Merge pull request #9267 from radTuti/cp-gen-manifest-v3.27

[cherry-pick] [v3.27] fix manifest generation
projectcalico · Sep 24, 2024 · e15aecc · e15aecc
2 parents fdb7b89 + b320f0d
commit e15aecc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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

diff --git 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"