Merge pull request #94 from trevorbox/fix-helm

Helm chart generation now includes crds and uses the default service a…

Author: raffaelespazzoli

Makefile

@@ -127,8 +127,10 @@ bundle-build:
 # Generate helm chart
 helmchart: kustomize
 	mkdir -p ./charts/${OPERATOR_NAME}/templates
+	mkdir -p ./charts/${OPERATOR_NAME}/crds
 	cp ./config/helmchart/templates/* ./charts/${OPERATOR_NAME}/templates
 	$(KUSTOMIZE) build ./config/helmchart | sed 's/release-namespace/{{.Release.Namespace}}/' > ./charts/${OPERATOR_NAME}/templates/rbac.yaml
+	$(KUSTOMIZE) build ./config/crd > ./charts/${OPERATOR_NAME}/crds/crds.yaml
 	version=${VERSION} envsubst < ./config/helmchart/Chart.yaml.tpl  > ./charts/${OPERATOR_NAME}/Chart.yaml
 	version=${VERSION} image_repo=$${IMG%:*} envsubst < ./config/helmchart/values.yaml.tpl  > ./charts/${OPERATOR_NAME}/values.yaml
 	helm lint ./charts/${OPERATOR_NAME}	

README.md

@@ -250,6 +250,29 @@ oc login --token ${token}
 make run ENABLE_WEBHOOKS=false
 ```
 
+### Test helm chart locally
+
+Define an image and tag. For example...
+
+```shell
+export imageRepository="quay.io/redhat-cop/namespace-configuration-operator"
+export imageTag="v1.0.2"
+```
+
+Deploy chart...
+
+```shell
+make helmchart IMG=${imageRepository} VERSION=${imageTag}
+helm upgrade -i namespace-configuration-operator-local charts/namespace-configuration-operator -n namespace-configuration-operator-local --create-namespace
+```
+
+Delete...
+
+```shell
+helm delete namespace-configuration-operator-local -n namespace-configuration-operator-local
+kubectl delete -f charts/namespace-configuration-operator/crds/crds.yaml
+```
+
 ### Building/Pushing the operator image
 
 ```shell

config/helmchart/templates/_helpers.tpl

@@ -50,14 +50,3 @@ Selector labels
 app.kubernetes.io/name: {{ include "namespace-configuration-operator.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
-
-{{/*
-Create the name of the service account to use
-*/}}
-{{- define "namespace-configuration-operator.serviceAccountName" -}}
-{{- if .Values.serviceAccount.create }}
-{{- default (include "namespace-configuration-operator.fullname" .) .Values.serviceAccount.name }}
-{{- else }}
-{{- default "default" .Values.serviceAccount.name }}
-{{- end }}
-{{- end }}

config/helmchart/templates/manager.yaml

@@ -22,7 +22,6 @@ spec:
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      serviceAccountName: {{ include "namespace-configuration-operator.serviceAccountName" . }}    
       containers:
       - command:
         - /manager
@@ -33,6 +32,18 @@ spec:
         name: {{ .Chart.Name }} 
         resources:
           {{- toYaml .Values.resources | nindent 12 }}
+        livenessProbe:
+          httpGet:
+            path: /healthz
+            port: 8081
+          initialDelaySeconds: 15
+          periodSeconds: 20
+        readinessProbe:
+          httpGet:
+            path: /readyz
+            port: 8081
+          initialDelaySeconds: 5
+          periodSeconds: 10
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}

config/helmchart/values.yaml.tpl

@@ -14,21 +14,9 @@ imagePullSecrets: []
 nameOverride: ""
 fullnameOverride: ""
 
-serviceAccount:
-  # Specifies whether a service account should be created
-  create: true
-  # Annotations to add to the service account
-  annotations: {}
-  # The name of the service account to use.
-  # If not set and create is true, a name is generated using the fullname template
-  name: ""
-
 podAnnotations: {}
 
 resources:
-  limits:
-    cpu: 100m
-    memory: 30Mi
   requests:
     cpu: 100m
     memory: 20Mi

config/manager/manager.yaml

@@ -44,9 +44,6 @@ spec:
           initialDelaySeconds: 5
           periodSeconds: 10
         resources:
-          limits:
-            cpu: 100m
-            memory: 30Mi
           requests:
             cpu: 100m
             memory: 20Mi