diff --git a/docs/modules/druid/examples/getting_started/druid.yaml.j2 b/docs/modules/druid/examples/getting_started/druid.yaml.j2 index c3255371..981f69b4 100644 --- a/docs/modules/druid/examples/getting_started/druid.yaml.j2 +++ b/docs/modules/druid/examples/getting_started/druid.yaml.j2 @@ -23,13 +23,13 @@ spec: default: replicas: 1 roleConfig: - listenerClass: external-stable # This exposes your Stacklet outside of Kubernetes. Remove this configuration if this is not desired + listenerClass: external-stable # This exposes this role outside of Kubernetes. Remove this configuration if this is not desired coordinators: roleGroups: default: replicas: 1 roleConfig: - listenerClass: external-stable # This exposes your Stacklet outside of Kubernetes. Remove this configuration if this is not desired + listenerClass: external-stable # This exposes this role outside of Kubernetes. Remove this configuration if this is not desired historicals: roleGroups: default: @@ -43,7 +43,7 @@ spec: default: replicas: 1 roleConfig: - listenerClass: external-stable # This exposes your Stacklet outside of Kubernetes. Remove this configuration if this is not desired + listenerClass: external-stable # This exposes this role outside of Kubernetes. Remove this configuration if this is not desired --- apiVersion: v1 kind: Secret diff --git a/docs/modules/druid/examples/getting_started/getting_started.sh b/docs/modules/druid/examples/getting_started/getting_started.sh index 0623bd7e..4c5046db 100755 --- a/docs/modules/druid/examples/getting_started/getting_started.sh +++ b/docs/modules/druid/examples/getting_started/getting_started.sh @@ -98,6 +98,10 @@ echo "Installing PostgreSQL for Druid" # tag::helm-install-postgres[] helm install postgresql-druid oci://registry-1.docker.io/bitnamicharts/postgresql \ --version 16.5.0 \ + --set image.repository=bitnamilegacy/postgresql \ + --set volumePermissions.image.repository=bitnamilegacy/os-shell \ + --set metrics.image.repository=bitnamilegacy/postgres-exporter \ + --set global.security.allowInsecureImages=true \ --set auth.database=druid \ --set auth.username=druid \ --set auth.password=druid \ diff --git a/docs/modules/druid/examples/getting_started/getting_started.sh.j2 b/docs/modules/druid/examples/getting_started/getting_started.sh.j2 index b9b2b5f8..8b108fae 100755 --- a/docs/modules/druid/examples/getting_started/getting_started.sh.j2 +++ b/docs/modules/druid/examples/getting_started/getting_started.sh.j2 @@ -98,6 +98,10 @@ echo "Installing PostgreSQL for Druid" # tag::helm-install-postgres[] helm install postgresql-druid oci://registry-1.docker.io/bitnamicharts/postgresql \ --version {{ versions.postgresql }} \ + --set image.repository=bitnamilegacy/postgresql \ + --set volumePermissions.image.repository=bitnamilegacy/os-shell \ + --set metrics.image.repository=bitnamilegacy/postgres-exporter \ + --set global.security.allowInsecureImages=true \ --set auth.database=druid \ --set auth.username=druid \ --set auth.password=druid \ diff --git a/docs/modules/druid/examples/getting_started/hdfs.yaml b/docs/modules/druid/examples/getting_started/hdfs.yaml index 9a5be544..f3147691 100644 --- a/docs/modules/druid/examples/getting_started/hdfs.yaml +++ b/docs/modules/druid/examples/getting_started/hdfs.yaml @@ -11,13 +11,13 @@ spec: zookeeperConfigMapName: simple-hdfs-znode nameNodes: config: - listenerClass: external-stable # This exposes your Stacklet outside of Kubernetes. Remove this configuration if this is not desired + listenerClass: external-stable # This exposes this role outside of Kubernetes. Remove this configuration if this is not desired roleGroups: default: replicas: 2 dataNodes: config: - listenerClass: external-unstable # This exposes your Stacklet outside of Kubernetes. Remove this configuration if this is not desired + listenerClass: external-unstable # This exposes this role outside of Kubernetes. Remove this configuration if this is not desired roleGroups: default: replicas: 1 diff --git a/docs/modules/druid/examples/getting_started/hdfs.yaml.j2 b/docs/modules/druid/examples/getting_started/hdfs.yaml.j2 index 9a5be544..f3147691 100644 --- a/docs/modules/druid/examples/getting_started/hdfs.yaml.j2 +++ b/docs/modules/druid/examples/getting_started/hdfs.yaml.j2 @@ -11,13 +11,13 @@ spec: zookeeperConfigMapName: simple-hdfs-znode nameNodes: config: - listenerClass: external-stable # This exposes your Stacklet outside of Kubernetes. Remove this configuration if this is not desired + listenerClass: external-stable # This exposes this role outside of Kubernetes. Remove this configuration if this is not desired roleGroups: default: replicas: 2 dataNodes: config: - listenerClass: external-unstable # This exposes your Stacklet outside of Kubernetes. Remove this configuration if this is not desired + listenerClass: external-unstable # This exposes this role outside of Kubernetes. Remove this configuration if this is not desired roleGroups: default: replicas: 1 diff --git a/examples/psql-s3/README.md b/examples/psql-s3/README.md index 117ee2b1..bd99b6f6 100644 --- a/examples/psql-s3/README.md +++ b/examples/psql-s3/README.md @@ -7,6 +7,10 @@ And setup the Postgres database: helm install druid bitnami/postgresql \ --version=11 \ + --set image.repository=bitnamilegacy/postgresql \ + --set volumePermissions.image.repository=bitnamilegacy/os-shell \ + --set metrics.image.repository=bitnamilegacy/postgres-exporter \ + --set global.security.allowInsecureImages=true \ --set auth.username=druid \ --set auth.password=druid \ --set auth.database=druid diff --git a/examples/psql/README.md b/examples/psql/README.md index 7256e91d..7360ddf6 100644 --- a/examples/psql/README.md +++ b/examples/psql/README.md @@ -7,6 +7,10 @@ And setup the Postgres database: helm install druid bitnami/postgresql \ --version=11 \ + --set image.repository=bitnamilegacy/postgresql \ + --set volumePermissions.image.repository=bitnamilegacy/os-shell \ + --set metrics.image.repository=bitnamilegacy/postgres-exporter \ + --set global.security.allowInsecureImages=true \ --set auth.username=druid \ --set auth.password=druid \ --set auth.database=druid diff --git a/tests/templates/kuttl/external-access/20_helm-bitnami-postgresql-values.yaml.j2 b/tests/templates/kuttl/external-access/20_helm-bitnami-postgresql-values.yaml.j2 index 6ff8b187..41fa11d2 100644 --- a/tests/templates/kuttl/external-access/20_helm-bitnami-postgresql-values.yaml.j2 +++ b/tests/templates/kuttl/external-access/20_helm-bitnami-postgresql-values.yaml.j2 @@ -1,9 +1,22 @@ --- +global: + security: + allowInsecureImages: true # needed starting with Chart version 16.3.0 if modifying images + +image: + repository: bitnamilegacy/postgresql + volumePermissions: enabled: false + image: + repository: bitnamilegacy/os-shell securityContext: runAsUser: auto +metrics: + image: + repository: bitnamilegacy/postgres-exporter + primary: extendedConfiguration: | password_encryption=md5 diff --git a/tests/templates/kuttl/ldap/01_openldap.yaml.j2 b/tests/templates/kuttl/ldap/01_openldap.yaml.j2 index ef0f2e35..5487d049 100644 --- a/tests/templates/kuttl/ldap/01_openldap.yaml.j2 +++ b/tests/templates/kuttl/ldap/01_openldap.yaml.j2 @@ -39,7 +39,7 @@ spec: fsGroup: 1000 containers: - name: openldap - image: docker.io/bitnami/openldap:2.5 + image: docker.io/bitnamilegacy/openldap:2.5 env: - name: LDAP_ADMIN_USERNAME value: admin diff --git a/tests/templates/kuttl/oidc/04_helm-bitnami-minio-values.yaml.j2 b/tests/templates/kuttl/oidc/04_helm-bitnami-minio-values.yaml.j2 index dfd6b698..c9643e2e 100644 --- a/tests/templates/kuttl/oidc/04_helm-bitnami-minio-values.yaml.j2 +++ b/tests/templates/kuttl/oidc/04_helm-bitnami-minio-values.yaml.j2 @@ -1,4 +1,20 @@ --- +global: + security: + allowInsecureImages: true # needed starting with Chart version 14.9.0 if modifying images + +image: + repository: bitnamilegacy/minio +clientImage: + repository: bitnamilegacy/minio-client +defaultInitContainers: + volumePermissions: + image: + repository: bitnamilegacy/os-shell +console: + image: + repository: bitnamilegacy/minio-object-browser + mode: standalone disableWebUI: false extraEnvVars: diff --git a/tests/templates/kuttl/resources/02_helm-bitnami-minio-values.yaml.j2 b/tests/templates/kuttl/resources/02_helm-bitnami-minio-values.yaml.j2 index dfd6b698..c9643e2e 100644 --- a/tests/templates/kuttl/resources/02_helm-bitnami-minio-values.yaml.j2 +++ b/tests/templates/kuttl/resources/02_helm-bitnami-minio-values.yaml.j2 @@ -1,4 +1,20 @@ --- +global: + security: + allowInsecureImages: true # needed starting with Chart version 14.9.0 if modifying images + +image: + repository: bitnamilegacy/minio +clientImage: + repository: bitnamilegacy/minio-client +defaultInitContainers: + volumePermissions: + image: + repository: bitnamilegacy/os-shell +console: + image: + repository: bitnamilegacy/minio-object-browser + mode: standalone disableWebUI: false extraEnvVars: diff --git a/tests/templates/kuttl/s3-deep-storage/04_helm-bitnami-minio-values.yaml.j2 b/tests/templates/kuttl/s3-deep-storage/04_helm-bitnami-minio-values.yaml.j2 index dfd6b698..c9643e2e 100644 --- a/tests/templates/kuttl/s3-deep-storage/04_helm-bitnami-minio-values.yaml.j2 +++ b/tests/templates/kuttl/s3-deep-storage/04_helm-bitnami-minio-values.yaml.j2 @@ -1,4 +1,20 @@ --- +global: + security: + allowInsecureImages: true # needed starting with Chart version 14.9.0 if modifying images + +image: + repository: bitnamilegacy/minio +clientImage: + repository: bitnamilegacy/minio-client +defaultInitContainers: + volumePermissions: + image: + repository: bitnamilegacy/os-shell +console: + image: + repository: bitnamilegacy/minio-object-browser + mode: standalone disableWebUI: false extraEnvVars: diff --git a/tests/templates/kuttl/smoke/20_helm-bitnami-postgresql-values.yaml.j2 b/tests/templates/kuttl/smoke/20_helm-bitnami-postgresql-values.yaml.j2 index 6ff8b187..41fa11d2 100644 --- a/tests/templates/kuttl/smoke/20_helm-bitnami-postgresql-values.yaml.j2 +++ b/tests/templates/kuttl/smoke/20_helm-bitnami-postgresql-values.yaml.j2 @@ -1,9 +1,22 @@ --- +global: + security: + allowInsecureImages: true # needed starting with Chart version 16.3.0 if modifying images + +image: + repository: bitnamilegacy/postgresql + volumePermissions: enabled: false + image: + repository: bitnamilegacy/os-shell securityContext: runAsUser: auto +metrics: + image: + repository: bitnamilegacy/postgres-exporter + primary: extendedConfiguration: | password_encryption=md5 diff --git a/tests/templates/kuttl/tls/03_helm-bitnami-minio-values.yaml.j2 b/tests/templates/kuttl/tls/03_helm-bitnami-minio-values.yaml.j2 index d48bbaa1..afe2be7a 100644 --- a/tests/templates/kuttl/tls/03_helm-bitnami-minio-values.yaml.j2 +++ b/tests/templates/kuttl/tls/03_helm-bitnami-minio-values.yaml.j2 @@ -1,4 +1,20 @@ --- +global: + security: + allowInsecureImages: true # needed starting with Chart version 14.9.0 if modifying images + +image: + repository: bitnamilegacy/minio +clientImage: + repository: bitnamilegacy/minio-client +defaultInitContainers: + volumePermissions: + image: + repository: bitnamilegacy/os-shell +console: + image: + repository: bitnamilegacy/minio-object-browser + mode: standalone disableWebUI: false extraEnvVars: