12.diff (7849B)
1 diff --git a/apps/base/postgres-operator/release.yaml b/apps/base/postgres-operator/release.yaml 2 index dd703db3..d14176b7 100644 3 --- a/apps/base/postgres-operator/release.yaml 4 +++ b/apps/base/postgres-operator/release.yaml 5 @@ -22,28 +22,28 @@ spec: 6 image: 7 registry: ghcr.io 8 repository: zalando/postgres-operator 9 -# --- 10 -# apiVersion: helm.toolkit.fluxcd.io/v2beta2 11 -# kind: HelmRelease 12 -# metadata: 13 -# name: postgres-operator-ui 14 -# namespace: postgres-operator 15 -# spec: 16 -# releaseName: postgres-operator-ui 17 -# chart: 18 -# spec: 19 -# chart: postgres-operator-ui 20 -# sourceRef: 21 -# kind: HelmRepository 22 -# name: postgres-operator-ui 23 -# interval: 50m 24 -# install: 25 -# remediation: 26 -# retries: 3 27 -# crds: Create 28 -# upgrade: 29 -# crds: CreateReplace 30 -# values: 31 -# image: 32 -# registry: ghcr.io 33 -# repository: zalando/postgres-operator-ui 34 + # --- 35 + # apiVersion: helm.toolkit.fluxcd.io/v2beta2 36 + # kind: HelmRelease 37 + # metadata: 38 + # name: postgres-operator-ui 39 + # namespace: postgres-operator 40 + # spec: 41 + # releaseName: postgres-operator-ui 42 + # chart: 43 + # spec: 44 + # chart: postgres-operator-ui 45 + # sourceRef: 46 + # kind: HelmRepository 47 + # name: postgres-operator-ui 48 + # interval: 50m 49 + # install: 50 + # remediation: 51 + # retries: 3 52 + # crds: Create 53 + # upgrade: 54 + # crds: CreateReplace 55 + # values: 56 + # image: 57 + # registry: ghcr.io 58 + # repository: zalando/postgres-operator-ui 59 diff --git a/apps/base/postgres-operator/repository.yaml b/apps/base/postgres-operator/repository.yaml 60 index 94e1bcec..db5ad763 100644 61 --- a/apps/base/postgres-operator/repository.yaml 62 +++ b/apps/base/postgres-operator/repository.yaml 63 @@ -6,12 +6,12 @@ metadata: 64 spec: 65 interval: 5m 66 url: https://opensource.zalando.com/postgres-operator/charts/postgres-operator 67 -# --- 68 -# apiVersion: source.toolkit.fluxcd.io/v1beta2 69 -# kind: HelmRepository 70 -# metadata: 71 -# name: postgres-operator-ui 72 -# namespace: postgres-operator 73 -# spec: 74 -# interval: 5m 75 -# url: https://opensource.zalando.com/postgres-operator/charts/postgres-operator-ui 76 + # --- 77 + # apiVersion: source.toolkit.fluxcd.io/v1beta2 78 + # kind: HelmRepository 79 + # metadata: 80 + # name: postgres-operator-ui 81 + # namespace: postgres-operator 82 + # spec: 83 + # interval: 5m 84 + # url: https://opensource.zalando.com/postgres-operator/charts/postgres-operator-ui 85 diff --git a/apps/base/traefik/release.yaml b/apps/base/traefik/release.yaml 86 index 1705b12d..ad91498a 100644 87 --- a/apps/base/traefik/release.yaml 88 +++ b/apps/base/traefik/release.yaml 89 @@ -156,33 +156,33 @@ spec: 90 kubernetesIngress: 91 publishedService: 92 enabled: true 93 -# --- 94 -# # NodePort Ingress for traefik ports 80 and 443 with http3 support 95 -# kind: Service 96 -# apiVersion: v1 97 -# metadata: 98 -# name: traefik-ingress-nodeport 99 -# namespace: traefik-ingress 100 -# spec: 101 -# type: NodePort 102 -# externalTrafficPolicy: Local 103 -# internalTrafficPolicy: Local 104 -# selector: 105 -# app.kubernetes.io/name: traefik 106 -# app.kubernetes.io/instance: traefik 107 -# ports: 108 -# - protocol: TCP 109 -# port: 980 110 -# targetPort: web 111 -# nodePort: 80 112 -# name: http 113 -# - protocol: TCP 114 -# port: 9443 115 -# targetPort: websecure 116 -# nodePort: 443 117 -# name: https 118 -# - protocol: UDP 119 -# port: 8443 120 -# targetPort: websecure 121 -# nodePort: 8443 122 -# name: http3 123 + # --- 124 + # # NodePort Ingress for traefik ports 80 and 443 with http3 support 125 + # kind: Service 126 + # apiVersion: v1 127 + # metadata: 128 + # name: traefik-ingress-nodeport 129 + # namespace: traefik-ingress 130 + # spec: 131 + # type: NodePort 132 + # externalTrafficPolicy: Local 133 + # internalTrafficPolicy: Local 134 + # selector: 135 + # app.kubernetes.io/name: traefik 136 + # app.kubernetes.io/instance: traefik 137 + # ports: 138 + # - protocol: TCP 139 + # port: 980 140 + # targetPort: web 141 + # nodePort: 80 142 + # name: http 143 + # - protocol: TCP 144 + # port: 9443 145 + # targetPort: websecure 146 + # nodePort: 443 147 + # name: https 148 + # - protocol: UDP 149 + # port: 8443 150 + # targetPort: websecure 151 + # nodePort: 8443 152 + # name: http3 153 diff --git a/apps/talos_cluster/draupnir4all/service.yaml b/apps/talos_cluster/draupnir4all/service.yaml 154 index 99f5b54d..93493463 100644 155 --- a/apps/talos_cluster/draupnir4all/service.yaml 156 +++ b/apps/talos_cluster/draupnir4all/service.yaml 157 @@ -21,19 +21,19 @@ spec: 158 targetPort: web 159 protocol: TCP 160 name: web 161 -# --- 162 -# apiVersion: gateway.networking.k8s.io/v1 163 -# kind: HTTPRoute 164 -# metadata: 165 -# name: draupnir4all-web 166 -# namespace: matrix 167 -# spec: 168 -# parentRefs: 169 -# - name: envoy-gateway 170 -# namespace: envoy-gateway 171 -# hostnames: 172 -# - draupnir.midnightthoughts.space 173 -# rules: 174 -# - backendRefs: 175 -# - name: draupnir4all 176 -# port: 3000 177 + # --- 178 + # apiVersion: gateway.networking.k8s.io/v1 179 + # kind: HTTPRoute 180 + # metadata: 181 + # name: draupnir4all-web 182 + # namespace: matrix 183 + # spec: 184 + # parentRefs: 185 + # - name: envoy-gateway 186 + # namespace: envoy-gateway 187 + # hostnames: 188 + # - draupnir.midnightthoughts.space 189 + # rules: 190 + # - backendRefs: 191 + # - name: draupnir4all 192 + # port: 3000 193 diff --git a/infrastructure/configs/flux-grafana.yaml b/infrastructure/configs/flux-grafana.yaml 194 index 8a39b4e5..4c525f4e 100644 195 --- a/infrastructure/configs/flux-grafana.yaml 196 +++ b/infrastructure/configs/flux-grafana.yaml 197 @@ -11,14 +11,14 @@ spec: 198 - kind: GitRepository 199 name: "*" 200 namespace: flux-system 201 -#--- 202 -#apiVersion: notification.toolkit.fluxcd.io/v1beta2 203 -#kind: Provider 204 -#metadata: 205 -# name: grafana 206 -# namespace: monitoring 207 -#spec: 208 -# type: grafana 209 -# address: "http://kube-prometheus-grafana.monitoring/api/annotations" 210 -# secretRef: 211 -# name: grafana-auth 212 + #--- 213 + #apiVersion: notification.toolkit.fluxcd.io/v1beta2 214 + #kind: Provider 215 + #metadata: 216 + # name: grafana 217 + # namespace: monitoring 218 + #spec: 219 + # type: grafana 220 + # address: "http://kube-prometheus-grafana.monitoring/api/annotations" 221 + # secretRef: 222 + # name: grafana-auth