Merge pull request #4119 from Jont828/caaph-calico-fix

Add version pin and registry values to calico Helm install with CAAPH
kubernetes-sigs · Oct 19, 2023 · 9b844c6 · 9b844c6
2 parents 1b6df41 + fe18c05
commit 9b844c6
Show file tree

Hide file tree

Showing 53 changed files with 265 additions and 25 deletions.
diff --git a/templates/addons/cluster-api-helm/calico-dual-stack.yaml b/templates/addons/cluster-api-helm/calico-dual-stack.yaml
@@ -8,6 +8,7 @@ spec:
       cni: calico-dual-stack
   repoURL: https://docs.tigera.io/calico/charts
   chartName: tigera-operator
+  version: ${CALICO_VERSION}
   releaseName: projectcalico
   namespace: tigera-operator
   valuesTemplate: |
@@ -29,4 +30,11 @@ spec:
           cidr: {{ index .Cluster.spec.clusterNetwork.pods.cidrBlocks 1 }}
           encapsulation: None
           natOutgoing: Enabled
-          nodeSelector: all()
+          nodeSelector: all()
+      registry: mcr.microsoft.com/oss
+    # Image and registry configuration for the tigera/operator pod.
+    tigeraOperator:
+      image: tigera/operator
+      registry: mcr.microsoft.com/oss
+    calicoctl:
+      image: mcr.microsoft.com/oss/calico/ctl
diff --git a/templates/addons/cluster-api-helm/calico-ipv6.yaml b/templates/addons/cluster-api-helm/calico-ipv6.yaml
@@ -8,6 +8,7 @@ spec:
       cni: calico-ipv6
   repoURL: https://docs.tigera.io/calico/charts
   chartName: tigera-operator
+  version: ${CALICO_VERSION}
   releaseName: projectcalico
   namespace: tigera-operator
   valuesTemplate: |
@@ -24,4 +25,11 @@ spec:
           cidr: {{ $cidr }}
           encapsulation: None
           natOutgoing: Enabled
-          nodeSelector: all(){{end}}
+          nodeSelector: all(){{end}}
+      registry: mcr.microsoft.com/oss
+    # Image and registry configuration for the tigera/operator pod.
+    tigeraOperator:
+      image: tigera/operator
+      registry: mcr.microsoft.com/oss
+    calicoctl:
+      image: mcr.microsoft.com/oss/calico/ctl
diff --git a/templates/addons/cluster-api-helm/calico.yaml b/templates/addons/cluster-api-helm/calico.yaml
@@ -8,6 +8,7 @@ spec:
       cni: calico
   repoURL: https://docs.tigera.io/calico/charts
   chartName: tigera-operator
+  version: ${CALICO_VERSION}
   releaseName: projectcalico
   namespace: tigera-operator
   valuesTemplate: |
@@ -20,4 +21,11 @@ spec:
         ipPools:
         ipPools:{{range $i, $cidr := .Cluster.spec.clusterNetwork.pods.cidrBlocks }}
         - cidr: {{ $cidr }}
-          encapsulation: VXLAN{{end}}
+          encapsulation: VXLAN{{end}}
+      registry: mcr.microsoft.com/oss
+    # Image and registry configuration for the tigera/operator pod.
+    tigeraOperator:
+      image: tigera/operator
+      registry: mcr.microsoft.com/oss
+    calicoctl:
+      image: mcr.microsoft.com/oss/calico/ctl
diff --git a/templates/test/ci/cluster-template-prow-ci-version-dual-stack.yaml b/templates/test/ci/cluster-template-prow-ci-version-dual-stack.yaml
diff --git a/templates/test/ci/cluster-template-prow-ci-version-ipv6.yaml b/templates/test/ci/cluster-template-prow-ci-version-ipv6.yaml
diff --git a/templates/test/ci/cluster-template-prow-ci-version.yaml b/templates/test/ci/cluster-template-prow-ci-version.yaml
diff --git a/templates/test/ci/cluster-template-prow-custom-vnet.yaml b/templates/test/ci/cluster-template-prow-custom-vnet.yaml
diff --git a/templates/test/ci/cluster-template-prow-dual-stack.yaml b/templates/test/ci/cluster-template-prow-dual-stack.yaml
diff --git a/templates/test/ci/cluster-template-prow-edgezone.yaml b/templates/test/ci/cluster-template-prow-edgezone.yaml
diff --git a/templates/test/ci/cluster-template-prow-flatcar.yaml b/templates/test/ci/cluster-template-prow-flatcar.yaml
diff --git a/templates/test/ci/cluster-template-prow-intree-cloud-provider-machine-pool.yaml b/templates/test/ci/cluster-template-prow-intree-cloud-provider-machine-pool.yaml
diff --git a/templates/test/ci/cluster-template-prow-intree-cloud-provider.yaml b/templates/test/ci/cluster-template-prow-intree-cloud-provider.yaml
diff --git a/templates/test/ci/cluster-template-prow-ipv6.yaml b/templates/test/ci/cluster-template-prow-ipv6.yaml
diff --git a/templates/test/ci/cluster-template-prow-machine-pool-ci-version.yaml b/templates/test/ci/cluster-template-prow-machine-pool-ci-version.yaml
diff --git a/templates/test/ci/cluster-template-prow-machine-pool-flex.yaml b/templates/test/ci/cluster-template-prow-machine-pool-flex.yaml
diff --git a/templates/test/ci/cluster-template-prow-machine-pool.yaml b/templates/test/ci/cluster-template-prow-machine-pool.yaml
diff --git a/templates/test/ci/cluster-template-prow-nvidia-gpu.yaml b/templates/test/ci/cluster-template-prow-nvidia-gpu.yaml
diff --git a/templates/test/ci/cluster-template-prow-private.yaml b/templates/test/ci/cluster-template-prow-private.yaml
diff --git a/templates/test/ci/cluster-template-prow-topology.yaml b/templates/test/ci/cluster-template-prow-topology.yaml
diff --git a/templates/test/ci/cluster-template-prow-workload-identity.yaml b/templates/test/ci/cluster-template-prow-workload-identity.yaml
diff --git a/templates/test/ci/cluster-template-prow.yaml b/templates/test/ci/cluster-template-prow.yaml
diff --git a/templates/test/ci/patches/cluster-label.yaml → ...test/ci/patches/cluster-label-calico.yaml b/templates/test/ci/patches/cluster-label.yaml → ...test/ci/patches/cluster-label-calico.yaml
diff --git a/templates/test/ci/prow-ci-version-dual-stack/kustomization.yaml b/templates/test/ci/prow-ci-version-dual-stack/kustomization.yaml
@@ -8,7 +8,7 @@ patchesStrategicMerge:
   - ../../../flavors/dual-stack/patches/dual-stack.yaml
   - ../../../flavors/dual-stack/patches/controlplane-azuremachinetemplate.yaml
   - ../../../flavors/dual-stack/patches/kubeadm-controlplane.yaml
-  - ../prow-dual-stack/patches/cluster-label.yaml
+  - ../prow-dual-stack/patches/cluster-label-calico-dual-stack.yaml
   - patches/machine-deployment.yaml
   - ../patches/windows-addons-disabled.yaml
 patches:

diff --git a/templates/test/ci/prow-ci-version-ipv6/kustomization.yaml b/templates/test/ci/prow-ci-version-ipv6/kustomization.yaml
@@ -8,7 +8,7 @@ patchesStrategicMerge:
   - ../../../flavors/ipv6/patches/ipv6.yaml
   - ../../../flavors/ipv6/patches/controlplane-azuremachinetemplate.yaml
   - ../../../flavors/ipv6/patches/kubeadm-controlplane.yaml
-  - ../prow-ipv6/patches/cluster-label.yaml
+  - ../prow-ipv6/patches/cluster-label-calico-ipv6.yaml
   - patches/machine-deployment.yaml
   - ../patches/windows-addons-disabled.yaml
 patches:

diff --git a/templates/test/ci/prow-custom-vnet/kustomization.yaml b/templates/test/ci/prow-custom-vnet/kustomization.yaml
@@ -12,4 +12,4 @@ patchesStrategicMerge:
   - patches/custom-vnet.yaml
   - ../patches/uami-md-0.yaml
   - ../patches/uami-control-plane.yaml
-  - ../patches/cluster-label.yaml
+  - ../patches/cluster-label-calico.yaml
diff --git a/templates/test/ci/prow-dual-stack/kustomization.yaml b/templates/test/ci/prow-dual-stack/kustomization.yaml
@@ -10,4 +10,4 @@ patchesStrategicMerge:
   - ../patches/controller-manager.yaml
   - patches/azure-machine-template-control-plane.yaml
   - patches/azure-machine-template.yaml
-  - patches/cluster-label.yaml
+  - patches/cluster-label-calico-dual-stack.yaml
diff --git a/...row-dual-stack/patches/cluster-label.yaml → ...ches/cluster-label-calico-dual-stack.yaml b/...row-dual-stack/patches/cluster-label.yaml → ...ches/cluster-label-calico-dual-stack.yaml
diff --git a/templates/test/ci/prow-edgezone/kustomization.yaml b/templates/test/ci/prow-edgezone/kustomization.yaml
@@ -14,4 +14,4 @@ patchesStrategicMerge:
   - patches/standardssd-disk.yaml
   - patches/machine-type.yaml
   - patches/kubernetes-version.yaml
-  - ../patches/cluster-label.yaml
+  - ../patches/cluster-label-calico.yaml
diff --git a/templates/test/ci/prow-flatcar/kustomization.yaml b/templates/test/ci/prow-flatcar/kustomization.yaml
@@ -7,4 +7,4 @@ resources:
 patchesStrategicMerge:
   - ../patches/tags.yaml
   - ../patches/controller-manager.yaml
-  - ../patches/cluster-label.yaml
+  - ../patches/cluster-label-calico.yaml
diff --git a/templates/test/ci/prow-ipv6/kustomization.yaml b/templates/test/ci/prow-ipv6/kustomization.yaml
@@ -8,4 +8,4 @@ resources:
 patchesStrategicMerge:
   - ../patches/tags.yaml
   - ../patches/controller-manager.yaml
-  - patches/cluster-label.yaml
+  - patches/cluster-label-calico-ipv6.yaml
diff --git a/...t/ci/prow-ipv6/patches/cluster-label.yaml → ...v6/patches/cluster-label-calico-ipv6.yaml b/...t/ci/prow-ipv6/patches/cluster-label.yaml → ...v6/patches/cluster-label-calico-ipv6.yaml
diff --git a/templates/test/ci/prow-machine-pool/kustomization.yaml b/templates/test/ci/prow-machine-pool/kustomization.yaml
@@ -13,7 +13,7 @@ patchesStrategicMerge:
   - ../patches/controller-manager.yaml
   - ../patches/machine-pool-worker-counts.yaml
   - ../patches/windows-containerd-labels.yaml
-  - ../patches/cluster-label.yaml
+  - ../patches/cluster-label-calico.yaml
 configMapGenerator:
   - name: cni-${CLUSTER_NAME}-calico-windows
     files:

diff --git a/templates/test/ci/prow-nvidia-gpu/kustomization.yaml b/templates/test/ci/prow-nvidia-gpu/kustomization.yaml
@@ -8,7 +8,7 @@ patchesStrategicMerge:
   - ../patches/tags.yaml
   - ../patches/controller-manager.yaml
   - ../patches/azurecluster-gpu.yaml
-  - ../patches/cluster-label.yaml
+  - ../patches/cluster-label-calico.yaml
 patches:
 - path: patches/node-storage-type.yaml
   target: