From 031c66c3022003e37b459a3d331f828b48023758 Mon Sep 17 00:00:00 2001 From: Raphaela <44403256+elatella@users.noreply.github.com> Date: Wed, 10 Apr 2024 15:54:26 +0200 Subject: [PATCH 1/9] Add replicaCount to values Signed-off-by: Raphaela <44403256+elatella@users.noreply.github.com> --- bitnami/jenkins/values.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bitnami/jenkins/values.yaml b/bitnami/jenkins/values.yaml index 7472c3079617f7..751d69bca28be7 100644 --- a/bitnami/jenkins/values.yaml +++ b/bitnami/jenkins/values.yaml @@ -40,6 +40,9 @@ nameOverride: "" fullnameOverride: "" ## @param commonLabels Labels to add to all deployed objects ## +replicaCount: 1 +## @param replicas Defining number of container replicas +## commonLabels: {} ## @param commonAnnotations Annotations to add to all deployed objects ## From cf4fd2e9f7beded5345ab1429ac7b6a5332f0654 Mon Sep 17 00:00:00 2001 From: Raphaela <44403256+elatella@users.noreply.github.com> Date: Wed, 10 Apr 2024 15:59:08 +0200 Subject: [PATCH 2/9] Add replicCount to deployment.yaml Signed-off-by: Raphaela <44403256+elatella@users.noreply.github.com> --- bitnami/jenkins/templates/deployment.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/bitnami/jenkins/templates/deployment.yaml b/bitnami/jenkins/templates/deployment.yaml index 6b6affdc4a2a43..8883371c66fc24 100644 --- a/bitnami/jenkins/templates/deployment.yaml +++ b/bitnami/jenkins/templates/deployment.yaml @@ -16,6 +16,7 @@ spec: {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.podLabels .Values.commonLabels ) "context" . ) }} selector: matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 6 }} + replicas: {{ .Values.replicaCount }} strategy: {{- include "common.tplvalues.render" (dict "value" .Values.updateStrategy "context" $ ) | nindent 4 }} template: metadata: From ac5d68eaa5ce9bb1025644e382d85ee130ef46f5 Mon Sep 17 00:00:00 2001 From: Raphaela <44403256+elatella@users.noreply.github.com> Date: Wed, 10 Apr 2024 16:11:22 +0200 Subject: [PATCH 3/9] Add replicaCount to README.md Signed-off-by: Raphaela <44403256+elatella@users.noreply.github.com> --- bitnami/jenkins/README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bitnami/jenkins/README.md b/bitnami/jenkins/README.md index 831fd6d30a1c10..f41f39651d9f55 100644 --- a/bitnami/jenkins/README.md +++ b/bitnami/jenkins/README.md @@ -196,6 +196,7 @@ s | `kubeVersion` | Override Kubernetes version | `""` | | `nameOverride` | String to partially override common.names.fullname | `""` | | `fullnameOverride` | String to fully override common.names.fullname | `""` | +| `replicaCount` | Number of containers | `1` | | `commonLabels` | Labels to add to all deployed objects | `{}` | | `commonAnnotations` | Annotations to add to all deployed objects | `{}` | | `clusterDomain` | Kubernetes cluster domain name | `cluster.local` | @@ -618,4 +619,4 @@ Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and -limitations under the License. \ No newline at end of file +limitations under the License. From 5d0b0456a42e0099db9c6636db15391af231ce39 Mon Sep 17 00:00:00 2001 From: Raphaela <44403256+elatella@users.noreply.github.com> Date: Wed, 10 Apr 2024 16:29:21 +0200 Subject: [PATCH 4/9] Update replicaCount to {} in values.yaml Signed-off-by: Raphaela <44403256+elatella@users.noreply.github.com> --- bitnami/jenkins/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bitnami/jenkins/values.yaml b/bitnami/jenkins/values.yaml index 751d69bca28be7..0b21981233d43b 100644 --- a/bitnami/jenkins/values.yaml +++ b/bitnami/jenkins/values.yaml @@ -40,7 +40,7 @@ nameOverride: "" fullnameOverride: "" ## @param commonLabels Labels to add to all deployed objects ## -replicaCount: 1 +replicaCount: {} ## @param replicas Defining number of container replicas ## commonLabels: {} From 4fa7dfbb471a2ef3c3881914201b076d6f446028 Mon Sep 17 00:00:00 2001 From: Raphaela <44403256+elatella@users.noreply.github.com> Date: Wed, 10 Apr 2024 22:49:07 +0200 Subject: [PATCH 5/9] Update deployment.yaml Signed-off-by: Raphaela <44403256+elatella@users.noreply.github.com> --- bitnami/jenkins/templates/deployment.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bitnami/jenkins/templates/deployment.yaml b/bitnami/jenkins/templates/deployment.yaml index 8883371c66fc24..7b3af2b1aa52f4 100644 --- a/bitnami/jenkins/templates/deployment.yaml +++ b/bitnami/jenkins/templates/deployment.yaml @@ -16,7 +16,9 @@ spec: {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.podLabels .Values.commonLabels ) "context" . ) }} selector: matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 6 }} - replicas: {{ .Values.replicaCount }} + {{- if .Values.replicaCount }} + {{- include "common.tplvalues.render" (dict "value" .Values.replicas "context" $) | nindent 8 }} + {{- end }} strategy: {{- include "common.tplvalues.render" (dict "value" .Values.updateStrategy "context" $ ) | nindent 4 }} template: metadata: From 5f94878a74a62df2a14d70c4cccedbd22bbb307e Mon Sep 17 00:00:00 2001 From: Raphaela <44403256+elatella@users.noreply.github.com> Date: Wed, 10 Apr 2024 22:50:12 +0200 Subject: [PATCH 6/9] Update values.yaml Signed-off-by: Raphaela <44403256+elatella@users.noreply.github.com> --- bitnami/jenkins/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bitnami/jenkins/values.yaml b/bitnami/jenkins/values.yaml index 0b21981233d43b..548fd0ccbdf04d 100644 --- a/bitnami/jenkins/values.yaml +++ b/bitnami/jenkins/values.yaml @@ -40,7 +40,7 @@ nameOverride: "" fullnameOverride: "" ## @param commonLabels Labels to add to all deployed objects ## -replicaCount: {} +replicas: {} ## @param replicas Defining number of container replicas ## commonLabels: {} From bcdbefccdedda198ad5d76aa950949acf80bafb3 Mon Sep 17 00:00:00 2001 From: Raphaela <44403256+elatella@users.noreply.github.com> Date: Wed, 15 May 2024 18:43:08 +0200 Subject: [PATCH 7/9] Simplify ReplicaCount Signed-off-by: Raphaela <44403256+elatella@users.noreply.github.com> --- bitnami/jenkins/values.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bitnami/jenkins/values.yaml b/bitnami/jenkins/values.yaml index e01e181ff8eab9..694513d3ed19db 100644 --- a/bitnami/jenkins/values.yaml +++ b/bitnami/jenkins/values.yaml @@ -38,10 +38,10 @@ nameOverride: "" ## @param fullnameOverride String to fully override common.names.fullname ## fullnameOverride: "" -## @param commonLabels Labels to add to all deployed objects +## @param replicaCount Number of container replicas ## -replicas: {} -## @param replicas Defining number of container replicas +replicaCount: 1 +## @param commonLabels Labels to add to all deployed objects ## commonLabels: {} ## @param commonAnnotations Annotations to add to all deployed objects From 4e80275e2d462c1b0887fe2e0826aac6937ccec1 Mon Sep 17 00:00:00 2001 From: Raphaela <44403256+elatella@users.noreply.github.com> Date: Wed, 15 May 2024 18:44:47 +0200 Subject: [PATCH 8/9] Simplify replica solution Signed-off-by: Raphaela <44403256+elatella@users.noreply.github.com> --- bitnami/jenkins/templates/deployment.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/bitnami/jenkins/templates/deployment.yaml b/bitnami/jenkins/templates/deployment.yaml index 089d335a53dc78..f419cecb6cd95e 100644 --- a/bitnami/jenkins/templates/deployment.yaml +++ b/bitnami/jenkins/templates/deployment.yaml @@ -16,9 +16,7 @@ spec: {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.podLabels .Values.commonLabels ) "context" . ) }} selector: matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 6 }} - {{- if .Values.replicaCount }} - {{- include "common.tplvalues.render" (dict "value" .Values.replicas "context" $) | nindent 8 }} - {{- end }} + replicas: {{ .Values.replicaCount }} strategy: {{- include "common.tplvalues.render" (dict "value" .Values.updateStrategy "context" $ ) | nindent 4 }} template: metadata: From ab7791cbae83f7a690fa8519a5e77c293f37f58f Mon Sep 17 00:00:00 2001 From: Raphaela Seeger Date: Thu, 16 May 2024 16:03:24 +0200 Subject: [PATCH 9/9] Update ReadMe and Bump version Signed-off-by: Raphaela Seeger --- bitnami/jenkins/Chart.yaml | 2 +- bitnami/jenkins/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bitnami/jenkins/Chart.yaml b/bitnami/jenkins/Chart.yaml index be86e5cc3dd15b..d342c47a42e75f 100644 --- a/bitnami/jenkins/Chart.yaml +++ b/bitnami/jenkins/Chart.yaml @@ -35,4 +35,4 @@ maintainers: name: jenkins sources: - https://github.com/bitnami/charts/tree/main/bitnami/jenkins -version: 13.1.4 +version: 13.2.0 diff --git a/bitnami/jenkins/README.md b/bitnami/jenkins/README.md index a67362a2446a33..133c60d78faa0b 100644 --- a/bitnami/jenkins/README.md +++ b/bitnami/jenkins/README.md @@ -196,7 +196,7 @@ s | `kubeVersion` | Override Kubernetes version | `""` | | `nameOverride` | String to partially override common.names.fullname | `""` | | `fullnameOverride` | String to fully override common.names.fullname | `""` | -| `replicaCount` | Number of containers | `1` | +| `replicaCount` | Number of container replicas | `1` | | `commonLabels` | Labels to add to all deployed objects | `{}` | | `commonAnnotations` | Annotations to add to all deployed objects | `{}` | | `clusterDomain` | Kubernetes cluster domain name | `cluster.local` |