From 6f6cab4f7c4fcbfffe982d029075b0e0b162b57f Mon Sep 17 00:00:00 2001 From: James Slagle Date: Tue, 9 Apr 2024 18:06:12 -0400 Subject: [PATCH] Add multipathd image This image was missing from OpenStackVersion. Signed-off-by: James Slagle --- apis/bases/core.openstack.org_openstackcontrolplanes.yaml | 2 ++ apis/bases/core.openstack.org_openstackversions.yaml | 6 ++++++ apis/core/v1beta1/openstackversion_types.go | 1 + apis/core/v1beta1/zz_generated.deepcopy.go | 5 +++++ .../bases/core.openstack.org_openstackcontrolplanes.yaml | 2 ++ config/crd/bases/core.openstack.org_openstackversions.yaml | 6 ++++++ hack/export_related_images.sh | 1 + pkg/openstack/version.go | 1 + tests/functional/openstackversion_controller_test.go | 1 + 9 files changed, 25 insertions(+) diff --git a/apis/bases/core.openstack.org_openstackcontrolplanes.yaml b/apis/bases/core.openstack.org_openstackcontrolplanes.yaml index c6ee00953..ad9dd2147 100644 --- a/apis/bases/core.openstack.org_openstackcontrolplanes.yaml +++ b/apis/bases/core.openstack.org_openstackcontrolplanes.yaml @@ -17301,6 +17301,8 @@ spec: type: string edpmLogrotateCrondImage: type: string + edpmMultipathdImage: + type: string edpmNeutronMetadataAgentImage: type: string edpmNeutronSriovAgentImage: diff --git a/apis/bases/core.openstack.org_openstackversions.yaml b/apis/bases/core.openstack.org_openstackversions.yaml index 84205f3b9..656416baf 100644 --- a/apis/bases/core.openstack.org_openstackversions.yaml +++ b/apis/bases/core.openstack.org_openstackversions.yaml @@ -99,6 +99,8 @@ spec: type: string edpmLogrotateCrondImage: type: string + edpmMultipathdImage: + type: string edpmNeutronMetadataAgentImage: type: string edpmNeutronSriovAgentImage: @@ -288,6 +290,8 @@ spec: type: string edpmLogrotateCrondImage: type: string + edpmMultipathdImage: + type: string edpmNeutronMetadataAgentImage: type: string edpmNeutronSriovAgentImage: @@ -446,6 +450,8 @@ spec: type: string edpmLogrotateCrondImage: type: string + edpmMultipathdImage: + type: string edpmNeutronMetadataAgentImage: type: string edpmNeutronSriovAgentImage: diff --git a/apis/core/v1beta1/openstackversion_types.go b/apis/core/v1beta1/openstackversion_types.go index 6ad05013d..750e708fd 100644 --- a/apis/core/v1beta1/openstackversion_types.go +++ b/apis/core/v1beta1/openstackversion_types.go @@ -96,6 +96,7 @@ type ContainerTemplate struct { EdpmFrrImage *string `json:"edpmFrrImage,omitempty"` EdpmIscsidImage *string `json:"edpmIscsidImage,omitempty"` EdpmLogrotateCrondImage *string `json:"edpmLogrotateCrondImage,omitempty"` + EdpmMultipathdImage *string `json:"edpmMultipathdImage,omitempty"` EdpmNeutronMetadataAgentImage *string `json:"edpmNeutronMetadataAgentImage,omitempty"` EdpmNeutronSriovAgentImage *string `json:"edpmNeutronSriovAgentImage,omitempty"` EdpmOvnBgpAgentImage *string `json:"edpmOvnBgpAgentImage,omitempty"` diff --git a/apis/core/v1beta1/zz_generated.deepcopy.go b/apis/core/v1beta1/zz_generated.deepcopy.go index 46b13e8fb..0c5169450 100644 --- a/apis/core/v1beta1/zz_generated.deepcopy.go +++ b/apis/core/v1beta1/zz_generated.deepcopy.go @@ -345,6 +345,11 @@ func (in *ContainerTemplate) DeepCopyInto(out *ContainerTemplate) { *out = new(string) **out = **in } + if in.EdpmMultipathdImage != nil { + in, out := &in.EdpmMultipathdImage, &out.EdpmMultipathdImage + *out = new(string) + **out = **in + } if in.EdpmNeutronMetadataAgentImage != nil { in, out := &in.EdpmNeutronMetadataAgentImage, &out.EdpmNeutronMetadataAgentImage *out = new(string) diff --git a/config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml b/config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml index c6ee00953..ad9dd2147 100644 --- a/config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml +++ b/config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml @@ -17301,6 +17301,8 @@ spec: type: string edpmLogrotateCrondImage: type: string + edpmMultipathdImage: + type: string edpmNeutronMetadataAgentImage: type: string edpmNeutronSriovAgentImage: diff --git a/config/crd/bases/core.openstack.org_openstackversions.yaml b/config/crd/bases/core.openstack.org_openstackversions.yaml index 84205f3b9..656416baf 100644 --- a/config/crd/bases/core.openstack.org_openstackversions.yaml +++ b/config/crd/bases/core.openstack.org_openstackversions.yaml @@ -99,6 +99,8 @@ spec: type: string edpmLogrotateCrondImage: type: string + edpmMultipathdImage: + type: string edpmNeutronMetadataAgentImage: type: string edpmNeutronSriovAgentImage: @@ -288,6 +290,8 @@ spec: type: string edpmLogrotateCrondImage: type: string + edpmMultipathdImage: + type: string edpmNeutronMetadataAgentImage: type: string edpmNeutronSriovAgentImage: @@ -446,6 +450,8 @@ spec: type: string edpmLogrotateCrondImage: type: string + edpmMultipathdImage: + type: string edpmNeutronMetadataAgentImage: type: string edpmNeutronSriovAgentImage: diff --git a/hack/export_related_images.sh b/hack/export_related_images.sh index ad3774970..8044cea54 100755 --- a/hack/export_related_images.sh +++ b/hack/export_related_images.sh @@ -73,6 +73,7 @@ export RELATED_IMAGE_BARBICAN_KEYSTONE_LISTENER_IMAGE_URL_DEFAULT=quay.io/podifi export RELATED_IMAGE_OPENSTACK_EDPM_FRR_DEFAULT_IMG=quay.io/podified-antelope-centos9/openstack-frr:current-podified export RELATED_IMAGE_OPENSTACK_EDPM_ISCSID_DEFAULT_IMG=quay.io/podified-antelope-centos9/openstack-iscsid:current-podified export RELATED_IMAGE_OPENSTACK_EDPM_LOGROTATE_CROND_DEFAULT_IMG=quay.io/podified-antelope-centos9/openstack-cron:current-podified +export RELATED_IMAGE_OPENSTACK_EDPM_MULTIPATHD_IMG=quay.io/podified-antelope-centos9/openstack-multipathd:current-podified export RELATED_IMAGE_OPENSTACK_EDPM_NEUTRON_METADATA_AGENT_DEFAULT_IMG=quay.io/podified-antelope-centos9/openstack-neutron-metadata-agent-ovn:current-podified export RELATED_IMAGE_OPENSTACK_EDPM_NEUTRON_SRIOV_AGENT_DEFAULT_IMG=quay.io/podified-antelope-centos9/openstack-neutron-sriov-agent:current-podified export RELATED_IMAGE_OPENSTACK_EDPM_OVN_BGP_AGENT_IMAGE=quay.io/podified-antelope-centos9/openstack-ovn-bgp-agent:current-podified diff --git a/pkg/openstack/version.go b/pkg/openstack/version.go index f5bc42814..21cc6c132 100644 --- a/pkg/openstack/version.go +++ b/pkg/openstack/version.go @@ -113,6 +113,7 @@ func GetContainerImages(ctx context.Context, defaults *corev1beta1.ContainerDefa EdpmFrrImage: getImg(instance.Spec.CustomContainerImages.EdpmFrrImage, defaults.EdpmFrrImage), EdpmIscsidImage: getImg(instance.Spec.CustomContainerImages.EdpmIscsidImage, defaults.EdpmIscsidImage), EdpmLogrotateCrondImage: getImg(instance.Spec.CustomContainerImages.EdpmLogrotateCrondImage, defaults.EdpmLogrotateCrondImage), + EdpmMultipathdImage: getImg(instance.Spec.CustomContainerImages.EdpmMultipathdImage, defaults.EdpmMultipathdImage), EdpmNeutronMetadataAgentImage: getImg(instance.Spec.CustomContainerImages.EdpmNeutronMetadataAgentImage, defaults.EdpmNeutronMetadataAgentImage), EdpmNeutronSriovAgentImage: getImg(instance.Spec.CustomContainerImages.EdpmNeutronSriovAgentImage, defaults.EdpmNeutronSriovAgentImage), EdpmOvnBgpAgentImage: getImg(instance.Spec.CustomContainerImages.EdpmOvnBgpAgentImage, defaults.EdpmOvnBgpAgentImage), diff --git a/tests/functional/openstackversion_controller_test.go b/tests/functional/openstackversion_controller_test.go index 05201b118..2e47dc661 100644 --- a/tests/functional/openstackversion_controller_test.go +++ b/tests/functional/openstackversion_controller_test.go @@ -87,6 +87,7 @@ var _ = Describe("OpenStackOperator controller", func() { g.Expect(version.Status.ContainerImages.EdpmFrrImage).ShouldNot(BeNil()) g.Expect(version.Status.ContainerImages.EdpmIscsidImage).ShouldNot(BeNil()) g.Expect(version.Status.ContainerImages.EdpmLogrotateCrondImage).ShouldNot(BeNil()) + g.Expect(version.Status.ContainerImages.EdpmMultipathdImage).ShouldNot(BeNil()) g.Expect(version.Status.ContainerImages.EdpmNeutronMetadataAgentImage).ShouldNot(BeNil()) g.Expect(version.Status.ContainerImages.EdpmOvnBgpAgentImage).ShouldNot(BeNil()) g.Expect(version.Status.ContainerImages.GlanceAPIImage).ShouldNot(BeNil())