Merge pull request #382 from jakalkhalili/helm-improve-label

Improve helm chart labels
jenkinsci · May 12, 2020 · 2374727 · 2374727
2 parents 88eda48 + 7894844
commit 2374727
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 19 deletions.
diff --git a/chart/index.yaml b/chart/index.yaml
@@ -3,7 +3,17 @@ entries:
   jenkins-operator:
   - apiVersion: v1
     appVersion: 0.4.0
-    created: "2020-05-08T15:18:39.599904+02:00"
+    created: "2020-05-12T11:40:10.572356+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
+    name: jenkins-operator
+    urls:
+    - https://raw.githubusercontent.com/jenkinsci/kubernetes-operator/master/chart/jenkins-operator/jenkins-operator-0.2.4.tgz
+    version: 0.2.4
+  - apiVersion: v1
+    appVersion: 0.4.0
+    created: "2020-05-12T11:40:10.591582+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
@@ -13,7 +23,7 @@ entries:
     version: 0.2.3
   - apiVersion: v1
     appVersion: 0.4.0
-    created: "2020-05-08T15:18:39.61599+02:00"
+    created: "2020-05-12T11:40:10.590322+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
@@ -23,7 +33,7 @@ entries:
     version: 0.2.2
   - apiVersion: v1
     appVersion: 0.4.0
-    created: "2020-05-08T15:18:39.614914+02:00"
+    created: "2020-05-12T11:40:10.588271+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
@@ -33,7 +43,7 @@ entries:
     version: 0.2.1
   - apiVersion: v1
     appVersion: 0.4.0
-    created: "2020-05-08T15:18:39.613638+02:00"
+    created: "2020-05-12T11:40:10.586721+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
@@ -43,7 +53,7 @@ entries:
     version: 0.2.0
   - apiVersion: v1
     appVersion: 0.4.0
-    created: "2020-05-08T15:18:39.612727+02:00"
+    created: "2020-05-12T11:40:10.58496+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
@@ -53,7 +63,7 @@ entries:
     version: 0.1.3
   - apiVersion: v1
     appVersion: 0.4.0
-    created: "2020-05-08T15:18:39.611679+02:00"
+    created: "2020-05-12T11:40:10.582935+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
@@ -63,7 +73,7 @@ entries:
     version: 0.1.2
   - apiVersion: v1
     appVersion: 0.4.0
-    created: "2020-05-08T15:18:39.610897+02:00"
+    created: "2020-05-12T11:40:10.581808+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
@@ -73,7 +83,7 @@ entries:
     version: 0.1.1
   - apiVersion: v1
     appVersion: 0.3.3
-    created: "2020-05-08T15:18:39.609836+02:00"
+    created: "2020-05-12T11:40:10.580517+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
@@ -83,7 +93,7 @@ entries:
     version: 0.1.0
   - apiVersion: v1
     appVersion: 0.3.3
-    created: "2020-05-08T15:18:39.607336+02:00"
+    created: "2020-05-12T11:40:10.579639+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
@@ -93,7 +103,7 @@ entries:
     version: 0.0.8
   - apiVersion: v1
     appVersion: 0.3.3
-    created: "2020-05-08T15:18:39.606045+02:00"
+    created: "2020-05-12T11:40:10.578797+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
@@ -103,7 +113,7 @@ entries:
     version: 0.0.7
   - apiVersion: v1
     appVersion: 0.3.2
-    created: "2020-05-08T15:18:39.603879+02:00"
+    created: "2020-05-12T11:40:10.577874+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
@@ -113,7 +123,7 @@ entries:
     version: 0.0.6
   - apiVersion: v1
     appVersion: 0.3.1
-    created: "2020-05-08T15:18:39.603222+02:00"
+    created: "2020-05-12T11:40:10.576968+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
@@ -123,7 +133,7 @@ entries:
     version: 0.0.5
   - apiVersion: v1
     appVersion: 0.3.0
-    created: "2020-05-08T15:18:39.602525+02:00"
+    created: "2020-05-12T11:40:10.576097+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
@@ -133,7 +143,7 @@ entries:
     version: 0.0.4
   - apiVersion: v1
     appVersion: 0.2.2
-    created: "2020-05-08T15:18:39.601843+02:00"
+    created: "2020-05-12T11:40:10.575246+02:00"
     description: Kubernetes native operator which fully manages Jenkins on Kubernetes
     digest: 2b2e4d9399fdf49e6ed33753fd69619068da16b1ffbae6f27bce89cbf83e8174
     name: jenkins-operator
@@ -142,7 +152,7 @@ entries:
     version: 0.0.3
   - apiVersion: v1
     appVersion: 0.2.2
-    created: "2020-05-08T15:18:39.601189+02:00"
+    created: "2020-05-12T11:40:10.574473+02:00"
     description: Kubernetes native operator which fully manages Jenkins on Kubernetes
     digest: 16229e795a171427cd019fd623569aab1672618d7bc1d6b2c9fd627310fa00ef
     name: jenkins-operator
@@ -151,11 +161,11 @@ entries:
     version: 0.0.2
   - apiVersion: v1
     appVersion: 0.2.0
-    created: "2020-05-08T15:18:39.600521+02:00"
+    created: "2020-05-12T11:40:10.573741+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-08T15:18:39.59876+02:00"
+generated: "2020-05-12T11:40:10.570045+02:00"
diff --git a/chart/jenkins-operator/Chart.yaml b/chart/jenkins-operator/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v1
 appVersion: "0.4.0"
 description: Kubernetes native operator which fully manages Jenkins on Kubernetes
 name: jenkins-operator
-version: 0.2.3
+version: 0.2.4
 icon: https://raw.githubusercontent.com/jenkinsci/kubernetes-operator/master/assets/jenkins-operator-icon.png
diff --git a/chart/jenkins-operator/jenkins-operator-0.2.4.tgz b/chart/jenkins-operator/jenkins-operator-0.2.4.tgz
diff --git a/chart/jenkins-operator/templates/jenkins.yaml b/chart/jenkins-operator/templates/jenkins.yaml
@@ -4,6 +4,9 @@ kind: Jenkins
 metadata:
   name: {{ .Values.jenkins.name }}
   namespace: {{ .Values.jenkins.namespace }}
+  {{- with .Values.jenkins.labels }}
+  labels: {{ toYaml . | nindent 4 }}
+  {{- end }}
 spec:
   configurationAsCode:
     configurations:
@@ -59,7 +62,7 @@ spec:
   {{- end }}
   master:
     {{- with .Values.jenkins.labels }}
-    labels: {{ toYaml . | nindent 8 }}
+    labels: {{ toYaml . | nindent 6 }}
     {{- end }}
     {{- with .Values.jenkins.basePlugins }}
     basePlugins: {{ toYaml . | nindent 4 }}