diff --git a/chart/index.yaml b/chart/index.yaml index cf6b2944..7a788468 100644 --- a/chart/index.yaml +++ b/chart/index.yaml @@ -2,13 +2,13 @@ apiVersion: v1 entries: jenkins-operator: - apiVersion: v1 - appVersion: "1.0" - created: "2019-09-18T10:03:55.800596+02:00" - description: Jenkins operator is a Kubernetes native operator which fully manages + appVersion: 0.2.0 + created: "2019-09-18T11:28:17.672673+02:00" + description: Kubernetes native operator which fully manages Jenkins on Kubernetes - digest: 6594e655923d9555bbfc19c7d2fb78580bbc9e7901530dd09aa3877c00759460 + digest: 8dc6fbfb7c6b17d6ea42ff985aa5f52d191277efa396a62a74390c1edf1f9b46 name: jenkins-operator urls: - - https://raw.githubusercontent.com/jenkinsci/kubernetes-operator/master/chart/jenkins-operator/jenkins-operator-0.2.0.tgz - version: 0.2.0 -generated: "2019-09-18T10:03:55.799534+02:00" + - 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" diff --git a/chart/jenkins-operator-0.0.1.tgz b/chart/jenkins-operator-0.0.1.tgz new file mode 100644 index 00000000..525d1397 Binary files /dev/null and b/chart/jenkins-operator-0.0.1.tgz differ diff --git a/chart/jenkins-operator-0.2.0.tgz b/chart/jenkins-operator-0.2.0.tgz deleted file mode 100644 index 7cad4da7..00000000 Binary files a/chart/jenkins-operator-0.2.0.tgz and /dev/null differ diff --git a/chart/jenkins-operator/Chart.yaml b/chart/jenkins-operator/Chart.yaml index ac3733e8..e902af9a 100644 --- a/chart/jenkins-operator/Chart.yaml +++ b/chart/jenkins-operator/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 -appVersion: "1.0" -description: Jenkins operator is a Kubernetes native operator which fully manages Jenkins on Kubernetes +appVersion: "0.2.0" +description: Kubernetes native operator which fully manages Jenkins on Kubernetes name: jenkins-operator -version: 0.2.0 +version: 0.0.1 diff --git a/chart/jenkins-operator/templates/NOTES.txt b/chart/jenkins-operator/templates/NOTES.txt index 45df9c74..ad9133e8 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 get pods -w +$ kubectl --namespace {{ .Values.jenkins.namespace }} get pods -w 2. Get Jenkins credentials: -$ kubectl get secret jenkins-operator-credentials-{{ .Values.jenkins.name }} -o 'jsonpath={.data.user}' | base64 -d -$ kubectl get secret jenkins-operator-credentials-{{ .Values.jenkins.name }} -o 'jsonpath={.data.password}' | base64 -d +$ 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 -3. Connect to Jenkins (minikube): -$ minikube service jenkins-operator-http-{{ .Values.jenkins.name }} --url -Connect to Jenkins (actual Kubernetes cluster): -$ kubectl port-forward jenkins-{{ .Values.jenkins.name }} 8080:8080 \ No newline at end of file +3. Connect to Jenkins (actual Kubernetes cluster): +$ kubectl --namespace {{ .Values.jenkins.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 3ffd736d..7a0d47c5 100644 --- a/chart/jenkins-operator/templates/jenkins-cr.yaml +++ b/chart/jenkins-operator/templates/jenkins-cr.yaml @@ -1,6 +1,8 @@ apiVersion: {{ .Values.jenkins.apiVersion }} kind: Jenkins metadata: - name: {{ .Values.jenkins.name }} -master: - {{- toYaml .Values.jenkins.master | nindent 4 }} \ No newline at end of file + name: {{ .Values.jenkins.name }} + namespace: {{ .Values.jenkins.namespace }} +spec: + master: + {{- toYaml .Values.jenkins.spec.master | nindent 4 }} diff --git a/chart/jenkins-operator/values.yaml b/chart/jenkins-operator/values.yaml index fed783b3..982b86e3 100644 --- a/chart/jenkins-operator/values.yaml +++ b/chart/jenkins-operator/values.yaml @@ -16,58 +16,40 @@ fullnameOverride: "" jenkins: apiVersion: jenkins.io/v1alpha2 name: example - master: - containers: - - name: jenkins-master - image: jenkins/jenkins:lts - imagePullPolicy: Always - livenessProbe: - failureThreshold: 12 - httpGet: - path: /login - port: http - scheme: HTTP - initialDelaySeconds: 80 - periodSeconds: 10 - successThreshold: 1 - timeoutSeconds: 5 - readinessProbe: - failureThreshold: 3 - httpGet: - path: /login - port: http - scheme: HTTP - initialDelaySeconds: 30 - periodSeconds: 10 - successThreshold: 1 - timeoutSeconds: 1 - resources: - limits: - cpu: 1500m - memory: 3Gi - requests: - cpu: "1" - memory: 500Mi - seedJobs: - - id: jenkins-operator - targets: "cicd/jobs/*.jenkins" - description: "Jenkins Operator repository" - repositoryBranch: master - repositoryUrl: https://github.com/jenkinsci/kubernetes-operator.git - -ingress: - enabled: false - annotations: {} - # kubernetes.io/ingress.class: nginx - # kubernetes.io/tls-acme: "true" - hosts: - - host: chart-example.local - paths: [] - - tls: [] - # - secretName: chart-example-tls - # hosts: - # - chart-example.local + namespace: default + spec: + master: + containers: + - name: jenkins-master + image: jenkins/jenkins:lts + imagePullPolicy: Always + livenessProbe: + failureThreshold: 12 + httpGet: + path: /login + port: http + scheme: HTTP + initialDelaySeconds: 80 + periodSeconds: 10 + successThreshold: 1 + timeoutSeconds: 5 + readinessProbe: + failureThreshold: 3 + httpGet: + path: /login + port: http + scheme: HTTP + initialDelaySeconds: 30 + periodSeconds: 10 + successThreshold: 1 + timeoutSeconds: 1 + resources: + limits: + cpu: 1500m + memory: 3Gi + requests: + cpu: "1" + memory: 500Mi resources: {} # We usually recommend not to specify default resources and to leave this as a conscious