chore(deps): update actions/checkout action to v6

Reviewed-on: #19

.gitea/workflows/renovate.yaml

@@ -16,12 +16,12 @@ jobs:
     container: ghcr.io/renovatebot/renovate:latest
     steps:
       - name: Check out repository code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
       - name: Run Renovate CLI
         run: |
           renovate
         env:
-          LOG_LEVEL: "debug"
+#          LOG_LEVEL: "debug"
           RENOVATE_CONFIG_FILE: ${{ gitea.workspace }}/.renovate/config.js
           RENOVATE_TOKEN: ${{ secrets.RENOVATE_TOKEN }}
-          #GITHUB_COM_TOKEN: ${{ secrets.RENOVATE_GITHUB_TOKEN }} # optional
+          GITHUB_COM_TOKEN: ${{ secrets.GH_TOKEN }}

services/Gitea/application-gitea.yaml

@@ -22,7 +22,7 @@ spec:
   - repoURL: https://dl.gitea.com/charts/
     chart: gitea
     # targetRevision: 11.0.0
-    targetRevision: 12.1.1
+    targetRevision: 12.4.0
     helm:
       valueFiles:
       - $values/services/Gitea/values.yaml

services/Gitea/supportingfiles/configmap-gitea-actions-act-runner-config.yaml

@@ -22,8 +22,10 @@ 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

services/Gitea/supportingfiles/sealedsecret-gitea-actions-registration-token.yaml

@@ -0,0 +1,15 @@
+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

services/Gitea/supportingfiles/values.yaml

@@ -1,41 +0,0 @@
-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.5-rootless"

services/Gitea/values.yaml

@@ -44,6 +44,11 @@ postgresql-ha:
   enabled: false
 valkey:
   enabled: true
+  image:
+    repository: bitnamilegacy/valkey
+  global:
+    security:
+      allowInsecureImages: true
   primary:
     persistence:
       existingClaim: csismb-gitea-cache

services/Guacamole/application-guacamole.yaml

@@ -0,0 +1,19 @@
+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

services/Guacamole/deployment-guacamole.yaml

@@ -0,0 +1,95 @@
+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

services/Guacamole/ingressroute-guacamole.yaml

@@ -1,8 +1,8 @@
 apiVersion: traefik.io/v1alpha1
 kind: IngressRoute
 metadata:
-  name: webtop
-  namespace: webtop
+  name: guacamole
+  namespace: guacamole
 spec:
   entryPoints:
     - websecure
@@ -10,10 +10,8 @@ spec:
   - match: Host(`remote.spamasaurus.com`)
     kind: Rule
     services:
-    - name: webtop
-      port: 3001
-      scheme: https
-      serversTransport: insecure-skip-verify
+    - name: guacamole
+      port: 8080
     middlewares:
-      - name: 2fa-authentication@file
+      - name: prepend-path-guacamole
       - name: security-headers@file

services/Guacamole/middleware-guacamole.yaml

@@ -0,0 +1,8 @@
+apiVersion: traefik.io/v1alpha1
+kind: Middleware
+metadata:
+  name: prepend-path-guacamole
+  namespace: guacamole
+spec:
+  addPrefix:
+    prefix: /guacamole

services/Guacamole/persistentvolume-csismb-guacamole-db.yaml

@@ -0,0 +1,33 @@
+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

services/Guacamole/persistentvolume-csismb-guacamole-home.yaml

@@ -3,14 +3,14 @@ kind: PersistentVolume
 metadata:
   annotations:
     pv.kubernetes.io/provisioned-by: smb.csi.k8s.io
-  name: csismb-ldapwrapper-cache
+  name: csismb-guacamole-home
 spec:
   capacity:
     storage: 1Gi
   accessModes:
     - ReadWriteMany
   persistentVolumeReclaimPolicy: Retain
-  storageClassName: csismb-ldapwrapper-cache
+  storageClassName: csismb-guacamole-home
   mountOptions:
     - dir_mode=0777
     - file_mode=0777
@@ -22,10 +22,10 @@ spec:
     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#ldapwrapper#cache
+    volumeHandle: 192.168.154.195#guacamole#home
     volumeAttributes:
       source: //192.168.154.195/K3s.Volumes
-      subDir: ldapwrapper/cache
+      subDir: guacamole/home
     nodeStageSecretRef:
       name: smb-credentials
-      namespace: ldapwrapper
+      namespace: guacamole

services/Guacamole/persistentvolumeclaim-csismb-guacamole-db.yaml

@@ -1,12 +1,12 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: csismb-ldapwrapper-cache
-  namespace: ldapwrapper
+  name: csismb-guacamole-db
+  namespace: guacamole
 spec:
   accessModes:
     - ReadWriteMany
-  storageClassName: csismb-ldapwrapper-cache
+  storageClassName: csismb-guacamole-db
   resources:
     requests:
       storage: 1Gi

services/Guacamole/persistentvolumeclaim-csismb-guacamole-home.yaml

@@ -0,0 +1,12 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: csismb-guacamole-home
+  namespace: guacamole
+spec:
+  accessModes:
+    - ReadWriteMany
+  storageClassName: csismb-guacamole-home
+  resources:
+    requests:
+      storage: 1Gi

services/Guacamole/sealedsecret-guacamole-db-secret.yaml

@@ -0,0 +1,19 @@
+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

services/Guacamole/sealedsecret-smb-credentials.yaml

@@ -0,0 +1,16 @@
+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

services/Guacamole/service-guacamole.yaml

@@ -0,0 +1,18 @@
+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

services/LdapWrapper/deployment-ldapwrapper.yaml

@@ -1,38 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: ldapwrapper
-  namespace: ldapwrapper
-  labels:
-    app: ldapwrapper
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: ldapwrapper
-  template:
-    metadata:
-      labels:
-        app: ldapwrapper
-    spec:
-      containers:
-      - name: ldapwrapper
-        image: ahaen/azuread-ldap-wrapper:latest
-        env:
-        - name: GRAPH_IGNORE_MFA_ERRORS
-          value: 'true'
-        - name: LDAP_PORT
-          value: '389'
-        envFrom:
-        - secretRef:
-            name: ldapwrapper
-        ports:
-        - containerPort: 389
-          name: ldap
-        volumeMounts:
-        - mountPath: /app/.cache
-          name: csismb-ldapwrapper-cache
-      volumes:
-      - name: csismb-ldapwrapper-cache
-        persistentVolumeClaim:
-          claimName: csismb-ldapwrapper-cache

services/LdapWrapper/sealedsecret-ldapwrapper.yaml

@@ -1,22 +0,0 @@
-apiVersion: bitnami.com/v1alpha1
-kind: SealedSecret
-metadata:
-  creationTimestamp: null
-  name: ldapwrapper
-  namespace: ldapwrapper
-spec:
-  encryptedData:
-    AZURE_APP_ID: AgAiauqNLJ+JncVKWkTrnbHMXJnhO5Qb5NEOTTftQoSz9BEByAsHAM3XdU0HpgbrZgC2JBHVuzlPQ0AxvAowOMywXVsa51N/ck1KNt/KaANX1eJIRgVdhQtafJm+uoiePbTKHezvgHbQQE14fqw2hMa2zI7pdEJb9qeLh5nVGcNyFown0SAnTWYRmvZNyy8oDQZyBCs/g1IAZk+ok0QU/mrU4Jx7yDT7uFZnahQAxeBYO2/UXQxVVbGchba4B2IpNl9ae3eK/DYA7ZlSMpTvh27ELeatpB8A66hXutS3Srec4CLDI9ULbT87ua5ndQreRCzMTOcUEO+EPAB0u7Vvf+4TNJqBmixpLlt615ruLCX5DDIXksDgIu7x3KBVSqoKCl/8qcYfZM6QL8cIQIMS4AN3jmIhh4bQV1qAQIMq8IgcHwV2phQWv75eEGIAyvhoKqlmV9MmTbSkUVwiVSxClVXIdr6U32sU22v4h+NvjRRJoaZGGWNm1N9lEHio29HuvG+SRPCmzaUGk+oajz5EljX/QGvKHHYKHoeT2rgp3i0t+y2HSaS310o1zUfTF7KAyHWz+pzvOmgESimsPM9m3Wqw5BI6zd5wWAflaf1UvNr37413z1rrK83Qe0iMyqjpO8Hsko3suyWqQWM0ditwMIqIJ5Exs+KgfXDyCDgKuKH2AmBWQf0yT/gONvhT8SGPbGBXeto30avG4xQPg9QJy3/YV7TXJduxbhOwdwavj19xHOKfad8=
-    AZURE_APP_SECRET: AgATwUdeu7DQlQBa6CHe7B+FXjqUKosCAxhDr3fAxRONqJqPTWF8bv766V4G9ivcWWEL7nIpy+WrHduAnnpykHJTabZAkcXIzid7RcwmBdhVc4Ahj2VIYSSaxlAmHwbi4Xf0eEsH60CaqdGmLi/ZymxIHjfMhPxT3P3R1+pnIkVhnQcN55DcOeS6UTIC8dAZwkPqXdzU4Kobt28dpGNDTwLzeF/opQKj0aGGdK/vQb5VQXlId+iqhUUBZIIPeKI98QItEa4xj6lwbdAQbTxqBEYRZEvEfkNLt7owKUC/pmNIt6uSPtlJfC02bRG+JJRfO2nNqZ4sNYDh/aiWBR6ch8LELh1u2jYVsuP+wi6DvWE3KMCob1ZkqI1GkU8QqNjscsi8utnQsklymJMBAhastzyOEv2SOqLk6Uh9xRDKce8DNzAd/PdoMPObyXXAFO5zpHVjj5RlCcGrKgqirnJwm46HdSgoXFQ+k4mLOywoZd8pRV1Jz8VNL2Hclv50WkfSH+xNyV8P7fN8ITJA/kG5tgQDuNpeWWljc7DMYvlJ4LtnhU2Oo/iSTgfBW0ENRsvdGRXjXk+zGnl1KGYF1Rl2YaySdEPOB9VbeipR3CjDtJQzm1jd/Ro5ctL4Jol5yQM2cf1osG8FN+hQ7A4z3nfGx8meoUioWxccnOMyVNsanp3xRUL7ZzZSDbo2TtoFdIEvFlz22HjxsgWNptb2c3++QL9yF4DvBdzuLGG97HTDDnmJm2GMp+R5o8W5
-    AZURE_TENANTID: AgCXRjcsgulYe8XFjCSCS7fSjGvtrU3rQT9dQf/ZPo6/iVZYiA3fF9uapa+WiiAsNWbMCPaNMWySkcKb+h8mh7O7r6Nd8inVJ1WNHE9QXE7kZnPgKtnBFVRfTewwAL2H3YrLEGwKOABO9L5fb0kzcnu+ryH7bmWHRl2Vn5Qb7ibKveeqNGe5shB6OiwbX1amnuUAhadA1lCZQutmbLjdY2w6G6zjm6YkF2jDlwDGsybv1Vtcbh+7P1joNtQ8BA4RywWP8BRYWg7/YnB4abGoff8adGteqeLHuQ0L2clP7kpf32qNt4fl1NmZDH75GKEtUQzIQG9SdjpDqUTzGi83e7seqLKz2v2phMvkkjDoNmTU/MLCQ8vzhjUEhNYRPU9R0lCbnY/erxuBAwS6m2qHQZMapKsfic1aD2Ui4CRXCZeExo9pkMYI/ObvSJmNDfuYNu0fi9KCYimoEoWXX+GEs+zBSsRGE4ibMRIWdm4Z3nyUPuLZNWa2/NJG3a/Xnqmyq5vKJE8GnO1EJ+XnbGzUY9fg1RVQ0g/TQWyBWmOXrjS2lIb/caz/xrGnIt+4xGVfmck7GHgjWcGd2lQKH67Nd8k0BVZZaN8GKZyYNHc8rkLxuIbNBwRd/O6YB0d5RrHe2346oazpuy4w01La4lGDoXQDkUOX0PE4EKNYWkr+qYgbow0yLBC1ET0fyqb+DCuOQioByyiu9qkPjIjkCSP1N/7nGRrbifHLhY4LjiMYeZpeKk+15wY=
-    LDAP_BINDUSER: AgBGcYK7LLNTqwBkWEcDf+E2Zroaqs0dp/aXO7wIZQQ7sIpEAy1/P093SF8650MYmiHP2W7phYylWW617U/pjuUzV7zzhZz02eAePWH+LucWIOxxuHVICQEjhWvGLFD7fk1zdLy/qktYI4EvJix3HPq4SHTtUmrZm9qL8cFz6JqAsiVP0Y2NvlsgDN0uPPS5zoiGt5ifFkCMXWS5JdYnEGyWD6bENPKLmmJhDjLxG1JkDMaYuRnGFLPX+d9mvCENp5myWAeW7VyIsU7ZrI0woItc06pCicbNa2qDabiuWIkRR5ZeC6xSU05Xinx4pNasWD1yYs6sw/PA0ghcs0t4vlPTL1Iru0w4albylSTi68jA4IaBwkJIfEcvBVEUykmf9fE8EsiorABUEGUXn8SrZvPiwKTtD1NtZ39avnvXAqqR3tzzvplpCNKOta9ziWmaH+3TuMU/HmdRHEdESJxqcIz+Xl1bmiunOr74eT2n5W4FVGL1DdpYZvJSWlLFzKbdkg/XbvLRSc6f7UVbZe5S7f8yK7B0rknEg6U1cyaE7DuYAraT4o8NK0FgDtm/pH/1lj5gTSR3X9uJbVmCbvhwUI1F4+62aBVx5BNM16IIJHYd750QkTLbanhpdfWhu7PXf9vvW6ySYNWWW5CZFzKd2DJKIDOWPj228OuOavBQBevTrZNH9cj2jnofZB+3cKEfFEKx+jm8XgSlUX4I8NR4pMY7bsW5ndvlWA==
-    LDAP_DOMAIN: AgCgcQjDhBiTAif8gY4ohMzsfI9muB7eUs7YTIS2Ma0jNW6sD+C16ytk9QcslxnO4BM8nXcJXYE/yv0STHjvIRkhMHcUsvlEIsCWI3x9VAwBp2mpMazObLF89s4O+3oumcWJm44bDc9hMHzydqnl3PXhx+hUE3fgq5zIpyqflAQD/9jUGMSXoeEV8ccopJNwsz613kUb7CPfzGV63cpfuby7J3OVXruTYkn8kXth+i5Q/R+7nMZW62vxMXNhkHUITlp96ZgPau8+2vwtYhxDU/EOvVwLqLEuktrHX12pGp8zQ7sRKMoCjp+IXUD2v0CgK+RgikTO9upfGYkdMFLpY1TDqnksJnUuGrrXhqsRU4ziP0sqPz0G2vK+tUFjiMlQDc71oEGEKICdKXoMwVhlk4lOY6xAYu/B06zJyTE20LQiiQvfNVQZz6YJhe/kjNMKml/9KrOcuzBB+fcCFXAJKHrS16Wa9DHPl4QVdtwLsrWTl9hhP30IVQMDdFASHhCBZEld2H0y0ZMXI5tT2XI2rFzQYr7lQIK4Za2IdDlI1vjjqye1vKZ5/AeYunGGEciGjFRPCqhD3VvlWRRsoJxY5NAyVJdp+bIpjAKRrso4qJwtNc3NcMAKlKS/fNlS1k8w7R1K6yMqKwkrqNKoCXD5LfHPCDGTb/vVUaEB68+lCKXTlZsAQriOOB+AbAbtrYXpYlbcw0tMBkcr77qm
-  template:
-    data: null
-    metadata:
-      creationTimestamp: null
-      labels:
-        app: ldapwrapper
-      name: ldapwrapper
-      namespace: ldapwrapper
-    type: Opaque

services/LdapWrapper/sealedsecret-smb-credentials.yaml

@@ -1,16 +0,0 @@
-apiVersion: bitnami.com/v1alpha1
-kind: SealedSecret
-metadata:
-  creationTimestamp: null
-  name: smb-credentials
-  namespace: ldapwrapper
-spec:
-  encryptedData:
-    password: AgBc2k0pHG/YT8gHBugDzpAreGsVlDLQJeQnGEn6lzk97Gv1F2RSBy5pASx6WgMX1P/OU4+MPD1QkAIHRQowUTXH2/YDsEKUO/8n93kXnWRr3LOc0hjKGeHCUWdyzre8fU07g4+6dcKopNRGY53nCBNTSQG0DOQOiyCzkEgGDQYLFLk6cnN0B2n2sYRgkNJQCRXUbjKIWaNc8xbmzMrWb+qCBarP75J0c42249K0cpVS/u8txpmWOOtPfngIRh6wV+r5/3W7CwXuNBSUHa+Sm18j/guvIIloN2m5nHY/jXFopekIr02lHv4ANO24EZ1N4V4Uo9TvVV/agNGAU9nK0a0ebZ8W4wjvhiKwMiBOHWp55E3+oA8mP4C9ZC1hkhgbyBi9rK/9ZhVvoB+Q1rl+FD8bdbMcuTYDU9lt799MOThpbR1ti9gj3hO4Yz/GACN7rCJhpb+MIQywrdpRlO2eME1ssVKSmedEAVp/efLfNgfNhlLDl0rZ/I4vwwiQ5JBNsrNwKIoIhneC98ouRJdrZUWFWU0p95dbActr3qmAZQNJbfJ+UktPWSWxd+HW7LqvmYB1A0BT628GLBM5SvXWx0+ye7MLS/t8hJM/cqtOtdwdzoTZZfZv2dCnDQ0WtsZfXAdnigitA7UES3TzapIgdim3d6ujvnOY0OfJcKKSsKh7GQw451dKWUzTWafkciWoaWRBZnTmEgt6zz0Be0hQCfJm
-    username: AgAMIlu1M5O+fL3DJvdgSHkLpp8QDYXada4cFGTOGREY/1VonKhnmCDvgchsDzZY4DFiXn/nRxljlc8PalZsDmZ+6CZCmnJpMVSehrDw0gUigLgf0fFccJ8Sqk/kb3RTfZUYu906xUVHCQg7XeVaNyOaVZVfxB/SpPV33Y41nt4rjlwwIs+haQA1HoJLekANsR8YTDJABa/PFj/+oX2WS3OHXJvRtCeSSmPR3WJWJXQYQQewakMNqOuGTRjXSvHw95XJPnyYJiwHL8b+fdZRKxPpJwhRvKNmj+reosJkKeaq/M6cERLixJo8RpFATNAnv8BcKMbslMRQB+cn5HlfX5afMS8E1k/nPHa/3uSjNCuFoc1w4t9FjNMjfQrvDMxTIaJ78py0eZHznBO9uGdr1gDwZHzgcLJSFKL2aH8AdGTivRk7qKegCcWvFxtujGUWyXNnCV/6S1n9V4gvk62tnxNMbC5alCo8cAehJfJMyQrozyWH3mtnn7a61brPh+LVMeSne6dl6RRctQY7ZG0ypH7r1UxQczvkwuafVFvY+EfuKRM95SV41wo8Nyunb1MpXte77QLFpBnDxs/td14/i8QDJMjHIw0dItmtEbvPOaLMiyIk6kIGYRksyVwAQOHdEJISUJPnF8wcCeC3gpbXukSpgmQFQeyGsMgiRPlKYGFRq1nk8gIDMtUn5k1cZsMPX9G43vBGU4M=
-  template:
-    metadata:
-      creationTimestamp: null
-      name: smb-credentials
-      namespace: ldapwrapper
-    type: Opaque

services/LdapWrapper/service-ldapwrapper.yaml

@@ -1,12 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: ldapwrapper
-  namespace: ldapwrapper
-spec:
-  ports:
-    - protocol: TCP
-      name: ldap
-      port: 389
-  selector:
-    app: ldapwrapper

services/Memos/deployment-memos.yaml

@@ -17,7 +17,7 @@ spec:
     spec:
       containers:
       - name: app
-        image: neosmemo/memos:0.24
+        image: neosmemo/memos:0.25
         imagePullPolicy: Always
         env:
           - name: MEMOS_PORT

services/PVR/Bazarr/_namespace-bazarr.yaml

@@ -1,4 +1,4 @@
 apiVersion: v1
 kind: Namespace
 metadata:
-  name: webtop
+  name: bazarr

services/PVR/Bazarr/application-bazarr.yaml

@@ -1,11 +1,11 @@
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  name: webtop
+  name: bazarr
   namespace: argo-cd
 spec:
   destination:
-    namespace: webtop
+    namespace: bazarr
     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/Webtop
+    path: services/PVR/Bazarr
     targetRevision: HEAD

services/PVR/Bazarr/deployment-bazarr.yaml

@@ -0,0 +1,43 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: bazarr
+  namespace: bazarr
+  labels:
+    app: bazarr
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: bazarr
+  strategy:
+    type: Recreate
+  template:
+    metadata:
+      labels:
+        app: bazarr
+    spec:
+      containers:
+      - name: bazarr
+        image: linuxserver/bazarr:latest
+        imagePullPolicy: Always
+        ports:
+          - name: web
+            containerPort: 6767
+        volumeMounts:
+        - mountPath: /config
+          name: csismb-bazarr-config
+        - mountPath: /movies
+          name: csismb-bazarr-movies
+        - mountPath: /tv
+          name: csismb-bazarr-series
+      volumes:
+      - name: csismb-bazarr-config
+        persistentVolumeClaim:
+          claimName: csismb-bazarr-config
+      - name: csismb-bazarr-movies
+        persistentVolumeClaim:
+          claimName: csismb-bazarr-movies
+      - name: csismb-bazarr-series
+        persistentVolumeClaim:
+          claimName: csismb-bazarr-series

services/PVR/Bazarr/ingressroute-bazarr.yaml

@@ -0,0 +1,18 @@
+apiVersion: traefik.io/v1alpha1
+kind: IngressRoute
+metadata:
+  name: bazarr
+  namespace: bazarr
+spec:
+  entryPoints:
+    - websecure
+  routes:
+  - match: Host(`captions.pvr.spamasaurus.com`)
+    kind: Rule
+    services:
+    - name: bazarr
+      port: 6767
+    middlewares:
+      - name: 2fa-authentication@file
+      - name: security-headers@file
+      # - name: compression@file

services/PVR/Bazarr/persistentvolume-csismb-bazarr-config.yaml

@@ -0,0 +1,33 @@
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  annotations:
+    pv.kubernetes.io/provisioned-by: smb.csi.k8s.io
+  name: csismb-bazarr-config
+spec:
+  capacity:
+    storage: 1Gi
+  accessModes:
+    - ReadWriteMany
+  persistentVolumeReclaimPolicy: Retain
+  storageClassName: csismb-bazarr-config
+  mountOptions:
+    - dir_mode=0777
+    - file_mode=0777
+    - uid=911
+    - gid=911
+    - 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#bazarr#config
+    volumeAttributes:
+      source: //192.168.154.195/K3s.Volumes
+      subDir: bazarr/config
+    nodeStageSecretRef:
+      name: smb-credentials
+      namespace: bazarr

services/PVR/Bazarr/persistentvolume-csismb-jellyfin-movies.yaml

@@ -0,0 +1,33 @@
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  annotations:
+    pv.kubernetes.io/provisioned-by: smb.csi.k8s.io
+  name: csismb-bazarr-movies
+spec:
+  capacity:
+    storage: 1Gi
+  accessModes:
+    - ReadWriteMany
+  persistentVolumeReclaimPolicy: Retain
+  storageClassName: csismb-bazarr-movies
+  mountOptions:
+    - dir_mode=0777
+    - file_mode=0777
+    - uid=911
+    - gid=911
+#    - 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#bazarr#movies
+    volumeAttributes:
+      source: //192.168.154.195/Public
+      subDir: Video's/Films
+    nodeStageSecretRef:
+      name: smb-credentials
+      namespace: bazarr

services/PVR/Bazarr/persistentvolume-csismb-jellyfin-series.yaml

@@ -0,0 +1,33 @@
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  annotations:
+    pv.kubernetes.io/provisioned-by: smb.csi.k8s.io
+  name: csismb-bazarr-series
+spec:
+  capacity:
+    storage: 1Gi
+  accessModes:
+    - ReadWriteMany
+  persistentVolumeReclaimPolicy: Retain
+  storageClassName: csismb-bazarr-series
+  mountOptions:
+    - dir_mode=0777
+    - file_mode=0777
+    - uid=911
+    - gid=911
+#    - 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#bazarr#series
+    volumeAttributes:
+      source: //192.168.154.195/Public
+      subDir: Video's/Series
+    nodeStageSecretRef:
+      name: smb-credentials
+      namespace: bazarr

services/PVR/Bazarr/persistentvolumeclaim-csismb-bazarr-config.yaml

@@ -0,0 +1,12 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: csismb-bazarr-config
+  namespace: bazarr
+spec:
+  accessModes:
+    - ReadWriteMany
+  storageClassName: csismb-bazarr-config
+  resources:
+    requests:
+      storage: 1Gi

services/PVR/Bazarr/persistentvolumeclaim-csismb-jellyfin-movies.yaml

@@ -0,0 +1,12 @@
+kind: PersistentVolumeClaim
+apiVersion: v1
+metadata:
+  name: csismb-bazarr-movies
+  namespace: bazarr
+spec:
+  accessModes:
+    - ReadWriteMany
+  resources:
+    requests:
+      storage: 1Gi
+  storageClassName: csismb-bazarr-movies

services/PVR/Bazarr/persistentvolumeclaim-csismb-jellyfin-series.yaml

@@ -0,0 +1,12 @@
+kind: PersistentVolumeClaim
+apiVersion: v1
+metadata:
+  name: csismb-bazarr-series
+  namespace: bazarr
+spec:
+  accessModes:
+    - ReadWriteMany
+  resources:
+    requests:
+      storage: 1Gi
+  storageClassName: csismb-bazarr-series

services/PVR/Bazarr/sealedsecret-smb-credentials.yaml

@@ -0,0 +1,14 @@
+apiVersion: bitnami.com/v1alpha1
+kind: SealedSecret
+metadata:
+  name: smb-credentials
+  namespace: bazarr
+spec:
+  encryptedData:
+    password: AgBOHNOsO7vRPeVmYSWmC3rozbFWozrt5zVbQnktnJfpiaHDKc42jDpd/Ug4EB8OVCOqM7AG6bMmeUz0TwWwaktap1epnBsa/6LZU1X7EATIlZ3B9pheHxETMCPBuCF853pr7vsASYW38jgY0jrlzAHuoak/P9DO+0YSPIaWV4a4lJHl7ZduER6RU++zjap1hTQKVaVDd5EJysS9hbh8Tiyx/jXQnkQnxrwpl9ZYaYVSuQcJIDUe2NBzsWMq3f53S2q4AEli6B0L5PVcQnSelzRVxhQ3zvNTpT2dJiCAtrAu1sVqcNknU4UKFEeyAdUDflSE3RH/Hwg1TxQz4cks0+oT6SGa1964U8fF0/zPHILGUt3eOhVFmBU5itI3Fe8J+Zk/DpMlRg0JoEbx0Pylq1JlBls31KTHoHtJVEF9LPB/Eqevvwx8ERe7RhJFYnlu0pQdZMhlU0y5sasiUby4AHNc+99qa/qFQoWCnr1y85Q7RAfPTY0ONWI7cW6soxtJo3kYYP8WARr9eGkXhd4KIcXJOF3Yvjg1FjEMd6k+4hHoWKlcmjjptu693CVBV8zGuxZHOBagbaf5ODs8e/IIJRsPhbJ4hVlkpavk00MbDoW5L/WHGtYoRx5JRCmXeT5qeNpJL26bL3RpdC6nY4Glh5PB97JxpDkhNCfinBrCH2urjBwYAz+o8BiPa5XjnY+Rq7EnoPIpADVVdzE+vyUL8Msm
+    username: AgC7jXwLqgbL3thXUymbF8mdPwnzmXZUvPQ0erAY0/NaZassMOnvlbTwpX0HbOSWVdJNGpzDlBPgjZ3Ayl1oOEVbQs8+I96T+klJgfJ2aMQMSfjpBzV2HXTuENfYLyDgzvX78a2jf/h54tQtU/zXuqvYpuXYBNIuishZxvK/JtkT82KQ3u4xA3DlvaWlu5RqnLQCaDXDnKPiyDdxRKgu97RcCpN3ONhPsTCmr5YfePmyL+w7Aq2WOPIQshUpkg9joQELdo8TPdxPOPvj72XGBzGjtq3I0dNPFn6iLQre60eKB7MqLsAWkf7lIkdgww+JqqCqf/AWeK2QUNH/oK+Y4rtqOV2rVb75Z+/MLD2VGwTo5UhOy9LOLEOXTlBIz/awNj4Z+TRmzZgkFOm62FVt5c+JwwjPg9vaS5+7pIeihkLO+KLziFyAMx67ASqrhqmMb6EZZ22yyuPsqwCxvUXHQ5khfgFxjg1s4n56Lsb/WIkCvQFi2B7jNLYWaNIfUDNySyHZdg5C249nsWRiCm+pjUFBiYWkCxVMvNAG1MCEzXnrD0aPPSyY8JRRTtRMUo8ykK+TiKn8b/ocrFu6lo2g4GiuNtLBUTdBhwQmHeMLZ3STofI5I2+eP4XGkWrdEjq6+L5NV5NmG+0CwyIAziNgumJVkbYBN93v1c1QQFpbt5Y8VtINvl++TU0uetC/wOpbz7GSGTpu2EQ=
+  template:
+    metadata:
+      name: smb-credentials
+      namespace: bazarr
+    type: Opaque

services/PVR/Bazarr/service-bazarr.yaml

@@ -1,12 +1,12 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: webtop
-  namespace: webtop
+  name: bazarr
+  namespace: bazarr
 spec:
   ports:
     - protocol: TCP
       name: web
-      port: 3001
+      port: 6767
   selector:
-    app: webtop
+    app: bazarr

services/PVR/Jellyseerr/application-jellyseerr.yaml

@@ -18,7 +18,7 @@ spec:
     targetRevision: HEAD
   - repoURL: ghcr.io/fallenbagel/jellyseerr
     chart: jellyseerr-chart
-    targetRevision: 2.4.0
+    targetRevision: 2.7.0
     helm:
       valueFiles:
         - $values/services/PVR/Jellyseerr/values.yaml

services/PVR/Wizarr/_namespace-wizarr.yaml

@@ -1,4 +1,4 @@
 apiVersion: v1
 kind: Namespace
 metadata:
-  name: ldapwrapper
+  name: wizarr

services/PVR/Wizarr/application-wizarr.yaml

@@ -1,12 +1,12 @@
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  name: ldapwrapper
+  name: wizarr
   namespace: argo-cd
 spec:
   destination:
+    namespace: wizarr
     server: https://kubernetes.default.svc
-    namespace: ldapwrapper
   project: default
   syncPolicy:
     automated: {}
@@ -14,5 +14,5 @@ spec:
       - CreateNamespace=true
   sources:
   - repoURL: https://code.spamasaurus.com/djpbessems/Kubernetes.K3s.installLog
-    path: services/LdapWrapper
+    path: services/PVR/Wizarr
     targetRevision: HEAD

services/PVR/Wizarr/deployment-wizarr.yaml

@@ -0,0 +1,40 @@
+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

services/PVR/Wizarr/ingressroute-wizarr.yaml

@@ -0,0 +1,18 @@
+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

services/PVR/Wizarr/persistentvolume-csismb-wizarr-data.yaml

@@ -0,0 +1,34 @@
+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

services/PVR/Wizarr/persistentvolumeclaim-csismb-wizarr-data.yaml

@@ -0,0 +1,12 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: csismb-wizarr-data
+  namespace: wizarr
+spec:
+  accessModes:
+    - ReadWriteMany
+  storageClassName: csismb-wizarr-data
+  resources:
+    requests:
+      storage: 1Gi

services/PVR/Wizarr/sealedsecret-smb-credentials.yaml

@@ -0,0 +1,14 @@
+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

services/PVR/Wizarr/service-wizarr.yaml

@@ -0,0 +1,12 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: wizarr
+  namespace: wizarr
+spec:
+  ports:
+    - protocol: TCP
+      name: web
+      port: 5690
+  selector:
+    app: wizarr

services/Webtop/configmap-init.d-zsh.yaml

@@ -1,18 +0,0 @@
-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

services/Webtop/deployment-webtop.yaml

@@ -1,48 +0,0 @@
-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

services/Webtop/persistentvolumeclaim-webtop-config.yaml

@@ -1,11 +0,0 @@
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: webtop-config
-  namespace: webtop
-spec:
-  accessModes:
-    - ReadWriteOnce
-  resources:
-    requests:
-      storage: 20Gi

services/Webtop/sealedsecret-smb-credentials.yaml

@@ -1,16 +0,0 @@
-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

services/Webtop/serverstransport-insecure-skip-verify.yaml

@@ -1,7 +0,0 @@
-apiVersion: traefik.io/v1alpha1
-kind: ServersTransport
-metadata:
-  name: insecure-skip-verify
-  namespace: webtop
-spec:
-  insecureSkipVerify: true

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: v1.18.0
+    targetRevision: 1.19.1
     helm:
       valueFiles:
       - $values/storage/csi-driver-smb/values.yaml

system/ArgoCD/application-argo-cd.yaml

@@ -11,10 +11,16 @@ spec:
   sources:
   - repoURL: https://argoproj.github.io/argo-helm
     chart: argo-cd
-    targetRevision: 8.1.2
+    # targetRevision: 8.1.2
+    targetRevision: 8.6.4
     helm:
       valueFiles:
       - $values/system/ArgoCD/values.yaml
   - repoURL: https://code.spamasaurus.com/djpbessems/Kubernetes.K3s.installLog
     targetRevision: HEAD
     ref: values
+  # - repoURL: https://github.com/djpbessems/Kubernetes.K3s.installLog
+  #   targetRevision: master
+  #   ref: values
+  syncPolicy:
+    automated: {}

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.3
+    targetRevision: 2.17.7
     helm:
       valueFiles:
       - $values/system/SealedSecrets/values.yaml