Merge branch 'main' into fix/rss2twitter

jenkins-infra · Sep 20, 2023 · a70ca1c · a70ca1c
2 parents 138d406 + 24328a3
commit a70ca1c
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 11 deletions.
diff --git a/charts/accountapp/Chart.yaml b/charts/accountapp/Chart.yaml
@@ -3,4 +3,4 @@ description: A Helm chart for accounts.jenkins.io
 maintainers:
 - name: timja
 name: accountapp
-version: 0.6.11
+version: 0.6.13
diff --git a/charts/accountapp/values.yaml b/charts/accountapp/values.yaml
@@ -4,7 +4,7 @@
 replicaCount: 1
 image:
   repository: jenkinsciinfra/account-app
-  tag: 0.4.43
+  tag: 0.4.45
   pullPolicy: IfNotPresent
 imagePullSecrets: []
 nameOverride: ""

diff --git a/charts/httpd/Chart.yaml b/charts/httpd/Chart.yaml
@@ -1,4 +1,4 @@
 apiVersion: v1
 description: httpd helm chart for Kubernetes
 name: httpd
-version: 0.0.5
+version: 0.0.6
diff --git a/charts/httpd/values.yaml b/charts/httpd/values.yaml
@@ -4,7 +4,7 @@
 replicaCount: 1
 image:
   repository: httpd
-  tag: 2.4@sha256:b55dde71414f5e7ef6a3d5b33ce1ff7357a21148fcdc6be3db155ef391b6c663
+  tag: 2.4@sha256:4ffdefc17aef73b626a6e60078083420ba0c0f0a91e688eac130d9c078253bfb
   pullPolicy: IfNotPresent
 imagePullSecrets: []
 nameOverride: ""

diff --git a/charts/mirrorbits/Chart.yaml b/charts/mirrorbits/Chart.yaml
@@ -5,4 +5,4 @@ maintainers:
 - email: [email protected]
   name: olblak
 name: mirrorbits
-version: 0.65.3
+version: 0.65.4
diff --git a/charts/mirrorbits/values.yaml b/charts/mirrorbits/values.yaml
@@ -8,7 +8,7 @@ replicaCount:
 image:
   mirrorbits:
     repository: jenkinsciinfra/mirrorbits
-    tag: 0.1.99
+    tag: 0.1.100
     pullPolicy: IfNotPresent
   files:
     repository: httpd

diff --git a/charts/wiki/Chart.yaml b/charts/wiki/Chart.yaml
@@ -3,4 +3,4 @@ appVersion: 0.0.7
 description: A Helm chart for wiki static content
 name: wiki
 type: application
-version: 0.4.0
+version: 0.5.1
diff --git a/charts/wiki/templates/pdb.yaml b/charts/wiki/templates/pdb.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.poddisruptionbudget.enabled }}
+{{- if (gt (int .Values.replicaCount) 1) }}
 apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:

diff --git a/charts/wiki/tests/custom_values_test.yaml b/charts/wiki/tests/custom_values_test.yaml
@@ -4,7 +4,7 @@ templates:
 tests:
   - it: should ensure the pdb has correct spec
     set:
-      poddisruptionbudget.enabled: true
+      replicaCount: 2
       poddisruptionbudget.minAvailable: 2
       poddisruptionbudget.maxUnavailable: 1
     asserts:

diff --git a/charts/wiki/values.yaml b/charts/wiki/values.yaml
@@ -6,7 +6,7 @@ image:
   repository: jenkinsciinfra/wiki
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
-  tag: 0.1.7
+  tag: 0.1.8
 imagePullSecrets: []
 nameOverride: ""
 fullnameOverride: ""
@@ -67,6 +67,5 @@ nodeSelector: {}
 tolerations: []
 affinity: {}
 poddisruptionbudget:
-  enabled: false
   minAvailable: 1
   maxUnavailable: 1