From afe2d41dccb493d4956908578272d7a7cd6537a7 Mon Sep 17 00:00:00 2001 From: Jakub Al-Khalili Date: Fri, 29 May 2020 11:46:43 +0200 Subject: [PATCH 1/2] Improve secret management in helm chart --- chart/jenkins-operator/Chart.yaml | 2 +- chart/jenkins-operator/templates/jenkins.yaml | 16 ++++++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/chart/jenkins-operator/Chart.yaml b/chart/jenkins-operator/Chart.yaml index 66216f79..f72667fd 100644 --- a/chart/jenkins-operator/Chart.yaml +++ b/chart/jenkins-operator/Chart.yaml @@ -2,5 +2,5 @@ apiVersion: v2 appVersion: "0.4.0" description: Kubernetes native operator which fully manages Jenkins on Kubernetes name: jenkins-operator -version: 0.3.0 +version: 0.3.1 icon: https://raw.githubusercontent.com/jenkinsci/kubernetes-operator/master/assets/jenkins-operator-icon.png diff --git a/chart/jenkins-operator/templates/jenkins.yaml b/chart/jenkins-operator/templates/jenkins.yaml index 17b7e5ae..e49f4f39 100644 --- a/chart/jenkins-operator/templates/jenkins.yaml +++ b/chart/jenkins-operator/templates/jenkins.yaml @@ -10,26 +10,30 @@ metadata: spec: configurationAsCode: configurations: - {{- range .Values.jenkins.configuration.configurationAsCode }} + {{- range .Values.jenkins.configuration.configurationAsCode }} - name: {{ .configMapName }} - {{- end }} + {{- end }} + {{- if .Values.jenkins.configuration.configurationAsCode }} secret: {{- if .Values.jenkins.configuration.secretRefName }} name: {{ .Values.jenkins.configuration.secretRefName }} - {{ else if .Values.jenkins.configuration.secretData }} + {{- else if .Values.jenkins.configuration.secretData }} name: jenkins-{{ .Values.jenkins.name }} {{- end }} + {{- end }} groovyScripts: configurations: - {{- range .Values.jenkins.configuration.groovyScripts }} + {{- range .Values.jenkins.configuration.groovyScripts }} - name: {{ .configMapName }} - {{- end }} + {{- end }} + {{- if .Values.jenkins.configuration.groovyScripts }} secret: {{- if .Values.jenkins.configuration.secretRefName }} name: {{ .Values.jenkins.configuration.secretRefName }} - {{ else if .Values.jenkins.configuration.secretData }} + {{- else if .Values.jenkins.configuration.secretData }} name: jenkins-{{ .Values.jenkins.name }} {{- end }} + {{- end }} {{- if .Values.jenkins.backup.enabled }} backup: containerName: {{ .Values.jenkins.backup.containerName }} From 5d0c6524d95aceab82f6c8b7077e8047018ea23c Mon Sep 17 00:00:00 2001 From: Jakub Al-Khalili Date: Fri, 29 May 2020 13:02:14 +0200 Subject: [PATCH 2/2] Bump version to 0.3.1 --- chart/index.yaml | 46 +++++++++++------- .../jenkins-operator-0.3.1.tgz | Bin 0 -> 5629 bytes 2 files changed, 28 insertions(+), 18 deletions(-) create mode 100644 chart/jenkins-operator/jenkins-operator-0.3.1.tgz diff --git a/chart/index.yaml b/chart/index.yaml index e227f5f4..ad0b147d 100644 --- a/chart/index.yaml +++ b/chart/index.yaml @@ -1,9 +1,19 @@ apiVersion: v1 entries: jenkins-operator: + - apiVersion: v2 + appVersion: 0.4.0 + created: "2020-05-29T13:00:04.65484+02:00" + description: Kubernetes native operator which fully manages Jenkins on Kubernetes + digest: 40e8a062a5f046595eb5b74d9b6dedc4f30432bbdd054f0aadee37200213f915 + icon: https://raw.githubusercontent.com/jenkinsci/kubernetes-operator/master/assets/jenkins-operator-icon.png + name: jenkins-operator + urls: + - https://raw.githubusercontent.com/jenkinsci/kubernetes-operator/master/chart/jenkins-operator/jenkins-operator-0.3.1.tgz + version: 0.3.1 - apiVersion: v1 appVersion: 0.4.0 - created: "2020-05-12T11:40:10.572356+02:00" + created: "2020-05-29T13:00:04.676573+02:00" description: Kubernetes native operator which fully manages Jenkins on Kubernetes digest: 64af56f62b3706e4c5b55055047ad6a238e74c8958a89b1a4c2866110a3077a6 icon: https://raw.githubusercontent.com/jenkinsci/kubernetes-operator/master/assets/jenkins-operator-icon.png @@ -13,7 +23,7 @@ entries: version: 0.2.4 - apiVersion: v1 appVersion: 0.4.0 - created: "2020-05-12T11:40:10.591582+02:00" + created: "2020-05-29T13:00:04.674379+02:00" description: Kubernetes native operator which fully manages Jenkins on Kubernetes digest: c5679f1509862ddf1df4432ff210eaece42ca0f62a8775d15e0912dfeb680d8c icon: https://raw.githubusercontent.com/jenkinsci/kubernetes-operator/master/assets/jenkins-operator-icon.png @@ -23,7 +33,7 @@ entries: version: 0.2.3 - apiVersion: v1 appVersion: 0.4.0 - created: "2020-05-12T11:40:10.590322+02:00" + created: "2020-05-29T13:00:04.672825+02:00" description: Kubernetes native operator which fully manages Jenkins on Kubernetes digest: ea92693fd3b3ad41a81fbc02502f6dd207ea36610509e10509cd9d4ff8a87b1e icon: https://raw.githubusercontent.com/jenkinsci/kubernetes-operator/master/assets/jenkins-operator-icon.png @@ -33,7 +43,7 @@ entries: version: 0.2.2 - apiVersion: v1 appVersion: 0.4.0 - created: "2020-05-12T11:40:10.588271+02:00" + created: "2020-05-29T13:00:04.671135+02:00" description: Kubernetes native operator which fully manages Jenkins on Kubernetes digest: d8eba6a0285f449eee933c875a2fa540131ff16471df77b24fa03c5b1e90a023 icon: https://raw.githubusercontent.com/jenkinsci/kubernetes-operator/master/assets/jenkins-operator-icon.png @@ -43,7 +53,7 @@ entries: version: 0.2.1 - apiVersion: v1 appVersion: 0.4.0 - created: "2020-05-12T11:40:10.586721+02:00" + created: "2020-05-29T13:00:04.669686+02:00" description: Kubernetes native operator which fully manages Jenkins on Kubernetes digest: 35ea98d6836b09946dcb1cb250c5e2b84391b92033f6ce8a0124ae15169b9db7 icon: https://raw.githubusercontent.com/jenkinsci/kubernetes-operator/master/assets/jenkins-operator-icon.png @@ -53,7 +63,7 @@ entries: version: 0.2.0 - apiVersion: v1 appVersion: 0.4.0 - created: "2020-05-12T11:40:10.58496+02:00" + created: "2020-05-29T13:00:04.668509+02:00" description: Kubernetes native operator which fully manages Jenkins on Kubernetes digest: 97050b9409a18b4349f108d49022d0fe7cad29b2afc7866db6ae781e1b2237a6 icon: https://raw.githubusercontent.com/jenkinsci/kubernetes-operator/master/assets/jenkins-operator-icon.png @@ -63,7 +73,7 @@ entries: version: 0.1.3 - apiVersion: v1 appVersion: 0.4.0 - created: "2020-05-12T11:40:10.582935+02:00" + created: "2020-05-29T13:00:04.667214+02:00" description: Kubernetes native operator which fully manages Jenkins on Kubernetes digest: e682ccc9359a6b1674711812f440a7aa1bbc0125e0148ed6ad388bbc5b08b32c icon: https://raw.githubusercontent.com/jenkinsci/kubernetes-operator/master/assets/jenkins-operator-icon.png @@ -73,7 +83,7 @@ entries: version: 0.1.2 - apiVersion: v1 appVersion: 0.4.0 - created: "2020-05-12T11:40:10.581808+02:00" + created: "2020-05-29T13:00:04.666269+02:00" description: Kubernetes native operator which fully manages Jenkins on Kubernetes digest: 3ac5720c5d1b46837018763710e54e75c1d156b15d64cc4727f0000858f85f32 icon: https://raw.githubusercontent.com/jenkinsci/kubernetes-operator/master/assets/jenkins-operator-icon.png @@ -83,7 +93,7 @@ entries: version: 0.1.1 - apiVersion: v1 appVersion: 0.3.3 - created: "2020-05-12T11:40:10.580517+02:00" + created: "2020-05-29T13:00:04.665026+02:00" description: Kubernetes native operator which fully manages Jenkins on Kubernetes digest: b45bd9e29735ecd62a7d4f1a146ed40288ca2c6871f447e8d2bc59c302388b31 icon: https://raw.githubusercontent.com/jenkinsci/kubernetes-operator/master/assets/jenkins-operator-icon.png @@ -93,7 +103,7 @@ entries: version: 0.1.0 - apiVersion: v1 appVersion: 0.3.3 - created: "2020-05-12T11:40:10.579639+02:00" + created: "2020-05-29T13:00:04.664196+02:00" description: Kubernetes native operator which fully manages Jenkins on Kubernetes digest: a8b2c7f7354d54b94e438ab8eccd220031c7066d97c4a8253da2919fdaaff34f icon: https://raw.githubusercontent.com/jenkinsci/kubernetes-operator/master/assets/jenkins-operator-icon.png @@ -103,7 +113,7 @@ entries: version: 0.0.8 - apiVersion: v1 appVersion: 0.3.3 - created: "2020-05-12T11:40:10.578797+02:00" + created: "2020-05-29T13:00:04.663415+02:00" description: Kubernetes native operator which fully manages Jenkins on Kubernetes digest: 8957f24ee68d23e903d4b9666b7670d1569a4fb5da04d548b756ea8324a96eb4 icon: https://raw.githubusercontent.com/jenkinsci/kubernetes-operator/master/assets/jenkins-operator-icon.png @@ -113,7 +123,7 @@ entries: version: 0.0.7 - apiVersion: v1 appVersion: 0.3.2 - created: "2020-05-12T11:40:10.577874+02:00" + created: "2020-05-29T13:00:04.662601+02:00" description: Kubernetes native operator which fully manages Jenkins on Kubernetes digest: a64b28ee639a2c2af662f66437db497dcdd36742c50aa664cfd6d023f8e6d4bd icon: https://raw.githubusercontent.com/jenkinsci/kubernetes-operator/master/assets/jenkins-operator-icon.png @@ -123,7 +133,7 @@ entries: version: 0.0.6 - apiVersion: v1 appVersion: 0.3.1 - created: "2020-05-12T11:40:10.576968+02:00" + created: "2020-05-29T13:00:04.661852+02:00" description: Kubernetes native operator which fully manages Jenkins on Kubernetes digest: e6914be2c96a7ae8c7794e0d356b073394d1ee99465c7a26aeb77a22a5b4b22d icon: https://raw.githubusercontent.com/jenkinsci/kubernetes-operator/master/assets/jenkins-operator-icon.png @@ -133,7 +143,7 @@ entries: version: 0.0.5 - apiVersion: v1 appVersion: 0.3.0 - created: "2020-05-12T11:40:10.576097+02:00" + created: "2020-05-29T13:00:04.66074+02:00" description: Kubernetes native operator which fully manages Jenkins on Kubernetes digest: 82d3748cce50ebc9fdcebba419c11dac0557e5ba2441b8deb5da49aa879b692a icon: https://raw.githubusercontent.com/jenkinsci/kubernetes-operator/master/assets/jenkins-operator-icon.png @@ -143,7 +153,7 @@ entries: version: 0.0.4 - apiVersion: v1 appVersion: 0.2.2 - created: "2020-05-12T11:40:10.575246+02:00" + created: "2020-05-29T13:00:04.659876+02:00" description: Kubernetes native operator which fully manages Jenkins on Kubernetes digest: 2b2e4d9399fdf49e6ed33753fd69619068da16b1ffbae6f27bce89cbf83e8174 name: jenkins-operator @@ -152,7 +162,7 @@ entries: version: 0.0.3 - apiVersion: v1 appVersion: 0.2.2 - created: "2020-05-12T11:40:10.574473+02:00" + created: "2020-05-29T13:00:04.659115+02:00" description: Kubernetes native operator which fully manages Jenkins on Kubernetes digest: 16229e795a171427cd019fd623569aab1672618d7bc1d6b2c9fd627310fa00ef name: jenkins-operator @@ -161,11 +171,11 @@ entries: version: 0.0.2 - apiVersion: v1 appVersion: 0.2.0 - created: "2020-05-12T11:40:10.573741+02:00" + created: "2020-05-29T13:00:04.65835+02:00" description: Kubernetes native operator which fully manages Jenkins on Kubernetes digest: d5828cba35e435fc6526d235ec98b3ffdb8d6ed20b82c953a81a5c1f660d1fb3 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: "2020-05-12T11:40:10.570045+02:00" +generated: "2020-05-29T13:00:04.651465+02:00" diff --git a/chart/jenkins-operator/jenkins-operator-0.3.1.tgz b/chart/jenkins-operator/jenkins-operator-0.3.1.tgz new file mode 100644 index 0000000000000000000000000000000000000000..069a0004085215528f11e9996f09246134eabc2b GIT binary patch literal 5629 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 XJd}s>Z(II900960<-bt`0DJ%dv