Skip to content

Commit 7044ae9

Browse files
authored
chore: update tests and examples to use bitnamilegacy (#784)
1 parent 7e4520c commit 7044ae9

9 files changed

+88
-9
lines changed

examples/simple-trino-cluster-hive-ha-s3.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# stackablectl operator install commons secret hive trino
2-
# helm install minio minio --repo https://charts.bitnami.com/bitnami --set auth.rootUser=minio-access-key --set auth.rootPassword=minio-secret-key
3-
# helm upgrade hive --install --version=12.1.5 --set postgresqlUsername=hive --set postgresqlPassword=hive --set postgresqlDatabase=hive --repo https://charts.bitnami.com/bitnami postgresql
1+
# stackablectl operator install commons secret listener hive trino
2+
# helm install minio oci://registry-1.docker.io/bitnamicharts/minio --set auth.rootUser=minio-access-key --set auth.rootPassword=minio-secret-key --set global.security.allowInsecureImages=true --set image.repository=bitnamilegacy/minio --set clientImage.repository=bitnamilegacy/minio-client --set defaultInitContainers.volumePermissions.image.repository=bitnamilegacy/os-shell --set console.image.repository=bitnamilegacy/minio-object-browser
3+
# helm upgrade hive --install --version=12.1.5 --set auth.username=hive --set auth.password=hive --set auth.database=hive --set image.repository=bitnamilegacy/postgresql --set volumePermissions.image.repository=bitnamilegacy/os-shell --set metrics.image.repository=bitnamilegacy/postgres-exporter --set global.security.allowInsecureImages=true --repo https://charts.bitnami.com/bitnami postgresql
44
# PostgreSQL is required for Hive HA to work! Does not work with Derby.
55
---
66
apiVersion: trino.stackable.tech/v1alpha1
@@ -33,14 +33,14 @@ spec:
3333
connector:
3434
hive:
3535
metastore:
36-
configMap: simple-hive-derby
36+
configMap: simple-hive
3737
s3:
3838
reference: minio
3939
---
4040
apiVersion: hive.stackable.tech/v1alpha1
4141
kind: HiveCluster
4242
metadata:
43-
name: simple-hive-derby
43+
name: simple-hive
4444
spec:
4545
image:
4646
productVersion: 4.0.0

examples/simple-trino-cluster-s3.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# stackablectl operator install commons secret hive zookeeper
2-
# helm install minio minio --repo https://charts.bitnami.com/bitnami --set auth.rootUser=minio-access-key --set auth.rootPassword=minio-secret-key
1+
# stackablectl operator install commons secret listener hive zookeeper trino
2+
# helm install minio oci://registry-1.docker.io/bitnamicharts/minio --set auth.rootUser=minio-access-key --set auth.rootPassword=minio-secret-key --set global.security.allowInsecureImages=true --set image.repository=bitnamilegacy/minio --set clientImage.repository=bitnamilegacy/minio-client --set defaultInitContainers.volumePermissions.image.repository=bitnamilegacy/os-shell --set console.image.repository=bitnamilegacy/minio-object-browser
33
---
44
apiVersion: trino.stackable.tech/v1alpha1
55
kind: TrinoCluster

tests/templates/kuttl/authentication/install-openldap-other.yaml.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ spec:
3333
serviceAccountName: "ldap-sa"
3434
containers:
3535
- name: openldap-other
36-
image: docker.io/bitnami/openldap:2.5
36+
image: docker.io/bitnamilegacy/openldap:2.5
3737
env:
3838
- name: LDAP_ADMIN_USERNAME
3939
value: admin

tests/templates/kuttl/authentication/install-openldap.yaml.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ spec:
3333
serviceAccountName: "ldap-sa"
3434
containers:
3535
- name: openldap
36-
image: docker.io/bitnami/openldap:2.5
36+
image: docker.io/bitnamilegacy/openldap:2.5
3737
env:
3838
- name: LDAP_ADMIN_USERNAME
3939
value: admin

tests/templates/kuttl/opa-authorization/helm-bitnami-minio-values.yaml.j2

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,21 @@
11
---
2+
global:
3+
security:
4+
allowInsecureImages: true
5+
6+
image:
7+
repository: bitnamilegacy/minio
8+
clientImage:
9+
repository: bitnamilegacy/minio-client
10+
defaultInitContainers:
11+
volumePermissions: # volumePermissions moved under defaultInitContainers starting with Chart version 17.0.0
12+
enabled: false
13+
image:
14+
repository: bitnamilegacy/os-shell
15+
console:
16+
image:
17+
repository: bitnamilegacy/minio-object-browser
18+
219
mode: standalone
320
disableWebUI: false
421
extraEnvVars:
@@ -27,8 +44,11 @@ provisioning:
2744
containerSecurityContext:
2845
enabled: false
2946

47+
# volumePermissions can be removed starting with Chart version 17.0.0, moved under defaultInitContainers
3048
volumePermissions:
3149
enabled: false
50+
image:
51+
repository: bitnamilegacy/os-shell
3252

3353
podSecurityContext:
3454
enabled: false

tests/templates/kuttl/opa-authorization/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/smoke/helm-bitnami-minio-values.yaml.j2

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,21 @@
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: # volumePermissions moved under defaultInitContainers starting with Chart version 17.0.0
12+
enabled: false
13+
image:
14+
repository: bitnamilegacy/os-shell
15+
console:
16+
image:
17+
repository: bitnamilegacy/minio-object-browser
18+
219
mode: standalone
320
disableWebUI: false
421
extraEnvVars:
@@ -27,8 +44,11 @@ provisioning:
2744
containerSecurityContext:
2845
enabled: false
2946

47+
# volumePermissions can be removed starting with Chart version 17.0.0, moved under defaultInitContainers
3048
volumePermissions:
3149
enabled: false
50+
image:
51+
repository: bitnamilegacy/os-shell
3252

3353
podSecurityContext:
3454
enabled: false

tests/templates/kuttl/smoke/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/smoke_aws/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

0 commit comments

Comments
 (0)