mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-27 13:37:30 +00:00
kubeadm: edit apiserver flags for storage-backend
Since storage-backend defaults to etcd3 in 1.6, no need to have a flag defining the default.
This commit is contained in:
parent
ca520e34a3
commit
2c05234674
@ -341,7 +341,6 @@ func getAPIServerCommand(cfg *kubeadmapi.MasterConfiguration, selfHosted bool, k
|
|||||||
"secure-port": fmt.Sprintf("%d", cfg.API.BindPort),
|
"secure-port": fmt.Sprintf("%d", cfg.API.BindPort),
|
||||||
"allow-privileged": "true",
|
"allow-privileged": "true",
|
||||||
"experimental-bootstrap-token-auth": "true",
|
"experimental-bootstrap-token-auth": "true",
|
||||||
"storage-backend": "etcd3",
|
|
||||||
"kubelet-preferred-address-types": "InternalIP,ExternalIP,Hostname",
|
"kubelet-preferred-address-types": "InternalIP,ExternalIP,Hostname",
|
||||||
// add options to configure the front proxy. Without the generated client cert, this will never be useable
|
// add options to configure the front proxy. Without the generated client cert, this will never be useable
|
||||||
// so add it unconditionally with recommended values
|
// so add it unconditionally with recommended values
|
||||||
|
@ -529,7 +529,6 @@ func TestGetAPIServerCommand(t *testing.T) {
|
|||||||
"--kubelet-client-key=" + testCertsDir + "/apiserver-kubelet-client.key",
|
"--kubelet-client-key=" + testCertsDir + "/apiserver-kubelet-client.key",
|
||||||
fmt.Sprintf("--secure-port=%d", 123),
|
fmt.Sprintf("--secure-port=%d", 123),
|
||||||
"--allow-privileged=true",
|
"--allow-privileged=true",
|
||||||
"--storage-backend=etcd3",
|
|
||||||
"--kubelet-preferred-address-types=InternalIP,ExternalIP,Hostname",
|
"--kubelet-preferred-address-types=InternalIP,ExternalIP,Hostname",
|
||||||
"--experimental-bootstrap-token-auth=true",
|
"--experimental-bootstrap-token-auth=true",
|
||||||
"--requestheader-username-headers=X-Remote-User",
|
"--requestheader-username-headers=X-Remote-User",
|
||||||
@ -562,7 +561,6 @@ func TestGetAPIServerCommand(t *testing.T) {
|
|||||||
"--kubelet-client-key=" + testCertsDir + "/apiserver-kubelet-client.key",
|
"--kubelet-client-key=" + testCertsDir + "/apiserver-kubelet-client.key",
|
||||||
fmt.Sprintf("--secure-port=%d", 123),
|
fmt.Sprintf("--secure-port=%d", 123),
|
||||||
"--allow-privileged=true",
|
"--allow-privileged=true",
|
||||||
"--storage-backend=etcd3",
|
|
||||||
"--kubelet-preferred-address-types=InternalIP,ExternalIP,Hostname",
|
"--kubelet-preferred-address-types=InternalIP,ExternalIP,Hostname",
|
||||||
"--experimental-bootstrap-token-auth=true",
|
"--experimental-bootstrap-token-auth=true",
|
||||||
"--requestheader-username-headers=X-Remote-User",
|
"--requestheader-username-headers=X-Remote-User",
|
||||||
@ -596,7 +594,6 @@ func TestGetAPIServerCommand(t *testing.T) {
|
|||||||
"--kubelet-client-key=" + testCertsDir + "/apiserver-kubelet-client.key",
|
"--kubelet-client-key=" + testCertsDir + "/apiserver-kubelet-client.key",
|
||||||
fmt.Sprintf("--secure-port=%d", 123),
|
fmt.Sprintf("--secure-port=%d", 123),
|
||||||
"--allow-privileged=true",
|
"--allow-privileged=true",
|
||||||
"--storage-backend=etcd3",
|
|
||||||
"--kubelet-preferred-address-types=InternalIP,ExternalIP,Hostname",
|
"--kubelet-preferred-address-types=InternalIP,ExternalIP,Hostname",
|
||||||
"--experimental-bootstrap-token-auth=true",
|
"--experimental-bootstrap-token-auth=true",
|
||||||
"--requestheader-username-headers=X-Remote-User",
|
"--requestheader-username-headers=X-Remote-User",
|
||||||
@ -632,7 +629,6 @@ func TestGetAPIServerCommand(t *testing.T) {
|
|||||||
"--kubelet-client-key=" + testCertsDir + "/apiserver-kubelet-client.key",
|
"--kubelet-client-key=" + testCertsDir + "/apiserver-kubelet-client.key",
|
||||||
fmt.Sprintf("--secure-port=%d", 123),
|
fmt.Sprintf("--secure-port=%d", 123),
|
||||||
"--allow-privileged=true",
|
"--allow-privileged=true",
|
||||||
"--storage-backend=etcd3",
|
|
||||||
"--kubelet-preferred-address-types=InternalIP,ExternalIP,Hostname",
|
"--kubelet-preferred-address-types=InternalIP,ExternalIP,Hostname",
|
||||||
"--experimental-bootstrap-token-auth=true",
|
"--experimental-bootstrap-token-auth=true",
|
||||||
"--proxy-client-cert-file=/var/lib/certs/front-proxy-client.crt",
|
"--proxy-client-cert-file=/var/lib/certs/front-proxy-client.crt",
|
||||||
|
Loading…
Reference in New Issue
Block a user