Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: bug with servicemonitor #24

Merged
merged 1 commit into from
Apr 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion chart/templates/controller-manager-metrics-monitor.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{{ if .Values.serviceMonitor.enabled -}}
apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:
Expand All @@ -18,4 +19,5 @@ spec:
insecureSkipVerify: true
selector:
matchLabels:
control-plane: controller-manager
control-plane: controller-manager
{{ end -}}
2 changes: 2 additions & 0 deletions chart/values.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
serviceMonitor:
enabled: false
controllerManager:
kubeRbacProxy:
containerSecurityContext:
Expand Down
Binary file added charts/k8sgpt-operator-v0.0.6.tgz
Binary file not shown.
20 changes: 15 additions & 5 deletions index.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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"