diff --git a/apps/base/cert-manager/certificate_wildcard-unkin-net.yaml b/apps/base/cert-manager/certificate_wildcard-unkin-net.yaml index 92338ce..6349a3e 100644 --- a/apps/base/cert-manager/certificate_wildcard-unkin-net.yaml +++ b/apps/base/cert-manager/certificate_wildcard-unkin-net.yaml @@ -14,9 +14,9 @@ spec: secretTemplate: annotations: reflector.v1.k8s.emberstack.com/reflection-allowed: "true" - reflector.v1.k8s.emberstack.com/reflection-allowed-namespaces: "cheeztv,arrstack,authentik,gitea,watchstate,mediamark,repospawner,haproxy,logging" + reflector.v1.k8s.emberstack.com/reflection-allowed-namespaces: "cheeztv,arrstack,authentik,gitea,watchstate,mediamark,repospawner,haproxy,vlogs" reflector.v1.k8s.emberstack.com/reflection-auto-enabled: "true" - reflector.v1.k8s.emberstack.com/reflection-auto-namespaces: "cheeztv,arrstack,authentik,gitea,watchstate,mediamark,repospawner,haproxy,logging" + reflector.v1.k8s.emberstack.com/reflection-auto-namespaces: "cheeztv,arrstack,authentik,gitea,watchstate,mediamark,repospawner,haproxy,vlogs" privateKey: size: 4096 dnsNames: diff --git a/apps/base/logging/kustomization.yaml b/apps/base/logging/kustomization.yaml index 7fdff26..895cce9 100644 --- a/apps/base/logging/kustomization.yaml +++ b/apps/base/logging/kustomization.yaml @@ -9,4 +9,3 @@ resources: - vlagent.yaml - gateway.yaml - httproute.yaml - - vlogs diff --git a/apps/base/logging/vlogs/gateway.yaml b/apps/base/vlogs/gateway.yaml similarity index 98% rename from apps/base/logging/vlogs/gateway.yaml rename to apps/base/vlogs/gateway.yaml index d1ead27..330bccc 100644 --- a/apps/base/logging/vlogs/gateway.yaml +++ b/apps/base/vlogs/gateway.yaml @@ -12,7 +12,7 @@ metadata: labels: traefik.io/instance: external name: vlogs-external - namespace: logging + namespace: vlogs spec: gatewayClassName: traefik-external listeners: diff --git a/apps/base/logging/vlogs/httproute.yaml b/apps/base/vlogs/httproute.yaml similarity index 96% rename from apps/base/logging/vlogs/httproute.yaml rename to apps/base/vlogs/httproute.yaml index b97755e..91b7f17 100644 --- a/apps/base/logging/vlogs/httproute.yaml +++ b/apps/base/vlogs/httproute.yaml @@ -3,7 +3,7 @@ apiVersion: gateway.networking.k8s.io/v1 kind: HTTPRoute metadata: name: vlogs-http-redirect - namespace: logging + namespace: vlogs spec: hostnames: - vlogs.unkin.net @@ -27,7 +27,7 @@ apiVersion: gateway.networking.k8s.io/v1 kind: HTTPRoute metadata: name: vlogs - namespace: logging + namespace: vlogs spec: hostnames: - vlogs.unkin.net diff --git a/apps/base/logging/vlogs/kustomization.yaml b/apps/base/vlogs/kustomization.yaml similarity index 85% rename from apps/base/logging/vlogs/kustomization.yaml rename to apps/base/vlogs/kustomization.yaml index a5a5412..c5f15cc 100644 --- a/apps/base/logging/vlogs/kustomization.yaml +++ b/apps/base/vlogs/kustomization.yaml @@ -3,6 +3,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: + - namespace.yaml + - vaultauth.yaml - vaultstaticsecret.yaml - oauth2-proxy-configmap.yaml - oauth2-proxy-deployment.yaml diff --git a/apps/base/vlogs/namespace.yaml b/apps/base/vlogs/namespace.yaml new file mode 100644 index 0000000..ba54d13 --- /dev/null +++ b/apps/base/vlogs/namespace.yaml @@ -0,0 +1,5 @@ +--- +apiVersion: v1 +kind: Namespace +metadata: + name: vlogs diff --git a/apps/base/logging/vlogs/oauth2-proxy-configmap.yaml b/apps/base/vlogs/oauth2-proxy-configmap.yaml similarity index 98% rename from apps/base/logging/vlogs/oauth2-proxy-configmap.yaml rename to apps/base/vlogs/oauth2-proxy-configmap.yaml index 1a1c3b9..f3b3bb1 100644 --- a/apps/base/logging/vlogs/oauth2-proxy-configmap.yaml +++ b/apps/base/vlogs/oauth2-proxy-configmap.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: vlogs-oauth2-env - namespace: logging + namespace: vlogs data: OAUTH2_PROXY_HTTP_ADDRESS: "0.0.0.0:4180" OAUTH2_PROXY_PROVIDER: "oidc" diff --git a/apps/base/logging/vlogs/oauth2-proxy-deployment.yaml b/apps/base/vlogs/oauth2-proxy-deployment.yaml similarity index 99% rename from apps/base/logging/vlogs/oauth2-proxy-deployment.yaml rename to apps/base/vlogs/oauth2-proxy-deployment.yaml index 40cfd48..6fafd5a 100644 --- a/apps/base/logging/vlogs/oauth2-proxy-deployment.yaml +++ b/apps/base/vlogs/oauth2-proxy-deployment.yaml @@ -3,7 +3,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: vlogs-oauth2 - namespace: logging + namespace: vlogs annotations: configmap.reloader.stakater.com/auto: "true" secret.reloader.stakater.com/reload: "vlogs-oauth-credentials,vault-ca-cert" diff --git a/apps/base/logging/vlogs/service.yaml b/apps/base/vlogs/service.yaml similarity index 94% rename from apps/base/logging/vlogs/service.yaml rename to apps/base/vlogs/service.yaml index 1b69bde..3e9ec04 100644 --- a/apps/base/logging/vlogs/service.yaml +++ b/apps/base/vlogs/service.yaml @@ -5,7 +5,7 @@ apiVersion: v1 kind: Service metadata: name: vlogs-oauth2 - namespace: logging + namespace: vlogs spec: internalTrafficPolicy: Cluster ports: diff --git a/apps/base/vlogs/vaultauth.yaml b/apps/base/vlogs/vaultauth.yaml new file mode 100644 index 0000000..6fbe79d --- /dev/null +++ b/apps/base/vlogs/vaultauth.yaml @@ -0,0 +1,18 @@ +--- +apiVersion: secrets.hashicorp.com/v1beta1 +kind: VaultAuth +metadata: + name: default + namespace: vlogs +spec: + allowedNamespaces: + - vlogs + kubernetes: + audiences: + - vault + role: default + serviceAccount: default + tokenExpirationSeconds: 600 + method: kubernetes + mount: k8s/au/syd1 + vaultConnectionRef: vso-system/default diff --git a/apps/base/logging/vlogs/vaultstaticsecret.yaml b/apps/base/vlogs/vaultstaticsecret.yaml similarity index 76% rename from apps/base/logging/vlogs/vaultstaticsecret.yaml rename to apps/base/vlogs/vaultstaticsecret.yaml index 6dcfc09..b509ccf 100644 --- a/apps/base/logging/vlogs/vaultstaticsecret.yaml +++ b/apps/base/vlogs/vaultstaticsecret.yaml @@ -3,7 +3,7 @@ apiVersion: secrets.hashicorp.com/v1beta1 kind: VaultStaticSecret metadata: name: vlogs-oauth-credentials - namespace: logging + namespace: vlogs spec: destination: create: true @@ -11,7 +11,7 @@ spec: overwrite: true hmacSecretData: true mount: kv - path: kubernetes/namespace/logging/default/vlogs-oauth-credentials + path: kubernetes/namespace/vlogs/default/oauth-credentials refreshAfter: 5m type: kv-v2 vaultAuthRef: default diff --git a/apps/overlays/au-syd1/vlogs/kustomization.yaml b/apps/overlays/au-syd1/vlogs/kustomization.yaml new file mode 100644 index 0000000..6bd6e69 --- /dev/null +++ b/apps/overlays/au-syd1/vlogs/kustomization.yaml @@ -0,0 +1,6 @@ +--- +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: + - ../../../base/vlogs diff --git a/argocd/applicationsets/platform.yaml b/argocd/applicationsets/platform.yaml index 2a6cfe5..6a951e3 100644 --- a/argocd/applicationsets/platform.yaml +++ b/argocd/applicationsets/platform.yaml @@ -49,6 +49,7 @@ spec: - path: apps/overlays/*/vm-system - path: apps/overlays/*/vpa-system - path: apps/overlays/*/vault + - path: apps/overlays/*/vlogs - path: apps/overlays/*/vso-system - path: apps/overlays/*/woodpecker template: diff --git a/argocd/projects/platform.yaml b/argocd/projects/platform.yaml index d5be156..011b942 100644 --- a/argocd/projects/platform.yaml +++ b/argocd/projects/platform.yaml @@ -67,6 +67,8 @@ spec: server: https://kubernetes.default.svc - namespace: 'vault' server: https://kubernetes.default.svc + - namespace: 'vlogs' + server: https://kubernetes.default.svc - namespace: 'woodpecker' server: https://kubernetes.default.svc clusterResourceWhitelist: