chore(deps): update helm release argo-cd to v8.3.1

2025-08-28 12:04:37 +00:00
34 changed files with 162 additions and 423 deletions
--- a/services/Gitea/application-gitea.yaml
+++ b/services/Gitea/application-gitea.yaml
@@ -22,7 +22,7 @@ spec:
  - repoURL: https://dl.gitea.com/charts/
    chart: gitea
    # targetRevision: 11.0.0
-    targetRevision: 12.4.0
+    targetRevision: 12.1.1
    helm:
      valueFiles:
      - $values/services/Gitea/values.yaml
--- a/services/Gitea/supportingfiles/configmap-gitea-actions-act-runner-config.yaml
+++ b/services/Gitea/supportingfiles/configmap-gitea-actions-act-runner-config.yaml
@@ -22,10 +22,8 @@ data:
      options: >
        --add-host=docker:host-gateway
        -v /dev/kvm:/dev/kvm
-        -v /var/run/docker.sock:/var/run/docker.sock
      privileged: true
      valid_volumes:
        - /dev/kvm
-        - /var/run/docker.sock
    runner:
      capacity: 2
--- a/services/Gitea/supportingfiles/sealedsecret-gitea-actions-registration-token.yaml
+++ b/services/Gitea/supportingfiles/sealedsecret-gitea-actions-registration-token.yaml
@@ -1,15 +0,0 @@
-apiVersion: bitnami.com/v1alpha1
-kind: SealedSecret
-metadata:
-  creationTimestamp: null
-  name: gitea-actions-registration-token
-  namespace: gitea
-spec:
-  encryptedData:
-    token: AgCfSO12i+bhMyaQo8esgDhnxc61L5VUGnT+L6q3rdfAco/pgKk6ZKS/p5+oTCu24VIGWnKq91IsvMxPTECfHmy6Z2ah8C8HNUCeOIupzz7QMSkGJuF3Gj0dB92bGQC34nGSmtl+Z0EXxfjZobaYmO2gZGHA2Y6FEf45bgb6wE3uxkv48RsWLDN0gW/FbQw837hcHxjx7Ivf5dpZu5Th3bTalKmEyoIlh7RCzsF8IV/I0V9ztJPeBpTRjUAYryVs8JgqrCW5DQQqAeSTRxccdb4Ldj22XsSOzKMXxsWbIOCqJ1arFZF+fhw3ITEnlDAn2N7Hl5keb/D9lleFcQe293f5+g/sfttVeR0G3a6lGrG0OzY2c5+1pH/Dlt+BfVWcdadV1HGqig+ZrAGQmz4XgUlcFhSuTBw+8pjyECsV+ueysi6DuPDiKh03ienc1dZY53yBo+e6QfV9Z0aIEsHheqasbIn1uh9StwqygTO/i7En3aJSBySuuHT3AMmBwKELsHyNQEgtIFocMjDJxOsxIj/3HYDdBzkEFoyx491hZSnV1ceJxN5BcgYMENJ6D/B5i+Srfyzk7AUD4fcuiyrV5ZWnnuHjOG57UlLXIUWBdeXdy2CS9+POltHuq5kGkku71UEJ/MLuZOHM+Iy/AASErsds9roZ1cBf2n4FpUXe+LwGb+RbvrLl1HETW2XnbsFMleiOx2wicvDsQ8CDSv9RVmxVE6TepHSrrDd2Aq+6PjCfkTpcUVhZYQ8s
-  template:
-    metadata:
-      creationTimestamp: null
-      name: gitea-actions-registration-token
-      namespace: gitea
-    type: Opaque
--- a/services/Gitea/supportingfiles/values.yaml
+++ b/services/Gitea/supportingfiles/values.yaml
@@ -0,0 +1,41 @@
+enabled: true
+
+statefulset:
+  actRunner:
+    repository: gitea/act_runner
+    tag: 0.2.12
+  dind:
+    repository: docker
+    # tag: 25.0.2-dind
+    tag: 28.3.2-dind
+
+  persistence:
+    size: 1Gi
+
+init:
+  image:
+    repository: busybox
+    tag: "1.37.0"
+
+provisioning:
+  enabled: false
+
+  publish:
+    repository: bitnami/kubectl
+    # tag: 1.29.0
+    tag: 1.33.3
+
+existingSecret: "gitea-actions-registration-token"
+existingSecretKey: "token"
+
+giteaRootURL: "https://code.spamasaurus.com"
+
+persistence:
+  create: false
+  claimName: csismb-gitea-act
+  storageClass: csismb-gitea-act
+
+image:
+  registry: "docker.gitea.com"
+  repository: gitea
+  tag: "1.24.2-rootless"
--- a/services/Gitea/values.yaml
+++ b/services/Gitea/values.yaml
@@ -44,11 +44,6 @@ postgresql-ha:
  enabled: false
 valkey:
  enabled: true
-  image:
-    repository: bitnamilegacy/valkey
-  global:
-    security:
-      allowInsecureImages: true
  primary:
    persistence:
      existingClaim: csismb-gitea-cache
--- a/services/Guacamole/application-guacamole.yaml
+++ b/services/Guacamole/application-guacamole.yaml
@@ -1,19 +0,0 @@
-apiVersion: argoproj.io/v1alpha1
-kind: Application
-metadata:
-  name: guacamole
-  namespace: argo-cd
-spec:
-  destination:
-    namespace: guacamole
-    server: https://kubernetes.default.svc
-  project: default
-  syncPolicy:
-    automated:
-      selfHeal: true
-    syncOptions:
-      - CreateNamespace=true
-  source:
-    path: services/Guacamole
-    repoURL: https://code.spamasaurus.com/djpbessems/Kubernetes.K3s.installLog.git
-    targetRevision: HEAD
--- a/services/Guacamole/deployment-guacamole.yaml
+++ b/services/Guacamole/deployment-guacamole.yaml
@@ -1,95 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: guacamole
-  namespace: guacamole
-  labels:
-    app: guacamole
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: guacamole
-  template:
-    metadata:
-      labels:
-        app: guacamole
-    spec:
-      hostname: guacamole
-      containers:
-      - name: guacamole
-        image: guacamole/guacamole:1.6.0
-        env:
-        - name: BAN_ENABLED
-          value: 'false'
-        - name: TOTP_ENABLED
-          value: 'true'
-        - name: GUACD_HOSTNAME
-          value: 'guacamole.guacamole.svc.cluster.local'
-        - name: POSTGRESQL_HOSTNAME
-          value: 'guacamole.guacamole.svc.cluster.local'
-        - name: GUACAMOLE_HOME
-          value: '/etc/guacamole'
-        - name: POSTGRESQL_DATABASE
-          valueFrom:
-            secretKeyRef:
-              name: guacamole-db-secret
-              key: POSTGRES_DATABASE
-        - name: POSTGRESQL_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: guacamole-db-secret
-              key: POSTGRES_PASSWORD
-        - name: POSTGRESQL_USER
-          valueFrom:
-            secretKeyRef:
-              name: guacamole-db-secret
-              key: POSTGRES_USER
-        volumeMounts:
-        - name: csismb-guacamole-home
-          mountPath: /etc/guacamole
-        ports:
-          - name: ui
-            containerPort: 8080
-        livenessProbe:
-          httpGet:
-            port: ui
-            path: /guacamole
-      - name: guacd
-        image: guacamole/guacd:1.6.0
-        env:
-        - name: GUACD_LOG_LEVEL
-          value: 'debug'
-        ports:
-          - name: proxy
-            containerPort: 4822
-        livenessProbe:
-          tcpSocket:
-            port: 4822
-      - name: db
-        image: postgres:16-alpine
-        securityContext:
-          runAsUser: 70
-          runAsGroup: 70
-        env:
-        - name: PGDATA
-          value: /var/lib/postgresql/data/pgdata
-        envFrom:
-        - secretRef:
-            name: guacamole-db-secret
-        volumeMounts:
-        - name: csismb-guacamole-db
-          mountPath: /var/lib/postgresql/data
-        ports:
-          - name: db
-            containerPort: 5432
-        livenessProbe:
-          exec:
-            command: ["pg_isready" ,"-U" ,"$POSTGRES_USER", "-d" ,"$POSTGRES_DATABASE"]
-      volumes:
-      - name: csismb-guacamole-db
-        persistentVolumeClaim:
-          claimName: csismb-guacamole-db
-      - name: csismb-guacamole-home
-        persistentVolumeClaim:
-          claimName: csismb-guacamole-home
--- a/services/Guacamole/middleware-guacamole.yaml
+++ b/services/Guacamole/middleware-guacamole.yaml
@@ -1,8 +0,0 @@
-apiVersion: traefik.io/v1alpha1
-kind: Middleware
-metadata:
-  name: prepend-path-guacamole
-  namespace: guacamole
-spec:
-  addPrefix:
-    prefix: /guacamole
--- a/services/Guacamole/persistentvolume-csismb-guacamole-db.yaml
+++ b/services/Guacamole/persistentvolume-csismb-guacamole-db.yaml
@@ -1,33 +0,0 @@
-apiVersion: v1
-kind: PersistentVolume
-metadata:
-  annotations:
-    pv.kubernetes.io/provisioned-by: smb.csi.k8s.io
-  name: csismb-guacamole-db
-spec:
-  capacity:
-    storage: 1Gi
-  accessModes:
-    - ReadWriteMany
-  persistentVolumeReclaimPolicy: Retain
-  storageClassName: csismb-guacamole-db
-  mountOptions:
-    - dir_mode=0700
-    - file_mode=0700
-    - uid=70
-    - gid=70
-    - nobrl
-    - cache=strict
-    - mfsymlinks
-    - noserverino  # required to prevent data corruption
-  csi:
-    driver: smb.csi.k8s.io
-    # volumeHandle format: {smb-server-address}#{sub-dir-name}#{share-name}
-    # make sure this value is unique for every share in the cluster
-    volumeHandle: 192.168.154.195#guacamole#db
-    volumeAttributes:
-      source: //192.168.154.195/K3s.Volumes
-      subDir: guacamole/db
-    nodeStageSecretRef:
-      name: smb-credentials
-      namespace: guacamole
--- a/services/Guacamole/persistentvolume-csismb-guacamole-home.yaml
+++ b/services/Guacamole/persistentvolume-csismb-guacamole-home.yaml
@@ -1,31 +0,0 @@
-apiVersion: v1
-kind: PersistentVolume
-metadata:
-  annotations:
-    pv.kubernetes.io/provisioned-by: smb.csi.k8s.io
-  name: csismb-guacamole-home
-spec:
-  capacity:
-    storage: 1Gi
-  accessModes:
-    - ReadWriteMany
-  persistentVolumeReclaimPolicy: Retain
-  storageClassName: csismb-guacamole-home
-  mountOptions:
-    - dir_mode=0777
-    - file_mode=0777
-    - nobrl
-    - cache=strict
-    - mfsymlinks
-    - noserverino  # required to prevent data corruption
-  csi:
-    driver: smb.csi.k8s.io
-    # volumeHandle format: {smb-server-address}#{sub-dir-name}#{share-name}
-    # make sure this value is unique for every share in the cluster
-    volumeHandle: 192.168.154.195#guacamole#home
-    volumeAttributes:
-      source: //192.168.154.195/K3s.Volumes
-      subDir: guacamole/home
-    nodeStageSecretRef:
-      name: smb-credentials
-      namespace: guacamole
--- a/services/Guacamole/persistentvolumeclaim-csismb-guacamole-db.yaml
+++ b/services/Guacamole/persistentvolumeclaim-csismb-guacamole-db.yaml
@@ -1,12 +0,0 @@
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: csismb-guacamole-db
-  namespace: guacamole
-spec:
-  accessModes:
-    - ReadWriteMany
-  storageClassName: csismb-guacamole-db
-  resources:
-    requests:
-      storage: 1Gi
--- a/services/Guacamole/persistentvolumeclaim-csismb-guacamole-home.yaml
+++ b/services/Guacamole/persistentvolumeclaim-csismb-guacamole-home.yaml
@@ -1,12 +0,0 @@
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: csismb-guacamole-home
-  namespace: guacamole
-spec:
-  accessModes:
-    - ReadWriteMany
-  storageClassName: csismb-guacamole-home
-  resources:
-    requests:
-      storage: 1Gi
--- a/services/Guacamole/sealedsecret-guacamole-db-secret.yaml
+++ b/services/Guacamole/sealedsecret-guacamole-db-secret.yaml
@@ -1,19 +0,0 @@
-apiVersion: bitnami.com/v1alpha1
-kind: SealedSecret
-metadata:
-  creationTimestamp: null
-  name: guacamole-db-secret
-  namespace: guacamole
-spec:
-  encryptedData:
-    POSTGRES_DATABASE: AgBg7zRQJoXeQZm0cXuc1FvSaN7WLWvKf/DcWWKD/YmviQEWuwxl/ZL3h9o7OTCMUegYLwYYm7t6CXPXvZ+KQqUQlXaMuxFtx03qdLlVSHJxlzi6Wh7Hhsk1c5/vQZdB2NFxMhcpPxq787F8PmiAyYPDXk7jBbS60ujFbG2X8YQt0zp2zXFFtpPsirbwNePi8fqHPZjlCpqMtgM9ZmdZhClS2kVNM9oynfdB/nTIdF8cuoTxfd0GbjQXODtRdqrB9PBQQSEGghEbwwNJiMzyU9fpPEKtYREwEKgYGJTQWz1oPU2x3zQuX/alp1B+/iWc+v1aqtwd0ZHVG7EnYlQ8sKOXj8wWoN8yO4XqoCbGce5bhrtC5UuQANhnKZByQQNsPf+6Px8SyGcHvlVdngnviP3HvQTggsZPrqHy0rd3t0z7NImoFQa09hP9aD9J/AY7NFadDKHkWfL+jNC79HBWPz6kBMqPj04jloTBF6BAmrvbYvdwkoDQ0cOXMpVTOc5BL7E6kUSkXp5l5SiMkdjUdNYEwSJPk09VzjAayalJoDlANk7j2kgmAOLlAqWs/+Ade2/8Fu/5iImOHVYG5pD3fmJVfjj2RJx8+juY8mfuEVvB3m7kMI77vDmnq8rF1clT2EmoyCsK3vwm2nD4WpMqi3qlZMwFkxlRvpOwt8sBy/Vl1yLMyVSqlVedTXGctZ4jHpHcQqm2dMqVSKI=
-    POSTGRES_PASSWORD: AgCFIob2Vnq6DyqhRcJN8jZMUwH+5XCU2aIz4pCtXJkeOs21jdhYWhUMvBjGLmpEMZVObWqQ75p6lB8s9VYbbcsWgTpVTlbmgs17lVpSrOV43XdwWRX33pSRie0pDRAOwQowSgN1nW145q6oJpeP+oE5Zr30Vx/j6WSllG9Yu4437p5fHqdLdAPKDXgFrVYUnxY3FZfITVC0DEmPkmVZZ/2wM6U5Ws1fmFC6clp/S7xPTxKfBPfWcUyhKNpBYPcbYLVvXmCj6MCZaTWdsDIdEw7Di5L9SYrvsfjtGHu92df/kv2cBpogi5yLZasXRW9UH6ENBcBjpl00cNvKBzbHRjljwdWe8454CfTrpTjrb3F3ag5hyQj2qbbyyvPbsn3T/A1U38o38crmMEvjCl9cYeVjGa7FrFtJaJa1SRThLWeUZefudRoOec9eyvfWVp4P4LdxQQpKhWsGhPJCVQqdWcumpXR3VLCztsc1yMI+R6+THtyCmZl0Dw57VSpsv+Gtky/Y5Rcf58HAXrtov8vmtWiUAWYo3CgWDOPohd51qXsR+6ZPOBoabclPvyE2Rmdbk4W7FRq3Ad2ZjhmtdsJOF5G7Hq8PflNDhUCOK6RDYZk4kEOUEx5LOAN+dRpOWLO3Vvr8VRFKjeyt59cjPidApbjMayt294hKEANUTdLFXMZ0KiguZQrx+fC2Yb82/NZ62VpdzuKlWPTAEYI=
-    POSTGRES_USER: AgCvkA4bTKbDY0B1mkLA5K+BjzXFOBnaKOnagTZGrKUYJrScPA/zcw8RjQqMbdq8cRWrY5y+Et1vcchJwR0Me4Zkfqo762r03W/ohFdlah+hoHIdjvXDIgPu4uSLOdRSDd+zRbd9j0BD2Q7GbA+XhmUlbstsHmgDwJc5T0ONqOPRAJkYpR83uVe8z8zqBUsJRLU61KIqMchw0R22GgC5gmyb0Du3kZOuHZPeGdztZhHTAmFot0z4DyQH8IUfkRWJQdTYuAjeDjWpoBGtTkldCTHSZ97pNpEbocNe86aEIl3xAvP+3agDEqjln+TMZUKDATk9dOtXvqBxxhceSKBbAqdOm/nLM90MckDX9H/CxFwSUQJh2xZiquLGGMecrIX8R40lNzmh2eXVa/bhBhkouwGs1/Hg33lAvcDajGLuSRsI/aVPgIthpipCilWRWWLTZ0QdLjtTqxDOprOlNHTST0W34XelGAb8O2yB65VpM21If+i74MdtuxNRTMspvQ8mtIzQe53xR59KSxX6Z2rZ3uETqXB3Cpvfs79hw5sh1FaMWAY7Egf7Z8mgMg3YzqHWgByXeHwzp6/Nl754pkAyQ+1SmlRpS6PGH0c811zy/ycBgIHPNDm7glSoZoA6h6aNz2Q2O/plxxzeshJ5cRx+DsAmSBGcpPsWwCaIYzMxg69Ah2BJqD+7Ky8d4CyfEp8gKWfO8OFyqzyPOjw=
-  template:
-    metadata:
-      creationTimestamp: null
-      labels:
-        app: guacamole
-      name: guacamole-db-secret
-      namespace: guacamole
-    type: Opaque
--- a/services/Guacamole/sealedsecret-smb-credentials.yaml
+++ b/services/Guacamole/sealedsecret-smb-credentials.yaml
@@ -1,16 +0,0 @@
-apiVersion: bitnami.com/v1alpha1
-kind: SealedSecret
-metadata:
-  creationTimestamp: null
-  name: smb-credentials
-  namespace: guacamole
-spec:
-  encryptedData:
-    password: AgBs08sIFvUZdSmpszzpWZB68ByIU+K3h9atIvo3Zq4f44LIQwDEi4r4W58fUCIOzt1bW3aWJua5gWm0iK9KoCpRoqPo9mJkjS+HRBC3I8ukAmLitGYs8t3HiuwSAdzYdqPch6BbQySMiyEB7JymczjtnFeR5DdxFJBwN3rC6ai2GFh2HfJl93Va8tEd7F6Zg3ZzRYlKxPOO/bJaE6FqS+W9Lo042h5lmGEh8NpOBL23D1MJ43bGutshZp4jWVoygTYpw9N62FoBX439I7aquxVLRyE97dG3JHYyRs+k9n7jgs6SJytw6jJdFO/qUEGVS6xOQR57jaGBZyeBKkg00PXXS8selJqF8S9/2pjlEEqtBSDVPNmnvN2nrFqVidqWfhB4SiJr3jtROOvXjpbg1+C+uGFVFPM7Ux/y8tOTkiTJZs9jXJyiS7CqlPqM9sswrLvBXEqdzeL7Gr2pm+5GRC9gJ86qa7df2xVRVZv5A1jhfmyQwC1H3Myc4HVjRLCGxmvNGu7K+0RLYpUS27AY4o6bY9EAJ6/fsrbavIZzxYnZJ8vx7BYgwPzD/tmsSrANUHZ5iWtLwh2HWI/RPKuZKG+AYrwVP8/4qnLMtu49CifjrXjwNFPz39iRdqU38+JSRA2eGemsrTVVC3SZue4wnel9R5fSIup20EnvosgXDK3MxU705R2guYRFNEYYJzFtufJHQl2W1KHeZNjN7pj2zgli
-    username: AgAOO3vS+I+bKW6xbz1Vc9c7p+xzHgTm3qg3NSPvGtZ6p6SH5ZBgk+nBb4IlhJ3NHvf53OUo/JVdooWgJqriCLibeyW3QtUsT2IbG4mL4VJ79UtDKqDARLMdJzZdXxbpBA1tvNK6Biz1T2yZOGSsw2BoGEkTECz151V+P55BeWxgY20JHY2h29A3NP8UXD2Y3dyfi1Z9U9AenS6SKxlDQiW6dPJdj4khbEnGezuKuvmjrr/r0i4ZiK46DlbBMDsuhwXxZoDmPKoEbtWuUMpBu1+qw4O7m9ddGTkW/R+u2mBXHplswL1hXHTj29YWih4UIaKMDtf4BRIqbKU9brl+27dKD6t66/GLdV8qoUDRcBPGuPzEJl3Fxc6sWQcUXr+HthGEbWtyETx4t8qpOXAEIBxwoqsV+u1zZth7AthrtZCyBUy0MQ0xZQcI6KdpzeIlwNTMioK49P6HhEcn5imvTNJ1LsVCnVZwz1LOwZQ7EoN6xL4IQdcXKJUdcWNWf/uczjA2rYYWVnTaxaO5uDauZJqDfLGqGy2pnWHxaonjS053jZRw/6MWV5XNrfA/XwrmxXdAGSZGa3Y/vKGB0C87osZOC9WyTAWmxUagcJr+xK6Qu0UWttl84cImtXRQea+qW7tQ/Akk1ZvIhQxs9haPtMMKBt/nwQRHLJuKf+F/EAWOanx7/yBYGHQtx1wo5ru4AmR5OLJwQhY=
-  template:
-    metadata:
-      creationTimestamp: null
-      name: smb-credentials
-      namespace: guacamole
-    type: Opaque
--- a/services/Guacamole/service-guacamole.yaml
+++ b/services/Guacamole/service-guacamole.yaml
@@ -1,18 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: guacamole
-  namespace: guacamole
-spec:
-  ports:
-    - protocol: TCP
-      name: ui
-      port: 8080
-    - protocol: TCP
-      name: proxy
-      port: 4822
-    - protocol: TCP
-      name: db
-      port: 5432
-  selector:
-    app: guacamole
--- a/services/Memos/deployment-memos.yaml
+++ b/services/Memos/deployment-memos.yaml
@@ -17,7 +17,7 @@ spec:
    spec:
      containers:
      - name: app
-        image: neosmemo/memos:0.25
+        image: neosmemo/memos:0.24
        imagePullPolicy: Always
        env:
          - name: MEMOS_PORT
--- a/services/PVR/Jellyseerr/application-jellyseerr.yaml
+++ b/services/PVR/Jellyseerr/application-jellyseerr.yaml
@@ -18,7 +18,7 @@ spec:
    targetRevision: HEAD
  - repoURL: ghcr.io/fallenbagel/jellyseerr
    chart: jellyseerr-chart
-    targetRevision: 2.7.0
+    targetRevision: 2.4.0
    helm:
      valueFiles:
        - $values/services/PVR/Jellyseerr/values.yaml
--- a/services/PVR/Wizarr/deployment-wizarr.yaml
+++ b/services/PVR/Wizarr/deployment-wizarr.yaml
@@ -1,40 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: wizarr
-  namespace: wizarr
-  labels:
-    app: wizarr
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: wizarr
-  template:
-    metadata:
-      labels:
-        app: wizarr
-    spec:
-      containers:
-      - name: wizarr
-        image: ghcr.io/wizarrrr/wizarr:latest
-        imagePullPolicy: Always
-        env:
-          - name: PUID
-            value: '1000'
-          - name: PGID
-            value: '1000'
-          - name: DISABLE_BUILTIN_AUTH
-            value: 'false'
-          - name: TZ
-            value: Australia/Melbourne
-        ports:
-          - name: web
-            containerPort: 5690
-        volumeMounts:
-        - mountPath: /data
-          name: csismb-wizarr-data
-      volumes:
-      - name: csismb-wizarr-data
-        persistentVolumeClaim:
-          claimName: csismb-wizarr-data
--- a/services/PVR/Wizarr/ingressroute-wizarr.yaml
+++ b/services/PVR/Wizarr/ingressroute-wizarr.yaml
@@ -1,18 +0,0 @@
-apiVersion: traefik.io/v1alpha1
-kind: IngressRoute
-metadata:
-  name: wizarr
-  namespace: wizarr
-spec:
-  entryPoints:
-    - websecure
-  routes:
-  - match: Host(`account.pvr.spamasaurus.com`)
-    kind: Rule
-    services:
-    - name: wizarr
-      port: 5690
-    middlewares:
-      - name: 2fa-authentication@file
-      - name: security-headers@file
-      # - name: compression@file
--- a/services/PVR/Wizarr/persistentvolume-csismb-wizarr-data.yaml
+++ b/services/PVR/Wizarr/persistentvolume-csismb-wizarr-data.yaml
@@ -1,34 +0,0 @@
-apiVersion: v1
-kind: PersistentVolume
-metadata:
-  annotations:
-    pv.kubernetes.io/provisioned-by: smb.csi.k8s.io
-  name: csismb-wizarr-data
-spec:
-  capacity:
-    storage: 1Gi
-  accessModes:
-    - ReadWriteMany
-  persistentVolumeReclaimPolicy: Retain
-  storageClassName: csismb-wizarr-data
-  mountOptions:
-    - dir_mode=0777
-    - file_mode=0777
-    - uid=1000
-    - gid=1000
-    - nobrl
-    - cache=strict
-    - iocharset=utf8
-    - mfsymlinks
-    - noserverino  # required to prevent data corruption
-  csi:
-    driver: smb.csi.k8s.io
-    # volumeHandle format: {smb-server-address}#{sub-dir-name}#{share-name}
-    # make sure this value is unique for every share in the cluster
-    volumeHandle: 192.168.154.195#wizarr#data
-    volumeAttributes:
-      source: //192.168.154.195/K3s.Volumes
-      subDir: wizarr/data
-    nodeStageSecretRef:
-      name: smb-credentials
-      namespace: wizarr
--- a/services/PVR/Wizarr/persistentvolumeclaim-csismb-wizarr-data.yaml
+++ b/services/PVR/Wizarr/persistentvolumeclaim-csismb-wizarr-data.yaml
@@ -1,12 +0,0 @@
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: csismb-wizarr-data
-  namespace: wizarr
-spec:
-  accessModes:
-    - ReadWriteMany
-  storageClassName: csismb-wizarr-data
-  resources:
-    requests:
-      storage: 1Gi
--- a/services/PVR/Wizarr/sealedsecret-smb-credentials.yaml
+++ b/services/PVR/Wizarr/sealedsecret-smb-credentials.yaml
@@ -1,14 +0,0 @@
-apiVersion: bitnami.com/v1alpha1
-kind: SealedSecret
-metadata:
-  name: smb-credentials
-  namespace: wizarr
-spec:
-  encryptedData:
-    password: AgAFPVyGCmZtPcMq5/BUWuAHWBBTXTRbMfS0iFTKCZiuKz0GmuKjjQ6XHfpMo3LvSs2TJD0Dzh/SjwqhnW4VA/xwH5BeBEn8hB5LS3FTN41MoJeH6PxY+be3FqMVLFkfZi7ae37D49qQkSb09FVd5cK/iy18ikDRR+sbr2snX0qZqrN4nYbvAJKfLeyUjbflXuS1XeQAv2vtZvNlgSRfpVph/DFGiPnwMVxkjLMWxIQnpX6SJy+xG6jWWMiAELH/Ro9vUEpYVO56foqemcU8NssHdvO8pfZ6nqFuXvHopM4MZYr6rH8b0XA7tK9crR334De7JpgwdLc7hQmuc2cn2IE/OsfPWnqJ8oQvR8ndZrX66IBBWOQM2RTzpyz7ZT3s8Ryc5Wew0NAeeusCm3V6M4NUAKZLCNO6rgKFzpGY6mNDTCKHNzj31GffxNF+U5KCXJuOL5E+vJaaWUi3tV9rO8WeKjrA2dPOPu8pMBFY//qYVcPYzVZ3m3oavQsJTSJZ7YCcYAUiL+UYNzeMZxTsU7dxqm864YOalc15453M35jespDioYTYtmSoQuQYQ3uyW3mLFF0lwspdCXhuulJQvqZ6AVfNkP55cHpYVpkRnlY6ESHI2fbBtWBLRrRlgRF2m8Hsa2ZGI+YmfSVYhKG1BotN4XpLlfLbNSeqlMMzR3SIK7n5zlZKJDZl/czr4w+lzJkXPXyhpZHYfGlPTCsXOW2E
-    username: AgApQgyeFk1Ebce3P86Ih3aAXwiwmJ8Jtkwd4reHW45l59X8OosDCdZnhoMxKebciG17Caa7MLWF5A7MFNzahlqnyMCj3xdoC+w8fqLDQUO8vhV1xikAfuVxLMqpj+BHg4gl2N+vuwz+EGnUrN+upC6AmJAC1KSY3Y1V+i6l6wegXv2FGzVYS9p48bROr8LJEEvpzaw99mA4DXPLO5rp9Dh90c70GN5wOq1AHC4oEQzeQJERxQ+M8xS1jGFOn0XDHvw5d1eIfOoN1lAyntowDfHzNZJ8gumS3xDr0sL2ISVkozvAGkabUBq2gMP1U0TlwQIPOfGJdUTYFujAZAItwT7YkLx2hiS3gITgiFuO3muB4U2xw+1Jimj4RH9kMdYDSXEnee2yCh4oZAiIYazXcwUv7R2d83QH2Nl6ORwHnkGsQRMe27q9CHszgLYM1tA2pUDtJfnengDLs4CCNUj1wCP40mThqFIJ9XF1FlkF3ulBleMBbLzFx+4UJJJXbVS2IRTufmLzAOk6ejf3WySP1/Cu5ik0/+2/5D7Ct/uraz+269YfbE8gz9wWMD4kU/EjoTAkfGZ8xuRso8hxKVOh4bXsgCCi0HT3MUJfE82crkKQxCIBzTPOYjreveZzL1TBtb9BQTaa7Cj8S2wNgrhGG9zAavpOMOGg4VtBuCBa9J6Vgw1EzS3vT/MjLMlo9JQGp8smH1kqNos=
-  template:
-    metadata:
-      name: smb-credentials
-      namespace: wizarr
-    type: Opaque
--- a/services/PVR/Wizarr/_namespace-wizarr.yaml
+++ b/services/PVR/Wizarr/_namespace-wizarr.yaml
@@ -1,4 +1,4 @@
 apiVersion: v1
 kind: Namespace
 metadata:
-  name: wizarr
+  name: webtop
--- a/services/PVR/Wizarr/application-wizarr.yaml
+++ b/services/PVR/Wizarr/application-wizarr.yaml
@@ -1,11 +1,11 @@
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  name: wizarr
+  name: webtop
  namespace: argo-cd
 spec:
  destination:
-    namespace: wizarr
+    namespace: webtop
    server: https://kubernetes.default.svc
  project: default
  syncPolicy:
@@ -14,5 +14,5 @@ spec:
      - CreateNamespace=true
  sources:
  - repoURL: https://code.spamasaurus.com/djpbessems/Kubernetes.K3s.installLog
-    path: services/PVR/Wizarr
+    path: services/Webtop
    targetRevision: HEAD
--- a/services/Webtop/configmap-init.d-zsh.yaml
+++ b/services/Webtop/configmap-init.d-zsh.yaml
@@ -0,0 +1,18 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: init.d-zsh
+  namespace: webtop
+data:
+  00-zsh.sh: |
+    #!/bin/bash
+
+    # Make sure zsh is installed and available
+    ZSH_BIN=$(command -v zsh)
+
+    if [[ -x "$ZSH_BIN" ]]; then
+        echo "[webtop] Setting abc's default shell to $ZSH_BIN"
+        usermod -s "$ZSH_BIN" abc
+    else
+        echo "[webtop] zsh not found, skipping chsh"
+    fi
--- a/services/Webtop/deployment-webtop.yaml
+++ b/services/Webtop/deployment-webtop.yaml
@@ -0,0 +1,48 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: webtop
+  namespace: webtop
+  labels:
+    app: webtop
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: webtop
+  strategy:
+    type: Recreate
+  template:
+    metadata:
+      labels:
+        app: webtop
+    spec:
+      containers:
+      - name: webtop
+        image: lscr.io/linuxserver/webtop:latest
+        env:
+          - name: START_DOCKER
+            value: "false"
+          - name: DOCKER_MODS
+            value: linuxserver/mods:universal-package-install
+          - name: INSTALL_PACKAGES
+            value: nano|zsh
+          - name: TZ
+            value: Australia/Melbourne
+        ports:
+          - name: web
+            containerPort: 3001
+        volumeMounts:
+        - mountPath: /config
+          name: webtop-config
+        - mountPath: /custom-cont-init.d/00-zsh.sh
+          name: webtop-initd
+          subPath: 00-zsh.sh
+      volumes:
+      - name: webtop-config
+        persistentVolumeClaim:
+          claimName: webtop-config
+      - name: webtop-initd
+        configMap:
+          name: init.d-zsh
+          defaultMode: 0700
--- a/services/Guacamole/ingressroute-guacamole.yaml
+++ b/services/Guacamole/ingressroute-guacamole.yaml
@@ -1,8 +1,8 @@
 apiVersion: traefik.io/v1alpha1
 kind: IngressRoute
 metadata:
-  name: guacamole
-  namespace: guacamole
+  name: webtop
+  namespace: webtop
 spec:
  entryPoints:
    - websecure
@@ -10,8 +10,10 @@ spec:
  - match: Host(`remote.spamasaurus.com`)
    kind: Rule
    services:
-    - name: guacamole
-      port: 8080
+    - name: webtop
+      port: 3001
+      scheme: https
+      serversTransport: insecure-skip-verify
    middlewares:
-      - name: prepend-path-guacamole
+      - name: 2fa-authentication@file
      - name: security-headers@file
--- a/services/Webtop/persistentvolumeclaim-webtop-config.yaml
+++ b/services/Webtop/persistentvolumeclaim-webtop-config.yaml
@@ -0,0 +1,11 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: webtop-config
+  namespace: webtop
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 20Gi
--- a/services/Webtop/sealedsecret-smb-credentials.yaml
+++ b/services/Webtop/sealedsecret-smb-credentials.yaml
@@ -0,0 +1,16 @@
+apiVersion: bitnami.com/v1alpha1
+kind: SealedSecret
+metadata:
+  creationTimestamp: null
+  name: smb-credentials
+  namespace: webtop
+spec:
+  encryptedData:
+    password: AgAwMck+jQJxNiv0vSkvgEcpbToRv2u5KzJSvJveY4gYXDeBW3mOdweCznypGtDZ6au+gDsAphqJKmgp7TMC3nYppjaqEm9nFybOnwQHhX+7t36c1MRQWNwBhMp3DDNikv9EhQBVdqiXQShX/sPQEBYgNCmspBGQNv/QWFxJPRbmpg1DdFn6TkRlW3VNqecO6RTgbj6YpKG9SCgQjsvXdOOEM85tc2v0UODITFNlemxq2anks8FzSb3VxXBqWOq3np1DcrTbHkcQMokVp9to8d/UXdD1L2jbWr4ykhosf3AV+9Ojgp32D48ODS0GgGykgN9bArwmRLNSYJbclIqViePO78CaOTAnquKf7HN1ZqaLhCNMLvY+MOzrwvmXlWVmmHLI1YLYJSxV9u2WTJlU7jRN/xlCgKbAUC50fhgqMd8l4RXlieqrSePnpgpnI96+fovW1Q2jeYngXX1RzjEsG1Up2ZhSiuWoP+We0nH3VCbIUrjk5XAdojrO1Uj9A1FOd0Gx1GVj6e++3/DpjuGOSphNspXXWiCn3hbH0idh/r011AQwKq6RgDO8QhtSZx8Ditnqu50hCmg8gRK6h2hSZ8LXiRvKy7l5H3Ca/99KyhDHoA7n1fqRN7702rOyz8txjwkbgyadk7T0zYdMYxXffrVgfD2XIWhKdjwtxbiO0OGeWcLD3IQwlZcyRsz0stqUPhbB+t4BNN5RE78tGpx3e0yv
+    username: AgAyzzViZggLUc47A3TkctmUG6rCEDnu2wsLXgRGs2Vw5Sg1KnOuUDhE/BQpM70Zhl07af+v0SqWkMJHM2n+L5jQ7ed27rqsRDYNJNXJqt6gwY6D7Rx0OYOfxOILrk0LXAfLIaZiuREzwrm6JExI5+xu/nTDgQm7sIufQvIrWvaJVM2zfhtHLGaB1x/CGzrc6ViXfPsYAFrlHWihNJJ+PVb3aoW68/oip5MmhKdmm9igf0Hmtr67fMm2A0JSA8cSbFA/bG2i94qHX+zswWrIzePgNrz2x2bpeag7p2/2XO6JssMn5XkZZVIWbB+cEX1wf8srrUnJqD8ycgiD1CY96A5ILPd50IErDYGv9xZAkxpfO53q3USC4dx8O4AnZFHkVWHfNYd0RBqhnHWTMpUXfEY5TC5KHA2RxS6v5wa3oBU446uSviswDuDPhg4aKStTasBvgmVgRLmnI9d/NxvIlSmNxMfaIvpyKXnvNZ8eaKIB9LeBVBzmubtATx712blNua78NuojBHtVCp042KW027fDs9aAJvUg1zFArxCwrgepakOrxO4WgUB1AUTomzKzZfKu4PjWRCYRwpyBHg38F/Y1IYAkffIMfWXQ31YQm2ng4/Xg+OYPJG7eKoVvGEWrqwFi0hqcEvXJPcYpp/o1fDKnwB61paMZOk7D4rJmdI9dTJsEZ6aIZzMSvRWZuw817FH3Feu1bgs=
+  template:
+    metadata:
+      creationTimestamp: null
+      name: smb-credentials
+      namespace: webtop
+    type: Opaque
--- a/services/Webtop/serverstransport-insecure-skip-verify.yaml
+++ b/services/Webtop/serverstransport-insecure-skip-verify.yaml
@@ -0,0 +1,7 @@
+apiVersion: traefik.io/v1alpha1
+kind: ServersTransport
+metadata:
+  name: insecure-skip-verify
+  namespace: webtop
+spec:
+  insecureSkipVerify: true
--- a/services/PVR/Wizarr/service-wizarr.yaml
+++ b/services/PVR/Wizarr/service-wizarr.yaml
@@ -1,12 +1,12 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: wizarr
-  namespace: wizarr
+  name: webtop
+  namespace: webtop
 spec:
  ports:
    - protocol: TCP
      name: web
-      port: 5690
+      port: 3001
  selector:
-    app: wizarr
+    app: webtop
--- a/storage/csi-driver-smb/application-csi-driver-smb.yaml
+++ b/storage/csi-driver-smb/application-csi-driver-smb.yaml
@@ -13,7 +13,7 @@ spec:
  sources:
  - repoURL: https://raw.githubusercontent.com/kubernetes-csi/csi-driver-smb/master/charts
    chart: csi-driver-smb
-    targetRevision: 1.19.1
+    targetRevision: v1.18.0
    helm:
      valueFiles:
      - $values/storage/csi-driver-smb/values.yaml
--- a/system/ArgoCD/application-argo-cd.yaml
+++ b/system/ArgoCD/application-argo-cd.yaml
@@ -11,8 +11,7 @@ spec:
  sources:
  - repoURL: https://argoproj.github.io/argo-helm
    chart: argo-cd
-    # targetRevision: 8.1.2
-    targetRevision: 8.6.4
+    targetRevision: 8.3.1
    helm:
      valueFiles:
      - $values/system/ArgoCD/values.yaml
--- a/system/SealedSecrets/application-sealed-secrets-controller.yaml
+++ b/system/SealedSecrets/application-sealed-secrets-controller.yaml
@@ -13,7 +13,7 @@ spec:
  sources:
  - repoURL: https://bitnami-labs.github.io/sealed-secrets
    chart: sealed-secrets
-    targetRevision: 2.17.7
+    targetRevision: 2.17.4
    helm:
      valueFiles:
      - $values/system/SealedSecrets/values.yaml