kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11582 from olemarkus/ccm-no-set-master 

Don't set the master address for aws ccm
This commit is contained in:
Kubernetes Prow Robot 2021-05-23 14:23:38 -07:00 committed by GitHub
parent 95dcaf2766 2d643fff11
commit dea5c28b9d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/model/components/awscloudcontrollermanager.go
View File

@ -73,7 +73,5 @@ func (b *AWSCloudControllerManagerOptionsBuilder) BuildOptions(o interface{}) er
return fmt.Errorf("no networking mode set") return fmt.Errorf("no networking mode set")
} }
eccm.Master = "https://127.0.0.1"
return nil return nil
} }

1
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/aws-cloud-controller.addons.k8s.io-k8s-1.18.yaml
View File

@ -21,7 +21,6 @@ spec:
spec: spec:
containers: containers:
- args: - args:
- --master=https://127.0.0.1
- --v=2 - --v=2
- --cloud-provider=aws - --cloud-provider=aws
- --cluster-name=minimal.example.com - --cluster-name=minimal.example.com

2
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/manifest.yaml
View File

@ -55,7 +55,7 @@ spec:
- id: k8s-1.18 - id: k8s-1.18
kubernetesVersion: '>=1.18.0' kubernetesVersion: '>=1.18.0'
manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
manifestHash: d1234040768f371ebb4a4e27cac699e215afb173 manifestHash: 66da0144f0b1b8077fe52179bc38268a3548579f
name: aws-cloud-controller.addons.k8s.io name: aws-cloud-controller.addons.k8s.io
selector: selector:
k8s-addon: aws-cloud-controller.addons.k8s.io k8s-addon: aws-cloud-controller.addons.k8s.io