From 4200c3d72a6d88f3201170bfb4d07ad83e3ec46c Mon Sep 17 00:00:00 2001 From: Junwei Zhao Date: Fri, 11 Apr 2025 14:08:33 +1000 Subject: [PATCH] Update yamls --- apply.sh | 10 +++++++ {es => archive}/es.yaml | 0 archive/postgres-values.yaml | 46 +++++++++++++++++++++----------- archive/redis-values.yaml | 35 ------------------------- argocd-values.yaml | 6 ++--- db/redis-values.yaml | 51 ++++++++++++++++++++++++++++++++++++ home-apps/n8n.yaml | 2 +- 7 files changed, 96 insertions(+), 54 deletions(-) rename {es => archive}/es.yaml (100%) delete mode 100644 archive/redis-values.yaml create mode 100644 db/redis-values.yaml diff --git a/apply.sh b/apply.sh index 09805ec..8db38f3 100755 --- a/apply.sh +++ b/apply.sh @@ -296,3 +296,13 @@ sudo fail2ban-client status sshd # When port 53 is used, then check systemd-resolved sudo systemctl status systemd-resolved + +sudo systemctl disable systemd-resolved + +vim /etc/resolv.conf # and remove local nameserver + + +# redis + + +helm upgrade --install redis -n db -f db/redis-values.yaml bitnami/redis diff --git a/es/es.yaml b/archive/es.yaml similarity index 100% rename from es/es.yaml rename to archive/es.yaml diff --git a/archive/postgres-values.yaml b/archive/postgres-values.yaml index 9d3e92a..f4e7ab2 100644 --- a/archive/postgres-values.yaml +++ b/archive/postgres-values.yaml @@ -1,11 +1,15 @@ +# image: +# repository: postgres +# tag: 11 +# postgresqlDataDir: /bitnami/postgresql postgresqlDatabase: home global: - storageClass: nfs-client + # storageClass: local-storage + imageRegistry: mirror.gcr.io postgresql: auth: database: junv-db - # TODO: need to UPDATE DATA before update this image tag # error: DETAIL: The data directory was initialized by PostgreSQL version 11, which is not compatible with this version 14.1. image: @@ -60,6 +64,15 @@ customRreadinessProbe: failureThreshold: 6 primary: + podSecurityContext: + enabled: true + fsGroup: 1000 + containerSecurityContext: + enabled: true + runAsUser: 1000 + extendedConfiguration: | + max_connections = 300 + shared_buffers = 128MB labels: role: primary service: @@ -73,19 +86,22 @@ primary: cpu: 250m persistence: mountPath: /bitnami/postgresql - storageClass: nfs-client - size: 20Gi - # nodeSelector: - # kubernetes.io/hostname: server-1 - # tolerations: - # - key: "node" - # operator: "Equal" - # value: "special" - # effect: "NoSchedule" - # - key: node-role.kubernetes.io/master - # operator: Equal - # value: "" - # effect: NoSchedule + existingClaim: postgres-local-pvc + nodeSelector: + kubernetes.io/hostname: server-3 + tolerations: + - key: "node" + operator: "Equal" + value: "special" + effect: "NoSchedule" + - key: node-role.kubernetes.io/master + operator: Equal + value: "" + effect: NoSchedule + - key: node-role.kubernetes.io/control-plane + operator: Equal + value: "" + effect: NoSchedule readReplicas: replicaCount: 1 diff --git a/archive/redis-values.yaml b/archive/redis-values.yaml deleted file mode 100644 index 2340227..0000000 --- a/archive/redis-values.yaml +++ /dev/null @@ -1,35 +0,0 @@ -auth: - sentinel: true - existingSecret: redis-credentials - existingSecretPasswordKey: redis-password - -persistence: - size: 10Gi - storageClass: nfs-client - # existingClaim: nfs-redis -volumePermissions: - enabled: true -# securityContext: -# fsGroup: 1000 -# runAsUser: 1000 -metrics: - enabled: true - serviceMonitor: - enabled: true - additionalLabels: - release: prometheus - -master: - service: - type: ClusterIP - persistence: - enabled: true - size: 10Gi - storageClass: nfs-client - # existingClaim: nfs-redis - -replica: - persistence: - enabled: true - size: 5Gi - storageClass: nfs-client diff --git a/argocd-values.yaml b/argocd-values.yaml index 69cb6d4..ab8f9b6 100644 --- a/argocd-values.yaml +++ b/argocd-values.yaml @@ -36,7 +36,7 @@ server: - argo.junv.cc secretName: argocd-tls metrics: - enabled: true + enabled: false serviceMonitor: enabled: true env: @@ -46,13 +46,13 @@ server: repoServer: replicas: 1 metrics: - enabled: true + enabled: false serviceMonitor: enabled: true applicationSet: metrics: - enabled: true + enabled: false serviceMonitor: enabled: true diff --git a/db/redis-values.yaml b/db/redis-values.yaml new file mode 100644 index 0000000..82ff87a --- /dev/null +++ b/db/redis-values.yaml @@ -0,0 +1,51 @@ +global: + imageRegistry: mirror.gcr.io +image: + registry: mirror.gcr.io +architecture: standalone +auth: + enabled: false + # sentinel: true + # existingSecret: redis-credentials + # existingSecretPasswordKey: redis-password +persistence: + size: 20Gi + # storageClass: nfs-client + existingClaim: redis-local-pvc +volumePermissions: + enabled: true +# securityContext: +# fsGroup: 1000 +# runAsUser: 1000 +metrics: + enabled: true + serviceMonitor: + enabled: true + additionalLabels: + release: prometheus +master: + service: + type: ClusterIP + persistence: + enabled: true + size: 20Gi + # storageClass: nfs-client + existingClaim: redis-local-pvc + tolerations: + - key: "node" + operator: "Equal" + value: "special" + effect: "NoSchedule" + - key: node-role.kubernetes.io/master + operator: Equal + value: "" + effect: NoSchedule + - key: node-role.kubernetes.io/control-plane + operator: Equal + value: "" + effect: NoSchedule +replica: + persistence: + enabled: false + size: 5Gi + storageClass: nfs-client diff --git a/home-apps/n8n.yaml b/home-apps/n8n.yaml index 03488bb..4d9f09c 100644 --- a/home-apps/n8n.yaml +++ b/home-apps/n8n.yaml @@ -38,7 +38,7 @@ spec: securityContext: runAsUser: 0 runAsGroup: 0 - fsGroup: 0 + # fsGroup: 0 command: ["/bin/sh", "-c"] args: - |