Decommissioned Harbor; cancelled migration

2020-11-15 17:16:43 +01:00 · 2020-11-15 17:16:43 +01:00 · 7b6df81924
parent 969b71211b
commit 7b6df81924
18 changed files with 33 additions and 85 deletions
--- a/services/Adminer/deploy-Adminer.yml
+++ b/services/Adminer/deploy-Adminer.yml
@ -37,7 +37,7 @@ spec:
      serviceAccountName: adminer
      containers:
      - name: adminer
-        image: registry.spamasaurus.com/proxy/library/adminer
+        image: adminer
        ports:
          - name: web
            containerPort: 8080
--- a/services/Authelia/deploy-Authelia.yml
+++ b/services/Authelia/deploy-Authelia.yml
@ -16,7 +16,7 @@ spec:
    spec:
      containers:
      - name: authelia
-        image: registry.spamasaurus.com/proxy/authelia/authelia
+        image: authelia/authelia
        env:
        - name: TZ
          value: Europe/Amsterdam
@ -27,7 +27,7 @@ spec:
        - name: flexvolsmb-authelia-conf
          mountPath: /config
      - name: redis
-        image: registry.spamasaurus.com/proxy/library/redis:alpine
+        image: redis:alpine
        args:
          - redis-server
          - --requirepass authelia
--- a/services/DDclient/deploy-DDclient.yml
+++ b/services/DDclient/deploy-DDclient.yml
@ -16,7 +16,7 @@ spec:
    spec:
      containers:
      - name: ddclient
-        image: registry.spamasaurus.com/proxy/linuxserver/ddclient
+        image: linuxserver/ddclient
        volumeMounts:
        - mountPath: /config
          name: ddclient-secret
--- a/services/DroneCI/deploy-DroneCI.yml
+++ b/services/DroneCI/deploy-DroneCI.yml
@ -39,7 +39,7 @@ spec:
      serviceAccountName: drone
      containers:
      - name: drone
-        image: registry.spamasaurus.com/proxy/drone/drone:latest
+        image: drone/drone:latest
        command: ["sh", "-c", ". /vault/secrets/drone && /bin/drone-server"]
        env:
        - name: DRONE_SERVER_PROTO
@ -65,7 +65,7 @@ spec:
        - mountPath: /data
          name: flexvolsmb-drone-data
      - name: drone-runner
-        image: registry.spamasaurus.com/proxy/drone/drone-runner-kube:latest
+        image: drone/drone-runner-kube:latest
        command: ["sh", "-c", ". /vault/secrets/drone && /bin/drone-runner-kube"]
        ports:
        - containerPort: 3000
--- a/services/Gotify/deploy-Gotify.yml
+++ b/services/Gotify/deploy-Gotify.yml
@ -28,7 +28,7 @@ spec:
    spec:
      containers:
      - name: gotify
-        image: registry.spamasaurus.com/proxy/gotify/server
+        image: gotify/server
        ports:
          - name: web
            containerPort: 80
--- a/services/Guacamole/deploy-Guacamole.yml
+++ b/services/Guacamole/deploy-Guacamole.yml
@ -35,7 +35,7 @@ spec:
      hostname: guacamole
      containers:
      - name: guacamole
-        image: registry.spamasaurus.com/proxy/guacamole/guacamole
+        image: guacamole/guacamole
        env:
        - name: GUACD_HOSTNAME
          value: 'guacamole.default.svc.cluster.local'
@ -53,7 +53,7 @@ spec:
          - name: ui
            containerPort: 8080
      - name: guacd
-        image: registry.spamasaurus.com/proxy/guacamole/guacd
+        image: guacamole/guacd
        env:
        - name: GUACD_LOG_LEVEL
          value: 'debug'
@ -61,7 +61,7 @@ spec:
          - name: proxy
            containerPort: 4822
      - name: mysql
-        image: registry.spamasaurus.com/proxy/library/mysql:latest
+        image: mysql:latest
        securityContext:
          runAsUser: 999
          runAsGroup: 999
--- a/services/Lighttpd/deploy-Lighttpd.yml
+++ b/services/Lighttpd/deploy-Lighttpd.yml
@ -28,7 +28,7 @@ spec:
    spec:
      containers:
      - name: lighttpd-php-pwsh
-        image: registry.spamasaurus.com/library/lighttpd-php-powershell
+        image: djpbessems/lighttpd-php-powershell
        ports:
          - name: web
            containerPort: 8080
--- a/services/PVR/deploy-NZBHydra.yml
+++ b/services/PVR/deploy-NZBHydra.yml
@ -30,7 +30,7 @@ spec:
    spec:
      containers:
      - name: nzbhydra
-        image: registry.spamasaurus.com/proxy/linuxserver/nzbhydra2
+        image: linuxserver/nzbhydra2
        ports:
          - name: web
            containerPort: 5076
--- a/services/PVR/deploy-Plex.yml
+++ b/services/PVR/deploy-Plex.yml
@ -11,39 +11,6 @@ spec:
  selector:
    app: plex
 ---
-apiVersion: v1
-kind: Service
-metadata:
-  name: plex-remoteaccess
-  namespace: pvr
-spec:
-  ports:
-  - port: 32400
-    protocol: TCP
-    targetPort: 32400
-    name: web
-  - port: 32469
-    protocol: TCP
-    targetPort: 32469
-    name: dlna
-  selector:
-    app: plex
-  type: LoadBalancer
---
-apiVersion: v1
-kind: Service
-metadata:
-  name: plex-dlna
-  namespace: pvr
-spec:
-  ports:
-  - port: 1900
-    protocol: UDP
-    targetPort: 1900
-  selector:
-    app: plex
-  type: LoadBalancer
---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@ -61,30 +28,27 @@ spec:
      labels:
        app: plex
    spec:
+      hostNetwork: true
      containers:
      - name: plex
-        image: registry.spamasaurus.com/proxy/linuxserver/plex
+        image: linuxserver/plex
        ports:
          - name: web
            containerPort: 32400
-          - containerPort: 1900
-            protocol: UDP
-          - name: dlna
-            containerPort: 32469
        env:
          - name: VERSION
            value: latest
        volumeMounts:
        - mountPath: /config
-          name: flexvolsmb-plex-config
+          name: longhorn-plex-config
        - mountPath: /data/series
          name: flexvolsmb-pvr-series
        - mountPath: /data/movies
          name: flexvolsmb-pvr-movies
      volumes:
-      - name: flexvolsmb-plex-config
+      - name: longhorn-plex-config
        persistentVolumeClaim:
-          claimName: flexvolsmb-plex-config
+          claimName: longhorn-plex-config
      - name: flexvolsmb-pvr-series
        persistentVolumeClaim:
          claimName: flexvolsmb-pvr-series
@ -119,34 +83,14 @@ spec:
        - 'pvr.spamasaurus.com'
 ---
 apiVersion: v1
-kind: PersistentVolume
-metadata:
-  name: flexvolsmb-plex-config
-  namespace: pvr
-spec:
-  capacity:
-    storage: 1Gi
-  accessModes:
-    - ReadWriteMany
-  storageClassName: flexvolsmb-plex-config
-  flexVolume:
-    driver: mount/smb
-    secretRef:
-      name: smb-secret
-    options:
-      opts: domain=bessems.eu,file_mode=0777,dir_mode=0777,uid=911,gid=911,iocharset=utf8
-      server: 192.168.11.225
-      share: /K3s.Volumes/plex/config
---
-apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: flexvolsmb-plex-config
+  name: longhorn-plex-config
  namespace: pvr
 spec:
  accessModes:
-    - ReadWriteMany
-  storageClassName: flexvolsmb-plex-config
+    - ReadWriteOnce
+  storageClassName: longhorn
  resources:
    requests:
      storage: 1Gi
--- a/services/PVR/deploy-Radarr.yml
+++ b/services/PVR/deploy-Radarr.yml
@ -30,7 +30,7 @@ spec:
    spec:
      containers:
      - name: radarr
-        image: registry.spamasaurus.com/proxy/linuxserver/radarr:nightly
+        image: linuxserver/radarr:nightly
        ports:
          - name: web
            containerPort: 7878
--- a/services/PVR/deploy-Readarr.yml
+++ b/services/PVR/deploy-Readarr.yml
@ -30,7 +30,7 @@ spec:
    spec:
      containers:
      - name: readarr
-        image: registry.spamasaurus.com/proxy/hotio/readarr:nightly
+        image: hotio/readarr:nightly
        env:
        - name: DEBUG
          value: 'yes'
--- a/services/PVR/deploy-SABnzbd.yml
+++ b/services/PVR/deploy-SABnzbd.yml
@ -30,7 +30,7 @@ spec:
    spec:
      containers:
      - name: sabnzbd
-        image: registry.spamasaurus.com/proxy/linuxserver/sabnzbd
+        image: linuxserver/sabnzbd
        ports:
          - name: web
            containerPort: 8080
--- a/services/PVR/deploy-Sonarr.yml
+++ b/services/PVR/deploy-Sonarr.yml
@ -30,7 +30,7 @@ spec:
    spec:
      containers:
      - name: sonarr
-        image: registry.spamasaurus.com/proxy/linuxserver/sonarr:preview
+        image: linuxserver/sonarr:preview
        ports:
          - name: web
            containerPort: 8989
--- a/services/Shaarli/deploy-Shaarli.yml
+++ b/services/Shaarli/deploy-Shaarli.yml
@ -28,7 +28,7 @@ spec:
    spec:
      containers:
      - name: shaarli
-        image: registry.spamasaurus.com/proxy/shaarli/shaarli
+        image: shaarli/shaarli
        ports:
          - name: web
            containerPort: 80
--- a/services/Theia/deploy-Theia.yml
+++ b/services/Theia/deploy-Theia.yml
@ -28,7 +28,7 @@ spec:
    spec:
      containers:
      - name: theia
-        image: registry.spamasaurus.com/proxy/theiaide/theia-full
+        image: theiaide/theia-full
        ports:
          - name: web
            containerPort: 3000
--- a/storage/Longhorn/ingressRoute-Longhorn.yml
+++ b/storage/Longhorn/ingressRoute-Longhorn.yml
@ -13,6 +13,10 @@ spec:
        - name: longhorn-frontend
          port: 80
          namespace: longhorn-system
+      middlewares:
+        - name: 2fa-authentication@file
+        - name: security-headers@file
+        - name: compression@file
  tls:
    options:
      name: default
--- a/system/UpgradeController/plan-Agent.yml
+++ b/system/UpgradeController/plan-Agent.yml
@ -14,8 +14,8 @@ spec:
    args:
    - prepare
    - server-plan
-    image: rancher/k3s-upgrade:v1.18.6-k3s1
+    image: rancher/k3s-upgrade:v1.19.3-k3s2
  serviceAccountName: system-upgrade
  upgrade:
-    image: registry.spamasaurus.com/proxy/rancher/k3s-upgrade
+    image: rancher/k3s-upgrade
  channel: https://update.k3s.io/v1-release/channels/stable
--- a/system/UpgradeController/plan-Server.yml
+++ b/system/UpgradeController/plan-Server.yml
@ -14,5 +14,5 @@ spec:
      - "true"
  serviceAccountName: system-upgrade
  upgrade:
-    image: registry.spamasaurus.com/proxy/rancher/k3s-upgrade
+    image: rancher/k3s-upgrade
  channel: https://update.k3s.io/v1-release/channels/stable