Skip to content

Commit bd1089a

Browse files
committed
Adding an option to ACS to use cluster CA, not self signed, for ACS Central
1 parent 12243a0 commit bd1089a

4 files changed

Lines changed: 14 additions & 2 deletions

File tree

charts/acs-central/templates/central-cr.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,13 @@ spec:
2121
port: 443
2222
route:
2323
enabled: {{ .Values.central.exposure.route.enabled }}
24+
{{- if .Values.central.exposure.route.reencrypt.enabled }}
25+
reencrypt:
26+
enabled: true
27+
{{- if .Values.central.exposure.route.reencrypt.host }}
28+
host: {{ .Values.central.exposure.route.reencrypt.host }}
29+
{{- end }}
30+
{{- end }}
2431

2532
{{- if .Values.central.persistence.enabled }}
2633
persistence:

charts/acs-central/templates/console-link.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@ metadata:
88
annotations:
99
argocd.argoproj.io/sync-wave: "46"
1010
spec:
11+
{{- if .Values.central.exposure.route.reencrypt.enabled }}
12+
href: https://central-reencrypt-{{ .Release.Namespace }}.{{ .Values.global.localClusterDomain }}
13+
{{- else }}
1114
href: https://central-{{ .Release.Namespace }}.{{ .Values.global.localClusterDomain }}
15+
{{- end }}
1216
location: ApplicationMenu
1317
text: Advanced Cluster Security
1418
applicationMenu:

charts/acs-central/templates/jobs/create-auth-provider.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ spec:
8686
exit 0
8787
fi
8888
89-
ACS_CENTRAL_HOSTNAME="$(oc get route central -n stackrox -o jsonpath='{.spec.host}')"
89+
ACS_CENTRAL_HOSTNAME="$(oc get route central-reencrypt -n stackrox -o jsonpath='{.spec.host}' 2>/dev/null || oc get route central -n stackrox -o jsonpath='{.spec.host}')"
9090
echo "ACS Central hostname: $ACS_CENTRAL_HOSTNAME"
9191
9292
cat > /tmp/oidc-config.json << 'OIDCEOF'

charts/acs-central/values.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,11 @@ central:
7373
exposure:
7474
route:
7575
enabled: true
76-
# Use cluster wildcard certificate
7776
tls:
7877
enabled: true
7978
termination: passthrough
79+
reencrypt:
80+
enabled: true
8081
loadBalancer:
8182
enabled: false
8283

0 commit comments

Comments
 (0)