Merge pull request openstack-k8s-operators#1150 from lmiccini/reuseimage

Reuse OpenstackClientImage instead of dedicated InstanceHaImage
fao89 · Oct 22, 2024 · ec7210b · ec7210b
2 parents 81e16fe + ad059d4
commit ec7210b
Show file tree

Hide file tree

Showing 10 changed files with 1 addition and 27 deletions.
diff --git a/apis/bases/core.openstack.org_openstackcontrolplanes.yaml b/apis/bases/core.openstack.org_openstackcontrolplanes.yaml
@@ -18373,8 +18373,6 @@ spec:
                     type: string
                   infraDnsmasqImage:
                     type: string
-                  infraInstanceHaImage:
-                    type: string
                   infraMemcachedImage:
                     type: string
                   infraRedisImage:

diff --git a/apis/bases/core.openstack.org_openstackversions.yaml b/apis/bases/core.openstack.org_openstackversions.yaml
@@ -127,8 +127,6 @@ spec:
                     type: string
                   infraDnsmasqImage:
                     type: string
-                  infraInstanceHaImage:
-                    type: string
                   infraMemcachedImage:
                     type: string
                   infraRedisImage:
@@ -334,8 +332,6 @@ spec:
                       type: string
                     infraDnsmasqImage:
                       type: string
-                    infraInstanceHaImage:
-                      type: string
                     infraMemcachedImage:
                       type: string
                     infraRedisImage:
@@ -512,8 +508,6 @@ spec:
                     type: string
                   infraDnsmasqImage:
                     type: string
-                  infraInstanceHaImage:
-                    type: string
                   infraMemcachedImage:
                     type: string
                   infraRedisImage:

diff --git a/apis/core/v1beta1/openstackversion_types.go b/apis/core/v1beta1/openstackversion_types.go
@@ -118,7 +118,6 @@ type ContainerTemplate struct {
 	InfraDnsmasqImage             *string `json:"infraDnsmasqImage,omitempty"`
 	InfraMemcachedImage           *string `json:"infraMemcachedImage,omitempty"`
 	InfraRedisImage               *string `json:"infraRedisImage,omitempty"`
-	InfraInstanceHaImage          *string `json:"infraInstanceHaImage,omitempty"`
 	IronicAPIImage                *string `json:"ironicAPIImage,omitempty"`
 	IronicConductorImage          *string `json:"ironicConductorImage,omitempty"`
 	IronicInspectorImage          *string `json:"ironicInspectorImage,omitempty"`

diff --git a/apis/core/v1beta1/zz_generated.deepcopy.go b/apis/core/v1beta1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml b/config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml
@@ -18373,8 +18373,6 @@ spec:
                     type: string
                   infraDnsmasqImage:
                     type: string
-                  infraInstanceHaImage:
-                    type: string
                   infraMemcachedImage:
                     type: string
                   infraRedisImage:

diff --git a/config/crd/bases/core.openstack.org_openstackversions.yaml b/config/crd/bases/core.openstack.org_openstackversions.yaml
@@ -127,8 +127,6 @@ spec:
                     type: string
                   infraDnsmasqImage:
                     type: string
-                  infraInstanceHaImage:
-                    type: string
                   infraMemcachedImage:
                     type: string
                   infraRedisImage:
@@ -334,8 +332,6 @@ spec:
                       type: string
                     infraDnsmasqImage:
                       type: string
-                    infraInstanceHaImage:
-                      type: string
                     infraMemcachedImage:
                       type: string
                     infraRedisImage:
@@ -512,8 +508,6 @@ spec:
                     type: string
                   infraDnsmasqImage:
                     type: string
-                  infraInstanceHaImage:
-                    type: string
                   infraMemcachedImage:
                     type: string
                   infraRedisImage:

diff --git a/config/default/manager_default_images.yaml b/config/default/manager_default_images.yaml
@@ -99,8 +99,6 @@ 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_INFRA_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
@@ -7,7 +7,6 @@ export RELATED_IMAGE_KEYSTONE_API_IMAGE_URL_DEFAULT=quay.io/podified-antelope-ce
 export RELATED_IMAGE_MARIADB_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-mariadb:current-podified
 export RELATED_IMAGE_INFRA_MEMCACHED_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-memcached:current-podified
 export RELATED_IMAGE_INFRA_REDIS_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-redis:current-podified
-export RELATED_IMAGE_INFRA_INSTANCE_HA_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-openstackclient:current-podified
 export RELATED_IMAGE_ANSIBLEEE_IMAGE_URL_DEFAULT=quay.io/openstack-k8s-operators/openstack-ansibleee-runner:current-podified
 export RELATED_IMAGE_NOVA_API_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-nova-api:current-podified
 export RELATED_IMAGE_NOVA_CONDUCTOR_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-nova-conductor:current-podified

diff --git a/pkg/openstack/instanceha.go b/pkg/openstack/instanceha.go
@@ -20,7 +20,7 @@ const (
 func ReconcileInstanceHa(ctx context.Context, instance *corev1beta1.OpenStackControlPlane, version *corev1beta1.OpenStackVersion, helper *helper.Helper) (ctrl.Result, error) {
 	missingImageDefault := ""
 	customData := map[string]string{
-		InstanceHaImageKey: *getImg(version.Status.ContainerImages.InfraInstanceHaImage, &missingImageDefault),
+		InstanceHaImageKey: *getImg(version.Status.ContainerImages.OpenstackClientImage, &missingImageDefault),
 	}
 
 	cms := []util.Template{

diff --git a/pkg/openstack/version.go b/pkg/openstack/version.go
@@ -127,7 +127,6 @@ 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),
-			InfraInstanceHaImage:          getImg(instance.Spec.CustomContainerImages.InfraInstanceHaImage, defaults.InfraInstanceHaImage),
 			IronicAPIImage:                getImg(instance.Spec.CustomContainerImages.IronicAPIImage, defaults.IronicAPIImage),
 			IronicConductorImage:          getImg(instance.Spec.CustomContainerImages.IronicConductorImage, defaults.IronicConductorImage),
 			IronicInspectorImage:          getImg(instance.Spec.CustomContainerImages.IronicInspectorImage, defaults.IronicInspectorImage),