Update images (#673)

* faet: update the octavia image to stable Signed-off-by: Kevin Carter <kevin.carter@rackspace.com> * feat: add skyline-rxt and cinder-rxt Signed-off-by: Kevin Carter <kevin.carter@rackspace.com> * feat: sort the image list Signed-off-by: Kevin Carter <kevin.carter@rackspace.com> --------- Signed-off-by: Kevin Carter <kevin.carter@rackspace.com>
rackerlabs · Jan 23, 2025 · 7e5b098 · 7e5b098
1 parent e12e6a5
commit 7e5b098
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 31 deletions.
diff --git a/.original-images.json b/.original-images.json
@@ -1,11 +1,13 @@
 [
-  "ghcr.io/rackerlabs/genestack/heat:2024.1-ubuntu_jammy",
+  "docker.io/openstackhelm/barbican:2024.1-ubuntu_jammy",
+  "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_jammy",
+  "docker.io/openstackhelm/glance:2024.1-ubuntu_jammy",
   "docker.io/openstackhelm/magnum:2024.1-ubuntu_jammy",
+  "docker.io/openstackhelm/neutron:2024.1-ubuntu_jammy",
+  "ghcr.io/rackerlabs/genestack/cinder-volume-rxt:2024.1-ubuntu_jammy-1731085441",
+  "ghcr.io/rackerlabs/genestack/heat:2024.1-ubuntu_jammy",
+  "ghcr.io/rackerlabs/genestack/nova-efi:2024.1-ubuntu_jammy-1723129048",
   "ghcr.io/rackerlabs/genestack/octavia-ovn:2024.1-ubuntu_jammy-1737651745",
-  "docker.io/openstackhelm/glance:2024.1-ubuntu_jammy",
   "ghcr.io/rackerlabs/keystone-rxt:2024.1-ubuntu_jammy-1737483453",
-  "docker.io/openstackhelm/barbican:2024.1-ubuntu_jammy",
-  "ghcr.io/rackerlabs/genestack/nova-efi:2024.1-ubuntu_jammy-1723129048",
-  "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_jammy",
-  "docker.io/openstackhelm/neutron:2024.1-ubuntu_jammy"
+  "ghcr.io/rackerlabs/skyline-rxt:master-ubuntu_jammy-1730100728"
 ]
diff --git a/base-helm-configs/octavia/octavia-helm-overrides.yaml b/base-helm-configs/octavia/octavia-helm-overrides.yaml
@@ -30,11 +30,11 @@ images:
     ks_endpoints: "quay.io/rackspace/rackerlabs-heat:2024.1-ubuntu_jammy"
     dep_check: "quay.io/rackspace/rackerlabs-kubernetes-entrypoint:v1.0.0"
     image_repo_sync: "quay.io/rackspace/rackerlabs-docker:17.07.0"
-    octavia_db_sync: "quay.io/rackspace/rackerlabs-octavia-ovn:master-ubuntu_jammy"
-    octavia_api: "quay.io/rackspace/rackerlabs-octavia-ovn:master-ubuntu_jammy"
-    octavia_worker: "quay.io/rackspace/rackerlabs-octavia-ovn:master-ubuntu_jammy"
-    octavia_housekeeping: "quay.io/rackspace/rackerlabs-octavia-ovn:master-ubuntu_jammy"
-    octavia_health_manager: "quay.io/rackspace/rackerlabs-octavia-ovn:master-ubuntu_jammy"
+    octavia_db_sync: "quay.io/rackspace/rackerlabs-octavia-ovn:2024.1-ubuntu_jammy-1737651745"
+    octavia_api: "quay.io/rackspace/rackerlabs-octavia-ovn:2024.1-ubuntu_jammy-1737651745"
+    octavia_worker: "quay.io/rackspace/rackerlabs-octavia-ovn:2024.1-ubuntu_jammy-1737651745"
+    octavia_housekeeping: "quay.io/rackspace/rackerlabs-octavia-ovn:2024.1-ubuntu_jammy-1737651745"
+    octavia_health_manager: "quay.io/rackspace/rackerlabs-octavia-ovn:2024.1-ubuntu_jammy-1737651745"
     octavia_health_manager_init: "quay.io/rackspace/rackerlabs-heat:2024.1-ubuntu_jammy"
     openvswitch_vswitchd: docker.io/kolla/centos-source-openvswitch-vswitchd:rocky
   pull_policy: "IfNotPresent"

diff --git a/base-kustomize/octavia/base/kustomization.yaml b/base-kustomize/octavia/base/kustomization.yaml
@@ -7,7 +7,7 @@ images:
     newTag: v1.0.0
   - name: image-octavia-ovn
     newName: quay.io/rackspace/rackerlabs-octavia-ovn
-    newTag: master-ubuntu_jammy
+    newTag: 2024.1-ubuntu_jammy-1737651745
 
 resources:
   - octavia-mariadb-database.yaml
@@ -35,25 +35,6 @@ patches:
             - octavia-driver-agent
             - --config-dir
             - /etc/octavia/octavia.conf
-          lifecycle:
-            preStop:
-              exec:
-                command:
-                  - /tmp/octavia-api.sh
-                  - stop
-          ports:
-            - name: o-api
-              containerPort: 9876
-          readinessProbe:
-            httpGet:
-              scheme: HTTP
-              path: /
-              port: 9876
-          livenessProbe:
-            httpGet:
-              scheme: HTTP
-              path: /
-              port: 9876
           volumeMounts:
             - name: pod-etc-octavia
               mountPath: /etc/octavia