Skip to content

Commit 52f7c2d

Browse files
committed
Addtl Changes to pattern for ocp-eso support
- changed job behavior to match rhtpa-ingress-ca-extractor chart - central-htpasswd is now operator-managed
1 parent 2610082 commit 52f7c2d

4 files changed

Lines changed: 10 additions & 3 deletions

File tree

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ metadata:
88
{{- include "acs-central.labels" . | nindent 4 }}
99
annotations:
1010
argocd.argoproj.io/sync-wave: "44"
11+
argocd.argoproj.io/hook: Sync
12+
argocd.argoproj.io/hook-delete-policy: BeforeHookCreation
1113
spec:
1214
template:
1315
metadata:

charts/acs-central/templates/jobs/create-cluster-init-bundle.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ metadata:
1515
annotations:
1616
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
1717
argocd.argoproj.io/sync-wave: "43"
18+
argocd.argoproj.io/hook: Sync
19+
argocd.argoproj.io/hook-delete-policy: BeforeHookCreation
1820
spec:
1921
template:
2022
metadata:

charts/acs-central/templates/jobs/create-htpasswd-field.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ metadata:
88
{{- include "acs-central.labels" . | nindent 4 }}
99
annotations:
1010
argocd.argoproj.io/sync-wave: "37"
11+
# Jobs are immutable; delete and recreate on each sync when spec changes
12+
argocd.argoproj.io/hook: Sync
13+
argocd.argoproj.io/hook-delete-policy: BeforeHookCreation
1114
spec:
1215
template:
1316
metadata:
@@ -34,7 +37,7 @@ spec:
3437
3538
echo "🔄 Generating htpasswd entry for admin user..."
3639
37-
# Check if central-htpasswd secret already has valid htpasswd field
40+
# Check if admin password secret already has valid htpasswd field
3841
if oc get secret {{ .Values.central.adminPassword.secretName }} -n {{ .Release.Namespace }} -o jsonpath='{.data.htpasswd}' 2>/dev/null | base64 -d | grep -q "^admin:\$2[aby]\$"; then
3942
echo "✅ htpasswd entry already exists and is valid (bcrypt format)"
4043
exit 0

charts/acs-central/values.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ central:
2020
adminPassword:
2121
# Use external secret from Vault
2222
useExternalSecret: true
23-
secretName: central-htpasswd
23+
secretName: central-admin-htpasswd
2424
secretKey: password
2525

2626
# Image configuration
@@ -195,4 +195,4 @@ securityContext:
195195
# Node selector and tolerations
196196
nodeSelector: {}
197197
tolerations: []
198-
affinity: {}
198+
affinity: {}

0 commit comments

Comments
 (0)