diff --git a/api/bases/core.openstack.org_openstackcontrolplanes.yaml b/api/bases/core.openstack.org_openstackcontrolplanes.yaml index facf80a00..55adfa53e 100644 --- a/api/bases/core.openstack.org_openstackcontrolplanes.yaml +++ b/api/bases/core.openstack.org_openstackcontrolplanes.yaml @@ -21099,6 +21099,8 @@ spec: type: string infraRedisImage: type: string + instanceHaImage: + type: string ironicAPIImage: type: string ironicConductorImage: diff --git a/api/bases/core.openstack.org_openstackversions.yaml b/api/bases/core.openstack.org_openstackversions.yaml index beb521d20..71f415c48 100644 --- a/api/bases/core.openstack.org_openstackversions.yaml +++ b/api/bases/core.openstack.org_openstackversions.yaml @@ -147,6 +147,8 @@ spec: type: string infraRedisImage: type: string + instanceHaImage: + type: string ironicAPIImage: type: string ironicConductorImage: @@ -389,6 +391,8 @@ spec: type: string infraRedisImage: type: string + instanceHaImage: + type: string ironicAPIImage: type: string ironicConductorImage: @@ -589,6 +593,8 @@ spec: type: string infraRedisImage: type: string + instanceHaImage: + type: string ironicAPIImage: type: string ironicConductorImage: @@ -807,6 +813,8 @@ spec: type: string infraRedisImage: type: string + instanceHaImage: + type: string ironicAPIImage: type: string ironicConductorImage: diff --git a/api/core/v1beta1/openstackversion_types.go b/api/core/v1beta1/openstackversion_types.go index fea75a03f..318e2f011 100644 --- a/api/core/v1beta1/openstackversion_types.go +++ b/api/core/v1beta1/openstackversion_types.go @@ -130,6 +130,7 @@ type ContainerTemplate struct { InfraDnsmasqImage *string `json:"infraDnsmasqImage,omitempty"` InfraMemcachedImage *string `json:"infraMemcachedImage,omitempty"` InfraRedisImage *string `json:"infraRedisImage,omitempty"` + InstanceHaImage *string `json:"instanceHaImage,omitempty"` IronicAPIImage *string `json:"ironicAPIImage,omitempty"` IronicConductorImage *string `json:"ironicConductorImage,omitempty"` IronicInspectorImage *string `json:"ironicInspectorImage,omitempty"` diff --git a/api/core/v1beta1/zz_generated.deepcopy.go b/api/core/v1beta1/zz_generated.deepcopy.go index 94cd7761c..dd79ebb1b 100644 --- a/api/core/v1beta1/zz_generated.deepcopy.go +++ b/api/core/v1beta1/zz_generated.deepcopy.go @@ -567,6 +567,11 @@ func (in *ContainerTemplate) DeepCopyInto(out *ContainerTemplate) { *out = new(string) **out = **in } + if in.InstanceHaImage != nil { + in, out := &in.InstanceHaImage, &out.InstanceHaImage + *out = new(string) + **out = **in + } if in.IronicAPIImage != nil { in, out := &in.IronicAPIImage, &out.IronicAPIImage *out = new(string) diff --git a/bindata/crds/crds.yaml b/bindata/crds/crds.yaml index f376dbe06..86355c323 100644 --- a/bindata/crds/crds.yaml +++ b/bindata/crds/crds.yaml @@ -21633,6 +21633,8 @@ spec: type: string infraRedisImage: type: string + instanceHaImage: + type: string ironicAPIImage: type: string ironicConductorImage: @@ -24551,6 +24553,8 @@ spec: type: string infraRedisImage: type: string + instanceHaImage: + type: string ironicAPIImage: type: string ironicConductorImage: @@ -24793,6 +24797,8 @@ spec: type: string infraRedisImage: type: string + instanceHaImage: + type: string ironicAPIImage: type: string ironicConductorImage: @@ -24993,6 +24999,8 @@ spec: type: string infraRedisImage: type: string + instanceHaImage: + type: string ironicAPIImage: type: string ironicConductorImage: @@ -25211,6 +25219,8 @@ spec: type: string infraRedisImage: type: string + instanceHaImage: + type: string ironicAPIImage: type: string ironicConductorImage: diff --git a/config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml b/config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml index facf80a00..55adfa53e 100644 --- a/config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml +++ b/config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml @@ -21099,6 +21099,8 @@ spec: type: string infraRedisImage: type: string + instanceHaImage: + type: string ironicAPIImage: type: string ironicConductorImage: diff --git a/config/crd/bases/core.openstack.org_openstackversions.yaml b/config/crd/bases/core.openstack.org_openstackversions.yaml index beb521d20..71f415c48 100644 --- a/config/crd/bases/core.openstack.org_openstackversions.yaml +++ b/config/crd/bases/core.openstack.org_openstackversions.yaml @@ -147,6 +147,8 @@ spec: type: string infraRedisImage: type: string + instanceHaImage: + type: string ironicAPIImage: type: string ironicConductorImage: @@ -389,6 +391,8 @@ spec: type: string infraRedisImage: type: string + instanceHaImage: + type: string ironicAPIImage: type: string ironicConductorImage: @@ -589,6 +593,8 @@ spec: type: string infraRedisImage: type: string + instanceHaImage: + type: string ironicAPIImage: type: string ironicConductorImage: @@ -807,6 +813,8 @@ spec: type: string infraRedisImage: type: string + instanceHaImage: + type: string ironicAPIImage: type: string ironicConductorImage: diff --git a/config/operator/default_images.yaml b/config/operator/default_images.yaml index 198412fb6..a7d2262f4 100644 --- a/config/operator/default_images.yaml +++ b/config/operator/default_images.yaml @@ -107,6 +107,8 @@ spec: value: quay.io/podified-antelope-centos9/openstack-memcached:current-podified - name: RELATED_IMAGE_INFRA_REDIS_IMAGE_URL_DEFAULT value: quay.io/podified-antelope-centos9/openstack-redis:current-podified + - name: RELATED_IMAGE_INSTANCE_HA_IMAGE_URL_DEFAULT + value: quay.io/podified-antelope-centos9/openstack-openstackclient:current-podified - name: RELATED_IMAGE_IRONIC_API_IMAGE_URL_DEFAULT value: quay.io/podified-antelope-centos9/openstack-ironic-api:current-podified - name: RELATED_IMAGE_IRONIC_CONDUCTOR_IMAGE_URL_DEFAULT diff --git a/hack/export_related_images.sh b/hack/export_related_images.sh index e3ef5be8b..a962858c2 100755 --- a/hack/export_related_images.sh +++ b/hack/export_related_images.sh @@ -18,6 +18,7 @@ export RELATED_IMAGE_MANILA_API_IMAGE_URL_DEFAULT=quay.io/podified-antelope-cent export RELATED_IMAGE_MANILA_SCHEDULER_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-manila-scheduler:current-podified export RELATED_IMAGE_MANILA_SHARE_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-manila-share:current-podified export RELATED_IMAGE_GLANCE_API_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-glance-api:current-podified +export RELATED_IMAGE_INSTANCE_HA_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-openstackclient:current-podified export RELATED_IMAGE_IRONIC_API_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-ironic-api:current-podified export RELATED_IMAGE_IRONIC_CONDUCTOR_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-ironic-conductor:current-podified export RELATED_IMAGE_IRONIC_INSPECTOR_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-ironic-inspector:current-podified diff --git a/internal/openstack/instanceha.go b/internal/openstack/instanceha.go index 3ac3d3f83..72c1728ea 100644 --- a/internal/openstack/instanceha.go +++ b/internal/openstack/instanceha.go @@ -46,7 +46,7 @@ func ReconcileInstanceHa(ctx context.Context, instance *corev1beta1.OpenStackCon } customData := map[string]string{ - InstanceHaImageKey: *getImg(version.Status.ContainerImages.OpenstackClientImage, &missingImageDefault), + InstanceHaImageKey: *getImg(version.Status.ContainerImages.InstanceHaImage, &missingImageDefault), } cms := []util.Template{ diff --git a/internal/openstack/version.go b/internal/openstack/version.go index 5fb3e8bb2..52de93b2c 100644 --- a/internal/openstack/version.go +++ b/internal/openstack/version.go @@ -165,6 +165,7 @@ func GetContainerImages(defaults *corev1beta1.ContainerDefaults, instance corev1 InfraDnsmasqImage: getImg(instance.Spec.CustomContainerImages.InfraDnsmasqImage, defaults.InfraDnsmasqImage), InfraMemcachedImage: getImg(instance.Spec.CustomContainerImages.InfraMemcachedImage, defaults.InfraMemcachedImage), InfraRedisImage: getImg(instance.Spec.CustomContainerImages.InfraRedisImage, defaults.InfraRedisImage), + InstanceHaImage: getImg(instance.Spec.CustomContainerImages.InstanceHaImage, defaults.InstanceHaImage), IronicAPIImage: getImg(instance.Spec.CustomContainerImages.IronicAPIImage, defaults.IronicAPIImage), IronicConductorImage: getImg(instance.Spec.CustomContainerImages.IronicConductorImage, defaults.IronicConductorImage), IronicInspectorImage: getImg(instance.Spec.CustomContainerImages.IronicInspectorImage, defaults.IronicInspectorImage),