mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-24 04:06:03 +00:00
Merge pull request #104157 from knight42/remove-port-from-kubeadm-manifest
refactor(kubeadm): remove the flag --port from KCM manifest
This commit is contained in:
commit
5eeaafd2b4
@ -306,7 +306,6 @@ func getControllerManagerCommand(cfg *kubeadmapi.ClusterConfiguration) []string
|
||||
caFile := filepath.Join(cfg.CertificatesDir, kubeadmconstants.CACertName)
|
||||
|
||||
defaultArguments := map[string]string{
|
||||
"port": "0",
|
||||
"bind-address": "127.0.0.1",
|
||||
"leader-elect": "true",
|
||||
"kubeconfig": kubeconfigFile,
|
||||
|
@ -550,7 +550,6 @@ func TestGetControllerManagerCommand(t *testing.T) {
|
||||
},
|
||||
expected: []string{
|
||||
"kube-controller-manager",
|
||||
"--port=0",
|
||||
"--bind-address=127.0.0.1",
|
||||
"--leader-elect=true",
|
||||
"--kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf",
|
||||
@ -576,7 +575,6 @@ func TestGetControllerManagerCommand(t *testing.T) {
|
||||
},
|
||||
expected: []string{
|
||||
"kube-controller-manager",
|
||||
"--port=0",
|
||||
"--bind-address=127.0.0.1",
|
||||
"--leader-elect=true",
|
||||
"--kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf",
|
||||
@ -601,7 +599,6 @@ func TestGetControllerManagerCommand(t *testing.T) {
|
||||
},
|
||||
expected: []string{
|
||||
"kube-controller-manager",
|
||||
"--port=0",
|
||||
"--bind-address=127.0.0.1",
|
||||
"--leader-elect=true",
|
||||
"--kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf",
|
||||
@ -633,7 +630,6 @@ func TestGetControllerManagerCommand(t *testing.T) {
|
||||
},
|
||||
expected: []string{
|
||||
"kube-controller-manager",
|
||||
"--port=0",
|
||||
"--bind-address=127.0.0.1",
|
||||
"--leader-elect=true",
|
||||
"--kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf",
|
||||
@ -665,7 +661,6 @@ func TestGetControllerManagerCommand(t *testing.T) {
|
||||
},
|
||||
expected: []string{
|
||||
"kube-controller-manager",
|
||||
"--port=0",
|
||||
"--bind-address=127.0.0.1",
|
||||
"--leader-elect=true",
|
||||
"--kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf",
|
||||
@ -698,7 +693,6 @@ func TestGetControllerManagerCommand(t *testing.T) {
|
||||
},
|
||||
expected: []string{
|
||||
"kube-controller-manager",
|
||||
"--port=0",
|
||||
"--bind-address=127.0.0.1",
|
||||
"--leader-elect=true",
|
||||
"--kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf",
|
||||
@ -733,7 +727,6 @@ func TestGetControllerManagerCommand(t *testing.T) {
|
||||
},
|
||||
expected: []string{
|
||||
"kube-controller-manager",
|
||||
"--port=0",
|
||||
"--bind-address=127.0.0.1",
|
||||
"--leader-elect=true",
|
||||
"--kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf",
|
||||
@ -766,7 +759,6 @@ func TestGetControllerManagerCommand(t *testing.T) {
|
||||
},
|
||||
expected: []string{
|
||||
"kube-controller-manager",
|
||||
"--port=0",
|
||||
"--bind-address=127.0.0.1",
|
||||
"--leader-elect=true",
|
||||
"--kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf",
|
||||
@ -801,7 +793,6 @@ func TestGetControllerManagerCommand(t *testing.T) {
|
||||
},
|
||||
expected: []string{
|
||||
"kube-controller-manager",
|
||||
"--port=0",
|
||||
"--bind-address=127.0.0.1",
|
||||
"--leader-elect=true",
|
||||
"--kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf",
|
||||
@ -855,7 +846,6 @@ func TestGetControllerManagerCommandExternalCA(t *testing.T) {
|
||||
expectedArgFunc: func(tmpdir string) []string {
|
||||
return []string{
|
||||
"kube-controller-manager",
|
||||
"--port=0",
|
||||
"--bind-address=127.0.0.1",
|
||||
"--leader-elect=true",
|
||||
"--kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf",
|
||||
@ -885,7 +875,6 @@ func TestGetControllerManagerCommandExternalCA(t *testing.T) {
|
||||
expectedArgFunc: func(tmpdir string) []string {
|
||||
return []string{
|
||||
"kube-controller-manager",
|
||||
"--port=0",
|
||||
"--bind-address=127.0.0.1",
|
||||
"--leader-elect=true",
|
||||
"--kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf",
|
||||
|
Loading…
Reference in New Issue
Block a user