diff --git a/secretstores/jenkins-admin-credentials.yaml b/secretstores/jenkins-admin-credentials.yaml new file mode 100644 index 0000000..5ba7608 --- /dev/null +++ b/secretstores/jenkins-admin-credentials.yaml @@ -0,0 +1,26 @@ +# Unlike gitea-admin-credentials, this one's Vault-backed from day one — +# no manual kubectl-created Secret ever existed for Jenkins. Keys match +# what the chart's controller.admin.userKey/passwordKey expect — see +# devops-infra-helm-charts/helm-overrides/k8s-admin-prd-ase1/jenkins/custom-values.yaml. +apiVersion: external-secrets.io/v1 +kind: ExternalSecret +metadata: + name: jenkins-admin-credentials + namespace: jenkins +spec: + refreshInterval: 1h + secretStoreRef: + name: vault-backend + kind: ClusterSecretStore + target: + name: jenkins-admin-credentials + creationPolicy: Owner + data: + - secretKey: jenkins-admin-user + remoteRef: + key: jenkins/admin + property: username + - secretKey: jenkins-admin-password + remoteRef: + key: jenkins/admin + property: password diff --git a/values/incubator-infra-k8s-admin-prd-ase1-values.yaml b/values/incubator-infra-k8s-admin-prd-ase1-values.yaml index b21916d..52f85c4 100644 --- a/values/incubator-infra-k8s-admin-prd-ase1-values.yaml +++ b/values/incubator-infra-k8s-admin-prd-ase1-values.yaml @@ -90,4 +90,15 @@ appSpec: # 256KiB last-applied-configuration annotation limit on a normal # client-side apply. SSA sidesteps it entirely — see the note in # generic-argo-apps-chart's template. - serverSideApply: true \ No newline at end of file + serverSideApply: true + - name: jenkins + # Fresh install, but pinning nameOverride anyway — learned from + # external-secrets that skipping it produces + # "jenkins-admin-prd"-suffixed resource names, which + # jenkins-admin-credentials (the ExternalSecret, namespace "jenkins") + # doesn't need to care about, but keeps naming predictable and + # consistent with every other app here regardless. + nameOverride: jenkins + namespace: jenkins + chartDir: jenkins + valuesDir: jenkins \ No newline at end of file