Skip to content
4 changes: 2 additions & 2 deletions root/templates/cluster-forge.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ spec:
valueFiles:
- {{ .Values.externalValues.path }}
- {{ .Values.global.clusterSize }}
- $values/values.yaml
- $cluster-values/values.yaml
- repoURL: {{ .Values.externalValues.repoUrl }}
targetRevision: {{ .Values.externalValues.targetRevision }}
ref: values
ref: cluster-values
{{ else }}
# helm-chart & values file within the same git repo
source:
Expand Down
10 changes: 4 additions & 6 deletions scripts/bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -270,12 +270,10 @@ helm template --release-name openbao ${SCRIPT_DIR}/../sources/openbao/0.18.2 --n
--kube-version=${KUBE_VERSION} | kubectl apply --server-side --field-manager=argocd-controller --force-conflicts -f -
kubectl wait --for=jsonpath='{.status.phase}'=Running pod/openbao-0 -n cf-openbao --timeout=100s

# Create static ConfigMaps needed for init job
echo "Creating OpenBao config static resources..."
helm template --release-name openbao-config-static ${SCRIPT_DIR}/init-openbao-job \
--set domain="${DOMAIN}" \
--kube-version=${KUBE_VERSION} \
--show-only templates/openbao-secret-manager-cm.yaml | kubectl apply -f -
# Create initial secrets config for init job (separate from ArgoCD-managed version)
echo "Creating initial OpenBao secrets configuration..."
cat ${SCRIPT_DIR}/../sources/openbao-config/0.1.0/templates/openbao-secret-manager-cm.yaml | \
sed "s|name: openbao-secret-manager-scripts|name: openbao-secret-manager-scripts-init|g" | kubectl apply -f -

# Create initial secrets config for init job (separate from ArgoCD-managed version)
echo "Creating initial OpenBao secrets configuration..."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,5 +55,5 @@ spec:
name: openbao-secrets-init-config
- name: secret-manager
configMap:
name: openbao-secret-manager-scripts
name: openbao-secret-manager-scripts-init
defaultMode: 0755