Skip to content

Commit 4f0cc5e

Browse files
Merge pull request #2158 from karelyatin/barbican_sync
[barbican] Update RELATED_IMAGE env var
2 parents 6cc8c4f + 6db21ed commit 4f0cc5e

3 files changed

Lines changed: 6 additions & 5 deletions

File tree

‎config/operator/default_images.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ spec:
1919
value: quay.io/openstack-s2i-containers/openstack-aodh-api:master-latest
2020
- name: RELATED_IMAGE_APACHE_IMAGE_URL_DEFAULT
2121
value: registry.redhat.io/ubi10/httpd-24:latest
22-
- name: RELATED_IMAGE_BARBICAN_API_IMAGE_URL_DEFAULT
22+
- name: RELATED_IMAGE_BARBICAN_IMAGE_URL_DEFAULT
2323
value: quay.io/openstack-s2i-containers/openstack-barbican-api:master-latest
2424
- name: RELATED_IMAGE_CEILOMETER_CENTRAL_IMAGE_URL_DEFAULT
2525
value: quay.io/openstack-s2i-containers/openstack-ceilometer-central:master-latest

‎hack/export_related_images.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ export RELATED_IMAGE_DESIGNATE_CENTRAL_IMAGE_URL_DEFAULT=quay.io/openstack-s2i-c
6060
export RELATED_IMAGE_DESIGNATE_WORKER_IMAGE_URL_DEFAULT=quay.io/openstack-s2i-containers/openstack-designate-worker:master-latest
6161
export RELATED_IMAGE_DESIGNATE_BACKENDBIND9_IMAGE_URL_DEFAULT=quay.io/openstack-s2i-containers/openstack-designate-backend-bind9:master-latest
6262
export RELATED_IMAGE_DESIGNATE_UNBOUND_IMAGE_URL_DEFAULT=quay.io/openstack-s2i-containers/openstack-unbound:master-latest
63-
export RELATED_IMAGE_BARBICAN_API_IMAGE_URL_DEFAULT=quay.io/openstack-s2i-containers/openstack-barbican-api:master-latest
63+
export RELATED_IMAGE_BARBICAN_IMAGE_URL_DEFAULT=quay.io/openstack-s2i-containers/openstack-barbican-api:master-latest
6464
export RELATED_IMAGE_EDPM_FRR_IMAGE_URL_DEFAULT=quay.io/openstack-s2i-containers/openstack-frr:master-latest
6565
export RELATED_IMAGE_EDPM_NEUTRON_DHCP_AGENT_IMAGE_URL_DEFAULT=quay.io/openstack-s2i-containers/openstack-neutron-dhcp-agent:master-latest
6666
export RELATED_IMAGE_EDPM_NEUTRON_METADATA_AGENT_IMAGE_URL_DEFAULT=quay.io/openstack-s2i-containers/openstack-neutron-metadata-agent-ovn:master-latest

‎internal/openstack/version.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,10 @@ func InitializeOpenStackVersionImageDefaults(ctx context.Context, envImages map[
7676
defaults.AodhListenerImage = envImages["RELATED_IMAGE_AODH_API_IMAGE_URL_DEFAULT"]
7777
defaults.AodhNotifierImage = envImages["RELATED_IMAGE_AODH_API_IMAGE_URL_DEFAULT"]
7878
}
79-
if envImages["RELATED_IMAGE_BARBICAN_API_IMAGE_URL_DEFAULT"] != nil {
80-
defaults.BarbicanKeystoneListenerImage = envImages["RELATED_IMAGE_BARBICAN_API_IMAGE_URL_DEFAULT"]
81-
defaults.BarbicanWorkerImage = envImages["RELATED_IMAGE_BARBICAN_API_IMAGE_URL_DEFAULT"]
79+
if envImages["RELATED_IMAGE_BARBICAN_IMAGE_URL_DEFAULT"] != nil {
80+
defaults.BarbicanAPIImage = envImages["RELATED_IMAGE_BARBICAN_IMAGE_URL_DEFAULT"]
81+
defaults.BarbicanKeystoneListenerImage = envImages["RELATED_IMAGE_BARBICAN_IMAGE_URL_DEFAULT"]
82+
defaults.BarbicanWorkerImage = envImages["RELATED_IMAGE_BARBICAN_IMAGE_URL_DEFAULT"]
8283
}
8384
if envImages["RELATED_IMAGE_CEILOMETER_CENTRAL_IMAGE_URL_DEFAULT"] != nil {
8485
defaults.CeilometerNotificationImage = envImages["RELATED_IMAGE_CEILOMETER_CENTRAL_IMAGE_URL_DEFAULT"]

0 commit comments

Comments
 (0)