Skip to content

Commit

Permalink
Merge remote-tracking branch 'bitnami/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
pckhoi committed Jan 20, 2025
2 parents a5a6dea + cd8d753 commit 67410ef
Show file tree
Hide file tree
Showing 249 changed files with 3,077 additions and 1,457 deletions.
42 changes: 42 additions & 0 deletions .github/workflows/gchat-notification.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
# Copyright Broadcom, Inc. All Rights Reserved.
# SPDX-License-Identifier: APACHE-2.0

name: 'GChat Notification'
on:
workflow_call:
inputs:
workflow:
type: string
required: true
job-url:
type: string
required: true
repository:
type: string
secrets:
GCHAT_WEBHOOK_URL:
required: true
# Remove all permissions by default
permissions: {}
jobs:
notification:
name: Google Chat Notification
runs-on: ubuntu-latest
steps:
- name: Notify
env:
JOB_URL: ${{ inputs.job-url }}
GH_WORKFLOW: ${{ inputs.workflow }}
GH_REPOSITORY: ${{ inputs.repository != '' && inputs.repository || github.repository }}
GCHAT_WEBHOOK_URL: ${{ secrets.GCHAT_WEBHOOK_URL }}
run: |
tmp_file=$(mktemp)
cat >"${tmp_file}"<<EOF
⚠️ [${GH_REPOSITORY}] Failure detected on '${GH_WORKFLOW}' workflow ⚠️
📑 See details <${JOB_URL}|here>.
EOF
# Use curl to send the JSON to Google.
escapedText=$(sed -e 's/\n/\\n/g' -e 's/"/\\"/g' -e "s/'/\\'/g" "${tmp_file}")
json="{\"text\": \"$escapedText\"}"
curl -o /tmp/out -s --fail -X POST -H 'Content-Type: application/json' -d "$json" "${GCHAT_WEBHOOK_URL}"
120 changes: 120 additions & 0 deletions .github/workflows/index-monitor.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,120 @@
name: '[Index] Monitor remote index.yaml'

on:
schedule:
# Every 10 minutes
- cron: '*/10 * * * *'

# Remove all permissions by default
permissions: {}

jobs:
integrity-check:
name: Compare the index.yaml checksums remote and locally
runs-on: ubuntu-latest
permissions:
contents: read
outputs:
result: ${{ steps.integrity-check.outputs.result }}
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
with:
ref: 'index'
- name: Check index integrity
id: integrity-check
run: |
status="fail"
attempts=0
# We want to check for consistent failures
# To do so, we will look for 3 consecutive failures with a 30 seconds wait
# A single success is enough to pass
while [[ "${status}" != "ok" && $attempts -lt 3 ]]; do
# Check the index.yaml integrity
REMOTE_MD5=($(curl -Ls https://charts.bitnami.com/bitnami/index.yaml | md5sum))
REPOSITORY_MD5=($(md5sum bitnami/index.yaml))
# Compare the index.yaml checksums remote and locally
if [[ "${REPOSITORY_MD5[0]}" == "${REMOTE_MD5[0]}" ]]; then
status='ok'
else
attempts=$((attempts+1))
echo "Integrity check failed. Remote checksum '${REMOTE_MD5[0]}' does not match expected '${REPOSITORY_MD5[0]}'";
# Refresh the 'index' branch in case it was updated
git fetch origin index
git reset --hard origin/index
# Wait 30 seconds
sleep 30
fi
done
echo "result=${status}" >> $GITHUB_OUTPUT
- name: Show messages
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea
with:
script: |
if ("${{ steps.integrity-check.outputs.result }}" != "ok" ) {
core.setFailed("Integrity check failed");
} else {
core.info("Integrity check succeeded")
}
validation-check:
name: Validate the helm repository can be added and updated
runs-on: ubuntu-latest
permissions:
contents: read
outputs:
result: ${{ steps.validation-check.outputs.result }}
steps:
- 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
- name: Validate helm repository
id: validation-check
run: |
repo="https://charts.bitnami.com/bitnami"
status="fail"
attempts=0
# We want to check for consistent failures
# To do so, we will look for 3 consecutive failures with a 30 seconds wait
# A single success is enough to pass
while [[ "${status}" != "ok" && $attempts -lt 3 ]]; do
# Validates the helm repository can be added and updated
if helm repo add bitnami "${repo}" && helm repo update bitnami; then
status="ok"
else
attempts=$((attempts+1))
echo "Failed to pull charts from helm repository '${repo}'"
# If present, remove repository to allow retries
if helm repo list | grep -q bitnami; then
helm repo remove bitnami
fi
# Wait 30 seconds
sleep 30
fi
done
echo "result=${status}" >> $GITHUB_OUTPUT
- name: Show messages
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea
with:
script: |
if ("${{ steps.validation-check.outputs.result }}" != "ok" ) {
core.setFailed("Validation check failed");
} else {
core.info("Validation check succeeded")
}
upload:
name: Re-upload index.yaml
needs: [validation-check, integrity-check]
if: ${{ always() && (needs.validation-check.outputs.result != 'ok' || needs.integrity-check.outputs.result != 'ok') }}
uses: bitnami/charts/.github/workflows/sync-chart-cloudflare-index.yml@index
secrets: inherit
permissions:
contents: read
notify:
name: Send notification
needs: [validation-check, integrity-check]
if: ${{ always() && (needs.validation-check.outputs.result != 'ok' || needs.integrity-check.outputs.result != 'ok') }}
uses: bitnami/charts/.github/workflows/gchat-notification.yml@main
with:
workflow: ${{ github.workflow }}
job-url: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
secrets: inherit
7 changes: 6 additions & 1 deletion bitnami/apache/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
# Changelog

## 11.3.1 (2025-01-17)

* [bitnami/apache] Release 11.3.1 ([#31449](https://github.com/bitnami/charts/pull/31449))

## 11.3.0 (2024-12-10)

* [bitnami/apache] Detect non-standard images ([#30857](https://github.com/bitnami/charts/pull/30857))
* [bitnami/*] Add Bitnami Premium to NOTES.txt (#30854) ([3dfc003](https://github.com/bitnami/charts/commit/3dfc00376df6631f0ce54b8d440d477f6caa6186)), closes [#30854](https://github.com/bitnami/charts/issues/30854)
* [bitnami/apache] Detect non-standard images (#30857) ([5666175](https://github.com/bitnami/charts/commit/5666175ae207b9527bb15070daf92f616aaa6c6a)), closes [#30857](https://github.com/bitnami/charts/issues/30857)

## <small>11.2.23 (2024-12-08)</small>

Expand Down
6 changes: 3 additions & 3 deletions bitnami/apache/Chart.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
dependencies:
- name: common
repository: oci://registry-1.docker.io/bitnamicharts
version: 2.28.0
digest: sha256:5b30f0fa07bb89b01c55fd6258c8ce22a611b13623d4ad83e8fdd1d4490adc74
generated: "2024-12-10T14:40:05.585262+01:00"
version: 2.29.0
digest: sha256:c0ac22dea12ebe35613a1fbde2d9ffcf913c40dc688139f10914db942f2dab13
generated: "2025-01-17T09:55:29.986117656Z"
8 changes: 4 additions & 4 deletions bitnami/apache/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ annotations:
licenses: Apache-2.0
images: |
- name: apache
image: docker.io/bitnami/apache:2.4.62-debian-12-r13
image: docker.io/bitnami/apache:2.4.62-debian-12-r15
- name: apache-exporter
image: docker.io/bitnami/apache-exporter:1.0.9-debian-12-r6
image: docker.io/bitnami/apache-exporter:1.0.9-debian-12-r8
- name: git
image: docker.io/bitnami/git:2.47.1-debian-12-r0
image: docker.io/bitnami/git:2.48.1-debian-12-r0
apiVersion: v2
appVersion: 2.4.62
dependencies:
Expand All @@ -35,4 +35,4 @@ maintainers:
name: apache
sources:
- https://github.com/bitnami/charts/tree/main/bitnami/apache
version: 11.3.0
version: 11.3.1
6 changes: 3 additions & 3 deletions bitnami/apache/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ extraDeploy: []
image:
registry: docker.io
repository: bitnami/apache
tag: 2.4.62-debian-12-r13
tag: 2.4.62-debian-12-r15
digest: ""
## Specify a imagePullPolicy
## ref: https://kubernetes.io/docs/concepts/containers/images/#pre-pulled-images
Expand Down Expand Up @@ -100,7 +100,7 @@ image:
git:
registry: docker.io
repository: bitnami/git
tag: 2.47.1-debian-12-r0
tag: 2.48.1-debian-12-r0
digest: ""
pullPolicy: IfNotPresent
## Optionally specify an array of imagePullSecrets.
Expand Down Expand Up @@ -691,7 +691,7 @@ metrics:
image:
registry: docker.io
repository: bitnami/apache-exporter
tag: 1.0.9-debian-12-r6
tag: 1.0.9-debian-12-r8
digest: ""
pullPolicy: IfNotPresent
## Optionally specify an array of imagePullSecrets.
Expand Down
9 changes: 7 additions & 2 deletions bitnami/apisix/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
# Changelog

## 3.7.1 (2025-01-09)
## 3.7.2 (2025-01-17)

* [bitnami/apisix] Release 3.7.1 ([#31272](https://github.com/bitnami/charts/pull/31272))
* [bitnami/apisix] feat: :recycle: Use os-shell for config generation ([#31455](https://github.com/bitnami/charts/pull/31455))

## <small>3.7.1 (2025-01-09)</small>

* [bitnami/*] Fix typo in README (#31052) ([b41a51d](https://github.com/bitnami/charts/commit/b41a51d1bd04841fc108b78d3b8357a5292771c8)), closes [#31052](https://github.com/bitnami/charts/issues/31052)
* [bitnami/apisix] Release 3.7.1 (#31272) ([199b715](https://github.com/bitnami/charts/commit/199b7151ef54c3cc81ca09813e28e2b2ade50f2d)), closes [#31272](https://github.com/bitnami/charts/issues/31272)

## 3.7.0 (2024-12-10)

Expand Down
2 changes: 1 addition & 1 deletion bitnami/apisix/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,4 @@ sources:
- https://github.com/bitnami/charts/tree/main/bitnami/apisix
- https://github.com/bitnami/charts/tree/main/bitnami/apisix-dashboard
- https://github.com/bitnami/charts/tree/main/bitnami/apisix-ingress-controller
version: 3.7.1
version: 3.7.2
21 changes: 10 additions & 11 deletions bitnami/apisix/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ Init container definition for waiting for the database to be ready
# This init container renders and merges the APISIX configuration files, as well
# as preparing the Nginx server. We need to use a volume because we're working with
# ReadOnlyRootFilesystem
- name: prepare-apisix
- name: prepare-apisix-dirs
image: {{ template "apisix.image" .context }}
imagePullPolicy: {{ .context.Values.image.pullPolicy }}
{{- $block := "" }}
Expand All @@ -337,9 +337,7 @@ Init container definition for waiting for the database to be ready
ln -sf /opt/bitnami/apisix/openresty/luajit/share/lua/*/apisix /usr/local/apisix
mkdir -p /usr/local/apisix/logs
# Build final config.yaml with the sections of the different files
find /bitnami/apisix/conf -type f -name *.yaml -print0 | sort -z | xargs -0 yq eval-all '. as $item ireduce ({}; . * $item )' > /usr/local/apisix/conf/pre-render-config.yaml
render-template /usr/local/apisix/conf/pre-render-config.yaml > /usr/local/apisix/conf/config.yaml
rm /usr/local/apisix/conf/pre-render-config.yaml
cp /bitnami/apisix/rendered-conf/config.yaml /usr/local/apisix/conf/
chmod 644 /usr/local/apisix/conf/config.yaml
apisix init
{{- if eq .component "control-plane" }}
Expand Down Expand Up @@ -390,15 +388,12 @@ Init container definition for waiting for the database to be ready
- name: empty-dir
mountPath: /usr/local/apisix
subPath: app-tmp-dir
- name: config
mountPath: /bitnami/apisix/conf/00_default
- name: empty-dir
mountPath: /bitnami/apisix/rendered-conf
subPath: app-conf-dir
- name: empty-dir
mountPath: /tmp
subPath: tmp-dir
{{- if or $block.extraConfig $block.extraConfigExistingConfigMap }}
- name: extra-config
mountPath: /bitnami/apisix/conf/01_extra
{{- end }}
{{- if $block.tls.enabled }}
- name: certs
mountPath: /bitnami/certs
Expand Down Expand Up @@ -543,11 +538,15 @@ Render configuration for the dashboard and ingress-controller components
# as preparing the Nginx server. We need to use a volume because we're working with
# ReadOnlyRootFilesystem
- name: render-conf
image: {{ template "apisix.image" .context }}
image: {{ template "apisix.wait-container.image" .context }}
imagePullPolicy: {{ .context.Values.image.pullPolicy }}
{{- $block := "" }}
{{- if eq .component "ingress-controller" }}
{{- $block = index .context.Values "ingressController" }}
{{- else if eq .component "control-plane" }}
{{- $block = index .context.Values "controlPlane" }}
{{- else if eq .component "data-plane" }}
{{- $block = index .context.Values "dataPlane" }}
{{- else }}
{{- $block = index .context.Values "dashboard" }}
{{- end }}
Expand Down
1 change: 1 addition & 0 deletions bitnami/apisix/templates/control-plane/dep-ds.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ spec:
{{- end }}
initContainers:
{{- include "apisix.waitForETCDInitContainer" . | nindent 8 }}
{{- include "apisix.renderConfInitContainer" (dict "component" "control-plane" "context" $) | nindent 8 }}
{{- include "apisix.prepareApisixInitContainer" (dict "component" "control-plane" "context" $) | nindent 8 }}
{{- if .Values.controlPlane.initContainers }}
{{- include "common.tplvalues.render" (dict "value" .Values.controlPlane.initContainers "context" $) | nindent 8 }}
Expand Down
1 change: 1 addition & 0 deletions bitnami/apisix/templates/data-plane/dep-ds.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ spec:
{{- if .Values.controlPlane.enabled }}
{{- include "apisix.waitForControlPlaneInitContainer" . | nindent 8 }}
{{- end }}
{{- include "apisix.renderConfInitContainer" (dict "component" "data-plane" "context" $) | nindent 8 }}
{{- include "apisix.prepareApisixInitContainer" (dict "component" "data-plane" "context" $) | nindent 8 }}
{{- if .Values.dataPlane.initContainers }}
{{- include "common.tplvalues.render" (dict "value" .Values.dataPlane.initContainers "context" $) | nindent 8 }}
Expand Down
8 changes: 6 additions & 2 deletions bitnami/appsmith/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
# Changelog

## 5.1.6 (2025-01-11)
## 5.1.7 (2025-01-16)

* [bitnami/appsmith] Release 5.1.6 ([#31304](https://github.com/bitnami/charts/pull/31304))
* [bitnami/appsmith] Release 5.1.7 ([#31402](https://github.com/bitnami/charts/pull/31402))

## <small>5.1.6 (2025-01-11)</small>

* [bitnami/appsmith] Release 5.1.6 (#31304) ([c816b8a](https://github.com/bitnami/charts/commit/c816b8ac783cafc7664953245ab26f2c1c84b687)), closes [#31304](https://github.com/bitnami/charts/issues/31304)

## <small>5.1.5 (2025-01-08)</small>

Expand Down
8 changes: 4 additions & 4 deletions bitnami/appsmith/Chart.lock
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
dependencies:
- name: redis
repository: oci://registry-1.docker.io/bitnamicharts
version: 20.6.2
version: 20.6.3
- name: mongodb
repository: oci://registry-1.docker.io/bitnamicharts
version: 16.4.0
version: 16.4.1
- name: common
repository: oci://registry-1.docker.io/bitnamicharts
version: 2.29.0
digest: sha256:d76e4bf4769553f5b2fb14676c9c914285f2d2826138480c4c2dd76a5784ad3e
generated: "2025-01-08T18:58:35.477740793Z"
digest: sha256:0e41cf21e32d92cbdbd158c031ced7816bb1f5423f001266f82306a817c5f530
generated: "2025-01-16T18:07:34.391716228Z"
6 changes: 3 additions & 3 deletions bitnami/appsmith/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ annotations:
licenses: Apache-2.0
images: |
- name: appsmith
image: docker.io/bitnami/appsmith:1.56.0-debian-12-r0
image: docker.io/bitnami/appsmith:1.57.0-debian-12-r0
- name: haproxy
image: docker.io/bitnami/haproxy:3.1.2-debian-12-r0
- name: os-shell
image: docker.io/bitnami/os-shell:12-debian-12-r35
apiVersion: v2
appVersion: 1.56.0
appVersion: 1.57.0
dependencies:
- condition: redis.enabled
name: redis
Expand All @@ -39,4 +39,4 @@ maintainers:
name: appsmith
sources:
- https://github.com/bitnami/charts/tree/main/bitnami/appsmith
version: 5.1.6
version: 5.1.7
2 changes: 1 addition & 1 deletion bitnami/appsmith/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ diagnosticMode:
image:
registry: docker.io
repository: bitnami/appsmith
tag: 1.56.0-debian-12-r0
tag: 1.57.0-debian-12-r0
digest: ""
## Specify a imagePullPolicy
## ref: http://kubernetes.io/docs/concepts/containers/images/#pre-pulled-images
Expand Down
Loading

0 comments on commit 67410ef

Please sign in to comment.