github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
k3s/hack
History
Kubernetes Submit Queue 11f00d1794
Merge pull request #64708 from chuckha/v1alpha1-fix 
Automatic merge from submit-queue (batch tested with PRs 63322, 64718, 64708, 64775, 64777). 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>.

Fix kubeadm for v1alpha1 configs

Signed-off-by: Chuck Ha <ha.chuck@gmail.com>

**What this PR does / why we need it**:
This PR allows v1alpha1 configurations to still work when running `kubeadm init`.

**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 kubernetes/kubeadm#884

**Special notes for your reviewer**:

```release-note
NONE
```
 		2018-06-05 14:31:12 -07:00
..
boilerplate Merge pull request #59172 from fisherxu/removeyear 2018-03-21 12:44:37 -07:00
e2e-internal Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
gen-swagger-doc Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
jenkins Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
lib Explictly enable cgo when building kubectl for darwin from darwin 2018-05-23 12:32:01 -07:00
make-rules Merge pull request #59579 from fbac/kubectl-cani-exitcode 2018-06-05 07:01:06 -07:00
testdata Remove initializer test 2018-05-25 22:18:10 +02:00
verify-flags Add multi-vc configuration for e2e tests 2018-01-18 15:29:27 -08:00
.golint_failures Merge pull request #64708 from chuckha/v1alpha1-fix 2018-06-05 14:31:12 -07:00
.spelling_failures add spelling checking script 2018-02-23 09:33:14 +08:00
BUILD Merge pull request #62151 from thockin/build-cleanup-with-go-1-10 2018-04-23 22:45:24 -07:00
OWNERS Volunteer for local-up-cluster related files 2018-04-13 08:21:28 -04:00
autogenerated_placeholder.txt
…
benchmark-go.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
build-cross.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
build-go.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
build-ui.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
cherry_pick_pull.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
dev-build-and-push.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
dev-build-and-up.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
dev-push-hyperkube.sh
…
e2e-node-test.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
e2e.go translate hack/e2e.go -v to --verbose-commands 2018-03-07 11:27:56 -08:00
e2e_test.go translate hack/e2e.go -v to --verbose-commands 2018-03-07 11:27:56 -08:00
generate-bindata.sh Merge pull request #62657 from matthyx/master 2018-05-02 19:44:32 -07:00
generate-docs.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
get-build.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
ginkgo-e2e.sh Merge pull request #62328 from serathius/monitoring-default-none 2018-05-16 07:07:05 -07:00
godep-restore.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
godep-save.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
grab-profiles.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
import-restrictions.yaml move resource builder flags to genericclioptions 2018-05-28 11:08:58 +02:00
install-etcd.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
list-feature-tests.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
local-up-cluster.sh Merge pull request #61610 from rajansandeep/kubeupaddon 2018-06-04 12:26:12 -07:00
print-workspace-status.sh bazel: support using SOURCE_DATE_EPOCH to override date 2018-02-08 21:12:03 -08:00
run-in-gopath.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
test-go.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
test-integration.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
test-update-storage-objects.sh Merge pull request #62657 from matthyx/master 2018-05-02 19:44:32 -07:00
update-all.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
update-api-reference-docs.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
update-bazel.sh Vendor kazel 2018-03-29 17:01:32 -07:00
update-cloudprovider-gce.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
update-codegen.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
update-generated-device-plugin-dockerized.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
update-generated-device-plugin.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
update-generated-docs.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
update-generated-kms-dockerized.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
update-generated-kms.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
update-generated-kubelet-plugin-registration-dockerized.sh Add probe based mechanism for kubelet plugin discovery 2018-05-29 12:00:37 -04:00
update-generated-kubelet-plugin-registration.sh Add probe based mechanism for kubelet plugin discovery 2018-05-29 12:00:37 -04:00
update-generated-protobuf-dockerized.sh Generated 2018-05-12 02:01:09 -04:00
update-generated-protobuf.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
update-generated-runtime-dockerized.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
update-generated-runtime.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
update-generated-swagger-docs.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
update-godep-licenses.sh update-godep-licenses.sh: various fixes and cleanups. 2018-03-23 15:38:20 +02:00
update-gofmt.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
update-openapi-spec.sh Merge pull request #63383 from liggitt/lease-reconciler 2018-05-04 12:41:09 -07:00
update-staging-godeps-dockerized.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
update-staging-godeps.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
update-swagger-spec.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
update-translations.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
update-workspace-mirror.sh workspace mirror: add trailing newline to urls list 2018-05-07 16:52:20 -07:00
update_owners.py remove some not used imports from python codes 2018-03-07 17:43:47 +08:00
verify-all.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
verify-api-groups.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
verify-api-reference-docs.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
verify-bazel.sh Fully resolve tmpdir in verify scripts, since it might be a symlink on macOS 2018-04-06 16:37:19 -07:00
verify-boilerplate.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
verify-cli-conventions.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
verify-cloudprovider-gce.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
verify-codegen.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
verify-description.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
verify-flags-underscore.py remove some not used imports from python codes 2018-03-07 17:43:47 +08:00
verify-generated-device-plugin.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
verify-generated-docs.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
verify-generated-files-remake.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
verify-generated-kms.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
verify-generated-kubelet-plugin-registration.sh Add probe based mechanism for kubelet plugin discovery 2018-05-29 12:00:37 -04:00
verify-generated-protobuf.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
verify-generated-runtime.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
verify-generated-swagger-docs.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
verify-godep-licenses.sh Route verify-godep-licenses output to stderr 2018-02-07 21:45:02 -08:00
verify-godeps.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
verify-gofmt.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
verify-golint.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
verify-govet.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
verify-import-boss.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
verify-imports.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
verify-linkcheck.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
verify-no-vendor-cycles.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
verify-openapi-spec.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
verify-pkg-names.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
verify-readonly-packages.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
verify-spelling.sh Vendor gazelle 2018-03-29 17:01:30 -07:00
verify-staging-godeps.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
verify-swagger-spec.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
verify-symbols.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
verify-test-images.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
verify-test-owners.sh
…
verify-typecheck.sh Merge pull request #62657 from matthyx/master 2018-05-02 19:44:32 -07:00