diff --git a/templates/addons/cluster-api-helm/calico-dual-stack.yaml b/templates/addons/cluster-api-helm/calico-dual-stack.yaml index 08099d9e005..2c9ca62e436 100644 --- 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() \ No newline at end of file + 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 index b3de3f8b24c..4a2d6ae8cca 100644 --- 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}} \ No newline at end of file + 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 \ No newline at end of file diff --git a/templates/addons/cluster-api-helm/calico.yaml b/templates/addons/cluster-api-helm/calico.yaml index 37d892a9a3b..ba19537703d 100644 --- 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}} \ No newline at end of file + 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 \ No newline at end of file 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 index 088d30e484c..9f5693d2fbc 100644 --- a/templates/test/ci/cluster-template-prow-ci-version-dual-stack.yaml +++ b/templates/test/ci/cluster-template-prow-ci-version-dual-stack.yaml @@ -853,7 +853,7 @@ spec: namespace: tigera-operator releaseName: projectcalico repoURL: https://docs.tigera.io/calico/charts - valuesTemplate: |- + valuesTemplate: | installation: cni: type: Calico @@ -873,3 +873,11 @@ spec: encapsulation: None natOutgoing: Enabled 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 + version: ${CALICO_VERSION} diff --git a/templates/test/ci/cluster-template-prow-ci-version-ipv6.yaml b/templates/test/ci/cluster-template-prow-ci-version-ipv6.yaml index 9015384e88f..8fe0fd46532 100644 --- a/templates/test/ci/cluster-template-prow-ci-version-ipv6.yaml +++ b/templates/test/ci/cluster-template-prow-ci-version-ipv6.yaml @@ -886,3 +886,11 @@ spec: encapsulation: None natOutgoing: Enabled 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 + version: ${CALICO_VERSION} diff --git a/templates/test/ci/cluster-template-prow-ci-version.yaml b/templates/test/ci/cluster-template-prow-ci-version.yaml index 00d1c90e0ab..acd162ffb95 100644 --- a/templates/test/ci/cluster-template-prow-ci-version.yaml +++ b/templates/test/ci/cluster-template-prow-ci-version.yaml @@ -619,6 +619,14 @@ spec: ipPools:{{range $i, $cidr := .Cluster.spec.clusterNetwork.pods.cidrBlocks }} - cidr: {{ $cidr }} 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 + version: ${CALICO_VERSION} --- apiVersion: v1 data: diff --git a/templates/test/ci/cluster-template-prow-custom-vnet.yaml b/templates/test/ci/cluster-template-prow-custom-vnet.yaml index 7ec418a3b04..368e2c611d3 100644 --- a/templates/test/ci/cluster-template-prow-custom-vnet.yaml +++ b/templates/test/ci/cluster-template-prow-custom-vnet.yaml @@ -269,3 +269,11 @@ spec: ipPools:{{range $i, $cidr := .Cluster.spec.clusterNetwork.pods.cidrBlocks }} - cidr: {{ $cidr }} 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 + version: ${CALICO_VERSION} diff --git a/templates/test/ci/cluster-template-prow-dual-stack.yaml b/templates/test/ci/cluster-template-prow-dual-stack.yaml index f909903ae31..8c44b51b909 100644 --- a/templates/test/ci/cluster-template-prow-dual-stack.yaml +++ b/templates/test/ci/cluster-template-prow-dual-stack.yaml @@ -338,7 +338,7 @@ spec: namespace: tigera-operator releaseName: projectcalico repoURL: https://docs.tigera.io/calico/charts - valuesTemplate: |- + valuesTemplate: | installation: cni: type: Calico @@ -358,3 +358,11 @@ spec: encapsulation: None natOutgoing: Enabled 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 + version: ${CALICO_VERSION} diff --git a/templates/test/ci/cluster-template-prow-edgezone.yaml b/templates/test/ci/cluster-template-prow-edgezone.yaml index cf006b51d69..f5a657ce6e4 100644 --- a/templates/test/ci/cluster-template-prow-edgezone.yaml +++ b/templates/test/ci/cluster-template-prow-edgezone.yaml @@ -253,3 +253,11 @@ spec: ipPools:{{range $i, $cidr := .Cluster.spec.clusterNetwork.pods.cidrBlocks }} - cidr: {{ $cidr }} 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 + version: ${CALICO_VERSION} diff --git a/templates/test/ci/cluster-template-prow-flatcar.yaml b/templates/test/ci/cluster-template-prow-flatcar.yaml index e5cf6f6d5fd..2717aaacde9 100644 --- a/templates/test/ci/cluster-template-prow-flatcar.yaml +++ b/templates/test/ci/cluster-template-prow-flatcar.yaml @@ -280,3 +280,11 @@ spec: ipPools:{{range $i, $cidr := .Cluster.spec.clusterNetwork.pods.cidrBlocks }} - cidr: {{ $cidr }} 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 + version: ${CALICO_VERSION} 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 index 4e966d77878..c3a43b4cdb2 100644 --- 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 @@ -389,6 +389,14 @@ spec: ipPools:{{range $i, $cidr := .Cluster.spec.clusterNetwork.pods.cidrBlocks }} - cidr: {{ $cidr }} 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 + version: ${CALICO_VERSION} --- apiVersion: v1 data: diff --git a/templates/test/ci/cluster-template-prow-intree-cloud-provider.yaml b/templates/test/ci/cluster-template-prow-intree-cloud-provider.yaml index 311f4c63f1e..7b65f75175c 100644 --- a/templates/test/ci/cluster-template-prow-intree-cloud-provider.yaml +++ b/templates/test/ci/cluster-template-prow-intree-cloud-provider.yaml @@ -453,6 +453,14 @@ spec: ipPools:{{range $i, $cidr := .Cluster.spec.clusterNetwork.pods.cidrBlocks }} - cidr: {{ $cidr }} 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 + version: ${CALICO_VERSION} --- apiVersion: v1 data: diff --git a/templates/test/ci/cluster-template-prow-ipv6.yaml b/templates/test/ci/cluster-template-prow-ipv6.yaml index 31f2a234bac..d41391ba463 100644 --- a/templates/test/ci/cluster-template-prow-ipv6.yaml +++ b/templates/test/ci/cluster-template-prow-ipv6.yaml @@ -375,3 +375,11 @@ spec: encapsulation: None natOutgoing: Enabled 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 + version: ${CALICO_VERSION} 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 index 52e9b00d8bc..96eea451785 100644 --- a/templates/test/ci/cluster-template-prow-machine-pool-ci-version.yaml +++ b/templates/test/ci/cluster-template-prow-machine-pool-ci-version.yaml @@ -553,6 +553,14 @@ spec: ipPools:{{range $i, $cidr := .Cluster.spec.clusterNetwork.pods.cidrBlocks }} - cidr: {{ $cidr }} 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 + version: ${CALICO_VERSION} --- apiVersion: v1 data: diff --git a/templates/test/ci/cluster-template-prow-machine-pool-flex.yaml b/templates/test/ci/cluster-template-prow-machine-pool-flex.yaml index 5626bb1704b..3579753e1b7 100644 --- a/templates/test/ci/cluster-template-prow-machine-pool-flex.yaml +++ b/templates/test/ci/cluster-template-prow-machine-pool-flex.yaml @@ -379,6 +379,14 @@ spec: ipPools:{{range $i, $cidr := .Cluster.spec.clusterNetwork.pods.cidrBlocks }} - cidr: {{ $cidr }} 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 + version: ${CALICO_VERSION} --- apiVersion: v1 data: diff --git a/templates/test/ci/cluster-template-prow-machine-pool.yaml b/templates/test/ci/cluster-template-prow-machine-pool.yaml index 3e64f4be6d1..fb55151d07d 100644 --- a/templates/test/ci/cluster-template-prow-machine-pool.yaml +++ b/templates/test/ci/cluster-template-prow-machine-pool.yaml @@ -373,6 +373,14 @@ spec: ipPools:{{range $i, $cidr := .Cluster.spec.clusterNetwork.pods.cidrBlocks }} - cidr: {{ $cidr }} 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 + version: ${CALICO_VERSION} --- apiVersion: v1 data: diff --git a/templates/test/ci/cluster-template-prow-nvidia-gpu.yaml b/templates/test/ci/cluster-template-prow-nvidia-gpu.yaml index f7328e44dce..6d863ca8ce0 100644 --- a/templates/test/ci/cluster-template-prow-nvidia-gpu.yaml +++ b/templates/test/ci/cluster-template-prow-nvidia-gpu.yaml @@ -239,3 +239,11 @@ spec: ipPools:{{range $i, $cidr := .Cluster.spec.clusterNetwork.pods.cidrBlocks }} - cidr: {{ $cidr }} 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 + version: ${CALICO_VERSION} diff --git a/templates/test/ci/cluster-template-prow-private.yaml b/templates/test/ci/cluster-template-prow-private.yaml index 19cdfcfd98c..439830865b6 100644 --- a/templates/test/ci/cluster-template-prow-private.yaml +++ b/templates/test/ci/cluster-template-prow-private.yaml @@ -307,6 +307,14 @@ spec: ipPools:{{range $i, $cidr := .Cluster.spec.clusterNetwork.pods.cidrBlocks }} - cidr: {{ $cidr }} 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 + version: ${CALICO_VERSION} --- apiVersion: v1 data: diff --git a/templates/test/ci/cluster-template-prow-topology.yaml b/templates/test/ci/cluster-template-prow-topology.yaml index bcee8016d36..b0201abf9d9 100644 --- a/templates/test/ci/cluster-template-prow-topology.yaml +++ b/templates/test/ci/cluster-template-prow-topology.yaml @@ -104,6 +104,14 @@ spec: ipPools:{{range $i, $cidr := .Cluster.spec.clusterNetwork.pods.cidrBlocks }} - cidr: {{ $cidr }} 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 + version: ${CALICO_VERSION} --- apiVersion: v1 data: diff --git a/templates/test/ci/cluster-template-prow-workload-identity.yaml b/templates/test/ci/cluster-template-prow-workload-identity.yaml index f323d3c7d2b..cbb61315b46 100644 --- a/templates/test/ci/cluster-template-prow-workload-identity.yaml +++ b/templates/test/ci/cluster-template-prow-workload-identity.yaml @@ -245,3 +245,11 @@ spec: ipPools:{{range $i, $cidr := .Cluster.spec.clusterNetwork.pods.cidrBlocks }} - cidr: {{ $cidr }} 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 + version: ${CALICO_VERSION} diff --git a/templates/test/ci/cluster-template-prow.yaml b/templates/test/ci/cluster-template-prow.yaml index 182897bccfd..f31e475dbaa 100644 --- a/templates/test/ci/cluster-template-prow.yaml +++ b/templates/test/ci/cluster-template-prow.yaml @@ -437,6 +437,14 @@ spec: ipPools:{{range $i, $cidr := .Cluster.spec.clusterNetwork.pods.cidrBlocks }} - cidr: {{ $cidr }} 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 + version: ${CALICO_VERSION} --- apiVersion: v1 data: diff --git a/templates/test/ci/patches/cluster-label.yaml b/templates/test/ci/patches/cluster-label-calico.yaml similarity index 100% rename from templates/test/ci/patches/cluster-label.yaml rename to templates/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 index 86cfab2755b..92e87540b63 100644 --- 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 index f5392b0a594..4d36b3b5dc8 100644 --- 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 index a2f400d17af..1ec37da5fad 100644 --- 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 \ No newline at end of file + - ../patches/cluster-label-calico.yaml \ No newline at end of file diff --git a/templates/test/ci/prow-dual-stack/kustomization.yaml b/templates/test/ci/prow-dual-stack/kustomization.yaml index 807798da9fd..459b8c4c907 100644 --- 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/templates/test/ci/prow-dual-stack/patches/cluster-label.yaml b/templates/test/ci/prow-dual-stack/patches/cluster-label-calico-dual-stack.yaml similarity index 100% rename from templates/test/ci/prow-dual-stack/patches/cluster-label.yaml rename to templates/test/ci/prow-dual-stack/patches/cluster-label-calico-dual-stack.yaml diff --git a/templates/test/ci/prow-edgezone/kustomization.yaml b/templates/test/ci/prow-edgezone/kustomization.yaml index 6ca377b7047..6bb2a8f70df 100644 --- 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 \ No newline at end of file + - ../patches/cluster-label-calico.yaml \ No newline at end of file diff --git a/templates/test/ci/prow-flatcar/kustomization.yaml b/templates/test/ci/prow-flatcar/kustomization.yaml index a188e84aed3..c341146cab4 100644 --- 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 index cea194fef13..b72de16056c 100644 --- 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/templates/test/ci/prow-ipv6/patches/cluster-label.yaml b/templates/test/ci/prow-ipv6/patches/cluster-label-calico-ipv6.yaml similarity index 100% rename from templates/test/ci/prow-ipv6/patches/cluster-label.yaml rename to templates/test/ci/prow-ipv6/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 index c775226abfa..c189fde424e 100644 --- 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 index 2f8cd589864..13c1085fc3c 100644 --- 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: diff --git a/templates/test/ci/prow-private/kustomization.yaml b/templates/test/ci/prow-private/kustomization.yaml index 8bdcb3821d4..a097dc10699 100644 --- a/templates/test/ci/prow-private/kustomization.yaml +++ b/templates/test/ci/prow-private/kustomization.yaml @@ -14,7 +14,7 @@ patchesStrategicMerge: - ../patches/uami-control-plane.yaml - ../prow-intree-cloud-provider/patches/intree-cp.yaml # TODO: remove once CAPI supports Helm addons - ../prow-intree-cloud-provider/patches/intree-md-0.yaml # TODO: remove once CAPI supports Helm addons - - ../patches/cluster-label.yaml + - ../patches/cluster-label-calico.yaml patches: - path: patches/user-assigned.yaml target: diff --git a/templates/test/ci/prow-topology/kustomization.yaml b/templates/test/ci/prow-topology/kustomization.yaml index 60a8aa47928..654099474e2 100644 --- a/templates/test/ci/prow-topology/kustomization.yaml +++ b/templates/test/ci/prow-topology/kustomization.yaml @@ -9,7 +9,7 @@ resources: patchesStrategicMerge: - ../patches/windows-containerd-labels.yaml - cluster.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-workload-identity/kustomization.yaml b/templates/test/ci/prow-workload-identity/kustomization.yaml index a86b5c67cde..45491162460 100644 --- a/templates/test/ci/prow-workload-identity/kustomization.yaml +++ b/templates/test/ci/prow-workload-identity/kustomization.yaml @@ -11,4 +11,4 @@ patchesStrategicMerge: - ../patches/apiserver.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/kustomization.yaml b/templates/test/ci/prow/kustomization.yaml index 63563fcf5f7..22bc0993504 100644 --- a/templates/test/ci/prow/kustomization.yaml +++ b/templates/test/ci/prow/kustomization.yaml @@ -21,7 +21,7 @@ patchesStrategicMerge: - ../patches/windows-feature-gates.yaml - ../patches/windows-containerd-labels.yaml - ../patches/windows-server-version.yaml - - ../patches/cluster-label.yaml + - ../patches/cluster-label-calico.yaml patches: - target: group: bootstrap.cluster.x-k8s.io diff --git a/templates/test/dev/cluster-template-custom-builds-machine-pool.yaml b/templates/test/dev/cluster-template-custom-builds-machine-pool.yaml index 2048f04b4a7..7ebfabbde8c 100644 --- a/templates/test/dev/cluster-template-custom-builds-machine-pool.yaml +++ b/templates/test/dev/cluster-template-custom-builds-machine-pool.yaml @@ -501,6 +501,14 @@ spec: ipPools:{{range $i, $cidr := .Cluster.spec.clusterNetwork.pods.cidrBlocks }} - cidr: {{ $cidr }} 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 + version: ${CALICO_VERSION} --- apiVersion: v1 data: diff --git a/templates/test/dev/cluster-template-custom-builds.yaml b/templates/test/dev/cluster-template-custom-builds.yaml index 44299c7ab59..ef7704a608a 100644 --- a/templates/test/dev/cluster-template-custom-builds.yaml +++ b/templates/test/dev/cluster-template-custom-builds.yaml @@ -566,6 +566,14 @@ spec: ipPools:{{range $i, $cidr := .Cluster.spec.clusterNetwork.pods.cidrBlocks }} - cidr: {{ $cidr }} 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 + version: ${CALICO_VERSION} --- apiVersion: v1 data: diff --git a/test/e2e/data/infrastructure-azure/v1beta1/bases/calico.yaml b/test/e2e/data/infrastructure-azure/v1beta1/bases/calico.yaml index 37d892a9a3b..ba19537703d 100644 --- a/test/e2e/data/infrastructure-azure/v1beta1/bases/calico.yaml +++ b/test/e2e/data/infrastructure-azure/v1beta1/bases/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}} \ No newline at end of file + 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 \ No newline at end of file diff --git a/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-kcp-remediation.yaml b/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-kcp-remediation.yaml index d40c934082f..0dc99e10b74 100644 --- a/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-kcp-remediation.yaml +++ b/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-kcp-remediation.yaml @@ -21,6 +21,14 @@ spec: ipPools:{{range $i, $cidr := .Cluster.spec.clusterNetwork.pods.cidrBlocks }} - cidr: {{ $cidr }} 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 + version: ${CALICO_VERSION} --- apiVersion: bootstrap.cluster.x-k8s.io/v1beta1 kind: KubeadmConfigTemplate diff --git a/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-kcp-remediation/kustomization.yaml b/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-kcp-remediation/kustomization.yaml index 48444fca35a..52e45be1f13 100644 --- a/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-kcp-remediation/kustomization.yaml +++ b/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-kcp-remediation/kustomization.yaml @@ -7,4 +7,4 @@ bases: patchesStrategicMerge: - ../patches/azurecluster-identity-ref.yaml - - ../patches/cluster-label.yaml + - ../patches/cluster-label-calico.yaml diff --git a/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-kcp-scale-in.yaml b/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-kcp-scale-in.yaml index a6277fdefe2..30eda5aae7c 100644 --- a/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-kcp-scale-in.yaml +++ b/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-kcp-scale-in.yaml @@ -21,6 +21,14 @@ spec: ipPools:{{range $i, $cidr := .Cluster.spec.clusterNetwork.pods.cidrBlocks }} - cidr: {{ $cidr }} 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 + version: ${CALICO_VERSION} --- apiVersion: bootstrap.cluster.x-k8s.io/v1beta1 kind: KubeadmConfigTemplate diff --git a/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-kcp-scale-in/kustomization.yaml b/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-kcp-scale-in/kustomization.yaml index 2cc8d75bdf4..54662455683 100644 --- a/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-kcp-scale-in/kustomization.yaml +++ b/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-kcp-scale-in/kustomization.yaml @@ -7,4 +7,4 @@ bases: patchesStrategicMerge: - ./cluster-with-kcp.yaml - ../patches/azurecluster-identity-ref.yaml -- ../patches/cluster-label.yaml +- ../patches/cluster-label-calico.yaml diff --git a/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-machine-pool.yaml b/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-machine-pool.yaml index 567c55b315d..594948ca941 100644 --- a/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-machine-pool.yaml +++ b/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-machine-pool.yaml @@ -21,6 +21,14 @@ spec: ipPools:{{range $i, $cidr := .Cluster.spec.clusterNetwork.pods.cidrBlocks }} - cidr: {{ $cidr }} 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 + version: ${CALICO_VERSION} --- apiVersion: bootstrap.cluster.x-k8s.io/v1beta1 kind: KubeadmConfig diff --git a/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-machine-pool/kustomization.yaml b/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-machine-pool/kustomization.yaml index 78ebcd78515..566770ccf02 100644 --- a/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-machine-pool/kustomization.yaml +++ b/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-machine-pool/kustomization.yaml @@ -6,4 +6,4 @@ resources: patchesStrategicMerge: - ../patches/azurecluster-identity-ref.yaml - - ../patches/cluster-label.yaml + - ../patches/cluster-label-calico.yaml diff --git a/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-md-remediation.yaml b/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-md-remediation.yaml index 1678cca0b9d..1c29569aa7d 100644 --- a/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-md-remediation.yaml +++ b/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-md-remediation.yaml @@ -21,6 +21,14 @@ spec: ipPools:{{range $i, $cidr := .Cluster.spec.clusterNetwork.pods.cidrBlocks }} - cidr: {{ $cidr }} 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 + version: ${CALICO_VERSION} --- apiVersion: bootstrap.cluster.x-k8s.io/v1beta1 kind: KubeadmConfigTemplate diff --git a/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-md-remediation/kustomization.yaml b/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-md-remediation/kustomization.yaml index 99e9d8f6b78..52219917bf3 100644 --- a/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-md-remediation/kustomization.yaml +++ b/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-md-remediation/kustomization.yaml @@ -8,4 +8,4 @@ bases: patchesStrategicMerge: - ./md.yaml - ../patches/azurecluster-identity-ref.yaml -- ../patches/cluster-label.yaml +- ../patches/cluster-label-calico.yaml diff --git a/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-node-drain.yaml b/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-node-drain.yaml index 0ef97a08fec..63e173f160b 100644 --- a/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-node-drain.yaml +++ b/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-node-drain.yaml @@ -21,6 +21,14 @@ spec: ipPools:{{range $i, $cidr := .Cluster.spec.clusterNetwork.pods.cidrBlocks }} - cidr: {{ $cidr }} 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 + version: ${CALICO_VERSION} --- apiVersion: bootstrap.cluster.x-k8s.io/v1beta1 kind: KubeadmConfigTemplate diff --git a/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-node-drain/kustomization.yaml b/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-node-drain/kustomization.yaml index f71e22d8a7e..23f1031e120 100644 --- a/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-node-drain/kustomization.yaml +++ b/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-node-drain/kustomization.yaml @@ -8,4 +8,4 @@ patchesStrategicMerge: - ./md.yaml - ./cluster-with-kcp.yaml - ../patches/azurecluster-identity-ref.yaml -- ../patches/cluster-label.yaml +- ../patches/cluster-label-calico.yaml diff --git a/test/e2e/data/infrastructure-azure/v1beta1/cluster-template.yaml b/test/e2e/data/infrastructure-azure/v1beta1/cluster-template.yaml index d17c420811b..6e25b06c1b0 100644 --- a/test/e2e/data/infrastructure-azure/v1beta1/cluster-template.yaml +++ b/test/e2e/data/infrastructure-azure/v1beta1/cluster-template.yaml @@ -21,6 +21,14 @@ spec: ipPools:{{range $i, $cidr := .Cluster.spec.clusterNetwork.pods.cidrBlocks }} - cidr: {{ $cidr }} 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 + version: ${CALICO_VERSION} --- apiVersion: bootstrap.cluster.x-k8s.io/v1beta1 kind: KubeadmConfigTemplate diff --git a/test/e2e/data/infrastructure-azure/v1beta1/cluster-template/kustomization.yaml b/test/e2e/data/infrastructure-azure/v1beta1/cluster-template/kustomization.yaml index 06fe17f1cde..a5808c06bf3 100644 --- a/test/e2e/data/infrastructure-azure/v1beta1/cluster-template/kustomization.yaml +++ b/test/e2e/data/infrastructure-azure/v1beta1/cluster-template/kustomization.yaml @@ -6,4 +6,4 @@ bases: patchesStrategicMerge: - ../patches/azurecluster-identity-ref.yaml -- ../patches/cluster-label.yaml +- ../patches/cluster-label-calico.yaml diff --git a/test/e2e/data/infrastructure-azure/v1beta1/patches/cluster-label.yaml b/test/e2e/data/infrastructure-azure/v1beta1/patches/cluster-label-calico.yaml similarity index 100% rename from test/e2e/data/infrastructure-azure/v1beta1/patches/cluster-label.yaml rename to test/e2e/data/infrastructure-azure/v1beta1/patches/cluster-label-calico.yaml