Skip to content

Commit 4ab047d

Browse files
committed
Merge branch 'main' into feat/operator-versioning
2 parents 3ef0e6f + 505e821 commit 4ab047d

6 files changed

Lines changed: 78 additions & 30 deletions

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

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,19 @@ spec:
6464
mountPath: /tls
6565
volumes:
6666
- name: tls
67-
csi:
68-
driver: secrets.stackable.tech
69-
volumeAttributes:
70-
secrets.stackable.tech/class: openldap-tls
71-
secrets.stackable.tech/scope: pod
67+
ephemeral:
68+
volumeClaimTemplate:
69+
metadata:
70+
annotations:
71+
secrets.stackable.tech/class: openldap-tls
72+
secrets.stackable.tech/scope: pod
73+
spec:
74+
storageClassName: secrets.stackable.tech
75+
accessModes:
76+
- ReadWriteOnce
77+
resources:
78+
requests:
79+
storage: "1"
7280
---
7381
apiVersion: v1
7482
kind: Service

examples/simple-airflow-cluster-ldap.yaml

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,19 @@ spec:
6464
mountPath: /tls
6565
volumes:
6666
- name: tls
67-
csi:
68-
driver: secrets.stackable.tech
69-
volumeAttributes:
70-
secrets.stackable.tech/class: openldap-tls
71-
secrets.stackable.tech/scope: pod
67+
ephemeral:
68+
volumeClaimTemplate:
69+
metadata:
70+
annotations:
71+
secrets.stackable.tech/class: openldap-tls
72+
secrets.stackable.tech/scope: pod
73+
spec:
74+
storageClassName: secrets.stackable.tech
75+
accessModes:
76+
- ReadWriteOnce
77+
resources:
78+
requests:
79+
storage: "1"
7280
---
7381
apiVersion: v1
7482
kind: Service

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

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,19 @@ commands:
7676
port: 1389
7777
volumes:
7878
- name: tls
79-
csi:
80-
driver: secrets.stackable.tech
81-
volumeAttributes:
82-
secrets.stackable.tech/class: openldap-tls-$NAMESPACE
83-
secrets.stackable.tech/scope: pod
79+
ephemeral:
80+
volumeClaimTemplate:
81+
metadata:
82+
annotations:
83+
secrets.stackable.tech/class: openldap-tls-$NAMESPACE
84+
secrets.stackable.tech/scope: pod
85+
spec:
86+
storageClassName: secrets.stackable.tech
87+
accessModes:
88+
- ReadWriteOnce
89+
resources:
90+
requests:
91+
storage: "1"
8492
---
8593
apiVersion: v1
8694
kind: Service

tests/templates/kuttl/oidc/50-install-test-container.yaml.j2

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,16 @@ spec:
8585

8686
volumes:
8787
- name: tls
88-
csi:
89-
driver: secrets.stackable.tech
90-
volumeAttributes:
91-
secrets.stackable.tech/class: tls
92-
secrets.stackable.tech/scope: pod
88+
ephemeral:
89+
volumeClaimTemplate:
90+
metadata:
91+
annotations:
92+
secrets.stackable.tech/class: tls
93+
secrets.stackable.tech/scope: pod
94+
spec:
95+
storageClassName: secrets.stackable.tech
96+
accessModes:
97+
- ReadWriteOnce
98+
resources:
99+
requests:
100+
storage: "1"

tests/templates/kuttl/oidc/install-keycloak.yaml.j2

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -101,11 +101,19 @@ spec:
101101
configMap:
102102
name: $INSTANCE_NAME-realms
103103
- name: tls
104-
csi:
105-
driver: secrets.stackable.tech
106-
volumeAttributes:
107-
secrets.stackable.tech/class: tls
108-
secrets.stackable.tech/scope: service=$INSTANCE_NAME
104+
ephemeral:
105+
volumeClaimTemplate:
106+
metadata:
107+
annotations:
108+
secrets.stackable.tech/class: tls
109+
secrets.stackable.tech/scope: service=$INSTANCE_NAME
110+
spec:
111+
storageClassName: secrets.stackable.tech
112+
accessModes:
113+
- ReadWriteOnce
114+
resources:
115+
requests:
116+
storage: "1"
109117
---
110118
apiVersion: v1
111119
kind: Service

tests/templates/kuttl/opa/40-install-test-container.yaml.j2

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,16 @@ spec:
7474
value: /stackable/tls/ca.crt
7575
volumes:
7676
- name: tls
77-
csi:
78-
driver: secrets.stackable.tech
79-
volumeAttributes:
80-
secrets.stackable.tech/class: tls
81-
secrets.stackable.tech/scope: pod
77+
ephemeral:
78+
volumeClaimTemplate:
79+
metadata:
80+
annotations:
81+
secrets.stackable.tech/class: tls
82+
secrets.stackable.tech/scope: pod
83+
spec:
84+
storageClassName: secrets.stackable.tech
85+
accessModes:
86+
- ReadWriteOnce
87+
resources:
88+
requests:
89+
storage: "1"

0 commit comments

Comments
 (0)