Skip to content

Commit faedcbd

Browse files
xeniapexeniape
authored
chore: update tests and docs to use bitnamilegacy (#670)
* chore: update tests and docs to use bitnamilegacy * update examples installation instructions
1 parent 37bfb68 commit faedcbd

27 files changed

Lines changed: 389 additions & 7 deletions

‎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

‎tests/templates/kuttl/cluster-operation/helm-bitnami-postgresql-values.yaml.j2‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,22 @@
11
---
2+
global:
3+
security:
4+
allowInsecureImages: true
5+
6+
image:
7+
repository: bitnamilegacy/postgresql
8+
29
volumePermissions:
310
enabled: false
11+
image:
12+
repository: bitnamilegacy/os-shell
413
securityContext:
514
runAsUser: auto
615

16+
metrics:
17+
image:
18+
repository: bitnamilegacy/postgres-exporter
19+
720
primary:
821
podSecurityContext:
922
{% if test_scenario['values']['openshift'] == 'true' %}

‎tests/templates/kuttl/cluster-operation/helm-bitnami-redis-values.yaml.j2‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,26 @@
11
---
2+
global:
3+
security:
4+
allowInsecureImages: true # needed starting with Chart version 20.5.0 if modifying images
5+
image:
6+
repository: bitnamilegacy/redis
7+
sentinel:
8+
image:
9+
repository: bitnamilegacy/redis-sentinel
10+
metrics:
11+
image:
12+
repository: bitnamilegacy/redis-exporter
13+
kubectl:
14+
image:
15+
repository: bitnamilegacy/kubectl
16+
sysctl:
17+
image:
18+
repository: bitnamilegacy/os-shell
19+
220
volumePermissions:
321
enabled: false
22+
image:
23+
repository: bitnamilegacy/os-shell
424
containerSecurityContext:
525
runAsUser: auto
626

‎tests/templates/kuttl/external-access/helm-bitnami-postgresql-values.yaml.j2‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,22 @@
11
---
2+
global:
3+
security:
4+
allowInsecureImages: true
5+
6+
image:
7+
repository: bitnamilegacy/postgresql
8+
29
volumePermissions:
310
enabled: false
11+
image:
12+
repository: bitnamilegacy/os-shell
413
securityContext:
514
runAsUser: auto
615

16+
metrics:
17+
image:
18+
repository: bitnamilegacy/postgres-exporter
19+
720
primary:
821
podSecurityContext:
922
{% if test_scenario['values']['openshift'] == 'true' %}

‎tests/templates/kuttl/external-access/helm-bitnami-redis-values.yaml.j2‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,26 @@
11
---
2+
global:
3+
security:
4+
allowInsecureImages: true # needed starting with Chart version 20.5.0 if modifying images
5+
image:
6+
repository: bitnamilegacy/redis
7+
sentinel:
8+
image:
9+
repository: bitnamilegacy/redis-sentinel
10+
metrics:
11+
image:
12+
repository: bitnamilegacy/redis-exporter
13+
kubectl:
14+
image:
15+
repository: bitnamilegacy/kubectl
16+
sysctl:
17+
image:
18+
repository: bitnamilegacy/os-shell
19+
220
volumePermissions:
321
enabled: false
22+
image:
23+
repository: bitnamilegacy/os-shell
424
containerSecurityContext:
525
runAsUser: auto
626

‎tests/templates/kuttl/ldap/30-install-openldap.yaml.j2‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ commands:
4646
fsGroup: 1000
4747
containers:
4848
- name: openldap
49-
image: docker.io/bitnami/openldap:2.5
49+
image: docker.io/bitnamilegacy/openldap:2.5
5050
env:
5151
- name: LDAP_ADMIN_USERNAME
5252
value: admin

‎tests/templates/kuttl/ldap/helm-bitnami-postgresql-values.yaml.j2‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,22 @@
11
---
2+
global:
3+
security:
4+
allowInsecureImages: true
5+
6+
image:
7+
repository: bitnamilegacy/postgresql
8+
29
volumePermissions:
310
enabled: false
11+
image:
12+
repository: bitnamilegacy/os-shell
413
securityContext:
514
runAsUser: auto
615

16+
metrics:
17+
image:
18+
repository: bitnamilegacy/postgres-exporter
19+
720
primary:
821
podSecurityContext:
922
{% if test_scenario['values']['openshift'] == 'true' %}

0 commit comments

Comments
 (0)