Merge branch 'main' into renovate/jaegertracing-jaeger-operator-1.x

keptn · Mar 30, 2023 · 94aac16 · 94aac16
2 parents e735b4d + 06b10a8
commit 94aac16
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 8 deletions.
diff --git a/.github/scripts/generate-crd-docs/generate-crd-docs.sh b/.github/scripts/generate-crd-docs/generate-crd-docs.sh
@@ -16,7 +16,12 @@ RENDERER='markdown'
 RENDERER_CONFIG_FILE='.github/scripts/generate-crd-docs/crd-docs-generator-config.yaml'
 
 echo "Checking if code generator tool is installed..."
-test -s crd-ref-docs || go install github.com/elastic/crd-ref-docs@${GENERATOR_VERSION}
+if ! test -s crd-ref-docs; then
+  echo "Docs generator is not installed, installing now..."
+  go install github.com/elastic/crd-ref-docs@${GENERATOR_VERSION}
+else
+  echo "Docs generator is installed, continuing..."
+fi
 
 echo "Running CRD docs auto-generator..."
 

diff --git a/examples/Makefile b/examples/Makefile
@@ -89,8 +89,8 @@ restart-lifecycle-toolkit:
 	@echo "----------------------------------"
 	@echo "Restart Keptn Lifecycle Controller"
 	@echo "----------------------------------"
-	kubectl rollout restart deployment -n "$(TOOLKIT_NAMESPACE)" lifecycle-operator
-	kubectl rollout status deployment -n "$(TOOLKIT_NAMESPACE)" lifecycle-operator --watch
-	kubectl rollout restart deployment -n "$(TOOLKIT_NAMESPACE)" scheduler -n keptn-lifecycle-toolkit-system
-	kubectl rollout status deployment -n "$(TOOLKIT_NAMESPACE)" scheduler --watch
+	kubectl rollout restart deployment -n "$(TOOLKIT_NAMESPACE)" -l control-plane=lifecycle-operator
+	kubectl rollout status deployment -n "$(TOOLKIT_NAMESPACE)" -l control-plane=lifecycle-operator --watch
+	kubectl rollout restart deployment -n "$(TOOLKIT_NAMESPACE)" -l component=scheduler
+	kubectl rollout status deployment -n "$(TOOLKIT_NAMESPACE)" -l component=scheduler --watch
 
diff --git a/examples/support/observability/config/prometheus/alertmanager-alertmanager.yaml b/examples/support/observability/config/prometheus/alertmanager-alertmanager.yaml
@@ -20,7 +20,7 @@ spec:
       app.kubernetes.io/name: alertmanager
       app.kubernetes.io/part-of: kube-prometheus
       app.kubernetes.io/version: 0.24.0
-  replicas: 3
+  replicas: 0
   resources:
     limits:
       cpu: 100m

diff --git a/examples/support/observability/config/prometheus/prometheus-adapter-deployment.yaml b/examples/support/observability/config/prometheus/prometheus-adapter-deployment.yaml
@@ -9,7 +9,7 @@ metadata:
   name: prometheus-adapter
   namespace: monitoring
 spec:
-  replicas: 2
+  replicas: 1
   selector:
     matchLabels:
       app.kubernetes.io/component: metrics-adapter

diff --git a/examples/support/observability/config/prometheus/prometheus-prometheus.yaml b/examples/support/observability/config/prometheus/prometheus-prometheus.yaml
@@ -32,7 +32,7 @@ spec:
   podMonitorSelector: {}
   probeNamespaceSelector: {}
   probeSelector: {}
-  replicas: 2
+  replicas: 1
   resources:
     requests:
       memory: 400Mi