Skip to content

Commit 7e5b098

Browse files
authored
Update images (#673)
* faet: update the octavia image to stable Signed-off-by: Kevin Carter <[email protected]> * feat: add skyline-rxt and cinder-rxt Signed-off-by: Kevin Carter <[email protected]> * feat: sort the image list Signed-off-by: Kevin Carter <[email protected]> --------- Signed-off-by: Kevin Carter <[email protected]>
1 parent e12e6a5 commit 7e5b098

File tree

3 files changed

+14
-31
lines changed

3 files changed

+14
-31
lines changed

Diff for: .original-images.json

+8-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
[
2-
"ghcr.io/rackerlabs/genestack/heat:2024.1-ubuntu_jammy",
2+
"docker.io/openstackhelm/barbican:2024.1-ubuntu_jammy",
3+
"docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_jammy",
4+
"docker.io/openstackhelm/glance:2024.1-ubuntu_jammy",
35
"docker.io/openstackhelm/magnum:2024.1-ubuntu_jammy",
6+
"docker.io/openstackhelm/neutron:2024.1-ubuntu_jammy",
7+
"ghcr.io/rackerlabs/genestack/cinder-volume-rxt:2024.1-ubuntu_jammy-1731085441",
8+
"ghcr.io/rackerlabs/genestack/heat:2024.1-ubuntu_jammy",
9+
"ghcr.io/rackerlabs/genestack/nova-efi:2024.1-ubuntu_jammy-1723129048",
410
"ghcr.io/rackerlabs/genestack/octavia-ovn:2024.1-ubuntu_jammy-1737651745",
5-
"docker.io/openstackhelm/glance:2024.1-ubuntu_jammy",
611
"ghcr.io/rackerlabs/keystone-rxt:2024.1-ubuntu_jammy-1737483453",
7-
"docker.io/openstackhelm/barbican:2024.1-ubuntu_jammy",
8-
"ghcr.io/rackerlabs/genestack/nova-efi:2024.1-ubuntu_jammy-1723129048",
9-
"docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_jammy",
10-
"docker.io/openstackhelm/neutron:2024.1-ubuntu_jammy"
12+
"ghcr.io/rackerlabs/skyline-rxt:master-ubuntu_jammy-1730100728"
1113
]

Diff for: base-helm-configs/octavia/octavia-helm-overrides.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ images:
3030
ks_endpoints: "quay.io/rackspace/rackerlabs-heat:2024.1-ubuntu_jammy"
3131
dep_check: "quay.io/rackspace/rackerlabs-kubernetes-entrypoint:v1.0.0"
3232
image_repo_sync: "quay.io/rackspace/rackerlabs-docker:17.07.0"
33-
octavia_db_sync: "quay.io/rackspace/rackerlabs-octavia-ovn:master-ubuntu_jammy"
34-
octavia_api: "quay.io/rackspace/rackerlabs-octavia-ovn:master-ubuntu_jammy"
35-
octavia_worker: "quay.io/rackspace/rackerlabs-octavia-ovn:master-ubuntu_jammy"
36-
octavia_housekeeping: "quay.io/rackspace/rackerlabs-octavia-ovn:master-ubuntu_jammy"
37-
octavia_health_manager: "quay.io/rackspace/rackerlabs-octavia-ovn:master-ubuntu_jammy"
33+
octavia_db_sync: "quay.io/rackspace/rackerlabs-octavia-ovn:2024.1-ubuntu_jammy-1737651745"
34+
octavia_api: "quay.io/rackspace/rackerlabs-octavia-ovn:2024.1-ubuntu_jammy-1737651745"
35+
octavia_worker: "quay.io/rackspace/rackerlabs-octavia-ovn:2024.1-ubuntu_jammy-1737651745"
36+
octavia_housekeeping: "quay.io/rackspace/rackerlabs-octavia-ovn:2024.1-ubuntu_jammy-1737651745"
37+
octavia_health_manager: "quay.io/rackspace/rackerlabs-octavia-ovn:2024.1-ubuntu_jammy-1737651745"
3838
octavia_health_manager_init: "quay.io/rackspace/rackerlabs-heat:2024.1-ubuntu_jammy"
3939
openvswitch_vswitchd: docker.io/kolla/centos-source-openvswitch-vswitchd:rocky
4040
pull_policy: "IfNotPresent"

Diff for: base-kustomize/octavia/base/kustomization.yaml

+1-20
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ images:
77
newTag: v1.0.0
88
- name: image-octavia-ovn
99
newName: quay.io/rackspace/rackerlabs-octavia-ovn
10-
newTag: master-ubuntu_jammy
10+
newTag: 2024.1-ubuntu_jammy-1737651745
1111

1212
resources:
1313
- octavia-mariadb-database.yaml
@@ -35,25 +35,6 @@ patches:
3535
- octavia-driver-agent
3636
- --config-dir
3737
- /etc/octavia/octavia.conf
38-
lifecycle:
39-
preStop:
40-
exec:
41-
command:
42-
- /tmp/octavia-api.sh
43-
- stop
44-
ports:
45-
- name: o-api
46-
containerPort: 9876
47-
readinessProbe:
48-
httpGet:
49-
scheme: HTTP
50-
path: /
51-
port: 9876
52-
livenessProbe:
53-
httpGet:
54-
scheme: HTTP
55-
path: /
56-
port: 9876
5738
volumeMounts:
5839
- name: pod-etc-octavia
5940
mountPath: /etc/octavia

0 commit comments

Comments
 (0)