Skip to content

Commit b3d7af3

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 53cafeb commit b3d7af3

11 files changed

+105
-1
lines changed

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15286,6 +15286,12 @@ spec:
1528615286
type: string
1528715287
testTobikoImage:
1528815288
type: string
15289+
watcherAPIImage:
15290+
type: string
15291+
watcherApplierImage:
15292+
type: string
15293+
watcherDecisionEngineImage:
15294+
type: string
1528915295
type: object
1529015296
deployedOVNVersion:
1529115297
type: string

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,12 @@ spec:
227227
type: string
228228
testTobikoImage:
229229
type: string
230+
watcherAPIImage:
231+
type: string
232+
watcherApplierImage:
233+
type: string
234+
watcherDecisionEngineImage:
235+
type: string
230236
type: object
231237
targetVersion:
232238
type: string
@@ -451,6 +457,12 @@ spec:
451457
type: string
452458
testTobikoImage:
453459
type: string
460+
watcherAPIImage:
461+
type: string
462+
watcherApplierImage:
463+
type: string
464+
watcherDecisionEngineImage:
465+
type: string
454466
type: object
455467
type: object
456468
containerImages:
@@ -645,6 +657,12 @@ spec:
645657
type: string
646658
testTobikoImage:
647659
type: string
660+
watcherAPIImage:
661+
type: string
662+
watcherApplierImage:
663+
type: string
664+
watcherDecisionEngineImage:
665+
type: string
648666
type: object
649667
deployedVersion:
650668
type: string

‎apis/core/v1beta1/openstackversion_types.go‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,9 @@ type ContainerTemplate struct {
166166
TestTobikoImage *string `json:"testTobikoImage,omitempty"`
167167
TestHorizontestImage *string `json:"testHorizontestImage,omitempty"`
168168
TestAnsibletestImage *string `json:"testAnsibletestImage,omitempty"`
169+
WatcherAPIImage *string `json:"watcherAPIImage,omitempty"`
170+
WatcherApplierImage *string `json:"watcherApplierImage,omitempty"`
171+
WatcherDecisionEngineImage *string `json:"watcherDecisionEngineImage,omitempty"`
169172
}
170173

171174
// 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.

‎bindata/crds/crds.yaml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15450,6 +15450,12 @@ spec:
1545015450
type: string
1545115451
testTobikoImage:
1545215452
type: string
15453+
watcherAPIImage:
15454+
type: string
15455+
watcherApplierImage:
15456+
type: string
15457+
watcherDecisionEngineImage:
15458+
type: string
1545315459
type: object
1545415460
deployedOVNVersion:
1545515461
type: string
@@ -17037,6 +17043,12 @@ spec:
1703717043
type: string
1703817044
testTobikoImage:
1703917045
type: string
17046+
watcherAPIImage:
17047+
type: string
17048+
watcherApplierImage:
17049+
type: string
17050+
watcherDecisionEngineImage:
17051+
type: string
1704017052
type: object
1704117053
targetVersion:
1704217054
type: string
@@ -17261,6 +17273,12 @@ spec:
1726117273
type: string
1726217274
testTobikoImage:
1726317275
type: string
17276+
watcherAPIImage:
17277+
type: string
17278+
watcherApplierImage:
17279+
type: string
17280+
watcherDecisionEngineImage:
17281+
type: string
1726417282
type: object
1726517283
type: object
1726617284
containerImages:
@@ -17455,6 +17473,12 @@ spec:
1745517473
type: string
1745617474
testTobikoImage:
1745717475
type: string
17476+
watcherAPIImage:
17477+
type: string
17478+
watcherApplierImage:
17479+
type: string
17480+
watcherDecisionEngineImage:
17481+
type: string
1745817482
type: object
1745917483
deployedVersion:
1746017484
type: string

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15286,6 +15286,12 @@ spec:
1528615286
type: string
1528715287
testTobikoImage:
1528815288
type: string
15289+
watcherAPIImage:
15290+
type: string
15291+
watcherApplierImage:
15292+
type: string
15293+
watcherDecisionEngineImage:
15294+
type: string
1528915295
type: object
1529015296
deployedOVNVersion:
1529115297
type: string

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,12 @@ spec:
227227
type: string
228228
testTobikoImage:
229229
type: string
230+
watcherAPIImage:
231+
type: string
232+
watcherApplierImage:
233+
type: string
234+
watcherDecisionEngineImage:
235+
type: string
230236
type: object
231237
targetVersion:
232238
type: string
@@ -451,6 +457,12 @@ spec:
451457
type: string
452458
testTobikoImage:
453459
type: string
460+
watcherAPIImage:
461+
type: string
462+
watcherApplierImage:
463+
type: string
464+
watcherDecisionEngineImage:
465+
type: string
454466
type: object
455467
type: object
456468
containerImages:
@@ -645,6 +657,12 @@ spec:
645657
type: string
646658
testTobikoImage:
647659
type: string
660+
watcherAPIImage:
661+
type: string
662+
watcherApplierImage:
663+
type: string
664+
watcherDecisionEngineImage:
665+
type: string
648666
type: object
649667
deployedVersion:
650668
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-podified
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_OPENSTACK_NETWORK_EXPORTER_IMAGE_URL_DEFAULT=quay.io/openst
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
@@ -199,6 +199,9 @@ func GetContainerImages(defaults *corev1beta1.ContainerDefaults, instance corev1
199199
TestTobikoImage: getImg(instance.Spec.CustomContainerImages.TestTobikoImage, defaults.TestTobikoImage),
200200
TestHorizontestImage: getImg(instance.Spec.CustomContainerImages.TestHorizontestImage, defaults.TestHorizontestImage),
201201
TestAnsibletestImage: getImg(instance.Spec.CustomContainerImages.TestAnsibletestImage, defaults.TestAnsibletestImage),
202+
WatcherAPIImage: getImg(instance.Spec.CustomContainerImages.WatcherAPIImage, defaults.WatcherAPIImage),
203+
WatcherApplierImage: getImg(instance.Spec.CustomContainerImages.WatcherApplierImage, defaults.WatcherApplierImage),
204+
WatcherDecisionEngineImage: getImg(instance.Spec.CustomContainerImages.WatcherDecisionEngineImage, defaults.WatcherDecisionEngineImage),
202205
}}
203206
if containerImages.CinderVolumeImages == nil {
204207
containerImages.CinderVolumeImages = make(map[string]*string)

0 commit comments

Comments
 (0)