From e63b85d5a5c34cf9c709db41ca9514495a0cc295 Mon Sep 17 00:00:00 2001 From: unkin-agent Date: Mon, 16 Nov 2026 21:30:39 +1100 Subject: [PATCH] vlogs: accept Vault identity JWTs and run oauth2-proxy HA (#587) Agents need programmatic vlogs access with short-lived Vault identity OIDC tokens, and the oauth2-proxy runs as a single replica. - accept Vault identity JWT bearer tokens (audience `victorialogs`) via extra JWT issuer - run oauth2-proxy with 2 replicas spread across nodes - add a PodDisruptionBudget (minAvailable 1) requires terraform-vault #179 applied first Reviewed-on: https://git.unkin.net/unkin/argocd-apps/pulls/587 Co-authored-by: unkin-agent Co-committed-by: unkin-agent --- apps/base/vlogs/kustomization.yaml | 1 + apps/base/vlogs/oauth2-proxy-configmap.yaml | 2 ++ apps/base/vlogs/oauth2-proxy-deployment.yaml | 9 ++++++++- apps/base/vlogs/pdb.yaml | 11 +++++++++++ 4 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 apps/base/vlogs/pdb.yaml diff --git a/apps/base/vlogs/kustomization.yaml b/apps/base/vlogs/kustomization.yaml index c5f15cc..12d2f5d 100644 --- a/apps/base/vlogs/kustomization.yaml +++ b/apps/base/vlogs/kustomization.yaml @@ -8,6 +8,7 @@ resources: - vaultstaticsecret.yaml - oauth2-proxy-configmap.yaml - oauth2-proxy-deployment.yaml + - pdb.yaml - service.yaml - gateway.yaml - httproute.yaml diff --git a/apps/base/vlogs/oauth2-proxy-configmap.yaml b/apps/base/vlogs/oauth2-proxy-configmap.yaml index f3b3bb1..924fa3a 100644 --- a/apps/base/vlogs/oauth2-proxy-configmap.yaml +++ b/apps/base/vlogs/oauth2-proxy-configmap.yaml @@ -26,3 +26,5 @@ data: OAUTH2_PROXY_PROVIDER_CA_FILES: "/etc/ssl/combined/ca-certificates.crt" OAUTH2_PROXY_CODE_CHALLENGE_METHOD: "S256" OAUTH2_PROXY_SKIP_PROVIDER_BUTTON: "true" + OAUTH2_PROXY_SKIP_JWT_BEARER_TOKENS: "true" + OAUTH2_PROXY_EXTRA_JWT_ISSUERS: "https://vault.service.consul:8200/v1/identity/oidc=victorialogs" diff --git a/apps/base/vlogs/oauth2-proxy-deployment.yaml b/apps/base/vlogs/oauth2-proxy-deployment.yaml index 6fafd5a..a58dad1 100644 --- a/apps/base/vlogs/oauth2-proxy-deployment.yaml +++ b/apps/base/vlogs/oauth2-proxy-deployment.yaml @@ -8,7 +8,7 @@ metadata: configmap.reloader.stakater.com/auto: "true" secret.reloader.stakater.com/reload: "vlogs-oauth-credentials,vault-ca-cert" spec: - replicas: 1 + replicas: 2 selector: matchLabels: app: vlogs-oauth2 @@ -23,6 +23,13 @@ spec: spec: serviceAccountName: default automountServiceAccountToken: false + topologySpreadConstraints: + - maxSkew: 1 + topologyKey: kubernetes.io/hostname + whenUnsatisfiable: DoNotSchedule + labelSelector: + matchLabels: + app: vlogs-oauth2 securityContext: runAsNonRoot: true runAsUser: 65532 diff --git a/apps/base/vlogs/pdb.yaml b/apps/base/vlogs/pdb.yaml new file mode 100644 index 0000000..3d1937b --- /dev/null +++ b/apps/base/vlogs/pdb.yaml @@ -0,0 +1,11 @@ +--- +apiVersion: policy/v1 +kind: PodDisruptionBudget +metadata: + name: vlogs-oauth2 + namespace: vlogs +spec: + minAvailable: 1 + selector: + matchLabels: + app: vlogs-oauth2