Skip to content

Add dedicated RELATED_IMAGE for instanceha instead of reusing openstackclient #1994

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
4383 wants to merge 1 commit into from
Closed

Add dedicated RELATED_IMAGE for instanceha instead of reusing openstackclient #1994

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions api/bases/core.openstack.org_openstackcontrolplanes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21099,6 +21099,8 @@ spec:
type: string
infraRedisImage:
type: string
instanceHaImage:
type: string
ironicAPIImage:
type: string
ironicConductorImage:
Expand Down
8 changes: 8 additions & 0 deletions api/bases/core.openstack.org_openstackversions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,8 @@ spec:
type: string
infraRedisImage:
type: string
instanceHaImage:
type: string
ironicAPIImage:
type: string
ironicConductorImage:
Expand Down Expand Up @@ -389,6 +391,8 @@ spec:
type: string
infraRedisImage:
type: string
instanceHaImage:
type: string
ironicAPIImage:
type: string
ironicConductorImage:
Expand Down Expand Up @@ -589,6 +593,8 @@ spec:
type: string
infraRedisImage:
type: string
instanceHaImage:
type: string
ironicAPIImage:
type: string
ironicConductorImage:
Expand Down Expand Up @@ -807,6 +813,8 @@ spec:
type: string
infraRedisImage:
type: string
instanceHaImage:
type: string
ironicAPIImage:
type: string
ironicConductorImage:
Expand Down
1 change: 1 addition & 0 deletions api/core/v1beta1/openstackversion_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"`
Expand Down
5 changes: 5 additions & 0 deletions api/core/v1beta1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions bindata/crds/crds.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21633,6 +21633,8 @@ spec:
type: string
infraRedisImage:
type: string
instanceHaImage:
type: string
ironicAPIImage:
type: string
ironicConductorImage:
Expand Down Expand Up @@ -24551,6 +24553,8 @@ spec:
type: string
infraRedisImage:
type: string
instanceHaImage:
type: string
ironicAPIImage:
type: string
ironicConductorImage:
Expand Down Expand Up @@ -24793,6 +24797,8 @@ spec:
type: string
infraRedisImage:
type: string
instanceHaImage:
type: string
ironicAPIImage:
type: string
ironicConductorImage:
Expand Down Expand Up @@ -24993,6 +24999,8 @@ spec:
type: string
infraRedisImage:
type: string
instanceHaImage:
type: string
ironicAPIImage:
type: string
ironicConductorImage:
Expand Down Expand Up @@ -25211,6 +25219,8 @@ spec:
type: string
infraRedisImage:
type: string
instanceHaImage:
type: string
ironicAPIImage:
type: string
ironicConductorImage:
Expand Down
2 changes: 2 additions & 0 deletions config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21099,6 +21099,8 @@ spec:
type: string
infraRedisImage:
type: string
instanceHaImage:
type: string
ironicAPIImage:
type: string
ironicConductorImage:
Expand Down
8 changes: 8 additions & 0 deletions config/crd/bases/core.openstack.org_openstackversions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,8 @@ spec:
type: string
infraRedisImage:
type: string
instanceHaImage:
type: string
ironicAPIImage:
type: string
ironicConductorImage:
Expand Down Expand Up @@ -389,6 +391,8 @@ spec:
type: string
infraRedisImage:
type: string
instanceHaImage:
type: string
ironicAPIImage:
type: string
ironicConductorImage:
Expand Down Expand Up @@ -589,6 +593,8 @@ spec:
type: string
infraRedisImage:
type: string
instanceHaImage:
type: string
ironicAPIImage:
type: string
ironicConductorImage:
Expand Down Expand Up @@ -807,6 +813,8 @@ spec:
type: string
infraRedisImage:
type: string
instanceHaImage:
type: string
ironicAPIImage:
type: string
ironicConductorImage:
Expand Down
2 changes: 2 additions & 0 deletions config/operator/default_images.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions hack/export_related_images.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion internal/openstack/instanceha.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
1 change: 1 addition & 0 deletions internal/openstack/version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down