From 7e5b0986f31a92eba50588bec803062424c8bee3 Mon Sep 17 00:00:00 2001 From: Kevin Carter Date: Thu, 23 Jan 2025 12:39:03 -0600 Subject: [PATCH] Update images (#673) * faet: update the octavia image to stable Signed-off-by: Kevin Carter * feat: add skyline-rxt and cinder-rxt Signed-off-by: Kevin Carter * feat: sort the image list Signed-off-by: Kevin Carter --------- Signed-off-by: Kevin Carter --- .original-images.json | 14 +++++++------ .../octavia/octavia-helm-overrides.yaml | 10 ++++----- .../octavia/base/kustomization.yaml | 21 +------------------ 3 files changed, 14 insertions(+), 31 deletions(-) diff --git a/.original-images.json b/.original-images.json index 67837907..38993c69 100644 --- 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 index 861b14aa..e8e293da 100644 --- 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 index 175bc8b1..8b8269df 100644 --- 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