Skip to content

Default watcher container images to master release #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 1 commit into from
Jan 20, 2025
Merged

Default watcher container images to master release #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,9 +449,9 @@ SKIP_CERT ?=false
.PHONY: run-with-webhook
run-with-webhook: export METRICS_PORT?=33080
run-with-webhook: export HEALTH_PORT?=33081
run-with-webhook: export WATCHER_API_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-watcher-api:current-podified
run-with-webhook: export WATCHER_DECISION_ENGINE_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-watcher-decision-engine:current-podified
run-with-webhook: export WATCHER_APPLIER_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-watcher-applier:current-podified
run-with-webhook: export WATCHER_API_IMAGE_URL_DEFAULT=quay.io/podified-master-centos9/openstack-watcher-api:current-podified
run-with-webhook: export WATCHER_DECISION_ENGINE_IMAGE_URL_DEFAULT=quay.io/podified-master-centos9/openstack-watcher-decision-engine:current-podified
run-with-webhook: export WATCHER_APPLIER_IMAGE_URL_DEFAULT=quay.io/podified-master-centos9/openstack-watcher-applier:current-podified
run-with-webhook: manifests generate fmt vet ## Run a controller from your host.
/bin/bash hack/clean_local_webhook.sh
/bin/bash hack/run_with_local_webhook.sh
Expand Down
6 changes: 3 additions & 3 deletions api/v1beta1/common_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ import (

// Container image fall-back defaults
const (
WatcherAPIContainerImage = "quay.io/podified-antelope-centos9/openstack-watcher-api:current-podified"
WatcherDecisionEngineContainerImage = "quay.io/podified-antelope-centos9/openstack-watcher-decision-engine:current-podified"
WatcherApplierContainerImage = "quay.io/podified-antelope-centos9/openstack-watcher-applier:current-podified"
WatcherAPIContainerImage = "quay.io/podified-master-centos9/openstack-watcher-api:current-podified"
WatcherDecisionEngineContainerImage = "quay.io/podified-master-centos9/openstack-watcher-decision-engine:current-podified"
WatcherApplierContainerImage = "quay.io/podified-master-centos9/openstack-watcher-applier:current-podified"
)

// WatcherCommon defines a spec based reusable for all the CRDs
Expand Down
6 changes: 3 additions & 3 deletions config/default/manager_default_images.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ spec:
- name: manager
env:
- name: WATCHER_API_IMAGE_URL_DEFAULT
value: quay.io/podified-antelope-centos9/openstack-watcher-api:current-podified
value: quay.io/podified-master-centos9/openstack-watcher-api:current-podified
- name: WATCHER_DECISION_ENGINE_IMAGE_URL_DEFAULT
value: quay.io/podified-antelope-centos9/openstack-watcher-decision-engine:current-podified
value: quay.io/podified-master-centos9/openstack-watcher-decision-engine:current-podified
- name: WATCHER_APPLIER_IMAGE_URL_DEFAULT
value: quay.io/podified-antelope-centos9/openstack-watcher-applier:current-podified
value: quay.io/podified-master-centos9/openstack-watcher-applier:current-podified
3 changes: 0 additions & 3 deletions config/samples/watcher_v1beta1_watcherapi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,4 @@ metadata:
spec:
secret: "watcher"
memcachedInstance: "memcached"
# jgilaber this field should be removed once we create the WatcherAPI from
# the Watcher controller
containerImage: "quay.io/podified-antelope-centos9/openstack-watcher-api:current-podified"
serviceAccount: "watcher-watcher"
3 changes: 0 additions & 3 deletions tests/kuttl/test-suites/default/common/deploy-with-defaults.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,3 @@ metadata:
namespace: watcher-kuttl-default
spec:
databaseInstance: "openstack"
apiContainerImageURL: "quay.io/podified-master-centos9/openstack-watcher-api:current-podified"
decisionengineContainerImageURL: "quay.io/podified-master-centos9/openstack-watcher-decision-engine:current-podified"
applierContainerImageURL: "quay.io/podified-master-centos9/openstack-watcher-applier:current-podified"
3 changes: 0 additions & 3 deletions tests/kuttl/test-suites/default/watcher/04-deploy-with-precreated-account.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,5 @@ metadata:
spec:
databaseInstance: "openstack"
databaseAccount: watcher-precreated
apiContainerImageURL: "quay.io/podified-master-centos9/openstack-watcher-api:current-podified"
decisionengineContainerImageURL: "quay.io/podified-master-centos9/openstack-watcher-decision-engine:current-podified"
applierContainerImageURL: "quay.io/podified-master-centos9/openstack-watcher-applier:current-podified"
apiServiceTemplate:
replicas: 2
Loading