From daf81eea43b7b1bc115bd09519a2210f1099f68e Mon Sep 17 00:00:00 2001 From: yatinkarel Date: Wed, 29 May 2024 18:21:40 +0530 Subject: [PATCH] Add dhcp and ovn agent images to OpenstackVersion Resolves: OSPRH-6639 Related-Issue: OSPRH-6747 --- .../core.openstack.org_openstackcontrolplanes.yaml | 4 ++++ apis/bases/core.openstack.org_openstackversions.yaml | 12 ++++++++++++ apis/core/v1beta1/openstackversion_types.go | 2 ++ apis/core/v1beta1/zz_generated.deepcopy.go | 10 ++++++++++ .../core.openstack.org_openstackcontrolplanes.yaml | 4 ++++ .../bases/core.openstack.org_openstackversions.yaml | 12 ++++++++++++ pkg/openstack/version.go | 2 ++ tests/functional/openstackversion_controller_test.go | 2 ++ 8 files changed, 48 insertions(+) diff --git a/apis/bases/core.openstack.org_openstackcontrolplanes.yaml b/apis/bases/core.openstack.org_openstackcontrolplanes.yaml index 6b1c44fa3..6bd5672b6 100644 --- a/apis/bases/core.openstack.org_openstackcontrolplanes.yaml +++ b/apis/bases/core.openstack.org_openstackcontrolplanes.yaml @@ -17378,8 +17378,12 @@ spec: type: string edpmMultipathdImage: type: string + edpmNeutronDhcpAgentImage: + type: string edpmNeutronMetadataAgentImage: type: string + edpmNeutronOvnAgentImage: + type: string edpmNeutronSriovAgentImage: type: string edpmNodeExporterImage: diff --git a/apis/bases/core.openstack.org_openstackversions.yaml b/apis/bases/core.openstack.org_openstackversions.yaml index 8f858c3d2..b48b8431a 100644 --- a/apis/bases/core.openstack.org_openstackversions.yaml +++ b/apis/bases/core.openstack.org_openstackversions.yaml @@ -103,8 +103,12 @@ spec: type: string edpmMultipathdImage: type: string + edpmNeutronDhcpAgentImage: + type: string edpmNeutronMetadataAgentImage: type: string + edpmNeutronOvnAgentImage: + type: string edpmNeutronSriovAgentImage: type: string edpmNodeExporterImage: @@ -294,8 +298,12 @@ spec: type: string edpmMultipathdImage: type: string + edpmNeutronDhcpAgentImage: + type: string edpmNeutronMetadataAgentImage: type: string + edpmNeutronOvnAgentImage: + type: string edpmNeutronSriovAgentImage: type: string edpmNodeExporterImage: @@ -454,8 +462,12 @@ spec: type: string edpmMultipathdImage: type: string + edpmNeutronDhcpAgentImage: + type: string edpmNeutronMetadataAgentImage: type: string + edpmNeutronOvnAgentImage: + type: string edpmNeutronSriovAgentImage: type: string edpmNodeExporterImage: diff --git a/apis/core/v1beta1/openstackversion_types.go b/apis/core/v1beta1/openstackversion_types.go index 2f194083c..49b403507 100644 --- a/apis/core/v1beta1/openstackversion_types.go +++ b/apis/core/v1beta1/openstackversion_types.go @@ -98,7 +98,9 @@ type ContainerTemplate struct { EdpmIscsidImage *string `json:"edpmIscsidImage,omitempty"` EdpmLogrotateCrondImage *string `json:"edpmLogrotateCrondImage,omitempty"` EdpmMultipathdImage *string `json:"edpmMultipathdImage,omitempty"` + EdpmNeutronDhcpAgentImage *string `json:"edpmNeutronDhcpAgentImage,omitempty"` EdpmNeutronMetadataAgentImage *string `json:"edpmNeutronMetadataAgentImage,omitempty"` + EdpmNeutronOvnAgentImage *string `json:"edpmNeutronOvnAgentImage,omitempty"` EdpmNeutronSriovAgentImage *string `json:"edpmNeutronSriovAgentImage,omitempty"` EdpmOvnBgpAgentImage *string `json:"edpmOvnBgpAgentImage,omitempty"` EdpmNodeExporterImage *string `json:"edpmNodeExporterImage,omitempty"` diff --git a/apis/core/v1beta1/zz_generated.deepcopy.go b/apis/core/v1beta1/zz_generated.deepcopy.go index 92e447ea4..5e8d1a0a0 100644 --- a/apis/core/v1beta1/zz_generated.deepcopy.go +++ b/apis/core/v1beta1/zz_generated.deepcopy.go @@ -363,11 +363,21 @@ func (in *ContainerTemplate) DeepCopyInto(out *ContainerTemplate) { *out = new(string) **out = **in } + if in.EdpmNeutronDhcpAgentImage != nil { + in, out := &in.EdpmNeutronDhcpAgentImage, &out.EdpmNeutronDhcpAgentImage + *out = new(string) + **out = **in + } if in.EdpmNeutronMetadataAgentImage != nil { in, out := &in.EdpmNeutronMetadataAgentImage, &out.EdpmNeutronMetadataAgentImage *out = new(string) **out = **in } + if in.EdpmNeutronOvnAgentImage != nil { + in, out := &in.EdpmNeutronOvnAgentImage, &out.EdpmNeutronOvnAgentImage + *out = new(string) + **out = **in + } if in.EdpmNeutronSriovAgentImage != nil { in, out := &in.EdpmNeutronSriovAgentImage, &out.EdpmNeutronSriovAgentImage *out = new(string) diff --git a/config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml b/config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml index 6b1c44fa3..6bd5672b6 100644 --- a/config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml +++ b/config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml @@ -17378,8 +17378,12 @@ spec: type: string edpmMultipathdImage: type: string + edpmNeutronDhcpAgentImage: + type: string edpmNeutronMetadataAgentImage: type: string + edpmNeutronOvnAgentImage: + type: string edpmNeutronSriovAgentImage: type: string edpmNodeExporterImage: diff --git a/config/crd/bases/core.openstack.org_openstackversions.yaml b/config/crd/bases/core.openstack.org_openstackversions.yaml index 8f858c3d2..b48b8431a 100644 --- a/config/crd/bases/core.openstack.org_openstackversions.yaml +++ b/config/crd/bases/core.openstack.org_openstackversions.yaml @@ -103,8 +103,12 @@ spec: type: string edpmMultipathdImage: type: string + edpmNeutronDhcpAgentImage: + type: string edpmNeutronMetadataAgentImage: type: string + edpmNeutronOvnAgentImage: + type: string edpmNeutronSriovAgentImage: type: string edpmNodeExporterImage: @@ -294,8 +298,12 @@ spec: type: string edpmMultipathdImage: type: string + edpmNeutronDhcpAgentImage: + type: string edpmNeutronMetadataAgentImage: type: string + edpmNeutronOvnAgentImage: + type: string edpmNeutronSriovAgentImage: type: string edpmNodeExporterImage: @@ -454,8 +462,12 @@ spec: type: string edpmMultipathdImage: type: string + edpmNeutronDhcpAgentImage: + type: string edpmNeutronMetadataAgentImage: type: string + edpmNeutronOvnAgentImage: + type: string edpmNeutronSriovAgentImage: type: string edpmNodeExporterImage: diff --git a/pkg/openstack/version.go b/pkg/openstack/version.go index f6de217a3..f92f3d698 100644 --- a/pkg/openstack/version.go +++ b/pkg/openstack/version.go @@ -106,7 +106,9 @@ func GetContainerImages(defaults *corev1beta1.ContainerDefaults, instance corev1 EdpmIscsidImage: getImg(instance.Spec.CustomContainerImages.EdpmIscsidImage, defaults.EdpmIscsidImage), EdpmLogrotateCrondImage: getImg(instance.Spec.CustomContainerImages.EdpmLogrotateCrondImage, defaults.EdpmLogrotateCrondImage), EdpmMultipathdImage: getImg(instance.Spec.CustomContainerImages.EdpmMultipathdImage, defaults.EdpmMultipathdImage), + EdpmNeutronDhcpAgentImage: getImg(instance.Spec.CustomContainerImages.EdpmNeutronDhcpAgentImage, defaults.EdpmNeutronDhcpAgentImage), EdpmNeutronMetadataAgentImage: getImg(instance.Spec.CustomContainerImages.EdpmNeutronMetadataAgentImage, defaults.EdpmNeutronMetadataAgentImage), + EdpmNeutronOvnAgentImage: getImg(instance.Spec.CustomContainerImages.EdpmNeutronOvnAgentImage, defaults.EdpmNeutronOvnAgentImage), EdpmNeutronSriovAgentImage: getImg(instance.Spec.CustomContainerImages.EdpmNeutronSriovAgentImage, defaults.EdpmNeutronSriovAgentImage), EdpmOvnBgpAgentImage: getImg(instance.Spec.CustomContainerImages.EdpmOvnBgpAgentImage, defaults.EdpmOvnBgpAgentImage), EdpmNodeExporterImage: getImg(instance.Spec.CustomContainerImages.EdpmNodeExporterImage, defaults.EdpmNodeExporterImage), diff --git a/tests/functional/openstackversion_controller_test.go b/tests/functional/openstackversion_controller_test.go index dab6813ff..42bd8c83e 100644 --- a/tests/functional/openstackversion_controller_test.go +++ b/tests/functional/openstackversion_controller_test.go @@ -97,7 +97,9 @@ var _ = Describe("OpenStackOperator controller", func() { 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.EdpmNeutronDhcpAgentImage).ShouldNot(BeNil()) g.Expect(version.Status.ContainerImages.EdpmNeutronMetadataAgentImage).ShouldNot(BeNil()) + g.Expect(version.Status.ContainerImages.EdpmNeutronOvnAgentImage).ShouldNot(BeNil()) g.Expect(version.Status.ContainerImages.EdpmNeutronSriovAgentImage).ShouldNot(BeNil()) g.Expect(version.Status.ContainerImages.EdpmNodeExporterImage).ShouldNot(BeNil()) g.Expect(version.Status.ContainerImages.EdpmOvnBgpAgentImage).ShouldNot(BeNil())