-
Notifications
You must be signed in to change notification settings - Fork 4.9k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Update kubeadm api version from v1beta1 to v1beta2 #6150
Merged
Merged
Changes from all commits
Commits
Show all changes
21 commits
Select commit
Hold shift + click to select a range
0ce6a03
add v1beta2 template
ruben-baez-seagull-com 3bedd60
add v1beta2 condition
ruben-baez-seagull-com 716abbb
refactor template && change validation
ruben-baez-seagull-com c7ded84
resolving conflicts
ruben-baez-seagull-com 805f117
fix imports
ruben-baez-seagull-com ebecf33
add podSubnet & certSANs from v1beta1
ruben-baez-seagull-com 5fd6bea
Merge branch 'master' of https://github.com/kubernetes/minikube into …
ruben-baez-seagull-com 453fb9f
fix code format
ruben-baez-seagull-com f1557f2
add more versions for testing
ruben-baez-seagull-com e2c254f
change template name to 1.17 test files
ruben-baez-seagull-com eef0e52
add more test files to 1.18 & 1.19 versions
ruben-baez-seagull-com c3bb380
Merge branch 'master' of https://github.com/kubernetes/minikube into …
ruben-baez-seagull-com 076d855
Merge branch 'master' of https://github.com/kubernetes/minikube into …
ruben-baez-seagull-com 31fd6d9
remove kubelet conf label
ruben-baez-seagull-com e8e3a6f
delete an empty line
ruben-baez-seagull-com aaff160
Merge branch 'master' of https://github.com/kubernetes/minikube into …
ruben-baez-seagull-com b365692
get master changes
ruben-baez-seagull-com 975f720
Merge branch 'master' of https://github.com/kubernetes/minikube into …
ruben-baez-seagull-com 34bb09c
add beta2 files
ruben-baez-seagull-com 7f17203
fix unittest
ruben-baez-seagull-com 7e22609
Merge branch 'master' of https://github.com/kubernetes/minikube into …
ruben-baez-seagull-com File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| /* | ||
| Copyright 2016 The Kubernetes Authors All rights reserved. | ||
|
|
||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
|
|
||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
|
|
||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package ktmpl | ||
|
|
||
| import "text/template" | ||
|
|
||
| // V1Beta2 is kubeadm config template for Kubernetes v1.17+ | ||
| var V1Beta2 = template.Must(template.New("configTmpl-v1beta2").Funcs(template.FuncMap{ | ||
| "printMapInOrder": printMapInOrder, | ||
| }).Parse(`apiVersion: kubeadm.k8s.io/v1beta2 | ||
| kind: InitConfiguration | ||
| localAPIEndpoint: | ||
| advertiseAddress: {{.AdvertiseAddress}} | ||
| bindPort: {{.APIServerPort}} | ||
| bootstrapTokens: | ||
| - groups: | ||
| - system:bootstrappers:kubeadm:default-node-token | ||
| ttl: 24h0m0s | ||
| usages: | ||
| - signing | ||
| - authentication | ||
| nodeRegistration: | ||
| criSocket: {{if .CRISocket}}{{.CRISocket}}{{else}}/var/run/dockershim.sock{{end}} | ||
| name: {{.NodeName}} | ||
| taints: [] | ||
| --- | ||
| apiVersion: kubeadm.k8s.io/v1beta2 | ||
| kind: ClusterConfiguration | ||
| {{ if .ImageRepository}}imageRepository: {{.ImageRepository}} | ||
| {{end}}{{range .ExtraArgs}}{{.Component}}: | ||
| extraArgs: | ||
| {{- range $i, $val := printMapInOrder .Options ": " }} | ||
| {{$val}} | ||
| {{- end}} | ||
| {{end -}} | ||
| {{if .FeatureArgs}}featureGates: | ||
| {{range $i, $val := .FeatureArgs}}{{$i}}: {{$val}} | ||
| {{end -}}{{end -}} | ||
| certificatesDir: {{.CertDir}} | ||
| clusterName: kubernetes | ||
| apiServer: | ||
| certSANs: ["127.0.0.1", "localhost", "{{.AdvertiseAddress}}"] | ||
| controlPlaneEndpoint: localhost:{{.APIServerPort}} | ||
| controllerManager: {} | ||
| dns: | ||
| type: CoreDNS | ||
| etcd: | ||
| local: | ||
| dataDir: {{.EtcdDataDir}} | ||
| kubernetesVersion: {{.KubernetesVersion}} | ||
| networking: | ||
| dnsDomain: {{if .DNSDomain}}{{.DNSDomain}}{{else}}cluster.local{{end}} | ||
| podSubnet: "{{.PodSubnet }}" | ||
| serviceSubnet: {{.ServiceCIDR}} | ||
| `)) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is this expected? Shouldn't we still be setting the eviction settings for this version?