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

Don't set the master address for aws ccm

pkg/model/components/awscloudcontrollermanager.go

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

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

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

upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/manifest.yaml

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