wip: Gateway Setup

bootstrap/keycloak-theme/Dockerfile

@@ -1,3 +0,0 @@
-FROM busybox
-
-COPY keycloak-themes/oceanbox /theme

bootstrap/keycloak-theme/keycloak-themes/oceanbox/login/resources/css/oceanbox.css

@@ -1,109 +0,0 @@
-/* Oceanbox Keycloak Login Theme
- *
- * Branding aligned with oceanbox.io:
- *   Primary teal:    #0bb4aa
- *   Dark teal:       #37746F
- *   Deep blue:       #031275
- *   Background:      #f9fafd
- *   Text:            #101010
- */
-
-:root {
-    --pf-v5-global--primary-color--100: #0bb4aa;
-    --pf-v5-global--primary-color--200: #099e95;
-    --pf-v5-global--link--Color: #0bb4aa;
-    --pf-v5-global--link--Color--hover: #031275;
-}
-
-.login-pf body {
-    background: #f9fafd url("../img/oceanbox-bg.png") no-repeat center bottom fixed;
-    background-size: cover;
-    height: 100%;
-}
-
-/* Login container layout */
-.pf-v5-c-login__container {
-    grid-template-columns: 34rem;
-    grid-template-areas: "header"
-                         "main";
-}
-
-/* Logo */
-div.kc-logo-text {
-    background-image: url('../img/oceanbox-logo-text.png');
-    height: 80px;
-    width: 360px;
-    background-repeat: no-repeat;
-    background-size: contain;
-    background-position: center;
-    margin: 0 auto;
-}
-
-div.kc-logo-text span {
-    display: none;
-}
-
-/* Header */
-#kc-header-wrapper {
-    font-size: 29px;
-    text-transform: uppercase;
-    letter-spacing: 3px;
-    line-height: 1.2em;
-    white-space: normal;
-    color: #37746F !important;
-    text-align: center;
-}
-
-/* Login card */
-.pf-v5-c-login__main {
-    border-radius: 8px;
-    box-shadow: 0 4px 24px rgba(0, 0, 0, 0.08);
-}
-
-/* Primary button */
-.pf-v5-c-button.pf-m-primary {
-    --pf-v5-c-button--m-primary--BackgroundColor: #0bb4aa;
-    --pf-v5-c-button--m-primary--hover--BackgroundColor: #099e95;
-    --pf-v5-c-button--m-primary--active--BackgroundColor: #37746F;
-    --pf-v5-c-button--m-primary--focus--BackgroundColor: #099e95;
-    border-radius: 4px;
-}
-
-/* Links */
-.pf-v5-c-button.pf-m-link {
-    --pf-v5-c-button--m-link--Color: #0bb4aa;
-    --pf-v5-c-button--m-link--hover--Color: #031275;
-}
-
-a {
-    color: #0bb4aa;
-}
-
-a:hover {
-    color: #031275;
-}
-
-/* Form inputs */
-.pf-v5-c-form-control > input,
-.pf-v5-c-form-control > textarea {
-    border-radius: 4px;
-}
-
-#kc-recovery-codes-list {
-    columns: 2;
-}
-
-#certificate_subjectDN {
-    overflow-wrap: break-word;
-}
-
-hr {
-    margin-top: var(--pf-v5-global--spacer--sm);
-    margin-bottom: var(--pf-v5-global--spacer--md);
-}
-
-@media (min-width: 768px) {
-    div.pf-v5-c-login__main-header {
-        grid-template-columns: 70% 30%;
-    }
-}

bootstrap/keycloak-theme/keycloak-themes/oceanbox/login/theme.properties

@@ -1,5 +0,0 @@
-parent=keycloak.v2
-import=common/keycloak
-
-stylesCommon=vendor/patternfly-v5/patternfly.min.css vendor/patternfly-v5/patternfly-addons.css
-styles=css/styles.css css/oceanbox.css

charts/docs/templates/httproute.yaml

@@ -0,0 +1,46 @@
+{{- if .Values.httpRoute.enabled -}}
+{{- $fullName := include "docs.fullname" . -}}
+{{- $svcPort := .Values.service.port -}}
+apiVersion: gateway.networking.k8s.io/v1
+kind: HTTPRoute
+metadata:
+  name: {{ $fullName }}
+  labels:
+    {{- include "docs.labels" . | nindent 4 }}
+spec:
+  parentRefs:
+    {{- toYaml .Values.httpRoute.parentRefs | nindent 4 }}
+  {{- with .Values.httpRoute.hostnames }}
+  hostnames:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  rules:
+    {{- range .Values.httpRoute.rules }}
+    - {{- with .matches }}
+      matches:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      backendRefs:
+        - name: {{ $fullName }}
+          port: {{ $svcPort }}
+    {{- end }}
+---
+apiVersion: cilium.io/v2
+kind: CiliumNetworkPolicy
+metadata:
+  name: allow-gateway-to-{{ $fullName }}
+  labels:
+    {{- include "docs.labels" . | nindent 4 }}
+spec:
+  endpointSelector:
+    matchLabels:
+      {{- include "docs.selectorLabels" . | nindent 6 }}
+  ingress:
+  - fromCIDRSet:
+    {{- range .Values.clusterConfig.ingress_whitelist }}
+    - cidr: {{ . }}
+    {{- end }}
+  - fromEndpoints:
+    - matchLabels:
+        "k8s:io.kubernetes.pod.namespace": {{ .Release.Namespace }}
+{{- end }}

charts/docs/values.yaml

@@ -46,8 +46,13 @@ service:
   type: ClusterIP
   port: 8080
 ingress:
-  enabled: true
+  enabled: false
   className: nginx
+httpRoute:
+  enabled: false
+  parentRefs: []
+  hostnames: []
+  rules: []
 persistence:
   enabled: false
   size: 1G

charts/makai/templates/httproute.yaml

@@ -0,0 +1,46 @@
+{{- if .Values.httpRoute.enabled -}}
+{{- $fullName := include "makai.fullname" . -}}
+{{- $svcPort := .Values.service.port -}}
+apiVersion: gateway.networking.k8s.io/v1
+kind: HTTPRoute
+metadata:
+  name: {{ $fullName }}
+  labels:
+    {{- include "makai.labels" . | nindent 4 }}
+spec:
+  parentRefs:
+    {{- toYaml .Values.httpRoute.parentRefs | nindent 4 }}
+  {{- with .Values.httpRoute.hostnames }}
+  hostnames:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  rules:
+    {{- range .Values.httpRoute.rules }}
+    - {{- with .matches }}
+      matches:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      backendRefs:
+        - name: {{ $fullName }}
+          port: {{ $svcPort }}
+    {{- end }}
+---
+apiVersion: cilium.io/v2
+kind: CiliumNetworkPolicy
+metadata:
+  name: allow-gateway-to-{{ $fullName }}
+  labels:
+    {{- include "makai.labels" . | nindent 4 }}
+spec:
+  endpointSelector:
+    matchLabels:
+      {{- include "makai.selectorLabels" . | nindent 6 }}
+  ingress:
+  - fromCIDRSet:
+    {{- range .Values.clusterConfig.ingress_whitelist }}
+    - cidr: {{ . }}
+    {{- end }}
+  - fromEndpoints:
+    - matchLabels:
+        "k8s:io.kubernetes.pod.namespace": {{ .Release.Namespace }}
+{{- end }}

charts/makai/values.yaml

@@ -46,8 +46,13 @@ service:
   type: ClusterIP
   port: 8080
 ingress:
-  enabled: true
+  enabled: false
   className: nginx
+httpRoute:
+  enabled: false
+  parentRefs: []
+  hostnames: []
+  rules: []
 persistence:
   enabled: false
   size: 1G

helmfile.d/docs.yaml.gotmpl

@@ -11,6 +11,7 @@ releases:
   condition: docs.enabled
   values:
   - ../values/docs/values/values.yaml
+  - ../values/docs/values/values.yaml.gotmpl
   - ../values/docs/values/values-{{ .Environment.Name }}.yaml
   postRenderer: ../bin/kustomizer
   postRendererArgs:

helmfile.d/gitea.yaml.gotmpl

@@ -17,6 +17,7 @@ releases:
   condition: gitea.enabled
   values:
   - ../values/gitea/values/values.yaml
+  - ../values/gitea/values/values.yaml.gotmpl
   - ../values/gitea/values/values-{{ .Environment.Name }}.yaml
   postRenderer: ../bin/kustomizer
   postRendererArgs:

helmfile.d/keycloak.yaml.gotmpl

@@ -12,7 +12,7 @@ releases:
 - name: {{ .Environment.Name }}-keycloak
   namespace: keycloak
   chart: bitnami/keycloak
-  version: 25.2.0
+  version: 24.9.0
   condition: keycloak.enabled
   values:
   - ../values/keycloak/values/values.yaml

helmfile.d/makai.yaml.gotmpl

@@ -11,6 +11,7 @@ releases:
   condition: makai.enabled
   values:
   - ../values/makai/values/values.yaml
+  - ../values/makai/values/values.yaml.gotmpl
   - ../values/makai/values/values-{{ .Environment.Name }}.yaml
   postRenderer: ../bin/kustomizer
   postRendererArgs:

helmfile.d/rabbitmq.yaml.gotmpl

@@ -13,7 +13,7 @@ releases:
 - name: {{ .Environment.Name }}-rabbitmq
   namespace: rabbitmq
   chart: bitnami/rabbitmq
-  version: 16.0.14
+  version: 13.0.3
   condition: rabbitmq.enabled
   values:
   - ../values/rabbitmq/values/values.yaml

npins/sources.json

@@ -1,10 +1,23 @@
 {
   "pins": {
+    "git-hooks": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "cachix",
+        "repo": "git-hooks.nix"
+      },
+      "branch": "master",
+      "submodules": false,
+      "revision": "a1ef738813b15cf8ec759bdff5761b027e3e1d23",
+      "url": "https://github.com/cachix/git-hooks.nix/archive/a1ef738813b15cf8ec759bdff5761b027e3e1d23.tar.gz",
+      "hash": "sha256-Efs3VUPelRduf3PpfPP2ovEB4CXT7vHf8W+xc49RL/U="
+    },
     "nixpkgs": {
       "type": "Channel",
       "name": "nixpkgs-unstable",
-      "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.05pre961788.75690239f08f/nixexprs.tar.xz",
-      "hash": "sha256-p0h/nSeqzIkbn/2uFC4keoIPwmqXGHsX0gkCXM7km00="
+      "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.05pre930822.ed142ab1b3a0/nixexprs.tar.xz",
+      "hash": "sha256-XH6awru9NnBc/m+2YhRNT8r1PAKEiPGF3gs//F3ods0="
     },
     "treefmt-nix": {
       "type": "Git",
@@ -15,9 +28,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "71b125cd05fbfd78cab3e070b73544abe24c5016",
-      "url": "https://github.com/numtide/treefmt-nix/archive/71b125cd05fbfd78cab3e070b73544abe24c5016.tar.gz",
-      "hash": "sha256-6E/yhXP7Oy/NbXtf1ktzmU8SdVqJQ09HC/48ebEGBpk="
+      "revision": "337a4fe074be1042a35086f15481d763b8ddc0e7",
+      "url": "https://github.com/numtide/treefmt-nix/archive/337a4fe074be1042a35086f15481d763b8ddc0e7.tar.gz",
+      "hash": "sha256-wQ6NJSuFqAEmIg2VMnLdCnUc0b7vslUohqqGGD+Fyxk="
     }
   },
   "version": 7

shell.nix

@@ -35,15 +35,12 @@ pkgs.mkShellNoCC {
     # pkgs.renovate
     # pkgs.graphviz
     # pkgs.hubble
-    pkgs.cilium-cli
-    pkgs.dapr-cli
+    # pkgs.dapr-cli
   ];
 
   # Environment variables
-  ARGOCD_ENV_CLUSTER_NAME = "hel1";
+  ARGOCD_ENV_CLUSTER_NAME = "ekman";
   HELM_GIT_ACCESS_TOKEN = "glpat-xxx";
-  API_SERVER_IP = "localhost";
-  API_SERVER_PORT = "7445";
 
   # Alternative shells
   passthru = pkgs.lib.mapAttrs (name: value: pkgs.mkShellNoCC (value // { inherit name; })) {

values/argo/manifests/argo.yaml

@@ -28,6 +28,7 @@ spec:
     managedNamespaceMetadata:
       labels:
         component: sys
+        shared-gateway-access: "true"
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true

values/argo/manifests/httproute.yaml

@@ -0,0 +1,40 @@
+{{- if .Values.clusterConfig.gatewayAPI.enabled }}
+apiVersion: gateway.networking.k8s.io/v1
+kind: HTTPRoute
+metadata:
+  name: argocd-server
+  namespace: argocd
+spec:
+  parentRefs:
+  - name: shared-gateway
+    namespace: kube-system
+    sectionName: https-internal
+  hostnames:
+  - argocd.{{ .Values.clusterConfig.domain }}
+  rules:
+  - matches:
+    - path:
+        type: PathPrefix
+        value: "/"
+    backendRefs:
+    - name: argocd-server
+      port: 80
+---
+apiVersion: cilium.io/v2
+kind: CiliumNetworkPolicy
+metadata:
+  name: allow-gateway-to-argocd
+  namespace: argocd
+spec:
+  endpointSelector:
+    matchLabels:
+      app.kubernetes.io/name: argocd-server
+  ingress:
+  - fromCIDRSet:
+    {{- range .Values.clusterConfig.ingress_whitelist }}
+    - cidr: {{ . }}
+    {{- end }}
+  - fromEndpoints:
+    - matchLabels:
+        "k8s:io.kubernetes.pod.namespace": argocd
+{{- end }}

values/argo/manifests/sys-project.yaml

@@ -94,8 +94,6 @@ spec:
     server: https://kubernetes.default.svc
   - namespace: jobset-system
     server: https://kubernetes.default.svc
-  - namespace: dex
-    server: https://kubernetes.default.svc
   sourceRepos:
   - https://argoproj.github.io/argo-helm
   - https://kubernetes-sigs.github.io/metrics-server/
@@ -142,4 +140,3 @@ spec:
   - https://operator.mariadb.com
   - https://ot-container-kit.github.io/helm-charts
   - https://twin.github.io/helm-charts
-  - https://charts.dexidp.io

values/argo/values/argocd.yaml.gotmpl

@@ -4,13 +4,16 @@ global:
 ## Ref: https://github.com/argoproj/argo-cd
 ##
 configs:
-  {{- if .Values.argocd.anyNamespaces.enabled }}
   params:
+    {{- if .Values.clusterConfig.gatewayAPI.enabled }}
+    server.insecure: "true"
+    {{- end }}
+    {{- if .Values.argocd.anyNamespaces.enabled }}
     applicationsetcontroller.namespaces: "{{ .Values.argocd.anyNamespaces.glob }}"
     # TODO(kai): anyapp will disable PR review apps. Look into anyapp settings to fix it
     applicationsetcontroller.enable.scm.providers: "false"
     application.namespaces: "{{ .Values.argocd.anyNamespaces.glob }}"
-  {{- end }}
+    {{- end }}
   cm:
     application.resourceTrackingMethod: annotation+label
     application.instanceLabelKey: app.kubernetes.io/instance
@@ -238,6 +241,9 @@ server:
     serviceMonitor:
       enabled: true
   ingress:
+    {{- if .Values.clusterConfig.gatewayAPI.enabled }}
+    enabled: false
+    {{- else }}
     enabled: true
     ingressClassName: nginx
     annotations:
@@ -254,6 +260,7 @@ server:
       - secretName: argocd-tls
         hosts:
           - "argocd.{{ .Values.clusterConfig.domain }}"
+    {{- end }}
 applicationSet:
   metrics:
     enabled: true

values/cilium/cilium-manifests/gateway.yaml

@@ -13,7 +13,7 @@ spec:
     annotations:
       load-balancer.hetzner.cloud/location: hel1
       load-balancer.hetzner.cloud/type: lb11
-      load-balancer.hetzner.cloud/name: load-balancer-2
+      load-balancer.hetzner.cloud/name: load-balancer-1
       load-balancer.hetzner.cloud/use-private-ip: "true"
       load-balancer.hetzner.cloud/uses-proxyprotocol: "true"
       load-balancer.hetzner.cloud/http-redirect-https: "false"
@@ -42,6 +42,36 @@ spec:
           selector:
             matchLabels:
               shared-gateway-access: "true"
+    - name: https-hel1
+      protocol: HTTPS
+      port: 443
+      hostname: "*.hel1.oceanbox.io"
+      tls:
+        certificateRefs:
+          - group: ''
+            kind: Secret
+            name: wildcard-hel1-oceanbox-io
+      allowedRoutes:
+        namespaces:
+          from: Selector
+          selector:
+            matchLabels:
+              shared-gateway-access: "true"
+    - name: https-internal
+      protocol: HTTPS
+      port: 443
+      hostname: "*.adm.hel1.obx"
+      tls:
+        certificateRefs:
+          - group: ''
+            kind: Secret
+            name: wildcard-adm-hel1-obx
+      allowedRoutes:
+        namespaces:
+          from: Selector
+          selector:
+            matchLabels:
+              shared-gateway-access: "true"
     - name: ssh
       protocol: TCP
       port: 22
@@ -65,4 +95,28 @@ spec:
   issuerRef:
     name: letsencrypt-prod-dns01
     kind: ClusterIssuer
+---
+apiVersion: cert-manager.io/v1
+kind: Certificate
+metadata:
+  name: wildcard-hel1-oceanbox-io
+spec:
+  secretName: wildcard-hel1-oceanbox-io
+  dnsNames:
+    - "*.hel1.oceanbox.io"
+  issuerRef:
+    name: letsencrypt-prod-dns01
+    kind: ClusterIssuer
+---
+apiVersion: cert-manager.io/v1
+kind: Certificate
+metadata:
+  name: wildcard-adm-hel1-obx
+spec:
+  secretName: wildcard-adm-hel1-obx
+  dnsNames:
+    - "*.adm.hel1.obx"
+  issuerRef:
+    name: ca-issuer
+    kind: ClusterIssuer
 {{- end}}

values/docs/manifests/docs.yaml

@@ -28,6 +28,9 @@ spec:
       - name: HELMFILE_FILE_PATH
         value: docs.yaml.gotmpl
   syncPolicy:
+    managedNamespaceMetadata:
+      labels:
+        shared-gateway-access: "true"
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true

values/docs/manifests/gateway-routes.yaml

@@ -0,0 +1 @@
+{{- /* HTTPRoute and CiliumNetworkPolicy are managed by the docs chart template */ -}}

values/docs/values/values.yaml.gotmpl

@@ -0,0 +1,46 @@
+replicaCount: 1
+image:
+  tag: "e9fd3fc6-debug"
+env:
+  - name: APP_VERSION
+    value: "0.0.0"
+  - name: LOG_LEVEL
+    value: "1"
+{{- if .Values.clusterConfig.gatewayAPI.enabled }}
+ingress:
+  enabled: false
+  className: "nginx"
+httpRoute:
+  enabled: true
+  parentRefs:
+    - name: shared-gateway
+      namespace: kube-system
+      sectionName: https
+  hostnames:
+    - docs.oceanbox.io
+  rules:
+    - matches:
+        - path:
+            type: PathPrefix
+            value: "/"
+{{- else }}
+ingress:
+  enabled: true
+  className: "nginx"
+  annotations:
+    cert-manager.io/cluster-issuer: letsencrypt-production
+    nginx.ingress.kubernetes.io/backend-protocol: HTTP
+    nginx.ingress.kubernetes.io/enable-cors: "true"
+    nginx.ingress.kubernetes.io/proxy-buffer-size: 128k
+    nginx.ingress.kubernetes.io/ssl-redirect: "true"
+    oceanbox.io/expose: internal
+  hosts:
+    - host: docs.oceanbox.io
+      paths:
+        - path: /
+          pathType: ImplementationSpecific
+  tls:
+    - hosts:
+        - docs.oceanbox.io
+      secretName: docs-tls
+{{- end }}

values/drupal/manifests/ingress.yaml

@@ -1,32 +1,38 @@
-apiVersion: networking.k8s.io/v1
-kind: Ingress
+apiVersion: gateway.networking.k8s.io/v1
+kind: HTTPRoute
 metadata:
-  annotations:
-    cert-manager.io/cluster-issuer: letsencrypt-production
-    nginx.ingress.kubernetes.io/backend-protocol: HTTP
-    nginx.ingress.kubernetes.io/proxy-body-size: "0"
-    nginx.ingress.kubernetes.io/proxy-read-timeout: "600"
-    nginx.ingress.kubernetes.io/proxy-send-timeout: "600"
-    nginx.ingress.kubernetes.io/ssl-redirect: "true"
-    nginx.ingress.kubernetes.io/whitelist-source-range: 10.0.0.0/8,172.16.0.0/12,192.168.0.0/16,172.19.255.0/24,100.64.0.0/12
-  labels:
-    app.kubernetes.io/component: drupal
   name: drupal
   namespace: fornix
 spec:
-  ingressClassName: nginx
+  parentRefs:
+  - name: shared-gateway
+    namespace: kube-system
+    sectionName: https-hel1
+  hostnames:
+  - drupal.hel1.oceanbox.io
   rules:
-    - host: drupal.hel1.oceanbox.io
-      http:
-        paths:
-          - backend:
-              service:
-                name: drupal
-                port:
-                  number: 80
-            path: /
-            pathType: Prefix
-  tls:
-    - hosts:
-        - drupal.hel1.oceanbox.io
-      secretName: drupal-tls
+  - matches:
+    - path:
+        type: PathPrefix
+        value: "/"
+    backendRefs:
+    - name: drupal
+      port: 80
+---
+apiVersion: cilium.io/v2
+kind: CiliumNetworkPolicy
+metadata:
+  name: allow-gateway-to-drupal
+  namespace: fornix
+spec:
+  endpointSelector:
+    matchLabels:
+      app: drupal
+  ingress:
+  - fromCIDRSet:
+    {{- range .Values.clusterConfig.ingress_whitelist }}
+    - cidr: {{ . }}
+    {{- end }}
+  - fromEndpoints:
+    - matchLabels:
+        "k8s:io.kubernetes.pod.namespace": fornix

values/env-hel1.yaml

@@ -20,6 +20,8 @@ clusterConfig:
     patterns: []
     cidr: []
   nodes: []
+  gatewayAPI:
+    enabled: true
   ingress_whitelist:
     - 10.0.0.0/8
     - 172.16.0.0/12

values/env.yaml

@@ -20,6 +20,8 @@ clusterConfig:
     - 192.168.0.0/16
     - 172.19.255.0/24
     - 100.64.0.0/12 # tailnet
+  gatewayAPI:
+    enabled: false
   ingress_hostnetwork: false
   ingress_hostport: false
   ingress_nodeport: true

values/fornix/manifests/fornix.yaml

@@ -31,6 +31,9 @@ spec:
     targetRevision: main
     ref: values
   syncPolicy:
+    managedNamespaceMetadata:
+      labels:
+        shared-gateway-access: "true"
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true

values/fornix/manifests/gateway-routes.yaml

@@ -0,0 +1,38 @@
+apiVersion: gateway.networking.k8s.io/v1
+kind: HTTPRoute
+metadata:
+  name: fornix
+  namespace: fornix
+spec:
+  parentRefs:
+  - name: shared-gateway
+    namespace: kube-system
+    sectionName: https-hel1
+  hostnames:
+  - fornix.hel1.oceanbox.io
+  rules:
+  - matches:
+    - path:
+        type: PathPrefix
+        value: "/"
+    backendRefs:
+    - name: fornix
+      port: 8085
+---
+apiVersion: cilium.io/v2
+kind: CiliumNetworkPolicy
+metadata:
+  name: allow-gateway-to-fornix
+  namespace: fornix
+spec:
+  endpointSelector:
+    matchLabels:
+      app.kubernetes.io/name: fornix
+  ingress:
+  - fromCIDRSet:
+    {{- range .Values.clusterConfig.ingress_whitelist }}
+    - cidr: {{ . }}
+    {{- end }}
+  - fromEndpoints:
+    - matchLabels:
+        "k8s:io.kubernetes.pod.namespace": fornix

values/fornix/values/values.yaml

@@ -3,7 +3,7 @@ drupalUrl: http://drupal
 
 replicaCount: 1
 ingress:
-  enabled: true
+  enabled: false
   className: "nginx"
   annotations:
     cert-manager.io/cluster-issuer: letsencrypt-production

values/gatus/manifests/gatus.yaml

@@ -26,6 +26,7 @@ spec:
     managedNamespaceMetadata:
       labels:
         component: sys
+        shared-gateway-access: "true"
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true

values/gatus/manifests/ingress.yaml

@@ -1,8 +1,48 @@
+{{- if .Values.clusterConfig.gatewayAPI.enabled }}
+apiVersion: gateway.networking.k8s.io/v1
+kind: HTTPRoute
+metadata:
+  name: gatus
+  namespace: uptime
+spec:
+  parentRefs:
+  - name: shared-gateway
+    namespace: kube-system
+    sectionName: https-internal
+  hostnames:
+  - uptime.{{ .Values.clusterConfig.domain }}
+  rules:
+  - matches:
+    - path:
+        type: PathPrefix
+        value: "/"
+    backendRefs:
+    - name: gatus
+      port: 80
+---
+apiVersion: cilium.io/v2
+kind: CiliumNetworkPolicy
+metadata:
+  name: allow-gateway-to-gatus
+  namespace: uptime
+spec:
+  endpointSelector:
+    matchLabels:
+      app.kubernetes.io/name: gatus
+  ingress:
+  - fromCIDRSet:
+    {{- range .Values.clusterConfig.ingress_whitelist }}
+    - cidr: {{ . }}
+    {{- end }}
+  - fromEndpoints:
+    - matchLabels:
+        "k8s:io.kubernetes.pod.namespace": uptime
+{{- else }}
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   annotations:
-    cert-manager.io/cluster-issuer: ca-issuer
+    cert-manager.io/cluster-issuer: {{ .Values.clusterConfig.ingress_clusterissuer }}
     nginx.ingress.kubernetes.io/backend-protocol: HTTP
     nginx.ingress.kubernetes.io/cors-allow-headers: Content-Type, x-gatus-cache
     nginx.ingress.kubernetes.io/enable-cors: "true"
@@ -15,7 +55,7 @@ metadata:
 spec:
   ingressClassName: nginx
   rules:
-    - host: uptime.adm.hel1.obx
+    - host: uptime.{{ .Values.clusterConfig.domain }}
       http:
         paths:
           - backend:
@@ -27,5 +67,6 @@ spec:
             pathType: ImplementationSpecific
   tls:
     - hosts:
-        - uptime.adm.hel1.obx
+        - uptime.{{ .Values.clusterConfig.domain }}
       secretName: gatus-tls
+{{- end }}

values/gitea/manifests/gateway-routes.yaml

@@ -14,11 +14,36 @@ spec:
     - path:
         type: PathPrefix
         value: "/"
+    timeouts:
+      request: 600s
+      backendRequest: 600s
     backendRefs:
     - name: gitea-http
       port: 3000
 
 ---
+apiVersion: cilium.io/v2
+kind: CiliumNetworkPolicy
+metadata:
+  name: allow-gateway-to-gitea
+  namespace: gitea
+spec:
+  endpointSelector:
+    matchLabels:
+      app.kubernetes.io/name: gitea
+  ingress:
+  - fromCIDRSet:
+    - cidr: 10.0.0.0/8
+    - cidr: 172.16.0.0/12
+    - cidr: 192.168.0.0/16
+    - cidr: 172.19.255.0/24
+    - cidr: 100.64.0.0/12
+    - cidr: 185.125.160.4/32
+    - cidr: 37.27.203.38/32
+  - fromEndpoints:
+    - matchLabels:
+        "k8s:io.kubernetes.pod.namespace": gitea
+---
 apiVersion: gateway.networking.k8s.io/v1alpha2
 kind: TCPRoute
 metadata:

values/gitea/values/values.yaml

@@ -3,7 +3,7 @@ replicaCount: 1
 image:
   registry: "docker.gitea.com"
   repository: gitea
-  tag: "1.25.5"
+  tag: "1.25.4"
 
 resources:
   requests:

values/gitea/values/values.yaml.gotmpl

@@ -0,0 +1,8 @@
+{{- /* Gateway API: disable ingress when cilium gateway is enabled (HTTPRoute is in manifests/gateway-routes.yaml) */ -}}
+{{- if .Values.clusterConfig.gatewayAPI.enabled }}
+ingress:
+  enabled: false
+{{- else }}
+ingress:
+  enabled: true
+{{- end }}

values/keycloak/README.md

@@ -8,7 +8,6 @@ kubectl cp -n keycloak oceanbox-realm.json prod-keycloak-0:/tmp/backup/oceanbox-
 kubectl cp -n keycloak oceanbox-users-0.json prod-keycloak-0:/tmp/backup/oceanbox-users-0.json
 kc.sh -Djgroups.bind.port=7801 import --dir /tmp/backup
 ```
-
 ## Theme
 
-The keycloak theme is maintained at [git.oceanbox.io/platform/keycloak-theme](https://git.oceanbox.io/platform/keycloak-theme) and is deployed via an init container using the `git.oceanbox.io/platform/keycloak-theme` image.
+Our keycloak theme is inserted using the image provided [here](https://gitlab.com/oceanbox/keycloak-theme)

values/keycloak/manifests/keycloak.yaml

@@ -33,8 +33,10 @@ spec:
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
+      # - ServerSideApply=true
     {{- if .Values.keycloak.autosync }}
     automated:
       prune: true
+      # selfHeal: false
     {{- end }}
 {{- end }}

values/keycloak/values/values-prod.yaml

@@ -1,14 +1,26 @@
 replicaCount: 2
 
+# NOTE(mrtz): Hack for working with bitnami legacy registry
+global:
+  security:
+    allowInsecureImages: true
+image:
+    repository: bitnamilegacy/keycloak
+
+production: true
+
+proxy: edge
+
 auth:
   adminPassword: en to tre fire
+  adminUser: admin
   existingSecret: ""
   managementPassword: ""
+  managementUser: manager
 
 postgresql:
   enabled: false
 
-resourcesPreset: "none"
 resources:
   limits:
     cpu: 750m
@@ -36,7 +48,37 @@ extraVolumes:
   name: theme
 
 ingress:
+  annotations:
+    cert-manager.io/cluster-issuer: letsencrypt-production
+    nginx.ingress.kubernetes.io/enable-cors: "true"
+    nginx.ingress.kubernetes.io/backend-protocol: HTTP
+    nginx.ingress.kubernetes.io/proxy-buffer-size: 128k
+    nginx.ingress.kubernetes.io/ssl-redirect: "true"
+  enabled: true
   hostname: auth.oceanbox.io
+  ingressClassName: nginx
+  path: /
+  pathType: ImplementationSpecific
+  selfSigned: false
+  servicePort: http
+  tls: true
+
+adminIngress:
+  enabled: false
+  annotations:
+    cert-manager.io/cluster-issuer: letsencrypt-production
+    nginx.ingress.kubernetes.io/enable-cors: "true"
+    nginx.ingress.kubernetes.io/backend-protocol: HTTP
+    nginx.ingress.kubernetes.io/proxy-buffer-size: 128k
+    nginx.ingress.kubernetes.io/ssl-redirect: "true"
+    oceanbox.io/expose: internal
+  hostname: keycloak.adm.oceanbox.io
+  ingressClassName: nginx
+  path: /
+  pathType: ImplementationSpecific
+  selfSigned: false
+  servicePort: http
+  tls: true
 
 keycloakConfigCli:
   enabled: false
@@ -51,8 +93,8 @@ keycloakConfigCli:
 
 initContainers: |
   - name: keycloak-theme-provider
-    image: git.oceanbox.io/platform/keycloak-theme:latest
-    imagePullPolicy: IfNotPresent
+    image: docker.io/juselius/oceanbox-theme:1.2
+    imagePullPolicy: Always
     command:
       - sh
     args:

values/keycloak/values/values-staging.yaml

@@ -1,7 +1,22 @@
 replicaCount: 1
 
+# NOTE(mrtz): Hack for working with bitnami legacy registry
+global:
+  security:
+    allowInsecureImages: true
+image:
+    repository: bitnamilegacy/keycloak
+
+production: true
+
+proxy: edge
+
 auth:
   adminPassword: en to tre fire
+  adminUser: admin
+  existingSecret: ""
+  managementPassword: ""
+  managementUser: manager
 
 postgresql:
   enabled: true
@@ -9,5 +24,58 @@ postgresql:
     postgresPassword: "avatar mustiness economic"
     password: "punctured abstain facility"
 
+extraVolumeMounts:
+- mountPath: /opt/bitnami/keycloak/themes/oceanbox
+  name: theme
+
+extraVolumes:
+- emptyDir: {}
+  name: theme
+
 ingress:
+  annotations:
+    cert-manager.io/cluster-issuer: letsencrypt-production
+    nginx.ingress.kubernetes.io/enable-cors: "true"
+    nginx.ingress.kubernetes.io/backend-protocol: HTTP
+    nginx.ingress.kubernetes.io/proxy-buffer-size: 128k
+    nginx.ingress.kubernetes.io/ssl-redirect: "true"
+  enabled: true
   hostname: auth.srv.oceanbox.io
+  ingressClassName: nginx
+  path: /
+  pathType: ImplementationSpecific
+  selfSigned: false
+  servicePort: http
+  tls: true
+
+adminIngress:
+  enabled: false
+  annotations:
+    cert-manager.io/cluster-issuer: letsencrypt-production
+    nginx.ingress.kubernetes.io/enable-cors: "true"
+    nginx.ingress.kubernetes.io/backend-protocol: HTTP
+    nginx.ingress.kubernetes.io/proxy-buffer-size: 128k
+    nginx.ingress.kubernetes.io/ssl-redirect: "true"
+    oceanbox.io/expose: internal
+  hostname: auth.adm.oceanbox.io
+  ingressClassName: nginx
+  path: /
+  pathType: ImplementationSpecific
+  selfSigned: false
+  servicePort: http
+  tls: true
+
+initContainers: |
+  - name: keycloak-theme-provider
+    image: docker.io/juselius/oceanbox-theme:1.2
+    imagePullPolicy: Always
+    command:
+      - sh
+    args:
+      - -c
+      - |
+        echo "Copying theme..."
+        cp -R /theme/* /keycloak/themes/oceanbox
+    volumeMounts:
+      - name: theme
+        mountPath: /keycloak/themes/oceanbox

values/keycloak/values/values.yaml

@@ -1,29 +0,0 @@
-# NOTE(mrtz): Hack for working with bitnami legacy registry
-global:
-  security:
-    allowInsecureImages: true
-image:
-    repository: bitnamilegacy/keycloak
-
-production: true
-
-proxyHeaders: xforwarded
-
-auth:
-  adminUser: admin
-  managementUser: manager
-
-ingress:
-  annotations:
-    cert-manager.io/cluster-issuer: letsencrypt-production
-    nginx.ingress.kubernetes.io/enable-cors: "true"
-    nginx.ingress.kubernetes.io/backend-protocol: HTTP
-    nginx.ingress.kubernetes.io/proxy-buffer-size: 128k
-    nginx.ingress.kubernetes.io/ssl-redirect: "true"
-  enabled: true
-  ingressClassName: nginx
-  path: /
-  pathType: ImplementationSpecific
-  selfSigned: false
-  servicePort: http
-  tls: true

values/makai/manifests/gateway-routes.yaml

@@ -0,0 +1 @@
+{{- /* HTTPRoute and CiliumNetworkPolicy are managed by the makai chart template */ -}}

values/makai/manifests/makai.yaml

@@ -28,6 +28,9 @@ spec:
       - name: HELMFILE_FILE_PATH
         value: makai.yaml.gotmpl
   syncPolicy:
+    managedNamespaceMetadata:
+      labels:
+        shared-gateway-access: "true"
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true

values/makai/values/values.yaml.gotmpl

@@ -0,0 +1,46 @@
+replicaCount: 1
+image:
+  tag: "d5e61949-debug"
+env:
+  - name: APP_VERSION
+    value: "0.0.0"
+  - name: LOG_LEVEL
+    value: "1"
+{{- if .Values.clusterConfig.gatewayAPI.enabled }}
+ingress:
+  enabled: false
+  className: "nginx"
+httpRoute:
+  enabled: true
+  parentRefs:
+    - name: shared-gateway
+      namespace: kube-system
+      sectionName: https
+  hostnames:
+    - makai.oceanbox.io
+  rules:
+    - matches:
+        - path:
+            type: PathPrefix
+            value: "/"
+{{- else }}
+ingress:
+  enabled: true
+  className: "nginx"
+  annotations:
+    cert-manager.io/cluster-issuer: letsencrypt-production
+    nginx.ingress.kubernetes.io/backend-protocol: HTTP
+    nginx.ingress.kubernetes.io/enable-cors: "true"
+    nginx.ingress.kubernetes.io/proxy-buffer-size: 128k
+    nginx.ingress.kubernetes.io/ssl-redirect: "true"
+    oceanbox.io/expose: internal
+  hosts:
+    - host: makai.oceanbox.io
+      paths:
+        - path: /
+          pathType: ImplementationSpecific
+  tls:
+    - hosts:
+        - makai.oceanbox.io
+      secretName: makai-tls
+{{- end }}

values/prometheus/manifests/httproutes.yaml

@@ -0,0 +1,118 @@
+{{- if .Values.clusterConfig.gatewayAPI.enabled }}
+apiVersion: gateway.networking.k8s.io/v1
+kind: HTTPRoute
+metadata:
+  name: grafana
+  namespace: prometheus
+spec:
+  parentRefs:
+  - name: shared-gateway
+    namespace: kube-system
+    sectionName: https-internal
+  hostnames:
+  - grafana.{{ .Values.clusterConfig.domain }}
+  rules:
+  - matches:
+    - path:
+        type: PathPrefix
+        value: "/"
+    backendRefs:
+    - name: prometheus-grafana
+      port: 80
+---
+apiVersion: gateway.networking.k8s.io/v1
+kind: HTTPRoute
+metadata:
+  name: alertmanager
+  namespace: prometheus
+spec:
+  parentRefs:
+  - name: shared-gateway
+    namespace: kube-system
+    sectionName: https-internal
+  hostnames:
+  - alertmanager.{{ .Values.clusterConfig.domain }}
+  rules:
+  - matches:
+    - path:
+        type: PathPrefix
+        value: "/"
+    backendRefs:
+    - name: prometheus-kube-prometheus-alertmanager
+      port: 9093
+---
+apiVersion: gateway.networking.k8s.io/v1
+kind: HTTPRoute
+metadata:
+  name: prometheus
+  namespace: prometheus
+spec:
+  parentRefs:
+  - name: shared-gateway
+    namespace: kube-system
+    sectionName: https-internal
+  hostnames:
+  - prometheus.{{ .Values.clusterConfig.domain }}
+  rules:
+  - matches:
+    - path:
+        type: PathPrefix
+        value: "/"
+    backendRefs:
+    - name: prometheus-kube-prometheus-prometheus
+      port: 9090
+---
+apiVersion: cilium.io/v2
+kind: CiliumNetworkPolicy
+metadata:
+  name: allow-gateway-to-grafana
+  namespace: prometheus
+spec:
+  endpointSelector:
+    matchLabels:
+      app.kubernetes.io/name: grafana
+  ingress:
+  - fromCIDRSet:
+    {{- range .Values.clusterConfig.ingress_whitelist }}
+    - cidr: {{ . }}
+    {{- end }}
+  - fromEndpoints:
+    - matchLabels:
+        "k8s:io.kubernetes.pod.namespace": prometheus
+---
+apiVersion: cilium.io/v2
+kind: CiliumNetworkPolicy
+metadata:
+  name: allow-gateway-to-alertmanager
+  namespace: prometheus
+spec:
+  endpointSelector:
+    matchLabels:
+      app.kubernetes.io/name: alertmanager
+  ingress:
+  - fromCIDRSet:
+    {{- range .Values.clusterConfig.ingress_whitelist }}
+    - cidr: {{ . }}
+    {{- end }}
+  - fromEndpoints:
+    - matchLabels:
+        "k8s:io.kubernetes.pod.namespace": prometheus
+---
+apiVersion: cilium.io/v2
+kind: CiliumNetworkPolicy
+metadata:
+  name: allow-gateway-to-prometheus
+  namespace: prometheus
+spec:
+  endpointSelector:
+    matchLabels:
+      app.kubernetes.io/name: prometheus
+  ingress:
+  - fromCIDRSet:
+    {{- range .Values.clusterConfig.ingress_whitelist }}
+    - cidr: {{ . }}
+    {{- end }}
+  - fromEndpoints:
+    - matchLabels:
+        "k8s:io.kubernetes.pod.namespace": prometheus
+{{- end }}

values/prometheus/manifests/prometheus.yaml

@@ -26,6 +26,7 @@ spec:
     managedNamespaceMetadata:
       labels:
         component: sys
+        shared-gateway-access: "true"
     syncOptions:
     - ServerSideApply=true
     - CreateNamespace=true

values/prometheus/values/prometheus.yaml.gotmpl

@@ -67,6 +67,9 @@ alertmanager:
   storage: {}
 
   ingress:
+    {{- if .Values.clusterConfig.gatewayAPI.enabled }}
+    enabled: false
+    {{- else }}
     enabled: true
     ingressClassName: nginx
     annotations:
@@ -84,6 +87,7 @@ alertmanager:
     - secretName: alertmanager-general-tls
       hosts:
       - alertmanager.{{ .Values.clusterConfig.domain }}
+    {{- end }}
 
   ingressPerReplica:
     pathType: ImplementationSpecific
@@ -170,6 +174,9 @@ grafana:
     size: 10Gi
   {{- end }}
   ingress:
+    {{- if .Values.clusterConfig.gatewayAPI.enabled }}
+    enabled: false
+    {{- else }}
     enabled: true
     ingressClassName: nginx
     annotations:
@@ -188,6 +195,7 @@ grafana:
     - secretName: grafana-general-tls
       hosts:
         - grafana.{{ .Values.clusterConfig.domain }}
+    {{- end }}
   sidecar:
     dashboards:
       enabled: true
@@ -458,6 +466,9 @@ prometheus:
     {{- end }}
 
   ingress:
+    {{- if .Values.clusterConfig.gatewayAPI.enabled }}
+    enabled: false
+    {{- else }}
     enabled: true
     ingressClassName: nginx
     annotations:
@@ -478,6 +489,7 @@ prometheus:
       - secretName: prometheus-general-tls
         hosts:
           - prometheus.{{ .Values.clusterConfig.domain }}
+    {{- end }}
 
   ingressPerReplica:
     enabled: false

values/system/hel1/hubble-ui-ingress.yaml

@@ -1,50 +1,41 @@
-apiVersion: networking.k8s.io/v1
-kind: Ingress
+# oauth2-proxy must be configured with --upstream=http://hubble-ui:80
+# so that it proxies authenticated requests to hubble-ui.
+apiVersion: gateway.networking.k8s.io/v1
+kind: HTTPRoute
 metadata:
-  annotations:
-    nginx.ingress.kubernetes.io/auth-signin: https://$host/oauth2/start?rd=$escaped_request_uri
-    nginx.ingress.kubernetes.io/auth-url: https://$host/oauth2/auth
-    oceanbox.io/expose: internal
   name: hubble-ui
   namespace: kube-system
 spec:
-  ingressClassName: nginx
+  parentRefs:
+  - name: shared-gateway
+    namespace: kube-system
+    sectionName: https-hel1
+  hostnames:
+  - hubble.hel1.oceanbox.io
   rules:
-    - host: hubble.hel1.oceanbox.io
-      http:
-        paths:
-          - backend:
-              service:
-                name: hubble-ui
-                port:
-                  number: 80
-            path: /
-            pathType: Prefix
+  - matches:
+    - path:
+        type: PathPrefix
+        value: "/"
+    backendRefs:
+    - name: oauth2-proxy
+      port: 80
 ---
-apiVersion: networking.k8s.io/v1
-kind: Ingress
+apiVersion: cilium.io/v2
+kind: CiliumNetworkPolicy
 metadata:
-  annotations:
-    cert-manager.io/cluster-issuer: letsencrypt-production
-    nginx.ingress.kubernetes.io/proxy-buffer-size: 8k
-    nginx.ingress.kubernetes.io/proxy-busy-buffers-size: 16k
-    oceanbox.io/expose: internal
-  name: hubble-ui-oauth2-proxy
+  name: allow-gateway-to-hubble-ui
   namespace: kube-system
 spec:
-  ingressClassName: nginx
-  rules:
-    - host: hubble.hel1.oceanbox.io
-      http:
-        paths:
-          - backend:
-              service:
-                name: oauth2-proxy
-                port:
-                  name: http
-            path: /oauth2
-            pathType: Prefix
-  tls:
-    - hosts:
-        - hubble.hel1.oceanbox.io
-      secretName: hubble-tls
+  endpointSelector:
+    matchLabels:
+      app.kubernetes.io/name: oauth2-proxy
+  ingress:
+  - fromCIDRSet:
+    - cidr: 10.0.0.0/8
+    - cidr: 172.16.0.0/12
+    - cidr: 192.168.0.0/16
+    - cidr: 100.64.0.0/12
+  - fromEndpoints:
+    - matchLabels:
+        "k8s:io.kubernetes.pod.namespace": kube-system

values/system/hel1/kube-system-labels.yaml

@@ -0,0 +1,6 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: kube-system
+  labels:
+    shared-gateway-access: "true"

values/system/hel1/network/allow-microsoft-oidc-login.yaml

@@ -9,5 +9,4 @@ spec:
   - toFQDNs:
     - matchName: login.microsoftonline.com
     - matchPattern: '*.microsoftonline.com'
-    - matchName: graph.microsoft.com
 {{- end }}

values/system/oceanbox/network/allow-microsoft-oidc-login.yaml

@@ -9,5 +9,4 @@ spec:
   - toFQDNs:
     - matchName: login.microsoftonline.com
     - matchPattern: '*.microsoftonline.com'
-    - matchName: graph.microsoft.com
 {{- end }}