From 35c8b8ce1b3bb77eef8df4f7a4f5a555d21d47af Mon Sep 17 00:00:00 2001 From: Alex Jones Date: Fri, 28 Apr 2023 08:49:04 +0200 Subject: [PATCH] fix: bug with servicemonitor (#24) Signed-off-by: Alex Jones --- Makefile | 4 ++-- .../controller-manager-metrics-monitor.yaml | 4 +++- chart/values.yaml | 2 ++ charts/k8sgpt-operator-v0.0.6.tgz | Bin 0 -> 3997 bytes index.yaml | 20 +++++++++++++----- 5 files changed, 22 insertions(+), 8 deletions(-) create mode 100644 charts/k8sgpt-operator-v0.0.6.tgz diff --git a/Makefile b/Makefile index c7c4e63f..98c738eb 100644 --- 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 index 681469a9..f08749d2 100644 --- 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 \ No newline at end of file + control-plane: controller-manager +{{ end -}} \ No newline at end of file diff --git a/chart/values.yaml b/chart/values.yaml index cb17d0b2..cbdb7369 100644 --- 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 new file mode 100644 index 0000000000000000000000000000000000000000..3253dbb451ca35f6a13515a60ae695b4a966495e GIT binary patch literal 3997 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%0At)TL0&XcMsS5d0D6b z54wZq{olcUf2aSqQ8pB^E*|tyGoUzAP4)j6diTZ47t7klR<^4er?pyjU#Z(F3ePIU z7LD7uPHf;%UJyPBJUSD?FeRTsG*EIgJQ%KZ+}e$brFCpPivXF?Z$QP(EsY8je1*YL z<%K`Dp-~ko_csTs^xN4P4=s1-f0w=>tX=mNX22T#A0E6~^8dq~{@+g7vi`4~sZGRP zTbk2Tl6<*M!Z^!Aq`zIfby}+Oc12w^e(&AC5C6NIhp%t}*1i7~F7bc3-`l0N*nLnd0dX@zg0gW&_K#`L0|H0 ztP(_T_d3=ep{$nwhT|UL_GkV5Pq+7~dH=H??&SYg%69EPccwNB{`@GmU*keUQxceR z-#uIziZQR^3YZi4)PA|q3b@6YZoqXOF^(dT@=o~Q>jtDe4G*~gclX6A5B3Mm@4vm;-@X66o$^iczui^+51jvfVOG${|F)G&`QK$=qMH9L zatK??|F-C@$p3ao?()BP`QN+z@9&ZSZMk!O{&z+43-yiJa|63`~(K%MyQa0AK-FWnA1`HWLOv~XEM^|_X zGVq?GOD&USmfEn8oB^e1O8MA+pog&OUy%TcwK-tEQBbMJEcTuw22}=qgK%rjg#uKz>TSm%$icc`pN%=w~j-)O-1V-gEQ; z3&JyrPLEHd7o>t4i5HLK0B!&P Dwj`=Z literal 0 HcmV?d00001 diff --git a/index.yaml b/index.yaml index 41469255..839ad0db 100644 --- 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,7 +43,7 @@ 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 @@ -41,4 +51,4 @@ entries: 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"