fix: bug with servicemonitor (#24)

Signed-off-by: Alex Jones <alexsimonjones@gmail.com>
k8sgpt-ai · Apr 28, 2023 · 35c8b8c · 35c8b8c
1 parent 5e8acc2
commit 35c8b8c
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 8 deletions.
diff --git a/Makefile b/Makefile
@@ -3,7 +3,7 @@
 IMG ?= ghcr.io/k8sgpt-ai/k8sgpt-operator:latest
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
 ENVTEST_K8S_VERSION = 1.26.0
-CHART_VERSION=v0.0.5 #x-release-please-version
+CHART_VERSION=v0.0.6 #x-release-please-version
 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
 ifeq (,$(shell go env GOBIN))
 GOBIN=$(shell go env GOPATH)/bin
@@ -141,7 +141,7 @@ helm-build: helm helmify manifests kustomize
 	cd config/manager && $(KUSTOMIZE) edit set image controller=$(IMG) && cd ../../
 	$(KUSTOMIZE) build config/default | $(HELMIFY) 
 
-helm-package: generate manifests helm-build
+helm-package: generate manifests
 	$(HELM) package --version $(CHART_VERSION) chart/
 	mkdir -p charts && mv k8sgpt-operator-*.tgz charts
 	$(HELM) repo index --url https://charts.k8sgpt.ai/charts charts

diff --git a/chart/templates/controller-manager-metrics-monitor.yaml b/chart/templates/controller-manager-metrics-monitor.yaml
@@ -1,3 +1,4 @@
+{{ if .Values.serviceMonitor.enabled -}}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
@@ -18,4 +19,5 @@ spec:
       insecureSkipVerify: true
   selector:
     matchLabels:
-      control-plane: controller-manager
+      control-plane: controller-manager
+{{ end -}}
diff --git a/chart/values.yaml b/chart/values.yaml
@@ -1,3 +1,5 @@
+serviceMonitor:
+  enabled: false
 controllerManager:
   kubeRbacProxy:
     containerSecurityContext:

diff --git a/charts/k8sgpt-operator-v0.0.6.tgz b/charts/k8sgpt-operator-v0.0.6.tgz
diff --git a/index.yaml b/index.yaml
@@ -3,7 +3,17 @@ entries:
   k8sgpt-operator:
   - apiVersion: v2
     appVersion: 0.1.0
-    created: "2023-04-28T08:41:21.597764+02:00"
+    created: "2023-04-28T08:48:06.511832+02:00"
+    description: A Helm chart for Kubernetes
+    digest: e7671f79b0ef1aebbae436a79bed6ab5caec714d53c65618f9fda5591837461e
+    name: k8sgpt-operator
+    type: application
+    urls:
+    - https://charts.k8sgpt.ai/charts/k8sgpt-operator-v0.0.6.tgz
+    version: v0.0.6
+  - apiVersion: v2
+    appVersion: 0.1.0
+    created: "2023-04-28T08:48:06.511621+02:00"
     description: A Helm chart for Kubernetes
     digest: 585fe03dbc10791746c50565eab63a1fb900e9f89710725e497db56608bd41d4
     name: k8sgpt-operator
@@ -13,7 +23,7 @@ entries:
     version: v0.0.5
   - apiVersion: v2
     appVersion: 0.1.0
-    created: "2023-04-28T08:41:21.597547+02:00"
+    created: "2023-04-28T08:48:06.511316+02:00"
     description: A Helm chart for Kubernetes
     digest: 01a83204abf1b7af53745da8cd9d25961a1d3b88d779ab22f920f801481bf835
     name: k8sgpt-operator
@@ -23,7 +33,7 @@ entries:
     version: v0.0.3
   - apiVersion: v2
     appVersion: 0.2.4
-    created: "2023-04-28T08:41:21.597196+02:00"
+    created: "2023-04-28T08:48:06.510881+02:00"
     description: A Helm chart for Kubernetes
     digest: e0dbf56b6e036a1eaf9f03a0c6a1b4a2a360a339c5b82b24a58fbc7df23a89c6
     name: k8sgpt-operator
@@ -33,12 +43,12 @@ entries:
     version: v0.0.2
   - apiVersion: v2
     appVersion: 0.2.4
-    created: "2023-04-28T08:41:21.596847+02:00"
+    created: "2023-04-28T08:48:06.51051+02:00"
     description: A Helm chart for Kubernetes
     digest: cd4a0ca2651f617ff7c1b81de031d9ae9acc23f291e46dc940a51f6a01857154
     name: k8sgpt-operator
     type: application
     urls:
     - https://charts.k8sgpt.ai/charts/k8sgpt-operator-v0.0.1.tgz
     version: v0.0.1
-generated: "2023-04-28T08:41:21.596418+02:00"
+generated: "2023-04-28T08:48:06.51011+02:00"