From c6c94898505bf7688fbf9c81cd79da22d6acfb76 Mon Sep 17 00:00:00 2001 From: tuti Date: Fri, 20 Sep 2024 09:48:51 -0700 Subject: [PATCH 1/2] fix manifest generation --- manifests/generate.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/generate.sh b/manifests/generate.sh index 62f940ae18a..72f36fb2eb1 100755 --- a/manifests/generate.sh +++ b/manifests/generate.sh @@ -14,7 +14,7 @@ CALICO_VERSION=${CALICO_VERSION:-$defaultCalicoVersion} defaultOperatorVersion=$(cat ../charts/tigera-operator/values.yaml | grep version: | cut -d" " -f4) OPERATOR_VERSION=${OPERATOR_VERSION:-$defaultOperatorVersion} -NON_HELM_MANIFEST_IMAGES="calico/apiserver calico/windows calico/ctl calico/csi calico/node-driver-registrar calico/dikastes" +NON_HELM_MANIFEST_IMAGES="calico/apiserver calico/windows calico/ctl calico/csi calico/node-driver-registrar calico/dikastes calico/flannel-migration-controller" echo "Generating manifests for Calico=$CALICO_VERSION and tigera-operator=$OPERATOR_VERSION" From b320f0df26517bcc3c976efd996cfda7e9dff59e Mon Sep 17 00:00:00 2001 From: tuti Date: Fri, 20 Sep 2024 12:45:00 -0700 Subject: [PATCH 2/2] update manifest image --- manifests/flannel-migration/migration-job.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/flannel-migration/migration-job.yaml b/manifests/flannel-migration/migration-job.yaml index 8574185fe43..aa3526e8a47 100644 --- a/manifests/flannel-migration/migration-job.yaml +++ b/manifests/flannel-migration/migration-job.yaml @@ -150,7 +150,7 @@ spec: restartPolicy: OnFailure containers: - name: flannel-migration-controller - image: calico/flannel-migration-controller:master + image: calico/flannel-migration-controller:v3.27.4 env: # Choose which controllers to run. - name: ENABLED_CONTROLLERS