consistency extras to extra/

2025-04-27 20:22:17 -04:00 · 2025-04-27 20:22:17 -04:00 · 08bccadc21
commit 08bccadc21
parent 779bfe169b
22 changed files with 30 additions and 224 deletions
--- a/namespaces/cert-manager/cert-manager/extras/cloudflare-token.yaml
+++ b/namespaces/cert-manager/cert-manager/extras/cloudflare-token.yaml
--- a/namespaces/cert-manager/cert-manager/kustomization.yaml
+++ b/namespaces/cert-manager/cert-manager/kustomization.yaml
@ -13,7 +13,7 @@ transformers:
 namePrefix: cert-manager-
 resources:
  - ../../../kustomize/bases/helmchart-noaddons
-  - extras/cloudflare-token.yaml
+  - extra/cloudflare-token.yaml

 patches:
  - path: patches/chart.yaml
--- a/namespaces/core/minio/extras/server-route.yaml
+++ b/namespaces/core/minio/extras/server-route.yaml
--- a/namespaces/core/minio/extras/server-svc.yaml
+++ b/namespaces/core/minio/extras/server-svc.yaml
--- a/namespaces/core/minio/kustomization.yaml
+++ b/namespaces/core/minio/kustomization.yaml
@ -13,8 +13,8 @@ transformers:
 namePrefix: minio-
 resources:
  - ../../../kustomize/bases/deployment/
-  - extras/server-svc.yaml
-  - extras/server-route.yaml
+  - extra/server-svc.yaml
+  - extra/server-route.yaml

 labels:
  - includeSelectors: true
--- a/namespaces/core/postgres/extras/tcproute.yaml
+++ b/namespaces/core/postgres/extras/tcproute.yaml
--- a/namespaces/core/postgres/kustomization.yaml
+++ b/namespaces/core/postgres/kustomization.yaml
@ -13,7 +13,7 @@ transformers:
 namePrefix: postgres-
 resources:
  - ../../../kustomize/bases/statefulset/
-  - extras/tcproute.yaml
+  - extra/tcproute.yaml

 labels:
  - includeSelectors: true
--- a/namespaces/longhorn/longhorn/extras/longhorn-backupjob.yaml
+++ b/namespaces/longhorn/longhorn/extras/longhorn-backupjob.yaml
--- a/namespaces/longhorn/longhorn/extras/longhorn-private-storageclass.yaml
+++ b/namespaces/longhorn/longhorn/extras/longhorn-private-storageclass.yaml
--- a/namespaces/longhorn/longhorn/extras/longhorn-public-storageclass.yaml
+++ b/namespaces/longhorn/longhorn/extras/longhorn-public-storageclass.yaml
--- a/namespaces/longhorn/longhorn/extras/longhorn-secret.yaml
+++ b/namespaces/longhorn/longhorn/extras/longhorn-secret.yaml
--- a/namespaces/longhorn/longhorn/kustomization.yaml
+++ b/namespaces/longhorn/longhorn/kustomization.yaml
@ -13,10 +13,10 @@ transformers:
 namePrefix: longhorn-
 resources:
  - ../../../kustomize/bases/helmchart
-  - extras/longhorn-public-storageclass.yaml
-  - extras/longhorn-private-storageclass.yaml
-  - extras/longhorn-secret.yaml
-  - extras/longhorn-backupjob.yaml
+  - extra/longhorn-public-storageclass.yaml
+  - extra/longhorn-private-storageclass.yaml
+  - extra/longhorn-secret.yaml
+  - extra/longhorn-backupjob.yaml

 patches:
  - path: patches/chart.yaml
--- a/namespaces/monitoring/gatus/base-config.yaml
+++ b/namespaces/monitoring/gatus/base-config.yaml
@ -1,24 +1,13 @@
-metrics: true
-ui:
+config.yaml: |
+  metrics: true
+  ui:
    title: "JLP Homelab Health | Gatus"
-skip-invalid-config-update: true
+  skip-invalid-config-update: true

 endpoints:
-  - name: website
-    url: https://twin.sh/health
-    interval: 5m
-    conditions:
-      - "[STATUS] == 200"
-      - "[BODY].status == UP"
-
-  - name: github
-    url: https://api.github.com/healthz
-    interval: 5m
-    conditions:
-      - "[STATUS] == 200"
-
-  - name: self
-    url: http://localhost:8080/health
+  - name: Gatus
+    url: http://gatus-svc.monitoring.svc.cluster.local:8080/health
+    group: Internal/Monitoring
    interval: 5m
    conditions:
      - "[STATUS] == 200"
--- a/namespaces/monitoring/gatus/extras/sidecar-crb.yaml
+++ b/namespaces/monitoring/gatus/extras/sidecar-crb.yaml
--- a/namespaces/monitoring/gatus/extras/sidecar-serviceAccount.yaml
+++ b/namespaces/monitoring/gatus/extras/sidecar-serviceAccount.yaml
--- a/namespaces/monitoring/gatus/kustomization.yaml
+++ b/namespaces/monitoring/gatus/kustomization.yaml
@ -13,8 +13,8 @@ transformers:
 namePrefix: gatus-
 resources:
  - ../../../kustomize/bases/deployment/
-  - extras/sidecar-crb.yaml
-  - extras/sidecar-serviceAccount.yaml
+  - extra/sidecar-crb.yaml
+  - extra/sidecar-serviceAccount.yaml

 patches:
  - path: patches/deployment.yaml
@ -36,10 +36,7 @@ labels:
      app.kubernetes.io/routePrefix: status

 configMapGenerator:
-  - name: gatus-config
-    files:
-      - base-config.yaml
-  - name: gatus-settings
+  - name: settings
    literals:
      - GATUS_CONFIG_PATH=/config
  - name: k8s-sidecar-settings
@ -49,6 +46,10 @@ configMapGenerator:
      - FOLDER="/config"
      - METHOD="SLEEP"
      - SLEEP_TIME=60
+      - NAMESPACE="auth,monitoring,apps,core,longhorn"
+  - name: base-config
+    files:
+      - base-config.yaml

 replacements:
  # Service
--- a/namespaces/monitoring/gatus/patches/deployment.yaml
+++ b/namespaces/monitoring/gatus/patches/deployment.yaml
@ -32,7 +32,7 @@ spec:
          resources:
            limits:
              cpu: 250m
-              memory: 100M
+              memory: 500M
            requests:
              cpu: 50m
              memory: 30M
@ -59,17 +59,22 @@ spec:
            - mountPath: /config/config.yaml
              name: gatus-config
              subPath: base-config.yaml
+            - name: collected
+              mountPath: /config/
        - name: config-collector
          image: kiwigrid/k8s-sidecar:1.30.3
          volumeMounts:
            - name: collected
              mountPath: /config/
+            - mountPath: /config/config.yaml
+              name: gatus-config
+              subPath: base-config.yaml
          envFrom:
            - configMapRef:
                name: k8s-sidecar-settings
      volumes:
        - configMap:
-            name: gatus-config
+            name: base-config
          name: gatus-config
        - name: collected
          emptyDir: {}
--- a/namespaces/monitoring/uptime-kuma/extra/middleware-auth.yaml
+++ b/namespaces/monitoring/uptime-kuma/extra/middleware-auth.yaml
@ -1,25 +0,0 @@
-apiVersion: traefik.io/v1alpha1
-kind: Middleware
-metadata:
-  name: authentik-forward-auth
-  namespace: monitoring # adjust as needed
-spec:
-  forwardAuth:
-    address: http://ak-outpost-authentik-embedded-outpost.auth.svc.cluster.local:9000/outpost.goauthentik.io/auth/traefik
-    trustForwardHeader: true
-    authResponseHeaders:
-      - X-Authentik-Username
-      - X-Authentik-Groups
-      - X-Authentik-Email
-    authRequestHeaders:
-      - Accept
-      - Cookie
-      - Host
-      - X-Forwarded-For
-      - X-Forwarded-Host
-      - X-Forwarded-Proto
-      - X-Forwarded-Uri
-      - X-Forwarded-Port
-      - X-Forwarded-Method
-    # Add these to handle redirect
-    authResponseHeadersRegex: "X-.*"
--- a/namespaces/monitoring/uptime-kuma/kustomization.yaml
+++ b/namespaces/monitoring/uptime-kuma/kustomization.yaml
@ -1,96 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-
-transformers:
-  - |-
-    apiVersion: builtin
-    kind: NamespaceTransformer
-    metadata:
-      name: notImportantHere
-      namespace: monitoring
-    unsetOnly: true
-
-namePrefix: uptime-kuma-
-resources:
-  - ../../../kustomize/bases/deployment/
-  # - extra/middleware-auth.yaml
-
-replacements:
-  - source:
-      kind: Service
-      name: svc
-    targets:
-      - select:
-          kind: HTTPRoute
-        options:
-          create: true
-        fieldPaths:
-          - spec.rules.0.backendRefs.0.name
-  - source:
-      kind: Deployment
-      name: app
-      fieldPath: metadata.labels.[app.kubernetes.io/appName]
-    targets:
-      - select:
-          kind: InfisicalSecret
-        options:
-          delimiter: "-"
-          index: 0
-        fieldPaths:
-          - spec.managedSecretReference.secretName
-      - select:
-          kind: InfisicalSecret
-        options:
-          delimiter: "/"
-          index: 2
-        fieldPaths:
-          - spec.authentication.universalAuth.secretsScope.secretsPath
-      - select:
-          kind: Service
-        fieldPaths:
-          - spec.ports.0.name
-          - spec.ports.0.targetPort
-  - source:
-      kind: Deployment
-      name: app
-      fieldPath: metadata.labels.[app.kubernetes.io/appNamespace]
-    targets:
-      - select:
-          kind: InfisicalSecret
-        fieldPaths:
-          - spec.managedSecretReference.secretNamespace
-  - source:
-      kind: Deployment
-      name: app
-      fieldPath: metadata.labels.[app.kubernetes.io/routePrefix]
-    targets:
-      - select:
-          kind: HTTPRoute
-        options:
-          create: true
-          delimiter: "."
-          index: 0
-        fieldPaths:
-          - spec.hostnames.0
-
-patches:
-  - path: patches/deployment.yaml
-    target:
-      kind: Deployment
-      name: app
-  - path: patches/httproute.yaml
-    target:
-      kind: HTTPRoute
-  - path: patches/pvc.yaml
-    target:
-      kind: PersistentVolumeClaim
-      name: pvc
-
-labels:
-  - includeSelectors: true
-    pairs:
-      app.kubernetes.io/appName: uptime-kuma
-  - pairs:
-      app.kubernetes.io/appNamespace: monitoring
-  - pairs:
-      app.kubernetes.io/routePrefix: status
--- a/namespaces/monitoring/uptime-kuma/patches/deployment.yaml
+++ b/namespaces/monitoring/uptime-kuma/patches/deployment.yaml
@ -1,48 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: app
-spec:
-  template:
-    spec:
-      tolerations:
-        - key: "public"
-          operator: "Equal"
-          value: "true"
-          effect: "NoSchedule"
-      affinity:
-        nodeAffinity:
-          preferredDuringSchedulingIgnoredDuringExecution:
-            - weight: 100
-              preference:
-                matchExpressions:
-                  - key: public
-                    operator: In
-                    values:
-                      - "true"
-      containers:
-        - name: uptime-kuma
-          image: louislam/uptime-kuma:1
-          imagePullPolicy: IfNotPresent
-          ports:
-            - containerPort: 3001
-              name: uptime-kuma
-          livenessProbe:
-            tcpSocket:
-              port: uptime-kuma
-            initialDelaySeconds: 60
-            periodSeconds: 10
-          readinessProbe:
-            httpGet:
-              scheme: HTTP
-              path: /
-              port: uptime-kuma
-            initialDelaySeconds: 30
-            periodSeconds: 10
-          volumeMounts:
-            - name: data
-              mountPath: /app/data
-      volumes:
-        - name: data
-          persistentVolumeClaim:
-            claimName: uptime-kuma-pvc
--- a/namespaces/monitoring/uptime-kuma/patches/httproute.yaml
+++ b/namespaces/monitoring/uptime-kuma/patches/httproute.yaml
@ -1,14 +0,0 @@
-apiVersion: gateway.networking.k8s.io/v1
-kind: HTTPRoute
-metadata:
-  name: http
-# spec:
-#   rules:
-#     - backendRefs:
-#         - port: 80
-#       filters:
-#         - type: ExtensionRef
-#           extensionRef:
-#             group: traefik.io
-#             kind: Middleware
-#             name: authentik-forward-auth
--- a/namespaces/monitoring/uptime-kuma/patches/pvc.yaml
+++ b/namespaces/monitoring/uptime-kuma/patches/pvc.yaml
@ -1,6 +0,0 @@
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: pvc
-spec:
-  storageClassName: longhorn-public