Merge pull request #3221 from CecileRobertMichon/oot-ipv6

Switch ipv6 template to external cloud-provider

Author: k8s-ci-robot

Tiltfile

@@ -371,7 +371,7 @@ def deploy_worker_templates(template, substitutions):
     else:
         calico_values = "./templates/addons/calico/values.yaml"
     flavor_cmd += "; " + helm_cmd + " repo add projectcalico https://docs.tigera.io/calico/charts; " + helm_cmd + " --kubeconfig ./${CLUSTER_NAME}.kubeconfig install calico projectcalico/tigera-operator -f " + calico_values + " --namespace tigera-operator --create-namespace"
-    if "intree-cloud-provider" not in flavor_name and "ipv6" not in flavor_name:  # TODO: remove ipv6 once https://github.com/kubernetes-sigs/cloud-provider-azure/issues/3401 is fixed.
+    if "intree-cloud-provider" not in flavor_name:
         flavor_cmd += "; " + helm_cmd + " --kubeconfig ./${CLUSTER_NAME}.kubeconfig install --repo https://raw.githubusercontent.com/kubernetes-sigs/cloud-provider-azure/master/helm/repo cloud-provider-azure --generate-name --set infra.clusterName=${CLUSTER_NAME}"
     local_resource(
         name = flavor_name,

templates/cluster-template-ipv6.yaml

@@ -6,8 +6,6 @@ resources:
 
 patchesStrategicMerge:
   - ../../azure-cluster-identity/azurecluster-identity-ref.yaml
-  - ../../test/ci/prow-intree-cloud-provider/patches/intree-cp.yaml # TODO: enable CCM for ipv6, see https://github.com/kubernetes-sigs/cloud-provider-azure/issues/3401.
-  - ../../test/ci/prow-intree-cloud-provider/patches/intree-md-0.yaml # TODO: enable CCM for ipv6, see https://github.com/kubernetes-sigs/cloud-provider-azure/issues/3401.
   - patches/ipv6.yaml
   - patches/kubeadm-controlplane.yaml
   - patches/controlplane-azuremachinetemplate.yaml

templates/flavors/ipv6/kustomization.yaml

@@ -55,7 +55,7 @@ spec:
           name: '{{ ds.meta_data["local_hostname"] }}'
           kubeletExtraArgs:
             azure-container-registry-config: /etc/kubernetes/azure.json
-            node-ip: "::"
+            cloud-provider: external
             cluster-dns: "[fd00::10]"
       clusterConfiguration:
         apiServer:

templates/flavors/ipv6/machine-deployment.yaml

@@ -13,7 +13,6 @@ spec:
       nodeRegistration:
         name: '{{ ds.meta_data["local_hostname"] }}'
         kubeletExtraArgs:
-          node-ip: "::"
           cluster-dns: "fd00::10"
       localAPIEndpoint:
         advertiseAddress: "::"
@@ -22,7 +21,6 @@ spec:
       nodeRegistration:
         name: '{{ ds.meta_data["local_hostname"] }}'
         kubeletExtraArgs:
-          node-ip: "::"
           cluster-dns: "fd00::10"
       controlPlane:
         localAPIEndpoint: