diff --git a/Makefile b/Makefile index a429d6ff..303b4591 100644 --- a/Makefile +++ b/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 \ No newline at end of file +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/ \ No newline at end of file diff --git a/chart/index.yaml b/chart/index.yaml index 7a788468..1d558217 100644 --- a/chart/index.yaml +++ b/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" - description: Kubernetes native operator which fully manages - Jenkins on Kubernetes - digest: 8dc6fbfb7c6b17d6ea42ff985aa5f52d191277efa396a62a74390c1edf1f9b46 + created: "2019-09-18T12:05:07.80241+02:00" + description: Kubernetes native operator which fully manages Jenkins on Kubernetes + digest: 17d48e5da2a77975cc5d9c4db3d28f003d578759f8538bf58ac3977534feb42f 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" diff --git a/chart/jenkins-operator-0.0.1.tgz b/chart/jenkins-operator-0.0.1.tgz index 525d1397..cba505b8 100644 Binary files a/chart/jenkins-operator-0.0.1.tgz and b/chart/jenkins-operator-0.0.1.tgz differ diff --git a/chart/jenkins-operator/templates/NOTES.txt b/chart/jenkins-operator/templates/NOTES.txt index ad9133e8..897c5f95 100644 --- a/chart/jenkins-operator/templates/NOTES.txt +++ b/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 {{ .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.user}' | 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 \ No newline at end of file diff --git a/chart/jenkins-operator/templates/jenkins-cr.yaml b/chart/jenkins-operator/templates/jenkins-cr.yaml index 7a0d47c5..83dda313 100644 --- a/chart/jenkins-operator/templates/jenkins-cr.yaml +++ b/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.master | nindent 4 }} + {{- toYaml .Values.jenkins.spec | nindent 4 }} diff --git a/chart/jenkins-operator/values.yaml b/chart/jenkins-operator/values.yaml index 982b86e3..528577fe 100644 --- a/chart/jenkins-operator/values.yaml +++ b/chart/jenkins-operator/values.yaml @@ -16,7 +16,6 @@ fullnameOverride: "" jenkins: apiVersion: jenkins.io/v1alpha2 name: example - namespace: default spec: master: containers: diff --git a/jenkins-operator-0.0.1.tgz b/jenkins-operator-0.0.1.tgz new file mode 100644 index 00000000..cba505b8 Binary files /dev/null and b/jenkins-operator-0.0.1.tgz differ