Merge branch 'main' into thanos-store-sharded

Signed-off-by: Peter Han <[email protected]>
bitnami · Jun 11, 2024 · 3f75d9a · 3f75d9a
2 parents c0c0ba8 + dd70523
commit 3f75d9a
Show file tree

Hide file tree

Showing 48 changed files with 232 additions and 67 deletions.
diff --git a/.github/workflows/cd-pipeline.yml b/.github/workflows/cd-pipeline.yml
@@ -113,6 +113,7 @@ jobs:
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_PUBLISH_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_PUBLISH_SECRET_ACCESS_KEY }}
           AWS_ASSUME_ROLE_ARN: ${{ secrets.AWS_PUBLISH_ROLE_ARN }}
+          AWS_MAX_ATTEMPTS: 3
           AWS_DEFAULT_REGION: us-east-1
         run: |
           # Configure AWS account
@@ -192,17 +193,99 @@ jobs:
             git tag ${CHART}/${chart_version}
             git push --tags
           fi
+  push-promotion:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    needs:
+      - get-chart
+      - update-index
+    name: Push Promotion files
+    if: ${{ needs.get-chart.outputs.result == 'ok' }}
+    steps:
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29
+        with:
+          path: charts
+      - name: Install helm
+        run: |
+          HELM_TARBALL="helm-v3.8.1-linux-amd64.tar.gz"
+          curl -SsLfO "https://get.helm.sh/${HELM_TARBALL}" && sudo tar xf "$HELM_TARBALL" --strip-components 1 -C /usr/local/bin
+      - env:
+          CHART_NAME: ${{ needs.get-chart.outputs.chart }}
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_PROMOTION_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_PROMOTION_SECRET_ACCESS_KEY }}
+          AWS_PROMOTION_BUCKET: ${{ secrets.AWS_PROMOTION_BUCKET }}
+          AWS_MAX_ATTEMPTS: 3
+          AWS_DEFAULT_REGION: us-east-1
+        run: |
+          #!/bin/bash
+          chart="bitnami/${CHART_NAME}"
+          cd charts
+          # Get chart and app version
+          chart_version="$(yq e '.version' "${chart}/Chart.yaml")"
+          app_version="$(yq e '.appVersion' "${chart}/Chart.yaml")"
+          # Get image list (removing the registry)
+          helm dep build ${chart}
+          image_list="$(yq '.annotations.images' "${chart}/Chart.yaml" | yq '[ .[] | .image | sub("^[^/]+/", "") ] | tojson')"
+          for dependency in "${chart}/charts/"*.tgz; do
+            if [[ -s "$dependency" ]]; then
+              # Analyse all 'Chart.yaml' files in dependencies
+              while read -r chart_yaml_file; do 
+                if [[ -n "${chart_yaml_file}" ]]; then
+                  dependency_image_list="$(tar -xzO -f "$dependency" "$chart_yaml_file" | yq '.annotations.images' | yq '[ .[] | .image | sub("^[^/]+/", "") ] | tojson')"
+                  image_list="$(jq -c --null-input --argjson arr1 "$image_list" --argjson arr2 "$dependency_image_list" '$arr1 + $arr2 | unique')"
+                fi
+              done < <(tar -tzf "$dependency" | grep -E "Chart.yaml$")
+            fi
+          done
+          # Build JSON files
+          release_date="$(date -u +"%Y/%m/%d")"
+          file_prefix="$(date -u +"%s%3N-${CHART_NAME}-${app_version}")"
+          json_template=$(cat << "EOF"
+          {
+            "platform_id": $platform_id,
+            "application": $app,
+            "external_id": "\($app):\($chart_version)",
+            "version": $app_version,
+            "bundled_os_version": $bundled_os_version,
+            "properties": {
+                "chart_url": "https://charts.bitnami.com/bitnami/\($app)-\($chart_version).tgz",
+                "containers": $image_list,
+                "github_repository": "bitnami/charts/tree/main/bitnami/\($app)",
+            }
+          }
+          EOF
+          )
+          jq --null-input \
+            --arg platform_id "bitnami-chart-debian-x64" \
+            --arg app "${CHART_NAME}" \
+            --arg app_version "${app_version}" \
+            --arg chart_version "${chart_version}" \
+            --arg bundled_os_version "12" \
+            --argjson image_list "${image_list}" "${json_template}" > "${file_prefix}-bitnami-chart-debian-x64.json"
+          jq --null-input \
+            --arg platform_id "vmware-chart-debian-x64" \
+            --arg app "${CHART_NAME}" \
+            --arg app_version "${app_version}" \
+            --arg chart_version "${chart_version}" \
+            --arg bundled_os_version "12" \
+            --argjson image_list "${image_list}" "${json_template}" | jq '.properties += {"alias_platform_from": "bitnami-chart-debian-x64"}' > "${file_prefix}-vmware-chart-debian-x64.json"
+          # Upload files to the release bucket.
+          aws s3 cp "${file_prefix}-bitnami-chart-debian-x64.json" "s3://${AWS_PROMOTION_BUCKET}/releases/${release_date}/${file_prefix}-bitnami-chart-debian-x64.json"
+          aws s3 cp "${file_prefix}-vmware-chart-debian-x64.json" "s3://${AWS_PROMOTION_BUCKET}/releases/${release_date}/${file_prefix}-vmware-chart-debian-x64.json"
+
   # If the CD Pipeline does not succeed we should notify the interested agents
   slack-notif:
     runs-on: ubuntu-latest
     needs:
       - vib-publish
       - update-index
+      - push-promotion
     if: always()
     name: Notify unsuccessful CD run
     steps:
       - name: Notify in Slack channel
-        if: ${{ needs.update-index.result != 'success' }}
+        if: ${{ needs.push-promotion.result != 'success' }}
         uses: slackapi/slack-github-action@70cd7be8e40a46e8b0eced40b0de447bdb42f68e
         with:
           channel-id: ${{ secrets.CD_SLACK_CHANNEL_ID }}

diff --git a/bitnami/apache/CHANGELOG.md b/bitnami/apache/CHANGELOG.md
@@ -1,8 +1,12 @@
 # Changelog
 
-## 11.2.2 (2024-06-06)
+## 11.2.3 (2024-06-11)
 
-* [bitnami/apache] Release 11.2.2 ([#26930](https://github.com/bitnami/charts/pull/26930))
+* [bitnami/apache] Release 11.2.3 ([#27102](https://github.com/bitnami/charts/pull/27102))
+
+## <small>11.2.2 (2024-06-06)</small>
+
+* [bitnami/apache] Release 11.2.2 (#26930) ([f9829a8](https://github.com/bitnami/charts/commit/f9829a869975cbf63ee0181baed19db915b32398)), closes [#26930](https://github.com/bitnami/charts/issues/26930)
 
 ## <small>11.2.1 (2024-06-06)</small>
 

diff --git a/bitnami/apache/Chart.lock b/bitnami/apache/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: common
   repository: oci://registry-1.docker.io/bitnamicharts
-  version: 2.20.0
-digest: sha256:71e7e576e2b5403aae173a518430f727ccc2dd690a64cb44d47d6b8deb23d3c6
-generated: "2024-06-06T11:51:19.706607654Z"
+  version: 2.20.2
+digest: sha256:35d895f873f86ebff35e439bcf9da34c42a78c4db2e0e179bfb4014a2a0e2e10
+generated: "2024-06-11T17:32:54.789429692Z"
diff --git a/bitnami/apache/Chart.yaml b/bitnami/apache/Chart.yaml
@@ -6,7 +6,7 @@ annotations:
   licenses: Apache-2.0
   images: |
     - name: apache
-      image: docker.io/bitnami/apache:2.4.59-debian-12-r5
+      image: docker.io/bitnami/apache:2.4.59-debian-12-r6
     - name: apache-exporter
       image: docker.io/bitnami/apache-exporter:1.0.7-debian-12-r9
     - name: git
@@ -35,4 +35,4 @@ maintainers:
 name: apache
 sources:
 - https://github.com/bitnami/charts/tree/main/bitnami/apache
-version: 11.2.2
+version: 11.2.3
diff --git a/bitnami/apache/values.yaml b/bitnami/apache/values.yaml
@@ -62,7 +62,7 @@ extraDeploy: []
 image:
   registry: docker.io
   repository: bitnami/apache
-  tag: 2.4.59-debian-12-r5
+  tag: 2.4.59-debian-12-r6
   digest: ""
   ## Specify a imagePullPolicy
   ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'

diff --git a/bitnami/argo-cd/CHANGELOG.md b/bitnami/argo-cd/CHANGELOG.md
@@ -1,8 +1,12 @@
 # Changelog
 
-## 6.4.5 (2024-06-06)
+## 6.4.6 (2024-06-07)
 
-* [bitnami/argo-cd] Release 6.4.5 ([#26938](https://github.com/bitnami/charts/pull/26938))
+* [bitnami/argo-cd] Typo in notifications service ([#27054](https://github.com/bitnami/charts/pull/27054))
+
+## <small>6.4.5 (2024-06-06)</small>
+
+* [bitnami/argo-cd] Release 6.4.5 (#26938) ([7233063](https://github.com/bitnami/charts/commit/72330635af507b167ed585844d2c3beb09191378)), closes [#26938](https://github.com/bitnami/charts/issues/26938)
 
 ## <small>6.4.4 (2024-06-06)</small>
 

diff --git a/bitnami/argo-cd/Chart.yaml b/bitnami/argo-cd/Chart.yaml
@@ -39,4 +39,4 @@ maintainers:
 name: argo-cd
 sources:
 - https://github.com/bitnami/charts/tree/main/bitnami/argo-cd
-version: 6.4.5
+version: 6.4.6
diff --git a/bitnami/argo-cd/templates/dex/servicemonitor.yaml b/bitnami/argo-cd/templates/dex/servicemonitor.yaml
@@ -8,7 +8,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: {{ include "argocd.dex" . }}
-  namespace: {{ default include ( "common.names.namespace" . ) .Values.dex.metrics.serviceMonitor.namespace | quote }}
+  namespace: {{ default ( include "common.names.namespace" . ) .Values.dex.metrics.serviceMonitor.namespace | quote }}
   {{- $versionLabel := dict "app.kubernetes.io/version" ( include "common.images.version" ( dict "imageRoot" .Values.dex.image "chart" .Chart ) ) }}
   {{- $labels := include "common.tplvalues.merge" ( dict "values" ( list .Values.commonLabels $versionLabel ) "context" . ) }}
   labels: {{- include "common.labels.standard" ( dict "customLabels" $labels "context" $ ) | nindent 4 }}

diff --git a/bitnami/argo-cd/templates/notifications/metrics-svc.yaml b/bitnami/argo-cd/templates/notifications/metrics-svc.yaml
@@ -39,7 +39,7 @@ spec:
   ports:
     - name:  http-metrics
       targetPort: metrics
-      port: {{ coalesce .Values.notifications.metrics.service.port .Valeus.notifications.metrics.service.ports.metrics }}
+      port: {{ coalesce .Values.notifications.metrics.service.port .Values.notifications.metrics.service.ports.metrics }}
       protocol: TCP
       {{- if (and (or (eq .Values.notifications.metrics.service.type "NodePort") (eq .Values.notifications.metrics.service.type "LoadBalancer")) (not (empty (coalesce .Values.notifications.metrics.service.nodePort .Values.notifications.metrics.service.nodePorts.metrics)))) }}
       nodePort: {{ coalesce .Values.notifications.metrics.service.nodePort .Values.notifications.metrics.service.nodePorts.metrics }}

diff --git a/bitnami/contour/CHANGELOG.md b/bitnami/contour/CHANGELOG.md
@@ -1,8 +1,12 @@
 # Changelog
 
-## 18.2.2 (2024-06-06)
+## 18.2.3 (2024-06-11)
 
-* [bitnami/contour] Release 18.2.2 ([#26943](https://github.com/bitnami/charts/pull/26943))
+* [bitnami/contour] Fix Envoy livenessProbe typo ([#26525](https://github.com/bitnami/charts/pull/26525))
+
+## <small>18.2.2 (2024-06-06)</small>
+
+* [bitnami/contour] Release 18.2.2 (#26943) ([df54b46](https://github.com/bitnami/charts/commit/df54b460deeb32892ef6762684db25f8f02900d1)), closes [#26943](https://github.com/bitnami/charts/issues/26943)
 
 ## <small>18.2.1 (2024-06-06)</small>
 

diff --git a/bitnami/contour/Chart.yaml b/bitnami/contour/Chart.yaml
@@ -32,4 +32,4 @@ maintainers:
 name: contour
 sources:
 - https://github.com/bitnami/charts/tree/main/bitnami/contour
-version: 18.2.2
+version: 18.2.3
diff --git a/bitnami/contour/templates/envoy/deployment.yaml b/bitnami/contour/templates/envoy/deployment.yaml
@@ -265,7 +265,7 @@ spec:
           livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.envoy.customLivenessProbe "context" $) | nindent 12 }}
           {{- else if .Values.envoy.livenessProbe.enabled }}
           livenessProbe:
-            tcpsocket:
+            tcpSocket:
               port: {{ .Values.envoy.containerPorts.metrics }}
             initialDelaySeconds: {{ .Values.envoy.livenessProbe.initialDelaySeconds }}
             periodSeconds: {{ .Values.envoy.livenessProbe.periodSeconds }}

diff --git a/bitnami/ghost/CHANGELOG.md b/bitnami/ghost/CHANGELOG.md
@@ -1,8 +1,12 @@
 # Changelog
 
-## 21.1.7 (2024-06-07)
+## 21.1.8 (2024-06-11)
 
-* [bitnami/ghost] Release 21.1.7 ([#27060](https://github.com/bitnami/charts/pull/27060))
+* [bitnami/ghost] Release 21.1.8 ([#27085](https://github.com/bitnami/charts/pull/27085))
+
+## <small>21.1.7 (2024-06-07)</small>
+
+* [bitnami/ghost] Release 21.1.7 (#27060) ([a4f42c1](https://github.com/bitnami/charts/commit/a4f42c1fe99cd72a3bde5a677229ccafb3308e60)), closes [#27060](https://github.com/bitnami/charts/issues/27060)
 
 ## <small>21.1.6 (2024-06-06)</small>
 

diff --git a/bitnami/ghost/Chart.lock b/bitnami/ghost/Chart.lock
@@ -4,6 +4,6 @@ dependencies:
   version: 11.1.2
 - name: common
   repository: oci://registry-1.docker.io/bitnamicharts
-  version: 2.20.0
-digest: sha256:10a6edaec52182bb7eafcaa6148324f1d4535096f21e50d50768fa84af7057ff
-generated: "2024-06-07T18:35:53.492692437Z"
+  version: 2.20.2
+digest: sha256:0e06e35b334354e4520eeb95074f470b9c68a97380f7af326a2161696575d5bd
+generated: "2024-06-10T21:46:52.923036407Z"
diff --git a/bitnami/ghost/Chart.yaml b/bitnami/ghost/Chart.yaml
@@ -6,11 +6,11 @@ annotations:
   licenses: Apache-2.0
   images: |
     - name: ghost
-      image: docker.io/bitnami/ghost:5.84.2-debian-12-r0
+      image: docker.io/bitnami/ghost:5.85.0-debian-12-r0
     - name: os-shell
       image: docker.io/bitnami/os-shell:12-debian-12-r22
 apiVersion: v2
-appVersion: 5.84.2
+appVersion: 5.85.0
 dependencies:
 - condition: mysql.enabled
   name: mysql
@@ -40,4 +40,4 @@ maintainers:
 name: ghost
 sources:
 - https://github.com/bitnami/charts/tree/main/bitnami/ghost
-version: 21.1.7
+version: 21.1.8
diff --git a/bitnami/ghost/values.yaml b/bitnami/ghost/values.yaml
@@ -79,7 +79,7 @@ diagnosticMode:
 image:
   registry: docker.io
   repository: bitnami/ghost
-  tag: 5.84.2-debian-12-r0
+  tag: 5.85.0-debian-12-r0
   digest: ""
   ## Specify a imagePullPolicy
   ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'

diff --git a/bitnami/haproxy/CHANGELOG.md b/bitnami/haproxy/CHANGELOG.md
@@ -1,8 +1,12 @@
 # Changelog
 
-## 2.0.2 (2024-06-10)
+## 2.0.3 (2024-06-11)
 
-* [bitnami/haproxy] Release 2.0.2 ([#27077](https://github.com/bitnami/charts/pull/27077))
+* [bitnami/haproxy] Release 2.0.3 ([#27098](https://github.com/bitnami/charts/pull/27098))
+
+## <small>2.0.2 (2024-06-10)</small>
+
+* [bitnami/haproxy] Release 2.0.2 (#27077) ([7da93c0](https://github.com/bitnami/charts/commit/7da93c0379f6b820a38ef54194f7dfa7fe5408b0)), closes [#27077](https://github.com/bitnami/charts/issues/27077)
 
 ## <small>2.0.1 (2024-06-06)</small>
 

diff --git a/bitnami/haproxy/Chart.yaml b/bitnami/haproxy/Chart.yaml
@@ -6,7 +6,7 @@ annotations:
   licenses: Apache-2.0
   images: |
     - name: haproxy
-      image: docker.io/bitnami/haproxy:3.0.1-debian-12-r0
+      image: docker.io/bitnami/haproxy:3.0.1-debian-12-r1
 apiVersion: v2
 appVersion: 3.0.1
 dependencies:
@@ -28,4 +28,4 @@ maintainers:
 name: haproxy
 sources:
 - https://github.com/bitnami/charts/tree/main/bitnami/haproxy
-version: 2.0.2
+version: 2.0.3
diff --git a/bitnami/haproxy/values.yaml b/bitnami/haproxy/values.yaml
@@ -304,7 +304,7 @@ terminationGracePeriodSeconds: ""
 image:
   registry: docker.io
   repository: bitnami/haproxy
-  tag: 3.0.1-debian-12-r0
+  tag: 3.0.1-debian-12-r1
   digest: ""
   ## Specify a imagePullPolicy
   ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'

diff --git a/bitnami/nginx/CHANGELOG.md b/bitnami/nginx/CHANGELOG.md
@@ -1,8 +1,12 @@
 # Changelog
 
-## 18.0.3 (2024-06-10)
+## 18.1.0 (2024-06-11)
 
-* [bitnami/nginx] Release 18.0.3 ([#27083](https://github.com/bitnami/charts/pull/27083))
+* [bitnami/nginx] Allowing for customize dnsPolicy and dnsConfig for nginx ([#26619](https://github.com/bitnami/charts/pull/26619))
+
+## <small>18.0.3 (2024-06-10)</small>
+
+* [bitnami/nginx] Release 18.0.3 (#27083) ([695dc9d](https://github.com/bitnami/charts/commit/695dc9dbc9fe880af6ee5df5b4a45dd894473a6a)), closes [#27083](https://github.com/bitnami/charts/issues/27083)
 
 ## <small>18.0.2 (2024-06-10)</small>
 

diff --git a/bitnami/nginx/Chart.yaml b/bitnami/nginx/Chart.yaml
@@ -34,4 +34,4 @@ maintainers:
 name: nginx
 sources:
 - https://github.com/bitnami/charts/tree/main/bitnami/nginx
-version: 18.0.3
+version: 18.1.0
diff --git a/bitnami/nginx/README.md b/bitnami/nginx/README.md
@@ -195,6 +195,8 @@ For annotations, please see [this document](https://github.com/kubernetes/ingres
 | `affinity`                                          | Affinity for pod assignment                                                                                                                                                                                       | `{}`             |
 | `hostNetwork`                                       | Specify if host network should be enabled for NGINX pod                                                                                                                                                           | `false`          |
 | `hostIPC`                                           | Specify if host IPC should be enabled for NGINX pod                                                                                                                                                               | `false`          |
+| `dnsPolicy`                                         | Specifies the DNS policy for the NGINX pod                                                                                                                                                                        | `""`             |
+| `dnsConfig`                                         | Allows users more control on the DNS settings for a Pod. Required if `dnsPolicy` is set to `None`                                                                                                                 | `{}`             |
 | `nodeSelector`                                      | Node labels for pod assignment. Evaluated as a template.                                                                                                                                                          | `{}`             |
 | `tolerations`                                       | Tolerations for pod assignment. Evaluated as a template.                                                                                                                                                          | `[]`             |
 | `priorityClassName`                                 | NGINX pods' priorityClassName                                                                                                                                                                                     | `""`             |

diff --git a/bitnami/nginx/templates/deployment.yaml b/bitnami/nginx/templates/deployment.yaml
@@ -53,6 +53,12 @@ spec:
         nodeAffinity: {{- include "common.affinities.nodes" (dict "type" .Values.nodeAffinityPreset.type "key" .Values.nodeAffinityPreset.key "values" .Values.nodeAffinityPreset.values) | nindent 10 }}
       {{- end }}
       hostNetwork: {{ .Values.hostNetwork }}
+      {{- if .Values.dnsPolicy  }}
+      dnsPolicy: {{ .Values.dnsPolicy }}
+      {{- end }}
+      {{- if .Values.dnsConfig }}
+      dnsConfig: {{- include "common.tplvalues.render" (dict "value" .Values.dnsConfig "context" $) | nindent 8 }}
+      {{- end }}
       hostIPC: {{ .Values.hostIPC }}
       {{- if .Values.priorityClassName }}
       priorityClassName: {{ .Values.priorityClassName | quote }}

diff --git a/bitnami/nginx/values.yaml b/bitnami/nginx/values.yaml
@@ -185,6 +185,28 @@ hostNetwork: false
 ## @param hostIPC Specify if host IPC should be enabled for NGINX pod
 ##
 hostIPC: false
+## DNS-Pod services
+## Ref: https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/
+## @param dnsPolicy Specifies the DNS policy for the NGINX pod
+## DNS policies can be set on a per-Pod basis. Currently Kubernetes supports the following Pod-specific DNS policies.
+## Available options: Default, ClusterFirst, ClusterFirstWithHostNet, None
+## Ref: https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/#pod-s-dns-policy
+dnsPolicy: ""
+## @param dnsConfig  Allows users more control on the DNS settings for a Pod. Required if `dnsPolicy` is set to `None`
+## The dnsConfig field is optional and it can work with any dnsPolicy settings.
+## Ref: https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/#pod-dns-config
+## E.g.
+## dnsConfig:
+##   nameservers:
+##     - 192.0.2.1 # this is an example
+##   searches:
+##     - ns1.svc.cluster-domain.example
+##     - my.dns.search.suffix
+##   options:
+##     - name: ndots
+##       value: "2"
+##     - name: edns0
+dnsConfig: {}
 ## @param nodeSelector Node labels for pod assignment. Evaluated as a template.
 ## Ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/
 ##