Improve helm CR, add helm goals to Makefile

Makefile

@@ -453,4 +453,14 @@ else
 	touch $(KUBECONFIG)
 	sudo minikube start --vm-driver=none --kubernetes-version=$(MINIKUBE_KUBERNETES_VERSION)
 	sudo chown -R travis: /home/travis/.minikube/
-endif
+endif
+
+.PHONY: helm-package
+helm-package:
+	@echo "+ $@"
+	cd chart/ && helm package jenkins-operator
+
+.PHONY: helm-deploy
+helm-deploy: helm-package
+	@echo "+ $@"
+	helm repo index chart/ --url https://raw.githubusercontent.com/jenkinsci/kubernetes-operator/master/chart/jenkins-operator/

chart/index.yaml

@@ -3,12 +3,11 @@ entries:
   jenkins-operator:
   - apiVersion: v1
     appVersion: 0.2.0
-    created: "2019-09-18T11:28:17.672673+02:00"
+    created: "2019-09-18T12:05:07.80241+02:00"
-    description: Kubernetes native operator which fully manages
+    description: Kubernetes native operator which fully manages Jenkins on Kubernetes
-      Jenkins on Kubernetes
+    digest: 17d48e5da2a77975cc5d9c4db3d28f003d578759f8538bf58ac3977534feb42f
-    digest: 8dc6fbfb7c6b17d6ea42ff985aa5f52d191277efa396a62a74390c1edf1f9b46
     name: jenkins-operator
     urls:
     - https://raw.githubusercontent.com/jenkinsci/kubernetes-operator/master/chart/jenkins-operator/jenkins-operator-0.0.1.tgz
     version: 0.0.1
-generated: "2019-09-18T11:28:17.671883+02:00"
+generated: "2019-09-18T12:05:07.801225+02:00"

chart/jenkins-operator/templates/NOTES.txt

@@ -1,11 +1,11 @@
 1. Watch Jenkins instance being created:
-$ kubectl --namespace {{ .Values.jenkins.namespace }} get pods -w
+$ kubectl --namespace {{ .Release.Namespace }} get pods -w
 
 2. Get Jenkins credentials:
-$ kubectl --namespace {{ .Values.jenkins.namespace }} get secret jenkins-operator-credentials-{{ .Values.jenkins.name }} -o 'jsonpath={.data.user}' | base64 -d
+$ kubectl --namespace {{ .Release.Namespace }} get secret jenkins-operator-credentials-{{ .Values.jenkins.name }} -o 'jsonpath={.data.user}' | base64 -d
-$ kubectl --namespace {{ .Values.jenkins.namespace }} get secret jenkins-operator-credentials-{{ .Values.jenkins.name }} -o 'jsonpath={.data.password}' | base64 -d
+$ kubectl --namespace {{ .Release.Namespace }} get secret jenkins-operator-credentials-{{ .Values.jenkins.name }} -o 'jsonpath={.data.password}' | base64 -d
 
 3. Connect to Jenkins (actual Kubernetes cluster):
-$ kubectl --namespace {{ .Values.jenkins.namespace }} port-forward jenkins-{{ .Values.jenkins.name }} 8080:8080
+$ kubectl --namespace {{ .Release.Namespace }} port-forward jenkins-{{ .Values.jenkins.name }} 8080:8080
 
 Now open the browser and enter http://localhost:8080

chart/jenkins-operator/templates/jenkins-cr.yaml

@@ -2,7 +2,5 @@ apiVersion: {{ .Values.jenkins.apiVersion }}
 kind: Jenkins
 metadata:
   name: {{ .Values.jenkins.name }}
-  namespace: {{ .Values.jenkins.namespace  }}
 spec:
-  master:
+        {{- toYaml .Values.jenkins.spec | nindent 4 }}
-        {{- toYaml .Values.jenkins.spec.master | nindent 4 }}

chart/jenkins-operator/values.yaml

@@ -16,7 +16,6 @@ fullnameOverride: ""
 jenkins:
     apiVersion: jenkins.io/v1alpha2
     name: example
-    namespace: default
     spec:
       master:
         containers: