diff --git a/clusters/cl01tl/manifests/seerr/StatefulSet-seerr-seerr-chart.yaml b/clusters/cl01tl/manifests/seerr/StatefulSet-seerr-seerr-chart.yaml index 40fc1c3a5..468901924 100644 --- a/clusters/cl01tl/manifests/seerr/StatefulSet-seerr-seerr-chart.yaml +++ b/clusters/cl01tl/manifests/seerr/StatefulSet-seerr-seerr-chart.yaml @@ -43,7 +43,7 @@ spec: runAsUser: 1000 seccompProfile: type: RuntimeDefault - image: "ghcr.io/seerr-team/seerr:v3.1.0@sha256:sha256:b35ba0461c4a1033d117ac1e5968fd4cbe777899e4cbfbdeaf3d10a42a0eb7e9" + image: "ghcr.io/seerr-team/seerr:v3.1.0@sha256:b35ba0461c4a1033d117ac1e5968fd4cbe777899e4cbfbdeaf3d10a42a0eb7e9" imagePullPolicy: IfNotPresent ports: - name: http diff --git a/clusters/cl01tl/manifests/slskd/Deployment-slskd-soularr.yaml b/clusters/cl01tl/manifests/slskd/Deployment-slskd-soularr.yaml deleted file mode 100644 index 248b41f23..000000000 --- a/clusters/cl01tl/manifests/slskd/Deployment-slskd-soularr.yaml +++ /dev/null @@ -1,70 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: slskd-soularr - labels: - app.kubernetes.io/controller: soularr - app.kubernetes.io/instance: slskd - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: slskd - helm.sh/chart: slskd-4.6.2 - namespace: slskd -spec: - revisionHistoryLimit: 3 - replicas: 0 - strategy: - type: Recreate - selector: - matchLabels: - app.kubernetes.io/controller: soularr - app.kubernetes.io/name: slskd - app.kubernetes.io/instance: slskd - template: - metadata: - labels: - app.kubernetes.io/controller: soularr - app.kubernetes.io/instance: slskd - app.kubernetes.io/name: slskd - spec: - enableServiceLinks: false - serviceAccountName: default - automountServiceAccountToken: true - securityContext: - fsGroup: 1000 - fsGroupChangePolicy: OnRootMismatch - hostIPC: false - hostNetwork: false - hostPID: false - dnsPolicy: ClusterFirst - containers: - - env: - - name: TZ - value: US/Central - - name: PUID - value: "1000" - - name: PGID - value: "1000" - - name: SCRIPT_INTERVAL - value: "300" - image: mrusse08/soularr:latest@sha256:69bc29f2072d6256c30f94fb1a0bfe8034c197791a2103d87f15ef1761347ce9 - imagePullPolicy: IfNotPresent - name: main - resources: - requests: - cpu: 10m - memory: 256Mi - volumeMounts: - - mountPath: /mnt/store - name: data - - mountPath: /data/config.ini - mountPropagation: None - name: soularr-config - readOnly: true - subPath: config.ini - volumes: - - name: data - persistentVolumeClaim: - claimName: slskd-nfs-storage - - name: soularr-config - secret: - secretName: soularr-config-secret diff --git a/clusters/cl01tl/manifests/slskd/Deployment-slskd-main.yaml b/clusters/cl01tl/manifests/slskd/Deployment-slskd.yaml similarity index 91% rename from clusters/cl01tl/manifests/slskd/Deployment-slskd-main.yaml rename to clusters/cl01tl/manifests/slskd/Deployment-slskd.yaml index c76dd0ade..dc3430841 100644 --- a/clusters/cl01tl/manifests/slskd/Deployment-slskd-main.yaml +++ b/clusters/cl01tl/manifests/slskd/Deployment-slskd.yaml @@ -1,7 +1,7 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: slskd-main + name: slskd labels: app.kubernetes.io/controller: main app.kubernetes.io/instance: slskd @@ -29,6 +29,9 @@ spec: enableServiceLinks: false serviceAccountName: default automountServiceAccountToken: true + securityContext: + fsGroup: 1000 + fsGroupChangePolicy: OnRootMismatch hostIPC: false hostNetwork: false hostPID: false @@ -51,13 +54,8 @@ spec: sysctl -w net.ipv6.conf.all.disable_ipv6=1 command: - /bin/sh - image: busybox:1.37.0 - imagePullPolicy: IfNotPresent + image: busybox:1.37.0@sha256:1487d0af5f52b4ba31c7e465126ee2123fe3f2305d638e7827681e7cf6c83d5e name: init-sysctl - resources: - requests: - cpu: 10m - memory: 128Mi securityContext: privileged: true containers: @@ -99,7 +97,6 @@ spec: - name: SHADOWSOCKS value: "off" image: ghcr.io/qdm12/gluetun:v3.41.1@sha256:1a5bf4b4820a879cdf8d93d7ef0d2d963af56670c9ebff8981860b6804ebc8ab - imagePullPolicy: IfNotPresent lifecycle: postStart: exec: @@ -122,9 +119,7 @@ spec: limits: devic.es/tun: "1" requests: - cpu: 10m devic.es/tun: "1" - memory: 128Mi securityContext: capabilities: add: @@ -133,20 +128,19 @@ spec: privileged: true - env: - name: TZ - value: US/Central + value: America/Chicago - name: PUID value: "1000" - name: PGID value: "1000" - name: SLSKD_UMASK value: "0" - image: slskd/slskd:0.24.5 - imagePullPolicy: IfNotPresent + image: slskd/slskd:0.24.5@sha256:17ef977563be206f3b5932080b1e23883b2cb39dc9010640f6f39b4eaec887e3 name: main resources: requests: cpu: 100m - memory: 512Mi + memory: 330Mi volumeMounts: - mountPath: /mnt/store name: data diff --git a/clusters/cl01tl/manifests/slskd/ExternalSecret-slskd-config-secret.yaml b/clusters/cl01tl/manifests/slskd/ExternalSecret-slskd-config-secret.yaml index 81476cd09..0edc31f5b 100644 --- a/clusters/cl01tl/manifests/slskd/ExternalSecret-slskd-config-secret.yaml +++ b/clusters/cl01tl/manifests/slskd/ExternalSecret-slskd-config-secret.yaml @@ -14,8 +14,5 @@ spec: data: - secretKey: slskd.yml remoteRef: - conversionStrategy: Default - decodingStrategy: None key: /cl01tl/slskd/config - metadataPolicy: None property: slskd.yml diff --git a/clusters/cl01tl/manifests/slskd/ExternalSecret-slskd-wireguard-conf.yaml b/clusters/cl01tl/manifests/slskd/ExternalSecret-slskd-wireguard-conf.yaml index 928964781..d863f0dff 100644 --- a/clusters/cl01tl/manifests/slskd/ExternalSecret-slskd-wireguard-conf.yaml +++ b/clusters/cl01tl/manifests/slskd/ExternalSecret-slskd-wireguard-conf.yaml @@ -14,29 +14,17 @@ spec: data: - secretKey: private-key remoteRef: - conversionStrategy: Default - decodingStrategy: None key: /airvpn/conf/cl01tl - metadataPolicy: None property: private-key - secretKey: preshared-key remoteRef: - conversionStrategy: Default - decodingStrategy: None key: /airvpn/conf/cl01tl - metadataPolicy: None property: preshared-key - secretKey: addresses remoteRef: - conversionStrategy: Default - decodingStrategy: None key: /airvpn/conf/cl01tl - metadataPolicy: None property: addresses - secretKey: input-ports remoteRef: - conversionStrategy: Default - decodingStrategy: None key: /airvpn/conf/cl01tl - metadataPolicy: None property: input-ports diff --git a/clusters/cl01tl/manifests/slskd/ExternalSecret-soularr-config-secret.yaml b/clusters/cl01tl/manifests/slskd/ExternalSecret-soularr-config-secret.yaml deleted file mode 100644 index 28db497e8..000000000 --- a/clusters/cl01tl/manifests/slskd/ExternalSecret-soularr-config-secret.yaml +++ /dev/null @@ -1,21 +0,0 @@ -apiVersion: external-secrets.io/v1 -kind: ExternalSecret -metadata: - name: soularr-config-secret - namespace: slskd - labels: - app.kubernetes.io/name: soularr-config-secret - app.kubernetes.io/instance: slskd - app.kubernetes.io/part-of: slskd -spec: - secretStoreRef: - kind: ClusterSecretStore - name: vault - data: - - secretKey: config.ini - remoteRef: - conversionStrategy: Default - decodingStrategy: None - key: /cl01tl/slskd/soularr - metadataPolicy: None - property: config.ini diff --git a/clusters/cl01tl/manifests/slskd/HTTPRoute-slskd.yaml b/clusters/cl01tl/manifests/slskd/HTTPRoute-slskd.yaml index dd6bd90af..8203069a5 100644 --- a/clusters/cl01tl/manifests/slskd/HTTPRoute-slskd.yaml +++ b/clusters/cl01tl/manifests/slskd/HTTPRoute-slskd.yaml @@ -23,7 +23,7 @@ spec: name: slskd namespace: slskd port: 5030 - weight: 100 + weight: 1 matches: - path: type: PathPrefix