mirror of https://github.com/k3s-io/k3s
24bc761aec
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Support containerized kubelet in CI **What this PR does / why we need it**: * Adjust hyperkube Makefile to allow HYPERKUBE_BIN to be specified from outside * new DOCKER_ROOT variable to specify --root-dir and associated volume for kubelet to know where docker directory lives * Save the docker logs when we kill the kubelet container * Allow customized image for dockerized kubelet and build a Default image if one is not specified We should allow a custom build using script we have: `VERSION="latest" REGISTRY="k8s.gcr.io" hack/dev-push-hyperkube.sh` to be used quickly using DOCKERIZE_KUBELET. To do this we remove the hard coded `k8s.gcr.io/kubelet` image and introduce a new environment variable `KUBELET_IMAGE`. Note that we are switching to hyperkube from kubelet as we have a quick and easy script to build hyperkube image and load it into local docker daemon. This reduces bad hacks like `docker tag k8s.gcr.io/hyperkube-amd64:<tag> k8s.gcr.io/kubelet:latest` being used by folks today (see 62057) * Better cope with PID 0 when running "docker inspect" to look for the process id for kubelet container **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes # **Special notes for your reviewer**: **Release note**: ```release-note NONE ``` |
||
|---|---|---|
| .. | ||
| boilerplate | ||
| e2e-internal | ||
| gen-swagger-doc | ||
| jenkins | ||
| lib | ||
| make-rules | ||
| testdata | ||
| verify-flags | ||
| .golint_failures | ||
| .spelling_failures | ||
| BUILD | ||
| OWNERS | ||
| autogenerated_placeholder.txt | ||
| benchmark-go.sh | ||
| build-cross.sh | ||
| build-go.sh | ||
| build-ui.sh | ||
| cherry_pick_pull.sh | ||
| dev-build-and-push.sh | ||
| dev-build-and-up.sh | ||
| dev-push-hyperkube.sh | ||
| e2e-node-test.sh | ||
| e2e.go | ||
| e2e_test.go | ||
| generate-bindata.sh | ||
| generate-docs.sh | ||
| get-build.sh | ||
| ginkgo-e2e.sh | ||
| godep-restore.sh | ||
| godep-save.sh | ||
| grab-profiles.sh | ||
| import-restrictions.yaml | ||
| install-etcd.sh | ||
| list-feature-tests.sh | ||
| local-up-cluster.sh | ||
| print-workspace-status.sh | ||
| run-in-gopath.sh | ||
| test-go.sh | ||
| test-integration.sh | ||
| test-update-storage-objects.sh | ||
| update-all.sh | ||
| update-api-reference-docs.sh | ||
| update-bazel.sh | ||
| update-cloudprovider-gce.sh | ||
| update-codegen.sh | ||
| update-generated-device-plugin-dockerized.sh | ||
| update-generated-device-plugin.sh | ||
| update-generated-docs.sh | ||
| update-generated-kms-dockerized.sh | ||
| update-generated-kms.sh | ||
| update-generated-protobuf-dockerized.sh | ||
| update-generated-protobuf.sh | ||
| update-generated-runtime-dockerized.sh | ||
| update-generated-runtime.sh | ||
| update-generated-swagger-docs.sh | ||
| update-godep-licenses.sh | ||
| update-gofmt.sh | ||
| update-openapi-spec.sh | ||
| update-staging-godeps-dockerized.sh | ||
| update-staging-godeps.sh | ||
| update-swagger-spec.sh | ||
| update-translations.sh | ||
| update-workspace-mirror.sh | ||
| update_owners.py | ||
| verify-all.sh | ||
| verify-api-groups.sh | ||
| verify-api-reference-docs.sh | ||
| verify-bazel.sh | ||
| verify-boilerplate.sh | ||
| verify-cli-conventions.sh | ||
| verify-cloudprovider-gce.sh | ||
| verify-codegen.sh | ||
| verify-description.sh | ||
| verify-flags-underscore.py | ||
| verify-generated-device-plugin.sh | ||
| verify-generated-docs.sh | ||
| verify-generated-files-remake.sh | ||
| verify-generated-kms.sh | ||
| verify-generated-protobuf.sh | ||
| verify-generated-runtime.sh | ||
| verify-generated-swagger-docs.sh | ||
| verify-godep-licenses.sh | ||
| verify-godeps.sh | ||
| verify-gofmt.sh | ||
| verify-golint.sh | ||
| verify-govet.sh | ||
| verify-import-boss.sh | ||
| verify-imports.sh | ||
| verify-linkcheck.sh | ||
| verify-no-vendor-cycles.sh | ||
| verify-openapi-spec.sh | ||
| verify-pkg-names.sh | ||
| verify-readonly-packages.sh | ||
| verify-spelling.sh | ||
| verify-staging-godeps.sh | ||
| verify-swagger-spec.sh | ||
| verify-symbols.sh | ||
| verify-test-images.sh | ||
| verify-test-owners.sh | ||
| verify-typecheck.sh | ||