github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-02 08:17:26 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #71973 from MalloZup/fix-1234

Browse Source 
Exclude by default address flag fix #1234
This commit is contained in:
Kubernetes Prow Robot 2019-01-01 05:36:18 -08:00 committed by GitHub
commit 993c65634e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/kubeadm/app/phases/controlplane/manifests.go
View File

@ -246,7 +246,7 @@ func calcNodeCidrSize(podSubnet string) string {
// getControllerManagerCommand builds the right controller manager command from the given config object and version // getControllerManagerCommand builds the right controller manager command from the given config object and version
func getControllerManagerCommand(cfg *kubeadmapi.InitConfiguration, k8sVersion *version.Version) []string { func getControllerManagerCommand(cfg *kubeadmapi.InitConfiguration, k8sVersion *version.Version) []string {
defaultArguments := map[string]string{ defaultArguments := map[string]string{
"address": "127.0.0.1", "bind-address": "127.0.0.1",
"leader-elect": "true", "leader-elect": "true",
"kubeconfig": filepath.Join(kubeadmconstants.KubernetesDir, kubeadmconstants.ControllerManagerKubeConfigFileName), "kubeconfig": filepath.Join(kubeadmconstants.KubernetesDir, kubeadmconstants.ControllerManagerKubeConfigFileName),
"root-ca-file": filepath.Join(cfg.CertificatesDir, kubeadmconstants.CACertName), "root-ca-file": filepath.Join(cfg.CertificatesDir, kubeadmconstants.CACertName),
@ -290,7 +290,7 @@ func getControllerManagerCommand(cfg *kubeadmapi.InitConfiguration, k8sVersion *
// getSchedulerCommand builds the right scheduler command from the given config object and version // getSchedulerCommand builds the right scheduler command from the given config object and version
func getSchedulerCommand(cfg *kubeadmapi.InitConfiguration) []string { func getSchedulerCommand(cfg *kubeadmapi.InitConfiguration) []string {
defaultArguments := map[string]string{ defaultArguments := map[string]string{
"address": "127.0.0.1", "bind-address": "127.0.0.1",
"leader-elect": "true", "leader-elect": "true",
"kubeconfig": filepath.Join(kubeadmconstants.KubernetesDir, kubeadmconstants.SchedulerKubeConfigFileName), "kubeconfig": filepath.Join(kubeadmconstants.KubernetesDir, kubeadmconstants.SchedulerKubeConfigFileName),
} }

26
cmd/kubeadm/app/phases/controlplane/manifests_test.go
View File

@ -583,7 +583,7 @@ func TestGetControllerManagerCommand(t *testing.T) {
}, },
expected: []string{ expected: []string{
"kube-controller-manager", "kube-controller-manager",
"--address=127.0.0.1", "--bind-address=127.0.0.1",
"--leader-elect=true", "--leader-elect=true",
"--kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf", "--kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf",
"--root-ca-file=" + testCertsDir + "/ca.crt", "--root-ca-file=" + testCertsDir + "/ca.crt",
@ -607,7 +607,7 @@ func TestGetControllerManagerCommand(t *testing.T) {
}, },
expected: []string{ expected: []string{
"kube-controller-manager", "kube-controller-manager",
"--address=127.0.0.1", "--bind-address=127.0.0.1",
"--leader-elect=true", "--leader-elect=true",
"--kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf", "--kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf",
"--root-ca-file=" + testCertsDir + "/ca.crt", "--root-ca-file=" + testCertsDir + "/ca.crt",
@ -637,7 +637,7 @@ func TestGetControllerManagerCommand(t *testing.T) {
}, },
expected: []string{ expected: []string{
"kube-controller-manager", "kube-controller-manager",
"--address=127.0.0.1", "--bind-address=127.0.0.1",
"--leader-elect=true", "--leader-elect=true",
"--kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf", "--kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf",
"--root-ca-file=" + testCertsDir + "/ca.crt", "--root-ca-file=" + testCertsDir + "/ca.crt",
@ -664,7 +664,7 @@ func TestGetControllerManagerCommand(t *testing.T) {
}, },
expected: []string{ expected: []string{
"kube-controller-manager", "kube-controller-manager",
"--address=127.0.0.1", "--bind-address=127.0.0.1",
"--leader-elect=true", "--leader-elect=true",
"--kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf", "--kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf",
"--root-ca-file=" + testCertsDir + "/ca.crt", "--root-ca-file=" + testCertsDir + "/ca.crt",
@ -690,7 +690,7 @@ func TestGetControllerManagerCommand(t *testing.T) {
}, },
expected: []string{ expected: []string{
"kube-controller-manager", "kube-controller-manager",
"--address=127.0.0.1", "--bind-address=127.0.0.1",
"--leader-elect=true", "--leader-elect=true",
"--kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf", "--kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf",
"--root-ca-file=" + testCertsDir + "/ca.crt", "--root-ca-file=" + testCertsDir + "/ca.crt",
@ -710,7 +710,7 @@ func TestGetControllerManagerCommand(t *testing.T) {
}, },
expected: []string{ expected: []string{
"kube-controller-manager", "kube-controller-manager",
"--address=127.0.0.1", "--bind-address=127.0.0.1",
"--leader-elect=true", "--leader-elect=true",
"--kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf", "--kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf",
"--root-ca-file=" + testCertsDir + "/ca.crt", "--root-ca-file=" + testCertsDir + "/ca.crt",
@ -736,7 +736,7 @@ func TestGetControllerManagerCommand(t *testing.T) {
}, },
expected: []string{ expected: []string{
"kube-controller-manager", "kube-controller-manager",
"--address=127.0.0.1", "--bind-address=127.0.0.1",
"--leader-elect=true", "--leader-elect=true",
"--kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf", "--kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf",
"--root-ca-file=" + testCertsDir + "/ca.crt", "--root-ca-file=" + testCertsDir + "/ca.crt",
@ -759,7 +759,7 @@ func TestGetControllerManagerCommand(t *testing.T) {
}, },
expected: []string{ expected: []string{
"kube-controller-manager", "kube-controller-manager",
"--address=127.0.0.1", "--bind-address=127.0.0.1",
"--leader-elect=true", "--leader-elect=true",
"--kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf", "--kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf",
"--root-ca-file=" + testCertsDir + "/ca.crt", "--root-ca-file=" + testCertsDir + "/ca.crt",
@ -886,7 +886,7 @@ func TestGetControllerManagerCommandExternalCA(t *testing.T) {
expectedArgFunc: func(tmpdir string) []string { expectedArgFunc: func(tmpdir string) []string {
return []string{ return []string{
"kube-controller-manager", "kube-controller-manager",
"--address=127.0.0.1", "--bind-address=127.0.0.1",
"--leader-elect=true", "--leader-elect=true",
"--kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf", "--kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf",
"--root-ca-file=" + tmpdir + "/ca.crt", "--root-ca-file=" + tmpdir + "/ca.crt",
@ -915,7 +915,7 @@ func TestGetControllerManagerCommandExternalCA(t *testing.T) {
expectedArgFunc: func(tmpdir string) []string { expectedArgFunc: func(tmpdir string) []string {
return []string{ return []string{
"kube-controller-manager", "kube-controller-manager",
"--address=127.0.0.1", "--bind-address=127.0.0.1",
"--leader-elect=true", "--leader-elect=true",
"--kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf", "--kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf",
"--root-ca-file=" + tmpdir + "/ca.crt", "--root-ca-file=" + tmpdir + "/ca.crt",
@ -944,7 +944,7 @@ func TestGetControllerManagerCommandExternalCA(t *testing.T) {
expectedArgFunc: func(tmpdir string) []string { expectedArgFunc: func(tmpdir string) []string {
return []string{ return []string{
"kube-controller-manager", "kube-controller-manager",
"--address=127.0.0.1", "--bind-address=127.0.0.1",
"--leader-elect=true", "--leader-elect=true",
"--kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf", "--kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf",
"--root-ca-file=" + tmpdir + "/ca.crt", "--root-ca-file=" + tmpdir + "/ca.crt",
@ -969,7 +969,7 @@ func TestGetControllerManagerCommandExternalCA(t *testing.T) {
expectedArgFunc: func(tmpdir string) []string { expectedArgFunc: func(tmpdir string) []string {
return []string{ return []string{
"kube-controller-manager", "kube-controller-manager",
"--address=127.0.0.1", "--bind-address=127.0.0.1",
"--leader-elect=true", "--leader-elect=true",
"--kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf", "--kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf",
"--root-ca-file=" + tmpdir + "/ca.crt", "--root-ca-file=" + tmpdir + "/ca.crt",
@ -1024,7 +1024,7 @@ func TestGetSchedulerCommand(t *testing.T) {
cfg: &kubeadmapi.ClusterConfiguration{}, cfg: &kubeadmapi.ClusterConfiguration{},
expected: []string{ expected: []string{
"kube-scheduler", "kube-scheduler",
"--address=127.0.0.1", "--bind-address=127.0.0.1",
"--leader-elect=true", "--leader-elect=true",
"--kubeconfig=" + kubeadmconstants.KubernetesDir + "/scheduler.conf", "--kubeconfig=" + kubeadmconstants.KubernetesDir + "/scheduler.conf",
}, },

8
cmd/kubeadm/app/phases/selfhosting/selfhosting_test.go
View File

@ -223,7 +223,7 @@ spec:
- --service-account-private-key-file=/etc/kubernetes/pki/sa.key - --service-account-private-key-file=/etc/kubernetes/pki/sa.key
- --cluster-signing-cert-file=/etc/kubernetes/pki/ca.crt - --cluster-signing-cert-file=/etc/kubernetes/pki/ca.crt
- --cluster-signing-key-file=/etc/kubernetes/pki/ca.key - --cluster-signing-key-file=/etc/kubernetes/pki/ca.key
- --address=127.0.0.1 - --bind-address=127.0.0.1
- --use-service-account-credentials=true - --use-service-account-credentials=true
image: k8s.gcr.io/kube-controller-manager-amd64:v1.7.4 image: k8s.gcr.io/kube-controller-manager-amd64:v1.7.4
livenessProbe: livenessProbe:
@ -298,7 +298,7 @@ spec:
- --service-account-private-key-file=/etc/kubernetes/pki/sa.key - --service-account-private-key-file=/etc/kubernetes/pki/sa.key
- --cluster-signing-cert-file=/etc/kubernetes/pki/ca.crt - --cluster-signing-cert-file=/etc/kubernetes/pki/ca.crt
- --cluster-signing-key-file=/etc/kubernetes/pki/ca.key - --cluster-signing-key-file=/etc/kubernetes/pki/ca.key
- --address=127.0.0.1 - --bind-address=127.0.0.1
- --use-service-account-credentials=true - --use-service-account-credentials=true
image: k8s.gcr.io/kube-controller-manager-amd64:v1.7.4 image: k8s.gcr.io/kube-controller-manager-amd64:v1.7.4
livenessProbe: livenessProbe:
@ -372,7 +372,7 @@ spec:
- kube-scheduler - kube-scheduler
- --leader-elect=true - --leader-elect=true
- --kubeconfig=/etc/kubernetes/scheduler.conf - --kubeconfig=/etc/kubernetes/scheduler.conf
- --address=127.0.0.1 - --bind-address=127.0.0.1
image: k8s.gcr.io/kube-scheduler-amd64:v1.7.4 image: k8s.gcr.io/kube-scheduler-amd64:v1.7.4
livenessProbe: livenessProbe:
failureThreshold: 8 failureThreshold: 8
@ -423,7 +423,7 @@ spec:
- kube-scheduler - kube-scheduler
- --leader-elect=true - --leader-elect=true
- --kubeconfig=/etc/kubernetes/scheduler.conf - --kubeconfig=/etc/kubernetes/scheduler.conf
- --address=127.0.0.1 - --bind-address=127.0.0.1
image: k8s.gcr.io/kube-scheduler-amd64:v1.7.4 image: k8s.gcr.io/kube-scheduler-amd64:v1.7.4
livenessProbe: livenessProbe:
failureThreshold: 8 failureThreshold: 8