Skip to content

K
k3s
Commit 1d56ec0f authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #34907 from luxas/remove_etcd_duplicate

Automatic merge from submit-queue Remove duplicate --etcd-servers arguments in kubeadm fixes: #34900 @pires @errordeveloper
parents fd1fd2a1 4ac49a74
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 1 deletion
cmd/kubeadm/app/master/manifests.go
View file @ 1d56ec0f
...@@ -225,7 +225,6 @@ func getComponentCommand(component string, s *kubeadmapi.MasterConfiguration) (c ...@@ -225,7 +225,6 @@ func getComponentCommand(component string, s *kubeadmapi.MasterConfiguration) (c
baseFlags := map[string][]string{ baseFlags := map[string][]string{
apiServer: { apiServer: {
"--insecure-bind-address=127.0.0.1", "--insecure-bind-address=127.0.0.1",
"--etcd-servers=http://127.0.0.1:2379",
"--admission-control=NamespaceLifecycle,LimitRanger,ServiceAccount,PersistentVolumeLabel,DefaultStorageClass,ResourceQuota", "--admission-control=NamespaceLifecycle,LimitRanger,ServiceAccount,PersistentVolumeLabel,DefaultStorageClass,ResourceQuota",
"--service-cluster-ip-range=" + s.Networking.ServiceSubnet, "--service-cluster-ip-range=" + s.Networking.ServiceSubnet,
"--service-account-key-file=" + pkiDir + "/apiserver-key.pem", "--service-account-key-file=" + pkiDir + "/apiserver-key.pem",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment