Skip to content

Commit 3bf4d88

Browse files
4383claude
4383
and
claude
committed
Add dedicated RELATED_IMAGE for instanceha instead of reusing openstackclient
Instanceha pods were using OpenstackClientImage, which prevented OLM from independently overriding the instanceha container image for RHOSO deployments. This adds a dedicated RELATED_IMAGE_INSTANCE_HA_IMAGE_URL_DEFAULT env var and InstanceHaImage field so instanceha can be configured separately. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent 788b8c9 commit 3bf4d88

11 files changed

Lines changed: 41 additions & 1 deletion

‎api/bases/core.openstack.org_openstackcontrolplanes.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21099,6 +21099,8 @@ spec:
2109921099
type: string
2110021100
infraRedisImage:
2110121101
type: string
21102+
instanceHaImage:
21103+
type: string
2110221104
ironicAPIImage:
2110321105
type: string
2110421106
ironicConductorImage:

‎api/bases/core.openstack.org_openstackversions.yaml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,8 @@ spec:
147147
type: string
148148
infraRedisImage:
149149
type: string
150+
instanceHaImage:
151+
type: string
150152
ironicAPIImage:
151153
type: string
152154
ironicConductorImage:
@@ -389,6 +391,8 @@ spec:
389391
type: string
390392
infraRedisImage:
391393
type: string
394+
instanceHaImage:
395+
type: string
392396
ironicAPIImage:
393397
type: string
394398
ironicConductorImage:
@@ -589,6 +593,8 @@ spec:
589593
type: string
590594
infraRedisImage:
591595
type: string
596+
instanceHaImage:
597+
type: string
592598
ironicAPIImage:
593599
type: string
594600
ironicConductorImage:
@@ -807,6 +813,8 @@ spec:
807813
type: string
808814
infraRedisImage:
809815
type: string
816+
instanceHaImage:
817+
type: string
810818
ironicAPIImage:
811819
type: string
812820
ironicConductorImage:

‎api/core/v1beta1/openstackversion_types.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ type ContainerTemplate struct {
130130
InfraDnsmasqImage *string `json:"infraDnsmasqImage,omitempty"`
131131
InfraMemcachedImage *string `json:"infraMemcachedImage,omitempty"`
132132
InfraRedisImage *string `json:"infraRedisImage,omitempty"`
133+
InstanceHaImage *string `json:"instanceHaImage,omitempty"`
133134
IronicAPIImage *string `json:"ironicAPIImage,omitempty"`
134135
IronicConductorImage *string `json:"ironicConductorImage,omitempty"`
135136
IronicInspectorImage *string `json:"ironicInspectorImage,omitempty"`

‎api/core/v1beta1/zz_generated.deepcopy.go‎

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎bindata/crds/crds.yaml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21633,6 +21633,8 @@ spec:
2163321633
type: string
2163421634
infraRedisImage:
2163521635
type: string
21636+
instanceHaImage:
21637+
type: string
2163621638
ironicAPIImage:
2163721639
type: string
2163821640
ironicConductorImage:
@@ -24551,6 +24553,8 @@ spec:
2455124553
type: string
2455224554
infraRedisImage:
2455324555
type: string
24556+
instanceHaImage:
24557+
type: string
2455424558
ironicAPIImage:
2455524559
type: string
2455624560
ironicConductorImage:
@@ -24793,6 +24797,8 @@ spec:
2479324797
type: string
2479424798
infraRedisImage:
2479524799
type: string
24800+
instanceHaImage:
24801+
type: string
2479624802
ironicAPIImage:
2479724803
type: string
2479824804
ironicConductorImage:
@@ -24993,6 +24999,8 @@ spec:
2499324999
type: string
2499425000
infraRedisImage:
2499525001
type: string
25002+
instanceHaImage:
25003+
type: string
2499625004
ironicAPIImage:
2499725005
type: string
2499825006
ironicConductorImage:
@@ -25211,6 +25219,8 @@ spec:
2521125219
type: string
2521225220
infraRedisImage:
2521325221
type: string
25222+
instanceHaImage:
25223+
type: string
2521425224
ironicAPIImage:
2521525225
type: string
2521625226
ironicConductorImage:

‎config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21099,6 +21099,8 @@ spec:
2109921099
type: string
2110021100
infraRedisImage:
2110121101
type: string
21102+
instanceHaImage:
21103+
type: string
2110221104
ironicAPIImage:
2110321105
type: string
2110421106
ironicConductorImage:

‎config/crd/bases/core.openstack.org_openstackversions.yaml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,8 @@ spec:
147147
type: string
148148
infraRedisImage:
149149
type: string
150+
instanceHaImage:
151+
type: string
150152
ironicAPIImage:
151153
type: string
152154
ironicConductorImage:
@@ -389,6 +391,8 @@ spec:
389391
type: string
390392
infraRedisImage:
391393
type: string
394+
instanceHaImage:
395+
type: string
392396
ironicAPIImage:
393397
type: string
394398
ironicConductorImage:
@@ -589,6 +593,8 @@ spec:
589593
type: string
590594
infraRedisImage:
591595
type: string
596+
instanceHaImage:
597+
type: string
592598
ironicAPIImage:
593599
type: string
594600
ironicConductorImage:
@@ -807,6 +813,8 @@ spec:
807813
type: string
808814
infraRedisImage:
809815
type: string
816+
instanceHaImage:
817+
type: string
810818
ironicAPIImage:
811819
type: string
812820
ironicConductorImage:

‎config/operator/default_images.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,8 @@ spec:
107107
value: quay.io/podified-antelope-centos9/openstack-memcached:current-podified
108108
- name: RELATED_IMAGE_INFRA_REDIS_IMAGE_URL_DEFAULT
109109
value: quay.io/podified-antelope-centos9/openstack-redis:current-podified
110+
- name: RELATED_IMAGE_INSTANCE_HA_IMAGE_URL_DEFAULT
111+
value: quay.io/podified-antelope-centos9/openstack-openstackclient:current-podified
110112
- name: RELATED_IMAGE_IRONIC_API_IMAGE_URL_DEFAULT
111113
value: quay.io/podified-antelope-centos9/openstack-ironic-api:current-podified
112114
- name: RELATED_IMAGE_IRONIC_CONDUCTOR_IMAGE_URL_DEFAULT

‎hack/export_related_images.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ export RELATED_IMAGE_MANILA_API_IMAGE_URL_DEFAULT=quay.io/podified-antelope-cent
1818
export RELATED_IMAGE_MANILA_SCHEDULER_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-manila-scheduler:current-podified
1919
export RELATED_IMAGE_MANILA_SHARE_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-manila-share:current-podified
2020
export RELATED_IMAGE_GLANCE_API_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-glance-api:current-podified
21+
export RELATED_IMAGE_INSTANCE_HA_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-openstackclient:current-podified
2122
export RELATED_IMAGE_IRONIC_API_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-ironic-api:current-podified
2223
export RELATED_IMAGE_IRONIC_CONDUCTOR_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-ironic-conductor:current-podified
2324
export RELATED_IMAGE_IRONIC_INSPECTOR_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-ironic-inspector:current-podified

‎internal/openstack/instanceha.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ func ReconcileInstanceHa(ctx context.Context, instance *corev1beta1.OpenStackCon
4646
}
4747

4848
customData := map[string]string{
49-
InstanceHaImageKey: *getImg(version.Status.ContainerImages.OpenstackClientImage, &missingImageDefault),
49+
InstanceHaImageKey: *getImg(version.Status.ContainerImages.InstanceHaImage, &missingImageDefault),
5050
}
5151

5252
cms := []util.Template{

0 commit comments

Comments
 (0)