diff --git a/README.md b/README.md index 5188055..7493119 100644 --- a/README.md +++ b/README.md @@ -51,6 +51,6 @@ the `RestateCluster` spec. ## Releasing -1. Update the app version in charts/restate-operator/Chart.yaml and the version in Cargo.{toml,lock} eg to `0.0.2` +1. Update the version in charts/restate-operator/Chart.yaml and the version in Cargo.{toml,lock} eg to `0.0.2` 2. Push a new tag `v0.0.2` 3. Accept the draft release once the workflow finishes diff --git a/charts/restate-operator-helm/Chart.yaml b/charts/restate-operator-helm/Chart.yaml index 74c8845..f8fd4d0 100644 --- a/charts/restate-operator-helm/Chart.yaml +++ b/charts/restate-operator-helm/Chart.yaml @@ -3,4 +3,3 @@ name: restate-operator-helm description: An operator for Restate clusters type: application version: "0.3.2" -appVersion: "0.3.2" diff --git a/charts/restate-operator-helm/templates/_helpers.tpl b/charts/restate-operator-helm/templates/_helpers.tpl index a965ba4..624db40 100644 --- a/charts/restate-operator-helm/templates/_helpers.tpl +++ b/charts/restate-operator-helm/templates/_helpers.tpl @@ -10,7 +10,7 @@ {{- define "controller.labels" -}} {{- include "controller.selectorLabels" . }} app.kubernetes.io/name: {{ include "controller.name" . }} -app.kubernetes.io/version: {{ .Values.image.tag | default .Chart.AppVersion | quote }} +app.kubernetes.io/version: {{ .Values.version | default .Chart.Version | quote }} {{- end }} {{- define "controller.selectorLabels" -}} @@ -18,5 +18,5 @@ app: {{ include "controller.name" . }} {{- end }} {{- define "controller.tag" -}} -{{- .Values.version | default .Chart.AppVersion }} +{{- .Values.version | default .Chart.Version }} {{- end }} diff --git a/charts/restate-operator-helm/templates/servicemonitor.yaml b/charts/restate-operator-helm/templates/servicemonitor.yaml index 50bd6c4..4bb22b3 100644 --- a/charts/restate-operator-helm/templates/servicemonitor.yaml +++ b/charts/restate-operator-helm/templates/servicemonitor.yaml @@ -34,9 +34,6 @@ spec: selector: matchLabels: {{- include "controller.selectorLabels" . | nindent 6 }} - namespaceSelector: - matchNames: - - {{ .Values.namespace }} {{- with .Values.serviceMonitor.targetLabels }} targetLabels: {{- toYaml . | nindent 4 }}