Move apps to scaleway

Signed-off-by: Marcus Noble <github@marcusnoble.co.uk>

manifests/_apps/base64.yaml

@@ -9,7 +9,7 @@ spec:
   project: cluster.fun
   destination:
     namespace: base64
-    name: civo
+    name: cluster-fun (v2)
   source:
     path: manifests/base64
     repoURL: "https://git.cluster.fun/AverageMarcus/cluster.fun.git"

manifests/_apps/bsky-screenshot.yaml

@@ -1,25 +1,24 @@
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  name: cluster-fun-matrix
+  name: bsky-screenshot
   namespace: argocd
   finalizers:
   - resources-finalizer.argocd.argoproj.io
 spec:
   project: cluster.fun
   destination:
-    namespace: chat
+    namespace: bsky-screenshot
     name: cluster-fun (v2)
   source:
-    path: manifests/matrix_chart
+    path: manifests/bsky-screenshot
     repoURL: "https://git.cluster.fun/AverageMarcus/cluster.fun.git"
     targetRevision: HEAD
   syncPolicy:
+    automated: {}
     syncOptions:
       - CreateNamespace=true
-    automated: {}
   ignoreDifferences:
   - kind: Secret
     jsonPointers:
     - /data
----

manifests/_apps/cel-tester.yaml

@@ -9,7 +9,7 @@ spec:
   project: cluster.fun
   destination:
     namespace: cel-tester
-    name: civo
+    name: cluster-fun (v2)
   source:
     path: manifests/cel-tester
     repoURL: "https://git.cluster.fun/AverageMarcus/cluster.fun.git"

manifests/_apps/civo-versions.yaml

@@ -9,7 +9,7 @@ spec:
   project: cluster.fun
   destination:
     namespace: civo-versions
-    name: civo
+    name: cluster-fun (v2)
   source:
     path: manifests/civo-versions
     repoURL: "https://git.cluster.fun/AverageMarcus/cluster.fun.git"

manifests/_apps/cors-proxy.yaml

@@ -1,17 +1,17 @@
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  name: cluster-fun-twitter-profile-pic
+  name: cors-proxy
   namespace: argocd
   finalizers:
   - resources-finalizer.argocd.argoproj.io
 spec:
   project: cluster.fun
   destination:
-    namespace: twitter-profile-pic
+    namespace: cors-proxy
     name: cluster-fun (v2)
   source:
-    path: manifests/twitter-profile-pic
+    path: manifests/cors-proxy
     repoURL: "https://git.cluster.fun/AverageMarcus/cluster.fun.git"
     targetRevision: HEAD
   syncPolicy:
@@ -22,5 +22,8 @@ spec:
   - kind: Secret
     jsonPointers:
     - /data
-
+  - group: apps
+    kind: Deployment
+    jqPathExpressions:
+    - .spec.template.spec.containers[]?.image
 ---

manifests/_apps/cv.yaml

@@ -9,7 +9,7 @@ spec:
   project: cluster.fun
   destination:
     namespace: cv
-    name: civo
+    name: cluster-fun (v2)
   source:
     path: manifests/cv
     repoURL: "https://git.cluster.fun/AverageMarcus/cluster.fun.git"

manifests/_apps/feed-fetcher.yaml

@@ -9,7 +9,7 @@ spec:
   project: cluster.fun
   destination:
     namespace: feed-fetcher
-    name: civo
+    name: cluster-fun (v2)
   source:
     path: manifests/feed-fetcher
     repoURL: "https://git.cluster.fun/AverageMarcus/cluster.fun.git"

manifests/_apps/goplayground.yaml

@@ -9,7 +9,7 @@ spec:
   project: cluster.fun
   destination:
     namespace: goplayground
-    name: civo
+    name: cluster-fun (v2)
   source:
     path: manifests/goplayground
     repoURL: "https://git.cluster.fun/AverageMarcus/cluster.fun.git"

manifests/_apps/link.yaml

@@ -9,7 +9,7 @@ spec:
   project: cluster.fun
   destination:
     namespace: link
-    name: civo
+    name: cluster-fun (v2)
   source:
     path: manifests/link
     repoURL: "https://git.cluster.fun/AverageMarcus/cluster.fun.git"

manifests/_apps/opengraph-image-gen.yaml

@@ -9,7 +9,7 @@ spec:
   project: cluster.fun
   destination:
     namespace: opengraph
-    name: civo
+    name: cluster-fun (v2)
   source:
     path: manifests/opengraph
     repoURL: "https://git.cluster.fun/AverageMarcus/cluster.fun.git"

manifests/_apps/qr.yaml

@@ -9,7 +9,7 @@ spec:
   project: cluster.fun
   destination:
     namespace: qr
-    name: civo
+    name: cluster-fun (v2)
   source:
     path: manifests/qr
     repoURL: "https://git.cluster.fun/AverageMarcus/cluster.fun.git"

manifests/_apps/social-to-rolodex.yaml

@@ -9,7 +9,7 @@ spec:
   project: cluster.fun
   destination:
     namespace: social-to-rolodex
-    name: civo
+    name: cluster-fun (v2)
   source:
     path: manifests/social-to-rolodex
     repoURL: "https://git.cluster.fun/AverageMarcus/cluster.fun.git"

manifests/_apps/svg-to-dxf.yaml

@@ -11,7 +11,7 @@ spec:
     namespace: svg-to-dxf
     name: civo
   source:
-    path: manifests/svg-to-dxf
+    name: cluster-fun (v2)
     repoURL: "https://git.cluster.fun/AverageMarcus/cluster.fun.git"
     targetRevision: HEAD
   syncPolicy:

manifests/_apps/talks.yaml

@@ -9,7 +9,7 @@ spec:
   project: cluster.fun
   destination:
     namespace: talks
-    name: civo
+    name: cluster-fun (v2)
   source:
     path: manifests/talks
     repoURL: "https://git.cluster.fun/AverageMarcus/cluster.fun.git"

manifests/_apps/text-to-dxf.yaml

@@ -11,7 +11,7 @@ spec:
     namespace: text-to-dxf
     name: civo
   source:
-    path: manifests/text-to-dxf
+    name: cluster-fun (v2)
     repoURL: "https://git.cluster.fun/AverageMarcus/cluster.fun.git"
     targetRevision: HEAD
   syncPolicy:

manifests/_apps/til.yaml

@@ -9,7 +9,7 @@ spec:
   project: cluster.fun
   destination:
     namespace: til
-    name: civo
+    name: cluster-fun (v2)
   source:
     path: manifests/til
     repoURL: "https://git.cluster.fun/AverageMarcus/cluster.fun.git"

manifests/_apps/tweetsvg.yaml

@@ -1,25 +0,0 @@
-apiVersion: argoproj.io/v1alpha1
-kind: Application
-metadata:
-  name: tweetsvg
-  namespace: argocd
-  finalizers:
-  - resources-finalizer.argocd.argoproj.io
-spec:
-  project: cluster.fun
-  destination:
-    namespace: tweetsvg
-    name: civo
-  source:
-    path: manifests/tweetsvg
-    repoURL: "https://git.cluster.fun/AverageMarcus/cluster.fun.git"
-    targetRevision: HEAD
-  syncPolicy:
-    automated: {}
-    syncOptions:
-      - CreateNamespace=true
-  ignoreDifferences:
-  - kind: Secret
-    jsonPointers:
-    - /data
-

manifests/_apps/wallabag.yaml

@@ -1,25 +0,0 @@
-apiVersion: argoproj.io/v1alpha1
-kind: Application
-metadata:
-  name: cluster-fun-wallabag
-  namespace: argocd
-  finalizers:
-  - resources-finalizer.argocd.argoproj.io
-spec:
-  project: cluster.fun
-  destination:
-    namespace: wallabag
-    name: cluster-fun (v2)
-  source:
-    path: manifests/wallabag
-    repoURL: "https://git.cluster.fun/AverageMarcus/cluster.fun.git"
-    targetRevision: HEAD
-  syncPolicy:
-    syncOptions:
-      - CreateNamespace=true
-    automated: {}
-  ignoreDifferences:
-  - kind: Secret
-    jsonPointers:
-    - /data
----

manifests/auth-proxy/proxy.yaml

@@ -67,7 +67,7 @@ spec:
           mountPath: /config/
 
       - name: oauth-proxy
-        image: quay.io/oauth2-proxy/oauth2-proxy:v7.11.0
+        image: quay.io/oauth2-proxy/oauth2-proxy:v7.12.0
         args:
         - --cookie-secure=false
         - --provider=oidc

manifests/base64/base64.yaml

@@ -49,11 +49,10 @@ metadata:
   namespace: base64
   annotations:
     cert-manager.io/cluster-issuer: letsencrypt
-    kubernetes.io/ingress.class: traefik
-    traefik.ingress.kubernetes.io/router.tls: "true"
     ingress.kubernetes.io/ssl-redirect: "true"
-    traefik.ingress.kubernetes.io/router.entrypoints: websecure
+    nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
 spec:
+  ingressClassName: nginx
   tls:
   - hosts:
     - base64.cluster.fun

manifests/bsky-screenshot/bsky-screenshot.yaml

@@ -0,0 +1,69 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: bsky-screenshot
+  namespace: bsky-screenshot
+spec:
+  type: ClusterIP
+  ports:
+  - port: 80
+    targetPort: web
+    name: web
+  selector:
+    app: bsky-screenshot
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: bsky-screenshot
+  namespace: bsky-screenshot
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: bsky-screenshot
+  template:
+    metadata:
+      labels:
+        app: bsky-screenshot
+    spec:
+      containers:
+      - name: web
+        image: rg.fr-par.scw.cloud/averagemarcus/bsky-screenshot:latest
+        imagePullPolicy: Always
+        ports:
+        - containerPort: 80
+          name: web
+        resources:
+          limits:
+            memory: 20Mi
+          requests:
+            memory: 20Mi
+---
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: bsky-screenshot
+  namespace: bsky-screenshot
+  annotations:
+    cert-manager.io/cluster-issuer: letsencrypt
+    ingress.kubernetes.io/ssl-redirect: "true"
+    nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
+spec:
+  ingressClassName: nginx
+  tls:
+  - hosts:
+    - bsky-screenshot.cluster.fun
+    secretName: bsky-screenshot-ingress
+  rules:
+  - host: bsky-screenshot.cluster.fun
+    http:
+      paths:
+      - path: /
+        pathType: ImplementationSpecific
+        backend:
+          service:
+            name: bsky-screenshot
+            port:
+              number: 80
+

manifests/cel-tester/cel-tester.yaml

@@ -47,11 +47,10 @@ metadata:
   namespace: cel-tester
   annotations:
     cert-manager.io/cluster-issuer: letsencrypt
-    kubernetes.io/ingress.class: traefik
-    traefik.ingress.kubernetes.io/router.tls: "true"
     ingress.kubernetes.io/ssl-redirect: "true"
-    traefik.ingress.kubernetes.io/router.entrypoints: websecure
+    nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
 spec:
+  ingressClassName: nginx
   tls:
   - hosts:
     - cel-tester.cluster.fun

manifests/civo-versions/civo-versions.yaml

@@ -66,11 +66,10 @@ metadata:
   namespace: civo-versions
   annotations:
     cert-manager.io/cluster-issuer: letsencrypt
-    kubernetes.io/ingress.class: traefik
-    traefik.ingress.kubernetes.io/router.tls: "true"
     ingress.kubernetes.io/ssl-redirect: "true"
-    traefik.ingress.kubernetes.io/router.entrypoints: websecure
+    nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
 spec:
+  ingressClassName: nginx
   tls:
   - hosts:
     - civo-versions.cluster.fun

manifests/cors-proxy/cors-proxy.yaml

@@ -0,0 +1,76 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: cors-proxy
+  namespace: cors-proxy
+spec:
+  type: ClusterIP
+  ports:
+  - port: 80
+    targetPort: 8000
+    name: web
+  selector:
+    app: cors-proxy
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: cors-proxy
+  namespace: cors-proxy
+spec:
+  replicas: 2
+  selector:
+    matchLabels:
+      app: cors-proxy
+  template:
+    metadata:
+      labels:
+        app: cors-proxy
+    spec:
+      containers:
+      - name: web
+        image: rg.fr-par.scw.cloud/averagemarcus/cors-proxy:latest
+        imagePullPolicy: Always
+        ports:
+        - containerPort: 8000
+          name: web
+        env:
+        - name: ALLOWLIST
+          value: cdn.bsky.app
+---
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: cors-proxy
+  namespace: cors-proxy
+  annotations:
+    cert-manager.io/cluster-issuer: letsencrypt
+    nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
+spec:
+  ingressClassName: nginx
+  tls:
+  - hosts:
+    - cors-proxy.cluster.fun
+    - cors-proxy.marcusnoble.co.uk
+    secretName: cors-proxy-ingress
+  rules:
+  - host: cors-proxy.cluster.fun
+    http:
+      paths:
+      - path: /
+        pathType: ImplementationSpecific
+        backend:
+          service:
+            name: cors-proxy
+            port:
+              number: 80
+  - host: cors-proxy.marcusnoble.co.uk
+    http:
+      paths:
+      - path: /
+        pathType: ImplementationSpecific
+        backend:
+          service:
+            name: cors-proxy
+            port:
+              number: 80

manifests/cv/cv.yaml

@@ -62,11 +62,10 @@ metadata:
   namespace: cv
   annotations:
     cert-manager.io/cluster-issuer: letsencrypt
-    kubernetes.io/ingress.class: traefik
-    traefik.ingress.kubernetes.io/router.tls: "true"
     ingress.kubernetes.io/ssl-redirect: "true"
-    traefik.ingress.kubernetes.io/router.entrypoints: websecure
+    nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
 spec:
+  ingressClassName: nginx
   tls:
   - hosts:
     - cv.marcusnoble.co.uk

manifests/dashboard/dashboard.yaml

@@ -81,7 +81,7 @@ spec:
             secretKeyRef:
               key: password
               name: dashboard-auth
-        image: quay.io/oauth2-proxy/oauth2-proxy:v7.11.0
+        image: quay.io/oauth2-proxy/oauth2-proxy:v7.12.0
         name: oauth-proxy
         ports:
         - containerPort: 8000

manifests/feed-fetcher/feed-fetcher.yaml

@@ -42,11 +42,10 @@ metadata:
   namespace: feed-fetcher
   annotations:
     cert-manager.io/cluster-issuer: letsencrypt
-    kubernetes.io/ingress.class: traefik
-    traefik.ingress.kubernetes.io/router.tls: "true"
     ingress.kubernetes.io/ssl-redirect: "true"
-    traefik.ingress.kubernetes.io/router.entrypoints: websecure
+    nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
 spec:
+  ingressClassName: nginx
   tls:
   - hosts:
     - feed-fetcher.cluster.fun

manifests/gitea/gitea.yaml

@@ -42,7 +42,7 @@ spec:
     spec:
       containers:
       - name: git
-        image: gitea/gitea:1.24.3
+        image: gitea/gitea:1.24.5
         env:
         - name: APP_NAME
           value: "Git"

manifests/goplayground/goplayground.yaml

@@ -47,11 +47,10 @@ metadata:
   namespace: goplayground
   annotations:
     cert-manager.io/cluster-issuer: letsencrypt
-    kubernetes.io/ingress.class: traefik
-    traefik.ingress.kubernetes.io/router.tls: "true"
     ingress.kubernetes.io/ssl-redirect: "true"
-    traefik.ingress.kubernetes.io/router.entrypoints: websecure
+    nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
 spec:
+  ingressClassName: nginx
   tls:
   - hosts:
     - go.cluster.fun

manifests/grist/grist.yaml

@@ -72,7 +72,7 @@ spec:
       serviceAccountName: grist
       containers:
         - name: grist
-          image: gristlabs/grist-oss:1.7.1
+          image: gristlabs/grist-oss:1.7.3
           imagePullPolicy: IfNotPresent
           ports:
             - name: http

manifests/link/link.yaml

@@ -91,11 +91,10 @@ metadata:
   namespace: link
   annotations:
     cert-manager.io/cluster-issuer: letsencrypt
-    kubernetes.io/ingress.class: traefik
-    traefik.ingress.kubernetes.io/router.tls: "true"
     ingress.kubernetes.io/ssl-redirect: "true"
-    traefik.ingress.kubernetes.io/router.entrypoints: websecure
+    nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
 spec:
+  ingressClassName: nginx
   tls:
   - hosts:
     - go-get.link

manifests/mastodon-digest/mastodon_digest.yaml

@@ -152,7 +152,7 @@ spec:
             secretKeyRef:
               key: password
               name: mastodon-digest-auth
-        image: quay.io/oauth2-proxy/oauth2-proxy:v7.11.0
+        image: quay.io/oauth2-proxy/oauth2-proxy:v7.12.0
         name: oauth-proxy
         ports:
         - containerPort: 8000

manifests/matrix_chart/matrix_chart.yaml

@@ -1,540 +0,0 @@
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: matrix
-  namespace: chat
-  annotations:
-    cert-manager.io/cluster-issuer: letsencrypt
-    nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
-    nginx.ingress.kubernetes.io/proxy-body-size: "0"
-spec:
-  ingressClassName: nginx
-  tls:
-  - hosts:
-    - matrix.cluster.fun
-    secretName: matrix-ingress
-  rules:
-  - host: matrix.cluster.fun
-    http:
-      paths:
-      - path: /.well-known/matrix
-        pathType: ImplementationSpecific
-        backend:
-          service:
-            name: well-known
-            port:
-              number: 80
-      - path: /
-        pathType: ImplementationSpecific
-        backend:
-          service:
-            name: matrix-synapse
-            port:
-              number: 80
-
----
-
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: riot
-  namespace: chat
-  annotations:
-    cert-manager.io/cluster-issuer: letsencrypt
-    nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
-    nginx.ingress.kubernetes.io/proxy-body-size: "0"
-spec:
-  ingressClassName: nginx
-  tls:
-  - hosts:
-    - chat.cluster.fun
-    secretName: riot-ingress
-  rules:
-  - host: chat.cluster.fun
-    http:
-      paths:
-      - path: /
-        pathType: ImplementationSpecific
-        backend:
-          service:
-            name: matrix-riot
-            port:
-              number: 80
-
----
-
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: well-known
-  namespace: chat
-  annotations:
-    configmap.reloader.stakater.com/reload: "well-known"
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: well-known
-  template:
-    metadata:
-      labels:
-        app: well-known
-    spec:
-      containers:
-      - name: web
-        image: nginx
-        imagePullPolicy: IfNotPresent
-        ports:
-        - containerPort: 80
-          name: web
-        volumeMounts:
-        - name: well-known
-          mountPath: /usr/share/nginx/html/.well-known/matrix
-        resources:
-          limits:
-            memory: 15Mi
-          requests:
-            memory: 15Mi
-      volumes:
-      - name: well-known
-        configMap:
-          name: well-known
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: well-known
-  namespace: chat
-spec:
-  type: ClusterIP
-  ports:
-  - port: 80
-    targetPort: 80
-    name: web
-  selector:
-    app: well-known
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: well-known
-  namespace: chat
-data:
-  server: |-
-    {
-      "m.server": "matrix.cluster.fun:443"
-    }
-  client: |-
-    {
-      "m.homeserver": {
-        "base_url": "https://matrix.cluster.fun"
-      },
-      "org.matrix.msc3575.proxy": {
-        "url": "https://syncv3.matrix.cluster.fun"
-      }
-    }
-
-
----
-
-
-# Source: matrix/templates/riot/configmap.yaml
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: matrix-riot-config
-  namespace: chat
-  labels:
-    app.kubernetes.io/name: "matrix"
-    component: element
-data:
-  config.json: |
-    {
-      "default_server_config": {
-        "m.homeserver": {
-          "base_url": "https://matrix.cluster.fun"
-        }
-      },
-      "brand": "Element",
-      "branding": {},
-      "integrations_ui_url": "https://scalar.vector.im/",
-      "integrations_rest_url": "https://scalar.vector.im/api",
-      "integrations_widgets_urls": [
-        "https://scalar.vector.im/_matrix/integrations/v1",
-        "https://scalar.vector.im/api",
-        "https://scalar-staging.vector.im/_matrix/integrations/v1",
-        "https://scalar-staging.vector.im/api",
-        "https://scalar-staging.riot.im/scalar/api"
-      ],
-      "showLabsSettings": true,
-      "features": {
-        "feature_pinning": true,
-        "feature_custom_status": "labs",
-        "feature_state_counters": "labs",
-        "feature_many_integration_managers": "labs",
-        "feature_mjolnir": "labs",
-        "feature_dm_verification": "labs",
-        "feature_bridge_state": "labs",
-        "feature_presence_in_room_list": true,
-        "feature_custom_themes": "labs",
-        "feature_new_spinner": "labs",
-        "feature_jump_to_date": "labs",
-        "feature_location_share_pin_drop": "labs",
-        "feature_location_share_live": "labs",
-        "feature_thread": true,
-        "feature_video_rooms": true,
-        "feature_favourite_messages": "labs"
-      },
-      "roomDirectory": {
-        "servers": []
-      },
-      "permalinkPrefix": "https://chat.cluster.fun",
-      "enable_presence_by_hs_url": {
-        "https://matrix.org": false,
-        "https://matrix-client.matrix.org": false
-      },
-      "map_style_url": "https://api.maptiler.com/maps/streets/style.json?key=2IerXP2a5g1e7hxxBbzs"
-    }
-  nginx.conf: |
-    worker_processes  auto;
-
-    error_log  /var/log/nginx/error.log warn;
-    pid        /var/run/pid/nginx.pid;
-
-    events {
-      worker_connections  1024;
-    }
-
-    http {
-      include       /etc/nginx/mime.types;
-      default_type  application/octet-stream;
-
-      log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
-      '$status $body_bytes_sent "$http_referer" '
-      '"$http_user_agent" "$http_x_forwarded_for"';
-
-      access_log  /var/log/nginx/access.log  main;
-
-      sendfile        on;
-
-      keepalive_timeout  65;
-
-      include /etc/nginx/conf.d/*.conf;
-    }
-  default.conf: |
-    server {
-      listen       8080;
-      server_name  localhost;
-
-      location / {
-          root   /usr/share/nginx/html;
-          index  index.html index.htm;
-      }
-
-      # redirect server error pages to the static page /50x.html
-      #
-      error_page   500 502 503 504  /50x.html;
-      location = /50x.html {
-          root   /usr/share/nginx/html;
-      }
-    }
----
-apiVersion: v1
-kind: Secret
-metadata:
-  name: matrix-synapse-config
-  namespace: chat
-  annotations:
-    kube-1password: wbj4oozwyx6m2zz5m42pgcmymy
-    kube-1password/vault: Kubernetes
-    kube-1password/secret-text-key: homeserver.yaml
-  labels:
-    app.kubernetes.io/name: "matrix"
-    component: synapse
-type: Opaque
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: matrix-synapse-config
-  namespace: chat
-  labels:
-    app.kubernetes.io/name: "matrix"
-    component: element
-data:
-  matrix.cluster.fun.log.config: |
-    version: 1
-
-    formatters:
-      precise:
-        format: '%(asctime)s - %(name)s - %(lineno)d - %(levelname)s - %(request)s - %(message)s'
-
-    filters:
-      context:
-        (): synapse.util.logcontext.LoggingContextFilter
-        request: ""
-
-    handlers:
-      console:
-        class: logging.StreamHandler
-        formatter: precise
-        filters: [context]
-
-    loggers:
-      synapse:
-        level: WARNING
-      synapse.storage.SQL:
-        # beware: increasing this to DEBUG will make synapse log sensitive
-        # information such as access tokens.
-        level: WARNING
-
-    root:
-      level: WARNING
-      handlers: [console]
----
-# Source: matrix/templates/riot/service.yaml
-apiVersion: v1
-kind: Service
-metadata:
-  name: matrix-riot
-  namespace: chat
-  labels:
-    app.kubernetes.io/name: "matrix"
-    component: element
-spec:
-  type: ClusterIP
-  ports:
-    - port: 80
-      targetPort: http
-      protocol: TCP
-      name: http
-  selector:
-    app.kubernetes.io/name: matrix-riot
----
-# Source: matrix/templates/synapse/service.yaml
-apiVersion: v1
-kind: Service
-metadata:
-  name: matrix-synapse
-  namespace: chat
-  labels:
-    app.kubernetes.io/name: "matrix"
-    component: synapse
-  annotations:
-    prometheus.io/scrape: "true"
-    prometheus.io/path: "/_synapse/metrics"
-    prometheus.io/port: "9000"
-spec:
-  type: ClusterIP
-  ports:
-    - port: 80
-      targetPort: http
-      protocol: TCP
-      name: http
-    - port: 9000
-      targetPort: metrics
-      protocol: TCP
-      name: metrics
-  selector:
-    app.kubernetes.io/name: matrix-synapse
----
-# Source: matrix/templates/riot/deployment.yaml
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: matrix-riot
-  namespace: chat
-  labels:
-    app.kubernetes.io/name: "matrix"
-    component: element
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app.kubernetes.io/name: matrix-riot
-  template:
-    metadata:
-      labels:
-        app.kubernetes.io/name: matrix-riot
-    spec:
-      securityContext:
-        runAsUser: 1000
-        runAsGroup: 1000
-        fsGroup: 1000
-      containers:
-        - name: "riot"
-          image: "vectorim/element-web:v1.11.108"
-          imagePullPolicy: IfNotPresent
-          ports:
-            - name: http
-              containerPort: 8080
-              protocol: TCP
-          volumeMounts:
-            - mountPath: /app/config.json
-              name: riot-config
-              subPath: config.json
-              readOnly: true
-            - mountPath: /etc/nginx/nginx.conf
-              name: riot-config
-              subPath: nginx.conf
-              readOnly: true
-            - mountPath: /etc/nginx/conf.d/default.conf
-              name: riot-config
-              subPath: default.conf
-              readOnly: true
-            - mountPath: /var/cache/nginx
-              name: ephemeral
-              subPath: cache
-            - mountPath: /var/run/pid
-              name: ephemeral
-              subPath: pid
-            - mountPath: /tmp
-              name: tmp
-          readinessProbe:
-            httpGet:
-              path: /
-              port: http
-          startupProbe:
-            httpGet:
-              path: /
-              port: http
-          livenessProbe:
-            httpGet:
-              path: /
-              port: http
-          securityContext:
-            capabilities:
-              drop:
-                - ALL
-            readOnlyRootFilesystem: true
-            allowPrivilegeEscalation: false
-      volumes:
-        - name: riot-config
-          configMap:
-            name: matrix-riot-config
-        - name: ephemeral
-          emptyDir: {}
-        - name: tmp
-          emptyDir: {}
----
-# Source: matrix/templates/synapse/deployment.yaml
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: matrix-synapse
-  namespace: chat
-  labels:
-    app.kubernetes.io/name: "matrix"
-    component: synapse
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app.kubernetes.io/name: matrix-synapse
-  strategy:
-    type: Recreate
-  template:
-    metadata:
-      labels:
-        app.kubernetes.io/name: matrix-synapse
-    spec:
-      securityContext:
-        runAsUser: 1000
-        runAsGroup: 1000
-        fsGroup: 1000
-      initContainers:
-        - name: generate-signing-key
-          image: "ghcr.io/element-hq/synapse:v1.135.0"
-          imagePullPolicy: IfNotPresent
-          env:
-            - name: SYNAPSE_SERVER_NAME
-              value: matrix.cluster.fun
-            - name: SYNAPSE_REPORT_STATS
-              value: "no"
-          command: ["python"]
-          args:
-            - "-m"
-            - "synapse.app.homeserver"
-            - "--config-path"
-            - "/data/homeserver.yaml"
-            - "--keys-directory"
-            - "/data/keys"
-            - "--generate-keys"
-          volumeMounts:
-            - name: synapse-config-homeserver
-              mountPath: /data/homeserver.yaml
-              subPath: homeserver.yaml
-            - name: synapse-config-logging
-              mountPath: /data/matrix.cluster.fun.log.config
-              subPath: matrix.cluster.fun.log.config
-            - name: signing-key
-              mountPath: /data/keys
-      containers:
-        - name: "synapse"
-          image: "ghcr.io/element-hq/synapse:v1.135.0"
-          imagePullPolicy: IfNotPresent
-          ports:
-            - name: http
-              containerPort: 8008
-              protocol: TCP
-            - name: metrics
-              containerPort: 9000
-              protocol: TCP
-          volumeMounts:
-            - name: synapse-config-homeserver
-              mountPath: /data/homeserver.yaml
-              subPath: homeserver.yaml
-            - name: synapse-config-logging
-              mountPath: /data/matrix.cluster.fun.log.config
-              subPath: matrix.cluster.fun.log.config
-            - name: signing-key
-              mountPath: /data/keys
-            - name: user-media
-              mountPath: /data/media_store
-            - name: uploads
-              mountPath: /data/uploads
-            - name: tmp
-              mountPath: /tmp
-          readinessProbe:
-            httpGet:
-              path: /_matrix/static/
-              port: http
-            periodSeconds: 10
-            timeoutSeconds: 5
-          startupProbe:
-            httpGet:
-              path: /_matrix/static/
-              port: http
-            failureThreshold: 6
-            periodSeconds: 5
-            timeoutSeconds: 5
-          livenessProbe:
-            httpGet:
-              path: /_matrix/static/
-              port: http
-            periodSeconds: 10
-            timeoutSeconds: 5
-          securityContext:
-            capabilities:
-              drop:
-                - ALL
-            readOnlyRootFilesystem: true
-            allowPrivilegeEscalation: false
-      volumes:
-        - name: synapse-config-logging
-          configMap:
-            name: matrix-synapse-config
-        - name: synapse-config-homeserver
-          secret:
-            secretName: matrix-synapse-config
-        - name: signing-key
-          persistentVolumeClaim:
-            claimName: chat-matrix-signing-key
-        - name: user-media
-          persistentVolumeClaim:
-            claimName: chat-matrix-user-media
-        - name: uploads
-          emptyDir: {}
-        - name: tmp
-          emptyDir: {}
----

manifests/matrix_chart/pvs.yaml

@@ -1,32 +0,0 @@
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: chat-matrix-user-media
-  namespace: chat
-  labels:
-    app.kubernetes.io/name: "matrix"
-    component: synapse
-spec:
-  accessModes:
-    - ReadWriteOnce
-  resources:
-    requests:
-      storage: 12Gi
-  storageClassName: sbs-default-retain
----
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: chat-matrix-signing-key
-  namespace: chat
-  labels:
-    app.kubernetes.io/name: "matrix"
-    component: synapse
-spec:
-  accessModes:
-    - ReadWriteOnce
-  resources:
-    requests:
-      storage: 1Gi
-  storageClassName: sbs-default-retain
----

manifests/matrix_chart/sliding-sync.yaml

@@ -1,119 +0,0 @@
-apiVersion: v1
-kind: Secret
-metadata:
-  name: matrix-sliding-sync
-  namespace: chat
-  annotations:
-    kube-1password: 7kvyfcszfaavj2d7uvl4troagm
-    kube-1password/vault: Kubernetes
-    kube-1password/secret-text-parse: "true"
-  labels:
-    app.kubernetes.io/name: "matrix"
-    component: sliding-sync
-type: Opaque
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: sliding-sync
-  namespace: chat
-  labels:
-    app.kubernetes.io/name: "matrix"
-    component: sliding-sync
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app.kubernetes.io/name: sliding-sync
-  template:
-    metadata:
-      labels:
-        app.kubernetes.io/name: sliding-sync
-    spec:
-      securityContext:
-        runAsUser: 1000
-        runAsGroup: 1000
-        fsGroup: 1000
-      containers:
-        - name: "sliding-sync"
-          image: "ghcr.io/matrix-org/sliding-sync:v0.99.19"
-          imagePullPolicy: IfNotPresent
-          ports:
-            - name: http
-              containerPort: 8008
-              protocol: TCP
-            - name: metrics
-              containerPort: 9090
-              protocol: TCP
-          env:
-          - name: SYNCV3_SERVER
-            value: https://matrix.cluster.fun
-          - name: SYNCV3_BINDADDR
-            value: ":8008"
-          - name: SYNCV3_PROM
-            value: ":9090"
-          - name: SYNCV3_SECRET
-            valueFrom:
-              secretKeyRef:
-                name: matrix-sliding-sync
-                key: SYNCV3_SECRET
-          - name: SYNCV3_DB
-            valueFrom:
-              secretKeyRef:
-                name: matrix-sliding-sync
-                key: SYNCV3_DB
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: sliding-sync
-  namespace: chat
-  labels:
-    app.kubernetes.io/name: "matrix"
-    component: sliding-sync
-  annotations:
-    prometheus.io/scrape: "true"
-    prometheus.io/port: "9090"
-spec:
-  type: ClusterIP
-  ports:
-  - port: 80
-    targetPort: http
-    name: web
-  - port: 9090
-    targetPort: metrics
-    protocol: TCP
-    name: metrics
-  selector:
-    app.kubernetes.io/name: sliding-sync
----
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: sliding-sync
-  namespace: chat
-  labels:
-    app.kubernetes.io/name: "matrix"
-    component: sliding-sync
-  annotations:
-    cert-manager.io/cluster-issuer: letsencrypt
-    nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
-    nginx.ingress.kubernetes.io/proxy-body-size: "0"
-spec:
-  ingressClassName: nginx
-  tls:
-  - hosts:
-    - syncv3.matrix.cluster.fun
-    secretName: sliding-sync-ingress
-  rules:
-  - host: syncv3.matrix.cluster.fun
-    http:
-      paths:
-      - path: /
-        pathType: ImplementationSpecific
-        backend:
-          service:
-            name: sliding-sync
-            port:
-              number: 80
----

manifests/mealie/mealie.yaml

@@ -30,7 +30,7 @@ spec:
     spec:
       containers:
       - name: frontend
-        image: ghcr.io/mealie-recipes/mealie:v3.0.2
+        image: ghcr.io/mealie-recipes/mealie:v3.1.2
         imagePullPolicy: Always
         envFrom:
         - secretRef:
@@ -41,7 +41,7 @@ spec:
         - name: PGID
           value: "1000"
         - name: TOKEN_TIME
-          value: "168"
+          value: "720"
         - name: DB_ENGINE
           value: postgres
         - name: POSTGRES_DB

manifests/monitoring-civo/kube-state-metrics.yaml

@@ -237,7 +237,7 @@ spec:
         - --resources=validatingwebhookconfigurations
         #- --resources=volumeattachments
         imagePullPolicy: IfNotPresent
-        image: "registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.16.0"
+        image: "registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.17.0"
         ports:
         - containerPort: 8080
         livenessProbe:

manifests/monitoring-civo/vmagent.yaml

@@ -147,7 +147,7 @@ spec:
       serviceAccountName: prometheus-server
       containers:
         - name: vmagent
-          image: "victoriametrics/vmagent:v1.122.0"
+          image: "victoriametrics/vmagent:v1.125.1"
           imagePullPolicy: "IfNotPresent"
           args:
             - -remoteWrite.url=http://vmcluster.proxy-civo.svc/insert/0/prometheus/

manifests/monitoring/kube-state-metrics.yaml

@@ -237,7 +237,7 @@ spec:
         - --resources=validatingwebhookconfigurations
         #- --resources=volumeattachments
         imagePullPolicy: IfNotPresent
-        image: "registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.16.0"
+        image: "registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.17.0"
         ports:
         - containerPort: 8080
         livenessProbe:

manifests/monitoring/vmagent.yaml

@@ -153,7 +153,7 @@ spec:
       serviceAccountName: prometheus-server
       containers:
         - name: vmagent
-          image: "victoriametrics/vmagent:v1.122.0"
+          image: "victoriametrics/vmagent:v1.125.1"
           imagePullPolicy: "IfNotPresent"
           args:
             - -remoteWrite.url=http://vmcluster.auth-proxy.svc/insert/0/prometheus/

manifests/nextcloud_chart/manifest.yaml

@@ -203,7 +203,7 @@ spec:
     spec:
       containers:
       - name: nextcloud
-        image: "nextcloud:31.0.7-apache"
+        image: "nextcloud:31.0.8-apache"
         imagePullPolicy: IfNotPresent
         env:
         - name: SQLITE_DATABASE
@@ -374,7 +374,7 @@ spec:
           restartPolicy: Never
           containers:
             - name: nextcloud
-              image: "nextcloud:31.0.7-apache"
+              image: "nextcloud:31.0.8-apache"
               imagePullPolicy: IfNotPresent
               command: [ "curl" ]
               args:

manifests/nginx-lb/nginx-lb.yaml

@@ -325,6 +325,7 @@ subjects:
 ---
 apiVersion: v1
 data:
+  annotations-risk-level: Critical
   allow-snippet-annotations: "true"
   use-proxy-protocol: "true"
   log-format-upstream: '{"time": "$time_iso8601", "request_id": "$req_id", "remote_user": "$remote_user", "remote_addr_masked": "$remote_addr_masked", "bytes_sent": $bytes_sent, "request_time": $request_time, "status": $status, "host": "$host", "request_proto": "$server_protocol", "path": "$uri", "request_query": "$args", "request_length": $request_length, "duration": $request_time,"method": "$request_method", "http_referrer": "$http_referer", "http_user_agent": "$http_user_agent", "redirect_location": "$redirect_location" }'
@@ -491,7 +492,7 @@ spec:
               fieldPath: metadata.namespace
         - name: LD_PRELOAD
           value: /usr/local/lib/libmimalloc.so
-        image: registry.k8s.io/ingress-nginx/controller:v1.13.0@sha256:dc75a7baec7a3b827a5d7ab0acd10ab507904c7dad692365b3e3b596eca1afd2
+        image: registry.k8s.io/ingress-nginx/controller:v1.13.2@sha256:1f7eaeb01933e719c8a9f4acd8181e555e582330c7d50f24484fb64d2ba9b2ef
         imagePullPolicy: IfNotPresent
         lifecycle:
           preStop:

manifests/opengraph/opengraph.yaml

@@ -47,11 +47,10 @@ metadata:
   namespace: opengraph
   annotations:
     cert-manager.io/cluster-issuer: letsencrypt
-    kubernetes.io/ingress.class: traefik
-    traefik.ingress.kubernetes.io/router.tls: "true"
     ingress.kubernetes.io/ssl-redirect: "true"
-    traefik.ingress.kubernetes.io/router.entrypoints: websecure
+    nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
 spec:
+  ingressClassName: nginx
   tls:
   - hosts:
     - opengraph.cluster.fun

manifests/outline/outline.yaml

@@ -45,7 +45,7 @@ spec:
     spec:
       containers:
       - name: outline
-        image: outlinewiki/outline:0.85.1
+        image: outlinewiki/outline:0.87.3
         imagePullPolicy: IfNotPresent
         env:
         - name: ALLOWED_DOMAINS

manifests/qr/qr.yaml

@@ -47,11 +47,10 @@ metadata:
   namespace: qr
   annotations:
     cert-manager.io/cluster-issuer: letsencrypt
-    kubernetes.io/ingress.class: traefik
-    traefik.ingress.kubernetes.io/router.tls: "true"
     ingress.kubernetes.io/ssl-redirect: "true"
-    traefik.ingress.kubernetes.io/router.entrypoints: websecure
+    nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
 spec:
+  ingressClassName: nginx
   tls:
   - hosts:
     - qr.cluster.fun

manifests/rss/miniflux.yaml

@@ -66,7 +66,7 @@ spec:
     spec:
       containers:
       - name: web
-        image: ghcr.io/miniflux/miniflux:2.2.11
+        image: ghcr.io/miniflux/miniflux:2.2.12
         imagePullPolicy: IfNotPresent
         envFrom:
         - configMapRef:

manifests/social-to-grist/social-to-grist.yaml

@@ -1,151 +0,0 @@
-apiVersion: v1
-kind: Secret
-metadata:
-  name: docker-config
-  namespace: social-to-grist
-  annotations:
-    kube-1password: i6ngbk5zf4k52xgwdwnfup5bby
-    kube-1password/vault: Kubernetes
-    kube-1password/secret-text-key: .dockerconfigjson
-type: kubernetes.io/dockerconfigjson
-data:
-  .dockerconfigjson: e30=
----
-apiVersion: v1
-kind: Secret
-metadata:
-  name: social-to-grist-auth
-  namespace: social-to-grist
-  annotations:
-    kube-1password: mr6spkkx7n3memkbute6ojaarm
-    kube-1password/vault: Kubernetes
-type: Opaque
----
-apiVersion: v1
-kind: Secret
-metadata:
-  name: social-to-grist
-  namespace: social-to-grist
-  annotations:
-    kube-1password: oa3ycnui3ji4lc665bifaao63q
-    kube-1password/vault: Kubernetes
-    kube-1password/secret-text-parse: "true"
-type: Opaque
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: social-to-grist
-  namespace: social-to-grist
-spec:
-  type: ClusterIP
-  ports:
-  - port: 80
-    targetPort: auth
-    name: web
-  selector:
-    app: social-to-grist
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: social-to-grist
-  namespace: social-to-grist
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: social-to-grist
-  template:
-    metadata:
-      labels:
-        app: social-to-grist
-    spec:
-      imagePullSecrets:
-        - name: docker-config
-      containers:
-      - args:
-        - --cookie-secure=false
-        - --provider=oidc
-        - --provider-display-name=Auth0
-        - --upstream=http://localhost:8080
-        - --http-address=$(HOST_IP):8000
-        - --redirect-url=https://social-to-grist.cluster.fun/oauth2/callback
-        - --email-domain=marcusnoble.co.uk
-        - --pass-basic-auth=false
-        - --pass-access-token=false
-        - --oidc-issuer-url=https://marcusnoble.eu.auth0.com/
-        - --cookie-secret=KDGD6rrK6cBmryyZ4wcJ9xAUNW9AQNFT
-        env:
-        - name: HOST_IP
-          valueFrom:
-            fieldRef:
-              apiVersion: v1
-              fieldPath: status.podIP
-        - name: OAUTH2_PROXY_CLIENT_ID
-          valueFrom:
-            secretKeyRef:
-              key: username
-              name: social-to-grist-auth
-        - name: OAUTH2_PROXY_CLIENT_SECRET
-          valueFrom:
-            secretKeyRef:
-              key: password
-              name: social-to-grist-auth
-        image: quay.io/oauth2-proxy/oauth2-proxy:v7.11.0
-        name: oauth-proxy
-        ports:
-        - containerPort: 8000
-          protocol: TCP
-          name: auth
-        resources:
-          limits:
-            memory: 50Mi
-          requests:
-            memory: 50Mi
-      - name: web
-        image: rg.fr-par.scw.cloud/averagemarcus-private/social-to-grist:latest
-        imagePullPolicy: Always
-        env:
-        - name: PORT
-          value: "8080"
-        envFrom:
-        - secretRef:
-            name: "social-to-grist"
-        ports:
-        - containerPort: 8080
-          name: web
-        resources:
-          limits:
-            memory: 50Mi
-          requests:
-            memory: 50Mi
-
----
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: social-to-grist
-  namespace: social-to-grist
-  annotations:
-    cert-manager.io/cluster-issuer: letsencrypt
-    kubernetes.io/ingress.class: traefik
-    traefik.ingress.kubernetes.io/router.tls: "true"
-    ingress.kubernetes.io/ssl-redirect: "true"
-    traefik.ingress.kubernetes.io/router.entrypoints: websecure
-spec:
-  tls:
-  - hosts:
-    - social-to-grist.cluster.fun
-    secretName: social-to-grist-ingress
-  rules:
-  - host: social-to-grist.cluster.fun
-    http:
-      paths:
-      - path: /
-        pathType: ImplementationSpecific
-        backend:
-          service:
-            name: social-to-grist
-            port:
-              number: 80

manifests/social-to-rolodex/social-to-rolodex.yaml

@@ -92,7 +92,7 @@ spec:
             secretKeyRef:
               key: password
               name: social-to-rolodex-auth
-        image: quay.io/oauth2-proxy/oauth2-proxy:v7.11.0
+        image: quay.io/oauth2-proxy/oauth2-proxy:v7.12.0
         name: oauth-proxy
         ports:
         - containerPort: 8000
@@ -129,11 +129,10 @@ metadata:
   namespace: social-to-rolodex
   annotations:
     cert-manager.io/cluster-issuer: letsencrypt
-    kubernetes.io/ingress.class: traefik
-    traefik.ingress.kubernetes.io/router.tls: "true"
     ingress.kubernetes.io/ssl-redirect: "true"
-    traefik.ingress.kubernetes.io/router.entrypoints: websecure
+    nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
 spec:
+  ingressClassName: nginx
   tls:
   - hosts:
     - social-to-rolodex.cluster.fun

manifests/svg-to-dxf/svg-to-dxf.yaml

@@ -45,14 +45,11 @@ metadata:
   namespace: svg-to-dxf
   annotations:
     cert-manager.io/cluster-issuer: letsencrypt
-    kubernetes.io/ingress.class: traefik
-    traefik.ingress.kubernetes.io/router.tls: "true"
     ingress.kubernetes.io/ssl-redirect: "true"
-    traefik.ingress.kubernetes.io/router.entrypoints: websecure
+    nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
-    traefik.ingress.kubernetes.io/buffering: |
+    nginx.ingress.kubernetes.io/proxy-body-size: "0"
-      maxrequestbodybytes: 31457280
-      memrequestbodybytes: 62914560
 spec:
+  ingressClassName: nginx
   tls:
   - hosts:
     - svg-to-dxf.cluster.fun

manifests/talks/talks.yaml

@@ -1,45 +1,3 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: talks
-  namespace: talks
-spec:
-  type: ClusterIP
-  ports:
-  - port: 80
-    targetPort: web
-    name: web
-  selector:
-    app: talks
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: talks
-  namespace: talks
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: talks
-  template:
-    metadata:
-      labels:
-        app: talks
-    spec:
-      containers:
-      - name: web
-        image: rg.fr-par.scw.cloud/averagemarcus/talks:latest
-        imagePullPolicy: Always
-        ports:
-        - containerPort: 80
-          name: web
-        resources:
-          limits:
-            memory: 20Mi
-          requests:
-            memory: 20Mi
----
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
@@ -47,24 +5,13 @@ metadata:
   namespace: talks
   annotations:
     cert-manager.io/cluster-issuer: letsencrypt
-    kubernetes.io/ingress.class: traefik
-    traefik.ingress.kubernetes.io/router.tls: "true"
     ingress.kubernetes.io/ssl-redirect: "true"
-    traefik.ingress.kubernetes.io/router.entrypoints: websecure
+    nginx.ingress.kubernetes.io/permanent-redirect: https://speaking.marcusnoble.co.uk
 spec:
+  ingressClassName: nginx
   tls:
   - hosts:
     - talks.marcusnoble.co.uk
     secretName: talks-ingress
   rules:
   - host: talks.marcusnoble.co.uk
-    http:
-      paths:
-      - path: /
-        pathType: ImplementationSpecific
-        backend:
-          service:
-            name: talks
-            port:
-              number: 80
-

manifests/text-to-dxf/text-to-dxf.yaml

@@ -45,11 +45,10 @@ metadata:
   namespace: text-to-dxf
   annotations:
     cert-manager.io/cluster-issuer: letsencrypt
-    kubernetes.io/ingress.class: traefik
-    traefik.ingress.kubernetes.io/router.tls: "true"
     ingress.kubernetes.io/ssl-redirect: "true"
-    traefik.ingress.kubernetes.io/router.entrypoints: websecure
+    nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
 spec:
+  ingressClassName: nginx
   tls:
   - hosts:
     - text-to-dxf.cluster.fun

manifests/til/til.yaml

@@ -1,45 +1,3 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: til
-  namespace: til
-spec:
-  type: ClusterIP
-  ports:
-  - port: 80
-    targetPort: web
-    name: web
-  selector:
-    app: til
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: til
-  namespace: til
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: til
-  template:
-    metadata:
-      labels:
-        app: til
-    spec:
-      containers:
-      - name: web
-        image: rg.fr-par.scw.cloud/averagemarcus/til:latest
-        imagePullPolicy: Always
-        ports:
-        - containerPort: 80
-          name: web
-        resources:
-          limits:
-            memory: 20Mi
-          requests:
-            memory: 20Mi
----
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
@@ -47,24 +5,25 @@ metadata:
   namespace: til
   annotations:
     cert-manager.io/cluster-issuer: letsencrypt
-    kubernetes.io/ingress.class: traefik
-    traefik.ingress.kubernetes.io/router.tls: "true"
     ingress.kubernetes.io/ssl-redirect: "true"
-    traefik.ingress.kubernetes.io/router.entrypoints: websecure
+    nginx.ingress.kubernetes.io/server-snippet: |
+      rewrite ^/dont-reuse-keys/?$ https://marcusnoble.co.uk/2020-10-03-t-i-l-don-t-reuse-api-keys/ permanent;
+      rewrite ^/favicons/?$ https://marcusnoble.co.uk/2020-11-10-t-i-l-how-to-get-the-favicon-of-any-site/ permanent;
+      rewrite ^/getopts/?$ https://marcusnoble.co.uk/2021-08-04-t-i-l-cli-flag-handling-in-bash-using-getopts/ permanent;
+      rewrite ^/go-named-return-values/?$ https://marcusnoble.co.uk/2020-10-05-t-i-l-named-returns-in-go-functions/ permanent;
+      rewrite ^/golang-append/?$ https://marcusnoble.co.uk/2020-10-30-t-i-l-golang-s-append-mutates-the-provided-array/ permanent;
+      rewrite ^/golang-split-by-space/?$ https://marcusnoble.co.uk/2020-09-18-t-i-l-split-on-spaces-in-go/ permanent;
+      rewrite ^/kubectl-replace/?$ https://marcusnoble.co.uk/2020-09-25-t-i-l-kubectl-replace/ permanent;
+      rewrite ^/kubernetes-label-length/?$ https://marcusnoble.co.uk/2021-04-20-t-i-l-kubernetes-label-length/ permanent;
+      rewrite ^/tekton-multi-arch-builds/?$ https://marcusnoble.co.uk/2020-09-13-t-i-l-tekton-multi-arch-image-builds/ permanent;
+      rewrite ^/yaml-key-spaces/?$ https://marcusnoble.co.uk/2021-05-11-t-i-l-yaml-keys-allow-for-spaces-in-them/ permanent;
+      rewrite ^/yaml-multiline/?$ https://marcusnoble.co.uk/2020-09-17-t-i-l-yaml-multiline-values/ permanent;
+      rewrite ^/?$ https://marcusnoble.co.uk/ permanent;
 spec:
+  ingressClassName: nginx
   tls:
   - hosts:
     - til.marcusnoble.co.uk
     secretName: til-ingress
   rules:
   - host: til.marcusnoble.co.uk
-    http:
-      paths:
-      - path: /
-        pathType: ImplementationSpecific
-        backend:
-          service:
-            name: til
-            port:
-              number: 80
-

manifests/traefik/traefik.yaml

@@ -45,7 +45,7 @@ spec:
         - --entrypoints.websecure.http.tls=true
         - --entrypoints.web.http.redirections.entrypoint.to=websecure
         - --entrypoints.web.http.redirections.entrypoint.scheme=https
-        image: rancher/mirrored-library-traefik:2.11.24
+        image: rancher/mirrored-library-traefik:2.11.29
         imagePullPolicy: IfNotPresent
         livenessProbe:
           failureThreshold: 3

manifests/tweetsvg/tweetsvg.yaml

@@ -1,92 +0,0 @@
-apiVersion: v1
-kind: Secret
-metadata:
-  name: tweetsvg
-  namespace: tweetsvg
-  annotations:
-    kube-1password: dmjtjxrcpqtmeddq5x7zikj37i
-    kube-1password/vault: Kubernetes
-    kube-1password/secret-text-key: .env
-type: Opaque
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: tweetsvg
-  namespace: tweetsvg
-spec:
-  type: ClusterIP
-  ports:
-  - port: 80
-    targetPort: 8080
-    name: web
-  selector:
-    app: tweetsvg
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: tweetsvg
-  namespace: tweetsvg
-spec:
-  replicas: 2
-  selector:
-    matchLabels:
-      app: tweetsvg
-  template:
-    metadata:
-      labels:
-        app: tweetsvg
-    spec:
-      containers:
-      - name: web
-        image: rg.fr-par.scw.cloud/averagemarcus/tweetsvg:latest
-        imagePullPolicy: Always
-        # env:
-        # - name: DOTENV_DIR
-        #   value: /config/
-        ports:
-        - containerPort: 8080
-          name: web
-        resources:
-          limits:
-            memory: 100Mi
-          requests:
-            memory: 100Mi
-        volumeMounts:
-          - name: dotenv
-            mountPath: /app/.env
-            subPath: .env
-      volumes:
-      - name: dotenv
-        secret:
-          secretName: tweetsvg
----
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: tweetsvg
-  namespace: tweetsvg
-  annotations:
-    cert-manager.io/cluster-issuer: letsencrypt
-    kubernetes.io/ingress.class: traefik
-    traefik.ingress.kubernetes.io/router.tls: "true"
-    ingress.kubernetes.io/ssl-redirect: "true"
-    traefik.ingress.kubernetes.io/router.entrypoints: websecure
-spec:
-  tls:
-  - hosts:
-    - tweet.cluster.fun
-    secretName: tweetsvg-ingress
-  rules:
-  - host: tweet.cluster.fun
-    http:
-      paths:
-      - path: /
-        pathType: ImplementationSpecific
-        backend:
-          service:
-            name: tweetsvg
-            port:
-              number: 80
-

manifests/twitter-profile-pic/twitter-profile-pic.yaml

@@ -1,86 +0,0 @@
-apiVersion: v1
-kind: Secret
-metadata:
-  name: twitter-profile-pic
-  namespace: twitter-profile-pic
-  annotations:
-    kube-1password: d2rt56v47q2wij47qgj27umrky
-    kube-1password/vault: Kubernetes
-    kube-1password/secret-text-key: .env
-type: Opaque
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: twitter-profile-pic
-  namespace: twitter-profile-pic
-spec:
-  type: ClusterIP
-  ports:
-  - port: 80
-    targetPort: 9090
-    name: web
-  selector:
-    app: twitter-profile-pic
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: twitter-profile-pic
-  namespace: twitter-profile-pic
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: twitter-profile-pic
-  template:
-    metadata:
-      labels:
-        app: twitter-profile-pic
-    spec:
-      containers:
-      - name: web
-        image: rg.fr-par.scw.cloud/averagemarcus/twitter-profile-pic:latest
-        imagePullPolicy: Always
-        ports:
-        - containerPort: 9090
-          name: web
-        resources:
-          limits:
-            memory: 100Mi
-          requests:
-            memory: 100Mi
-        volumeMounts:
-          - name: dotenv
-            mountPath: /app/.env
-            subPath: .env
-      volumes:
-      - name: dotenv
-        secret:
-          secretName: twitter-profile-pic
----
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: twitter-profile-pic-cluster-fun
-  namespace: twitter-profile-pic
-  annotations:
-    cert-manager.io/cluster-issuer: letsencrypt
-    nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
-spec:
-  ingressClassName: nginx
-  tls:
-  - hosts:
-    - twitter-profile-pic.cluster.fun
-    secretName: twitter-profile-pic-cluster-fun-ingress
-  rules:
-  - host: twitter-profile-pic.cluster.fun
-    http:
-      paths:
-      - path: /
-        pathType: ImplementationSpecific
-        backend:
-          service:
-            name: twitter-profile-pic
-            port:
-              number: 80

manifests/wallabag/wallabag.yaml

@@ -1,204 +0,0 @@
-apiVersion: v1
-kind: Secret
-metadata:
-  name: wallabag
-  namespace: wallabag
-  annotations:
-    kube-1password: 4yogl6yx6t4trrkq7o35tiyj6i
-    kube-1password/vault: Kubernetes
-    kube-1password/secret-text-parse: "true"
-type: Opaque
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: wallabag
-  namespace: wallabag
-  labels:
-    app.kubernetes.io/name: wallabag
-  annotations:
-spec:
-  type: ClusterIP
-  ports:
-  - port: 80
-    targetPort: http
-    protocol: TCP
-    name: http
-  selector:
-    app.kubernetes.io/name: wallabag
----
-apiVersion: batch/v1
-kind: Job
-metadata:
-  name: wallabag
-  namespace: wallabag
-  labels:
-    app.kubernetes.io/name: wallabag-init
-spec:
-  suspend: true
-  template:
-    metadata:
-      labels:
-        app.kubernetes.io/name: wallabag-init
-    spec:
-      restartPolicy: OnFailure
-      containers:
-      - name: db-init
-        image: "wallabag/wallabag:latest"
-        imagePullPolicy: IfNotPresent
-        envFrom:
-        - secretRef:
-            name: wallabag
-        env:
-          - name: "SYMFONY__ENV__DATABASE_CHARSET"
-            value: "utf8"
-          - name: "SYMFONY__ENV__DATABASE_DRIVER"
-            value: "pdo_pgsql"
-          - name: "SYMFONY__ENV__DATABASE_NAME"
-            value: "wallabag"
-          - name: "SYMFONY__ENV__DATABASE_TABLE_PREFIX"
-            value: "wallabag_"
-          - name: "SYMFONY__ENV__DOMAIN_NAME"
-            value: "https://wallabag.cluster.fun"
-          - name: "SYMFONY__ENV__FOSUSER_REGISTRATION"
-            value: "false"
-          - name: "SYMFONY__ENV__LOCALE"
-            value: "en"
-          - name: "TZ"
-            value: "UTC"
-        command:
-        - /var/www/wallabag/bin/console
-        - wallabag:install
-        - --env=prod
-        - --no-interaction
-
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: wallabag
-  namespace: wallabag
-  labels:
-    app.kubernetes.io/name: wallabag
-spec:
-  revisionHistoryLimit: 3
-  replicas: 1
-  strategy:
-    type: Recreate
-  selector:
-    matchLabels:
-      app.kubernetes.io/name: wallabag
-  template:
-    metadata:
-      labels:
-        app.kubernetes.io/name: wallabag
-    spec:
-      initContainers:
-        - name: db-migrate
-          image: "wallabag/wallabag:2.6.13"
-          imagePullPolicy: IfNotPresent
-          command:
-          - /var/www/wallabag/bin/console
-          - doctrine:migrations:migrate
-          - --env=prod
-          - --no-interaction
-          envFrom:
-          - secretRef:
-              name: wallabag
-          env:
-            - name: "SYMFONY__ENV__DATABASE_CHARSET"
-              value: "utf8"
-            - name: "SYMFONY__ENV__DATABASE_DRIVER"
-              value: "pdo_pgsql"
-            - name: "SYMFONY__ENV__DATABASE_NAME"
-              value: "wallabag"
-            - name: "SYMFONY__ENV__DATABASE_TABLE_PREFIX"
-              value: "wallabag_"
-            - name: "SYMFONY__ENV__DOMAIN_NAME"
-              value: "https://wallabag.cluster.fun"
-            - name: "SYMFONY__ENV__FOSUSER_REGISTRATION"
-              value: "false"
-            - name: "SYMFONY__ENV__LOCALE"
-              value: "en"
-            - name: "TZ"
-              value: "UTC"
-            - name: "POPULATE_DATABASE"
-              value: "false"
-      containers:
-        - name: wallabag
-          image: "wallabag/wallabag:2.6.13"
-          imagePullPolicy: IfNotPresent
-          envFrom:
-          - secretRef:
-              name: wallabag
-          env:
-            - name: "SYMFONY__ENV__DATABASE_CHARSET"
-              value: "utf8"
-            - name: "SYMFONY__ENV__DATABASE_DRIVER"
-              value: "pdo_pgsql"
-            - name: "SYMFONY__ENV__DATABASE_NAME"
-              value: "wallabag"
-            - name: "SYMFONY__ENV__DATABASE_TABLE_PREFIX"
-              value: "wallabag_"
-            - name: "SYMFONY__ENV__DOMAIN_NAME"
-              value: "https://wallabag.cluster.fun"
-            - name: "SYMFONY__ENV__FOSUSER_REGISTRATION"
-              value: "false"
-            - name: "SYMFONY__ENV__LOCALE"
-              value: "en"
-            - name: "TZ"
-              value: "UTC"
-            - name: "POPULATE_DATABASE"
-              value: "false"
-          ports:
-            - name: http
-              containerPort: 80
-              protocol: TCP
-          livenessProbe:
-            tcpSocket:
-              port: 80
-            initialDelaySeconds: 0
-            failureThreshold: 3
-            timeoutSeconds: 1
-            periodSeconds: 10
-          readinessProbe:
-            tcpSocket:
-              port: 80
-            initialDelaySeconds: 0
-            failureThreshold: 3
-            timeoutSeconds: 1
-            periodSeconds: 10
-          startupProbe:
-            tcpSocket:
-              port: 80
-            initialDelaySeconds: 0
-            failureThreshold: 30
-            timeoutSeconds: 1
-            periodSeconds: 5
----
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: wallabag
-  namespace: wallabag
-  labels:
-    app.kubernetes.io/name: wallabag
-  annotations:
-    cert-manager.io/cluster-issuer: letsencrypt
-    nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
-spec:
-  tls:
-    - hosts:
-        - "wallabag.cluster.fun"
-      secretName: "wallabag-ingress"
-  rules:
-    - host: "wallabag.cluster.fun"
-      http:
-        paths:
-          - path: "/"
-            pathType: ImplementationSpecific
-            backend:
-              service:
-                name: wallabag
-                port:
-                  number: 80

manifests/yay-or-nay/yay-or-nay.yaml

@@ -31,7 +31,7 @@ spec:
     spec:
       containers:
       - name: yay-or-nay
-        image: ghcr.io/mocdaniel/yay-or-nay:db-fix
+        image: ghcr.io/mocdaniel/yay-or-nay:1.1.1
         imagePullPolicy: IfNotPresent
         ports:
         - containerPort: 3000
@@ -77,6 +77,7 @@ metadata:
     cert-manager.io/cluster-issuer: letsencrypt
     nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
 spec:
+  ingressClassName: nginx
   tls:
     - hosts:
         - "yay-or-nay.cluster.fun"