Skip to content

Commit a116e07

Browse files
authored
chore: update tests and docs to use bitnamilegacy (#744)
* chore: update tests and docs to use bitnamilegacy * add allowInsecureImages to minio chart values for later versions * add allowInsecureImages comment to postgresql chart values for later versions * fix getting started templates
1 parent aba5bab commit a116e07

File tree

14 files changed

+114
-8
lines changed

14 files changed

+114
-8
lines changed

docs/modules/druid/examples/getting_started/druid.yaml.j2

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ spec:
2323
default:
2424
replicas: 1
2525
roleConfig:
26-
listenerClass: external-stable # This exposes your Stacklet outside of Kubernetes. Remove this configuration if this is not desired
26+
listenerClass: external-stable # This exposes this role outside of Kubernetes. Remove this configuration if this is not desired
2727
coordinators:
2828
roleGroups:
2929
default:
3030
replicas: 1
3131
roleConfig:
32-
listenerClass: external-stable # This exposes your Stacklet outside of Kubernetes. Remove this configuration if this is not desired
32+
listenerClass: external-stable # This exposes this role outside of Kubernetes. Remove this configuration if this is not desired
3333
historicals:
3434
roleGroups:
3535
default:
@@ -43,7 +43,7 @@ spec:
4343
default:
4444
replicas: 1
4545
roleConfig:
46-
listenerClass: external-stable # This exposes your Stacklet outside of Kubernetes. Remove this configuration if this is not desired
46+
listenerClass: external-stable # This exposes this role outside of Kubernetes. Remove this configuration if this is not desired
4747
---
4848
apiVersion: v1
4949
kind: Secret

docs/modules/druid/examples/getting_started/getting_started.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,10 @@ echo "Installing PostgreSQL for Druid"
9898
# tag::helm-install-postgres[]
9999
helm install postgresql-druid oci://registry-1.docker.io/bitnamicharts/postgresql \
100100
--version 16.5.0 \
101+
--set image.repository=bitnamilegacy/postgresql \
102+
--set volumePermissions.image.repository=bitnamilegacy/os-shell \
103+
--set metrics.image.repository=bitnamilegacy/postgres-exporter \
104+
--set global.security.allowInsecureImages=true \
101105
--set auth.database=druid \
102106
--set auth.username=druid \
103107
--set auth.password=druid \

docs/modules/druid/examples/getting_started/getting_started.sh.j2

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,10 @@ echo "Installing PostgreSQL for Druid"
9898
# tag::helm-install-postgres[]
9999
helm install postgresql-druid oci://registry-1.docker.io/bitnamicharts/postgresql \
100100
--version {{ versions.postgresql }} \
101+
--set image.repository=bitnamilegacy/postgresql \
102+
--set volumePermissions.image.repository=bitnamilegacy/os-shell \
103+
--set metrics.image.repository=bitnamilegacy/postgres-exporter \
104+
--set global.security.allowInsecureImages=true \
101105
--set auth.database=druid \
102106
--set auth.username=druid \
103107
--set auth.password=druid \

docs/modules/druid/examples/getting_started/hdfs.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ spec:
1111
zookeeperConfigMapName: simple-hdfs-znode
1212
nameNodes:
1313
config:
14-
listenerClass: external-stable # This exposes your Stacklet outside of Kubernetes. Remove this configuration if this is not desired
14+
listenerClass: external-stable # This exposes this role outside of Kubernetes. Remove this configuration if this is not desired
1515
roleGroups:
1616
default:
1717
replicas: 2
1818
dataNodes:
1919
config:
20-
listenerClass: external-unstable # This exposes your Stacklet outside of Kubernetes. Remove this configuration if this is not desired
20+
listenerClass: external-unstable # This exposes this role outside of Kubernetes. Remove this configuration if this is not desired
2121
roleGroups:
2222
default:
2323
replicas: 1

docs/modules/druid/examples/getting_started/hdfs.yaml.j2

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ spec:
1111
zookeeperConfigMapName: simple-hdfs-znode
1212
nameNodes:
1313
config:
14-
listenerClass: external-stable # This exposes your Stacklet outside of Kubernetes. Remove this configuration if this is not desired
14+
listenerClass: external-stable # This exposes this role outside of Kubernetes. Remove this configuration if this is not desired
1515
roleGroups:
1616
default:
1717
replicas: 2
1818
dataNodes:
1919
config:
20-
listenerClass: external-unstable # This exposes your Stacklet outside of Kubernetes. Remove this configuration if this is not desired
20+
listenerClass: external-unstable # This exposes this role outside of Kubernetes. Remove this configuration if this is not desired
2121
roleGroups:
2222
default:
2323
replicas: 1

examples/psql-s3/README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ And setup the Postgres database:
77

88
helm install druid bitnami/postgresql \
99
--version=11 \
10+
--set image.repository=bitnamilegacy/postgresql \
11+
--set volumePermissions.image.repository=bitnamilegacy/os-shell \
12+
--set metrics.image.repository=bitnamilegacy/postgres-exporter \
13+
--set global.security.allowInsecureImages=true \
1014
--set auth.username=druid \
1115
--set auth.password=druid \
1216
--set auth.database=druid

examples/psql/README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ And setup the Postgres database:
77

88
helm install druid bitnami/postgresql \
99
--version=11 \
10+
--set image.repository=bitnamilegacy/postgresql \
11+
--set volumePermissions.image.repository=bitnamilegacy/os-shell \
12+
--set metrics.image.repository=bitnamilegacy/postgres-exporter \
13+
--set global.security.allowInsecureImages=true \
1014
--set auth.username=druid \
1115
--set auth.password=druid \
1216
--set auth.database=druid

tests/templates/kuttl/external-access/20_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 # needed starting with Chart version 16.3.0 if modifying images
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
extendedConfiguration: |
922
password_encryption=md5

tests/templates/kuttl/ldap/01_openldap.yaml.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ spec:
3939
fsGroup: 1000
4040
containers:
4141
- name: openldap
42-
image: docker.io/bitnami/openldap:2.5
42+
image: docker.io/bitnamilegacy/openldap:2.5
4343
env:
4444
- name: LDAP_ADMIN_USERNAME
4545
value: admin

tests/templates/kuttl/oidc/04_helm-bitnami-minio-values.yaml.j2

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,20 @@
11
---
2+
global:
3+
security:
4+
allowInsecureImages: true # needed starting with Chart version 14.9.0 if modifying images
5+
6+
image:
7+
repository: bitnamilegacy/minio
8+
clientImage:
9+
repository: bitnamilegacy/minio-client
10+
defaultInitContainers:
11+
volumePermissions:
12+
image:
13+
repository: bitnamilegacy/os-shell
14+
console:
15+
image:
16+
repository: bitnamilegacy/minio-object-browser
17+
218
mode: standalone
319
disableWebUI: false
420
extraEnvVars:

0 commit comments

Comments
 (0)