Compare commits
1 Commits
master
...
fixing_err
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b3f20777c3 |
@@ -296,6 +296,8 @@ spec:
|
|||||||
secretKeyRef:
|
secretKeyRef:
|
||||||
name: authentik-secret
|
name: authentik-secret
|
||||||
key: AUTHENTIK_SECRET_KEY
|
key: AUTHENTIK_SECRET_KEY
|
||||||
|
- name: AUTHENTIK_WORKER_CONCURRENCY
|
||||||
|
value: "2"
|
||||||
resources:
|
resources:
|
||||||
requests:
|
requests:
|
||||||
memory: "512Mi"
|
memory: "512Mi"
|
||||||
|
|||||||
@@ -18,12 +18,12 @@ data:
|
|||||||
xpack.security.transport.ssl.enabled: true
|
xpack.security.transport.ssl.enabled: true
|
||||||
xpack.security.transport.ssl.verification_mode: certificate
|
xpack.security.transport.ssl.verification_mode: certificate
|
||||||
xpack.security.transport.ssl.keystore.path: /usr/share/elasticsearch/config/certs/elasticsearch.p12
|
xpack.security.transport.ssl.keystore.path: /usr/share/elasticsearch/config/certs/elasticsearch.p12
|
||||||
xpack.security.transport.ssl.truststore.path: /usr/share/elasticsearch/config/certs/elasticsearch.p12
|
xpack.security.transport.ssl.certificate_authorities: ["/usr/share/elasticsearch/config/certs/ca.crt"]
|
||||||
|
|
||||||
# HTTP TLS (client-to-node)
|
# HTTP TLS (client-to-node)
|
||||||
xpack.security.http.ssl.enabled: true
|
xpack.security.http.ssl.enabled: true
|
||||||
xpack.security.http.ssl.keystore.path: /usr/share/elasticsearch/config/certs/http.p12
|
xpack.security.http.ssl.keystore.path: /usr/share/elasticsearch/config/certs/http.p12
|
||||||
xpack.security.http.ssl.truststore.path: /usr/share/elasticsearch/config/certs/http.p12
|
xpack.security.http.ssl.certificate_authorities: ["/usr/share/elasticsearch/config/certs/ca.crt"]
|
||||||
|
|
||||||
# Token service for Kibana
|
# Token service for Kibana
|
||||||
xpack.security.authc.token.enabled: true
|
xpack.security.authc.token.enabled: true
|
||||||
@@ -60,6 +60,7 @@ type: Opaque
|
|||||||
stringData:
|
stringData:
|
||||||
ELASTIC_PASSWORD: "ElasticP@ss2024!"
|
ELASTIC_PASSWORD: "ElasticP@ss2024!"
|
||||||
ES_KEYSTORE_PASS: "changeit"
|
ES_KEYSTORE_PASS: "changeit"
|
||||||
|
OIDC_CLIENT_SECRET: "kibana-client-secret-2024"
|
||||||
---
|
---
|
||||||
apiVersion: apps/v1
|
apiVersion: apps/v1
|
||||||
kind: StatefulSet
|
kind: StatefulSet
|
||||||
@@ -93,6 +94,40 @@ spec:
|
|||||||
command: ['sysctl', '-w', 'vm.max_map_count=262144']
|
command: ['sysctl', '-w', 'vm.max_map_count=262144']
|
||||||
securityContext:
|
securityContext:
|
||||||
privileged: true
|
privileged: true
|
||||||
|
- name: setup-config
|
||||||
|
image: docker.elastic.co/elasticsearch/elasticsearch:8.17.0
|
||||||
|
command:
|
||||||
|
- sh
|
||||||
|
- -c
|
||||||
|
- |
|
||||||
|
# Copy default config files into writable config dir
|
||||||
|
cp -r /usr/share/elasticsearch/config/* /writable-config/
|
||||||
|
# Overlay with our custom elasticsearch.yml
|
||||||
|
cp /custom-config/elasticsearch.yml /writable-config/elasticsearch.yml
|
||||||
|
# Create keystore and add PKCS12 secure passwords
|
||||||
|
export ES_PATH_CONF=/writable-config
|
||||||
|
/usr/share/elasticsearch/bin/elasticsearch-keystore create
|
||||||
|
echo "$KEYSTORE_PASSWORD" | /usr/share/elasticsearch/bin/elasticsearch-keystore add -x xpack.security.transport.ssl.keystore.secure_password
|
||||||
|
echo "$KEYSTORE_PASSWORD" | /usr/share/elasticsearch/bin/elasticsearch-keystore add -x xpack.security.http.ssl.keystore.secure_password
|
||||||
|
echo "$OIDC_CLIENT_SECRET" | /usr/share/elasticsearch/bin/elasticsearch-keystore add -x xpack.security.authc.realms.oidc.authentik.rp.client_secret
|
||||||
|
echo "Config directory assembled successfully"
|
||||||
|
ls -la /writable-config/
|
||||||
|
env:
|
||||||
|
- name: KEYSTORE_PASSWORD
|
||||||
|
valueFrom:
|
||||||
|
secretKeyRef:
|
||||||
|
name: elasticsearch-credentials
|
||||||
|
key: ES_KEYSTORE_PASS
|
||||||
|
- name: OIDC_CLIENT_SECRET
|
||||||
|
valueFrom:
|
||||||
|
secretKeyRef:
|
||||||
|
name: elasticsearch-credentials
|
||||||
|
key: OIDC_CLIENT_SECRET
|
||||||
|
volumeMounts:
|
||||||
|
- name: es-config-dir
|
||||||
|
mountPath: /writable-config
|
||||||
|
- name: es-custom-config
|
||||||
|
mountPath: /custom-config
|
||||||
containers:
|
containers:
|
||||||
- name: elasticsearch
|
- name: elasticsearch
|
||||||
image: docker.elastic.co/elasticsearch/elasticsearch:8.17.0
|
image: docker.elastic.co/elasticsearch/elasticsearch:8.17.0
|
||||||
@@ -109,32 +144,11 @@ spec:
|
|||||||
key: ELASTIC_PASSWORD
|
key: ELASTIC_PASSWORD
|
||||||
- name: ES_JAVA_OPTS
|
- name: ES_JAVA_OPTS
|
||||||
value: "-Xms1g -Xmx1g"
|
value: "-Xms1g -Xmx1g"
|
||||||
- name: xpack.security.transport.ssl.keystore.secure_password
|
|
||||||
valueFrom:
|
|
||||||
secretKeyRef:
|
|
||||||
name: elasticsearch-credentials
|
|
||||||
key: ES_KEYSTORE_PASS
|
|
||||||
- name: xpack.security.transport.ssl.truststore.secure_password
|
|
||||||
valueFrom:
|
|
||||||
secretKeyRef:
|
|
||||||
name: elasticsearch-credentials
|
|
||||||
key: ES_KEYSTORE_PASS
|
|
||||||
- name: xpack.security.http.ssl.keystore.secure_password
|
|
||||||
valueFrom:
|
|
||||||
secretKeyRef:
|
|
||||||
name: elasticsearch-credentials
|
|
||||||
key: ES_KEYSTORE_PASS
|
|
||||||
- name: xpack.security.http.ssl.truststore.secure_password
|
|
||||||
valueFrom:
|
|
||||||
secretKeyRef:
|
|
||||||
name: elasticsearch-credentials
|
|
||||||
key: ES_KEYSTORE_PASS
|
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
- name: es-data
|
- name: es-data
|
||||||
mountPath: /usr/share/elasticsearch/data
|
mountPath: /usr/share/elasticsearch/data
|
||||||
- name: es-config
|
- name: es-config-dir
|
||||||
mountPath: /usr/share/elasticsearch/config/elasticsearch.yml
|
mountPath: /usr/share/elasticsearch/config
|
||||||
subPath: elasticsearch.yml
|
|
||||||
- name: es-certs
|
- name: es-certs
|
||||||
mountPath: /usr/share/elasticsearch/config/certs
|
mountPath: /usr/share/elasticsearch/config/certs
|
||||||
readOnly: true
|
readOnly: true
|
||||||
@@ -158,7 +172,9 @@ spec:
|
|||||||
periodSeconds: 15
|
periodSeconds: 15
|
||||||
timeoutSeconds: 10
|
timeoutSeconds: 10
|
||||||
volumes:
|
volumes:
|
||||||
- name: es-config
|
- name: es-config-dir
|
||||||
|
emptyDir: {}
|
||||||
|
- name: es-custom-config
|
||||||
configMap:
|
configMap:
|
||||||
name: elasticsearch-config
|
name: elasticsearch-config
|
||||||
- name: es-certs
|
- name: es-certs
|
||||||
|
|||||||
@@ -17,6 +17,24 @@ spec:
|
|||||||
labels:
|
labels:
|
||||||
app: mysql
|
app: mysql
|
||||||
spec:
|
spec:
|
||||||
|
initContainers:
|
||||||
|
- name: cleanup-stale-data
|
||||||
|
image: busybox:1.36
|
||||||
|
command:
|
||||||
|
- sh
|
||||||
|
- -c
|
||||||
|
- |
|
||||||
|
# If data dir has files but MySQL was never fully initialized
|
||||||
|
# (no 'mysql.ibd' system tablespace), clean up so init can run
|
||||||
|
if [ -d /var/lib/mysql ] && [ "$(ls -A /var/lib/mysql)" ] && [ ! -f /var/lib/mysql/mysql.ibd ]; then
|
||||||
|
echo "Detected partially initialized data directory — cleaning up"
|
||||||
|
rm -rf /var/lib/mysql/*
|
||||||
|
else
|
||||||
|
echo "Data directory is clean or already initialized — no action needed"
|
||||||
|
fi
|
||||||
|
volumeMounts:
|
||||||
|
- name: mysql-data
|
||||||
|
mountPath: /var/lib/mysql
|
||||||
containers:
|
containers:
|
||||||
- name: mysql
|
- name: mysql
|
||||||
image: mysql:8.4
|
image: mysql:8.4
|
||||||
|
|||||||
Reference in New Issue
Block a user