From c69fadfc68688e99ef4c648acdc0079f817a742a Mon Sep 17 00:00:00 2001 From: JJGadgets Date: Mon, 19 Feb 2024 05:56:48 +0800 Subject: [PATCH] chore(template): updates --- kube/deploy/apps/media-edit/app/es.yaml | 1 + kube/templates/test/app/es.yaml | 3 ++- kube/templates/test/app/hr.yaml | 7 ++++--- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/kube/deploy/apps/media-edit/app/es.yaml b/kube/deploy/apps/media-edit/app/es.yaml index 251a18ee..5c49e5ac 100644 --- a/kube/deploy/apps/media-edit/app/es.yaml +++ b/kube/deploy/apps/media-edit/app/es.yaml @@ -6,6 +6,7 @@ metadata: name: &name media-edit-gluetun namespace: media-edit spec: + refreshInterval: 1m secretStoreRef: kind: ClusterSecretStore name: 1p diff --git a/kube/templates/test/app/es.yaml b/kube/templates/test/app/es.yaml index c3ca3c77..31d86dab 100644 --- a/kube/templates/test/app/es.yaml +++ b/kube/templates/test/app/es.yaml @@ -6,12 +6,13 @@ metadata: name: &name ${APPNAME}-secrets namespace: ${APPNAME} spec: + refreshInterval: 1m secretStoreRef: kind: ClusterSecretStore name: 1p dataFrom: - extract: - key: "${APPNAME} (${CLUSTER_NAME})" + key: "${APPNAME} - ${CLUSTER_NAME}" target: creationPolicy: Owner deletionPolicy: Retain diff --git a/kube/templates/test/app/hr.yaml b/kube/templates/test/app/hr.yaml index 1263229e..9d2b35f9 100644 --- a/kube/templates/test/app/hr.yaml +++ b/kube/templates/test/app/hr.yaml @@ -25,6 +25,7 @@ spec: ingress.home.arpa/nginx-internal: "allow" db.home.arpa/pg: "pg-default" s3.home.arpa/store: "rgw-${CLUSTER_NAME}" + # egress.home.arpa/internet: "allow" containers: main: image: &img @@ -61,13 +62,13 @@ spec: memory: "128Mi" limits: cpu: "3000m" - memory: "6000Mi" + memory: "6Gi" # statefulset: # volumeClaimTemplates: # - name: data - # accessMode: ReadWriteOnce # size: 20Gi # storageClass: block + # accessMode: ReadWriteOnce # advancedMounts: # main: # only container name here # - path: "/data" @@ -130,7 +131,7 @@ spec: primary: true className: "nginx-internal" annotations: - external-dns.alpha.kubernetes.io/target: "${DNS_SHORT_CF}" + external-dns.alpha.kubernetes.io/target: "${DNS_CF}" external-dns.alpha.kubernetes.io/cloudflare-proxied: "true" nginx.ingress.kubernetes.io/backend-protocol: "HTTPS" # https://github.com/kubernetes/ingress-nginx/issues/6728