Merge pull request #1587 from Nordix/pin-ironic-release-release-0.4/s…

…unnat 🌱 Harden release-0.4 against ironic inspector removal
metal3-io · Mar 5, 2024 · e92d770 · e92d770
2 parents 70bc937 + 6d33ec5
commit e92d770
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 7 deletions.
diff --git a/config/default/ironic.env b/config/default/ironic.env
@@ -7,3 +7,4 @@ IRONIC_ENDPOINT=http://172.22.0.2:6385/v1/
 IRONIC_INSPECTOR_ENDPOINT=http://172.22.0.2:5050/v1/
 CACHEURL=http://172.22.0.1/images
 IRONIC_FAST_TRACK=true
+USE_IRONIC_INSPECTOR=true
diff --git a/config/render/capm3.yaml b/config/render/capm3.yaml
@@ -2124,6 +2124,7 @@ data:
   IRONIC_FAST_TRACK: "true"
   IRONIC_INSPECTOR_ENDPOINT: http://172.22.0.2:5050/v1/
   PROVISIONING_INTERFACE: eth2
+  USE_IRONIC_INSPECTOR: "true"
 kind: ConfigMap
 metadata:
   name: baremetal-operator-ironic

diff --git a/hack/ironic_ci.env b/hack/ironic_ci.env
@@ -7,4 +7,5 @@ DEPLOY_RAMDISK_URL=http://172.22.0.2:6180/images/ironic-python-agent.initramfs
 IRONIC_ENDPOINT=http://172.22.0.2:6385/v1/
 IRONIC_INSPECTOR_ENDPOINT=http://172.22.0.2:5050/v1/
 CACHEURL=http://172.22.0.1/images
-IRONIC_FAST_TRACK=true
+IRONIC_FAST_TRACK=true
+USE_IRONIC_INSPECTOR=true
diff --git a/ironic-deployment/base/ironic.yaml b/ironic-deployment/base/ironic.yaml
@@ -20,7 +20,7 @@ spec:
       hostNetwork: true
       containers:
       - name: ironic-dnsmasq
-        image: quay.io/metal3-io/ironic
+        image: quay.io/metal3-io/ironic:release-23.1
         imagePullPolicy: Always
         securityContext:
           # Must be true so dnsmasq may get the capabilities via file caps
@@ -61,7 +61,7 @@ spec:
         - configMapRef:
             name: ironic-bmo-configmap
       - name: ironic
-        image: quay.io/metal3-io/ironic
+        image: quay.io/metal3-io/ironic:release-23.1
         imagePullPolicy: Always
         command:
         - /bin/runironic
@@ -96,7 +96,7 @@ spec:
           runAsUser: 997 # ironic
           runAsGroup: 994 # ironic
       - name: ironic-log-watch
-        image: quay.io/metal3-io/ironic
+        image: quay.io/metal3-io/ironic:release-23.1
         imagePullPolicy: Always
         command:
         - /bin/runlogwatch.sh
@@ -112,7 +112,7 @@ spec:
           runAsUser: 997 # ironic
           runAsGroup: 994 # ironic
       - name: ironic-inspector
-        image: quay.io/metal3-io/ironic
+        image: quay.io/metal3-io/ironic:release-23.1
         imagePullPolicy: Always
         readinessProbe:
           exec:
@@ -144,7 +144,7 @@ spec:
           runAsUser: 996 # ironic-inspector
           runAsGroup: 993 # ironicinspector
       - name: ironic-httpd
-        image: quay.io/metal3-io/ironic
+        image: quay.io/metal3-io/ironic:release-23.1
         imagePullPolicy: Always
         command:
         - /bin/runhttpd

diff --git a/ironic-deployment/components/keepalived/ironic_bmo_configmap.env b/ironic-deployment/components/keepalived/ironic_bmo_configmap.env
@@ -9,3 +9,4 @@ IRONIC_INSPECTOR_ENDPOINT=http://172.22.0.2:5050/v1/
 CACHEURL=http://172.22.0.1/images
 IRONIC_FAST_TRACK=true
 IRONIC_KERNEL_PARAMS=console=ttyS0
+USE_IRONIC_INSPECTOR=true
diff --git a/ironic-deployment/default/ironic_bmo_configmap.env b/ironic-deployment/default/ironic_bmo_configmap.env
@@ -9,3 +9,4 @@ CACHEURL=http://172.22.0.1/images
 IRONIC_FAST_TRACK=true
 IRONIC_KERNEL_PARAMS=console=ttyS0
 IRONIC_INSPECTOR_VLAN_INTERFACES=all
+USE_IRONIC_INSPECTOR=true
diff --git a/tools/run_local_ironic.sh b/tools/run_local_ironic.sh
@@ -4,7 +4,7 @@ set -ex
 
 SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd )"
 
-IRONIC_IMAGE=${IRONIC_IMAGE:-"quay.io/metal3-io/ironic:main"}
+IRONIC_IMAGE=${IRONIC_IMAGE:-"quay.io/metal3-io/ironic:release-23.1"}
 IRONIC_KEEPALIVED_IMAGE=${IRONIC_KEEPALIVED_IMAGE:-"quay.io/metal3-io/keepalived"}
 IPA_DOWNLOADER_IMAGE=${IPA_DOWNLOADER_IMAGE:-"quay.io/metal3-io/ironic-ipa-downloader:main"}
 MARIADB_IMAGE=${MARIADB_IMAGE:-"quay.io/metal3-io/mariadb:main"}