Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions .taskfiles/vault/Taskfile.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,19 @@ version: '3'
tasks:
oicd-setup:
desc: Configure k8s auth for Vault External Secrets
vars:
cluster: genmachine
requires:
vars:
- cluster
cmds:
- task: enable-vault-oidc
vars:
cluster: '{{.cluster}}'

eso-auth-setup:
desc: Configure k8s auth for Vault External Secrets
vars:
cluster: genmachine
requires:
vars:
- cluster
cmds:
- task: enable-vault-k8s
vars:
Expand All @@ -35,8 +37,9 @@ tasks:

certmanager-auth-setup:
desc: Configure k8s auth for Vault Certmanager
vars:
cluster: genmachine
requires:
vars:
- cluster
cmds:
- task: enable-vault-k8s
vars:
Expand Down Expand Up @@ -84,10 +87,11 @@ tasks:
sleep 5
done
kubectl config view --raw --minify --flatten -o jsonpath='{.clusters[].cluster.certificate-authority-data}' | base64 --decode > ca.crt
K8S_HOST="$(kubectl config view --raw --minify -o jsonpath='{.clusters[0].cluster.server}')"
TOKEN="$(kubectl get secret -n {{.namespace}} {{.service_account}} -o jsonpath='{.data.token}' | base64 -d)"
vault write -tls-skip-verify -address={{.VAULT_ENDPOINT}} \
auth/{{.cluster}}-k8s/config token_reviewer_jwt="$TOKEN" \
kubernetes_host="https://{{.K8S_API}}:6443" \
kubernetes_host="$K8S_HOST" \
kubernetes_ca_cert=@ca.crt
rm ca.crt
requires:
Expand Down
1 change: 0 additions & 1 deletion Taskfile.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ vars:
VAULT_ENDPOINT: 'https://vault.k0s-fullstack.fredcorp.com'
AUTHENTIK_ENDPOINT_GENMACHINE: 'https://authentik.talos-genmachine.fredcorp.com'
AUTHENTIK_ENDPOINT_BEELINK: 'https://authentik.k0s-fullstack.fredcorp.com'
K8S_API: 'talos-cluster.genmachine.fredcorp.com'
MINIO_API: 'minio-api.talos-genmachine.fredcorp.com'

includes:
Expand Down
14 changes: 7 additions & 7 deletions gitops/manifests/cert-manager/k0s/templates/clusterIssuer.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@ spec:
name: root-ca-chain
auth:
kubernetes:
mountPath: /v1/auth/kubernetes
role: certmanager-vault-auth-k0s
mountPath: /v1/auth/beelink-k8s
role: certmanager
secretRef:
name: certmanager-vault-auth-k0s
name: certmanager-auth
key: token
---
apiVersion: rbac.authorization.k8s.io/v1
Expand All @@ -63,18 +63,18 @@ roleRef:
name: system:auth-delegator
subjects:
- kind: ServiceAccount
name: certmanager-vault-auth-k0s
name: certmanager-auth
namespace: cert-manager
---
apiVersion: v1
kind: ServiceAccount
metadata:
name: certmanager-vault-auth-k0s
name: certmanager-auth
---
apiVersion: v1
kind: Secret
type: kubernetes.io/service-account-token
metadata:
name: certmanager-vault-auth-k0s
name: certmanager-auth
annotations:
kubernetes.io/service-account.name: 'certmanager-vault-auth-k0s'
kubernetes.io/service-account.name: 'certmanager-auth'
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ spec:
key: fredcorp-ca-chain.pem
auth:
kubernetes:
mountPath: kubernetes
role: external-secrets
mountPath: beelink-k8s
role: eso
serviceAccountRef:
name: eso-auth
namespace: external-secrets
Expand Down
Loading