Skip to content

Commit ec7210b

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #1150 from lmiccini/reuseimage
Reuse OpenstackClientImage instead of dedicated InstanceHaImage
2 parents 81e16fe + ad059d4 commit ec7210b

10 files changed

Lines changed: 1 addition & 27 deletions

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18373,8 +18373,6 @@ spec:
1837318373
type: string
1837418374
infraDnsmasqImage:
1837518375
type: string
18376-
infraInstanceHaImage:
18377-
type: string
1837818376
infraMemcachedImage:
1837918377
type: string
1838018378
infraRedisImage:

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,6 @@ spec:
127127
type: string
128128
infraDnsmasqImage:
129129
type: string
130-
infraInstanceHaImage:
131-
type: string
132130
infraMemcachedImage:
133131
type: string
134132
infraRedisImage:
@@ -334,8 +332,6 @@ spec:
334332
type: string
335333
infraDnsmasqImage:
336334
type: string
337-
infraInstanceHaImage:
338-
type: string
339335
infraMemcachedImage:
340336
type: string
341337
infraRedisImage:
@@ -512,8 +508,6 @@ spec:
512508
type: string
513509
infraDnsmasqImage:
514510
type: string
515-
infraInstanceHaImage:
516-
type: string
517511
infraMemcachedImage:
518512
type: string
519513
infraRedisImage:

‎apis/core/v1beta1/openstackversion_types.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,6 @@ type ContainerTemplate struct {
118118
InfraDnsmasqImage *string `json:"infraDnsmasqImage,omitempty"`
119119
InfraMemcachedImage *string `json:"infraMemcachedImage,omitempty"`
120120
InfraRedisImage *string `json:"infraRedisImage,omitempty"`
121-
InfraInstanceHaImage *string `json:"infraInstanceHaImage,omitempty"`
122121
IronicAPIImage *string `json:"ironicAPIImage,omitempty"`
123122
IronicConductorImage *string `json:"ironicConductorImage,omitempty"`
124123
IronicInspectorImage *string `json:"ironicInspectorImage,omitempty"`

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

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

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18373,8 +18373,6 @@ spec:
1837318373
type: string
1837418374
infraDnsmasqImage:
1837518375
type: string
18376-
infraInstanceHaImage:
18377-
type: string
1837818376
infraMemcachedImage:
1837918377
type: string
1838018378
infraRedisImage:

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,6 @@ spec:
127127
type: string
128128
infraDnsmasqImage:
129129
type: string
130-
infraInstanceHaImage:
131-
type: string
132130
infraMemcachedImage:
133131
type: string
134132
infraRedisImage:
@@ -334,8 +332,6 @@ spec:
334332
type: string
335333
infraDnsmasqImage:
336334
type: string
337-
infraInstanceHaImage:
338-
type: string
339335
infraMemcachedImage:
340336
type: string
341337
infraRedisImage:
@@ -512,8 +508,6 @@ spec:
512508
type: string
513509
infraDnsmasqImage:
514510
type: string
515-
infraInstanceHaImage:
516-
type: string
517511
infraMemcachedImage:
518512
type: string
519513
infraRedisImage:

‎config/default/manager_default_images.yaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,6 @@ spec:
9999
value: quay.io/podified-antelope-centos9/openstack-memcached:current-podified
100100
- name: RELATED_IMAGE_INFRA_REDIS_IMAGE_URL_DEFAULT
101101
value: quay.io/podified-antelope-centos9/openstack-redis:current-podified
102-
- name: RELATED_IMAGE_INFRA_INSTANCE_HA_IMAGE_URL_DEFAULT
103-
value: quay.io/podified-antelope-centos9/openstack-openstackclient:current-podified
104102
- name: RELATED_IMAGE_IRONIC_API_IMAGE_URL_DEFAULT
105103
value: quay.io/podified-antelope-centos9/openstack-ironic-api:current-podified
106104
- name: RELATED_IMAGE_IRONIC_CONDUCTOR_IMAGE_URL_DEFAULT

‎hack/export_related_images.sh‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ export RELATED_IMAGE_KEYSTONE_API_IMAGE_URL_DEFAULT=quay.io/podified-antelope-ce
77
export RELATED_IMAGE_MARIADB_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-mariadb:current-podified
88
export RELATED_IMAGE_INFRA_MEMCACHED_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-memcached:current-podified
99
export RELATED_IMAGE_INFRA_REDIS_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-redis:current-podified
10-
export RELATED_IMAGE_INFRA_INSTANCE_HA_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-openstackclient:current-podified
1110
export RELATED_IMAGE_ANSIBLEEE_IMAGE_URL_DEFAULT=quay.io/openstack-k8s-operators/openstack-ansibleee-runner:current-podified
1211
export RELATED_IMAGE_NOVA_API_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-nova-api:current-podified
1312
export RELATED_IMAGE_NOVA_CONDUCTOR_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-nova-conductor:current-podified

‎pkg/openstack/instanceha.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ const (
2020
func ReconcileInstanceHa(ctx context.Context, instance *corev1beta1.OpenStackControlPlane, version *corev1beta1.OpenStackVersion, helper *helper.Helper) (ctrl.Result, error) {
2121
missingImageDefault := ""
2222
customData := map[string]string{
23-
InstanceHaImageKey: *getImg(version.Status.ContainerImages.InfraInstanceHaImage, &missingImageDefault),
23+
InstanceHaImageKey: *getImg(version.Status.ContainerImages.OpenstackClientImage, &missingImageDefault),
2424
}
2525

2626
cms := []util.Template{

‎pkg/openstack/version.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,6 @@ func GetContainerImages(defaults *corev1beta1.ContainerDefaults, instance corev1
127127
InfraDnsmasqImage: getImg(instance.Spec.CustomContainerImages.InfraDnsmasqImage, defaults.InfraDnsmasqImage),
128128
InfraMemcachedImage: getImg(instance.Spec.CustomContainerImages.InfraMemcachedImage, defaults.InfraMemcachedImage),
129129
InfraRedisImage: getImg(instance.Spec.CustomContainerImages.InfraRedisImage, defaults.InfraRedisImage),
130-
InfraInstanceHaImage: getImg(instance.Spec.CustomContainerImages.InfraInstanceHaImage, defaults.InfraInstanceHaImage),
131130
IronicAPIImage: getImg(instance.Spec.CustomContainerImages.IronicAPIImage, defaults.IronicAPIImage),
132131
IronicConductorImage: getImg(instance.Spec.CustomContainerImages.IronicConductorImage, defaults.IronicConductorImage),
133132
IronicInspectorImage: getImg(instance.Spec.CustomContainerImages.IronicInspectorImage, defaults.IronicInspectorImage),

0 commit comments

Comments
 (0)