From 24235a5fa61635bfdb2dfdd517f9cbe4f170b186 Mon Sep 17 00:00:00 2001 From: Jakub Al-Khalili Date: Thu, 7 May 2020 15:03:53 +0200 Subject: [PATCH] Allow configure Jenkins labels in Helm chart (#372) --- chart/index.yaml | 48 +++++++++++++----- chart/jenkins-operator/Chart.yaml | 2 +- .../jenkins-operator-0.2.1.tgz | Bin 0 -> 5609 bytes chart/jenkins-operator/templates/jenkins.yaml | 3 ++ chart/jenkins-operator/values.yaml | 3 ++ 5 files changed, 41 insertions(+), 15 deletions(-) create mode 100644 chart/jenkins-operator/jenkins-operator-0.2.1.tgz diff --git a/chart/index.yaml b/chart/index.yaml index e16d65ab..de58c3b9 100644 --- a/chart/index.yaml +++ b/chart/index.yaml @@ -3,7 +3,27 @@ entries: jenkins-operator: - apiVersion: v1 appVersion: 0.4.0 - created: "2020-04-30T09:52:29.969939+02:00" + created: "2020-05-07T14:23:46.484238+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 + name: jenkins-operator + urls: + - https://raw.githubusercontent.com/jenkinsci/kubernetes-operator/master/chart/jenkins-operator/jenkins-operator-0.2.1.tgz + version: 0.2.1 + - apiVersion: v1 + appVersion: 0.4.0 + created: "2020-05-07T14:23:46.502483+02:00" + description: Kubernetes native operator which fully manages Jenkins on Kubernetes + digest: 079ced4dd6b08ff3a5d9018e0f9f70d061d27da1be802677db66c8c669854a33 + 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.1.tgz + version: 0.2.1 + - apiVersion: v1 + appVersion: 0.4.0 + created: "2020-05-07T14:23:46.500585+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 @@ -13,7 +33,7 @@ entries: version: 0.2.0 - apiVersion: v1 appVersion: 0.4.0 - created: "2020-04-30T09:52:29.98191+02:00" + created: "2020-05-07T14:23:46.499549+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 @@ -23,7 +43,7 @@ entries: version: 0.1.3 - apiVersion: v1 appVersion: 0.4.0 - created: "2020-04-30T09:52:29.980524+02:00" + created: "2020-05-07T14:23:46.498302+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 @@ -33,7 +53,7 @@ entries: version: 0.1.2 - apiVersion: v1 appVersion: 0.4.0 - created: "2020-04-30T09:52:29.979597+02:00" + created: "2020-05-07T14:23:46.497405+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 @@ -43,7 +63,7 @@ entries: version: 0.1.1 - apiVersion: v1 appVersion: 0.3.3 - created: "2020-04-30T09:52:29.976979+02:00" + created: "2020-05-07T14:23:46.49613+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 @@ -53,7 +73,7 @@ entries: version: 0.1.0 - apiVersion: v1 appVersion: 0.3.3 - created: "2020-04-30T09:52:29.975998+02:00" + created: "2020-05-07T14:23:46.495214+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 @@ -63,7 +83,7 @@ entries: version: 0.0.8 - apiVersion: v1 appVersion: 0.3.3 - created: "2020-04-30T09:52:29.975342+02:00" + created: "2020-05-07T14:23:46.494385+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 @@ -73,7 +93,7 @@ entries: version: 0.0.7 - apiVersion: v1 appVersion: 0.3.2 - created: "2020-04-30T09:52:29.974625+02:00" + created: "2020-05-07T14:23:46.493255+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 @@ -83,7 +103,7 @@ entries: version: 0.0.6 - apiVersion: v1 appVersion: 0.3.1 - created: "2020-04-30T09:52:29.973589+02:00" + created: "2020-05-07T14:23:46.492438+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 @@ -93,7 +113,7 @@ entries: version: 0.0.5 - apiVersion: v1 appVersion: 0.3.0 - created: "2020-04-30T09:52:29.972746+02:00" + created: "2020-05-07T14:23:46.49119+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 @@ -103,7 +123,7 @@ entries: version: 0.0.4 - apiVersion: v1 appVersion: 0.2.2 - created: "2020-04-30T09:52:29.972076+02:00" + created: "2020-05-07T14:23:46.486789+02:00" description: Kubernetes native operator which fully manages Jenkins on Kubernetes digest: 2b2e4d9399fdf49e6ed33753fd69619068da16b1ffbae6f27bce89cbf83e8174 name: jenkins-operator @@ -112,7 +132,7 @@ entries: version: 0.0.3 - apiVersion: v1 appVersion: 0.2.2 - created: "2020-04-30T09:52:29.971412+02:00" + created: "2020-05-07T14:23:46.485924+02:00" description: Kubernetes native operator which fully manages Jenkins on Kubernetes digest: 16229e795a171427cd019fd623569aab1672618d7bc1d6b2c9fd627310fa00ef name: jenkins-operator @@ -121,11 +141,11 @@ entries: version: 0.0.2 - apiVersion: v1 appVersion: 0.2.0 - created: "2020-04-30T09:52:29.970732+02:00" + created: "2020-05-07T14:23:46.485124+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-04-30T09:52:29.967329+02:00" +generated: "2020-05-07T14:23:46.4806+02:00" diff --git a/chart/jenkins-operator/Chart.yaml b/chart/jenkins-operator/Chart.yaml index d3d6c4f5..625afad4 100644 --- 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.0 +version: 0.2.1 icon: https://raw.githubusercontent.com/jenkinsci/kubernetes-operator/master/assets/jenkins-operator-icon.png diff --git a/chart/jenkins-operator/jenkins-operator-0.2.1.tgz b/chart/jenkins-operator/jenkins-operator-0.2.1.tgz new file mode 100644 index 0000000000000000000000000000000000000000..a1dc14ca044010d6137f5689a41e8562dbaa389c GIT binary patch literal 5609 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 DJ}?fX literal 0 HcmV?d00001 diff --git a/chart/jenkins-operator/templates/jenkins.yaml b/chart/jenkins-operator/templates/jenkins.yaml index 6e251159..d3547932 100644 --- a/chart/jenkins-operator/templates/jenkins.yaml +++ b/chart/jenkins-operator/templates/jenkins.yaml @@ -58,6 +58,9 @@ spec: notifications: {{ toYaml . | nindent 4 }} {{- end }} master: + {{- with .Values.jenkins.labels }} + labels: {{ toYaml . | nindent 8 }} + {{- end }} {{- with .Values.jenkins.basePlugins }} basePlugins: {{ toYaml . | nindent 4 }} {{- end }} diff --git a/chart/jenkins-operator/values.yaml b/chart/jenkins-operator/values.yaml index fb83a934..d3b1af85 100644 --- a/chart/jenkins-operator/values.yaml +++ b/chart/jenkins-operator/values.yaml @@ -20,6 +20,9 @@ jenkins: # Create new namespace for jenkins (called e.g. jenkins) namespace: default + # labels are injected into metadata labels field + labels: {} + # image is the name (and tag) of the Jenkins instance # Default: jenkins/jenkins:lts # It's recommended to use LTS (tag: "lts") version