Skip to content

Commit 5e70421

Browse files
authored
Merge pull request #672 from stackabletech/chore/release-25.7-bitnami-migration
chore: update docs and examples to use bitnamilegacy
2 parents 93a4ccf + 0e613a1 commit 5e70421

4 files changed

Lines changed: 32 additions & 6 deletions

File tree

docs/modules/airflow/examples/getting_started/code/getting_started.sh

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@ echo "Adding bitnami Helm Chart repository and dependencies (Postgresql and Redi
2121
# tag::helm-add-bitnami-pgs[]
2222
helm install airflow-postgresql oci://registry-1.docker.io/bitnamicharts/postgresql \
2323
--version 16.5.0 \
24+
--set image.repository=bitnamilegacy/postgresql \
25+
--set volumePermissions.image.repository=bitnamilegacy/os-shell \
26+
--set metrics.image.repository=bitnamilegacy/postgres-exporter \
27+
--set global.security.allowInsecureImages=true \
2428
--set auth.database=airflow \
2529
--set auth.username=airflow \
2630
--set auth.password=airflow \
@@ -29,6 +33,13 @@ helm install airflow-postgresql oci://registry-1.docker.io/bitnamicharts/postgre
2933
# tag::helm-add-bitnami-redis[]
3034
helm install airflow-redis oci://registry-1.docker.io/bitnamicharts/redis \
3135
--version 20.11.3 \
36+
--set global.security.allowInsecureImages=true \
37+
--set image.repository=bitnamilegacy/redis \
38+
--set sentinel.image.repository=bitnamilegacy/redis-sentinel \
39+
--set metrics.image.repository=bitnamilegacy/redis-exporter \
40+
--set volumePermissions.image.repository=bitnamilegacy/os-shell \
41+
--set kubectl.image.repository=bitnamilegacy/kubectl \
42+
--set sysctl.image.repository=bitnamilegacy/os-shell \
3243
--set replica.replicaCount=1 \
3344
--set auth.password=redis \
3445
--wait

docs/modules/airflow/examples/getting_started/code/getting_started.sh.j2

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@ echo "Adding bitnami Helm Chart repository and dependencies (Postgresql and Redi
2121
# tag::helm-add-bitnami-pgs[]
2222
helm install airflow-postgresql oci://registry-1.docker.io/bitnamicharts/postgresql \
2323
--version {{ versions.postgresql }} \
24+
--set image.repository=bitnamilegacy/postgresql \
25+
--set volumePermissions.image.repository=bitnamilegacy/os-shell \
26+
--set metrics.image.repository=bitnamilegacy/postgres-exporter \
27+
--set global.security.allowInsecureImages=true \
2428
--set auth.database=airflow \
2529
--set auth.username=airflow \
2630
--set auth.password=airflow \
@@ -29,6 +33,13 @@ helm install airflow-postgresql oci://registry-1.docker.io/bitnamicharts/postgre
2933
# tag::helm-add-bitnami-redis[]
3034
helm install airflow-redis oci://registry-1.docker.io/bitnamicharts/redis \
3135
--version {{ versions.redis }} \
36+
--set global.security.allowInsecureImages=true \
37+
--set image.repository=bitnamilegacy/redis \
38+
--set sentinel.image.repository=bitnamilegacy/redis-sentinel \
39+
--set metrics.image.repository=bitnamilegacy/redis-exporter \
40+
--set volumePermissions.image.repository=bitnamilegacy/os-shell \
41+
--set kubectl.image.repository=bitnamilegacy/kubectl \
42+
--set sysctl.image.repository=bitnamilegacy/os-shell \
3243
--set replica.replicaCount=1 \
3344
--set auth.password=redis \
3445
--wait

examples/simple-airflow-cluster-ldap-insecure-tls.yaml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
# helm install secret-operator oci://oci.stackable.tech/sdp-charts/secret-operator
22
# helm install commons-operator oci://oci.stackable.tech/sdp-charts/commons-operator
3-
# helm install --repo https://charts.bitnami.com/bitnami --version 12.1.5 --set auth.username=airflow --set auth.password=airflow --set auth.database=airflow airflow-postgresql postgresql
4-
# helm install --repo https://charts.bitnami.com/bitnami --version 17.3.7 --set auth.password=redis --set replica.replicaCount=1 airflow-redis redis
3+
# helm install listener-operator oci://oci.stackable.tech/sdp-charts/listener-operator
4+
# helm install airflow-operator oci://oci.stackable.tech/sdp-charts/airflow-operator
5+
# helm install --repo https://charts.bitnami.com/bitnami --version 12.1.5 --set auth.username=airflow --set auth.password=airflow --set auth.database=airflow --set image.repository=bitnamilegacy/postgresql --set volumePermissions.image.repository=bitnamilegacy/os-shell --set metrics.image.repository=bitnamilegacy/postgres-exporter --set global.security.allowInsecureImages=true airflow-postgresql postgresql
6+
# helm install --repo https://charts.bitnami.com/bitnami --version 17.3.7 --set auth.password=redis --set replica.replicaCount=1 --set global.security.allowInsecureImages=true --set image.repository=bitnamilegacy/redis --set sentinel.image.repository=bitnamilegacy/redis-sentinel --set metrics.image.repository=bitnamilegacy/redis-exporter --set volumePermissions.image.repository=bitnamilegacy/os-shell --set kubectl.image.repository=bitnamilegacy/kubectl --set sysctl.image.repository=bitnamilegacy/os-shell airflow-redis redis
57
# Log in with user01/user01 or user02/user02
68
---
79
apiVersion: secrets.stackable.tech/v1alpha1
@@ -36,7 +38,7 @@ spec:
3638
spec:
3739
containers:
3840
- name: openldap
39-
image: docker.io/bitnami/openldap:2.5
41+
image: docker.io/bitnamilegacy/openldap:2.5
4042
env:
4143
- name: LDAP_ADMIN_USERNAME
4244
value: admin

examples/simple-airflow-cluster-ldap.yaml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
# helm install secret-operator oci://oci.stackable.tech/sdp-charts/secret-operator
22
# helm install commons-operator oci://oci.stackable.tech/sdp-charts/commons-operator
3-
# helm install --repo https://charts.bitnami.com/bitnami --version 12.1.5 --set auth.username=airflow --set auth.password=airflow --set auth.database=airflow airflow-postgresql postgresql
4-
# helm install --repo https://charts.bitnami.com/bitnami --version 17.3.7 --set auth.password=redis --set replica.replicaCount=1 airflow-redis redis
3+
# helm install listener-operator oci://oci.stackable.tech/sdp-charts/listener-operator
4+
# helm install airflow-operator oci://oci.stackable.tech/sdp-charts/airflow-operator
5+
# helm install --repo https://charts.bitnami.com/bitnami --version 12.1.5 --set auth.username=airflow --set auth.password=airflow --set auth.database=airflow --set image.repository=bitnamilegacy/postgresql --set volumePermissions.image.repository=bitnamilegacy/os-shell --set metrics.image.repository=bitnamilegacy/postgres-exporter --set global.security.allowInsecureImages=true airflow-postgresql postgresql
6+
# helm install --repo https://charts.bitnami.com/bitnami --version 17.3.7 --set auth.password=redis --set replica.replicaCount=1 --set global.security.allowInsecureImages=true --set image.repository=bitnamilegacy/redis --set sentinel.image.repository=bitnamilegacy/redis-sentinel --set metrics.image.repository=bitnamilegacy/redis-exporter --set volumePermissions.image.repository=bitnamilegacy/os-shell --set kubectl.image.repository=bitnamilegacy/kubectl --set sysctl.image.repository=bitnamilegacy/os-shell airflow-redis redis
57
# Log in with user01/user01 or user02/user02
68
---
79
apiVersion: secrets.stackable.tech/v1alpha1
@@ -36,7 +38,7 @@ spec:
3638
spec:
3739
containers:
3840
- name: openldap
39-
image: docker.io/bitnami/openldap:2.5
41+
image: docker.io/bitnamilegacy/openldap:2.5
4042
env:
4143
- name: LDAP_ADMIN_USERNAME
4244
value: admin

0 commit comments

Comments
 (0)