diff --git a/.github/actions/deploy-keptn-on-cluster/action.yml b/.github/actions/deploy-keptn-on-cluster/action.yml index d25b2a6cbb..8b98bd8de5 100644 --- a/.github/actions/deploy-keptn-on-cluster/action.yml +++ b/.github/actions/deploy-keptn-on-cluster/action.yml @@ -98,6 +98,6 @@ runs: echo "installing with values.yaml file:" cat tmp.yaml - helm install -n keptn-lifecycle-toolkit-system --create-namespace keptn ../../../chart \ + helm install -n keptn-system --create-namespace keptn ../../../chart \ --values ./tmp.yaml \ --debug --wait --timeout 1m diff --git a/.github/scripts/.helm-tests/default/result.yaml b/.github/scripts/.helm-tests/default/result.yaml index 0581181603..447ea80af2 100644 --- a/.github/scripts/.helm-tests/default/result.yaml +++ b/.github/scripts/.helm-tests/default/result.yaml @@ -9407,7 +9407,7 @@ webhooks: - lifecycle-operator - key: kubernetes.io/metadata.name operator: NotIn - values: ["cert-manager","keptn-lifecycle-toolkit-system","observability","monitoring"] + values: ["cert-manager","keptn-system","observability","monitoring"] - key: kubernetes.io/metadata.name operator: NotIn values: diff --git a/.github/scripts/.helm-tests/lifecycle-with-certs/result.yaml b/.github/scripts/.helm-tests/lifecycle-with-certs/result.yaml index 8462c0a297..9b9d0672bf 100644 --- a/.github/scripts/.helm-tests/lifecycle-with-certs/result.yaml +++ b/.github/scripts/.helm-tests/lifecycle-with-certs/result.yaml @@ -6989,7 +6989,7 @@ webhooks: - lifecycle-operator - key: kubernetes.io/metadata.name operator: NotIn - values: ["cert-manager","keptn-lifecycle-toolkit-system","observability","monitoring"] + values: ["cert-manager","keptn-system","observability","monitoring"] - key: kubernetes.io/metadata.name operator: NotIn values: diff --git a/Makefile b/Makefile index 2b93c643c5..4e9e17f03c 100644 --- a/Makefile +++ b/Makefile @@ -120,7 +120,7 @@ build-deploy-scheduler: $(MAKE) -C scheduler release-local.$(ARCH) RELEASE_REGISTRY=$(RELEASE_REGISTRY) TAG=$(TAG) $(MAKE) -C scheduler push-local RELEASE_REGISTRY=$(RELEASE_REGISTRY) TAG=$(TAG) $(MAKE) -C scheduler release-manifests RELEASE_REGISTRY=$(RELEASE_REGISTRY) CHART_APPVERSION=$(TAG) ARCH=$(ARCH) - kubectl create namespace keptn-lifecycle-toolkit-system --dry-run=client -o yaml | kubectl apply -f - + kubectl create namespace keptn-system --dry-run=client -o yaml | kubectl apply -f - kubectl apply -f scheduler/config/rendered/release.yaml .PHONY: build-deploy-certmanager @@ -128,7 +128,7 @@ build-deploy-certmanager: $(MAKE) -C keptn-cert-manager release-local.$(ARCH) RELEASE_REGISTRY=$(RELEASE_REGISTRY) TAG=$(TAG) $(MAKE) -C keptn-cert-manager push-local RELEASE_REGISTRY=$(RELEASE_REGISTRY) TAG=$(TAG) $(MAKE) -C keptn-cert-manager release-manifests RELEASE_REGISTRY=$(RELEASE_REGISTRY) CHART_APPVERSION=$(TAG) ARCH=$(ARCH) - kubectl create namespace keptn-lifecycle-toolkit-system --dry-run=client -o yaml | kubectl apply -f - + kubectl create namespace keptn-system --dry-run=client -o yaml | kubectl apply -f - kubectl apply -f keptn-cert-manager/config/rendered/release.yaml .PHONY: build-deploy-dev-environment diff --git a/README.md b/README.md index 318e91b92e..5b18ed66dc 100644 --- a/README.md +++ b/README.md @@ -79,7 +79,7 @@ to install the latest release of Keptn: ```shell helm repo add keptn https://charts.lifecycle.keptn.sh helm repo update -helm upgrade --install keptn keptn/keptn -n keptn-lifecycle-toolkit-system --create-namespace --wait +helm upgrade --install keptn keptn/keptn -n keptn-system --create-namespace --wait ``` ### Installation with only certain namespaces allowed @@ -90,7 +90,7 @@ Keptn lifecycle orchestration is by default enabled for all namespaces except th - `kube-public` - `kube-node-lease` - `cert-manager` -- `keptn-lifecycle-toolkit-system` +- `keptn-system` - `observability` - `monitoring` - `` @@ -112,7 +112,7 @@ and add the values file to the helm installation command: ```shell helm repo add keptn https://charts.lifecycle.keptn.sh helm repo update -helm upgrade --install keptn keptn/keptn -n keptn-lifecycle-toolkit-system --values values.yaml --create-namespace --wait +helm upgrade --install keptn keptn/keptn -n keptn-system --values values.yaml --create-namespace --wait ``` > **Note** @@ -147,7 +147,7 @@ to install Keptn with scheduling gates enabled: ```shell helm repo add keptn https://charts.lifecycle.keptn.sh helm repo update -helm upgrade --install keptn keptn/keptn -n keptn-lifecycle-toolkit-system --set schedulingGatesEnabled=true --create-namespace --wait +helm upgrade --install keptn keptn/keptn -n keptn-system --set schedulingGatesEnabled=true --create-namespace --wait ``` > **Note** @@ -327,11 +327,11 @@ Please find more information in the [LICENSE](LICENSE) file. - + Made with [contrib.rocks](https://contrib.rocks). - + diff --git a/dashboards/grafana/README.md b/dashboards/grafana/README.md index e57567c8cd..2e13089591 100644 --- a/dashboards/grafana/README.md +++ b/dashboards/grafana/README.md @@ -35,5 +35,5 @@ If you prefer to prepare the dashboards for the examples and importing them as j make import-json ``` - + diff --git a/docs/content/en/docs/components/certificate-operator/_index.md b/docs/content/en/docs/components/certificate-operator/_index.md index 58d1083191..0351da768f 100644 --- a/docs/content/en/docs/components/certificate-operator/_index.md +++ b/docs/content/en/docs/components/certificate-operator/_index.md @@ -23,7 +23,7 @@ the [keptn-cert-manager](https://github.com/keptn/lifecycle-toolkit/blob/main/ke How it works: * The certificate is created as a secret -in the `keptn-lifecycle-toolkit-system` namespace +in the `keptn-system` namespace with a renewal threshold of 12 hours. * If the certificate expires, the [keptn-cert-manager](https://github.com/keptn/lifecycle-toolkit/blob/main/keptn-cert-manager/README.md) @@ -49,11 +49,11 @@ because of an invalid certificate. To solve this, delete the certificate and restart the operator. The Keptn cert-manager certificate is stored as a secret in the -`keptn-lifecycle-toolkit-system` namespace. +`keptn-system` namespace. To retrieve it: ```shell -kubectl get secrets -n keptn-lifecycle-toolkit-system +kubectl get secrets -n keptn-system ``` This returns something like: @@ -67,5 +67,5 @@ Specify the `NAME` of the Keptn certificate (`keptn-certs` in this case) to delete the Keptn certificate: ```shell -kubectl delete secret keptn-certs -n keptn-lifecycle-toolkit-system +kubectl delete secret keptn-certs -n keptn-system ``` diff --git a/docs/content/en/docs/getting-started/observability.md b/docs/content/en/docs/getting-started/observability.md index c38a34815c..998d91dd31 100644 --- a/docs/content/en/docs/getting-started/observability.md +++ b/docs/content/en/docs/getting-started/observability.md @@ -54,7 +54,7 @@ Install Keptn using Helm: ```shell helm repo add keptn https://charts.lifecycle.keptn.sh helm repo update -helm upgrade --install keptn keptn/keptn -n keptn-lifecycle-toolkit-system --create-namespace --wait +helm upgrade --install keptn keptn/keptn -n keptn-system --create-namespace --wait ``` Keptn will need to know where to send OpenTelemetry traces. @@ -70,9 +70,9 @@ apiVersion: options.keptn.sh/v1alpha1 kind: KeptnConfig metadata: name: keptnconfig-sample - namespace: keptn-lifecycle-toolkit-system + namespace: keptn-system spec: - OTelCollectorUrl: 'jaeger-collector.keptn-lifecycle-toolkit-system.svc.cluster.local:4317' + OTelCollectorUrl: 'jaeger-collector.keptn-system.svc.cluster.local:4317' keptnAppCreationRequestTimeoutSeconds: 30 ``` @@ -248,7 +248,7 @@ To see these raw metrics: ```shell SERVICE=$(kubectl get svc -l control-plane=lifecycle-operator -A -ojsonpath="{.items[0].metadata.name}") -kubectl -n keptn-lifecycle-toolkit-system port-forward svc/$SERVICE 2222 +kubectl -n keptn-system port-forward svc/$SERVICE 2222 ``` Note that this command will (and should) continue to run in your terminal windows. @@ -315,14 +315,14 @@ Install Jaeger to store and visualise the deployment traces generated by Keptn: kubectl create namespace observability kubectl apply -f https://github.com/jaegertracing/jaeger-operator/releases/download/v1.46.0/jaeger-operator.yaml -n observability kubectl wait --for=condition=available deployment/jaeger-operator -n observability --timeout=300s -kubectl apply -f jaeger.yaml -n keptn-lifecycle-toolkit-system -kubectl wait --for=condition=available deployment/jaeger -n keptn-lifecycle-toolkit-system --timeout=300s +kubectl apply -f jaeger.yaml -n keptn-system +kubectl wait --for=condition=available deployment/jaeger -n keptn-system --timeout=300s ``` Port-forward to access Jaeger: ```shell -kubectl -n keptn-lifecycle-toolkit-system port-forward svc/jaeger-query 16686 +kubectl -n keptn-system port-forward svc/jaeger-query 16686 ``` Jaeger is available on `http://localhost:16686` @@ -377,7 +377,7 @@ stringData: "typeName":"Jaeger", "typeLogoUrl":"public/app/plugins/datasource/jaeger/img/jaeger_logo.svg", "access":"proxy", - "url":"http://jaeger-query.keptn-lifecycle-toolkit-system.svc.cluster.local:16686", + "url":"http://jaeger-query.keptn-system.svc.cluster.local:16686", "user":"", "database":"", "basicAuth":false, @@ -415,7 +415,7 @@ prometheus: - job_name: "scrape_klt" scrape_interval: 5s static_configs: - - targets: ['lifecycle-operator-metrics-service.keptn-lifecycle-toolkit-system.svc.cluster.local:2222'] + - targets: ['lifecycle-operator-metrics-service.keptn-system.svc.cluster.local:2222'] ``` ```shell diff --git a/docs/content/en/docs/guides/dora.md b/docs/content/en/docs/guides/dora.md index 807a5a587e..81aeac7f18 100644 --- a/docs/content/en/docs/guides/dora.md +++ b/docs/content/en/docs/guides/dora.md @@ -40,14 +40,14 @@ To view DORA metrics, run the following two commands: - Retrieve the service name with: ```shell - kubectl -n keptn-lifecycle-toolkit-system get service \ + kubectl -n keptn-system get service \ -l control-plane=lifecycle-operator ``` - Then port-forward to the name of your service: ```shell - kubectl -n keptn-lifecycle-toolkit-system port-forward \ + kubectl -n keptn-system port-forward \ service/ 2222 ``` diff --git a/docs/content/en/docs/guides/evaluatemetrics.md b/docs/content/en/docs/guides/evaluatemetrics.md index 7fd25ff481..6fb0688ff2 100644 --- a/docs/content/en/docs/guides/evaluatemetrics.md +++ b/docs/content/en/docs/guides/evaluatemetrics.md @@ -50,7 +50,7 @@ Note the following: on all namespaces in the cluster, create `KeptnMetricsProvider` and `KeptnMetric` resources in a centralized namespace - such as `keptn-lifecycle-toolkit-system`. + such as `keptn-system`. To configure a data provider into your Keptn cluster: @@ -223,7 +223,7 @@ $ kubectl get --raw "/apis/custom.metrics.k8s.io/v1beta2/namespaces/podtato-kube { "describedObject": { "kind": "KeptnMetric", - "namespace": "keptn-lifecycle-toolkit-system", + "namespace": "keptn-system", "name": "keptnmetric-sample", "apiVersion": "metrics.keptn.sh/v1beta1" }, diff --git a/docs/content/en/docs/guides/otel.md b/docs/content/en/docs/guides/otel.md index 30c1ff4894..ee9ef6d253 100644 --- a/docs/content/en/docs/guides/otel.md +++ b/docs/content/en/docs/guides/otel.md @@ -52,7 +52,7 @@ you must have the following on your cluster: - The Prometheus Operator must have the required permissions to watch resources of your Keptn namespace - (default is `keptn-lifecycle-toolkit-system`). + (default is `keptn-system`). See [Setup for Monitoring other Namespaces](https://prometheus-operator.dev/docs/kube/monitoring-other-namespaces/)). @@ -113,7 +113,7 @@ using this manifest, the command is: ```shell kubectl apply -f config/otel-collector.yaml \ - -n keptn-lifecycle-toolkit-system + -n keptn-system ``` Use the following command to confirm that the pod @@ -121,7 +121,7 @@ for the `otel-collector` deployment is up and running: ```shell $ kubectl get pods -lapp=opentelemetry \ - -n keptn-lifecycle-toolkit-system + -n keptn-system NAME READY STATUS RESTARTS AGE otel-collector-6fc4cc84d6-7hnvp 1/1 Running 0 92m @@ -133,7 +133,7 @@ you can edit the Collector `ConfigMap` with the following command: ```shell kubectl edit configmap otel-collector-conf \ - -n keptn-lifecycle-toolkit-system + -n keptn-system ``` When the `otel-collector` pod is up and running, @@ -142,7 +142,7 @@ so they can pick up the new configuration: ```shell kubectl rollout restart deployment \ - -n keptn-lifecycle-toolkit-system keptn-scheduler lifecycle-operator + -n keptn-system keptn-scheduler lifecycle-operator ``` Keptn begins to collect OpenTelemetry metrics @@ -157,7 +157,7 @@ via port `9999` of the Keptn metrics-operator. To access the metrics, use the following command: ```shell -kubectl port-forward deployment/metrics-operator 9999 -n keptn-lifecycle-toolkit-system +kubectl port-forward deployment/metrics-operator 9999 -n keptn-system ``` You can access the metrics from your browser at: `http://localhost:9999` diff --git a/docs/content/en/docs/installation/configuration/namespace.md b/docs/content/en/docs/installation/configuration/namespace.md index ee552ae877..f82b9b2990 100644 --- a/docs/content/en/docs/installation/configuration/namespace.md +++ b/docs/content/en/docs/installation/configuration/namespace.md @@ -31,7 +31,7 @@ Some considerations for Keptn: resources that are used for pre- and post-deployment can reference metrics from any namespace. So you can create `KeptnMetrics` in a centralized namespace - (such as `keptn-lifecycle-toolkit-system`) + (such as `keptn-system`) and access those metrics in evaluations on all namespaces in the cluster. * Analysis related resources ([Analysis](../../reference/crd-reference/analysis.md), diff --git a/docs/content/en/docs/installation/uninstall.md b/docs/content/en/docs/installation/uninstall.md index 53c44b6849..58f79768f0 100644 --- a/docs/content/en/docs/installation/uninstall.md +++ b/docs/content/en/docs/installation/uninstall.md @@ -13,9 +13,9 @@ you can uninstall it together with all CRDs, webhooks and custom resources with using the following command: ```shell -helm uninstall keptn -n keptn-lifecycle-toolkit-system +helm uninstall keptn -n keptn-system ``` If your Keptn instance is not installed in the -`keptn-lifecycle-toolkit-system` namespace, please substitute +`keptn-system` namespace, please substitute it with your custom one. diff --git a/docs/content/en/docs/installation/upgrade.md b/docs/content/en/docs/installation/upgrade.md index 1d5380095f..9ebb0e617e 100644 --- a/docs/content/en/docs/installation/upgrade.md +++ b/docs/content/en/docs/installation/upgrade.md @@ -14,7 +14,7 @@ by running the same command sequence used to install Keptn: helm repo add keptn https://charts.lifecycle.keptn.sh helm repo update helm upgrade --install keptn keptn/keptn \ - -n keptn-lifecycle-toolkit-system --create-namespace --wait + -n keptn-system --create-namespace --wait ``` Use the `--set` flag or download and edit the `values.yaml` file @@ -59,7 +59,7 @@ kubectl delete -f \ ```shell helm repo add keptn https://charts.lifecycle.keptn.sh helm repo update -helm upgrade --install keptn keptn/keptn -n keptn-lifecycle-toolkit-system --create-namespace --wait +helm upgrade --install keptn keptn/keptn -n keptn-system --create-namespace --wait ``` For information about advanced installation options, refer to diff --git a/docs/content/en/docs/migrate/metrics-observe.md b/docs/content/en/docs/migrate/metrics-observe.md index a2c8982e0c..1a6623e502 100644 --- a/docs/content/en/docs/migrate/metrics-observe.md +++ b/docs/content/en/docs/migrate/metrics-observe.md @@ -262,7 +262,7 @@ The process is: name: my-project-ad namespace: keptn-lifecycle-poc args: - ns: keptn-lifecycle-toolkit-system + ns: keptn-system project: my-project timeframe: from: "2023-09-14T11:20:19Z" diff --git a/docs/content/en/docs/reference/crd-reference/analysisdefinition.md b/docs/content/en/docs/reference/crd-reference/analysisdefinition.md index e849cae7fe..f1444f9856 100644 --- a/docs/content/en/docs/reference/crd-reference/analysisdefinition.md +++ b/docs/content/en/docs/reference/crd-reference/analysisdefinition.md @@ -123,12 +123,12 @@ apiVersion: metrics.keptn.sh/v1beta1 kind: AnalysisDefinition metadata: name: ed-my-proj-dev-svc1 - namespace: keptn-lifecycle-toolkit-system + namespace: keptn-system spec: objectives: - analysisValueTemplateRef: name: response-time-p95 - namespace: keptn-lifecycle-toolkit-system + namespace: keptn-system target: failure: : diff --git a/docs/content/en/docs/reference/crd-reference/evaluationdefinition.md b/docs/content/en/docs/reference/crd-reference/evaluationdefinition.md index 3aab0aa4e0..871cf68a85 100644 --- a/docs/content/en/docs/reference/crd-reference/evaluationdefinition.md +++ b/docs/content/en/docs/reference/crd-reference/evaluationdefinition.md @@ -76,7 +76,7 @@ but the `KeptnEvaluationDefinition` resources can reference metrics from any namespace in the cluster. This means that you can create `KeptnMetricsProvider` and `KeptnMetric` resources -in a centralized namespace (e.g. in `keptn-lifecycle-toolkit-system`) +in a centralized namespace (e.g. in `keptn-system`) and use those metrics in evaluations on all namespaces in the cluster. diff --git a/docs/content/en/docs/reference/crd-reference/metric.md b/docs/content/en/docs/reference/crd-reference/metric.md index ba98491305..69eb9a37d6 100644 --- a/docs/content/en/docs/reference/crd-reference/metric.md +++ b/docs/content/en/docs/reference/crd-reference/metric.md @@ -101,7 +101,7 @@ resources that are used for pre- and post-deployment evaluations. from any namespace. This means that you can create `KeptnMetricsProvider` and `KeptnMetric` resources -in a centralized namespace (e.g. in `keptn-lifecycle-toolkit-system`) +in a centralized namespace (e.g. in `keptn-system`) and access those metrics in evaluations on all namespaces in the cluster. diff --git a/docs/content/en/docs/reference/crd-reference/metricsprovider.md b/docs/content/en/docs/reference/crd-reference/metricsprovider.md index a058b239d9..308666f215 100644 --- a/docs/content/en/docs/reference/crd-reference/metricsprovider.md +++ b/docs/content/en/docs/reference/crd-reference/metricsprovider.md @@ -82,7 +82,7 @@ resources that are used for pre- and post-deployment evaluations. from any namespace. This means that you can create `KeptnMetricsProvider` and `KeptnMetric` resources -in a centralized namespace (e.g. in `keptn-lifecycle-toolkit-system`) +in a centralized namespace (e.g. in `keptn-system`) and access those metrics in evaluations on all namespaces in the cluster. diff --git a/examples/Makefile b/examples/Makefile index ea4bfe78d0..65a54423cb 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -1,6 +1,6 @@ # renovate: datasource=github-tags depName=jaegertracing/jaeger-operator JAEGER_VERSION ?= v1.51.0 -TOOLKIT_NAMESPACE ?= keptn-lifecycle-toolkit-system +TOOLKIT_NAMESPACE ?= keptn-system PODTATO_NAMESPACE ?= podtato-kubectl GRAFANA_PORT_FORWARD ?= 3000 diff --git a/examples/sample-app/README.md b/examples/sample-app/README.md index 71ae7f3839..98eb7207c4 100644 --- a/examples/sample-app/README.md +++ b/examples/sample-app/README.md @@ -75,5 +75,5 @@ The deployment should fail because of too few cpu resources * This should only change one service, you can see that only this changed in the trace - + diff --git a/examples/support/argo/Makefile b/examples/support/argo/Makefile index 8b6f10d0af..cb012ef3a3 100644 --- a/examples/support/argo/Makefile +++ b/examples/support/argo/Makefile @@ -1,4 +1,4 @@ -LFC_NAMESPACE ?= keptn-lifecycle-toolkit-system +LFC_NAMESPACE ?= keptn-system PODTATO_NAMESPACE ?= podtato-kubectl ARGO_NAMESPACE ?= argocd # renovate: datasource=github-tags depName=argoproj/argo-cd diff --git a/examples/support/argo/README.md b/examples/support/argo/README.md index f728f0cc88..f37d20614f 100644 --- a/examples/support/argo/README.md +++ b/examples/support/argo/README.md @@ -90,5 +90,5 @@ After some time all resources should be in a succeeded state. In the Argo-UI you will see that the application is in sync. - + diff --git a/examples/support/observability/Makefile b/examples/support/observability/Makefile index 274adead20..38d06a9f30 100644 --- a/examples/support/observability/Makefile +++ b/examples/support/observability/Makefile @@ -1,6 +1,6 @@ # renovate: datasource=github-tags depName=jaegertracing/jaeger-operator JAEGER_VERSION ?= v1.51.0 -TOOLKIT_NAMESPACE ?= keptn-lifecycle-toolkit-system +TOOLKIT_NAMESPACE ?= keptn-system PODTATO_NAMESPACE ?= podtato-kubectl GRAFANA_PORT_FORWARD ?= 3000 diff --git a/examples/support/observability/README.md b/examples/support/observability/README.md index e5d6dea5b1..55fd0bdfd1 100644 --- a/examples/support/observability/README.md +++ b/examples/support/observability/README.md @@ -42,7 +42,7 @@ To do so, please create a port-forward for the `jaeger-query` service: ```shell -kubectl port-forward -n keptn-lifecycle-toolkit-system svc/jaeger-query 16686 +kubectl port-forward -n keptn-system svc/jaeger-query 16686 ``` Afterwards, you can view the Jaeger UI in the browser at @@ -100,5 +100,5 @@ under `Dashboards > General`. ![Screenshot of a dashboard in Grafana](./assets/grafana_dashboard.png) - + diff --git a/examples/support/observability/config/jaeger.yaml b/examples/support/observability/config/jaeger.yaml index 686136e2c7..292daf67aa 100644 --- a/examples/support/observability/config/jaeger.yaml +++ b/examples/support/observability/config/jaeger.yaml @@ -2,4 +2,4 @@ apiVersion: jaegertracing.io/v1 kind: Jaeger metadata: name: jaeger - namespace: keptn-lifecycle-toolkit-system + namespace: keptn-system diff --git a/examples/support/observability/config/otel-collector.yaml b/examples/support/observability/config/otel-collector.yaml index 6d205cbe6c..0896e5300d 100644 --- a/examples/support/observability/config/otel-collector.yaml +++ b/examples/support/observability/config/otel-collector.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: otel-collector-conf - namespace: keptn-lifecycle-toolkit-system + namespace: keptn-system labels: app: opentelemetry component: otel-collector-conf @@ -51,7 +51,7 @@ apiVersion: v1 kind: Service metadata: name: otel-collector - namespace: keptn-lifecycle-toolkit-system + namespace: keptn-system labels: app: opentelemetry component: otel-collector @@ -74,7 +74,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: otel-collector - namespace: keptn-lifecycle-toolkit-system + namespace: keptn-system labels: app: opentelemetry component: otel-collector @@ -140,7 +140,7 @@ metadata: labels: serviceapp: otel-collector name: otel-collector - namespace: keptn-lifecycle-toolkit-system + namespace: keptn-system spec: endpoints: - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token @@ -148,7 +148,7 @@ spec: port: metrics namespaceSelector: matchNames: - - keptn-lifecycle-toolkit-system + - keptn-system selector: matchLabels: app: opentelemetry diff --git a/examples/support/observability/config/prometheus/grafana-dashboardDatasources.yaml b/examples/support/observability/config/prometheus/grafana-dashboardDatasources.yaml index 5f44352541..af8617b8de 100644 --- a/examples/support/observability/config/prometheus/grafana-dashboardDatasources.yaml +++ b/examples/support/observability/config/prometheus/grafana-dashboardDatasources.yaml @@ -29,7 +29,7 @@ stringData: "typeName":"Jaeger", "typeLogoUrl":"public/app/plugins/datasource/jaeger/img/jaeger_logo.svg", "access":"proxy", - "url":"http://jaeger-query.keptn-lifecycle-toolkit-system.svc.cluster.local:16686", + "url":"http://jaeger-query.keptn-system.svc.cluster.local:16686", "user":"", "database":"", "basicAuth":false, diff --git a/examples/support/observability/config/prometheus/prometheus-networkPolicy.yaml b/examples/support/observability/config/prometheus/prometheus-networkPolicy.yaml index 8ac5bc1ff3..a6a015dd44 100644 --- a/examples/support/observability/config/prometheus/prometheus-networkPolicy.yaml +++ b/examples/support/observability/config/prometheus/prometheus-networkPolicy.yaml @@ -32,7 +32,7 @@ spec: - from: - namespaceSelector: matchLabels: - kubernetes.io/metadata.name: keptn-lifecycle-toolkit-system + kubernetes.io/metadata.name: keptn-system ports: - port: 9090 protocol: TCP diff --git a/examples/support/observability/config/prometheus/prometheus-roleBindingSpecificNamespaces.yaml b/examples/support/observability/config/prometheus/prometheus-roleBindingSpecificNamespaces.yaml index 8dc80e65dc..cb505d95fd 100644 --- a/examples/support/observability/config/prometheus/prometheus-roleBindingSpecificNamespaces.yaml +++ b/examples/support/observability/config/prometheus/prometheus-roleBindingSpecificNamespaces.yaml @@ -67,7 +67,7 @@ items: app.kubernetes.io/part-of: kube-prometheus app.kubernetes.io/version: 2.39.1 name: prometheus-k8s - namespace: keptn-lifecycle-toolkit-system + namespace: keptn-system roleRef: apiGroup: rbac.authorization.k8s.io kind: Role diff --git a/examples/support/observability/config/prometheus/prometheus-roleSpecificNamespaces.yaml b/examples/support/observability/config/prometheus/prometheus-roleSpecificNamespaces.yaml index 6819f27625..bf7191e334 100644 --- a/examples/support/observability/config/prometheus/prometheus-roleSpecificNamespaces.yaml +++ b/examples/support/observability/config/prometheus/prometheus-roleSpecificNamespaces.yaml @@ -124,7 +124,7 @@ items: app.kubernetes.io/part-of: kube-prometheus app.kubernetes.io/version: 2.39.1 name: prometheus-k8s - namespace: keptn-lifecycle-toolkit-system + namespace: keptn-system rules: - apiGroups: - "" diff --git a/keptn-cert-manager/config/default/kustomization.yaml b/keptn-cert-manager/config/default/kustomization.yaml index 6c4d1552c2..db7d432697 100644 --- a/keptn-cert-manager/config/default/kustomization.yaml +++ b/keptn-cert-manager/config/default/kustomization.yaml @@ -1,5 +1,5 @@ # Adds namespace to all resources. -namespace: keptn-lifecycle-toolkit-system +namespace: keptn-system # Value of this field is prepended to the # names of all resources, e.g. a deployment named diff --git a/keptn-cert-manager/config/rbac/extra_role_binding.yaml b/keptn-cert-manager/config/rbac/extra_role_binding.yaml index 799cc99960..95ad9eb5a1 100644 --- a/keptn-cert-manager/config/rbac/extra_role_binding.yaml +++ b/keptn-cert-manager/config/rbac/extra_role_binding.yaml @@ -1,7 +1,7 @@ ## This is not autogenerated ## substitutes -# // +kubebuilder:rbac:groups="",namespace=keptn-lifecycle-toolkit-system,resources=secrets,verbs=get;list;watch;create;update;patch;delete -# // +kubebuilder:rbac:groups=admissionregistration.k8s.io,namespace=keptn-lifecycle-toolkit-system,resources=mutatingwebhookconfigurations,\ +# // +kubebuilder:rbac:groups="",namespace=keptn-system,resources=secrets,verbs=get;list;watch;create;update;patch;delete +# // +kubebuilder:rbac:groups=admissionregistration.k8s.io,namespace=keptn-system,resources=mutatingwebhookconfigurations,\ # verbs=get;list;watch;create;update;patch;delete apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding diff --git a/keptn-cert-manager/config/rbac/role.yaml b/keptn-cert-manager/config/rbac/role.yaml index c682555764..9321894d7d 100644 --- a/keptn-cert-manager/config/rbac/role.yaml +++ b/keptn-cert-manager/config/rbac/role.yaml @@ -47,7 +47,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: name: certificate-operator-role - namespace: keptn-lifecycle-toolkit-system + namespace: keptn-system rules: - apiGroups: - "" diff --git a/keptn-cert-manager/controllers/keptnwebhookcontroller/keptnwebhookcertificate_controller.go b/keptn-cert-manager/controllers/keptnwebhookcontroller/keptnwebhookcertificate_controller.go index c0559cb526..3ee823af91 100644 --- a/keptn-cert-manager/controllers/keptnwebhookcontroller/keptnwebhookcertificate_controller.go +++ b/keptn-cert-manager/controllers/keptnwebhookcontroller/keptnwebhookcertificate_controller.go @@ -79,8 +79,8 @@ type KeptnWebhookCertificateReconciler struct { // +kubebuilder:rbac:groups="apps",resources=deployments,verbs=get;list;watch; //role -// +kubebuilder:rbac:groups="",namespace=keptn-lifecycle-toolkit-system,resources=secrets,verbs=get;update;patch,resourceNames=keptn-certs -// +kubebuilder:rbac:groups="",namespace=keptn-lifecycle-toolkit-system,resources=secrets,verbs=create;list;watch +// +kubebuilder:rbac:groups="",namespace=keptn-system,resources=secrets,verbs=get;update;patch,resourceNames=keptn-certs +// +kubebuilder:rbac:groups="",namespace=keptn-system,resources=secrets,verbs=create;list;watch // Reconcile is part of the main kubernetes reconciliation loop which aims to // move the current state of the cluster closer to the desired state. diff --git a/keptn-cert-manager/main.go b/keptn-cert-manager/main.go index 980fc11011..f0219fc9c9 100644 --- a/keptn-cert-manager/main.go +++ b/keptn-cert-manager/main.go @@ -37,7 +37,7 @@ func init() { } type envConfig struct { - KeptnNamespace string `envconfig:"NAMESPACE" default:"keptn-lifecycle-toolkit-system"` + KeptnNamespace string `envconfig:"NAMESPACE" default:"keptn-system"` KeptnLabelSelectorKey string `envconfig:"LABEL_SELECTOR_KEY" default:"keptn.sh/inject-cert"` KeptnLabelSelectorValue string `envconfig:"LABEL_SELECTOR_VALUE" default:"true"` } diff --git a/lifecycle-operator/PROJECT b/lifecycle-operator/PROJECT index ade614adf0..189f0c59f1 100644 --- a/lifecycle-operator/PROJECT +++ b/lifecycle-operator/PROJECT @@ -2,7 +2,7 @@ domain: keptn.sh layout: - go.kubebuilder.io/v3 multigroup: true -projectName: keptn +projectName: lifecycle-operator repo: github.com/keptn/lifecycle-toolkit/lifecycle-operator resources: - api: diff --git a/lifecycle-operator/README.md b/lifecycle-operator/README.md index 261097eec0..db8e7c34dd 100644 --- a/lifecycle-operator/README.md +++ b/lifecycle-operator/README.md @@ -95,5 +95,5 @@ Run `make --help` for more information on all potential `make` targets More information can be found via the [Kubebuilder Documentation](https://book.kubebuilder.io/introduction.html) - + diff --git a/lifecycle-operator/chart/README.md b/lifecycle-operator/chart/README.md index 9b508e42b4..6df07b69ae 100644 --- a/lifecycle-operator/chart/README.md +++ b/lifecycle-operator/chart/README.md @@ -68,14 +68,14 @@ and application health checks ### Global -| Name | Description | Value | -| ------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------- | -| `kubernetesClusterDomain` | overrides cluster.local | `cluster.local` | -| `annotations` | add deployment level annotations | `{}` | -| `podAnnotations` | adds pod level annotations | `{}` | -| `schedulingGatesEnabled` | enables the scheduling gates in lifecycle-operator. This feature is available in alpha version from K8s 1.27 or 1.26 enabling the alpha version | `false` | -| `allowedNamespaces` | specifies the allowed namespaces for the lifecycle orchestration functionality | `[]` | -| `deniedNamespaces` | specifies a list of namespaces where the lifecycle orchestration functionality is disabled, ignored if `allowedNamespaces` is set | `["cert-manager","keptn-lifecycle-toolkit-system","observability","monitoring"]` | +| Name | Description | Value | +| ------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------- | +| `kubernetesClusterDomain` | overrides cluster.local | `cluster.local` | +| `annotations` | add deployment level annotations | `{}` | +| `podAnnotations` | adds pod level annotations | `{}` | +| `schedulingGatesEnabled` | enables the scheduling gates in lifecycle-operator. This feature is available in alpha version from K8s 1.27 or 1.26 enabling the alpha version | `false` | +| `allowedNamespaces` | specifies the allowed namespaces for the lifecycle orchestration functionality | `[]` | +| `deniedNamespaces` | specifies a list of namespaces where the lifecycle orchestration functionality is disabled, ignored if `allowedNamespaces` is set | `["cert-manager","keptn-system","observability","monitoring"]` | ### Keptn Scheduler diff --git a/lifecycle-operator/chart/values.yaml b/lifecycle-operator/chart/values.yaml index f0a7002047..d02576f24a 100644 --- a/lifecycle-operator/chart/values.yaml +++ b/lifecycle-operator/chart/values.yaml @@ -177,7 +177,7 @@ allowedNamespaces: [] ## @param deniedNamespaces specifies a list of namespaces where the lifecycle orchestration functionality is disabled, ignored if `allowedNamespaces` is set deniedNamespaces: - cert-manager - - keptn-lifecycle-toolkit-system + - keptn-system - observability - monitoring diff --git a/lifecycle-operator/config/default/kustomization.yaml b/lifecycle-operator/config/default/kustomization.yaml index c349a400b4..fb6c0f3484 100644 --- a/lifecycle-operator/config/default/kustomization.yaml +++ b/lifecycle-operator/config/default/kustomization.yaml @@ -1,5 +1,5 @@ # Adds namespace to all resources. -namespace: keptn-lifecycle-toolkit-system +namespace: keptn-system apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization diff --git a/lifecycle-operator/config/default/webhooknamespaces_patch.yaml b/lifecycle-operator/config/default/webhooknamespaces_patch.yaml index 7ea4daf056..b97ff4c0c7 100644 --- a/lifecycle-operator/config/default/webhooknamespaces_patch.yaml +++ b/lifecycle-operator/config/default/webhooknamespaces_patch.yaml @@ -22,6 +22,6 @@ webhooks: - "kube-public" - "kube-node-lease" - "cert-manager" - - "keptn-lifecycle-toolkit-system" + - "keptn-system" - "observability" - "monitoring" diff --git a/lifecycle-operator/controllers/options/keptnconfig_controller_test.go b/lifecycle-operator/controllers/options/keptnconfig_controller_test.go index 79a3f21392..d4bd3cbe2a 100644 --- a/lifecycle-operator/controllers/options/keptnconfig_controller_test.go +++ b/lifecycle-operator/controllers/options/keptnconfig_controller_test.go @@ -46,7 +46,7 @@ func TestKeptnConfigReconciler_Reconcile(t *testing.T) { ctx: context.TODO(), req: ctrl.Request{ NamespacedName: types.NamespacedName{ - Namespace: "keptn-lifecycle-toolkit-system", + Namespace: "keptn-system", Name: "empty-config", }, }, @@ -54,7 +54,7 @@ func TestKeptnConfigReconciler_Reconcile(t *testing.T) { reconcileConfig: &optionsv1alpha1.KeptnConfig{ ObjectMeta: metav1.ObjectMeta{ Name: "empty-config", - Namespace: "keptn-lifecycle-toolkit-system", + Namespace: "keptn-system", }, Spec: optionsv1alpha1.KeptnConfigSpec{ OTelCollectorUrl: "", @@ -70,7 +70,7 @@ func TestKeptnConfigReconciler_Reconcile(t *testing.T) { ctx: context.TODO(), req: ctrl.Request{ NamespacedName: types.NamespacedName{ - Namespace: "keptn-lifecycle-toolkit-system", + Namespace: "keptn-system", Name: "empty-config", }, }, @@ -78,7 +78,7 @@ func TestKeptnConfigReconciler_Reconcile(t *testing.T) { reconcileConfig: &optionsv1alpha1.KeptnConfig{ ObjectMeta: metav1.ObjectMeta{ Name: "empty-config", - Namespace: "keptn-lifecycle-toolkit-system", + Namespace: "keptn-system", }, Spec: optionsv1alpha1.KeptnConfigSpec{ OTelCollectorUrl: "", @@ -93,7 +93,7 @@ func TestKeptnConfigReconciler_Reconcile(t *testing.T) { ctx: context.TODO(), req: ctrl.Request{ NamespacedName: types.NamespacedName{ - Namespace: "keptn-lifecycle-toolkit-system", + Namespace: "keptn-system", Name: "not-found-config", }, }, @@ -101,7 +101,7 @@ func TestKeptnConfigReconciler_Reconcile(t *testing.T) { reconcileConfig: &optionsv1alpha1.KeptnConfig{ ObjectMeta: metav1.ObjectMeta{ Name: "empty-config", - Namespace: "keptn-lifecycle-toolkit-system", + Namespace: "keptn-system", }, Spec: optionsv1alpha1.KeptnConfigSpec{ OTelCollectorUrl: "", @@ -116,7 +116,7 @@ func TestKeptnConfigReconciler_Reconcile(t *testing.T) { ctx: context.TODO(), req: ctrl.Request{ NamespacedName: types.NamespacedName{ - Namespace: "keptn-lifecycle-toolkit-system", + Namespace: "keptn-system", Name: "config1", }, }, @@ -127,7 +127,7 @@ func TestKeptnConfigReconciler_Reconcile(t *testing.T) { reconcileConfig: &optionsv1alpha1.KeptnConfig{ ObjectMeta: metav1.ObjectMeta{ Name: "config1", - Namespace: "keptn-lifecycle-toolkit-system", + Namespace: "keptn-system", }, Spec: optionsv1alpha1.KeptnConfigSpec{ OTelCollectorUrl: "url1", diff --git a/metrics-operator/config/default/kustomization.yaml b/metrics-operator/config/default/kustomization.yaml index fd3c769baa..b41d31d810 100644 --- a/metrics-operator/config/default/kustomization.yaml +++ b/metrics-operator/config/default/kustomization.yaml @@ -1,5 +1,5 @@ # Adds namespace to all resources. -namespace: keptn-lifecycle-toolkit-system +namespace: keptn-system # Value of this field is prepended to the # names of all resources, e.g. a deployment named diff --git a/metrics-operator/config/samples/metrics_v1alpha3_analysis.yaml b/metrics-operator/config/samples/metrics_v1alpha3_analysis.yaml index fc469fd0c5..5b148cdc5e 100644 --- a/metrics-operator/config/samples/metrics_v1alpha3_analysis.yaml +++ b/metrics-operator/config/samples/metrics_v1alpha3_analysis.yaml @@ -19,4 +19,4 @@ spec: nodename: test # can be any key/value pair; NOT only project/stage/service analysisDefinition: name: ed-my-proj-dev-svc1 - namespace: keptn-lifecycle-toolkit-system + namespace: keptn-system diff --git a/metrics-operator/config/samples/metrics_v1alpha3_analysisdefinition.yaml b/metrics-operator/config/samples/metrics_v1alpha3_analysisdefinition.yaml index b67282f108..682e325703 100644 --- a/metrics-operator/config/samples/metrics_v1alpha3_analysisdefinition.yaml +++ b/metrics-operator/config/samples/metrics_v1alpha3_analysisdefinition.yaml @@ -2,12 +2,12 @@ apiVersion: metrics.keptn.sh/v1alpha3 kind: AnalysisDefinition metadata: name: ed-my-proj-dev-svc1 - namespace: keptn-lifecycle-toolkit-system + namespace: keptn-system spec: objectives: - analysisValueTemplateRef: name: response-time-p95 - namespace: keptn-lifecycle-toolkit-system + namespace: keptn-system target: failure: lessThan: diff --git a/metrics-operator/config/samples/metrics_v1alpha3_analysisvaluetemplate.yaml b/metrics-operator/config/samples/metrics_v1alpha3_analysisvaluetemplate.yaml index c03d2d4e11..6545d1ff51 100644 --- a/metrics-operator/config/samples/metrics_v1alpha3_analysisvaluetemplate.yaml +++ b/metrics-operator/config/samples/metrics_v1alpha3_analysisvaluetemplate.yaml @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/managed-by: kustomize app.kubernetes.io/created-by: metrics-operator name: response-time-p95 - namespace: keptn-lifecycle-toolkit-system + namespace: keptn-system spec: provider: name: prometheus diff --git a/metrics-operator/config/samples/metrics_v1beta1_analysis.yaml b/metrics-operator/config/samples/metrics_v1beta1_analysis.yaml index 53986c5f1a..d65ee3e6ad 100644 --- a/metrics-operator/config/samples/metrics_v1beta1_analysis.yaml +++ b/metrics-operator/config/samples/metrics_v1beta1_analysis.yaml @@ -18,4 +18,4 @@ spec: nodename: test # can be any key/value pair; NOT only project/stage/service analysisDefinition: name: ad-my-proj-dev-svc1 - namespace: keptn-lifecycle-toolkit-system + namespace: keptn-system diff --git a/metrics-operator/config/samples/metrics_v1beta1_analysisdefinition.yaml b/metrics-operator/config/samples/metrics_v1beta1_analysisdefinition.yaml index 677059e41d..a2a0825381 100644 --- a/metrics-operator/config/samples/metrics_v1beta1_analysisdefinition.yaml +++ b/metrics-operator/config/samples/metrics_v1beta1_analysisdefinition.yaml @@ -2,12 +2,12 @@ apiVersion: metrics.keptn.sh/v1beta1 kind: AnalysisDefinition metadata: name: ad-my-proj-dev-svc1 - namespace: keptn-lifecycle-toolkit-system + namespace: keptn-system spec: objectives: - analysisValueTemplateRef: name: response-time-p95 - namespace: keptn-lifecycle-toolkit-system + namespace: keptn-system target: failure: lessThan: diff --git a/metrics-operator/config/samples/metrics_v1beta1_analysisvaluetemplate.yaml b/metrics-operator/config/samples/metrics_v1beta1_analysisvaluetemplate.yaml index b63ddbba44..88a67f5590 100644 --- a/metrics-operator/config/samples/metrics_v1beta1_analysisvaluetemplate.yaml +++ b/metrics-operator/config/samples/metrics_v1beta1_analysisvaluetemplate.yaml @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/managed-by: kustomize app.kubernetes.io/created-by: metrics-operator name: response-time-p95 - namespace: keptn-lifecycle-toolkit-system + namespace: keptn-system spec: provider: name: prometheus diff --git a/metrics-operator/controllers/common/providers/dynatrace/dynatrace_dql_test.go b/metrics-operator/controllers/common/providers/dynatrace/dynatrace_dql_test.go index 2814a49abb..c734432033 100644 --- a/metrics-operator/controllers/common/providers/dynatrace/dynatrace_dql_test.go +++ b/metrics-operator/controllers/common/providers/dynatrace/dynatrace_dql_test.go @@ -679,7 +679,7 @@ func TestGetDQLCannotPostQuery_EvaluateQuery(t *testing.T) { func TestDQLInitClientWithSecret_EvaluateQuery(t *testing.T) { - namespace := "keptn-lifecycle-toolkit-system" + namespace := "keptn-system" mySecret := &corev1.Secret{ ObjectMeta: metav1.ObjectMeta{ @@ -1047,7 +1047,7 @@ func TestGetDQLCannotPostQuery_EvaluateQueryForStep(t *testing.T) { func TestDQLInitClientWithSecret_EvaluateQueryForStep(t *testing.T) { - namespace := "keptn-lifecycle-toolkit-system" + namespace := "keptn-system" mySecret := &corev1.Secret{ ObjectMeta: metav1.ObjectMeta{ diff --git a/metrics-operator/pkg/metrics/server_test.go b/metrics-operator/pkg/metrics/server_test.go index c3a766e5b6..59bb0ae9fe 100644 --- a/metrics-operator/pkg/metrics/server_test.go +++ b/metrics-operator/pkg/metrics/server_test.go @@ -53,7 +53,7 @@ func TestMetricServer_happyPath(t *testing.T) { var metric = metricsapi.KeptnMetric{ ObjectMeta: v1.ObjectMeta{ Name: "sample-metric", - Namespace: "keptn-lifecycle-toolkit-system", + Namespace: "keptn-system", }, Spec: metricsapi.KeptnMetricSpec{ Provider: metricsapi.ProviderRef{ @@ -106,7 +106,7 @@ func TestMetricServer_happyPath(t *testing.T) { require.Eventually(t, func() bool { cli := &http.Client{} - req, _ := http.NewRequestWithContext(context.TODO(), http.MethodGet, "http://localhost:9999/api/v1/metrics/keptn-lifecycle-toolkit-system/sample-metric", nil) + req, _ := http.NewRequestWithContext(context.TODO(), http.MethodGet, "http://localhost:9999/api/v1/metrics/keptn-system/sample-metric", nil) resp, err = cli.Do(req) return err == nil }, 10*time.Second, time.Second) @@ -118,7 +118,7 @@ func TestMetricServer_happyPath(t *testing.T) { require.Nil(t, err) newStr = buf.String() - require.Contains(t, newStr, "\"metric\":\"sample-metric\",\"namespace\":\"keptn-lifecycle-toolkit-system\",\"value\":\"12\"") + require.Contains(t, newStr, "\"metric\":\"sample-metric\",\"namespace\":\"keptn-system\",\"value\":\"12\"") } func TestMetricServer_noMetric(t *testing.T) { diff --git a/runtimes/deno-runtime/README.md b/runtimes/deno-runtime/README.md index 3dec2525e4..96b6b27c7e 100644 --- a/runtimes/deno-runtime/README.md +++ b/runtimes/deno-runtime/README.md @@ -71,5 +71,5 @@ docker run \ ghcr.io/keptn/deno-runtime:${VERSION} ``` - + diff --git a/runtimes/python-runtime/README.md b/runtimes/python-runtime/README.md index ca64db829a..35ff660d2f 100644 --- a/runtimes/python-runtime/README.md +++ b/runtimes/python-runtime/README.md @@ -67,5 +67,5 @@ We can call the hellopy.py script downloading it directly from github docker run -e "SCRIPT=https://raw.githubusercontent.com/keptn/lifecycle-toolkit/main/runtimes/python-runtime/samples/hellopy.py" -it lifecycle-toolkit/runtimes/python-runtime:${VERSION} ``` - + diff --git a/test/integration/expose-keptn-metric/00-teststep.yaml b/test/integration/expose-keptn-metric/00-teststep.yaml index 5737cf9632..726c21700c 100644 --- a/test/integration/expose-keptn-metric/00-teststep.yaml +++ b/test/integration/expose-keptn-metric/00-teststep.yaml @@ -3,7 +3,7 @@ kind: TestStep commands: # generating job and metric based on namespace to avoid interference between runs - script: | export NAME=$( echo $NAMESPACE | tr -d -) - export SVCNAME=$( kubectl get svc -n keptn-lifecycle-toolkit-system -l control-plane=metrics-operator -ojsonpath="{ .items[0].metadata.name }" ) + export SVCNAME=$( kubectl get svc -n keptn-system -l control-plane=metrics-operator -ojsonpath="{ .items[0].metadata.name }" ) echo "installing first job pointing to ${SVCNAME}" envsubst < job-no-metric.yaml | kubectl apply -f - - script: | diff --git a/test/integration/expose-keptn-metric/01-teststep.yaml b/test/integration/expose-keptn-metric/01-teststep.yaml index 0638a3ed0d..0b4b9ea310 100644 --- a/test/integration/expose-keptn-metric/01-teststep.yaml +++ b/test/integration/expose-keptn-metric/01-teststep.yaml @@ -3,7 +3,7 @@ kind: TestStep commands: - script: | # generating job and metric based on namespace to avoid interference between runs export NAME=$( echo $NAMESPACE | tr -d -) - export SVCNAME=$( kubectl get svc -n keptn-lifecycle-toolkit-system -l control-plane=metrics-operator -ojsonpath="{ .items[0].metadata.name }" ) + export SVCNAME=$( kubectl get svc -n keptn-system -l control-plane=metrics-operator -ojsonpath="{ .items[0].metadata.name }" ) echo "installing second job pointing to ${SVCNAME}" envsubst < job-existing-metric.yaml | kubectl apply -f - diff --git a/test/integration/expose-keptn-metric/job-existing-metric.yaml b/test/integration/expose-keptn-metric/job-existing-metric.yaml index 7b68afb50f..61868db01c 100644 --- a/test/integration/expose-keptn-metric/job-existing-metric.yaml +++ b/test/integration/expose-keptn-metric/job-existing-metric.yaml @@ -25,7 +25,7 @@ spec: - /bin/sh - -ec - | - curl -s $SVCNAME.keptn-lifecycle-toolkit-system.svc.cluster.local:9999/metrics > ~/out.txt + curl -s $SVCNAME.keptn-system.svc.cluster.local:9999/metrics > ~/out.txt echo ~/out.txt if grep -Fxq "# HELP $NAME $NAME" ~/out.txt then @@ -39,7 +39,7 @@ spec: - /bin/sh - -ec - | - curl -s $SVCNAME.keptn-lifecycle-toolkit-system.svc.cluster.local:9999/api/v1/metrics/$NAMESPACE/$NAME > ~/out.txt + curl -s $SVCNAME.keptn-system.svc.cluster.local:9999/api/v1/metrics/$NAMESPACE/$NAME > ~/out.txt echo ~/out.txt if grep -F "$NAME" ~/out.txt then diff --git a/test/integration/expose-keptn-metric/job-no-metric.yaml b/test/integration/expose-keptn-metric/job-no-metric.yaml index 811b34ba2f..898a1de089 100644 --- a/test/integration/expose-keptn-metric/job-no-metric.yaml +++ b/test/integration/expose-keptn-metric/job-no-metric.yaml @@ -14,7 +14,7 @@ spec: - /bin/sh - -ec - | - curl -s $SVCNAME.keptn-lifecycle-toolkit-system.svc.cluster.local:9999/metrics > ~/out.txt + curl -s $SVCNAME.keptn-system.svc.cluster.local:9999/metrics > ~/out.txt if grep -Fxq "# HELP $NAME $NAME" ~/out.txt then exit 1 @@ -25,7 +25,7 @@ spec: - /bin/sh - -ec - | - curl -s $SVCNAME.keptn-lifecycle-toolkit-system.svc.cluster.local:9999/api/v1/metrics/$NAMESPACE/$NAME > ~/out.txt + curl -s $SVCNAME.keptn-system.svc.cluster.local:9999/api/v1/metrics/$NAMESPACE/$NAME > ~/out.txt if grep -F "$NAME" ~/out.txt then exit 1 diff --git a/test/integration/keptn-config/get-logs.sh b/test/integration/keptn-config/get-logs.sh index e6ce8a29fe..22c5b4d4d0 100755 --- a/test/integration/keptn-config/get-logs.sh +++ b/test/integration/keptn-config/get-logs.sh @@ -1,6 +1,6 @@ #!/bin/bash -NAMESPACE="keptn-lifecycle-toolkit-system" +NAMESPACE="keptn-system" RETRY_COUNT=3 SLEEP_TIME=5 diff --git a/test/integration/validate-analysisdefinition/analysisdef_bad.yaml b/test/integration/validate-analysisdefinition/analysisdef_bad.yaml index a473112227..3d562d522b 100644 --- a/test/integration/validate-analysisdefinition/analysisdef_bad.yaml +++ b/test/integration/validate-analysisdefinition/analysisdef_bad.yaml @@ -6,7 +6,7 @@ spec: objectives: - analysisValueTemplateRef: name: response_time_p95 - namespace: keptn-lifecycle-toolkit-system + namespace: keptn-system target: failure: # multiple operators should not be defined as part of one item, but as 2 separate list items diff --git a/test/integration/validate-analysisdefinition/analysisdef_good.yaml b/test/integration/validate-analysisdefinition/analysisdef_good.yaml index 5010fb962d..f8a24e97f0 100644 --- a/test/integration/validate-analysisdefinition/analysisdef_good.yaml +++ b/test/integration/validate-analysisdefinition/analysisdef_good.yaml @@ -6,7 +6,7 @@ spec: objectives: - analysisValueTemplateRef: name: response_time_p95 - namespace: keptn-lifecycle-toolkit-system + namespace: keptn-system target: failure: lessThan: diff --git a/test/integration/validate-analysisdefinition/analysisdef_good_empty_fail.yaml b/test/integration/validate-analysisdefinition/analysisdef_good_empty_fail.yaml index 7d822cceb3..b76b77bb18 100644 --- a/test/integration/validate-analysisdefinition/analysisdef_good_empty_fail.yaml +++ b/test/integration/validate-analysisdefinition/analysisdef_good_empty_fail.yaml @@ -6,7 +6,7 @@ spec: objectives: - analysisValueTemplateRef: name: response_time_p95 - namespace: keptn-lifecycle-toolkit-system + namespace: keptn-system weight: 1 keyObjective: false totalScore: diff --git a/test/load/assets/templates/metric.yaml b/test/load/assets/templates/metric.yaml index 1c732b7a11..bc5d37f669 100644 --- a/test/load/assets/templates/metric.yaml +++ b/test/load/assets/templates/metric.yaml @@ -2,7 +2,7 @@ apiVersion: metrics.keptn.sh/v1beta1 kind: KeptnMetric metadata: name: keptnmetric-load-test-{{.Iteration}}-{{.Replica}} - namespace: keptn-lifecycle-toolkit-system + namespace: keptn-system spec: provider: name: "prometheus" diff --git a/test/load/assets/templates/namespace.yaml b/test/load/assets/templates/namespace.yaml index 8995961269..56973cc020 100644 --- a/test/load/assets/templates/namespace.yaml +++ b/test/load/assets/templates/namespace.yaml @@ -1,6 +1,6 @@ apiVersion: v1 kind: Namespace metadata: - name: keptn-lifecycle-toolkit-system + name: keptn-system annotations: keptn.sh/lifecycle-toolkit: "enabled" diff --git a/test/load/assets/templates/provider.yaml b/test/load/assets/templates/provider.yaml index 0cb135025d..205b0cafa9 100644 --- a/test/load/assets/templates/provider.yaml +++ b/test/load/assets/templates/provider.yaml @@ -2,7 +2,7 @@ apiVersion: metrics.keptn.sh/v1beta1 kind: KeptnMetricsProvider metadata: name: prometheus - namespace: keptn-lifecycle-toolkit-system + namespace: keptn-system spec: type: prometheus targetServer: "http://prometheus-k8s.monitoring.svc.cluster.local:9090" diff --git a/test/load/cfg.yml b/test/load/cfg.yml index 19aebff8ba..9509157238 100644 --- a/test/load/cfg.yml +++ b/test/load/cfg.yml @@ -11,7 +11,7 @@ jobs: qps: 4 burst: 4 namespacedIterations: false - namespace: keptn-lifecycle-toolkit-system + namespace: keptn-system podWait: false cleanup: true waitWhenFinished: true diff --git a/test/load/metrics.yml b/test/load/metrics.yml index d160eadf1e..d6f3bcde0b 100644 --- a/test/load/metrics.yml +++ b/test/load/metrics.yml @@ -1,16 +1,16 @@ - query: | (max_over_time(container_memory_working_set_bytes{container="manager", \ - namespace="keptn-lifecycle-toolkit-system", pod=~"lifecycle-operator-.*"}[1m]))/1024/1024 + namespace="keptn-system", pod=~"lifecycle-operator-.*"}[1m]))/1024/1024 metricName: MemoryUsageInMB - query: | max_over_time(irate(container_cpu_usage_seconds_total{container="manager", \ - namespace="keptn-lifecycle-toolkit-system", pod=~"lifecycle-operator-.*"}[1m])[{{ .elapsed }}:]) + namespace="keptn-system", pod=~"lifecycle-operator-.*"}[1m])[{{ .elapsed }}:]) metricName: CPUUsage - query: | irate(container_cpu_cfs_throttled_seconds_total{container="manager", \ - namespace="keptn-lifecycle-toolkit-system", pod=~"lifecycle-operator-.*"}[1m]) + namespace="keptn-system", pod=~"lifecycle-operator-.*"}[1m]) metricName: CPUThrottling - query: | diff --git a/test/prometheus/prometheus-networkPolicy.yaml b/test/prometheus/prometheus-networkPolicy.yaml index 8ac5bc1ff3..a6a015dd44 100644 --- a/test/prometheus/prometheus-networkPolicy.yaml +++ b/test/prometheus/prometheus-networkPolicy.yaml @@ -32,7 +32,7 @@ spec: - from: - namespaceSelector: matchLabels: - kubernetes.io/metadata.name: keptn-lifecycle-toolkit-system + kubernetes.io/metadata.name: keptn-system ports: - port: 9090 protocol: TCP diff --git a/test/prometheus/prometheus-roleBindingSpecificNamespaces.yaml b/test/prometheus/prometheus-roleBindingSpecificNamespaces.yaml index 8dc80e65dc..cb505d95fd 100644 --- a/test/prometheus/prometheus-roleBindingSpecificNamespaces.yaml +++ b/test/prometheus/prometheus-roleBindingSpecificNamespaces.yaml @@ -67,7 +67,7 @@ items: app.kubernetes.io/part-of: kube-prometheus app.kubernetes.io/version: 2.39.1 name: prometheus-k8s - namespace: keptn-lifecycle-toolkit-system + namespace: keptn-system roleRef: apiGroup: rbac.authorization.k8s.io kind: Role diff --git a/test/prometheus/prometheus-roleSpecificNamespaces.yaml b/test/prometheus/prometheus-roleSpecificNamespaces.yaml index 6819f27625..bf7191e334 100644 --- a/test/prometheus/prometheus-roleSpecificNamespaces.yaml +++ b/test/prometheus/prometheus-roleSpecificNamespaces.yaml @@ -124,7 +124,7 @@ items: app.kubernetes.io/part-of: kube-prometheus app.kubernetes.io/version: 2.39.1 name: prometheus-k8s - namespace: keptn-lifecycle-toolkit-system + namespace: keptn-system rules: - apiGroups: - "" diff --git a/test/testanalysis/analysis-controller-existing-status/00-install.yaml b/test/testanalysis/analysis-controller-existing-status/00-install.yaml index 67e59299e6..0f8d08a5f9 100644 --- a/test/testanalysis/analysis-controller-existing-status/00-install.yaml +++ b/test/testanalysis/analysis-controller-existing-status/00-install.yaml @@ -47,7 +47,7 @@ spec: from: 2023-09-14T07:33:19Z to: 2023-09-14T08:33:19Z args: - "ns": "keptn-lifecycle-toolkit-system" + "ns": "keptn-system" analysisDefinition: name: ed-my-proj-dev-svc1 namespace: testy diff --git a/test/testanalysis/analysis-controller-existing-status/01-assert.yaml b/test/testanalysis/analysis-controller-existing-status/01-assert.yaml index ff333425e8..2acaa8dc7a 100644 --- a/test/testanalysis/analysis-controller-existing-status/01-assert.yaml +++ b/test/testanalysis/analysis-controller-existing-status/01-assert.yaml @@ -9,4 +9,4 @@ spec: status: pass: true # yamllint disable-line rule:line-length - raw: '{"objectiveResults":[{"result":{"failResult":{"operator":{"lessThan":{"fixedValue":"2"}},"fulfilled":false},"warnResult":{"operator":{"lessThan":{"fixedValue":"3"}},"fulfilled":false},"warning":false,"pass":true},"objective":{"analysisValueTemplateRef":{"name":"ready","namespace":"testy"},"target":{"failure":{"lessThan":{"fixedValue":"2"}},"warning":{"lessThan":{"fixedValue":"3"}}},"weight":1},"value":4,"query":"sum(kube_pod_container_status_ready{namespace=\"keptn-lifecycle-toolkit-system\"})","score":1}],"totalScore":1,"maximumScore":1,"pass":true,"warning":false}' + raw: '{"objectiveResults":[{"result":{"failResult":{"operator":{"lessThan":{"fixedValue":"2"}},"fulfilled":false},"warnResult":{"operator":{"lessThan":{"fixedValue":"3"}},"fulfilled":false},"warning":false,"pass":true},"objective":{"analysisValueTemplateRef":{"name":"ready","namespace":"testy"},"target":{"failure":{"lessThan":{"fixedValue":"2"}},"warning":{"lessThan":{"fixedValue":"3"}}},"weight":1},"value":4,"query":"sum(kube_pod_container_status_ready{namespace=\"keptn-system\"})","score":1}],"totalScore":1,"maximumScore":1,"pass":true,"warning":false}' diff --git a/test/testanalysis/analysis-controller-multiple-providers/install.yaml b/test/testanalysis/analysis-controller-multiple-providers/install.yaml index 53940561f3..073f549287 100644 --- a/test/testanalysis/analysis-controller-multiple-providers/install.yaml +++ b/test/testanalysis/analysis-controller-multiple-providers/install.yaml @@ -75,7 +75,7 @@ spec: from: 2023-09-14T07:33:19Z to: 2023-09-14T08:33:19Z args: - "ns": "keptn-lifecycle-toolkit-system" + "ns": "keptn-system" analysisDefinition: name: ed-my-proj-dev-svc1 --- diff --git a/test/testanalysis/analysis-controller-with-duration-timeframe/01-assert.yaml b/test/testanalysis/analysis-controller-with-duration-timeframe/01-assert.yaml index cd0e650008..ccdec00238 100644 --- a/test/testanalysis/analysis-controller-with-duration-timeframe/01-assert.yaml +++ b/test/testanalysis/analysis-controller-with-duration-timeframe/01-assert.yaml @@ -9,4 +9,4 @@ status: pass: true state: Completed # yamllint disable-line rule:line-length - raw: '{"objectiveResults":[{"result":{"failResult":{"operator":{"lessThan":{"fixedValue":"2"}},"fulfilled":false},"warnResult":{"operator":{"lessThan":{"fixedValue":"3"}},"fulfilled":false},"warning":false,"pass":true},"objective":{"analysisValueTemplateRef":{"name":"ready"},"target":{"failure":{"lessThan":{"fixedValue":"2"}},"warning":{"lessThan":{"fixedValue":"3"}}},"weight":1},"value":4,"query":"sum(kube_pod_container_status_ready{namespace=\"keptn-lifecycle-toolkit-system\"})","score":1}],"totalScore":1,"maximumScore":1,"pass":true,"warning":false}' + raw: '{"objectiveResults":[{"result":{"failResult":{"operator":{"lessThan":{"fixedValue":"2"}},"fulfilled":false},"warnResult":{"operator":{"lessThan":{"fixedValue":"3"}},"fulfilled":false},"warning":false,"pass":true},"objective":{"analysisValueTemplateRef":{"name":"ready"},"target":{"failure":{"lessThan":{"fixedValue":"2"}},"warning":{"lessThan":{"fixedValue":"3"}}},"weight":1},"value":4,"query":"sum(kube_pod_container_status_ready{namespace=\"keptn-system\"})","score":1}],"totalScore":1,"maximumScore":1,"pass":true,"warning":false}' diff --git a/test/testanalysis/analysis-controller-with-duration-timeframe/install.yaml b/test/testanalysis/analysis-controller-with-duration-timeframe/install.yaml index 58fb209ebc..6d82e7abac 100644 --- a/test/testanalysis/analysis-controller-with-duration-timeframe/install.yaml +++ b/test/testanalysis/analysis-controller-with-duration-timeframe/install.yaml @@ -36,7 +36,7 @@ spec: timeframe: recent: 5m args: - "ns": "keptn-lifecycle-toolkit-system" + "ns": "keptn-system" analysisDefinition: name: ed-my-proj-dev-svc1 --- diff --git a/test/testanalysis/analysis-controller/01-assert.yaml b/test/testanalysis/analysis-controller/01-assert.yaml index cd0e650008..ccdec00238 100644 --- a/test/testanalysis/analysis-controller/01-assert.yaml +++ b/test/testanalysis/analysis-controller/01-assert.yaml @@ -9,4 +9,4 @@ status: pass: true state: Completed # yamllint disable-line rule:line-length - raw: '{"objectiveResults":[{"result":{"failResult":{"operator":{"lessThan":{"fixedValue":"2"}},"fulfilled":false},"warnResult":{"operator":{"lessThan":{"fixedValue":"3"}},"fulfilled":false},"warning":false,"pass":true},"objective":{"analysisValueTemplateRef":{"name":"ready"},"target":{"failure":{"lessThan":{"fixedValue":"2"}},"warning":{"lessThan":{"fixedValue":"3"}}},"weight":1},"value":4,"query":"sum(kube_pod_container_status_ready{namespace=\"keptn-lifecycle-toolkit-system\"})","score":1}],"totalScore":1,"maximumScore":1,"pass":true,"warning":false}' + raw: '{"objectiveResults":[{"result":{"failResult":{"operator":{"lessThan":{"fixedValue":"2"}},"fulfilled":false},"warnResult":{"operator":{"lessThan":{"fixedValue":"3"}},"fulfilled":false},"warning":false,"pass":true},"objective":{"analysisValueTemplateRef":{"name":"ready"},"target":{"failure":{"lessThan":{"fixedValue":"2"}},"warning":{"lessThan":{"fixedValue":"3"}}},"weight":1},"value":4,"query":"sum(kube_pod_container_status_ready{namespace=\"keptn-system\"})","score":1}],"totalScore":1,"maximumScore":1,"pass":true,"warning":false}' diff --git a/test/testanalysis/analysis-controller/install.yaml b/test/testanalysis/analysis-controller/install.yaml index 58fb209ebc..6d82e7abac 100644 --- a/test/testanalysis/analysis-controller/install.yaml +++ b/test/testanalysis/analysis-controller/install.yaml @@ -36,7 +36,7 @@ spec: timeframe: recent: 5m args: - "ns": "keptn-lifecycle-toolkit-system" + "ns": "keptn-system" analysisDefinition: name: ed-my-proj-dev-svc1 --- diff --git a/test/testcertificate/cert-recreates/00-assert.yaml b/test/testcertificate/cert-recreates/00-assert.yaml index 596297d252..05a31f9cd5 100644 --- a/test/testcertificate/cert-recreates/00-assert.yaml +++ b/test/testcertificate/cert-recreates/00-assert.yaml @@ -3,12 +3,12 @@ apiVersion: v1 kind: Secret metadata: name: keptn-certs - namespace: keptn-lifecycle-toolkit-system + namespace: keptn-system --- apiVersion: apps/v1 kind: Deployment metadata: - namespace: keptn-lifecycle-toolkit-system + namespace: keptn-system labels: control-plane: metrics-operator status: @@ -17,7 +17,7 @@ status: apiVersion: apps/v1 kind: Deployment metadata: - namespace: keptn-lifecycle-toolkit-system + namespace: keptn-system labels: control-plane: lifecycle-operator status: diff --git a/test/testcertificate/cert-recreates/00-teststep.yaml b/test/testcertificate/cert-recreates/00-teststep.yaml index fda7c36bc6..8b2ee00056 100644 --- a/test/testcertificate/cert-recreates/00-teststep.yaml +++ b/test/testcertificate/cert-recreates/00-teststep.yaml @@ -1,6 +1,6 @@ apiVersion: kuttl.dev/v1 kind: TestStep commands: # first scenario: the toolkit is restarted after removing the certificate - - script: kubectl delete secret keptn-certs -n keptn-lifecycle-toolkit-system - - script: kubectl rollout restart deployment -n keptn-lifecycle-toolkit-system -l control-plane=lifecycle-operator - - script: kubectl rollout restart deployment -n keptn-lifecycle-toolkit-system -l control-plane=metrics-operator + - script: kubectl delete secret keptn-certs -n keptn-system + - script: kubectl rollout restart deployment -n keptn-system -l control-plane=lifecycle-operator + - script: kubectl rollout restart deployment -n keptn-system -l control-plane=metrics-operator diff --git a/test/testcertificate/cert-recreates/01-assert.yaml b/test/testcertificate/cert-recreates/01-assert.yaml index 596297d252..05a31f9cd5 100644 --- a/test/testcertificate/cert-recreates/01-assert.yaml +++ b/test/testcertificate/cert-recreates/01-assert.yaml @@ -3,12 +3,12 @@ apiVersion: v1 kind: Secret metadata: name: keptn-certs - namespace: keptn-lifecycle-toolkit-system + namespace: keptn-system --- apiVersion: apps/v1 kind: Deployment metadata: - namespace: keptn-lifecycle-toolkit-system + namespace: keptn-system labels: control-plane: metrics-operator status: @@ -17,7 +17,7 @@ status: apiVersion: apps/v1 kind: Deployment metadata: - namespace: keptn-lifecycle-toolkit-system + namespace: keptn-system labels: control-plane: lifecycle-operator status: diff --git a/test/testcertificate/cert-recreates/01-delete.yaml b/test/testcertificate/cert-recreates/01-delete.yaml index f39dfd62b1..e287393aa2 100644 --- a/test/testcertificate/cert-recreates/01-delete.yaml +++ b/test/testcertificate/cert-recreates/01-delete.yaml @@ -3,4 +3,4 @@ apiVersion: v1 kind: Secret metadata: name: keptn-certs - namespace: keptn-lifecycle-toolkit-system + namespace: keptn-system diff --git a/test/testcertificate/cert-recreates/02-assert.yaml b/test/testcertificate/cert-recreates/02-assert.yaml index ee79107c0b..19f43f6912 100644 --- a/test/testcertificate/cert-recreates/02-assert.yaml +++ b/test/testcertificate/cert-recreates/02-assert.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: Secret metadata: name: keptn-certs - namespace: keptn-lifecycle-toolkit-system + namespace: keptn-system annotations: mycert: "true" # make sure this is the latest secret --- @@ -12,7 +12,7 @@ kind: Deployment metadata: labels: control-plane: metrics-operator - namespace: keptn-lifecycle-toolkit-system + namespace: keptn-system status: readyReplicas: 1 --- @@ -21,6 +21,6 @@ kind: Deployment metadata: labels: control-plane: lifecycle-operator - namespace: keptn-lifecycle-toolkit-system + namespace: keptn-system status: readyReplicas: 1 diff --git a/test/testcertificate/cert-recreates/02-install.yaml b/test/testcertificate/cert-recreates/02-install.yaml index 9be94821bf..bd4821a4b0 100644 --- a/test/testcertificate/cert-recreates/02-install.yaml +++ b/test/testcertificate/cert-recreates/02-install.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: Secret metadata: name: keptn-certs - namespace: keptn-lifecycle-toolkit-system + namespace: keptn-system annotations: mycert: "true" data: diff --git a/test/testcertificate/cert-recreates/02-teststep.yaml b/test/testcertificate/cert-recreates/02-teststep.yaml index f9b9a46465..17faad1123 100644 --- a/test/testcertificate/cert-recreates/02-teststep.yaml +++ b/test/testcertificate/cert-recreates/02-teststep.yaml @@ -2,7 +2,7 @@ apiVersion: kuttl.dev/v1 kind: TestStep commands: - script: | # make sure secret is updated from the bad one to a proper one - str1=$(kubectl get secret keptn-certs -n keptn-lifecycle-toolkit-system -o=go-template='{{index .data "tls.crt"}}') + str1=$(kubectl get secret keptn-certs -n keptn-system -o=go-template='{{index .data "tls.crt"}}') str2="LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUNkekNDQWg2Z0F3SUJBZ0lRZUpBWkJMcmxCY2VqNzh3cm4wV1ZIekFLQmdncWhrak9QUVFEQWpDQmlURUwKa0ZGY1FpY29hdE8yRFJnPQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0t" if [ "$str1" == "$str2" ]; then echo "Strings are equal" $str1 diff --git a/test/testmetrics/metrics-provider/00-install.yaml b/test/testmetrics/metrics-provider/00-install.yaml index 86ddcb316b..0144dc52d4 100644 --- a/test/testmetrics/metrics-provider/00-install.yaml +++ b/test/testmetrics/metrics-provider/00-install.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Secret metadata: name: dynatrace - namespace: keptn-lifecycle-toolkit-system + namespace: keptn-system type: Opaque data: DT_TOKEN: dG9rZW46IG15dG9rZW4= @@ -11,7 +11,7 @@ apiVersion: metrics.keptn.sh/v1beta1 kind: KeptnMetric metadata: name: podtatometric - namespace: keptn-lifecycle-toolkit-system + namespace: keptn-system spec: provider: name: "dynatrace" @@ -23,7 +23,7 @@ apiVersion: metrics.keptn.sh/v1beta1 kind: KeptnMetricsProvider metadata: name: dynatrace - namespace: keptn-lifecycle-toolkit-system + namespace: keptn-system spec: secretKeyRef: key: DT_TOKEN diff --git a/test/testmetrics/metrics-provider/logs.sh b/test/testmetrics/metrics-provider/logs.sh index 0a65cf5558..5674082879 100755 --- a/test/testmetrics/metrics-provider/logs.sh +++ b/test/testmetrics/metrics-provider/logs.sh @@ -1,11 +1,11 @@ #!/bin/bash -NAMESPACE="keptn-lifecycle-toolkit-system" +NAMESPACE="keptn-system" RETRY_COUNT=3 SLEEP_TIME=5 for i in $(seq 1 $RETRY_COUNT); do - VAR=$(kubectl logs -n keptn-lifecycle-toolkit-system deployments/lifecycle-operator | grep -c "Error while parsing response") + VAR=$(kubectl logs -n $NAMESPACE deployments/lifecycle-operator | grep -c "Error while parsing response") # shellcheck disable=SC1072 if [ "$VAR" -ge 1 ]; then echo "Controller could access secret" diff --git a/test/testmetrics/metrics/check-active-metrics.sh b/test/testmetrics/metrics/check-active-metrics.sh index 7ccf661faf..dacd571298 100755 --- a/test/testmetrics/metrics/check-active-metrics.sh +++ b/test/testmetrics/metrics/check-active-metrics.sh @@ -4,7 +4,7 @@ component_name=$1 -metrics_url="http://lifecycle-operator-metrics-service.keptn-lifecycle-toolkit-system.svc.cluster.local:2222/metrics" +metrics_url="http://lifecycle-operator-metrics-service.keptn-system.svc.cluster.local:2222/metrics" # Fetch keptn_lifecycle_active metrics metrics=$(curl -s $metrics_url | grep "${component_name}")