Skip to content

Commit

Permalink
Add multipathd image
Browse files Browse the repository at this point in the history 
This image was missing from OpenStackVersion.

Signed-off-by: James Slagle <[email protected]>
  • Loading branch information
@slagle
slagle committed Apr 11, 2024
1 parent 0414bc0 commit 6f6cab4
Show file tree
Hide file tree
Showing 9 changed files with 25 additions and 0 deletions.
2 changes: 2 additions & 0 deletions apis/bases/core.openstack.org_openstackcontrolplanes.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17301,6 +17301,8 @@ spec:
type: string
edpmLogrotateCrondImage:
type: string
edpmMultipathdImage:
type: string
edpmNeutronMetadataAgentImage:
type: string
edpmNeutronSriovAgentImage:
Expand Down
6 changes: 6 additions & 0 deletions apis/bases/core.openstack.org_openstackversions.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,8 @@ spec:
type: string
edpmLogrotateCrondImage:
type: string
edpmMultipathdImage:
type: string
edpmNeutronMetadataAgentImage:
type: string
edpmNeutronSriovAgentImage:
Expand Down Expand Up @@ -288,6 +290,8 @@ spec:
type: string
edpmLogrotateCrondImage:
type: string
edpmMultipathdImage:
type: string
edpmNeutronMetadataAgentImage:
type: string
edpmNeutronSriovAgentImage:
Expand Down Expand Up @@ -446,6 +450,8 @@ spec:
type: string
edpmLogrotateCrondImage:
type: string
edpmMultipathdImage:
type: string
edpmNeutronMetadataAgentImage:
type: string
edpmNeutronSriovAgentImage:
Expand Down
1 change: 1 addition & 0 deletions apis/core/v1beta1/openstackversion_types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"`
Expand Down
5 changes: 5 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.

2 changes: 2 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 @@ -17301,6 +17301,8 @@ spec:
type: string
edpmLogrotateCrondImage:
type: string
edpmMultipathdImage:
type: string
edpmNeutronMetadataAgentImage:
type: string
edpmNeutronSriovAgentImage:
Expand Down
6 changes: 6 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 @@ -99,6 +99,8 @@ spec:
type: string
edpmLogrotateCrondImage:
type: string
edpmMultipathdImage:
type: string
edpmNeutronMetadataAgentImage:
type: string
edpmNeutronSriovAgentImage:
Expand Down Expand Up @@ -288,6 +290,8 @@ spec:
type: string
edpmLogrotateCrondImage:
type: string
edpmMultipathdImage:
type: string
edpmNeutronMetadataAgentImage:
type: string
edpmNeutronSriovAgentImage:
Expand Down Expand Up @@ -446,6 +450,8 @@ spec:
type: string
edpmLogrotateCrondImage:
type: string
edpmMultipathdImage:
type: string
edpmNeutronMetadataAgentImage:
type: string
edpmNeutronSriovAgentImage:
Expand Down
1 change: 1 addition & 0 deletions hack/export_related_images.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions pkg/openstack/version.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
1 change: 1 addition & 0 deletions tests/functional/openstackversion_controller_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down

0 comments on commit 6f6cab4

Please sign in to comment.