Skip to content

Commit 9252b06

Browse files
committed
Merge remote-tracking branch 'origin/main' into feat/tls-support
2 parents 910a58d + c2d4887 commit 9252b06

3 files changed

Lines changed: 52 additions & 2 deletions

File tree

tests/templates/kuttl/ldap/21-install-opensearch.yaml.j2

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,16 @@ spec:
2222
config:
2323
logging:
2424
enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
25+
containers:
26+
opensearch:
27+
console:
28+
level: DEBUG
29+
file:
30+
level: DEBUG
31+
loggers:
32+
# Successful authorizations are logged at the DEBUG level.
33+
org.opensearch.security:
34+
level: DEBUG
2535
roleGroups:
2636
default:
2737
replicas: 3

tests/templates/kuttl/snapshot-s3/11_minio-values.yaml.j2

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ console:
1515
image:
1616
repository: bitnamilegacy/minio-object-browser
1717

18+
tls:
19+
enabled: true
20+
1821
persistence:
1922
enabled: false # "false" means, that an emptyDir is used instead of a persistentVolumeClaim
2023
size: 64Mi

tests/templates/kuttl/snapshot-s3/20-install-opensearch.yaml.j2

Lines changed: 39 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ spec:
3737
# not be created even if enough disk space would be available.
3838
cluster.routing.allocation.disk.threshold_enabled: "false"
3939
plugins.security.allow_default_init_securityindex: "true"
40-
s3.client.default.endpoint: http://minio:9000/
41-
s3.client.default.protocol: http
40+
s3.client.default.endpoint: https://minio:9000/
41+
s3.client.default.protocol: https
4242
s3.client.default.region: unused # but required
4343
s3.client.default.path_style_access: "true"
4444
podOverrides:
@@ -68,12 +68,31 @@ spec:
6868
- name: keystore-secrets
6969
mountPath: /stackable/opensearch/keystore-secrets
7070
readOnly: true
71+
- name: init-system-keystore
72+
image: oci.stackable.tech/sdp/opensearch:3.1.0-stackable0.0.0-dev
73+
command:
74+
- update-ca-trust
75+
args:
76+
- extract
77+
- --output
78+
- /stackable/ca-trust
79+
volumeMounts:
80+
- name: system-trust-store
81+
mountPath: /stackable/ca-trust
82+
readOnly: false
83+
- name: s3-ca-crt
84+
mountPath: /etc/pki/ca-trust/source/anchors/s3-ca.crt
85+
subPath: tls.crt
86+
readOnly: true
7187
containers:
7288
- name: opensearch
7389
volumeMounts:
7490
- name: security-config
7591
mountPath: /stackable/opensearch/config/opensearch-security
7692
readOnly: true
93+
- name: tls
94+
mountPath: /stackable/opensearch/config/tls
95+
readOnly: true
7796
- name: keystore
7897
mountPath: /stackable/opensearch/config/opensearch.keystore
7998
subPath: opensearch.keystore
@@ -86,10 +105,28 @@ spec:
86105
secret:
87106
secretName: s3-credentials
88107
defaultMode: 0o660
108+
- name: s3-ca-crt
109+
secret:
110+
secretName: minio-ca-crt
111+
defaultMode: 0o660
89112
- name: security-config
90113
secret:
91114
secretName: opensearch-security-config
92115
defaultMode: 0o660
116+
- name: tls
117+
ephemeral:
118+
volumeClaimTemplate:
119+
metadata:
120+
annotations:
121+
secrets.stackable.tech/scope: node,pod,service=opensearch,service=opensearch-nodes-default-headless
122+
secrets.stackable.tech/class: tls
123+
spec:
124+
storageClassName: secrets.stackable.tech
125+
accessModes:
126+
- ReadWriteOnce
127+
resources:
128+
requests:
129+
storage: "1"
93130
---
94131
apiVersion: v1
95132
kind: Secret

0 commit comments

Comments
 (0)