Skip to content

Commit 6602c08

Browse files
committed
fix(kubernetes): drop apex guard on oidc-rbac-job
The oidc-rbac bootstrap Job renders unconditionally, including the no-etcd bootstrap path and with OIDC disabled, so guarding its OIDC_SERVER_URL apex failed a render that must succeed: helm template of the chart with no etcd DataStore (hack/admin-kubeconfig-invariant.bats) aborted instead of emitting only the awaiting-etcd beacon. A running cluster's apiserver endpoint is already guarded in cluster.yaml (etcd present), which is the meaningful malformed-hostname case, so revert the oidc-rbac-job guard rather than gate it further. Restore the no-etcd unit fixture to an empty host so it keeps exercising that path. Signed-off-by: IvanHunters <[email protected]>
1 parent 37f5936 commit 6602c08

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

‎packages/apps/kubernetes/templates/oidc-rbac-job.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
*/}}
4848
{{- $clientId := include "kubernetes.oidc.clientId" . | trim }}
4949
{{- $issuer := include "kubernetes.oidc.systemIssuerURL" . | trim }}
50-
{{- $externalHost := .Values.host | default (printf "%s.%s" .Release.Name (include "cozy-lib.ns-host-required" .)) }}
50+
{{- $externalHost := .Values.host | default (printf "%s.%s" .Release.Name (.Values._namespace.host)) }}
5151
---
5252
apiVersion: v1
5353
kind: ServiceAccount

‎packages/apps/kubernetes/tests/admin_kubeconfig_wait_test.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ tests:
141141
monitoring: ""
142142
ingress: ""
143143
seaweedfs: ""
144-
host: example.org
144+
host: ""
145145
asserts:
146146
- hasDocuments:
147147
count: 1

0 commit comments

Comments
 (0)