Skip to content

Commit aa91068

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #818 from karelyatin/OSPRH-6639
Add dhcp and ovn agent images to OpenstackVersion
2 parents 63e2b64 + 89ab255 commit aa91068

9 files changed

+50
-0
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17378,8 +17378,12 @@ spec:
1737817378
type: string
1737917379
edpmMultipathdImage:
1738017380
type: string
17381+
edpmNeutronDhcpAgentImage:
17382+
type: string
1738117383
edpmNeutronMetadataAgentImage:
1738217384
type: string
17385+
edpmNeutronOvnAgentImage:
17386+
type: string
1738317387
edpmNeutronSriovAgentImage:
1738417388
type: string
1738517389
edpmNodeExporterImage:

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,12 @@ spec:
103103
type: string
104104
edpmMultipathdImage:
105105
type: string
106+
edpmNeutronDhcpAgentImage:
107+
type: string
106108
edpmNeutronMetadataAgentImage:
107109
type: string
110+
edpmNeutronOvnAgentImage:
111+
type: string
108112
edpmNeutronSriovAgentImage:
109113
type: string
110114
edpmNodeExporterImage:
@@ -294,8 +298,12 @@ spec:
294298
type: string
295299
edpmMultipathdImage:
296300
type: string
301+
edpmNeutronDhcpAgentImage:
302+
type: string
297303
edpmNeutronMetadataAgentImage:
298304
type: string
305+
edpmNeutronOvnAgentImage:
306+
type: string
299307
edpmNeutronSriovAgentImage:
300308
type: string
301309
edpmNodeExporterImage:
@@ -454,8 +462,12 @@ spec:
454462
type: string
455463
edpmMultipathdImage:
456464
type: string
465+
edpmNeutronDhcpAgentImage:
466+
type: string
457467
edpmNeutronMetadataAgentImage:
458468
type: string
469+
edpmNeutronOvnAgentImage:
470+
type: string
459471
edpmNeutronSriovAgentImage:
460472
type: string
461473
edpmNodeExporterImage:

‎apis/core/v1beta1/openstackversion_types.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,9 @@ type ContainerTemplate struct {
9898
EdpmIscsidImage *string `json:"edpmIscsidImage,omitempty"`
9999
EdpmLogrotateCrondImage *string `json:"edpmLogrotateCrondImage,omitempty"`
100100
EdpmMultipathdImage *string `json:"edpmMultipathdImage,omitempty"`
101+
EdpmNeutronDhcpAgentImage *string `json:"edpmNeutronDhcpAgentImage,omitempty"`
101102
EdpmNeutronMetadataAgentImage *string `json:"edpmNeutronMetadataAgentImage,omitempty"`
103+
EdpmNeutronOvnAgentImage *string `json:"edpmNeutronOvnAgentImage,omitempty"`
102104
EdpmNeutronSriovAgentImage *string `json:"edpmNeutronSriovAgentImage,omitempty"`
103105
EdpmOvnBgpAgentImage *string `json:"edpmOvnBgpAgentImage,omitempty"`
104106
EdpmNodeExporterImage *string `json:"edpmNodeExporterImage,omitempty"`

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

Lines changed: 10 additions & 0 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: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17378,8 +17378,12 @@ spec:
1737817378
type: string
1737917379
edpmMultipathdImage:
1738017380
type: string
17381+
edpmNeutronDhcpAgentImage:
17382+
type: string
1738117383
edpmNeutronMetadataAgentImage:
1738217384
type: string
17385+
edpmNeutronOvnAgentImage:
17386+
type: string
1738317387
edpmNeutronSriovAgentImage:
1738417388
type: string
1738517389
edpmNodeExporterImage:

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,12 @@ spec:
103103
type: string
104104
edpmMultipathdImage:
105105
type: string
106+
edpmNeutronDhcpAgentImage:
107+
type: string
106108
edpmNeutronMetadataAgentImage:
107109
type: string
110+
edpmNeutronOvnAgentImage:
111+
type: string
108112
edpmNeutronSriovAgentImage:
109113
type: string
110114
edpmNodeExporterImage:
@@ -294,8 +298,12 @@ spec:
294298
type: string
295299
edpmMultipathdImage:
296300
type: string
301+
edpmNeutronDhcpAgentImage:
302+
type: string
297303
edpmNeutronMetadataAgentImage:
298304
type: string
305+
edpmNeutronOvnAgentImage:
306+
type: string
299307
edpmNeutronSriovAgentImage:
300308
type: string
301309
edpmNodeExporterImage:
@@ -454,8 +462,12 @@ spec:
454462
type: string
455463
edpmMultipathdImage:
456464
type: string
465+
edpmNeutronDhcpAgentImage:
466+
type: string
457467
edpmNeutronMetadataAgentImage:
458468
type: string
469+
edpmNeutronOvnAgentImage:
470+
type: string
459471
edpmNeutronSriovAgentImage:
460472
type: string
461473
edpmNodeExporterImage:

‎hack/export_related_images.sh‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,9 @@ export RELATED_IMAGE_EDPM_FRR_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos
7474
export RELATED_IMAGE_EDPM_ISCSID_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-iscsid:current-podified
7575
export RELATED_IMAGE_EDPM_LOGROTATE_CROND_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-cron:current-podified
7676
export RELATED_IMAGE_EDPM_MULTIPATHD_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-multipathd:current-podified
77+
export RELATED_IMAGE_EDPM_NEUTRON_DHCP_AGENT_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-neutron-dhcp-agent:current-podified
7778
export RELATED_IMAGE_EDPM_NEUTRON_METADATA_AGENT_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-neutron-metadata-agent-ovn:current-podified
79+
export RELATED_IMAGE_EDPM_NEUTRON_OVN_AGENT_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-neutron-ovn-agent:current-podified
7880
export RELATED_IMAGE_EDPM_NEUTRON_SRIOV_AGENT_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-neutron-sriov-agent:current-podified
7981
export RELATED_IMAGE_EDPM_OVN_BGP_AGENT_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-ovn-bgp-agent:current-podified
8082
export RELATED_IMAGE_EDPM_NODE_EXPORTER_IMAGE_URL_DEFAULT=quay.io/prometheus/node-exporter:v1.5.0

‎pkg/openstack/version.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,9 @@ func GetContainerImages(defaults *corev1beta1.ContainerDefaults, instance corev1
106106
EdpmIscsidImage: getImg(instance.Spec.CustomContainerImages.EdpmIscsidImage, defaults.EdpmIscsidImage),
107107
EdpmLogrotateCrondImage: getImg(instance.Spec.CustomContainerImages.EdpmLogrotateCrondImage, defaults.EdpmLogrotateCrondImage),
108108
EdpmMultipathdImage: getImg(instance.Spec.CustomContainerImages.EdpmMultipathdImage, defaults.EdpmMultipathdImage),
109+
EdpmNeutronDhcpAgentImage: getImg(instance.Spec.CustomContainerImages.EdpmNeutronDhcpAgentImage, defaults.EdpmNeutronDhcpAgentImage),
109110
EdpmNeutronMetadataAgentImage: getImg(instance.Spec.CustomContainerImages.EdpmNeutronMetadataAgentImage, defaults.EdpmNeutronMetadataAgentImage),
111+
EdpmNeutronOvnAgentImage: getImg(instance.Spec.CustomContainerImages.EdpmNeutronOvnAgentImage, defaults.EdpmNeutronOvnAgentImage),
110112
EdpmNeutronSriovAgentImage: getImg(instance.Spec.CustomContainerImages.EdpmNeutronSriovAgentImage, defaults.EdpmNeutronSriovAgentImage),
111113
EdpmOvnBgpAgentImage: getImg(instance.Spec.CustomContainerImages.EdpmOvnBgpAgentImage, defaults.EdpmOvnBgpAgentImage),
112114
EdpmNodeExporterImage: getImg(instance.Spec.CustomContainerImages.EdpmNodeExporterImage, defaults.EdpmNodeExporterImage),

‎tests/functional/openstackversion_controller_test.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,9 @@ var _ = Describe("OpenStackOperator controller", func() {
9797
g.Expect(version.Status.ContainerImages.EdpmIscsidImage).ShouldNot(BeNil())
9898
g.Expect(version.Status.ContainerImages.EdpmLogrotateCrondImage).ShouldNot(BeNil())
9999
g.Expect(version.Status.ContainerImages.EdpmMultipathdImage).ShouldNot(BeNil())
100+
g.Expect(version.Status.ContainerImages.EdpmNeutronDhcpAgentImage).ShouldNot(BeNil())
100101
g.Expect(version.Status.ContainerImages.EdpmNeutronMetadataAgentImage).ShouldNot(BeNil())
102+
g.Expect(version.Status.ContainerImages.EdpmNeutronOvnAgentImage).ShouldNot(BeNil())
101103
g.Expect(version.Status.ContainerImages.EdpmNeutronSriovAgentImage).ShouldNot(BeNil())
102104
g.Expect(version.Status.ContainerImages.EdpmNodeExporterImage).ShouldNot(BeNil())
103105
g.Expect(version.Status.ContainerImages.EdpmOvnBgpAgentImage).ShouldNot(BeNil())

0 commit comments

Comments
 (0)