Skip to content

Commit

Permalink
Add dhcp and ovn agent images to OpenstackVersion
Browse files Browse the repository at this point in the history 
Resolves: OSPRH-6639
Related-Issue: OSPRH-6747
  • Loading branch information
@karelyatin
karelyatin committed May 29, 2024
1 parent 0d27046 commit 89ab255
Show file tree
Hide file tree
Showing 9 changed files with 50 additions and 0 deletions.
4 changes: 4 additions & 0 deletions apis/bases/core.openstack.org_openstackcontrolplanes.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17378,8 +17378,12 @@ spec:
type: string
edpmMultipathdImage:
type: string
edpmNeutronDhcpAgentImage:
type: string
edpmNeutronMetadataAgentImage:
type: string
edpmNeutronOvnAgentImage:
type: string
edpmNeutronSriovAgentImage:
type: string
edpmNodeExporterImage:
Expand Down
12 changes: 12 additions & 0 deletions apis/bases/core.openstack.org_openstackversions.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,12 @@ spec:
type: string
edpmMultipathdImage:
type: string
edpmNeutronDhcpAgentImage:
type: string
edpmNeutronMetadataAgentImage:
type: string
edpmNeutronOvnAgentImage:
type: string
edpmNeutronSriovAgentImage:
type: string
edpmNodeExporterImage:
Expand Down Expand Up @@ -294,8 +298,12 @@ spec:
type: string
edpmMultipathdImage:
type: string
edpmNeutronDhcpAgentImage:
type: string
edpmNeutronMetadataAgentImage:
type: string
edpmNeutronOvnAgentImage:
type: string
edpmNeutronSriovAgentImage:
type: string
edpmNodeExporterImage:
Expand Down Expand Up @@ -454,8 +462,12 @@ spec:
type: string
edpmMultipathdImage:
type: string
edpmNeutronDhcpAgentImage:
type: string
edpmNeutronMetadataAgentImage:
type: string
edpmNeutronOvnAgentImage:
type: string
edpmNeutronSriovAgentImage:
type: string
edpmNodeExporterImage:
Expand Down
2 changes: 2 additions & 0 deletions apis/core/v1beta1/openstackversion_types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"`
Expand Down
10 changes: 10 additions & 0 deletions apis/core/v1beta1/zz_generated.deepcopy.go
View file

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

4 changes: 4 additions & 0 deletions config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17378,8 +17378,12 @@ spec:
type: string
edpmMultipathdImage:
type: string
edpmNeutronDhcpAgentImage:
type: string
edpmNeutronMetadataAgentImage:
type: string
edpmNeutronOvnAgentImage:
type: string
edpmNeutronSriovAgentImage:
type: string
edpmNodeExporterImage:
Expand Down
12 changes: 12 additions & 0 deletions config/crd/bases/core.openstack.org_openstackversions.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,12 @@ spec:
type: string
edpmMultipathdImage:
type: string
edpmNeutronDhcpAgentImage:
type: string
edpmNeutronMetadataAgentImage:
type: string
edpmNeutronOvnAgentImage:
type: string
edpmNeutronSriovAgentImage:
type: string
edpmNodeExporterImage:
Expand Down Expand Up @@ -294,8 +298,12 @@ spec:
type: string
edpmMultipathdImage:
type: string
edpmNeutronDhcpAgentImage:
type: string
edpmNeutronMetadataAgentImage:
type: string
edpmNeutronOvnAgentImage:
type: string
edpmNeutronSriovAgentImage:
type: string
edpmNodeExporterImage:
Expand Down Expand Up @@ -454,8 +462,12 @@ spec:
type: string
edpmMultipathdImage:
type: string
edpmNeutronDhcpAgentImage:
type: string
edpmNeutronMetadataAgentImage:
type: string
edpmNeutronOvnAgentImage:
type: string
edpmNeutronSriovAgentImage:
type: string
edpmNodeExporterImage:
Expand Down
2 changes: 2 additions & 0 deletions hack/export_related_images.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,9 @@ export RELATED_IMAGE_EDPM_FRR_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos
export RELATED_IMAGE_EDPM_ISCSID_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-iscsid:current-podified
export RELATED_IMAGE_EDPM_LOGROTATE_CROND_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-cron:current-podified
export RELATED_IMAGE_EDPM_MULTIPATHD_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-multipathd:current-podified
export RELATED_IMAGE_EDPM_NEUTRON_DHCP_AGENT_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-neutron-dhcp-agent:current-podified
export RELATED_IMAGE_EDPM_NEUTRON_METADATA_AGENT_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-neutron-metadata-agent-ovn:current-podified
export RELATED_IMAGE_EDPM_NEUTRON_OVN_AGENT_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-neutron-ovn-agent:current-podified
export RELATED_IMAGE_EDPM_NEUTRON_SRIOV_AGENT_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-neutron-sriov-agent:current-podified
export RELATED_IMAGE_EDPM_OVN_BGP_AGENT_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-ovn-bgp-agent:current-podified
export RELATED_IMAGE_EDPM_NODE_EXPORTER_IMAGE_URL_DEFAULT=quay.io/prometheus/node-exporter:v1.5.0
2 changes: 2 additions & 0 deletions pkg/openstack/version.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
2 changes: 2 additions & 0 deletions tests/functional/openstackversion_controller_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down

0 comments on commit 89ab255

Please sign in to comment.