Removed Harbor's ingressRoute;Replaced Harbor's fqdn in all deployments

2020-12-04 09:41:15 +01:00
parent 051f7fcbad
commit 93683f68d3
25 changed files with 72 additions and 94 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: bv11-cr01.bessems.eu/proxy/library/adminer
        ports:
          - name: web
            containerPort: 8080
--- a/services/Bitwarden/deploy-Bitwarden.yml
+++ b/services/Bitwarden/deploy-Bitwarden.yml
@ -42,7 +42,7 @@ spec:
      serviceAccountName: bitwarden
      containers:
      - name: bitwarden
-        image: bitwardenrs/server
+        image: bv11-cr01.bessems.eu/proxy/bitwardenrs/server
        args: ["sh", "-c", ". /vault/secrets/bitwarden && /start.sh"]
        env:
        - name: ENABLE_DB_WAL
--- 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: bv11-cr01.bessems.eu/proxy/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: drone/drone:latest
+        image: bv11-cr01.bessems.eu/proxy/drone/drone:latest
        command: ["sh", "-c", ". /vault/secrets/drone && /bin/drone-server"]
        env:
        - name: DRONE_SERVER_PROTO
@ -58,6 +58,8 @@ spec:
          value: 'false'
        - name: DRONE_AGENTS_ENABLED
          value: 'true'
+        - name: DRONE_USER_CREATE
+          value: 'username:djpbessems,admin:true'
        ports:
          - name: ui
            containerPort: 80
@ -65,7 +67,7 @@ spec:
        - mountPath: /data
          name: flexvolsmb-drone-data
      - name: drone-runner
-        image: drone/drone-runner-kube:latest
+        image: bv11-cr01.bessems.eu/proxy/drone/drone-runner-kube:latest
        command: ["sh", "-c", ". /vault/secrets/drone && /bin/drone-runner-kube"]
        ports:
        - containerPort: 3000
@ -135,6 +137,38 @@ spec:
    requests:
      storage: 1Gi
 ---
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: flexvolsmb-drone-certs
+spec:
+  capacity:
+    storage: 1Gi
+  accessModes:
+    - ReadWriteMany
+  storageClassName: flexvolsmb-drone-certs
+  flexVolume:
+    driver: mount/smb
+    secretRef:
+      name: smb-secret
+    options:
+      opts: domain=bessems.eu,file_mode=0777,dir_mode=0777,iocharset=utf8,nobrl
+      server: 192.168.11.225
+      share: /K3s.Volumes/traefikcertsdumper/export
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: flexvolsmb-drone-certs
+  namespace: default
+spec:
+  accessModes:
+    - ReadWriteMany
+  storageClassName: flexvolsmb-drone-certs
+  resources:
+    requests:
+      storage: 1Gi
+---
 kind: Role
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
--- a/services/Gitea/deploy-Gitea.yml
+++ b/services/Gitea/deploy-Gitea.yml
@ -28,7 +28,7 @@ spec:
    spec:
      containers:
      - name: gitea
-        image: registry.spamasaurus.com/proxy/gitea/gitea:1
+        image: bv11-cr01.bessems.eu/proxy/gitea/gitea:1
        env:
        - name: DB_TYPE
          value: 'sqlite3'
--- 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: bv11-cr01.bessems.eu/proxy/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: bv11-cr01.bessems.eu/proxy/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: bv11-cr01.bessems.eu/proxy/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: bv11-cr01.bessems.eu/proxy/library/mysql:latest
        securityContext:
          runAsUser: 999
          runAsGroup: 999
--- a/services/Harbor/ingressRoute-Harbor.yml
+++ b/services/Harbor/ingressRoute-Harbor.yml
@ -1,50 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: harbor
-spec:
-  ports:
-    - protocol: TCP
-      port: 80
-      targetPort: 80
---
-apiVersion: v1
-kind: Endpoints
-metadata:
-  name: harbor
-subsets:
-  - addresses:
-      - ip: 192.168.11.249
-    ports:
-      - port: 80
---
-apiVersion: traefik.containo.us/v1alpha1
-kind: IngressRoute
-metadata:
-  name: harbor
-spec:
-  entryPoints:
-    - websecure
-  routes:
-  - match: Host(`registry.spamasaurus.com`)
-    kind: Rule
-    services:
-    - name: harbor
-      port: 80
-    middlewares:
-      - name: security-headers@file
-      - name: compression@file
-#  - match: Host(`registry.spamasaurus.com`) && PathPrefix(`/api/`, `/service/`, `/v2/`, `/chartrepo/`, `/c/`)
-#    kind: Rule
-#    services:
-#    - name: harbor-harbor-core
-#      port: 80
-#    middlewares:
-#      - name: security-headers@file
-#  - match: Host(`notary.spamasaurus.com`)
-#    kind: Rule
-#    services:
-#    - name: harbor-harbor-notary-server
-#      port: 4443
-#    middlewares:
-#      - name: security-headers@file
--- 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: bv11-cr01.bessems.eu/library/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: bv11-cr01.bessems.eu/proxy/linuxserver/nzbhydra2
        ports:
          - name: web
            containerPort: 5076
--- a/services/PVR/deploy-Plex.yml
+++ b/services/PVR/deploy-Plex.yml
@ -31,7 +31,7 @@ spec:
      hostNetwork: true
      containers:
      - name: plex
-        image: registry.spamasaurus.com/proxy/linuxserver/plex
+        image: bv11-cr01.bessems.eu/proxy/linuxserver/plex
        ports:
          - name: web
            containerPort: 32400
--- 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: bv11-cr01.bessems.eu/proxy/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: bv11-cr01.bessems.eu/proxy/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: bv11-cr01.bessems.eu/proxy/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: bv11-cr01.bessems.eu/proxy/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: bv11-cr01.bessems.eu/proxy/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: bv11-cr01.bessems.eu/proxy/theiaide/theia-full
        ports:
          - name: web
            containerPort: 3000
--- a/services/TraefikCertsDumper/deploy-TraefikCertsDumper.yml
+++ b/services/TraefikCertsDumper/deploy-TraefikCertsDumper.yml
@ -16,7 +16,7 @@ spec:
    spec:
      containers:
      - name: traefik-certs-dumper
-        image: registry.spamasaurus.com/proxy/ldez/traefik-certs-dumper:latest-amd64
+        image: bv11-cr01.bessems.eu/proxy/ldez/traefik-certs-dumper:latest-amd64
        command: ['traefik-certs-dumper', 'file']
        args: 
        - --watch
--- a/services/Unifi/deploy-Unifi.yml
+++ b/services/Unifi/deploy-Unifi.yml
@ -67,7 +67,7 @@ spec:
    spec:
      containers:
      - name: unifi
-        image: linuxserver/unifi-controller
+        image: bv11-cr01.bessems.eu/proxy/linuxserver/unifi-controller
        ports:
          - name: web
            containerPort: 8443