Skip to content

Commit c7996d1

Browse files
committed
chore: add spiffe defaults to Helm values, remove static templates
Add spiffe section with helperConfig to Helm values.yaml under defaults. Delete static spiffe-helper-config.yaml template and OpenShift spiffe-helper-keycloak.yaml kustomize patch. Update kustomization references and e2e fixture comments. RHAIENG-4939 Assisted-By: Claude (Anthropic AI) <noreply@anthropic.com> Signed-off-by: Ian Miller <milleryan2003@gmail.com>
1 parent a824a30 commit c7996d1

4 files changed

Lines changed: 18 additions & 45 deletions

File tree

charts/kagenti-operator/values.yaml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -275,3 +275,21 @@ defaults:
275275
limits:
276276
cpu: 300m
277277
memory: 384Mi
278+
279+
# SPIFFE / spiffe-helper settings.
280+
# Keep helperConfig in sync with DefaultSpiffeHelperConfig in internal/webhook/config/defaults.go.
281+
spiffe:
282+
trustDomain: cluster.local
283+
socketPath: "unix:///spiffe-workload-api/spire-agent.sock"
284+
helperConfig: |
285+
agent_address = "/spiffe-workload-api/spire-agent.sock"
286+
cmd = ""
287+
cmd_args = ""
288+
svid_file_name = "/opt/svid.pem"
289+
svid_key_file_name = "/opt/svid_key.pem"
290+
svid_bundle_file_name = "/opt/svid_bundle.pem"
291+
cert_file_mode = 0644
292+
key_file_mode = 0640
293+
jwt_svids = [{jwt_audience="http://keycloak.localtest.me:8080/realms/kagenti", jwt_svid_file_name="/opt/jwt_svid.token"}]
294+
jwt_svid_file_mode = 0644
295+
include_federated_domains = true

kagenti-operator/config/authbridge/spiffe-helper-config.yaml

Lines changed: 0 additions & 24 deletions
This file was deleted.

kagenti-operator/config/openshift/kustomization.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,3 @@ resources:
1212

1313
patches:
1414
- path: patches/authbridge-keycloak.yaml
15-
- path: patches/spiffe-helper-keycloak.yaml

kagenti-operator/config/openshift/patches/spiffe-helper-keycloak.yaml

Lines changed: 0 additions & 20 deletions
This file was deleted.

0 commit comments

Comments
 (0)