diff --git a/kubernetes/apps/default/pgadmin/app/helmrelease.yaml b/kubernetes/apps/default/pgadmin/app/helmrelease.yaml index fa50792c1..15f1a856c 100644 --- a/kubernetes/apps/default/pgadmin/app/helmrelease.yaml +++ b/kubernetes/apps/default/pgadmin/app/helmrelease.yaml @@ -10,7 +10,7 @@ spec: chart: spec: chart: app-template - version: 1.5.1 + version: 2.0.3 sourceRef: kind: HelmRepository name: bjw-s @@ -27,26 +27,46 @@ spec: uninstall: keepHistory: false values: - controller: - annotations: - reloader.stakater.com/auto: "true" - image: - repository: dpage/pgadmin4 - tag: "7.8" - env: - PGADMIN_CONFIG_ENHANCED_COOKIE_PROTECTION: "False" - envFrom: - - secretRef: - name: pgadmin-secret - initContainers: - volume-permissions: - image: dpage/pgadmin4:7.8 - command: ["/bin/chown", "-R", "5050:5050", "/var/lib/pgadmin"] - volumeMounts: - - name: config - mountPath: /var/lib/pgadmin - securityContext: - runAsUser: 0 + controllers: + main: + type: statefulset + annotations: + reloader.stakater.com/auto: "true" + initContainers: + volume-permissions: + image: + repository: dpage/pgadmin4 + tag: "7.8" + command: ["/bin/chown", "-R", "5050:5050", "/var/lib/pgadmin"] + volumeMounts: + - name: config + mountPath: /var/lib/pgadmin + securityContext: + runAsUser: 0 + containers: + main: + image: + repository: dpage/pgadmin4 + tag: "7.8" + env: + PGADMIN_CONFIG_ENHANCED_COOKIE_PROTECTION: "False" + envFrom: + - secretRef: + name: pgadmin-secret + resources: + requests: + cpu: 50m + memory: 100Mi + limits: + memory: 500Mi + statefulset: + volumeClaimTemplates: + - name: config + accessMode: ReadWriteOnce + size: 1Gi + storageClass: rook-ceph-block + globalMounts: + - path: /var/lib/pgadmin service: main: ports: @@ -55,25 +75,16 @@ spec: ingress: main: enabled: true - ingressClassName: "nginx" + cClassName: "nginx" annotations: hajimari.io/icon: mdi:database hosts: - host: &host "{{ .Release.Name }}.${SECRET_CLUSTER_DOMAIN}" paths: - path: / - pathType: Prefix + service: + name: main + port: http tls: - hosts: - *host - persistence: - config: - enabled: true - existingClaim: pgadmin-config - mountPath: /var/lib/pgadmin - resources: - requests: - cpu: 50m - memory: 100Mi - limits: - memory: 500Mi diff --git a/kubernetes/apps/default/pgadmin/app/kustomization.yaml b/kubernetes/apps/default/pgadmin/app/kustomization.yaml index 1ac8f8607..c254171ab 100644 --- a/kubernetes/apps/default/pgadmin/app/kustomization.yaml +++ b/kubernetes/apps/default/pgadmin/app/kustomization.yaml @@ -8,4 +8,3 @@ resources: - ./gatus.yaml - ./helmrelease.yaml - ./volsync.yaml - - ./volume.yaml diff --git a/kubernetes/apps/default/pgadmin/app/volsync.yaml b/kubernetes/apps/default/pgadmin/app/volsync.yaml index 1ea1eb54e..3049c6066 100644 --- a/kubernetes/apps/default/pgadmin/app/volsync.yaml +++ b/kubernetes/apps/default/pgadmin/app/volsync.yaml @@ -30,7 +30,7 @@ metadata: name: pgadmin namespace: default spec: - sourcePVC: pgadmin-config + sourcePVC: config-pgadmin-0 trigger: schedule: "0 7 * * *" restic: diff --git a/kubernetes/apps/default/pgadmin/app/volume.yaml b/kubernetes/apps/default/pgadmin/app/volume.yaml deleted file mode 100644 index 141a9a46c..000000000 --- a/kubernetes/apps/default/pgadmin/app/volume.yaml +++ /dev/null @@ -1,17 +0,0 @@ ---- -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: pgadmin-config - namespace: default - labels: - app.kubernetes.io/name: &name pgadmin - app.kubernetes.io/instance: *name - snapshot.home.arpa/enabled: "true" -spec: - accessModes: - - ReadWriteOnce - storageClassName: rook-ceph-block - resources: - requests: - storage: 1Gi