Skip to content

Commit 5519a0c

Browse files
authored
Migrate away from initContainers for CA Bundle operations (#177)
To provide better support for disconnected environments, the operator's initContainers are being removed. This PR removes the initContainer that performs CA Bundle concatenation, and now processes cert data from ConfigMaps directly before mounting the final result into the llama-stack container. Validation steps are performed to ensure that only legitimate certificate data is being passed to the llama-stack process in the container. Other basic size /number validation is done to ensure the operator stays within its resource limits. Startup script additions were avoided this time, so that intentions like RHAIENG-1438 can be carried out without additional logic overhead. Supersedes #174 Closes RHAIENG-1383 --------- Signed-off-by: Doug Edgar <dedgar@redhat.com>
1 parent 3a3ed41 commit 5519a0c

File tree

11 files changed

+965
-331
lines changed

11 files changed

+965
-331
lines changed

config/samples/example-with-ca-bundle.yaml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,6 @@ spec:
6161
value: "meta-llama/Llama-3.2-1B-Instruct"
6262
- name: VLLM_URL
6363
value: "https://vllm-server.vllm-dist.svc.cluster.local:8000/v1"
64-
- name: VLLM_TLS_VERIFY
65-
value: "/etc/ssl/certs/ca-bundle.crt"
6664
userConfig:
6765
configMapName: llama-stack-config
6866
# configMapNamespace: "" # Optional - defaults to the same namespace as the CR
@@ -71,6 +69,12 @@ spec:
7169
configMapName: custom-ca-bundle
7270
# configMapNamespace: "" # Optional - defaults to the same namespace as the CR
7371
# configMapKeys not specified - defaults to ["ca-bundle.crt"]
74-
# configMapKeys: # Specify multiple keys to concatenate into ca-bundle.crt
72+
# configMapKeys: # Specify multiple keys to concatenate into a single CA bundle
7573
# - ca-bundle1.crt
7674
# - ca-bundle2.crt
75+
# Note: The operator will automatically:
76+
# 1. Validate and extract valid certificates from all specified ConfigMap keys
77+
# 2. Concatenate them into a single PEM file
78+
# 3. Create a managed ConfigMap named {instance-name}-ca-bundle
79+
# 4. Mount the bundle at /etc/ssl/certs/ca-bundle/ca-bundle.crt
80+
# 5. Set SSL_CERT_FILE environment variable automatically

0 commit comments

Comments
 (0)