Merge remote-tracking branch 'upstream/master' into merged-master-dev-1.16

2019-08-23 12:43:41 -05:00
parent 0125d9477c 92e439e124
commit 6c66ccd456
94 changed files with 3831 additions and 292 deletions
@@ -47,7 +47,7 @@ spec:
        image: k8s.gcr.io/cloud-controller-manager:v1.8.0
        command:
        - /usr/local/bin/cloud-controller-manager
-        - --cloud-provider=<YOUR_CLOUD_PROVIDER>   # Add your own cloud provider here!
+        - --cloud-provider=[YOUR_CLOUD_PROVIDER]  # Add your own cloud provider here!
        - --leader-elect=true
        - --use-service-account-credentials
        # these flags will vary for every cloud provider