adjust operator helm chart labels & resource names

Signed-off-by: André Bauer <[email protected]>

Author: monotek

charts/opensearch-operator/Chart.yaml

@@ -1,24 +1,10 @@
 apiVersion: v2
 name: opensearch-operator
 description: The OpenSearch Operator Helm chart for Kubernetes
-
-# A chart can be either an 'application' or a 'library' chart.
-#
-# Application charts are a collection of templates that can be packaged into versioned archives
-# to be deployed.
-#
-# Library charts provide useful utilities or functions for the chart developer. They're included as
-# a dependency of application charts to inject those utilities and functions into the rendering
-# pipeline. Library charts do not define any templates and therefore cannot be deployed.
+home: https://opensearch.org
+sources:
+  - https://github.com/opensearch-project/OpenSearch
+  - https://github.com/opensearch-project/opensearch-k8s-operator
 type: application
-
-# This is the opensearch-operator chart version. This version number should be incremented each time you make changes
-# to the chart and its templates, including the app version.
-# Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 2.8.0
-
-# This is the version number of the application being deployed (the operator). This version number should be
-# incremented each time you make changes to the application. Versions are not expected to
-# follow Semantic Versioning. They should reflect the version the application is using.
-# It is recommended to use it with quotes.
+version: 2.8.1
 appVersion: 2.8.0

charts/opensearch-operator/README.md

@@ -9,21 +9,27 @@ The Operator can be easily installed using helm on any CNCF-certified Kubernetes
 ### Installation Using Helm
 
 #### Get Repo Info
-```
+
+```bash
 helm repo add opensearch-operator https://opensearch-project.github.io/opensearch-k8s-operator/
 helm repo update
 ```
+
 #### Install Chart
-```
+
+```bash
 helm install [RELEASE_NAME] opensearch-operator/opensearch-operator
 ```
+
 #### Uninstall Chart
-```
+
+```bash
 helm uninstall [RELEASE_NAME]
 ```
+
 #### Upgrade Chart
-```
+
+```bash
 helm repo update
 helm upgrade [RELEASE_NAME] opensearch-operator/opensearch-operator
 ```
-

charts/opensearch-operator/templates/_helpers.tpl

@@ -55,8 +55,8 @@ Create the name of the service account to use
 */}}
 {{- define "opensearch-operator.serviceAccountName" -}}
 {{- if .Values.serviceAccount.create }}
-{{- default (printf "%s-%s" (include "opensearch-operator.fullname" .) "controller-manager") .Values.serviceAccount.name }}
+{{- default (include "opensearch-operator.fullname" .) .Values.serviceAccount.name }}
 {{- else }}
-{{- default "opensearch-operator-controller-manager" .Values.serviceAccount.name }}
+{{- default "default" .Values.serviceAccount.name }}
 {{- end }}
 {{- end }}

charts/opensearch-operator/templates/opensearch-operator-manager-config-cm.yaml renamed to charts/opensearch-operator/templates/configmap.yaml

@@ -1,4 +1,10 @@
+---
 apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "opensearch-operator.fullname" . }}
+  labels:
+    {{- include "opensearch-operator.labels" . | nindent 4 }}
 data:
   controller_manager_config.yaml: |
     apiVersion: controller-runtime.sigs.k8s.io/v1alpha1
@@ -12,6 +18,3 @@ data:
     leaderElection:
       leaderElect: true
       resourceName: a867c7dc.opensearch.opster.io
-kind: ConfigMap
-metadata:
-  name: {{ include "opensearch-operator.fullname" . }}-manager-config

charts/opensearch-operator/templates/crds.yaml

@@ -0,0 +1,19 @@
+{{- if .Values.installCRDs -}}
+{{- range $path, $_ := .Files.Glob "files/*.yaml" }}
+	{{- $raw := $.Files.Get $path -}}
+	{{- $docs := splitList "\n---\n" $raw -}}
+	{{- range $doc := $docs }}
+		{{- if and $doc (ne $doc "") }}
+			{{- $obj := fromYaml $doc }}
+			{{- if $obj }}
+				{{- $labels := include "opensearch-operator.labels" $ | fromYaml }}
+				{{- $md := default (dict) $obj.metadata }}
+				{{- $_ := set $md "labels" (merge (default (dict) $obj.metadata.labels) $labels) }}
+				{{- $_ := set $obj "metadata" $md }}
+{{ $obj | toYaml }}
+---
+			{{- end }}
+		{{- end }}
+	{{- end }}
+{{- end }}
+{{- end }}

charts/opensearch-operator/templates/opensearch-operator-controller-manager-deployment.yaml renamed to charts/opensearch-operator/templates/deployment.yaml

@@ -1,18 +1,19 @@
+---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
-    control-plane: controller-manager
-  name: {{ include "opensearch-operator.fullname" . }}-controller-manager
+    {{- include "opensearch-operator.labels" . | nindent 4 }}
+  name: {{ include "opensearch-operator.fullname" . }}
 spec:
   replicas: 1
   selector:
     matchLabels:
-      control-plane: controller-manager
+      {{- include "opensearch-operator.selectorLabels" . | nindent 6 }}
   template:
     metadata:
       labels:
-        control-plane: controller-manager
+        {{- include "opensearch-operator.labels" . | nindent 8 }}
         {{- with .Values.podLabels }}
         {{- toYaml . | nindent 8 }}
         {{- end }}