Skip to content

Commit 08d9499

Browse files
amoralejamoralej
committed
Add Watcher service containers to OpenStackVersion
Add the three related containers to the OpenStackVersion container images list and add default values. Note that Watcher Operator does not work with containers from Antelope release so I am setting master ones as defaults.
1 parent 9eeb2e2 commit 08d9499

10 files changed

Lines changed: 81 additions & 1 deletion

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18803,6 +18803,12 @@ spec:
1880318803
type: string
1880418804
testTobikoImage:
1880518805
type: string
18806+
watcherAPIImage:
18807+
type: string
18808+
watcherApplierImage:
18809+
type: string
18810+
watcherDecisionEngineImage:
18811+
type: string
1880618812
type: object
1880718813
deployedOVNVersion:
1880818814
type: string

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,12 @@ spec:
225225
type: string
226226
testTobikoImage:
227227
type: string
228+
watcherAPIImage:
229+
type: string
230+
watcherApplierImage:
231+
type: string
232+
watcherDecisionEngineImage:
233+
type: string
228234
type: object
229235
targetVersion:
230236
type: string
@@ -447,6 +453,12 @@ spec:
447453
type: string
448454
testTobikoImage:
449455
type: string
456+
watcherAPIImage:
457+
type: string
458+
watcherApplierImage:
459+
type: string
460+
watcherDecisionEngineImage:
461+
type: string
450462
type: object
451463
type: object
452464
containerImages:
@@ -639,6 +651,12 @@ spec:
639651
type: string
640652
testTobikoImage:
641653
type: string
654+
watcherAPIImage:
655+
type: string
656+
watcherApplierImage:
657+
type: string
658+
watcherDecisionEngineImage:
659+
type: string
642660
type: object
643661
deployedVersion:
644662
type: string

‎apis/core/v1beta1/openstackversion_types.go‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,9 @@ type ContainerTemplate struct {
164164
TestTobikoImage *string `json:"testTobikoImage,omitempty"`
165165
TestHorizontestImage *string `json:"testHorizontestImage,omitempty"`
166166
TestAnsibletestImage *string `json:"testAnsibletestImage,omitempty"`
167+
WatcherAPIImage *string `json:"watcherAPIImage,omitempty"`
168+
WatcherApplierImage *string `json:"watcherApplierImage,omitempty"`
169+
WatcherDecisionEngineImage *string `json:"watcherDecisionEngineImage,omitempty"`
167170
}
168171

169172
// ServiceDefaults - struct that contains defaults for OSP services that can change over time

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

Lines changed: 15 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: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18803,6 +18803,12 @@ spec:
1880318803
type: string
1880418804
testTobikoImage:
1880518805
type: string
18806+
watcherAPIImage:
18807+
type: string
18808+
watcherApplierImage:
18809+
type: string
18810+
watcherDecisionEngineImage:
18811+
type: string
1880618812
type: object
1880718813
deployedOVNVersion:
1880818814
type: string

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,12 @@ spec:
225225
type: string
226226
testTobikoImage:
227227
type: string
228+
watcherAPIImage:
229+
type: string
230+
watcherApplierImage:
231+
type: string
232+
watcherDecisionEngineImage:
233+
type: string
228234
type: object
229235
targetVersion:
230236
type: string
@@ -447,6 +453,12 @@ spec:
447453
type: string
448454
testTobikoImage:
449455
type: string
456+
watcherAPIImage:
457+
type: string
458+
watcherApplierImage:
459+
type: string
460+
watcherDecisionEngineImage:
461+
type: string
450462
type: object
451463
type: object
452464
containerImages:
@@ -639,6 +651,12 @@ spec:
639651
type: string
640652
testTobikoImage:
641653
type: string
654+
watcherAPIImage:
655+
type: string
656+
watcherApplierImage:
657+
type: string
658+
watcherDecisionEngineImage:
659+
type: string
642660
type: object
643661
deployedVersion:
644662
type: string

‎config/operator/default_images.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,12 @@ spec:
181181
value: quay.io/podified-antelope-centos9/openstack-swift-proxy-server:current-podified
182182
- name: RELATED_IMAGE_TEST_TEMPEST_IMAGE_URL_DEFAULT
183183
value: quay.io/podified-antelope-centos9/openstack-tempest-all:current-podified
184+
- name: RELATED_IMAGE_WATCHER_API_IMAGE_URL_DEFAULT
185+
value: quay.io/podified-master-centos9/openstack-watcher-api:current-podified
186+
- name: RELATED_IMAGE_WATCHER_APPLIER_IMAGE_URL_DEFAULT
187+
value: quay.io/podified-master-centos9/openstack-watcher-applier:current-podified
188+
- name: RELATED_IMAGE_WATCHER_DECISION_ENGINE_IMAGE_URL_DEFAULT
189+
value: quay.io/podified-master-centos9/openstack-watcher-decision-engine:current-podifie
184190
# NOTE: TEST_ images below do not get released downstream. They should not be prefixed with RELATED
185191
- name: TEST_TOBIKO_IMAGE_URL_DEFAULT
186192
value: quay.io/podified-antelope-centos9/openstack-tobiko:current-podified

‎hack/export_related_images.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,9 @@ export RELATED_IMAGE_EDPM_OPENSTACK_NETWORK_EXPORTER_IMAGE_URL_DEFAULT=quay.io/o
8787
export RELATED_IMAGE_EDPM_KEPLER_IMAGE_URL_DEFAULT=quay.io/sustainable_computing_io/kepler:release-0.7.12
8888
export RELATED_IMAGE_EDPM_PODMAN_EXPORTER_IMAGE_URL_DEFAULT=quay.io/navidys/prometheus-podman-exporter:v1.10.1
8989
export RELATED_IMAGE_TEST_TEMPEST_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-tempest-all:current-podified
90+
export RELATED_IMAGE_WATCHER_API_IMAGE_URL_DEFAULT=quay.io/podified-master-centos9/openstack-watcher-api:current-podified
91+
export RELATED_IMAGE_WATCHER_APPLIER_IMAGE_URL_DEFAULT=quay.io/podified-master-centos9/openstack-watcher-applier:current-podified
92+
export RELATED_IMAGE_WATCHER_DECISION_ENGINE_IMAGE_URL_DEFAULT=quay.io/podified-master-centos9/openstack-watcher-decision-engine:current-podified
9093
#NOTE: TEST_ images below do not get released downstream. They should not be prefixed with RELATED
9194
export TEST_TOBIKO_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-tobiko:current-podified
9295
export TEST_ANSIBLETEST_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-ansible-tests:current-podified

‎pkg/openstack/version.go‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,9 @@ func GetContainerImages(defaults *corev1beta1.ContainerDefaults, instance corev1
186186
TestTobikoImage: getImg(instance.Spec.CustomContainerImages.TestTobikoImage, defaults.TestTobikoImage),
187187
TestHorizontestImage: getImg(instance.Spec.CustomContainerImages.TestHorizontestImage, defaults.TestHorizontestImage),
188188
TestAnsibletestImage: getImg(instance.Spec.CustomContainerImages.TestAnsibletestImage, defaults.TestAnsibletestImage),
189+
WatcherAPIImage: getImg(instance.Spec.CustomContainerImages.WatcherAPIImage, defaults.WatcherAPIImage),
190+
WatcherApplierImage: getImg(instance.Spec.CustomContainerImages.WatcherApplierImage, defaults.WatcherApplierImage),
191+
WatcherDecisionEngineImage: getImg(instance.Spec.CustomContainerImages.WatcherDecisionEngineImage, defaults.WatcherDecisionEngineImage),
189192
}}
190193
if containerImages.CinderVolumeImages == nil {
191194
containerImages.CinderVolumeImages = make(map[string]*string)

‎tests/functional/ctlplane/openstackversion_controller_test.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,9 @@ var _ = Describe("OpenStackOperator controller", func() {
187187
g.Expect(version.Status.ContainerImages.TestTobikoImage).ShouldNot(BeNil())
188188
g.Expect(version.Status.ContainerImages.TestHorizontestImage).ShouldNot(BeNil())
189189
g.Expect(version.Status.ContainerImages.TestAnsibletestImage).ShouldNot(BeNil())
190-
190+
g.Expect(version.Status.ContainerImages.WatcherAPIImage).ShouldNot(BeNil())
191+
g.Expect(version.Status.ContainerImages.WatcherDecisionEngineImage).ShouldNot(BeNil())
192+
g.Expect(version.Status.ContainerImages.WatcherApplierImage).ShouldNot(BeNil())
191193
}, timeout, interval).Should(Succeed())
192194
})
193195

0 commit comments

Comments
 (0)