Skip to content

Commit 716bdea

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #1300 from beagles/netutils_image
Add missing netutils container image support
2 parents 7832dae + a2b4a57 commit 716bdea

12 files changed

+39
-0
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17502,6 +17502,8 @@ spec:
1750217502
type: object
1750317503
mariadbImage:
1750417504
type: string
17505+
netUtilsImage:
17506+
type: string
1750517507
neutronAPIImage:
1750617508
type: string
1750717509
novaAPIImage:

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,8 @@ spec:
158158
type: object
159159
mariadbImage:
160160
type: string
161+
netUtilsImage:
162+
type: string
161163
neutronAPIImage:
162164
type: string
163165
novaAPIImage:
@@ -367,6 +369,8 @@ spec:
367369
type: string
368370
mariadbImage:
369371
type: string
372+
netUtilsImage:
373+
type: string
370374
neutronAPIImage:
371375
type: string
372376
novaAPIImage:
@@ -551,6 +555,8 @@ spec:
551555
type: object
552556
mariadbImage:
553557
type: string
558+
netUtilsImage:
559+
type: string
554560
neutronAPIImage:
555561
type: string
556562
novaAPIImage:

‎apis/core/v1beta1/openstackversion_types.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ type ContainerTemplate struct {
130130
ManilaAPIImage *string `json:"manilaAPIImage,omitempty"`
131131
ManilaSchedulerImage *string `json:"manilaSchedulerImage,omitempty"`
132132
MariadbImage *string `json:"mariadbImage,omitempty"`
133+
NetUtilsImage *string `json:"netUtilsImage,omitempty"`
133134
NeutronAPIImage *string `json:"neutronAPIImage,omitempty"`
134135
NovaAPIImage *string `json:"novaAPIImage,omitempty"`
135136
NovaComputeImage *string `json:"novaComputeImage,omitempty"`

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

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎bindata/crds/crds.yaml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17666,6 +17666,8 @@ spec:
1766617666
type: object
1766717667
mariadbImage:
1766817668
type: string
17669+
netUtilsImage:
17670+
type: string
1766917671
neutronAPIImage:
1767017672
type: string
1767117673
novaAPIImage:
@@ -19235,6 +19237,8 @@ spec:
1923519237
type: object
1923619238
mariadbImage:
1923719239
type: string
19240+
netUtilsImage:
19241+
type: string
1923819242
neutronAPIImage:
1923919243
type: string
1924019244
novaAPIImage:
@@ -19444,6 +19448,8 @@ spec:
1944419448
type: string
1944519449
mariadbImage:
1944619450
type: string
19451+
netUtilsImage:
19452+
type: string
1944719453
neutronAPIImage:
1944819454
type: string
1944919455
novaAPIImage:
@@ -19628,6 +19634,8 @@ spec:
1962819634
type: object
1962919635
mariadbImage:
1963019636
type: string
19637+
netUtilsImage:
19638+
type: string
1963119639
neutronAPIImage:
1963219640
type: string
1963319641
novaAPIImage:

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17502,6 +17502,8 @@ spec:
1750217502
type: object
1750317503
mariadbImage:
1750417504
type: string
17505+
netUtilsImage:
17506+
type: string
1750517507
neutronAPIImage:
1750617508
type: string
1750717509
novaAPIImage:

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,8 @@ spec:
158158
type: object
159159
mariadbImage:
160160
type: string
161+
netUtilsImage:
162+
type: string
161163
neutronAPIImage:
162164
type: string
163165
novaAPIImage:
@@ -367,6 +369,8 @@ spec:
367369
type: string
368370
mariadbImage:
369371
type: string
372+
netUtilsImage:
373+
type: string
370374
neutronAPIImage:
371375
type: string
372376
novaAPIImage:
@@ -551,6 +555,8 @@ spec:
551555
type: object
552556
mariadbImage:
553557
type: string
558+
netUtilsImage:
559+
type: string
554560
neutronAPIImage:
555561
type: string
556562
novaAPIImage:

‎config/operator/default_images.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,8 @@ spec:
125125
value: quay.io/podified-antelope-centos9/openstack-manila-share:current-podified
126126
- name: RELATED_IMAGE_MARIADB_IMAGE_URL_DEFAULT
127127
value: quay.io/podified-antelope-centos9/openstack-mariadb:current-podified
128+
- name: RELATED_IMAGE_NET_UTILS_IMAGE_URL_DEFAULT
129+
value: quay.io/podified-antelope-centos9/openstack-netutils:current-podified
128130
- name: RELATED_IMAGE_NEUTRON_API_IMAGE_URL_DEFAULT
129131
value: quay.io/podified-antelope-centos9/openstack-neutron-server:current-podified
130132
- name: RELATED_IMAGE_NOVA_API_IMAGE_URL_DEFAULT

‎hack/export_related_images.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ export RELATED_IMAGE_SWIFT_PROXY_IMAGE_URL_DEFAULT=quay.io/podified-antelope-cen
5757
export RELATED_IMAGE_SWIFT_ACCOUNT_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-swift-account:current-podified
5858
export RELATED_IMAGE_SWIFT_CONTAINER_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-swift-container:current-podified
5959
export RELATED_IMAGE_SWIFT_OBJECT_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-swift-object:current-podified
60+
export RELATED_IMAGE_NET_UTILS_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-netutils:current-podified
6061
export RELATED_IMAGE_OCTAVIA_API_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-octavia-api:current-podified
6162
export RELATED_IMAGE_OCTAVIA_HOUSEKEEPING_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-octavia-housekeeping:current-podified
6263
export RELATED_IMAGE_OCTAVIA_HEALTHMANAGER_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-octavia-health-manager:current-podified

‎pkg/openstack/designate.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ func ReconcileDesignate(ctx context.Context, instance *corev1beta1.OpenStackCont
4040
instance.Status.ContainerImages.DesignateWorkerImage = nil
4141
instance.Status.ContainerImages.DesignateBackendbind9Image = nil
4242
instance.Status.ContainerImages.DesignateUnboundImage = nil
43+
instance.Status.ContainerImages.NetUtilsImage = nil
4344
return ctrl.Result{}, nil
4445
}
4546

@@ -146,6 +147,8 @@ func ReconcileDesignate(ctx context.Context, instance *corev1beta1.OpenStackCont
146147
designate.Spec.DesignateWorker.ContainerImage = *version.Status.ContainerImages.DesignateWorkerImage
147148
designate.Spec.DesignateBackendbind9.ContainerImage = *version.Status.ContainerImages.DesignateBackendbind9Image
148149
designate.Spec.DesignateUnbound.ContainerImage = *version.Status.ContainerImages.DesignateUnboundImage
150+
designate.Spec.DesignateBackendbind9.NetUtilsImage = *version.Status.ContainerImages.NetUtilsImage
151+
designate.Spec.DesignateMdns.NetUtilsImage = *version.Status.ContainerImages.NetUtilsImage
149152

150153
if designate.Spec.Secret == "" {
151154
designate.Spec.Secret = instance.Spec.Secret
@@ -182,6 +185,7 @@ func ReconcileDesignate(ctx context.Context, instance *corev1beta1.OpenStackCont
182185
instance.Status.ContainerImages.DesignateWorkerImage = version.Status.ContainerImages.DesignateWorkerImage
183186
instance.Status.ContainerImages.DesignateBackendbind9Image = version.Status.ContainerImages.DesignateBackendbind9Image
184187
instance.Status.ContainerImages.DesignateUnboundImage = version.Status.ContainerImages.DesignateUnboundImage
188+
instance.Status.ContainerImages.NetUtilsImage = version.Status.ContainerImages.NetUtilsImage
185189
instance.Status.Conditions.MarkTrue(corev1beta1.OpenStackControlPlaneDesignateReadyCondition, corev1beta1.OpenStackControlPlaneDesignateReadyMessage)
186190
} else {
187191
instance.Status.Conditions.Set(condition.FalseCondition(

0 commit comments

Comments
 (0)