diff --git a/config/samples/watcher_v1beta1_watcher.yaml b/config/samples/watcher_v1beta1_watcher.yaml index 441eaf8..334e35d 100644 --- a/config/samples/watcher_v1beta1_watcher.yaml +++ b/config/samples/watcher_v1beta1_watcher.yaml @@ -10,3 +10,8 @@ metadata: name: watcher 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" + tls: + caBundleSecretName: "combined-ca-bundle" diff --git a/tests/kuttl/test-suites/default/common/deploy-with-defaults.yaml b/tests/kuttl/test-suites/default/common/deploy-with-defaults.yaml index b008f3f..6f5d337 100644 --- a/tests/kuttl/test-suites/default/common/deploy-with-defaults.yaml +++ b/tests/kuttl/test-suites/default/common/deploy-with-defaults.yaml @@ -8,3 +8,5 @@ spec: 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" + tls: + caBundleSecretName: "combined-ca-bundle" diff --git a/tests/kuttl/test-suites/default/deps/infra.yaml b/tests/kuttl/test-suites/default/deps/infra.yaml index 31b56f9..b6e9353 100644 --- a/tests/kuttl/test-suites/default/deps/infra.yaml +++ b/tests/kuttl/test-suites/default/deps/infra.yaml @@ -31,4 +31,4 @@ spec: cinder: enabled: false telemetry: - enabled: false + enabled: true diff --git a/tests/kuttl/test-suites/default/deps/kustomization.yaml b/tests/kuttl/test-suites/default/deps/kustomization.yaml index 30d1d12..a4d7c10 100644 --- a/tests/kuttl/test-suites/default/deps/kustomization.yaml +++ b/tests/kuttl/test-suites/default/deps/kustomization.yaml @@ -5,6 +5,8 @@ namespace: watcher-kuttl-default secretGenerator: - literals: - AdminPassword=password + - AodhPassword=password + - CeilometerPassword=password - DbRootPassword=password - DatabasePassword=password - WatcherPassword=password @@ -40,3 +42,4 @@ patches: secret: osp-secret - path: infra.yaml - path: keystone.yaml +- path: telemetry.yaml diff --git a/tests/kuttl/test-suites/default/deps/telemetry.yaml b/tests/kuttl/test-suites/default/deps/telemetry.yaml new file mode 100644 index 0000000..67cbc76 --- /dev/null +++ b/tests/kuttl/test-suites/default/deps/telemetry.yaml @@ -0,0 +1,35 @@ +apiVersion: core.openstack.org/v1beta1 +kind: OpenStackControlPlane +metadata: + name: openstack +spec: + telemetry: + template: + metricStorage: + enabled: true + dashboardsEnabled: true + monitoringStack: + alertingEnabled: true + scrapeInterval: 30s + storage: + strategy: persistent + retention: 24h + persistent: + pvcStorageRequest: 1G + autoscaling: + enabled: false + aodh: + passwordSelectors: + databaseAccount: aodh + databaseInstance: openstack + secret: osp-secret + heatInstance: heat + ceilometer: + enabled: true + secret: osp-secret + passwordSelector: + aodhService: AodhPassword + ceilometerService: CeilometerPassword + serviceUser: ceilometer + logging: + enabled: false diff --git a/tests/kuttl/test-suites/default/watcher/04-deploy-with-precreated-account.yaml b/tests/kuttl/test-suites/default/watcher/04-deploy-with-precreated-account.yaml index 87b740e..fc3b472 100644 --- a/tests/kuttl/test-suites/default/watcher/04-deploy-with-precreated-account.yaml +++ b/tests/kuttl/test-suites/default/watcher/04-deploy-with-precreated-account.yaml @@ -9,5 +9,7 @@ spec: 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" + tls: + caBundleSecretName: "combined-ca-bundle" apiServiceTemplate: replicas: 2