From f1dddb8932394d4f9de6f420869adf150b92ecac Mon Sep 17 00:00:00 2001 From: Jay Kim Date: Fri, 7 Jul 2023 11:07:33 +0900 Subject: [PATCH 001/190] feat: change delegator tag --- delegator/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/delegator/values.yaml b/delegator/values.yaml index 35d77e1e..b7e5c2f5 100644 --- a/delegator/values.yaml +++ b/delegator/values.yaml @@ -5,7 +5,7 @@ global: image: repository: public.ecr.aws/bisonai/orakl-delegator #repository url pullPolicy: IfNotPresent - tag: "v0.0.1.20230627.0904.6d79d3c" + tag: "v0.0.1.20230707.0137.513e9f9" imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: [] From 9ea984e3385f1361b144dec16166303c0655db2d Mon Sep 17 00:00:00 2001 From: Jay Kim Date: Thu, 13 Jul 2023 14:25:08 +0900 Subject: [PATCH 002/190] feat: update tag version --- aggregator/values.yaml | 2 +- request-response/values.yaml | 2 +- vrf/values.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/aggregator/values.yaml b/aggregator/values.yaml index f5ca22e1..a15edd67 100644 --- a/aggregator/values.yaml +++ b/aggregator/values.yaml @@ -6,7 +6,7 @@ global: image: repository: public.ecr.aws/u6t6w0e4/orakl-core #repository url pullPolicy: IfNotPresent - tag: "v0.3.1.20230703.0933.ef3b19c" + tag: "v0.3.1.20230712.0827.c37315" imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: [] diff --git a/request-response/values.yaml b/request-response/values.yaml index 0d1cdb7f..58b07c4f 100644 --- a/request-response/values.yaml +++ b/request-response/values.yaml @@ -6,7 +6,7 @@ global: image: repository: public.ecr.aws/bisonai/orakl-core #repository url pullPolicy: IfNotPresent - tag: "v0.3.1.20230703.0933.ef3b19c" #image tag + tag: "v0.3.1.20230712.0827.c373159" #image tag imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: [] diff --git a/vrf/values.yaml b/vrf/values.yaml index 5ce1a766..d3c81bf4 100644 --- a/vrf/values.yaml +++ b/vrf/values.yaml @@ -6,7 +6,7 @@ global: image: repository: public.ecr.aws/u6t6w0e4/orakl-core #repository url pullPolicy: IfNotPresent - tag: "v0.3.1.20230703.0933.ef3b19c" #image tag + tag: "v0.3.1.20230712.0827.c373159" #image tag imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: [] From 90a61977bdc326d6c26680cd346ed163050af2ac Mon Sep 17 00:00:00 2001 From: Jay Kim Date: Thu, 13 Jul 2023 14:35:06 +0900 Subject: [PATCH 003/190] fix: fix aggregator tag image typo --- aggregator/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aggregator/values.yaml b/aggregator/values.yaml index a15edd67..958c2881 100644 --- a/aggregator/values.yaml +++ b/aggregator/values.yaml @@ -6,7 +6,7 @@ global: image: repository: public.ecr.aws/u6t6w0e4/orakl-core #repository url pullPolicy: IfNotPresent - tag: "v0.3.1.20230712.0827.c37315" + tag: "v0.3.1.20230712.0827.c373159" imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: [] From 65b7ce74e1fd6cfa5f8a2d56396f288c93cdd3da Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Thu, 20 Jul 2023 15:33:53 +0900 Subject: [PATCH 004/190] feat: update tag image --- monitor-api/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/monitor-api/values.yaml b/monitor-api/values.yaml index 015a4dc4..16f684b6 100644 --- a/monitor-api/values.yaml +++ b/monitor-api/values.yaml @@ -4,7 +4,7 @@ global: image: repository: public.ecr.aws/bisonai/orakl-general #repository url pullPolicy: IfNotPresent - tag: "monitor.v.20230627.0256.7a9206d" + tag: "monitor.v.20230720.0501.4c98214" imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: [] From d4b5d3a23eb20529aacdb437975467866781796c Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Thu, 20 Jul 2023 15:36:30 +0900 Subject: [PATCH 005/190] feat: Add NODE_ENV to secret store --- secret-store/monitor-secret.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/secret-store/monitor-secret.yaml b/secret-store/monitor-secret.yaml index 3b9d68a9..e298292a 100644 --- a/secret-store/monitor-secret.yaml +++ b/secret-store/monitor-secret.yaml @@ -104,3 +104,7 @@ spec: remoteRef: key: baobab/prod/monitor property: VRF_REDIS_PORT + - secretKey: NODE_ENV + remoteRef: + key: baobab/prod/monitor + property: NODE_ENV From 5fb9bcb32b481f53ca9535407eff336118700dfe Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Thu, 20 Jul 2023 16:11:13 +0900 Subject: [PATCH 006/190] feat: Add DATABASE_URL secretKey --- secret-store/monitor-secret.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/secret-store/monitor-secret.yaml b/secret-store/monitor-secret.yaml index e298292a..51245ac7 100644 --- a/secret-store/monitor-secret.yaml +++ b/secret-store/monitor-secret.yaml @@ -108,3 +108,7 @@ spec: remoteRef: key: baobab/prod/monitor property: NODE_ENV + - secretKey: DATABASE_URL + remoteRef: + key: baobab/prod/monitor + property: DATABASE_URL \ No newline at end of file From 87530af89645fd2b3081ab9a2f20aef1a7f12897 Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Thu, 20 Jul 2023 16:53:02 +0900 Subject: [PATCH 007/190] feat: Update monitor tag --- monitor-api/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/monitor-api/values.yaml b/monitor-api/values.yaml index 16f684b6..eada32e6 100644 --- a/monitor-api/values.yaml +++ b/monitor-api/values.yaml @@ -4,7 +4,7 @@ global: image: repository: public.ecr.aws/bisonai/orakl-general #repository url pullPolicy: IfNotPresent - tag: "monitor.v.20230720.0501.4c98214" + tag: "monitor.v.20230720.0749.b542157" imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: [] From 8f5c5058a1913323c81a14b56d4cf142a4c1ec06 Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Tue, 25 Jul 2023 11:42:16 +0900 Subject: [PATCH 008/190] feat: Update monitor tag --- monitor-api/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/monitor-api/values.yaml b/monitor-api/values.yaml index eada32e6..2d939681 100644 --- a/monitor-api/values.yaml +++ b/monitor-api/values.yaml @@ -4,7 +4,7 @@ global: image: repository: public.ecr.aws/bisonai/orakl-general #repository url pullPolicy: IfNotPresent - tag: "monitor.v.20230720.0749.b542157" + tag: "monitor.v.20230725.0237.775b477" imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: [] From b5eb1434813becb2ec0e8dc016d527f720668596 Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Tue, 22 Aug 2023 17:16:58 +0900 Subject: [PATCH 009/190] fix: Remove vault token from code for security --- secret-store/secret-store.yaml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/secret-store/secret-store.yaml b/secret-store/secret-store.yaml index 0da9c132..ec61c891 100644 --- a/secret-store/secret-store.yaml +++ b/secret-store/secret-store.yaml @@ -11,12 +11,4 @@ spec: auth: tokenSecretRef: name: "vault-token" - key: "token" - ---- -apiVersion: v1 -kind: Secret -metadata: - name: vault-token -data: - token: aHZzLmtZUGdCU0w1ODRZWGtqWWVxbjZXQjBSNA== \ No newline at end of file + key: "token" \ No newline at end of file From ade17afd7621b712b941fa333428952d10687191 Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Tue, 22 Aug 2023 17:17:21 +0900 Subject: [PATCH 010/190] feat: Deploy api --- manifest/argocd/baobab/api.yaml | 15 +++++++++++++++ secret-store/api-secret.yaml | 4 ++-- 2 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 manifest/argocd/baobab/api.yaml diff --git a/manifest/argocd/baobab/api.yaml b/manifest/argocd/baobab/api.yaml new file mode 100644 index 00000000..89328431 --- /dev/null +++ b/manifest/argocd/baobab/api.yaml @@ -0,0 +1,15 @@ +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: api + namespace: argocd +spec: + destination: + namespace: orakl + server: https://kubernetes.default.svc + project: default + source: + path: api/ + repoURL: https://github.com/Bisonai/orakl-helm-charts.git + targetRevision: gcp-baobab-prod + syncPolicy: {} diff --git a/secret-store/api-secret.yaml b/secret-store/api-secret.yaml index 44d06b46..debaddd0 100644 --- a/secret-store/api-secret.yaml +++ b/secret-store/api-secret.yaml @@ -10,9 +10,9 @@ spec: data: - secretKey: DATABASE_URL remoteRef: - key: baobab/prod/api + key: baobab/api property: DATABASE_URL - secretKey: ENCRYPT_PASSWORD remoteRef: - key: baobab/prod/api + key: baobab/api property: ENCRYPT_PASSWORD \ No newline at end of file From 44efba593c26cec58b959cc1032b0d8153bb843a Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Tue, 22 Aug 2023 17:42:33 +0900 Subject: [PATCH 011/190] feat: Deploy delegator --- manifest/argocd/baobab/delegator.yaml | 15 +++++++++++++++ secret-store/delegator-secret.yaml | 4 ++-- 2 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 manifest/argocd/baobab/delegator.yaml diff --git a/manifest/argocd/baobab/delegator.yaml b/manifest/argocd/baobab/delegator.yaml new file mode 100644 index 00000000..a5564659 --- /dev/null +++ b/manifest/argocd/baobab/delegator.yaml @@ -0,0 +1,15 @@ +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: delegator + namespace: argocd +spec: + destination: + namespace: orakl + server: https://kubernetes.default.svc + project: default + source: + path: delegator/ + repoURL: https://github.com/Bisonai/orakl-helm-charts.git + targetRevision: gcp-baobab-prod + syncPolicy: {} diff --git a/secret-store/delegator-secret.yaml b/secret-store/delegator-secret.yaml index 158ebaa8..09b85158 100644 --- a/secret-store/delegator-secret.yaml +++ b/secret-store/delegator-secret.yaml @@ -10,9 +10,9 @@ spec: data: - secretKey: DATABASE_URL remoteRef: - key: baobab/prod/delegator + key: baobab/delegator property: DATABASE_URL - secretKey: PROVIDER_URL remoteRef: - key: baobab/prod/delegator + key: baobab/delegator property: PROVIDER_URL \ No newline at end of file From dcf4f07ba6bef7c949d9a15df5ecf68a641bce9e Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Tue, 22 Aug 2023 17:44:04 +0900 Subject: [PATCH 012/190] feat: Deploy cli --- manifest/argocd/baobab/cli.yaml | 15 +++++++++++++++ secret-store/cli-secret.yaml | 18 +++++++++--------- 2 files changed, 24 insertions(+), 9 deletions(-) create mode 100644 manifest/argocd/baobab/cli.yaml diff --git a/manifest/argocd/baobab/cli.yaml b/manifest/argocd/baobab/cli.yaml new file mode 100644 index 00000000..9f4b990c --- /dev/null +++ b/manifest/argocd/baobab/cli.yaml @@ -0,0 +1,15 @@ +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: cli + namespace: argocd +spec: + destination: + namespace: orakl + server: https://kubernetes.default.svc + project: default + source: + path: cli/ + repoURL: https://github.com/Bisonai/orakl-helm-charts.git + targetRevision: gcp-baobab-prod + syncPolicy: {} diff --git a/secret-store/cli-secret.yaml b/secret-store/cli-secret.yaml index f70e6a69..3dc3fad0 100644 --- a/secret-store/cli-secret.yaml +++ b/secret-store/cli-secret.yaml @@ -10,37 +10,37 @@ spec: data: - secretKey: LISTENER_SERVICE_HOST remoteRef: - key: baobab/prod/cli + key: baobab/cli property: LISTENER_SERVICE_HOST - secretKey: LISTENER_SERVICE_PORT remoteRef: - key: baobab/prod/cli + key: baobab/cli property: LISTENER_SERVICE_PORT - secretKey: ORAKL_NETWORK_API_URL remoteRef: - key: baobab/prod/cli + key: baobab/cli property: ORAKL_NETWORK_API_URL - secretKey: ORAKL_NETWORK_DELEGATOR_URL remoteRef: - key: baobab/prod/cli + key: baobab/cli property: ORAKL_NETWORK_DELEGATOR_URL - secretKey: ORAKL_NETWORK_FETCHER_URL remoteRef: - key: baobab/prod/cli + key: baobab/cli property: ORAKL_NETWORK_FETCHER_URL - secretKey: REPORTER_SERVICE_HOST remoteRef: - key: baobab/prod/cli + key: baobab/cli property: REPORTER_SERVICE_HOST - secretKey: REPORTER_SERVICE_PORT remoteRef: - key: baobab/prod/cli + key: baobab/cli property: REPORTER_SERVICE_PORT - secretKey: WORKER_SERVICE_HOST remoteRef: - key: baobab/prod/cli + key: baobab/cli property: WORKER_SERVICE_HOST - secretKey: WORKER_SERVICE_PORT remoteRef: - key: baobab/prod/cli + key: baobab/cli property: WORKER_SERVICE_PORT \ No newline at end of file From 5fb39f4b3da7b0e20fd09e53557027a1a1090a07 Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Tue, 22 Aug 2023 17:50:56 +0900 Subject: [PATCH 013/190] feat: Update RR chart --- .../listener/deployment-listener.yaml | 17 ---------- request-response/templates/pvc.yaml | 34 ------------------- .../reporter/deployment-reporter.yaml | 16 --------- .../templates/worker/deployment-worker.yaml | 16 --------- request-response/values.yaml | 22 +----------- 5 files changed, 1 insertion(+), 104 deletions(-) delete mode 100644 request-response/templates/pvc.yaml diff --git a/request-response/templates/listener/deployment-listener.yaml b/request-response/templates/listener/deployment-listener.yaml index 273be121..a16173a8 100644 --- a/request-response/templates/listener/deployment-listener.yaml +++ b/request-response/templates/listener/deployment-listener.yaml @@ -25,29 +25,12 @@ spec: serviceAccountName: {{ .Values.listener.serviceAccount.name }} securityContext: {{- toYaml .Values.listener.podSecurityContext | nindent 8 }} - volumes: - {{ if .Values.global.hostPath.enable }} - {{- toYaml .Values.global.hostPath.volumes | default "" | nindent 8 }} - {{ else }} - {{- if .Values.global.gcpAutopilot.enabled }} - - name: orakl-log-storage - persistentVolumeClaim: - claimName: {{ .Values.global.appName }}-listener-pvc - {{ else }} - - name: orakl-log-storage - persistentVolumeClaim: - claimName: orakl-log - {{ end }} - {{ end }} containers: - name: {{ .Chart.Name }} securityContext: {{- toYaml .Values.listener.containerSecurityContext | nindent 12 }} image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.tag | default .Chart.AppVersion }}" imagePullPolicy: {{ .Values.global.image.pullPolicy }} - volumeMounts: - {{- toYaml .Values.global.volumeMounts | default "" | nindent 12 }} - {{- if .Values.global.secretManager.enabled }} env: - name: NODE_ENV valueFrom: diff --git a/request-response/templates/pvc.yaml b/request-response/templates/pvc.yaml deleted file mode 100644 index 8f47ec96..00000000 --- a/request-response/templates/pvc.yaml +++ /dev/null @@ -1,34 +0,0 @@ -{{- if .Values.global.gcpAutopilot.enabled }} -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: "{{ .Values.global.appName }}-listener-pvc" -spec: - accessModes: - - ReadWriteOnce - resources: - requests: - storage: 10Gi ---- -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: "{{ .Values.global.appName }}-reporter-pvc" -spec: - accessModes: - - ReadWriteOnce - resources: - requests: - storage: 10Gi ---- -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: "{{ .Values.global.appName }}-worker-pvc" -spec: - accessModes: - - ReadWriteOnce - resources: - requests: - storage: 10Gi -{{- end}} \ No newline at end of file diff --git a/request-response/templates/reporter/deployment-reporter.yaml b/request-response/templates/reporter/deployment-reporter.yaml index be047ad4..53820e0c 100644 --- a/request-response/templates/reporter/deployment-reporter.yaml +++ b/request-response/templates/reporter/deployment-reporter.yaml @@ -25,20 +25,6 @@ spec: serviceAccountName: {{ .Values.reporter.serviceAccount.name }} securityContext: {{- toYaml .Values.reporter.podSecurityContext | nindent 8 }} - volumes: - {{ if .Values.global.hostPath.enable }} - {{- toYaml .Values.global.hostPath.volumes | default "" | nindent 8 }} - {{ else }} - {{- if .Values.global.gcpAutopilot.enabled }} - - name: orakl-log-storage - persistentVolumeClaim: - claimName: {{ .Values.global.appName }}-reporter-pvc - {{ else }} - - name: orakl-log-storage - persistentVolumeClaim: - claimName: orakl-log - {{ end }} - {{ end }} {{- if .Values.global.affinity.enabled }} affinity: nodeAffinity: @@ -57,8 +43,6 @@ spec: {{- toYaml .Values.reporter.containerSecurityContext | nindent 12 }} image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.tag | default .Chart.AppVersion }}" imagePullPolicy: {{ .Values.global.image.pullPolicy }} - volumeMounts: - {{- toYaml .Values.global.volumeMounts | default "" | nindent 12 }} {{- if .Values.global.secretManager.enabled }} env: - name: NODE_ENV diff --git a/request-response/templates/worker/deployment-worker.yaml b/request-response/templates/worker/deployment-worker.yaml index e4485c74..d89a08ab 100644 --- a/request-response/templates/worker/deployment-worker.yaml +++ b/request-response/templates/worker/deployment-worker.yaml @@ -25,20 +25,6 @@ spec: serviceAccountName: {{ .Values.worker.serviceAccount.name }} securityContext: {{- toYaml .Values.worker.podSecurityContext | nindent 8 }} - volumes: - {{ if .Values.global.hostPath.enable }} - {{- toYaml .Values.global.hostPath.volumes | default "" | nindent 8 }} - {{ else }} - {{- if .Values.global.gcpAutopilot.enabled }} - - name: orakl-log-storage - persistentVolumeClaim: - claimName: {{ .Values.global.appName }}-worker-pvc - {{ else }} - - name: orakl-log-storage - persistentVolumeClaim: - claimName: orakl-log - {{ end }} - {{ end }} {{- if .Values.global.affinity.enabled }} affinity: nodeAffinity: @@ -57,8 +43,6 @@ spec: {{- toYaml .Values.worker.containerSecurityContext | nindent 12 }} image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.tag | default .Chart.AppVersion }}" imagePullPolicy: {{ .Values.global.image.pullPolicy }} - volumeMounts: - {{- toYaml .Values.global.volumeMounts | default "" | nindent 12 }} {{- if .Values.global.secretManager.enabled }} env: - name: NODE_ENV diff --git a/request-response/values.yaml b/request-response/values.yaml index 58b07c4f..ab35b8d5 100644 --- a/request-response/values.yaml +++ b/request-response/values.yaml @@ -6,7 +6,7 @@ global: image: repository: public.ecr.aws/bisonai/orakl-core #repository url pullPolicy: IfNotPresent - tag: "v0.3.1.20230712.0827.c373159" #image tag + tag: "v0.3.1.20230822.0106.32f5041" #image tag imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: [] @@ -16,31 +16,11 @@ global: secretId: versionId: - gcpAutopilot: - enabled: true - affinity: enabled: false key: kubernetes.io/hostname value: ip-10-0-90-13.ap-southeast-1.compute.internal - hostPath: - enable: false - volumes: - - name: orakl-log-storage - hostPath: - path: /log/ - type: DirectoryOrCreate - - volumes: - - name: orakl-log-storage - persistentVolumeClaim: - claimName: orakl-log - - volumeMounts: - - name: orakl-log-storage - mountPath: /app/log - podAnnotations: {} livenessProbe: From 1ed1b02fb6b621115e154345403a1810c1a3c8f5 Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Tue, 22 Aug 2023 17:53:03 +0900 Subject: [PATCH 014/190] fixup! feat: Update RR chart --- .../templates/listener/deployment-listener.yaml | 10 ---------- .../templates/reporter/deployment-reporter.yaml | 10 ---------- .../templates/worker/deployment-worker.yaml | 10 ---------- 3 files changed, 30 deletions(-) diff --git a/request-response/templates/listener/deployment-listener.yaml b/request-response/templates/listener/deployment-listener.yaml index a16173a8..bd27ef58 100644 --- a/request-response/templates/listener/deployment-listener.yaml +++ b/request-response/templates/listener/deployment-listener.yaml @@ -62,11 +62,6 @@ spec: secretKeyRef: name: orakl-request-response-secrets key: LOG_LEVEL - - name: LOG_DIR - valueFrom: - secretKeyRef: - name: orakl-request-response-secrets - key: LOG_DIR - name: REDIS_HOST valueFrom: secretKeyRef: @@ -111,11 +106,6 @@ spec: secretKeyRef: name: request-response-secrets key: LOG_LEVEL - - name: LOG_DIR - valueFrom: - secretKeyRef: - name: request-response-secrets - key: LOG_DIR - name: REDIS_HOST valueFrom: secretKeyRef: diff --git a/request-response/templates/reporter/deployment-reporter.yaml b/request-response/templates/reporter/deployment-reporter.yaml index 53820e0c..589d178b 100644 --- a/request-response/templates/reporter/deployment-reporter.yaml +++ b/request-response/templates/reporter/deployment-reporter.yaml @@ -67,11 +67,6 @@ spec: secretKeyRef: name: orakl-request-response-secrets key: LOG_LEVEL - - name: LOG_DIR - valueFrom: - secretKeyRef: - name: orakl-request-response-secrets - key: LOG_DIR - name: REDIS_HOST valueFrom: secretKeyRef: @@ -116,11 +111,6 @@ spec: secretKeyRef: name: request-response-secrets key: LOG_LEVEL - - name: LOG_DIR - valueFrom: - secretKeyRef: - name: request-response-secrets - key: LOG_DIR - name: REDIS_HOST valueFrom: secretKeyRef: diff --git a/request-response/templates/worker/deployment-worker.yaml b/request-response/templates/worker/deployment-worker.yaml index d89a08ab..6eae207b 100644 --- a/request-response/templates/worker/deployment-worker.yaml +++ b/request-response/templates/worker/deployment-worker.yaml @@ -67,11 +67,6 @@ spec: secretKeyRef: name: orakl-request-response-secrets key: LOG_LEVEL - - name: LOG_DIR - valueFrom: - secretKeyRef: - name: orakl-request-response-secrets - key: LOG_DIR - name: REDIS_HOST valueFrom: secretKeyRef: @@ -113,11 +108,6 @@ spec: secretKeyRef: name: request-response-secrets key: LOG_LEVEL - - name: LOG_DIR - valueFrom: - secretKeyRef: - name: request-response-secrets - key: LOG_DIR - name: REDIS_HOST valueFrom: secretKeyRef: From 019f526b123d9d4beaa03932f6e2b53d4aac02d6 Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Tue, 22 Aug 2023 17:54:41 +0900 Subject: [PATCH 015/190] feat: Deploy RR --- manifest/argocd/baobab/request-response.yaml | 15 +++++++++++++++ secret-store/request-response-secret.yaml | 18 +++++++----------- 2 files changed, 22 insertions(+), 11 deletions(-) create mode 100644 manifest/argocd/baobab/request-response.yaml diff --git a/manifest/argocd/baobab/request-response.yaml b/manifest/argocd/baobab/request-response.yaml new file mode 100644 index 00000000..db996c96 --- /dev/null +++ b/manifest/argocd/baobab/request-response.yaml @@ -0,0 +1,15 @@ +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: request-response + namespace: argocd +spec: + destination: + namespace: orakl + server: https://kubernetes.default.svc + project: default + source: + path: request-response/ + repoURL: https://github.com/Bisonai/orakl-helm-charts.git + targetRevision: gcp-baobab-prod + syncPolicy: {} diff --git a/secret-store/request-response-secret.yaml b/secret-store/request-response-secret.yaml index aab39c6a..aa81a2ad 100644 --- a/secret-store/request-response-secret.yaml +++ b/secret-store/request-response-secret.yaml @@ -10,33 +10,29 @@ spec: data: - secretKey: CHAIN remoteRef: - key: baobab/prod/request-response + key: baobab/request-response property: CHAIN - - secretKey: LOG_DIR - remoteRef: - key: baobab/prod/request-response - property: LOG_DIR - secretKey: NODE_ENV remoteRef: - key: baobab/prod/request-response + key: baobab/request-response property: NODE_ENV - secretKey: LOG_LEVEL remoteRef: - key: baobab/prod/request-response + key: baobab/request-response property: LOG_LEVEL - secretKey: ORAKL_NETWORK_API_URL remoteRef: - key: baobab/prod/request-response + key: baobab/request-response property: ORAKL_NETWORK_API_URL - secretKey: PROVIDER_URL remoteRef: - key: baobab/prod/request-response + key: baobab/request-response property: PROVIDER_URL - secretKey: REDIS_HOST remoteRef: - key: baobab/prod/request-response + key: baobab/request-response property: REDIS_HOST - secretKey: REDIS_PORT remoteRef: - key: baobab/prod/request-response + key: baobab/request-response property: REDIS_PORT From 57adb9a7594d16f2be2e9739f8e61006ade678ad Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Tue, 22 Aug 2023 18:00:09 +0900 Subject: [PATCH 016/190] fix: Revert wrong deleted code --- request-response/templates/listener/deployment-listener.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/request-response/templates/listener/deployment-listener.yaml b/request-response/templates/listener/deployment-listener.yaml index bd27ef58..76708fde 100644 --- a/request-response/templates/listener/deployment-listener.yaml +++ b/request-response/templates/listener/deployment-listener.yaml @@ -31,6 +31,7 @@ spec: {{- toYaml .Values.listener.containerSecurityContext | nindent 12 }} image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.tag | default .Chart.AppVersion }}" imagePullPolicy: {{ .Values.global.image.pullPolicy }} + {{- if .Values.global.secretManager.enabled }} env: - name: NODE_ENV valueFrom: From 2e917447a4b461967167fc6795ca7f8ff746f493 Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Tue, 22 Aug 2023 18:04:52 +0900 Subject: [PATCH 017/190] feat: Update VRF chart --- .../listener/deployment-listener.yaml | 26 -------------- vrf/templates/pvc.yaml | 34 ------------------- .../reporter/deployment-reporter.yaml | 26 -------------- vrf/templates/worker/deployment-worker.yaml | 26 -------------- vrf/values.yaml | 22 +----------- 5 files changed, 1 insertion(+), 133 deletions(-) delete mode 100644 vrf/templates/pvc.yaml diff --git a/vrf/templates/listener/deployment-listener.yaml b/vrf/templates/listener/deployment-listener.yaml index 257079ca..0014f68e 100644 --- a/vrf/templates/listener/deployment-listener.yaml +++ b/vrf/templates/listener/deployment-listener.yaml @@ -25,28 +25,12 @@ spec: serviceAccountName: {{ .Values.listener.serviceAccount.name }} securityContext: {{- toYaml .Values.listener.podSecurityContext | nindent 8 }} - volumes: - {{ if .Values.global.hostPath.enable }} - {{- toYaml .Values.global.hostPath.volumes | default "" | nindent 8 }} - {{ else }} - {{- if .Values.global.gcpAutopilot.enabled }} - - name: orakl-log-storage - persistentVolumeClaim: - claimName: {{ .Values.global.appName }}-listener-pvc - {{ else }} - - name: orakl-log-storage - persistentVolumeClaim: - claimName: orakl-log - {{ end }} - {{ end }} containers: - name: {{ .Chart.Name }} securityContext: {{- toYaml .Values.listener.containerSecurityContext | nindent 12 }} image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.tag | default .Chart.AppVersion }}" imagePullPolicy: {{ .Values.global.image.pullPolicy }} - volumeMounts: - {{- toYaml .Values.global.volumeMounts | default "" | nindent 12 }} {{- if .Values.global.secretManager.enabled }} env: - name: NODE_ENV @@ -79,11 +63,6 @@ spec: secretKeyRef: name: orakl-vrf-secrets key: LOG_LEVEL - - name: LOG_DIR - valueFrom: - secretKeyRef: - name: orakl-vrf-secrets - key: LOG_DIR - name: REDIS_HOST valueFrom: secretKeyRef: @@ -128,11 +107,6 @@ spec: secretKeyRef: name: vrf-secrets key: LOG_LEVEL - - name: LOG_DIR - valueFrom: - secretKeyRef: - name: vrf-secrets - key: LOG_DIR - name: REDIS_HOST valueFrom: secretKeyRef: diff --git a/vrf/templates/pvc.yaml b/vrf/templates/pvc.yaml deleted file mode 100644 index 8f25f506..00000000 --- a/vrf/templates/pvc.yaml +++ /dev/null @@ -1,34 +0,0 @@ -{{- if .Values.global.gcpAutopilot.enabled }} -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: "{{ .Values.global.appName }}-listener-pvc" -spec: - accessModes: - - ReadWriteOnce - resources: - requests: - storage: 5Gi ---- -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: "{{ .Values.global.appName }}-reporter-pvc" -spec: - accessModes: - - ReadWriteOnce - resources: - requests: - storage: 10Gi ---- -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: "{{ .Values.global.appName }}-worker-pvc" -spec: - accessModes: - - ReadWriteOnce - resources: - requests: - storage: 10Gi -{{- end}} \ No newline at end of file diff --git a/vrf/templates/reporter/deployment-reporter.yaml b/vrf/templates/reporter/deployment-reporter.yaml index bf00e54b..d5ad4f10 100644 --- a/vrf/templates/reporter/deployment-reporter.yaml +++ b/vrf/templates/reporter/deployment-reporter.yaml @@ -25,20 +25,6 @@ spec: serviceAccountName: {{ .Values.reporter.serviceAccount.name }} securityContext: {{- toYaml .Values.reporter.podSecurityContext | nindent 8 }} - volumes: - {{ if .Values.global.hostPath.enable }} - {{- toYaml .Values.global.hostPath.volumes | default "" | nindent 8 }} - {{ else }} - {{- if .Values.global.gcpAutopilot.enabled }} - - name: orakl-log-storage - persistentVolumeClaim: - claimName: {{ .Values.global.appName }}-reporter-pvc - {{ else }} - - name: orakl-log-storage - persistentVolumeClaim: - claimName: orakl-log - {{ end }} - {{ end }} {{- if .Values.global.affinity.enabled }} affinity: nodeAffinity: @@ -57,8 +43,6 @@ spec: {{- toYaml .Values.reporter.containerSecurityContext | nindent 12 }} image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.tag | default .Chart.AppVersion }}" imagePullPolicy: {{ .Values.global.image.pullPolicy }} - volumeMounts: - {{- toYaml .Values.global.volumeMounts | default "" | nindent 12 }} {{- if .Values.global.secretManager.enabled }} env: - name: NODE_ENV @@ -91,11 +75,6 @@ spec: secretKeyRef: name: orakl-vrf-secrets key: LOG_LEVEL - - name: LOG_DIR - valueFrom: - secretKeyRef: - name: orakl-vrf-secrets - key: LOG_DIR - name: REDIS_HOST valueFrom: secretKeyRef: @@ -140,11 +119,6 @@ spec: secretKeyRef: name: vrf-secrets key: LOG_LEVEL - - name: LOG_DIR - valueFrom: - secretKeyRef: - name: vrf-secrets - key: LOG_DIR - name: REDIS_HOST valueFrom: secretKeyRef: diff --git a/vrf/templates/worker/deployment-worker.yaml b/vrf/templates/worker/deployment-worker.yaml index 8c20c457..70f9d41b 100644 --- a/vrf/templates/worker/deployment-worker.yaml +++ b/vrf/templates/worker/deployment-worker.yaml @@ -25,20 +25,6 @@ spec: serviceAccountName: {{ .Values.worker.serviceAccount.name }} securityContext: {{- toYaml .Values.worker.podSecurityContext | nindent 8 }} - volumes: - {{ if .Values.global.hostPath.enable }} - {{- toYaml .Values.global.hostPath.volumes | default "" | nindent 8 }} - {{ else }} - {{- if .Values.global.gcpAutopilot.enabled }} - - name: orakl-log-storage - persistentVolumeClaim: - claimName: {{ .Values.global.appName }}-worker-pvc - {{ else }} - - name: orakl-log-storage - persistentVolumeClaim: - claimName: orakl-log - {{ end }} - {{ end }} {{- if .Values.global.affinity.enabled }} affinity: nodeAffinity: @@ -57,8 +43,6 @@ spec: {{- toYaml .Values.worker.containerSecurityContext | nindent 12 }} image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.tag | default .Chart.AppVersion }}" imagePullPolicy: {{ .Values.global.image.pullPolicy }} - volumeMounts: - {{- toYaml .Values.global.volumeMounts | default "" | nindent 12 }} {{- if .Values.global.secretManager.enabled }} env: - name: NODE_ENV @@ -91,11 +75,6 @@ spec: secretKeyRef: name: orakl-vrf-secrets key: LOG_LEVEL - - name: LOG_DIR - valueFrom: - secretKeyRef: - name: orakl-vrf-secrets - key: LOG_DIR - name: REDIS_HOST valueFrom: secretKeyRef: @@ -140,11 +119,6 @@ spec: secretKeyRef: name: vrf-secrets key: LOG_LEVEL - - name: LOG_DIR - valueFrom: - secretKeyRef: - name: vrf-secrets - key: LOG_DIR - name: REDIS_HOST valueFrom: secretKeyRef: diff --git a/vrf/values.yaml b/vrf/values.yaml index d3c81bf4..0e50cdd5 100644 --- a/vrf/values.yaml +++ b/vrf/values.yaml @@ -6,7 +6,7 @@ global: image: repository: public.ecr.aws/u6t6w0e4/orakl-core #repository url pullPolicy: IfNotPresent - tag: "v0.3.1.20230712.0827.c373159" #image tag + tag: "v0.3.1.20230822.0106.32f5041" #image tag imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: [] @@ -16,31 +16,11 @@ global: secretId: versionId: - gcpAutopilot: - enabled: true - affinity: enabled: false key: kubernetes.io/hostname value: ip-10-0-176-73.ap-southeast-1.compute.internal - hostPath: - enable: false - volumes: - - name: orakl-log-storage - hostPath: - path: /log/ - type: DirectoryOrCreate - - volumes: - - name: orakl-log-storage - persistentVolumeClaim: - claimName: orakl-log - - volumeMounts: - - name: orakl-log-storage - mountPath: /app/log - podAnnotations: {} livenessProbe: From b2a8857eda19da6d0d90c6efad10e922a37fac9d Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Tue, 22 Aug 2023 18:06:08 +0900 Subject: [PATCH 018/190] feat: Deploy VRF --- manifest/argocd/baobab/vrf.yaml | 15 +++++++++++++++ secret-store/vrf-secret.yaml | 18 +++++++----------- 2 files changed, 22 insertions(+), 11 deletions(-) create mode 100644 manifest/argocd/baobab/vrf.yaml diff --git a/manifest/argocd/baobab/vrf.yaml b/manifest/argocd/baobab/vrf.yaml new file mode 100644 index 00000000..801ff248 --- /dev/null +++ b/manifest/argocd/baobab/vrf.yaml @@ -0,0 +1,15 @@ +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: vrf + namespace: argocd +spec: + destination: + namespace: orakl + server: https://kubernetes.default.svc + project: default + source: + path: vrf/ + repoURL: https://github.com/Bisonai/orakl-helm-charts.git + targetRevision: gcp-baobab-prod + syncPolicy: {} diff --git a/secret-store/vrf-secret.yaml b/secret-store/vrf-secret.yaml index e3aac95a..52e3da59 100644 --- a/secret-store/vrf-secret.yaml +++ b/secret-store/vrf-secret.yaml @@ -10,33 +10,29 @@ spec: data: - secretKey: CHAIN remoteRef: - key: baobab/prod/vrf + key: baobab/vrf property: CHAIN - - secretKey: LOG_DIR - remoteRef: - key: baobab/prod/vrf - property: LOG_DIR - secretKey: NODE_ENV remoteRef: - key: baobab/prod/vrf + key: baobab/vrf property: NODE_ENV - secretKey: LOG_LEVEL remoteRef: - key: baobab/prod/vrf + key: baobab/vrf property: LOG_LEVEL - secretKey: ORAKL_NETWORK_API_URL remoteRef: - key: baobab/prod/vrf + key: baobab/vrf property: ORAKL_NETWORK_API_URL - secretKey: PROVIDER_URL remoteRef: - key: baobab/prod/vrf + key: baobab/vrf property: PROVIDER_URL - secretKey: REDIS_HOST remoteRef: - key: baobab/prod/vrf + key: baobab/vrf property: REDIS_HOST - secretKey: REDIS_PORT remoteRef: - key: baobab/prod/vrf + key: baobab/vrf property: REDIS_PORT \ No newline at end of file From 94a900ca652d349721efeac485830cb4423c8676 Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Tue, 22 Aug 2023 18:09:50 +0900 Subject: [PATCH 019/190] feat: Update Data Feed chart --- .../listener/deployment-listener.yaml | 26 -------------- aggregator/templates/pvc.yaml | 34 ------------------- .../reporter/deployment-reporter.yaml | 26 -------------- .../templates/worker/deployment-worker.yaml | 26 -------------- aggregator/values.yaml | 22 +----------- 5 files changed, 1 insertion(+), 133 deletions(-) delete mode 100644 aggregator/templates/pvc.yaml diff --git a/aggregator/templates/listener/deployment-listener.yaml b/aggregator/templates/listener/deployment-listener.yaml index 5b92b7b9..2c06beff 100644 --- a/aggregator/templates/listener/deployment-listener.yaml +++ b/aggregator/templates/listener/deployment-listener.yaml @@ -25,28 +25,12 @@ spec: serviceAccountName: {{ .Values.listener.serviceAccount.name }} securityContext: {{- toYaml .Values.listener.podSecurityContext | nindent 8 }} - volumes: - {{ if .Values.global.hostPath.enable }} - {{- toYaml .Values.global.hostPath.volumes | default "" | nindent 8 }} - {{ else }} - {{- if .Values.global.gcpAutopilot.enabled }} - - name: orakl-log-storage - persistentVolumeClaim: - claimName: {{ .Values.global.appName }}-listener-pvc - {{ else }} - - name: orakl-log-storage - persistentVolumeClaim: - claimName: orakl-log - {{ end }} - {{ end }} containers: - name: {{ .Chart.Name }} securityContext: {{- toYaml .Values.listener.containerSecurityContext | nindent 12 }} image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.tag | default .Chart.AppVersion }}" imagePullPolicy: {{ .Values.global.image.pullPolicy }} - volumeMounts: - {{- toYaml .Values.global.volumeMounts | default "" | nindent 12 }} {{- if .Values.global.secretManager.enabled }} env: - name: NODE_ENV @@ -84,11 +68,6 @@ spec: secretKeyRef: name: orakl-aggregator-secrets key: LOG_LEVEL - - name: LOG_DIR - valueFrom: - secretKeyRef: - name: orakl-aggregator-secrets - key: LOG_DIR - name: REDIS_HOST valueFrom: secretKeyRef: @@ -133,11 +112,6 @@ spec: secretKeyRef: name: aggregator-secrets key: LOG_LEVEL - - name: LOG_DIR - valueFrom: - secretKeyRef: - name: aggregator-secrets - key: LOG_DIR - name: REDIS_HOST valueFrom: secretKeyRef: diff --git a/aggregator/templates/pvc.yaml b/aggregator/templates/pvc.yaml deleted file mode 100644 index 8f47ec96..00000000 --- a/aggregator/templates/pvc.yaml +++ /dev/null @@ -1,34 +0,0 @@ -{{- if .Values.global.gcpAutopilot.enabled }} -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: "{{ .Values.global.appName }}-listener-pvc" -spec: - accessModes: - - ReadWriteOnce - resources: - requests: - storage: 10Gi ---- -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: "{{ .Values.global.appName }}-reporter-pvc" -spec: - accessModes: - - ReadWriteOnce - resources: - requests: - storage: 10Gi ---- -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: "{{ .Values.global.appName }}-worker-pvc" -spec: - accessModes: - - ReadWriteOnce - resources: - requests: - storage: 10Gi -{{- end}} \ No newline at end of file diff --git a/aggregator/templates/reporter/deployment-reporter.yaml b/aggregator/templates/reporter/deployment-reporter.yaml index 1afa042f..4828be12 100644 --- a/aggregator/templates/reporter/deployment-reporter.yaml +++ b/aggregator/templates/reporter/deployment-reporter.yaml @@ -25,20 +25,6 @@ spec: serviceAccountName: {{ .Values.reporter.serviceAccount.name }} securityContext: {{- toYaml .Values.reporter.podSecurityContext | nindent 8 }} - volumes: - {{ if .Values.global.hostPath.enable }} - {{- toYaml .Values.global.hostPath.volumes | default "" | nindent 8 }} - {{ else }} - {{- if .Values.global.gcpAutopilot.enabled }} - - name: orakl-log-storage - persistentVolumeClaim: - claimName: {{ .Values.global.appName }}-reporter-pvc - {{ else }} - - name: orakl-log-storage - persistentVolumeClaim: - claimName: orakl-log - {{ end }} - {{ end }} {{- if .Values.global.affinity.enabled }} affinity: nodeAffinity: @@ -57,8 +43,6 @@ spec: {{- toYaml .Values.reporter.containerSecurityContext | nindent 12 }} image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.tag | default .Chart.AppVersion }}" imagePullPolicy: {{ .Values.global.image.pullPolicy }} - volumeMounts: - {{- toYaml .Values.global.volumeMounts | default "" | nindent 12 }} {{- if .Values.global.secretManager.enabled }} env: - name: NODE_ENV @@ -96,11 +80,6 @@ spec: secretKeyRef: name: orakl-aggregator-secrets key: LOG_LEVEL - - name: LOG_DIR - valueFrom: - secretKeyRef: - name: orakl-aggregator-secrets - key: LOG_DIR - name: REDIS_HOST valueFrom: secretKeyRef: @@ -145,11 +124,6 @@ spec: secretKeyRef: name: aggregator-secrets key: LOG_LEVEL - - name: LOG_DIR - valueFrom: - secretKeyRef: - name: aggregator-secrets - key: LOG_DIR - name: REDIS_HOST valueFrom: secretKeyRef: diff --git a/aggregator/templates/worker/deployment-worker.yaml b/aggregator/templates/worker/deployment-worker.yaml index cd686dac..93adada5 100644 --- a/aggregator/templates/worker/deployment-worker.yaml +++ b/aggregator/templates/worker/deployment-worker.yaml @@ -25,20 +25,6 @@ spec: serviceAccountName: {{ .Values.worker.serviceAccount.name }} securityContext: {{- toYaml .Values.worker.podSecurityContext | nindent 8 }} - volumes: - {{ if .Values.global.hostPath.enable }} - {{- toYaml .Values.global.hostPath.volumes | default "" | nindent 8 }} - {{ else }} - {{- if .Values.global.gcpAutopilot.enabled }} - - name: orakl-log-storage - persistentVolumeClaim: - claimName: {{ .Values.global.appName }}-worker-pvc - {{ else }} - - name: orakl-log-storage - persistentVolumeClaim: - claimName: orakl-log - {{ end }} - {{ end }} {{- if .Values.global.affinity.enabled }} affinity: nodeAffinity: @@ -57,8 +43,6 @@ spec: {{- toYaml .Values.worker.containerSecurityContext | nindent 12 }} image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.tag | default .Chart.AppVersion }}" imagePullPolicy: {{ .Values.global.image.pullPolicy }} - volumeMounts: - {{- toYaml .Values.global.volumeMounts | default "" | nindent 12 }} {{- if .Values.global.secretManager.enabled }} env: - name: NODE_ENV @@ -96,11 +80,6 @@ spec: secretKeyRef: name: orakl-aggregator-secrets key: LOG_LEVEL - - name: LOG_DIR - valueFrom: - secretKeyRef: - name: orakl-aggregator-secrets - key: LOG_DIR - name: REDIS_HOST valueFrom: secretKeyRef: @@ -145,11 +124,6 @@ spec: secretKeyRef: name: aggregator-secrets key: LOG_LEVEL - - name: LOG_DIR - valueFrom: - secretKeyRef: - name: aggregator-secrets - key: LOG_DIR - name: REDIS_HOST valueFrom: secretKeyRef: diff --git a/aggregator/values.yaml b/aggregator/values.yaml index 958c2881..0b8ae8e3 100644 --- a/aggregator/values.yaml +++ b/aggregator/values.yaml @@ -6,7 +6,7 @@ global: image: repository: public.ecr.aws/u6t6w0e4/orakl-core #repository url pullPolicy: IfNotPresent - tag: "v0.3.1.20230712.0827.c373159" + tag: "v0.3.1.20230822.0106.32f5041" imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: [] @@ -16,31 +16,11 @@ global: secretId: versionId: - gcpAutopilot: - enabled: true - affinity: enabled: false key: kubernetes.io/hostname value: - hostPath: - enable: false - volumes: - - name: orakl-log-storage - hostPath: - path: /log/ - type: DirectoryOrCreate - - volumes: - - name: orakl-log-storage - persistentVolumeClaim: - claimName: orakl-log - - volumeMounts: - - name: orakl-log-storage - mountPath: /app/log - podAnnotations: {} livenessProbe: From a205f1376aed01145c910de8405dab0d99dc8564 Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Tue, 22 Aug 2023 18:10:45 +0900 Subject: [PATCH 020/190] feat: Deploy Data Feed --- manifest/argocd/baobab/aggregator.yaml | 15 +++++++++++++++ secret-store/aggregator-secret.yaml | 20 ++++++++------------ 2 files changed, 23 insertions(+), 12 deletions(-) create mode 100644 manifest/argocd/baobab/aggregator.yaml diff --git a/manifest/argocd/baobab/aggregator.yaml b/manifest/argocd/baobab/aggregator.yaml new file mode 100644 index 00000000..1a9626b0 --- /dev/null +++ b/manifest/argocd/baobab/aggregator.yaml @@ -0,0 +1,15 @@ +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: aggregator + namespace: argocd +spec: + destination: + namespace: orakl + server: https://kubernetes.default.svc + project: default + source: + path: aggregator/ + repoURL: https://github.com/Bisonai/orakl-helm-charts.git + targetRevision: gcp-baobab-prod + syncPolicy: {} diff --git a/secret-store/aggregator-secret.yaml b/secret-store/aggregator-secret.yaml index 79309b3b..05d8c109 100644 --- a/secret-store/aggregator-secret.yaml +++ b/secret-store/aggregator-secret.yaml @@ -10,37 +10,33 @@ spec: data: - secretKey: CHAIN remoteRef: - key: baobab/prod/aggregator + key: baobab/aggregator property: CHAIN - - secretKey: LOG_DIR - remoteRef: - key: baobab/prod/aggregator - property: LOG_DIR - secretKey: NODE_ENV remoteRef: - key: baobab/prod/aggregator + key: baobab/aggregator property: NODE_ENV - secretKey: LOG_LEVEL remoteRef: - key: baobab/prod/aggregator + key: baobab/aggregator property: LOG_LEVEL - secretKey: ORAKL_NETWORK_API_URL remoteRef: - key: baobab/prod/aggregator + key: baobab/aggregator property: ORAKL_NETWORK_API_URL - secretKey: ORAKL_NETWORK_DELEGATOR_URL remoteRef: - key: baobab/prod/aggregator + key: baobab/aggregator property: ORAKL_NETWORK_DELEGATOR_URL - secretKey: PROVIDER_URL remoteRef: - key: baobab/prod/aggregator + key: baobab/aggregator property: PROVIDER_URL - secretKey: REDIS_HOST remoteRef: - key: baobab/prod/aggregator + key: baobab/aggregator property: REDIS_HOST - secretKey: REDIS_PORT remoteRef: - key: baobab/prod/aggregator + key: baobab/aggregator property: REDIS_PORT \ No newline at end of file From 7c9c91fdb52fbc230f630175fe34b2be0cbd792e Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Tue, 22 Aug 2023 18:43:27 +0900 Subject: [PATCH 021/190] feat: Deploy fetcher --- manifest/argocd/baobab/fetcher.yaml | 15 +++++++++++++++ secret-store/fetcher-secret.yaml | 6 +++--- 2 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 manifest/argocd/baobab/fetcher.yaml diff --git a/manifest/argocd/baobab/fetcher.yaml b/manifest/argocd/baobab/fetcher.yaml new file mode 100644 index 00000000..3a9ee8e6 --- /dev/null +++ b/manifest/argocd/baobab/fetcher.yaml @@ -0,0 +1,15 @@ +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: fetcher + namespace: argocd +spec: + destination: + namespace: orakl + server: https://kubernetes.default.svc + project: default + source: + path: fetcher/ + repoURL: https://github.com/Bisonai/orakl-helm-charts.git + targetRevision: gcp-baobab-prod + syncPolicy: {} diff --git a/secret-store/fetcher-secret.yaml b/secret-store/fetcher-secret.yaml index e62e65de..5c197ff5 100644 --- a/secret-store/fetcher-secret.yaml +++ b/secret-store/fetcher-secret.yaml @@ -10,13 +10,13 @@ spec: data: - secretKey: ORAKL_NETWORK_API_URL remoteRef: - key: baobab/prod/fetcher + key: baobab/fetcher property: ORAKL_NETWORK_API_URL - secretKey: REDIS_HOST remoteRef: - key: baobab/prod/fetcher + key: baobab/fetcher property: REDIS_HOST - secretKey: REDIS_PORT remoteRef: - key: baobab/prod/fetcher + key: baobab/fetcher property: REDIS_PORT \ No newline at end of file From 321f15d3d328a6e979017e9e89034c78dde0887f Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Tue, 22 Aug 2023 18:43:42 +0900 Subject: [PATCH 022/190] feat: Deploy redis --- manifest/argocd/baobab/redis.yaml | 66 +++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 manifest/argocd/baobab/redis.yaml diff --git a/manifest/argocd/baobab/redis.yaml b/manifest/argocd/baobab/redis.yaml new file mode 100644 index 00000000..d14b3a4a --- /dev/null +++ b/manifest/argocd/baobab/redis.yaml @@ -0,0 +1,66 @@ +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: redis-vrf + namespace: argocd +spec: + destination: + namespace: redis + server: https://kubernetes.default.svc + project: default + source: + path: redis/ + repoURL: https://github.com/Bisonai/orakl-helm-charts.git + targetRevision: gcp-baobab-prod + syncPolicy: {} + +--- +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: redis-request-response + namespace: argocd +spec: + destination: + namespace: redis + server: https://kubernetes.default.svc + project: default + source: + path: redis/ + repoURL: https://github.com/Bisonai/orakl-helm-charts.git + targetRevision: gcp-baobab-prod + syncPolicy: {} + +--- +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: redis-data-feed + namespace: argocd +spec: + destination: + namespace: redis + server: https://kubernetes.default.svc + project: default + source: + path: redis/ + repoURL: https://github.com/Bisonai/orakl-helm-charts.git + targetRevision: gcp-baobab-prod + syncPolicy: {} + +--- +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: redis-fetcher + namespace: argocd +spec: + destination: + namespace: redis + server: https://kubernetes.default.svc + project: default + source: + path: redis/ + repoURL: https://github.com/Bisonai/orakl-helm-charts.git + targetRevision: gcp-baobab-prod + syncPolicy: {} \ No newline at end of file From 93dda54dbcc4f1b5c8787051cc396c8d745518f8 Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Wed, 23 Aug 2023 11:45:23 +0900 Subject: [PATCH 023/190] feat: Deploy updated fetcher --- fetcher/templates/deployment.yaml | 10 ++++++++++ fetcher/values.yaml | 2 +- secret-store/fetcher-secret.yaml | 4 ++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/fetcher/templates/deployment.yaml b/fetcher/templates/deployment.yaml index e417aed9..b2ab282a 100644 --- a/fetcher/templates/deployment.yaml +++ b/fetcher/templates/deployment.yaml @@ -45,6 +45,11 @@ spec: imagePullPolicy: {{ .Values.global.image.pullPolicy }} {{- if .Values.global.secretManager.enabled }} env: + - name: CHAIN + valueFrom: + secretKeyRef: + name: orakl-fetcher-secrets + key: CHAIN - name: REDIS_HOST valueFrom: secretKeyRef: @@ -67,6 +72,11 @@ spec: key: APP_PORT {{ else }} env: + - name: CHAIN + valueFrom: + secretKeyRef: + name: fetcher-secrets + key: CHAIN - name: ORAKL_NETWORK_API_URL valueFrom: secretKeyRef: diff --git a/fetcher/values.yaml b/fetcher/values.yaml index ad7c5a78..0f139816 100644 --- a/fetcher/values.yaml +++ b/fetcher/values.yaml @@ -5,7 +5,7 @@ global: image: repository: public.ecr.aws/u6t6w0e4/orakl-fetcher #repository url pullPolicy: IfNotPresent - tag: "v0.0.1.20230616.0549.3901f72" + tag: "v0.0.1.20230823.0120.6c98e95" imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: [] diff --git a/secret-store/fetcher-secret.yaml b/secret-store/fetcher-secret.yaml index 5c197ff5..f042f171 100644 --- a/secret-store/fetcher-secret.yaml +++ b/secret-store/fetcher-secret.yaml @@ -8,6 +8,10 @@ spec: name: vault-backend kind: SecretStore data: + - secretKey: CHAIN + remoteRef: + key: baobab/fetcher + property: CHAIN - secretKey: ORAKL_NETWORK_API_URL remoteRef: key: baobab/fetcher From dde0776f1f743f2d63c287c68030bcbe2ca4487c Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Wed, 23 Aug 2023 14:24:22 +0900 Subject: [PATCH 024/190] feat: Deploy monitor --- manifest/argocd/baobab/monitor.yaml | 15 +++++++++ secret-store/monitor-secret.yaml | 52 ++++++++++++++--------------- 2 files changed, 41 insertions(+), 26 deletions(-) create mode 100644 manifest/argocd/baobab/monitor.yaml diff --git a/manifest/argocd/baobab/monitor.yaml b/manifest/argocd/baobab/monitor.yaml new file mode 100644 index 00000000..8ac4792c --- /dev/null +++ b/manifest/argocd/baobab/monitor.yaml @@ -0,0 +1,15 @@ +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: monitor + namespace: argocd +spec: + destination: + namespace: orakl + server: https://kubernetes.default.svc + project: default + source: + path: monitor-api/ + repoURL: https://github.com/Bisonai/orakl-helm-charts.git + targetRevision: gcp-baobab-prod + syncPolicy: {} diff --git a/secret-store/monitor-secret.yaml b/secret-store/monitor-secret.yaml index 51245ac7..f303a024 100644 --- a/secret-store/monitor-secret.yaml +++ b/secret-store/monitor-secret.yaml @@ -10,105 +10,105 @@ spec: data: - secretKey: AGGREGATOR_REDIS_HOST remoteRef: - key: baobab/prod/monitor + key: baobab/monitor property: AGGREGATOR_REDIS_HOST - secretKey: AGGREGATOR_REDIS_PORT remoteRef: - key: baobab/prod/monitor + key: baobab/monitor property: AGGREGATOR_REDIS_PORT - secretKey: GRAPH_NODE_POSTGRES_DATABASE remoteRef: - key: baobab/prod/monitor + key: baobab/monitor property: GRAPH_NODE_POSTGRES_DATABASE - secretKey: GRAPH_NODE_POSTGRES_HOST remoteRef: - key: baobab/prod/monitor + key: baobab/monitor property: GRAPH_NODE_POSTGRES_HOST - secretKey: GRAPH_NODE_POSTGRES_PASSWORD remoteRef: - key: baobab/prod/monitor + key: baobab/monitor property: GRAPH_NODE_POSTGRES_PASSWORD - secretKey: GRAPH_NODE_POSTGRES_PORT remoteRef: - key: baobab/prod/monitor + key: baobab/monitor property: GRAPH_NODE_POSTGRES_PORT - secretKey: GRAPH_NODE_POSTGRES_USER remoteRef: - key: baobab/prod/monitor + key: baobab/monitor property: GRAPH_NODE_POSTGRES_USER - secretKey: JWT_SECRET remoteRef: - key: baobab/prod/monitor + key: baobab/monitor property: JWT_SECRET - secretKey: MONITOR_POSTGRES_DATABASE remoteRef: - key: baobab/prod/monitor + key: baobab/monitor property: MONITOR_POSTGRES_DATABASE - secretKey: MONITOR_POSTGRES_HOST remoteRef: - key: baobab/prod/monitor + key: baobab/monitor property: MONITOR_POSTGRES_HOST - secretKey: MONITOR_POSTGRES_PASSWORD remoteRef: - key: baobab/prod/monitor + key: baobab/monitor property: MONITOR_POSTGRES_PASSWORD - secretKey: MONITOR_POSTGRES_PORT remoteRef: - key: baobab/prod/monitor + key: baobab/monitor property: MONITOR_POSTGRES_PORT - secretKey: MONITOR_POSTGRES_USER remoteRef: - key: baobab/prod/monitor + key: baobab/monitor property: MONITOR_POSTGRES_USER - secretKey: ORAKL_POSTGRES_DATABASE remoteRef: - key: baobab/prod/monitor + key: baobab/monitor property: ORAKL_POSTGRES_DATABASE - secretKey: ORAKL_POSTGRES_HOST remoteRef: - key: baobab/prod/monitor + key: baobab/monitor property: ORAKL_POSTGRES_HOST - secretKey: ORAKL_POSTGRES_PASSWORD remoteRef: - key: baobab/prod/monitor + key: baobab/monitor property: ORAKL_POSTGRES_PASSWORD - secretKey: ORAKL_POSTGRES_PORT remoteRef: - key: baobab/prod/monitor + key: baobab/monitor property: ORAKL_POSTGRES_PORT - secretKey: ORAKL_POSTGRES_USER remoteRef: - key: baobab/prod/monitor + key: baobab/monitor property: ORAKL_POSTGRES_USER - secretKey: PASSWORD remoteRef: - key: baobab/prod/monitor + key: baobab/monitor property: PASSWORD - secretKey: PROVIDER remoteRef: - key: baobab/prod/monitor + key: baobab/monitor property: PROVIDER - secretKey: REQUEST_RESPONSE_REDIS_HOST remoteRef: - key: baobab/prod/monitor + key: baobab/monitor property: REQUEST_RESPONSE_REDIS_HOST - secretKey: REQUEST_RESPONSE_REDIS_PORT remoteRef: - key: baobab/prod/monitor + key: baobab/monitor property: REQUEST_RESPONSE_REDIS_PORT - secretKey: VRF_REDIS_HOST remoteRef: - key: baobab/prod/monitor + key: baobab/monitor property: VRF_REDIS_HOST - secretKey: VRF_REDIS_PORT remoteRef: - key: baobab/prod/monitor + key: baobab/monitor property: VRF_REDIS_PORT - secretKey: NODE_ENV remoteRef: - key: baobab/prod/monitor + key: baobab/monitor property: NODE_ENV - secretKey: DATABASE_URL remoteRef: - key: baobab/prod/monitor + key: baobab/monitor property: DATABASE_URL \ No newline at end of file From 45f1fbd02269995c0b7fa4f3f3536676f6b7c12e Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Wed, 23 Aug 2023 14:27:22 +0900 Subject: [PATCH 025/190] feat: Update admin chart --- admin/templates/deployment.yaml | 3 --- admin/values.yaml | 5 +---- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/admin/templates/deployment.yaml b/admin/templates/deployment.yaml index 17f9a17f..2cf3fe99 100644 --- a/admin/templates/deployment.yaml +++ b/admin/templates/deployment.yaml @@ -16,9 +16,6 @@ spec: - name: orakl-admin image: {{ .Values.image.repository }}:{{ .Values.image.tag }} imagePullPolicy: Always - env: - - name: NEXT_PUBLIC_API_BASE_URL - value: {{ .Values.config.NEXT_PUBLIC_API_BASE_URL }} command: - yarn diff --git a/admin/values.yaml b/admin/values.yaml index e665d37b..60dd6e82 100644 --- a/admin/values.yaml +++ b/admin/values.yaml @@ -1,9 +1,6 @@ image: repository: public.ecr.aws/bisonai/orakl-general - tag: admin.v0.1.0.20230602.0152.74df68c - -config: - NEXT_PUBLIC_API_BASE_URL: "http://orakl-monitor-api.orakl.svc.cluster.local:8888" + tag: admin.v0.1.0.20230802.0109.13ce71f deployment: name: orakl-admin From 1e5153be5a1f37964bb82da21d15df374d96e3ea Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Wed, 23 Aug 2023 14:31:18 +0900 Subject: [PATCH 026/190] feat: Deploy admin --- manifest/argocd/baobab/admin.yaml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 manifest/argocd/baobab/admin.yaml diff --git a/manifest/argocd/baobab/admin.yaml b/manifest/argocd/baobab/admin.yaml new file mode 100644 index 00000000..f3af1eb8 --- /dev/null +++ b/manifest/argocd/baobab/admin.yaml @@ -0,0 +1,15 @@ +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: admin + namespace: argocd +spec: + destination: + namespace: orakl + server: https://kubernetes.default.svc + project: default + source: + path: admin/ + repoURL: https://github.com/Bisonai/orakl-helm-charts.git + targetRevision: gcp-baobab-prod + syncPolicy: {} From 568db5a4ec19aa459fa40957ffb754adbfa54d30 Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Wed, 23 Aug 2023 14:35:06 +0900 Subject: [PATCH 027/190] feat: Deploy LB for Grafana --- grafana/service.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 grafana/service.yaml diff --git a/grafana/service.yaml b/grafana/service.yaml new file mode 100644 index 00000000..311f5003 --- /dev/null +++ b/grafana/service.yaml @@ -0,0 +1,10 @@ +apiVersion: v1 +kind: Service +metadata: + name: grafana +spec: + ports: + - port: 80 + targetPort: 3000 + protocol: TCP + type: LoadBalancer From a1a3c05d5839c4166bef4fd4c85e8420239d5438 Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Sun, 27 Aug 2023 18:00:06 +0900 Subject: [PATCH 028/190] feat: Deploy bisontry-health-check --- bisontry-health-check/Chart.yaml | 5 +++ .../templates/deployment.yaml | 23 +++++++++++++ bisontry-health-check/values.yaml | 8 +++++ .../argocd/baobab/bisontry-health-check.yaml | 15 ++++++++ .../bisontry-health-check-secret.yaml | 34 +++++++++++++++++++ 5 files changed, 85 insertions(+) create mode 100644 bisontry-health-check/Chart.yaml create mode 100644 bisontry-health-check/templates/deployment.yaml create mode 100644 bisontry-health-check/values.yaml create mode 100644 manifest/argocd/baobab/bisontry-health-check.yaml create mode 100644 secret-store/bisontry-health-check-secret.yaml diff --git a/bisontry-health-check/Chart.yaml b/bisontry-health-check/Chart.yaml new file mode 100644 index 00000000..07018972 --- /dev/null +++ b/bisontry-health-check/Chart.yaml @@ -0,0 +1,5 @@ +apiVersion: v2 +name: bisontry-health-check +description: Bisontry Health Check service. +version: 0.1.0 +appVersion: 1.0.0 diff --git a/bisontry-health-check/templates/deployment.yaml b/bisontry-health-check/templates/deployment.yaml new file mode 100644 index 00000000..ad829c68 --- /dev/null +++ b/bisontry-health-check/templates/deployment.yaml @@ -0,0 +1,23 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ .Values.deployment.name }} +spec: + replicas: {{ .Values.deployment.replicas }} + selector: + matchLabels: + app: {{ .Values.deployment.name }} + template: + metadata: + labels: + app: {{ .Values.deployment.name }} + spec: + imagePullSecrets: + - name: bisontry-ecr-secret + containers: + - name: {{ .Values.deployment.name }} + image: {{ .Values.image.repository }}:{{ .Values.image.tag }} + imagePullPolicy: Always + envFrom: + - secretRef: + name: bisontry-health-check-secrets diff --git a/bisontry-health-check/values.yaml b/bisontry-health-check/values.yaml new file mode 100644 index 00000000..4dd96e73 --- /dev/null +++ b/bisontry-health-check/values.yaml @@ -0,0 +1,8 @@ +image: + repository: 831311642255.dkr.ecr.us-east-1.amazonaws.com/bisontry-health-check + tag: v0.1.0.20230822.0128.1bc6ce9 + +deployment: + name: bisontry-health-check + replicas: 1 + resources: diff --git a/manifest/argocd/baobab/bisontry-health-check.yaml b/manifest/argocd/baobab/bisontry-health-check.yaml new file mode 100644 index 00000000..389f0158 --- /dev/null +++ b/manifest/argocd/baobab/bisontry-health-check.yaml @@ -0,0 +1,15 @@ +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: bisontry-health-check + namespace: argocd +spec: + destination: + namespace: orakl + server: https://kubernetes.default.svc + project: default + source: + path: bisontry-health-check/ + repoURL: https://github.com/Bisonai/orakl-helm-charts.git + targetRevision: gcp-baobab-prod + syncPolicy: {} diff --git a/secret-store/bisontry-health-check-secret.yaml b/secret-store/bisontry-health-check-secret.yaml new file mode 100644 index 00000000..197c9f0b --- /dev/null +++ b/secret-store/bisontry-health-check-secret.yaml @@ -0,0 +1,34 @@ +apiVersion: external-secrets.io/v1beta1 +kind: ExternalSecret +metadata: + name: bisontry-health-check-secrets +spec: + refreshInterval: "15s" + secretStoreRef: + name: vault-backend + kind: SecretStore + data: + - secretKey: COMPANY + remoteRef: + key: baobab/bisontry-health-check + property: COMPANY + - secretKey: MESSENGER_ENDPOINT + remoteRef: + key: baobab/bisontry-health-check + property: MESSENGER_ENDPOINT + - secretKey: NETWORK + remoteRef: + key: baobab/bisontry-health-check + property: NETWORK + - secretKey: NODE_ENV + remoteRef: + key: baobab/bisontry-health-check + property: NODE_ENV + - secretKey: OPERATOR + remoteRef: + key: baobab/bisontry-health-check + property: OPERATOR + - secretKey: SYSTEM + remoteRef: + key: baobab/bisontry-health-check + property: SYSTEM From 72296699412091c526af1ede5b85dbc46635c474 Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Thu, 31 Aug 2023 14:53:53 +0900 Subject: [PATCH 029/190] feat: Deploy bisontry-balance-checker --- bisontry-balance-checker/Chart.yaml | 5 ++ .../templates/deployment.yaml | 23 ++++++++ bisontry-balance-checker/values.yaml | 8 +++ .../baobab/bisontry-balance-checker.yaml | 15 +++++ .../bisontry-balance-checker-secret.yaml | 58 +++++++++++++++++++ 5 files changed, 109 insertions(+) create mode 100644 bisontry-balance-checker/Chart.yaml create mode 100644 bisontry-balance-checker/templates/deployment.yaml create mode 100644 bisontry-balance-checker/values.yaml create mode 100644 manifest/argocd/baobab/bisontry-balance-checker.yaml create mode 100644 secret-store/bisontry-balance-checker-secret.yaml diff --git a/bisontry-balance-checker/Chart.yaml b/bisontry-balance-checker/Chart.yaml new file mode 100644 index 00000000..250afaed --- /dev/null +++ b/bisontry-balance-checker/Chart.yaml @@ -0,0 +1,5 @@ +apiVersion: v2 +name: bisontry-balance-checker +description: Bisontry Balance Checker service. +version: 0.1.0 +appVersion: 1.0.0 diff --git a/bisontry-balance-checker/templates/deployment.yaml b/bisontry-balance-checker/templates/deployment.yaml new file mode 100644 index 00000000..7565fa7b --- /dev/null +++ b/bisontry-balance-checker/templates/deployment.yaml @@ -0,0 +1,23 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ .Values.deployment.name }} +spec: + replicas: {{ .Values.deployment.replicas }} + selector: + matchLabels: + app: {{ .Values.deployment.name }} + template: + metadata: + labels: + app: {{ .Values.deployment.name }} + spec: + imagePullSecrets: + - name: bisontry-ecr-secret + containers: + - name: {{ .Values.deployment.name }} + image: {{ .Values.image.repository }}:{{ .Values.image.tag }} + imagePullPolicy: Always + envFrom: + - secretRef: + name: bisontry-balance-checker-secrets diff --git a/bisontry-balance-checker/values.yaml b/bisontry-balance-checker/values.yaml new file mode 100644 index 00000000..2a7079d1 --- /dev/null +++ b/bisontry-balance-checker/values.yaml @@ -0,0 +1,8 @@ +image: + repository: 831311642255.dkr.ecr.ap-southeast-1.amazonaws.com/bisontry-balance-checker + tag: v0.1.0.20230831.0149.4809042 + +deployment: + name: bisontry-balance-checker + replicas: 1 + resources: diff --git a/manifest/argocd/baobab/bisontry-balance-checker.yaml b/manifest/argocd/baobab/bisontry-balance-checker.yaml new file mode 100644 index 00000000..6e008827 --- /dev/null +++ b/manifest/argocd/baobab/bisontry-balance-checker.yaml @@ -0,0 +1,15 @@ +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: bisontry-balance-checker + namespace: argocd +spec: + destination: + namespace: orakl + server: https://kubernetes.default.svc + project: default + source: + path: bisontry-balance-checker/ + repoURL: https://github.com/Bisonai/orakl-helm-charts.git + targetRevision: gcp-baobab-prod + syncPolicy: {} diff --git a/secret-store/bisontry-balance-checker-secret.yaml b/secret-store/bisontry-balance-checker-secret.yaml new file mode 100644 index 00000000..1c3d33d7 --- /dev/null +++ b/secret-store/bisontry-balance-checker-secret.yaml @@ -0,0 +1,58 @@ +apiVersion: external-secrets.io/v1beta1 +kind: ExternalSecret +metadata: + name: bisontry-balance-checker-secrets +spec: + refreshInterval: "15s" + secretStoreRef: + name: vault-backend + kind: SecretStore + data: + - secretKey: COMPANY + remoteRef: + key: baobab/bisontry-balance-checker + property: COMPANY + - secretKey: OPERATOR + remoteRef: + key: baobab/bisontry-balance-checker + property: OPERATOR + - secretKey: SYSTEM + remoteRef: + key: baobab/bisontry-balance-checker + property: SYSTEM + - secretKey: NODE_ENV + remoteRef: + key: baobab/bisontry-balance-checker + property: NODE_ENV + - secretKey: NETWORK + remoteRef: + key: baobab/bisontry-balance-checker + property: NETWORK + - secretKey: MESSENGER_ENDPOINT + remoteRef: + key: baobab/bisontry-balance-checker + property: MESSENGER_ENDPOINT + - secretKey: MONITOR_POSTGRES_USER + remoteRef: + key: baobab/bisontry-balance-checker + property: MONITOR_POSTGRES_USER + - secretKey: MONITOR_POSTGRES_HOST + remoteRef: + key: baobab/bisontry-balance-checker + property: MONITOR_POSTGRES_HOST + - secretKey: MONITOR_POSTGRES_DATABASE + remoteRef: + key: baobab/bisontry-balance-checker + property: MONITOR_POSTGRES_DATABASE + - secretKey: MONITOR_POSTGRES_PASSWORD + remoteRef: + key: baobab/bisontry-balance-checker + property: MONITOR_POSTGRES_PASSWORD + - secretKey: MONITOR_POSTGRES_PORT + remoteRef: + key: baobab/bisontry-balance-checker + property: MONITOR_POSTGRES_PORT + - secretKey: PROVIDER + remoteRef: + key: baobab/bisontry-balance-checker + property: PROVIDER \ No newline at end of file From 18d26c8912d5e759131bdeba1f3fb6b2bdeb765e Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Fri, 1 Sep 2023 11:11:25 +0900 Subject: [PATCH 030/190] feat: Update bisontry helm charts --- .../templates/deployment.yaml | 2 +- bisontry-event-checker/Chart.yaml | 5 ++++ .../templates/deployment.yaml | 23 +++++++++++++++++++ bisontry-event-checker/values.yaml | 8 +++++++ bisontry-health-check/Chart.yaml | 4 ++-- .../templates/deployment.yaml | 2 +- bisontry-health-check/values.yaml | 6 ++--- 7 files changed, 43 insertions(+), 7 deletions(-) create mode 100644 bisontry-event-checker/Chart.yaml create mode 100644 bisontry-event-checker/templates/deployment.yaml create mode 100644 bisontry-event-checker/values.yaml diff --git a/bisontry-balance-checker/templates/deployment.yaml b/bisontry-balance-checker/templates/deployment.yaml index 7565fa7b..b79f049f 100644 --- a/bisontry-balance-checker/templates/deployment.yaml +++ b/bisontry-balance-checker/templates/deployment.yaml @@ -20,4 +20,4 @@ spec: imagePullPolicy: Always envFrom: - secretRef: - name: bisontry-balance-checker-secrets + name: {{ .Values.deployment.name }}-secrets diff --git a/bisontry-event-checker/Chart.yaml b/bisontry-event-checker/Chart.yaml new file mode 100644 index 00000000..ff318be5 --- /dev/null +++ b/bisontry-event-checker/Chart.yaml @@ -0,0 +1,5 @@ +apiVersion: v2 +name: bisontry-event-checker +description: Bisontry Event Checker service. +version: 0.1.0 +appVersion: 1.0.0 diff --git a/bisontry-event-checker/templates/deployment.yaml b/bisontry-event-checker/templates/deployment.yaml new file mode 100644 index 00000000..b79f049f --- /dev/null +++ b/bisontry-event-checker/templates/deployment.yaml @@ -0,0 +1,23 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ .Values.deployment.name }} +spec: + replicas: {{ .Values.deployment.replicas }} + selector: + matchLabels: + app: {{ .Values.deployment.name }} + template: + metadata: + labels: + app: {{ .Values.deployment.name }} + spec: + imagePullSecrets: + - name: bisontry-ecr-secret + containers: + - name: {{ .Values.deployment.name }} + image: {{ .Values.image.repository }}:{{ .Values.image.tag }} + imagePullPolicy: Always + envFrom: + - secretRef: + name: {{ .Values.deployment.name }}-secrets diff --git a/bisontry-event-checker/values.yaml b/bisontry-event-checker/values.yaml new file mode 100644 index 00000000..95c49d3a --- /dev/null +++ b/bisontry-event-checker/values.yaml @@ -0,0 +1,8 @@ +image: + repository: 831311642255.dkr.ecr.ap-southeast-1.amazonaws.com/bisontry-event-checker + tag: v0.0.1.20230831.0828.a7e82bc + +deployment: + name: bisontry-event-checker + replicas: 1 + resources: diff --git a/bisontry-health-check/Chart.yaml b/bisontry-health-check/Chart.yaml index 07018972..2c71e241 100644 --- a/bisontry-health-check/Chart.yaml +++ b/bisontry-health-check/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -name: bisontry-health-check -description: Bisontry Health Check service. +name: bisontry-health-checker +description: Bisontry Health Checker service. version: 0.1.0 appVersion: 1.0.0 diff --git a/bisontry-health-check/templates/deployment.yaml b/bisontry-health-check/templates/deployment.yaml index ad829c68..b79f049f 100644 --- a/bisontry-health-check/templates/deployment.yaml +++ b/bisontry-health-check/templates/deployment.yaml @@ -20,4 +20,4 @@ spec: imagePullPolicy: Always envFrom: - secretRef: - name: bisontry-health-check-secrets + name: {{ .Values.deployment.name }}-secrets diff --git a/bisontry-health-check/values.yaml b/bisontry-health-check/values.yaml index 4dd96e73..2d65e799 100644 --- a/bisontry-health-check/values.yaml +++ b/bisontry-health-check/values.yaml @@ -1,8 +1,8 @@ image: - repository: 831311642255.dkr.ecr.us-east-1.amazonaws.com/bisontry-health-check - tag: v0.1.0.20230822.0128.1bc6ce9 + repository: 831311642255.dkr.ecr.ap-southeast-1.amazonaws.com/bisontry-health-checker + tag: v0.1.0.20230831.0804.f399284 deployment: - name: bisontry-health-check + name: bisontry-health-checker replicas: 1 resources: From 133b5ae8c47eae71a2015c7d1de898ad7a41263c Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Fri, 1 Sep 2023 11:25:17 +0900 Subject: [PATCH 031/190] feat: Deploy event-checker --- .../argocd/baobab/bisontry-event-checker.yaml | 15 ++++++ .../bisontry-event-checker-secret.yaml | 54 +++++++++++++++++++ 2 files changed, 69 insertions(+) create mode 100644 manifest/argocd/baobab/bisontry-event-checker.yaml create mode 100644 secret-store/bisontry-event-checker-secret.yaml diff --git a/manifest/argocd/baobab/bisontry-event-checker.yaml b/manifest/argocd/baobab/bisontry-event-checker.yaml new file mode 100644 index 00000000..c9781e12 --- /dev/null +++ b/manifest/argocd/baobab/bisontry-event-checker.yaml @@ -0,0 +1,15 @@ +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: bisontry-event-checker + namespace: argocd +spec: + destination: + namespace: orakl + server: https://kubernetes.default.svc + project: default + source: + path: bisontry-event-checker/ + repoURL: https://github.com/Bisonai/orakl-helm-charts.git + targetRevision: gcp-baobab-prod + syncPolicy: {} diff --git a/secret-store/bisontry-event-checker-secret.yaml b/secret-store/bisontry-event-checker-secret.yaml new file mode 100644 index 00000000..e5f9777f --- /dev/null +++ b/secret-store/bisontry-event-checker-secret.yaml @@ -0,0 +1,54 @@ +apiVersion: external-secrets.io/v1beta1 +kind: ExternalSecret +metadata: + name: bisontry-event-checker-secrets +spec: + refreshInterval: "15s" + secretStoreRef: + name: vault-backend + kind: SecretStore + data: + - secretKey: COMPANY + remoteRef: + key: baobab/bisontry-event-checker + property: COMPANY + - secretKey: OPERATOR + remoteRef: + key: baobab/bisontry-event-checker + property: OPERATOR + - secretKey: SYSTEM + remoteRef: + key: baobab/bisontry-event-checker + property: SYSTEM + - secretKey: NODE_ENV + remoteRef: + key: baobab/bisontry-event-checker + property: NODE_ENV + - secretKey: NETWORK + remoteRef: + key: baobab/bisontry-event-checker + property: NETWORK + - secretKey: PROVIDER1 + remoteRef: + key: baobab/bisontry-event-checker + property: PROVIDER1 + - secretKey: PROVIDER2 + remoteRef: + key: baobab/bisontry-event-checker + property: PROVIDER2 + - secretKey: PROVIDER3 + remoteRef: + key: baobab/bisontry-event-checker + property: PROVIDER3 + - secretKey: CONFIG_CRON_PERIOD + remoteRef: + key: baobab/bisontry-event-checker + property: CONFIG_CRON_PERIOD + - secretKey: CONFIG_EVENT_PERIOD + remoteRef: + key: baobab/bisontry-event-checker + property: CONFIG_EVENT_PERIOD + - secretKey: MESSENGER_ENDPOINT + remoteRef: + key: baobab/bisontry-event-checker + property: MESSENGER_ENDPOINT \ No newline at end of file From 3b454b3c83cb2dfdfa38217fddc54ae7bed2e3ea Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Fri, 1 Sep 2023 11:28:58 +0900 Subject: [PATCH 032/190] fix: Fix wrong name --- ...isontry-health-check.yaml => bisontry-health-checker.yaml} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename manifest/argocd/baobab/{bisontry-health-check.yaml => bisontry-health-checker.yaml} (82%) diff --git a/manifest/argocd/baobab/bisontry-health-check.yaml b/manifest/argocd/baobab/bisontry-health-checker.yaml similarity index 82% rename from manifest/argocd/baobab/bisontry-health-check.yaml rename to manifest/argocd/baobab/bisontry-health-checker.yaml index 389f0158..c114087d 100644 --- a/manifest/argocd/baobab/bisontry-health-check.yaml +++ b/manifest/argocd/baobab/bisontry-health-checker.yaml @@ -1,7 +1,7 @@ apiVersion: argoproj.io/v1alpha1 kind: Application metadata: - name: bisontry-health-check + name: bisontry-health-checker namespace: argocd spec: destination: @@ -9,7 +9,7 @@ spec: server: https://kubernetes.default.svc project: default source: - path: bisontry-health-check/ + path: bisontry-health-checker/ repoURL: https://github.com/Bisonai/orakl-helm-charts.git targetRevision: gcp-baobab-prod syncPolicy: {} From 981962cc375ce40e6b123fd7dd159a2d8629d540 Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Fri, 1 Sep 2023 11:30:05 +0900 Subject: [PATCH 033/190] fix: Fix wrong directory name --- {bisontry-health-check => bisontry-health-checker}/Chart.yaml | 0 .../templates/deployment.yaml | 0 {bisontry-health-check => bisontry-health-checker}/values.yaml | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename {bisontry-health-check => bisontry-health-checker}/Chart.yaml (100%) rename {bisontry-health-check => bisontry-health-checker}/templates/deployment.yaml (100%) rename {bisontry-health-check => bisontry-health-checker}/values.yaml (100%) diff --git a/bisontry-health-check/Chart.yaml b/bisontry-health-checker/Chart.yaml similarity index 100% rename from bisontry-health-check/Chart.yaml rename to bisontry-health-checker/Chart.yaml diff --git a/bisontry-health-check/templates/deployment.yaml b/bisontry-health-checker/templates/deployment.yaml similarity index 100% rename from bisontry-health-check/templates/deployment.yaml rename to bisontry-health-checker/templates/deployment.yaml diff --git a/bisontry-health-check/values.yaml b/bisontry-health-checker/values.yaml similarity index 100% rename from bisontry-health-check/values.yaml rename to bisontry-health-checker/values.yaml From 652f6c13d657e3ed8f3579322db12a81bc7ba8f6 Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Fri, 1 Sep 2023 11:42:10 +0900 Subject: [PATCH 034/190] fix: Fix wrong secret name --- ...et.yaml => bisontry-health-checker-secret.yaml} | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) rename secret-store/{bisontry-health-check-secret.yaml => bisontry-health-checker-secret.yaml} (66%) diff --git a/secret-store/bisontry-health-check-secret.yaml b/secret-store/bisontry-health-checker-secret.yaml similarity index 66% rename from secret-store/bisontry-health-check-secret.yaml rename to secret-store/bisontry-health-checker-secret.yaml index 197c9f0b..ffae1ca4 100644 --- a/secret-store/bisontry-health-check-secret.yaml +++ b/secret-store/bisontry-health-checker-secret.yaml @@ -1,7 +1,7 @@ apiVersion: external-secrets.io/v1beta1 kind: ExternalSecret metadata: - name: bisontry-health-check-secrets + name: bisontry-health-checker-secrets spec: refreshInterval: "15s" secretStoreRef: @@ -10,25 +10,25 @@ spec: data: - secretKey: COMPANY remoteRef: - key: baobab/bisontry-health-check + key: baobab/bisontry-health-checker property: COMPANY - secretKey: MESSENGER_ENDPOINT remoteRef: - key: baobab/bisontry-health-check + key: baobab/bisontry-health-checker property: MESSENGER_ENDPOINT - secretKey: NETWORK remoteRef: - key: baobab/bisontry-health-check + key: baobab/bisontry-health-checker property: NETWORK - secretKey: NODE_ENV remoteRef: - key: baobab/bisontry-health-check + key: baobab/bisontry-health-checker property: NODE_ENV - secretKey: OPERATOR remoteRef: - key: baobab/bisontry-health-check + key: baobab/bisontry-health-checker property: OPERATOR - secretKey: SYSTEM remoteRef: - key: baobab/bisontry-health-check + key: baobab/bisontry-health-checker property: SYSTEM From 8cf6841cf984bf44e86cde21571ca72589933d00 Mon Sep 17 00:00:00 2001 From: jo Date: Fri, 1 Sep 2023 18:29:05 +0900 Subject: [PATCH 035/190] deploy 20230901 version of core (vrf) --- vrf/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vrf/values.yaml b/vrf/values.yaml index 0e50cdd5..024d5702 100644 --- a/vrf/values.yaml +++ b/vrf/values.yaml @@ -6,7 +6,7 @@ global: image: repository: public.ecr.aws/u6t6w0e4/orakl-core #repository url pullPolicy: IfNotPresent - tag: "v0.3.1.20230822.0106.32f5041" #image tag + tag: "v0.3.1.20230901.0922.9c5dad9" #image tag imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: [] From 69e736777673750dbc787ff441cbcd146f20a68d Mon Sep 17 00:00:00 2001 From: jo Date: Fri, 1 Sep 2023 18:30:12 +0900 Subject: [PATCH 036/190] helm update --- charts/orakl-vrf-0.3.8.tgz | Bin 0 -> 3863 bytes index.yaml | 134 ++++++++++++++++++++----------------- vrf/Chart.yaml | 2 +- 3 files changed, 73 insertions(+), 63 deletions(-) create mode 100644 charts/orakl-vrf-0.3.8.tgz diff --git a/charts/orakl-vrf-0.3.8.tgz b/charts/orakl-vrf-0.3.8.tgz new file mode 100644 index 0000000000000000000000000000000000000000..35c05ad88b0f260db9b22879243663867e5e9093 GIT binary patch literal 3863 zcmV+y59sh8iwG0|00000|0w_~VMtOiV@ORlOnEsqVl!4SWK%V1T2nbTPgYhoO;>Dc zVQyr3R8em|NM&qo0PI~^bK^LYu4n#=TzMyYrglVAm)*^Xeel?tE=PH6hvlt`jfxHj zM5ZLPDS{1va%o+)zkPz>edw?y%T^chU`r&B_yA_&$ovQ~PVSxNjE@daCxlCVPNvSg zEhob;jH7N>{WlDw_}^$9ciy$S-Q#YjecWvu?~GQbWpv+xv27q#$rqCFcgDtb6&trF ziFouAazUAE!mO#tN3B>apYLTG0Hp@!>S$plK*XiB6cd7l)h~uMpi2-1R{rB3PR?+@D-F9vNyGREI z@X;Z2>B3c@32;G$L>D=nGIvDBJ`YXz-~cR+M4}DDIsAhP<`SxDV}}iiV`>oC`DI}M z0H9Mc#^5dhM~?|A8K0Zr`9p_VI$B&O58}{2l1C2)b`Qg%7UKwUI!Mcb&mASo^Bw1! zIna`xad?bkH_oL>z(YQkd)9HbH%jMqc$jcvzzm zb*Y>$EPju36Yi6-U8n4D!h{Tl_)uOjR+vD&X3JCrE^Bwseb4 zJzt_uU5VT!PEfPQ>=V~zQfZYi;qiNL)uA(VQHX2KhFAb4xgXZ)5jip8Fzg(cN=lqF zbjW;w7IST3LfZ)QA*akvuJ%H;pi^YNEL;`7WuXwa6OLlS9NUDJx;`S*@i}I$_X3z4 ziA{Hlv-MP*plMEI!U4b{JdSEQjwB1@Giu?9Wij8CW~$hy%GQCzIe>&&)SNFTn4Q+a zVy@)OagZwk;W&}$5G8R?5R|A=VcF1((WgZ-3KQ0gc3@xecvOI>%8`POrLug?(VQ#H7@f2GlY`-hKW z%>vp3v8qu%NXf_~{g{~cZ)D*sCsTkKV@*QUmfB3|qqhP5< zJWnClwa*yJR{3R6L(mEVL$ru55JWK8rC#f>y(5Z_Er4(g*FWLnPfnqE3qzTO#s~t7}xk19co2BKRV}DS#;O5!xkP8|2D&FC8Vl z8Q)BLG|IB@{yIJGh(ykRD)i=mum4C>j7dL)LiC%klftqw&fLW(g7Y|a

&o5zW7d zMnP6s>G}#*{V}I@ndcc;N#silo~3%Gk%EM|95O^_>2p>2(uZ1XOtzoH&rv)EzNw8B zu@D;n)quubsI7{xM-VU7^w1f8iaCWi{Q36GCJUCZ(9sz&KywN*JpwCul# zMC%!ii5hy6#GZnC#PjsL2QmpCJw8?x`38UZOk$zoWhqnTIklU^c_=8>o_J4I)p7Bj zWsR;YwzF9YBHWNx_f%-~dNq3L3Q1fG^VqYdwfKpv?Pua%Tlx6)IO_}QL8gvn2f{#Uzo zY}EXZoun-Pi+G+moVB!j>e?opB@bVlq9itv#MI(gN+D7k4q0IkK#jNMv8A-A)ZrVr z)V0x-&<#e8U|((K;zz;w5^XjU{fqAgB>>{VFRXe>q&2z7U|EP}$ucxWbrjYS8%9(| zrZ3_O9;looNJCDHo@Y9Ql8Rv?EvBCYLL~cNGIeqQeol*Jri<``lWXQ?4NdBaAHlMQ zDPoFVq^G37O2m~-TA7a?UdD4*Nh|XC)I^pQl8=5>0xC)@N7bq!Co#56Lz|Gyve^xN zQf4WrRlpVn^)m2U?R;G!4+|QZp36PV49V*IcXLrLNyhN4=n=}Try9jNvlOaDVpBR- z9(2Lw6_v@+pY$m74Bx+p!OS?JJIi-y{6sFV&iZ%#%TKwR5ufRwoK4NbjhIRG5$88J zD&H-~mc#s_BBvr%RRW07UEQ2~ytupU-+sQj`FMA7eSY^pHy3HPR|8#%tFi^BA5P9M z-vDBTqY~kV{>jDdhr81c{nL*skp5~Imm`Vs4lYhkKi+-r|Kr2e)yGo5?-K8FBr)EL zt6%Rf`k(r5L2nZ*l}K;;XXk^v4_AZNQ-K8#@(5p5Nf$tf5nkV1eL6qu->8A=)j(!Z zR4e8A;I@C+zj@uhT!iBBF^O-a7k55|?b+nDPt(@RPgo{2el~tK8m~1Zzv037Ef2$Q zd;s3b&}%}YYZy7z4F*IvTGg*enNk*;PKj%q@TD;)+->}pxkva|nD9kN!ljuIcp%c6Oo^L=pX|e~S>(JfZPj9~W@g(IG!?!9btNS2tEh2;#E}zgg4X@A zN&}l;-YM0)sN4$|nO#(-V8uHbahgc!{fe@vH`x~-@}0W4J(Vv=ly{1GycLD=*h?>0 ztdf|^UX)dQCu5bceEy=e^1B?XuLG~*fA>oK&!hHn&Hvm>vQ&U1^c$WTa_aa(B0s;@GJCShy_om> zt(Ph<2_K`}U;`JT;7l@$IVRkmUTfOoU7VL}+Df%27jwd*)lojmy>Uo8`~0iyKj!{q z`5*DM7vO(%yT|Pk|D#j$KX#Hf;D2P^qFsN&&XV(62AK88_kFE!_+cpDKHzo69Ovg{qV%>Em6Ia}urjQOG$pJEvynJRfn*&Z*fsH9Mzf z=Oi5&wBWVbIg3!#?3|Z@`(~!Cnw?X#b2h`azwDfqL$3*qqczz%nJjBlaguZ7UWkg5 zY|JV=xkqIxPDO=JVB+NZ=qa?DiXN=#H*u=zH#PmHrr*3Z`c1|kU(;{)I4zC;y&nIk zV;t4-zg?ul#Ih)$vQ7Ta>Y&Y5!ig0l!J?XL{?7vY-x2?(b5!F0^o-j6cafgK|0&1) z*Wv#xw$xqme~z}o|EZ9&MgGrom_AF$3#*@hmHkIfg{}P*(8~GWXqV4_tY15z=Nl-=_27$794?)Z#Ik~+ttJQ1K! zXvQ~|{@P7>vy^X2oHJd~XMP%IRpBISW}@HsW3H;~U!suV-=@V}7p-6+w83bw(*C=J z`M+&++MU||cabXR|7&Jfm~5l^(75!VVs&s_L2VjOS+pY#BLCND)#rciBt3)wTa5d!!~R`ltGnX<_O`|2QYXABKohelT z<}K^k%K5+3E7*Uh)2jJ@J4pv{O{7Hb3XlxK#}5w^bYbXI$ENNWJYwCGF$!HffZGWb zAbd}mCWr|-4g}kekVQb<@!x@?LnNJ{+An6V6W7)bz{RneU*WGF#}WOCb~sW0$KQ0g za-BIaSCtGP1)Dr@sEfL$pAGH?l5x}yAo>B~Pp1R0DHobPrt(nz4dHA0@c;Os`Ws)E zj1Pl9@mDc(4^u%yV%_^5jHrV`d#{TJPkXNq$-VYom($=g<8-XO|9|ZOJ`qltFW~&F zFErib?02-Jrc)cqVVIq>-!*+EEN0{3KCA>%`@iX*oc*h>PwlPOvC95~&w2ZAcWeG{ Zo$6GlI=yWAcK`qY|NjGtENK9u002tl#XkT5 literal 0 HcmV?d00001 diff --git a/index.yaml b/index.yaml index 698a8f70..1a7c9b2b 100644 --- a/index.yaml +++ b/index.yaml @@ -3,7 +3,7 @@ entries: orakl-admin: - apiVersion: v2 appVersion: 1.0.0 - created: "2023-07-01T12:35:26.897711+09:00" + created: "2023-09-01T18:29:58.764836+09:00" description: orakl network service monitor api digest: 181bf94f82d312d580dd97ea8d0e11db9b90b3435ae39723f21edfb8c00d7deb name: orakl-admin @@ -13,7 +13,7 @@ entries: orakl-aggregator: - apiVersion: v2 appVersion: 0.3.1 - created: "2023-07-01T12:35:26.902277+09:00" + created: "2023-09-01T18:29:58.769449+09:00" description: A Helm chart for Kubernetes digest: a13cce236a8924ea8bcdef8c448bcd6a3ebec296104761a93f221a9b378d0296 name: orakl-aggregator @@ -23,7 +23,7 @@ entries: version: 0.3.13 - apiVersion: v2 appVersion: 0.3.1 - created: "2023-07-01T12:35:26.901793+09:00" + created: "2023-09-01T18:29:58.768735+09:00" description: A Helm chart for Kubernetes digest: c6d33b6e27ae80b243eeb1e214640565d4c9b1aee9883037446c9636f78b8a0e name: orakl-aggregator @@ -33,7 +33,7 @@ entries: version: 0.3.12 - apiVersion: v2 appVersion: 0.3.1 - created: "2023-07-01T12:35:26.901156+09:00" + created: "2023-09-01T18:29:58.768106+09:00" description: A Helm chart for Kubernetes digest: 0ce6d31b6cb5421553a5d779f1f41c9bab43905163b6d50a536f6479d7f7c948 name: orakl-aggregator @@ -43,7 +43,7 @@ entries: version: 0.3.11 - apiVersion: v2 appVersion: 0.3.1 - created: "2023-07-01T12:35:26.900473+09:00" + created: "2023-09-01T18:29:58.767488+09:00" description: A Helm chart for Kubernetes digest: 46b4c948f9e21c821375209cec2b2ae3fc1145d133c766019dbe7199938b4aec name: orakl-aggregator @@ -53,7 +53,7 @@ entries: version: 0.3.10 - apiVersion: v2 appVersion: 0.3.1 - created: "2023-07-01T12:35:26.908491+09:00" + created: "2023-09-01T18:29:58.775651+09:00" description: A Helm chart for Kubernetes digest: 58f2ba854acee878e36762b3c4be878e3993ae1d89b751fcb84695a629094d3d name: orakl-aggregator @@ -63,7 +63,7 @@ entries: version: 0.3.9 - apiVersion: v2 appVersion: 0.3.1 - created: "2023-07-01T12:35:26.907876+09:00" + created: "2023-09-01T18:29:58.775057+09:00" description: A Helm chart for Kubernetes digest: c42f0a2b5bc31dc0632b5fedbda581e652b1f858837a7b2c00a4b402afa45398 name: orakl-aggregator @@ -73,7 +73,7 @@ entries: version: 0.3.8 - apiVersion: v2 appVersion: 0.3.1 - created: "2023-07-01T12:35:26.90723+09:00" + created: "2023-09-01T18:29:58.774428+09:00" description: A Helm chart for Kubernetes digest: 134c3653dbfff137ff0abb4e895fdd8a1c76701417c56f360bc0d0202c8452d1 name: orakl-aggregator @@ -83,7 +83,7 @@ entries: version: 0.3.7 - apiVersion: v2 appVersion: 0.3.1 - created: "2023-07-01T12:35:26.906577+09:00" + created: "2023-09-01T18:29:58.773759+09:00" description: A Helm chart for Kubernetes digest: d92372e561e59a74d190343bfd9ba2f6a237af904b6879dd2bb392ce45020140 name: orakl-aggregator @@ -93,7 +93,7 @@ entries: version: 0.3.6 - apiVersion: v2 appVersion: 0.3.1 - created: "2023-07-01T12:35:26.905917+09:00" + created: "2023-09-01T18:29:58.771849+09:00" description: A Helm chart for Kubernetes digest: 83df54403a7c7b88cfccd8bc90b407cb3b7dce2bfe3036a51d9af2d5d11075b3 name: orakl-aggregator @@ -103,7 +103,7 @@ entries: version: 0.3.5 - apiVersion: v2 appVersion: 0.3.1 - created: "2023-07-01T12:35:26.904359+09:00" + created: "2023-09-01T18:29:58.771275+09:00" description: A Helm chart for Kubernetes digest: 8ed481d2807a3cfc3bf07e85616a91cf8ddc1d73deb0b08e2380a33b532eab0b name: orakl-aggregator @@ -113,7 +113,7 @@ entries: version: 0.3.4 - apiVersion: v2 appVersion: 0.3.1 - created: "2023-07-01T12:35:26.90354+09:00" + created: "2023-09-01T18:29:58.77071+09:00" description: A Helm chart for Kubernetes digest: 591485dddb88e167f80a8558170f5505be083a0cc42d1824ff962ac3291ec9a3 name: orakl-aggregator @@ -123,7 +123,7 @@ entries: version: 0.3.3 - apiVersion: v2 appVersion: 0.3.1 - created: "2023-07-01T12:35:26.902907+09:00" + created: "2023-09-01T18:29:58.7701+09:00" description: A Helm chart for Kubernetes digest: d139d102b0dc38b504fe9b9af17819f58be33162ad1f2af746c7fbb6bc88e96c name: orakl-aggregator @@ -133,7 +133,7 @@ entries: version: 0.3.2 - apiVersion: v2 appVersion: 0.3.1 - created: "2023-07-01T12:35:26.899817+09:00" + created: "2023-09-01T18:29:58.766866+09:00" description: A Helm chart for Kubernetes digest: 20e5e4d38c92e0f620aadbf7d1014d1a0a20668d686442ec4204b6626a228955 name: orakl-aggregator @@ -143,7 +143,7 @@ entries: version: 0.3.1 - apiVersion: v2 appVersion: 0.1.0 - created: "2023-07-01T12:35:26.899064+09:00" + created: "2023-09-01T18:29:58.766275+09:00" description: A Helm chart for Kubernetes digest: 7abe1541de9673be9cd32ecf88d0ef9359d706d1dec9f00a7bf3a5c78977575d name: orakl-aggregator @@ -153,7 +153,7 @@ entries: version: 0.1.3 - apiVersion: v2 appVersion: 0.1.0 - created: "2023-07-01T12:35:26.898351+09:00" + created: "2023-09-01T18:29:58.765418+09:00" description: A Helm chart for Kubernetes digest: 298374e4aab409707fe0656ba204621d02b15e172dcefbe7aed6e7d3eb959296 name: orakl-aggregator @@ -164,7 +164,7 @@ entries: orakl-api: - apiVersion: v1 appVersion: 0.1.0 - created: "2023-07-01T12:35:26.911097+09:00" + created: "2023-09-01T18:29:58.777533+09:00" description: A Helm chart for Kubernetes digest: 1c834e52756f55e6d14b9cef7429f72ccc409854df03f0a5eff2bd90504b0259 name: orakl-api @@ -174,7 +174,7 @@ entries: version: 0.1.4 - apiVersion: v1 appVersion: 0.1.0 - created: "2023-07-01T12:35:26.910553+09:00" + created: "2023-09-01T18:29:58.777169+09:00" description: A Helm chart for Kubernetes digest: 61b7338ce03e214bd0bc40164750c9c2cebde94298c9868f43b89dc1924f1b90 name: orakl-api @@ -184,7 +184,7 @@ entries: version: 0.1.3 - apiVersion: v1 appVersion: 0.1.0 - created: "2023-07-01T12:35:26.910041+09:00" + created: "2023-09-01T18:29:58.77681+09:00" description: A Helm chart for Kubernetes digest: 9d89605aa698fd4d9a47d1ea00dd7847481bb3326f3bf76d82a90ba935106a66 name: orakl-api @@ -194,7 +194,7 @@ entries: version: 0.1.2 - apiVersion: v1 appVersion: 0.1.0 - created: "2023-07-01T12:35:26.90951+09:00" + created: "2023-09-01T18:29:58.776427+09:00" description: A Helm chart for Kubernetes digest: 2399a2a16e0f57cd6acbc7283b23907c128068be10625438e25698387660aa3a name: orakl-api @@ -204,7 +204,7 @@ entries: version: 0.1.1 - apiVersion: v1 appVersion: 0.1.0 - created: "2023-07-01T12:35:26.908983+09:00" + created: "2023-09-01T18:29:58.776053+09:00" description: A Helm chart for Kubernetes digest: 8d25ffe3a48d2bb5b088a562b39f5164d13ee332957eb52c9459e4cdacb17bc9 name: orakl-api @@ -215,7 +215,7 @@ entries: orakl-cli: - apiVersion: v2 appVersion: 0.6.0 - created: "2023-07-01T12:35:26.911966+09:00" + created: "2023-09-01T18:29:58.778215+09:00" description: A Helm chart for Kubernetes digest: e6f70fb56a8fc0c25a0b52a3b104e52a1a76a2b73d999aa6c164b6438f02f9c0 name: orakl-cli @@ -225,7 +225,7 @@ entries: version: 0.1.2 - apiVersion: v2 appVersion: 0.6.0 - created: "2023-07-01T12:35:26.91154+09:00" + created: "2023-09-01T18:29:58.7779+09:00" description: A Helm chart for Kubernetes digest: fd2747612f47891cc45d701718ff614ed87d935249c95a4bbbc0030b67b91c2e name: orakl-cli @@ -236,7 +236,7 @@ entries: orakl-delegator: - apiVersion: v2 appVersion: 0.0.1 - created: "2023-07-01T12:35:26.91483+09:00" + created: "2023-09-01T18:29:58.780305+09:00" description: A Helm chart for Kubernetes digest: 28ee5c585801254fb6cb7544c5edab1d53de7813a6e8f287bcbf3c27f08bc5c9 name: orakl-delegator @@ -246,7 +246,7 @@ entries: version: 0.1.5 - apiVersion: v2 appVersion: 0.0.1 - created: "2023-07-01T12:35:26.914268+09:00" + created: "2023-09-01T18:29:58.779679+09:00" description: A Helm chart for Kubernetes digest: 8e7e33372d7a91e232410b5b9fadf94b35d54518b354522ae3a3f8eb90d46291 name: orakl-delegator @@ -256,7 +256,7 @@ entries: version: 0.1.4 - apiVersion: v2 appVersion: 0.0.1 - created: "2023-07-01T12:35:26.913492+09:00" + created: "2023-09-01T18:29:58.779321+09:00" description: A Helm chart for Kubernetes digest: 9a5541ef46b0e53f7fcc412c87f97c59f3715d0af289cf07a5d54c08895bbd7a name: orakl-delegator @@ -266,7 +266,7 @@ entries: version: 0.1.3 - apiVersion: v2 appVersion: 0.0.1 - created: "2023-07-01T12:35:26.912961+09:00" + created: "2023-09-01T18:29:58.77896+09:00" description: A Helm chart for Kubernetes digest: 3c2438ac722c2c00759011423930b221d48e1478503d819db2c17243485143d2 name: orakl-delegator @@ -276,7 +276,7 @@ entries: version: 0.1.2 - apiVersion: v2 appVersion: 0.0.1 - created: "2023-07-01T12:35:26.912477+09:00" + created: "2023-09-01T18:29:58.778603+09:00" description: A Helm chart for Kubernetes digest: 1751d5a11f55de434310864ec04e067974af368681168de48523be9657c330cf name: orakl-delegator @@ -287,7 +287,7 @@ entries: orakl-fetcher: - apiVersion: v1 appVersion: 0.1.0 - created: "2023-07-01T12:35:26.916753+09:00" + created: "2023-09-01T18:29:58.781786+09:00" description: A Helm chart for Kubernetes digest: 177b380c7ca0025d0829ea1063ec7fc4643e0824281f2fc26b877efc64407584 name: orakl-fetcher @@ -297,7 +297,7 @@ entries: version: 0.1.3 - apiVersion: v1 appVersion: 0.1.0 - created: "2023-07-01T12:35:26.916308+09:00" + created: "2023-09-01T18:29:58.781406+09:00" description: A Helm chart for Kubernetes digest: 21fb94323948b8363dc28647aff35a4477a78fa1726f501392b983981c3c7f79 name: orakl-fetcher @@ -307,7 +307,7 @@ entries: version: 0.1.2 - apiVersion: v1 appVersion: 0.1.0 - created: "2023-07-01T12:35:26.915912+09:00" + created: "2023-09-01T18:29:58.78107+09:00" description: A Helm chart for Kubernetes digest: 30fa77008d7463be38f2a2472129e3a6fd0036d3c33e03d32fbea35bbfea99e1 name: orakl-fetcher @@ -317,7 +317,7 @@ entries: version: 0.1.1 - apiVersion: v1 appVersion: 0.1.0 - created: "2023-07-01T12:35:26.915409+09:00" + created: "2023-09-01T18:29:58.780714+09:00" description: A Helm chart for Kubernetes digest: 64edc1fea835150506731e996faa27694cf69bc8c8e98cbf0788c3064184f317 name: orakl-fetcher @@ -328,7 +328,7 @@ entries: orakl-log-aws-storage: - apiVersion: v1 appVersion: 0.1.0 - created: "2023-07-01T12:35:26.917124+09:00" + created: "2023-09-01T18:29:58.781996+09:00" description: A Helm chart for Kubernetes digest: 4841e8930d55238bfa78f3a98102ff8a06c53f7ee3d5a769a2de17b542e97a27 name: orakl-log-aws-storage @@ -339,7 +339,7 @@ entries: orakl-log-gcp-storage: - apiVersion: v1 appVersion: 0.1.0 - created: "2023-07-01T12:35:26.917476+09:00" + created: "2023-09-01T18:29:58.78221+09:00" description: A Helm chart for Kubernetes digest: 71940f86c320a3f2f50ae9d86a3793aa8ea4730659a14ae7e7a1033d44dfd4b6 name: orakl-log-gcp-storage @@ -350,7 +350,7 @@ entries: orakl-monitor-api: - apiVersion: v2 appVersion: 0.1.0 - created: "2023-07-01T12:35:26.920573+09:00" + created: "2023-09-01T18:29:58.784566+09:00" description: A Helm chart for Kubernetes digest: 785e0c8f569dff996e95b89e0dc0db8a848b7fe396d7246ae4027121d8445f21 name: orakl-monitor-api @@ -360,7 +360,7 @@ entries: version: 0.1.5 - apiVersion: v2 appVersion: 0.1.0 - created: "2023-07-01T12:35:26.920029+09:00" + created: "2023-09-01T18:29:58.784158+09:00" description: A Helm chart for Kubernetes digest: fadf1f9862c52edf74d116e610d77257bf121f051c9d13cf79aba1eb3769641c name: orakl-monitor-api @@ -370,7 +370,7 @@ entries: version: 0.1.4 - apiVersion: v2 appVersion: 0.1.0 - created: "2023-07-01T12:35:26.91952+09:00" + created: "2023-09-01T18:29:58.783784+09:00" description: A Helm chart for Kubernetes digest: 0fa4b2d0969d047a8a824ccafe2b4dc68fd108b7b52a031067bf0d84f8471870 name: orakl-monitor-api @@ -380,7 +380,7 @@ entries: version: 0.1.3 - apiVersion: v2 appVersion: 0.1.0 - created: "2023-07-01T12:35:26.919014+09:00" + created: "2023-09-01T18:29:58.783389+09:00" description: A Helm chart for Kubernetes digest: 5b3342bebdaf5fd980efa8bd88ea688db1f77fa379bae9f84853677476b8d1c4 name: orakl-monitor-api @@ -390,7 +390,7 @@ entries: version: 0.1.2 - apiVersion: v2 appVersion: 0.1.0 - created: "2023-07-01T12:35:26.918503+09:00" + created: "2023-09-01T18:29:58.783019+09:00" description: A Helm chart for Kubernetes digest: cc9c3487ed1703149392595b019596f63f973ffad5ae364690e5d646bf7fcf24 name: orakl-monitor-api @@ -400,7 +400,7 @@ entries: version: 0.1.1 - apiVersion: v2 appVersion: 0.1.0 - created: "2023-07-01T12:35:26.917947+09:00" + created: "2023-09-01T18:29:58.78259+09:00" description: A Helm chart for Kubernetes digest: 305b6ed11bf93a390ac4386ea30d71874ed77e87d9d1ef5f315f15b124d45256 name: orakl-monitor-api @@ -411,7 +411,7 @@ entries: orakl-request-response: - apiVersion: v2 appVersion: 0.3.4 - created: "2023-07-01T12:35:26.923148+09:00" + created: "2023-09-01T18:29:58.786677+09:00" description: A Helm chart for Kubernetes digest: 262b1e98d36e0ff99af2117a23bc2d13e1138d9b52a200c42790f748df0f7257 name: orakl-request-response @@ -421,7 +421,7 @@ entries: version: 0.3.11 - apiVersion: v2 appVersion: 0.3.4 - created: "2023-07-01T12:35:26.922575+09:00" + created: "2023-09-01T18:29:58.786132+09:00" description: A Helm chart for Kubernetes digest: be9f2bbdcee6faae1487d2f07a8b489e5debefcbc0e1f14c3e1b41d635f27213 name: orakl-request-response @@ -431,7 +431,7 @@ entries: version: 0.3.10 - apiVersion: v2 appVersion: 0.3.4 - created: "2023-07-01T12:35:26.92846+09:00" + created: "2023-09-01T18:29:58.79137+09:00" description: A Helm chart for Kubernetes digest: 4640704ef7bd04246737d679c0bc6d6cffd623e1c2ad6fe7aa59bfb6e9ec1ee5 name: orakl-request-response @@ -441,7 +441,7 @@ entries: version: 0.3.9 - apiVersion: v2 appVersion: 0.3.4 - created: "2023-07-01T12:35:26.927855+09:00" + created: "2023-09-01T18:29:58.790846+09:00" description: A Helm chart for Kubernetes digest: 96a4910f2fa4115da1205d57320b44cd2a4f20fd64282ffcf6946696ac2020a3 name: orakl-request-response @@ -451,7 +451,7 @@ entries: version: 0.3.8 - apiVersion: v2 appVersion: 0.3.4 - created: "2023-07-01T12:35:26.927216+09:00" + created: "2023-09-01T18:29:58.790326+09:00" description: A Helm chart for Kubernetes digest: 07eb17c4dffbbd6adb972ef6f79b65f41afa30ee10279314baf2e8240887759b name: orakl-request-response @@ -461,7 +461,7 @@ entries: version: 0.3.7 - apiVersion: v2 appVersion: 0.3.4 - created: "2023-07-01T12:35:26.926583+09:00" + created: "2023-09-01T18:29:58.789766+09:00" description: A Helm chart for Kubernetes digest: 36e58172e9c6c4fe25bd0933edf5d357a84062cefcbe81a6e571aee2a3d798cf name: orakl-request-response @@ -471,7 +471,7 @@ entries: version: 0.3.6 - apiVersion: v2 appVersion: 0.3.4 - created: "2023-07-01T12:35:26.925933+09:00" + created: "2023-09-01T18:29:58.789168+09:00" description: A Helm chart for Kubernetes digest: 53b77c129678dfd014028330476047d9116b7b784b94e6d142b648c8c33076de name: orakl-request-response @@ -481,7 +481,7 @@ entries: version: 0.3.5 - apiVersion: v2 appVersion: 0.3.4 - created: "2023-07-01T12:35:26.925279+09:00" + created: "2023-09-01T18:29:58.788574+09:00" description: A Helm chart for Kubernetes digest: a32b5ed8df82e2d15d5a4d275631c99774770b7130ce0d82bd1148c040aea792 name: orakl-request-response @@ -491,7 +491,7 @@ entries: version: 0.3.4 - apiVersion: v2 appVersion: 0.3.1 - created: "2023-07-01T12:35:26.924632+09:00" + created: "2023-09-01T18:29:58.787785+09:00" description: A Helm chart for Kubernetes digest: 7c76e97daad2c0ae25546665630b3e0340f665fd633a386f1da340bc24cd0666 name: orakl-request-response @@ -501,7 +501,7 @@ entries: version: 0.3.3 - apiVersion: v2 appVersion: 0.3.1 - created: "2023-07-01T12:35:26.923781+09:00" + created: "2023-09-01T18:29:58.787241+09:00" description: A Helm chart for Kubernetes digest: 1a86a4f05b841035b2acc2a4392b08d8af03a561397756df2d121b63c5daafe6 name: orakl-request-response @@ -511,7 +511,7 @@ entries: version: 0.3.2 - apiVersion: v2 appVersion: 0.3.1 - created: "2023-07-01T12:35:26.92192+09:00" + created: "2023-09-01T18:29:58.785619+09:00" description: A Helm chart for Kubernetes digest: 0f25508779a9e53de12b05ebe1c21255bbd2467e51b6399d32c1c3b8b69767d8 name: orakl-request-response @@ -521,7 +521,7 @@ entries: version: 0.3.1 - apiVersion: v2 appVersion: 0.0.1 - created: "2023-07-01T12:35:26.921255+09:00" + created: "2023-09-01T18:29:58.78508+09:00" description: A Helm chart for Kubernetes digest: ebbdd7b164eb0eeec00bdba78f7bbc4f32758aa20f61c147e9ecfc0fa79208eb name: orakl-request-response @@ -532,7 +532,17 @@ entries: orakl-vrf: - apiVersion: v2 appVersion: 0.3.1 - created: "2023-07-01T12:35:26.933773+09:00" + created: "2023-09-01T18:29:58.796272+09:00" + description: A Helm chart for Kubernetes + digest: e1d347c5c4a4c755a61293ba21f6eadf8b0bbbeac160c6f217f69fe25fe33b05 + name: orakl-vrf + type: application + urls: + - charts/orakl-vrf-0.3.8.tgz + version: 0.3.8 + - apiVersion: v2 + appVersion: 0.3.1 + created: "2023-09-01T18:29:58.795643+09:00" description: A Helm chart for Kubernetes digest: 21e1629278c7cea56b216f7621bb4f7507749bb95eee321619fb3ba8289e69a8 name: orakl-vrf @@ -542,7 +552,7 @@ entries: version: 0.3.7 - apiVersion: v2 appVersion: 0.3.1 - created: "2023-07-01T12:35:26.932483+09:00" + created: "2023-09-01T18:29:58.795054+09:00" description: A Helm chart for Kubernetes digest: 7322b98425e4386a1f9052a669572677fb5659e2668ac45a939a64d56c926235 name: orakl-vrf @@ -552,7 +562,7 @@ entries: version: 0.3.6 - apiVersion: v2 appVersion: 0.3.1 - created: "2023-07-01T12:35:26.931959+09:00" + created: "2023-09-01T18:29:58.794456+09:00" description: A Helm chart for Kubernetes digest: a332d387d7cc581223fca0881d3ad8a1e91e9144deda842f54eec0fa7fb65e41 name: orakl-vrf @@ -562,7 +572,7 @@ entries: version: 0.3.5 - apiVersion: v2 appVersion: 0.3.1 - created: "2023-07-01T12:35:26.931342+09:00" + created: "2023-09-01T18:29:58.793947+09:00" description: A Helm chart for Kubernetes digest: c27207538be0b12c5f71228595e7f1e5c56df7fcbc985a09442555defb2b9d97 name: orakl-vrf @@ -572,7 +582,7 @@ entries: version: 0.3.4 - apiVersion: v2 appVersion: 0.3.1 - created: "2023-07-01T12:35:26.930827+09:00" + created: "2023-09-01T18:29:58.79343+09:00" description: A Helm chart for Kubernetes digest: 9232d2a026cc17b4836f4f5da79e7629dd645f89a0665352e14b48a14c2dc615 name: orakl-vrf @@ -582,7 +592,7 @@ entries: version: 0.3.3 - apiVersion: v2 appVersion: 0.3.1 - created: "2023-07-01T12:35:26.930194+09:00" + created: "2023-09-01T18:29:58.792929+09:00" description: A Helm chart for Kubernetes digest: 7eba4169c30d0982d4ef8886a307e6c59efc35d43308e7432161bf4f323f7bcd name: orakl-vrf @@ -592,7 +602,7 @@ entries: version: 0.3.2 - apiVersion: v2 appVersion: 0.3.1 - created: "2023-07-01T12:35:26.929523+09:00" + created: "2023-09-01T18:29:58.792407+09:00" description: A Helm chart for Kubernetes digest: a61a559509bd4f36e1efb8d771d75097879df76c86accfb2b14355f65f36d28e name: orakl-vrf @@ -602,7 +612,7 @@ entries: version: 0.3.1 - apiVersion: v2 appVersion: 0.0.0 - created: "2023-07-01T12:35:26.929+09:00" + created: "2023-09-01T18:29:58.791881+09:00" description: A Helm chart for Kubernetes digest: 073808d0ca0d88a61b4e4383c10024c9a4eec27c95d7a949b32ed56baf75b09c name: orakl-vrf @@ -616,7 +626,7 @@ entries: licenses: Apache-2.0 apiVersion: v2 appVersion: 7.0.8 - created: "2023-07-01T12:35:26.937505+09:00" + created: "2023-09-01T18:29:58.800127+09:00" dependencies: - name: common repository: https://charts.bitnami.com/bitnami @@ -642,4 +652,4 @@ entries: urls: - charts/redis-17.7.0.tgz version: 17.7.0 -generated: "2023-07-01T12:35:26.896626+09:00" +generated: "2023-09-01T18:29:58.764132+09:00" diff --git a/vrf/Chart.yaml b/vrf/Chart.yaml index 4ce51a28..b176d0cb 100644 --- a/vrf/Chart.yaml +++ b/vrf/Chart.yaml @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.3.7 +version: 0.3.8 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to From 2622cd67a1882581dc1f713a187cf1322d6a7d6d Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Fri, 1 Sep 2023 20:39:35 +0900 Subject: [PATCH 037/190] feat: Update prometheus chart --- prometheus/values.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/prometheus/values.yaml b/prometheus/values.yaml index 1909ab89..dd1422cb 100644 --- a/prometheus/values.yaml +++ b/prometheus/values.yaml @@ -12,7 +12,7 @@ imagePullSecrets: serviceAccounts: server: create: true - name: + name: prometheus annotations: {} ## Monitors ConfigMap changes and POSTs to a URL @@ -32,7 +32,7 @@ configmapReload: ## image: repository: jimmidyson/configmap-reload - tag: v0.8.0 + tag: v0.9.0 # When digest is set to a non-empty value, images will be pulled by digest (regardless of tag value). digest: "" pullPolicy: IfNotPresent @@ -1024,7 +1024,6 @@ serverFiles: # adds additional scrape configs to prometheus.yml # must be a string so you have to add a | after extraScrapeConfigs: # example adds prometheus-blackbox-exporter scrape config -extraScrapeConfigs: # - job_name: 'prometheus-blackbox-exporter' # metrics_path: /probe # params: From 85925bb2e5e5ea8badea7c756d9c765ebcb3c085 Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Fri, 1 Sep 2023 20:39:58 +0900 Subject: [PATCH 038/190] fixup! feat: Update prometheus chart --- prometheus/.gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 prometheus/.gitignore diff --git a/prometheus/.gitignore b/prometheus/.gitignore new file mode 100644 index 00000000..fbad6142 --- /dev/null +++ b/prometheus/.gitignore @@ -0,0 +1 @@ +/charts \ No newline at end of file From 7622278e6bf54b322165ca3a6a6014e2c7cc030a Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Tue, 5 Sep 2023 15:17:50 +0900 Subject: [PATCH 039/190] feat: Update monitor chart --- monitor-api/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/monitor-api/values.yaml b/monitor-api/values.yaml index 2d939681..70a973cd 100644 --- a/monitor-api/values.yaml +++ b/monitor-api/values.yaml @@ -4,7 +4,7 @@ global: image: repository: public.ecr.aws/bisonai/orakl-general #repository url pullPolicy: IfNotPresent - tag: "monitor.v.20230725.0237.775b477" + tag: "monitor.v.20230905.0521.48fdf0a" imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: [] From b71e28ce229b2ede332dca1b1e9abd54a0a3312d Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Tue, 5 Sep 2023 15:22:45 +0900 Subject: [PATCH 040/190] feat: Deploy prometheus --- manifest/argocd/baobab/prometheus.yaml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 manifest/argocd/baobab/prometheus.yaml diff --git a/manifest/argocd/baobab/prometheus.yaml b/manifest/argocd/baobab/prometheus.yaml new file mode 100644 index 00000000..440bf12a --- /dev/null +++ b/manifest/argocd/baobab/prometheus.yaml @@ -0,0 +1,15 @@ +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: prometheus + namespace: argocd +spec: + destination: + namespace: orakl + server: https://kubernetes.default.svc + project: default + source: + path: prometheus/ + repoURL: https://github.com/Bisonai/orakl-helm-charts.git + targetRevision: gcp-baobab-prod + syncPolicy: {} From 3ec963c9105c88ac4e84ff8828e11962dd799180 Mon Sep 17 00:00:00 2001 From: jayce Date: Wed, 6 Sep 2023 13:44:09 +0900 Subject: [PATCH 041/190] feat: update vrf chart --- vrf/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vrf/values.yaml b/vrf/values.yaml index 024d5702..ecd14f72 100644 --- a/vrf/values.yaml +++ b/vrf/values.yaml @@ -6,7 +6,7 @@ global: image: repository: public.ecr.aws/u6t6w0e4/orakl-core #repository url pullPolicy: IfNotPresent - tag: "v0.3.1.20230901.0922.9c5dad9" #image tag + tag: "v0.3.1.20230905.0826.2a7b93c" #image tag imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: [] From f5eec0157ece1db29ed613b7c254c3beaf207f64 Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Thu, 7 Sep 2023 14:33:34 +0900 Subject: [PATCH 042/190] feat: Update health-checker tag --- bisontry-health-checker/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bisontry-health-checker/values.yaml b/bisontry-health-checker/values.yaml index 2d65e799..989e637b 100644 --- a/bisontry-health-checker/values.yaml +++ b/bisontry-health-checker/values.yaml @@ -1,6 +1,6 @@ image: repository: 831311642255.dkr.ecr.ap-southeast-1.amazonaws.com/bisontry-health-checker - tag: v0.1.0.20230831.0804.f399284 + tag: v0.1.0.20230907.0530.f399284 deployment: name: bisontry-health-checker From ffa709b3983a0f57a0ea6abe71f680d96bc90769 Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Thu, 7 Sep 2023 14:42:24 +0900 Subject: [PATCH 043/190] feat: Update health-checker image --- bisontry-health-checker/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bisontry-health-checker/values.yaml b/bisontry-health-checker/values.yaml index 989e637b..f36fd963 100644 --- a/bisontry-health-checker/values.yaml +++ b/bisontry-health-checker/values.yaml @@ -1,6 +1,6 @@ image: repository: 831311642255.dkr.ecr.ap-southeast-1.amazonaws.com/bisontry-health-checker - tag: v0.1.0.20230907.0530.f399284 + tag: v0.1.0.20230907.0539.ac90199 deployment: name: bisontry-health-checker From 7d74ebb78b5ad2dfcad4425fb421f3fd4e39fb6e Mon Sep 17 00:00:00 2001 From: jo Date: Wed, 20 Sep 2023 21:44:01 +0900 Subject: [PATCH 044/190] vrf image update --- vrf/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vrf/values.yaml b/vrf/values.yaml index ecd14f72..d2c07551 100644 --- a/vrf/values.yaml +++ b/vrf/values.yaml @@ -6,7 +6,7 @@ global: image: repository: public.ecr.aws/u6t6w0e4/orakl-core #repository url pullPolicy: IfNotPresent - tag: "v0.3.1.20230905.0826.2a7b93c" #image tag + tag: "v0.3.1.20230920.1228.1aa16bc" #image tag imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: [] From 2c0c2ab2223a352869b57d7edab37e6cf62dbb5a Mon Sep 17 00:00:00 2001 From: jo Date: Wed, 20 Sep 2023 21:47:22 +0900 Subject: [PATCH 045/190] remove name --- vrf/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vrf/values.yaml b/vrf/values.yaml index d2c07551..cd5ac329 100644 --- a/vrf/values.yaml +++ b/vrf/values.yaml @@ -6,7 +6,7 @@ global: image: repository: public.ecr.aws/u6t6w0e4/orakl-core #repository url pullPolicy: IfNotPresent - tag: "v0.3.1.20230920.1228.1aa16bc" #image tag + tag: "v0.3.1.20230920.1228.1aa16bc" #image tag imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: [] From d309ce55c44ee758baf0a09a8d3be61d77e5120a Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Thu, 21 Sep 2023 09:36:24 +0900 Subject: [PATCH 046/190] feat: Remove prometheus --- manifest/argocd/baobab/prometheus.yaml | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 manifest/argocd/baobab/prometheus.yaml diff --git a/manifest/argocd/baobab/prometheus.yaml b/manifest/argocd/baobab/prometheus.yaml deleted file mode 100644 index 440bf12a..00000000 --- a/manifest/argocd/baobab/prometheus.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: prometheus - namespace: argocd -spec: - destination: - namespace: orakl - server: https://kubernetes.default.svc - project: default - source: - path: prometheus/ - repoURL: https://github.com/Bisonai/orakl-helm-charts.git - targetRevision: gcp-baobab-prod - syncPolicy: {} From 6acdec63faa95bb00d0c10eb36370fb68bc19f46 Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Mon, 25 Sep 2023 14:29:01 +0900 Subject: [PATCH 047/190] feat: Update tag to deploy new fetcher --- api/values.yaml | 2 +- cli/values.yaml | 2 +- fetcher/values.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/api/values.yaml b/api/values.yaml index cfa7d2dd..fd1afb93 100644 --- a/api/values.yaml +++ b/api/values.yaml @@ -4,7 +4,7 @@ global: image: repository: public.ecr.aws/bisonai/orakl-api pullPolicy: IfNotPresent - tag: "v0.1.0.20230703.0933.ef3b19c" + tag: "v0.1.0.20230920.0750.99c4cdd" imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: [] diff --git a/cli/values.yaml b/cli/values.yaml index 83666d14..15c5dca1 100644 --- a/cli/values.yaml +++ b/cli/values.yaml @@ -5,7 +5,7 @@ global: image: repository: public.ecr.aws/u6t6w0e4/orakl-cli pullPolicy: IfNotPresent - tag: "v0.6.0.20230613.0106.de75a96" + tag: "v0.6.0.20230920.0750.99c4cdd" imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: [] diff --git a/fetcher/values.yaml b/fetcher/values.yaml index 0f139816..94d25bdb 100644 --- a/fetcher/values.yaml +++ b/fetcher/values.yaml @@ -5,7 +5,7 @@ global: image: repository: public.ecr.aws/u6t6w0e4/orakl-fetcher #repository url pullPolicy: IfNotPresent - tag: "v0.0.1.20230823.0120.6c98e95" + tag: "v0.0.1.20230920.0750.99c4cdd" imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: [] From f0ce9c2335e6695fa892a4e37fda4d539b963863 Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Tue, 3 Oct 2023 17:21:19 +0900 Subject: [PATCH 048/190] feat: Update tag for VRF --- vrf/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vrf/values.yaml b/vrf/values.yaml index cd5ac329..22c25724 100644 --- a/vrf/values.yaml +++ b/vrf/values.yaml @@ -6,7 +6,7 @@ global: image: repository: public.ecr.aws/u6t6w0e4/orakl-core #repository url pullPolicy: IfNotPresent - tag: "v0.3.1.20230920.1228.1aa16bc" #image tag + tag: "v0.3.1.20231003.0810.063b2a2" #image tag imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: [] From 8c30d2c1bbbd3a3a9a6b718618a864dd06b14f5f Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Mon, 16 Oct 2023 13:07:20 +0900 Subject: [PATCH 049/190] feat: Deploy new core image --- aggregator/values.yaml | 2 +- request-response/values.yaml | 2 +- vrf/values.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/aggregator/values.yaml b/aggregator/values.yaml index 0b8ae8e3..ec77a272 100644 --- a/aggregator/values.yaml +++ b/aggregator/values.yaml @@ -6,7 +6,7 @@ global: image: repository: public.ecr.aws/u6t6w0e4/orakl-core #repository url pullPolicy: IfNotPresent - tag: "v0.3.1.20230822.0106.32f5041" + tag: "v0.3.1.20231011.1055.60ecfcc" imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: [] diff --git a/request-response/values.yaml b/request-response/values.yaml index ab35b8d5..e2f108aa 100644 --- a/request-response/values.yaml +++ b/request-response/values.yaml @@ -6,7 +6,7 @@ global: image: repository: public.ecr.aws/bisonai/orakl-core #repository url pullPolicy: IfNotPresent - tag: "v0.3.1.20230822.0106.32f5041" #image tag + tag: "v0.3.1.20231011.1055.60ecfcc" imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: [] diff --git a/vrf/values.yaml b/vrf/values.yaml index 22c25724..d52ac7e2 100644 --- a/vrf/values.yaml +++ b/vrf/values.yaml @@ -6,7 +6,7 @@ global: image: repository: public.ecr.aws/u6t6w0e4/orakl-core #repository url pullPolicy: IfNotPresent - tag: "v0.3.1.20231003.0810.063b2a2" #image tag + tag: "v0.3.1.20231011.1055.60ecfcc" imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: [] From 376f7ad5007613ab3387d60fbc1950708f59db29 Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Mon, 16 Oct 2023 21:40:28 +0900 Subject: [PATCH 050/190] feat: Deploy new core tag --- aggregator/values.yaml | 2 +- request-response/values.yaml | 2 +- vrf/values.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/aggregator/values.yaml b/aggregator/values.yaml index ec77a272..535602d0 100644 --- a/aggregator/values.yaml +++ b/aggregator/values.yaml @@ -6,7 +6,7 @@ global: image: repository: public.ecr.aws/u6t6w0e4/orakl-core #repository url pullPolicy: IfNotPresent - tag: "v0.3.1.20231011.1055.60ecfcc" + tag: "v0.3.1.20231016.1000.749dac8" imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: [] diff --git a/request-response/values.yaml b/request-response/values.yaml index e2f108aa..0c3147f8 100644 --- a/request-response/values.yaml +++ b/request-response/values.yaml @@ -6,7 +6,7 @@ global: image: repository: public.ecr.aws/bisonai/orakl-core #repository url pullPolicy: IfNotPresent - tag: "v0.3.1.20231011.1055.60ecfcc" + tag: "v0.3.1.20231016.1000.749dac8" imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: [] diff --git a/vrf/values.yaml b/vrf/values.yaml index d52ac7e2..b3c163a0 100644 --- a/vrf/values.yaml +++ b/vrf/values.yaml @@ -6,7 +6,7 @@ global: image: repository: public.ecr.aws/u6t6w0e4/orakl-core #repository url pullPolicy: IfNotPresent - tag: "v0.3.1.20231011.1055.60ecfcc" + tag: "v0.3.1.20231016.1000.749dac8" imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: [] From b2328549fa6f210e9dddad10922168a13f7e7088 Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Tue, 31 Oct 2023 14:06:47 +0900 Subject: [PATCH 051/190] feat: Update version of RR, VRF --- request-response/values.yaml | 2 +- vrf/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/request-response/values.yaml b/request-response/values.yaml index 0c3147f8..40c38261 100644 --- a/request-response/values.yaml +++ b/request-response/values.yaml @@ -6,7 +6,7 @@ global: image: repository: public.ecr.aws/bisonai/orakl-core #repository url pullPolicy: IfNotPresent - tag: "v0.3.1.20231016.1000.749dac8" + tag: "v0.3.1.20231030.0230.ad46af8" imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: [] diff --git a/vrf/values.yaml b/vrf/values.yaml index b3c163a0..652120ff 100644 --- a/vrf/values.yaml +++ b/vrf/values.yaml @@ -6,7 +6,7 @@ global: image: repository: public.ecr.aws/u6t6w0e4/orakl-core #repository url pullPolicy: IfNotPresent - tag: "v0.3.1.20231016.1000.749dac8" + tag: "v0.3.1.20231030.0230.ad46af8" imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: [] From bd9ab97d43e0a42ff2c5d52d6f651b023a322d8c Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Fri, 3 Nov 2023 16:00:01 +0900 Subject: [PATCH 052/190] feat: Update vrf-worker --- vrf/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vrf/values.yaml b/vrf/values.yaml index 652120ff..3fc69048 100644 --- a/vrf/values.yaml +++ b/vrf/values.yaml @@ -6,7 +6,7 @@ global: image: repository: public.ecr.aws/u6t6w0e4/orakl-core #repository url pullPolicy: IfNotPresent - tag: "v0.3.1.20231030.0230.ad46af8" + tag: "v0.3.1.20231103.0653.19ca105" imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: [] From d7e39e23a6aee1949772f3eb01bd44d41d6de20b Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Tue, 7 Nov 2023 15:13:35 +0900 Subject: [PATCH 053/190] feat: Add default namespace --- secret-store/secret-store.yaml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/secret-store/secret-store.yaml b/secret-store/secret-store.yaml index ec61c891..249b23ca 100644 --- a/secret-store/secret-store.yaml +++ b/secret-store/secret-store.yaml @@ -2,6 +2,7 @@ apiVersion: external-secrets.io/v1beta1 kind: SecretStore metadata: name: vault-backend + namespace: orakl spec: provider: vault: @@ -11,4 +12,13 @@ spec: auth: tokenSecretRef: name: "vault-token" - key: "token" \ No newline at end of file + key: "token" + +--- +apiVersion: v1 +kind: Secret +metadata: + name: vault-token + namespace: orakl +data: + token: # Input encoded vault root token value by base64, and remove it after applied it. \ No newline at end of file From f272517f1b256f2f6adf91d6c85997b844b731e7 Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Tue, 14 Nov 2023 09:32:36 +0900 Subject: [PATCH 054/190] Fix wrong port number (#13) * fix: Make vrf to use fixed port number * fixup! fix: Make vrf to use fixed port number * fix: Make `request-response` to use fixed port number * feat: Add health-check port to aggreagtor service --- aggregator/templates/listener/service.yaml | 7 ++++++- aggregator/templates/reporter/service.yaml | 7 ++++++- aggregator/templates/worker/service.yaml | 7 ++++++- request-response/templates/listener/service.yaml | 5 ++--- request-response/templates/reporter/service.yaml | 5 ++--- request-response/templates/worker/service.yaml | 5 ++--- vrf/templates/listener/service.yaml | 5 ++--- vrf/templates/reporter/service.yaml | 5 ++--- vrf/templates/worker/service.yaml | 5 ++--- 9 files changed, 30 insertions(+), 21 deletions(-) diff --git a/aggregator/templates/listener/service.yaml b/aggregator/templates/listener/service.yaml index 30a71b78..8907cd95 100644 --- a/aggregator/templates/listener/service.yaml +++ b/aggregator/templates/listener/service.yaml @@ -7,8 +7,13 @@ metadata: spec: type: ClusterIP ports: - - port: 4000 + - name: watchman + port: 4000 targetPort: 4000 protocol: TCP + - name: healthcheck + port: 8080 + targetPort: 8080 + protocol: TCP selector: {{- include "orakl-aggregator.selectorLabels.listener" . | nindent 6 }} diff --git a/aggregator/templates/reporter/service.yaml b/aggregator/templates/reporter/service.yaml index eb7b52ba..27c5885a 100644 --- a/aggregator/templates/reporter/service.yaml +++ b/aggregator/templates/reporter/service.yaml @@ -7,8 +7,13 @@ metadata: spec: type: ClusterIP ports: - - port: 6000 + - name: watchman + port: 6000 targetPort: 6000 protocol: TCP + - name: healthcheck + port: 8080 + targetPort: 8080 + protocol: TCP selector: {{- include "orakl-aggregator.selectorLabels.reporter" . | nindent 6 }} diff --git a/aggregator/templates/worker/service.yaml b/aggregator/templates/worker/service.yaml index 6314aa9e..621af5c9 100644 --- a/aggregator/templates/worker/service.yaml +++ b/aggregator/templates/worker/service.yaml @@ -7,8 +7,13 @@ metadata: spec: type: ClusterIP ports: - - port: 5000 + - name: watchman + port: 5000 targetPort: 5000 protocol: TCP + - name: healthcheck + port: 8080 + targetPort: 8080 + protocol: TCP selector: {{- include "orakl-aggregator.selectorLabels.worker" . | nindent 6 }} diff --git a/request-response/templates/listener/service.yaml b/request-response/templates/listener/service.yaml index b3435b1e..60e6d980 100644 --- a/request-response/templates/listener/service.yaml +++ b/request-response/templates/listener/service.yaml @@ -8,10 +8,9 @@ spec: type: ClusterIP ports: - name: watchman - port: {{ .Values.listener.APP_PORT | default 4000 | int }} - targetPort: {{ .Values.listener.APP_PORT | default 4000 | int }} + port: 4000 + targetPort: 4000 protocol: TCP - - name: healthcheck port: 8080 targetPort: 8080 diff --git a/request-response/templates/reporter/service.yaml b/request-response/templates/reporter/service.yaml index e4017da8..69acb31f 100644 --- a/request-response/templates/reporter/service.yaml +++ b/request-response/templates/reporter/service.yaml @@ -8,10 +8,9 @@ spec: type: ClusterIP ports: - name: watchman - port: {{ .Values.listener.APP_PORT | default 6000 | int }} - targetPort: {{ .Values.listener.APP_PORT | default 6000 | int }} + port: 6000 + targetPort: 6000 protocol: TCP - - name: healthcheck port: 8080 targetPort: 8080 diff --git a/request-response/templates/worker/service.yaml b/request-response/templates/worker/service.yaml index a64b9597..ce655b8f 100644 --- a/request-response/templates/worker/service.yaml +++ b/request-response/templates/worker/service.yaml @@ -8,10 +8,9 @@ spec: type: ClusterIP ports: - name: watchman - port: {{ .Values.listener.APP_PORT | default 5000 | int }} - targetPort: {{ .Values.listener.APP_PORT | default 5000 | int }} + port: 5000 + targetPort: 5000 protocol: TCP - - name: healthcheck port: 8080 targetPort: 8080 diff --git a/vrf/templates/listener/service.yaml b/vrf/templates/listener/service.yaml index 0d84887c..bfc1b148 100644 --- a/vrf/templates/listener/service.yaml +++ b/vrf/templates/listener/service.yaml @@ -8,10 +8,9 @@ spec: type: ClusterIP ports: - name: watchman - port: {{ .Values.listener.APP_PORT | default 4000 | int }} - targetPort: {{ .Values.listener.APP_PORT | default 4000 | int }} + port: 4000 + targetPort: 4000 protocol: TCP - - name: healthcheck port: 8080 targetPort: 8080 diff --git a/vrf/templates/reporter/service.yaml b/vrf/templates/reporter/service.yaml index 4b355239..305e79e5 100644 --- a/vrf/templates/reporter/service.yaml +++ b/vrf/templates/reporter/service.yaml @@ -8,10 +8,9 @@ spec: type: ClusterIP ports: - name: watchman - port: {{ .Values.listener.APP_PORT | default 6000 | int }} - targetPort: {{ .Values.listener.APP_PORT | default 6000 | int }} + port: 6000 + targetPort: 6000 protocol: TCP - - name: healthcheck port: 8080 targetPort: 8080 diff --git a/vrf/templates/worker/service.yaml b/vrf/templates/worker/service.yaml index 9c8e2dde..21700e65 100644 --- a/vrf/templates/worker/service.yaml +++ b/vrf/templates/worker/service.yaml @@ -8,10 +8,9 @@ spec: type: ClusterIP ports: - name: watchman - port: {{ .Values.listener.APP_PORT | default 5000 | int }} - targetPort: {{ .Values.listener.APP_PORT | default 5000 | int }} + port: 5000 + targetPort: 5000 protocol: TCP - - name: healthcheck port: 8080 targetPort: 8080 From 2e0fe1608c870c174cbbb3044fa2cd86c691ac43 Mon Sep 17 00:00:00 2001 From: Martin Kersner Date: Tue, 14 Nov 2023 10:26:24 +0900 Subject: [PATCH 055/190] feat: Define `DATA_FEED_REPORTER_CONCURRENCY` env var --- .../reporter/deployment-reporter.yaml | 34 ++++++++++--------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/vrf/templates/reporter/deployment-reporter.yaml b/vrf/templates/reporter/deployment-reporter.yaml index d5ad4f10..e3ea17cf 100644 --- a/vrf/templates/reporter/deployment-reporter.yaml +++ b/vrf/templates/reporter/deployment-reporter.yaml @@ -25,7 +25,7 @@ spec: serviceAccountName: {{ .Values.reporter.serviceAccount.name }} securityContext: {{- toYaml .Values.reporter.podSecurityContext | nindent 8 }} - {{- if .Values.global.affinity.enabled }} + {{- if .Values.global.affinity.enabled }} affinity: nodeAffinity: preferredDuringSchedulingIgnoredDuringExecution: @@ -36,26 +36,26 @@ spec: operator: In values: - {{ .Values.global.affinity.value }} - {{- end }} + {{- end }} containers: - name: {{ .Chart.Name }} securityContext: {{- toYaml .Values.reporter.containerSecurityContext | nindent 12 }} image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.tag | default .Chart.AppVersion }}" imagePullPolicy: {{ .Values.global.image.pullPolicy }} - {{- if .Values.global.secretManager.enabled }} + {{- if .Values.global.secretManager.enabled }} env: - name: NODE_ENV valueFrom: secretKeyRef: name: orakl-vrf-secrets key: NODE_ENV - - name: ORAKL_NETWORK_API_URL + - name: ORAKL_NETWORK_API_URL valueFrom: secretKeyRef: name: orakl-vrf-secrets key: ORAKL_NETWORK_API_URL - - name: CHAIN + - name: CHAIN valueFrom: secretKeyRef: name: orakl-vrf-secrets @@ -70,7 +70,7 @@ spec: secretKeyRef: name: orakl-vrf-secrets key: SLACK_WEBHOOK_URL - - name: LOG_LEVEL + - name: LOG_LEVEL valueFrom: secretKeyRef: name: orakl-vrf-secrets @@ -85,7 +85,7 @@ spec: secretKeyRef: name: orakl-vrf-secrets key: REDIS_PORT - - name: PROVIDER_URL + - name: PROVIDER_URL valueFrom: secretKeyRef: name: orakl-vrf-secrets @@ -102,19 +102,19 @@ spec: secretKeyRef: name: vrf-secrets key: NODE_ENV - - name: ORAKL_NETWORK_API_URL + - name: ORAKL_NETWORK_API_URL valueFrom: secretKeyRef: name: vrf-secrets key: ORAKL_NETWORK_API_URL - - name: CHAIN + - name: CHAIN valueFrom: secretKeyRef: name: vrf-secrets key: CHAIN - name: HEALTH_CHECK_PORT value: "8080" - - name: LOG_LEVEL + - name: LOG_LEVEL valueFrom: secretKeyRef: name: vrf-secrets @@ -129,22 +129,24 @@ spec: secretKeyRef: name: vrf-secrets key: REDIS_PORT - - name: PROVIDER_URL + - name: PROVIDER_URL valueFrom: secretKeyRef: name: vrf-secrets key: PROVIDER_URL - name: REPORTER_PORT value: "6000" - {{ end }} + - name: DATA_FEED_REPORTER_CONCURRENCY + value: 15 + {{ end }} command: ["yarn"] args: [start:reporter:vrf] ports: - name: watchman - containerPort: {{ .Values.reporter.APP_PORT | default 6000 | int }} + containerPort: {{ .Values.reporter.APP_PORT | default 6000 | int }} - name: healthcheck containerPort: 8080 - {{- if .Values.global.livenessProbe.enabled }} + {{- if .Values.global.livenessProbe.enabled }} livenessProbe: httpGet: path: / @@ -164,8 +166,8 @@ spec: periodSeconds: {{ .Values.global.readinessProbe.periodSeconds }} timeoutSeconds: {{ .Values.global.readinessProbe.timeoutSeconds }} successThreshold: {{ .Values.global.readinessProbe.successThreshold }} - failureThreshold: {{ .Values.global.readinessProbe.failureThreshold }} - {{- end }} + failureThreshold: {{ .Values.global.readinessProbe.failureThreshold }} + {{- end }} resources: {{- toYaml .Values.reporter.resources | nindent 12 }} From f7244280eb666e5546a756a028579a95be7d2b7c Mon Sep 17 00:00:00 2001 From: Nick <148735107+nick-bisonai@users.noreply.github.com> Date: Tue, 14 Nov 2023 15:46:59 +0900 Subject: [PATCH 056/190] Deploy fetcher to add reducer (Baobab) (#17) * deploy for new fetcher reducer * fix: update appVersion * fix: update chart version --- fetcher/Chart.yaml | 4 ++-- fetcher/values.yaml | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/fetcher/Chart.yaml b/fetcher/Chart.yaml index 5ea91932..b60970cc 100644 --- a/fetcher/Chart.yaml +++ b/fetcher/Chart.yaml @@ -15,10 +15,10 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.1.3 +version: 0.1.31 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "0.1.0" +appVersion: "0.1.1" diff --git a/fetcher/values.yaml b/fetcher/values.yaml index 94d25bdb..b42df2c0 100644 --- a/fetcher/values.yaml +++ b/fetcher/values.yaml @@ -5,20 +5,20 @@ global: image: repository: public.ecr.aws/u6t6w0e4/orakl-fetcher #repository url pullPolicy: IfNotPresent - tag: "v0.0.1.20230920.0750.99c4cdd" + tag: "v0.0.1.20231114.0601.066c192" imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: [] secretManager: enabled: false - secretId: - versionId: + secretId: + versionId: affinity: enabled: false key: kubernetes.io/hostname - value: + value: externalIp: enabled: false @@ -41,7 +41,7 @@ global: periodSeconds: 5 timeoutSeconds: 1 successThreshold: 1 - failureThreshold: 5 + failureThreshold: 5 fetcher: enabled: true @@ -59,7 +59,7 @@ fetcher: podSecurityContext: {} containerSecurityContext: {} - + resources: limits: cpu: 1000m From c09902dd5e122aa38beb5bf5c8b42c29e2212f17 Mon Sep 17 00:00:00 2001 From: Martin Kersner Date: Wed, 15 Nov 2023 14:22:33 +0900 Subject: [PATCH 057/190] (baobab) Pass data feed reporter concurrency to reporter (#23) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: Rollback DATA_FEED_REPORTER_CONCURRENCY in vrf 🤦 * feat: Set 20 workers in DATA_FEED_REPORTER_CONCURRENCY * chore: Bump up aggregator chart version to 0.3.14 --- aggregator/Chart.yaml | 2 +- .../reporter/deployment-reporter.yaml | 68 ++++++++++--------- .../reporter/deployment-reporter.yaml | 2 - 3 files changed, 37 insertions(+), 35 deletions(-) diff --git a/aggregator/Chart.yaml b/aggregator/Chart.yaml index 47ebf80b..eef6f05a 100644 --- a/aggregator/Chart.yaml +++ b/aggregator/Chart.yaml @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.3.13 +version: 0.3.14 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/aggregator/templates/reporter/deployment-reporter.yaml b/aggregator/templates/reporter/deployment-reporter.yaml index 4828be12..9d3e53c5 100644 --- a/aggregator/templates/reporter/deployment-reporter.yaml +++ b/aggregator/templates/reporter/deployment-reporter.yaml @@ -25,7 +25,7 @@ spec: serviceAccountName: {{ .Values.reporter.serviceAccount.name }} securityContext: {{- toYaml .Values.reporter.podSecurityContext | nindent 8 }} - {{- if .Values.global.affinity.enabled }} + {{- if .Values.global.affinity.enabled }} affinity: nodeAffinity: preferredDuringSchedulingIgnoredDuringExecution: @@ -36,114 +36,118 @@ spec: operator: In values: - {{ .Values.global.affinity.value }} - {{- end }} + {{- end }} containers: - name: {{ .Chart.Name }} securityContext: {{- toYaml .Values.reporter.containerSecurityContext | nindent 12 }} image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.tag | default .Chart.AppVersion }}" imagePullPolicy: {{ .Values.global.image.pullPolicy }} - {{- if .Values.global.secretManager.enabled }} + {{- if .Values.global.secretManager.enabled }} env: - - name: NODE_ENV + - name: NODE_ENV valueFrom: secretKeyRef: name: orakl-aggregator-secrets key: NODE_ENV - - name: ORAKL_NETWORK_API_URL + - name: ORAKL_NETWORK_API_URL valueFrom: secretKeyRef: name: orakl-aggregator-secrets key: ORAKL_NETWORK_API_URL - - name: ORAKL_NETWORK_DELEGATOR_URL + - name: ORAKL_NETWORK_DELEGATOR_URL valueFrom: secretKeyRef: name: orakl-aggregator-secrets - key: ORAKL_NETWORK_DELEGATOR_URL - - name: CHAIN + key: ORAKL_NETWORK_DELEGATOR_URL + - name: CHAIN valueFrom: secretKeyRef: name: orakl-aggregator-secrets key: CHAIN - - name: HEALTH_CHECK_PORT + - name: HEALTH_CHECK_PORT valueFrom: secretKeyRef: name: orakl-aggregator-secrets key: HEALTH_CHECK_PORT - - name: SLACK_WEBHOOK_URL + - name: SLACK_WEBHOOK_URL valueFrom: secretKeyRef: name: orakl-aggregator-secrets key: SLACK_WEBHOOK_URL - - name: LOG_LEVEL + - name: LOG_LEVEL valueFrom: secretKeyRef: name: orakl-aggregator-secrets key: LOG_LEVEL - - name: REDIS_HOST + - name: REDIS_HOST valueFrom: secretKeyRef: name: orakl-aggregator-secrets key: REDIS_HOST - - name: REDIS_PORT + - name: REDIS_PORT valueFrom: secretKeyRef: name: orakl-aggregator-secrets key: REDIS_PORT - - name: PROVIDER_URL + - name: PROVIDER_URL valueFrom: secretKeyRef: name: orakl-aggregator-secrets key: PROVIDER_URL - - name: REPORTER_PORT - value: {{ .Values.reporter.APP_PORT | default 6000 | int }} + - name: REPORTER_PORT + value: {{ .Values.reporter.APP_PORT | default 6000 | int }} + - name: DATA_FEED_REPORTER_CONCURRENCY + value: 20 {{ else }} - env: - - name: NODE_ENV + env: + - name: NODE_ENV valueFrom: secretKeyRef: name: aggregator-secrets key: NODE_ENV - - name: ORAKL_NETWORK_API_URL + - name: ORAKL_NETWORK_API_URL valueFrom: secretKeyRef: name: aggregator-secrets key: ORAKL_NETWORK_API_URL - - name: ORAKL_NETWORK_DELEGATOR_URL + - name: ORAKL_NETWORK_DELEGATOR_URL valueFrom: secretKeyRef: name: aggregator-secrets - key: ORAKL_NETWORK_DELEGATOR_URL - - name: CHAIN + key: ORAKL_NETWORK_DELEGATOR_URL + - name: CHAIN valueFrom: secretKeyRef: name: aggregator-secrets key: CHAIN - - name: LOG_LEVEL + - name: LOG_LEVEL valueFrom: secretKeyRef: name: aggregator-secrets key: LOG_LEVEL - - name: REDIS_HOST + - name: REDIS_HOST valueFrom: secretKeyRef: name: aggregator-secrets key: REDIS_HOST - - name: REDIS_PORT + - name: REDIS_PORT valueFrom: secretKeyRef: name: aggregator-secrets key: REDIS_PORT - - name: PROVIDER_URL + - name: PROVIDER_URL valueFrom: secretKeyRef: name: aggregator-secrets key: PROVIDER_URL - - name: REPORTER_PORT + - name: REPORTER_PORT value: "6000" - - name: HEALTH_CHECK_PORT - value: "8080" - {{ end }} + - name: HEALTH_CHECK_PORT + value: "8080" + - name: DATA_FEED_REPORTER_CONCURRENCY + value: 20 + {{ end }} command: ["yarn"] args: [start:reporter:data_feed] ports: @@ -171,8 +175,8 @@ spec: periodSeconds: {{ .Values.global.readinessProbe.periodSeconds }} timeoutSeconds: {{ .Values.global.readinessProbe.timeoutSeconds }} successThreshold: {{ .Values.global.readinessProbe.successThreshold }} - failureThreshold: {{ .Values.global.readinessProbe.failureThreshold }} - {{- end }} + failureThreshold: {{ .Values.global.readinessProbe.failureThreshold }} + {{- end }} resources: {{- toYaml .Values.reporter.resources | nindent 12 }} diff --git a/vrf/templates/reporter/deployment-reporter.yaml b/vrf/templates/reporter/deployment-reporter.yaml index e3ea17cf..90c2ccac 100644 --- a/vrf/templates/reporter/deployment-reporter.yaml +++ b/vrf/templates/reporter/deployment-reporter.yaml @@ -136,8 +136,6 @@ spec: key: PROVIDER_URL - name: REPORTER_PORT value: "6000" - - name: DATA_FEED_REPORTER_CONCURRENCY - value: 15 {{ end }} command: ["yarn"] args: [start:reporter:vrf] From 02d9b910483a068fe21ae941da51478c97581075 Mon Sep 17 00:00:00 2001 From: Martin Kersner Date: Wed, 15 Nov 2023 14:49:05 +0900 Subject: [PATCH 058/190] Update tag for DATA_FEED_REPORTER_CONCURRENCY (#24) --- aggregator/Chart.yaml | 2 +- aggregator/values.yaml | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/aggregator/Chart.yaml b/aggregator/Chart.yaml index eef6f05a..82704635 100644 --- a/aggregator/Chart.yaml +++ b/aggregator/Chart.yaml @@ -21,4 +21,4 @@ version: 0.3.14 # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "0.3.1" +appVersion: "v0.4.0.20231114.0559.38c3f23" diff --git a/aggregator/values.yaml b/aggregator/values.yaml index 535602d0..6f3a85dd 100644 --- a/aggregator/values.yaml +++ b/aggregator/values.yaml @@ -6,20 +6,20 @@ global: image: repository: public.ecr.aws/u6t6w0e4/orakl-core #repository url pullPolicy: IfNotPresent - tag: "v0.3.1.20231016.1000.749dac8" + tag: "v0.4.0.20231114.0559.38c3f23" imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: [] secretManager: enabled: false - secretId: - versionId: + secretId: + versionId: affinity: enabled: false key: kubernetes.io/hostname - value: + value: podAnnotations: {} @@ -39,7 +39,7 @@ global: periodSeconds: 5 timeoutSeconds: 1 successThreshold: 1 - failureThreshold: 5 + failureThreshold: 5 listener: enabled: true @@ -59,7 +59,7 @@ listener: podSecurityContext: {} containerSecurityContext: {} - + resources: limits: cpu: 1000m @@ -86,7 +86,7 @@ worker: podSecurityContext: {} containerSecurityContext: {} - + resources: limits: cpu: 1000m @@ -113,7 +113,7 @@ reporter: podSecurityContext: {} containerSecurityContext: {} - + resources: limits: cpu: 1000m From 3c1329fab9fd738cfdbbd6918d3de072b853fa9e Mon Sep 17 00:00:00 2001 From: Martin Kersner Date: Wed, 15 Nov 2023 15:18:41 +0900 Subject: [PATCH 059/190] Env vars must be strings! (#25) --- aggregator/templates/reporter/deployment-reporter.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/aggregator/templates/reporter/deployment-reporter.yaml b/aggregator/templates/reporter/deployment-reporter.yaml index 9d3e53c5..325292a0 100644 --- a/aggregator/templates/reporter/deployment-reporter.yaml +++ b/aggregator/templates/reporter/deployment-reporter.yaml @@ -98,7 +98,7 @@ spec: - name: REPORTER_PORT value: {{ .Values.reporter.APP_PORT | default 6000 | int }} - name: DATA_FEED_REPORTER_CONCURRENCY - value: 20 + value: "20" {{ else }} env: - name: NODE_ENV @@ -146,7 +146,7 @@ spec: - name: HEALTH_CHECK_PORT value: "8080" - name: DATA_FEED_REPORTER_CONCURRENCY - value: 20 + value: "20" {{ end }} command: ["yarn"] args: [start:reporter:data_feed] From 2c6d437cf0f97c4167514728a51543915a29a400 Mon Sep 17 00:00:00 2001 From: Martin Kersner Date: Wed, 15 Nov 2023 16:12:16 +0900 Subject: [PATCH 060/190] Pass `CONCURRENCY` env var to Fetcher (#26) --- fetcher/Chart.yaml | 2 +- fetcher/templates/deployment.yaml | 22 +++++++++++++--------- fetcher/values.yaml | 2 +- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/fetcher/Chart.yaml b/fetcher/Chart.yaml index b60970cc..b56d5c12 100644 --- a/fetcher/Chart.yaml +++ b/fetcher/Chart.yaml @@ -21,4 +21,4 @@ version: 0.1.31 # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "0.1.1" +appVersion: "v0.0.1.20231115.0708.e386ea1" diff --git a/fetcher/templates/deployment.yaml b/fetcher/templates/deployment.yaml index b2ab282a..ba30a965 100644 --- a/fetcher/templates/deployment.yaml +++ b/fetcher/templates/deployment.yaml @@ -25,7 +25,7 @@ spec: serviceAccountName: {{ .Values.fetcher.serviceAccount.name }} securityContext: {{- toYaml .Values.fetcher.podSecurityContext | nindent 8 }} - {{- if .Values.global.affinity.enabled }} + {{- if .Values.global.affinity.enabled }} affinity: nodeAffinity: preferredDuringSchedulingIgnoredDuringExecution: @@ -36,7 +36,7 @@ spec: operator: In values: - {{ .Values.global.affinity.value }} - {{- end }} + {{- end }} containers: - name: {{ .Chart.Name }} securityContext: @@ -50,17 +50,17 @@ spec: secretKeyRef: name: orakl-fetcher-secrets key: CHAIN - - name: REDIS_HOST + - name: REDIS_HOST valueFrom: secretKeyRef: name: orakl-fetcher-secrets key: REDIS_HOST - - name: REDIS_PORT + - name: REDIS_PORT valueFrom: secretKeyRef: name: orakl-fetcher-secrets key: REDIS_PORT - - name: ORAKL_NETWORK_API_URL + - name: ORAKL_NETWORK_API_URL valueFrom: secretKeyRef: name: orakl-fetcher-secrets @@ -70,6 +70,8 @@ spec: secretKeyRef: name: orakl-fetcher-secrets key: APP_PORT + - name: CONCURRENCY + value: "20" {{ else }} env: - name: CHAIN @@ -77,7 +79,7 @@ spec: secretKeyRef: name: fetcher-secrets key: CHAIN - - name: ORAKL_NETWORK_API_URL + - name: ORAKL_NETWORK_API_URL valueFrom: secretKeyRef: name: fetcher-secrets @@ -91,9 +93,11 @@ spec: valueFrom: secretKeyRef: name: fetcher-secrets - key: REDIS_PORT + key: REDIS_PORT - name: APP_PORT value: "4040" + - name: CONCURRENCY + value: "20" {{ end }} command: ["yarn"] @@ -121,8 +125,8 @@ spec: periodSeconds: {{ .Values.global.readinessProbe.periodSeconds }} timeoutSeconds: {{ .Values.global.readinessProbe.timeoutSeconds }} successThreshold: {{ .Values.global.readinessProbe.successThreshold }} - failureThreshold: {{ .Values.global.readinessProbe.failureThreshold }} - {{- end }} + failureThreshold: {{ .Values.global.readinessProbe.failureThreshold }} + {{- end }} resources: {{- toYaml .Values.fetcher.resources | nindent 12 }} diff --git a/fetcher/values.yaml b/fetcher/values.yaml index b42df2c0..4894ba49 100644 --- a/fetcher/values.yaml +++ b/fetcher/values.yaml @@ -5,7 +5,7 @@ global: image: repository: public.ecr.aws/u6t6w0e4/orakl-fetcher #repository url pullPolicy: IfNotPresent - tag: "v0.0.1.20231114.0601.066c192" + tag: "v0.0.1.20231115.0708.e386ea1" imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: [] From ce49a4960aa687bad821762fd9b253228b5599e3 Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Wed, 15 Nov 2023 19:13:20 +0900 Subject: [PATCH 061/190] feat: Create cronjob for execute PoR every minute (#29) --- scripts/cronjob-por.yml | 71 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 scripts/cronjob-por.yml diff --git a/scripts/cronjob-por.yml b/scripts/cronjob-por.yml new file mode 100644 index 00000000..2a3ec751 --- /dev/null +++ b/scripts/cronjob-por.yml @@ -0,0 +1,71 @@ +kind: ServiceAccount +apiVersion: v1 +metadata: + name: orakl-por + namespace: orakl + +--- +kind: CronJob +apiVersion: batch/v1 +metadata: + name: proof-of-reserve + namespace: orakl +spec: + schedule: "* * * * *" + jobTemplate: + spec: + backoffLimit: 0 + ttlSecondsAfterFinished: 30 + template: + spec: + serviceAccountName: orakl-por + restartPolicy: Never + containers: + - name: proof-of-reserve + image: public.ecr.aws/u6t6w0e4/orakl-core:v0.5.0.20231115.0418.edbde75 + imagePullPolicy: IfNotPresent + command: ["yarn"] + args: [start:por] + env: + - name: NODE_ENV + valueFrom: + secretKeyRef: + name: aggregator-secrets + key: NODE_ENV + - name: ORAKL_NETWORK_API_URL + valueFrom: + secretKeyRef: + name: aggregator-secrets + key: ORAKL_NETWORK_API_URL + - name: ORAKL_NETWORK_DELEGATOR_URL + valueFrom: + secretKeyRef: + name: aggregator-secrets + key: ORAKL_NETWORK_DELEGATOR_URL + - name: CHAIN + valueFrom: + secretKeyRef: + name: aggregator-secrets + key: CHAIN + - name: LOG_LEVEL + valueFrom: + secretKeyRef: + name: aggregator-secrets + key: LOG_LEVEL + - name: REDIS_HOST + valueFrom: + secretKeyRef: + name: aggregator-secrets + key: REDIS_HOST + - name: REDIS_PORT + valueFrom: + secretKeyRef: + name: aggregator-secrets + key: REDIS_PORT + - name: PROVIDER_URL + valueFrom: + secretKeyRef: + name: aggregator-secrets + key: PROVIDER_URL + - name: POR_AGGREGATOR_HASH + value: "0xdfc65be0daca54cfd5c081bb325d855e71b1a9cd6d2c5e44fcc1d7d0756f7811" From 52679aac79bdaac6df4e23c8ca3d24f18fbd21d2 Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Wed, 15 Nov 2023 19:29:25 +0900 Subject: [PATCH 062/190] fix: Change `POR_AGGREGATOR_HASH` to use updated address (#30) --- scripts/cronjob-por.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/cronjob-por.yml b/scripts/cronjob-por.yml index 2a3ec751..41be3694 100644 --- a/scripts/cronjob-por.yml +++ b/scripts/cronjob-por.yml @@ -68,4 +68,4 @@ spec: name: aggregator-secrets key: PROVIDER_URL - name: POR_AGGREGATOR_HASH - value: "0xdfc65be0daca54cfd5c081bb325d855e71b1a9cd6d2c5e44fcc1d7d0756f7811" + value: "0x952f883b8d2fd47a790307cb569118a215ea45eb861cefd4ed3b83ae7550f8e8" From d6c003c12d1448afc0bc1279d9edd0a6e3e414fd Mon Sep 17 00:00:00 2001 From: Martin Kersner Date: Wed, 15 Nov 2023 20:03:57 +0900 Subject: [PATCH 063/190] Increase fetcher concurrency from 20 to 30 (#28) --- fetcher/templates/deployment.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fetcher/templates/deployment.yaml b/fetcher/templates/deployment.yaml index ba30a965..18f2c681 100644 --- a/fetcher/templates/deployment.yaml +++ b/fetcher/templates/deployment.yaml @@ -71,7 +71,7 @@ spec: name: orakl-fetcher-secrets key: APP_PORT - name: CONCURRENCY - value: "20" + value: "30" {{ else }} env: - name: CHAIN @@ -97,7 +97,7 @@ spec: - name: APP_PORT value: "4040" - name: CONCURRENCY - value: "20" + value: "30" {{ end }} command: ["yarn"] From 20e6a2d713d65dce1505d11a94003eae60383477 Mon Sep 17 00:00:00 2001 From: Martin Kersner Date: Wed, 15 Nov 2023 20:38:59 +0900 Subject: [PATCH 064/190] Decrease fetcher concurrency from 30 to 20 (#32) --- fetcher/templates/deployment.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fetcher/templates/deployment.yaml b/fetcher/templates/deployment.yaml index 18f2c681..ba30a965 100644 --- a/fetcher/templates/deployment.yaml +++ b/fetcher/templates/deployment.yaml @@ -71,7 +71,7 @@ spec: name: orakl-fetcher-secrets key: APP_PORT - name: CONCURRENCY - value: "30" + value: "20" {{ else }} env: - name: CHAIN @@ -97,7 +97,7 @@ spec: - name: APP_PORT value: "4040" - name: CONCURRENCY - value: "30" + value: "20" {{ end }} command: ["yarn"] From 18fc9734ba7d84caf9c4c4e05c2918366c973fdf Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Thu, 16 Nov 2023 14:08:54 +0900 Subject: [PATCH 065/190] Split deployment (#33) * fix: Remove conflicts * feat: Split tags for aggregator * feat: Update tag for `request-response` * feat: Split tags for vrf * fix: Modify tag value to use changed it * fix: Revert wrong merged file * fix: Correcting wrong service name --- .../listener/deployment-listener.yaml | 58 ++++++++-------- .../reporter/deployment-reporter.yaml | 2 +- .../templates/worker/deployment-worker.yaml | 68 +++++++++---------- aggregator/values.yaml | 4 +- .../listener/deployment-listener.yaml | 34 +++++----- .../reporter/deployment-reporter.yaml | 40 +++++------ .../templates/worker/deployment-worker.yaml | 40 +++++------ request-response/values.yaml | 4 +- .../listener/deployment-listener.yaml | 30 ++++---- .../reporter/deployment-reporter.yaml | 2 +- vrf/templates/worker/deployment-worker.yaml | 40 +++++------ vrf/values.yaml | 18 ++--- 12 files changed, 173 insertions(+), 167 deletions(-) diff --git a/aggregator/templates/listener/deployment-listener.yaml b/aggregator/templates/listener/deployment-listener.yaml index 2c06beff..997a1633 100644 --- a/aggregator/templates/listener/deployment-listener.yaml +++ b/aggregator/templates/listener/deployment-listener.yaml @@ -29,108 +29,108 @@ spec: - name: {{ .Chart.Name }} securityContext: {{- toYaml .Values.listener.containerSecurityContext | nindent 12 }} - image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.tag | default .Chart.AppVersion }}" + image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.listener-tag | default .Chart.AppVersion }}" imagePullPolicy: {{ .Values.global.image.pullPolicy }} - {{- if .Values.global.secretManager.enabled }} + {{- if .Values.global.secretManager.enabled }} env: - - name: NODE_ENV + - name: NODE_ENV valueFrom: secretKeyRef: name: orakl-aggregator-secrets key: NODE_ENV - - name: ORAKL_NETWORK_API_URL + - name: ORAKL_NETWORK_API_URL valueFrom: secretKeyRef: name: orakl-aggregator-secrets key: ORAKL_NETWORK_API_URL - - name: ORAKL_NETWORK_DELEGATOR_URL + - name: ORAKL_NETWORK_DELEGATOR_URL valueFrom: secretKeyRef: name: orakl-aggregator-secrets - key: ORAKL_NETWORK_DELEGATOR_URL - - name: CHAIN + key: ORAKL_NETWORK_DELEGATOR_URL + - name: CHAIN valueFrom: secretKeyRef: name: orakl-aggregator-secrets key: CHAIN - - name: HEALTH_CHECK_PORT + - name: HEALTH_CHECK_PORT valueFrom: secretKeyRef: name: orakl-aggregator-secrets key: HEALTH_CHECK_PORT - - name: SLACK_WEBHOOK_URL + - name: SLACK_WEBHOOK_URL valueFrom: secretKeyRef: name: orakl-aggregator-secrets key: SLACK_WEBHOOK_URL - - name: LOG_LEVEL + - name: LOG_LEVEL valueFrom: secretKeyRef: name: orakl-aggregator-secrets key: LOG_LEVEL - - name: REDIS_HOST + - name: REDIS_HOST valueFrom: secretKeyRef: name: orakl-aggregator-secrets key: REDIS_HOST - - name: REDIS_PORT + - name: REDIS_PORT valueFrom: secretKeyRef: name: orakl-aggregator-secrets key: REDIS_PORT - - name: PROVIDER_URL + - name: PROVIDER_URL valueFrom: secretKeyRef: name: orakl-aggregator-secrets key: PROVIDER_URL - - name: LISTENER_PORT - value: {{ .Values.listener.APP_PORT | default 4000 | int }} + - name: LISTENER_PORT + value: {{ .Values.listener.APP_PORT | default 4000 | int }} {{ else }} env: - - name: NODE_ENV + - name: NODE_ENV valueFrom: secretKeyRef: name: aggregator-secrets key: NODE_ENV - - name: ORAKL_NETWORK_API_URL + - name: ORAKL_NETWORK_API_URL valueFrom: secretKeyRef: name: aggregator-secrets key: ORAKL_NETWORK_API_URL - - name: ORAKL_NETWORK_DELEGATOR_URL + - name: ORAKL_NETWORK_DELEGATOR_URL valueFrom: secretKeyRef: name: aggregator-secrets - key: ORAKL_NETWORK_DELEGATOR_URL - - name: CHAIN + key: ORAKL_NETWORK_DELEGATOR_URL + - name: CHAIN valueFrom: secretKeyRef: name: aggregator-secrets key: CHAIN - - name: LOG_LEVEL + - name: LOG_LEVEL valueFrom: secretKeyRef: name: aggregator-secrets key: LOG_LEVEL - - name: REDIS_HOST + - name: REDIS_HOST valueFrom: secretKeyRef: name: aggregator-secrets key: REDIS_HOST - - name: REDIS_PORT + - name: REDIS_PORT valueFrom: secretKeyRef: name: aggregator-secrets key: REDIS_PORT - - name: PROVIDER_URL + - name: PROVIDER_URL valueFrom: secretKeyRef: name: aggregator-secrets key: PROVIDER_URL - - name: LISTENER_PORT + - name: LISTENER_PORT value: "4000" - - name: HEALTH_CHECK_PORT - value: "8080" + - name: HEALTH_CHECK_PORT + value: "8080" {{ end }} command: ["yarn"] @@ -158,8 +158,8 @@ spec: periodSeconds: {{ .Values.global.readinessProbe.periodSeconds }} timeoutSeconds: {{ .Values.global.readinessProbe.timeoutSeconds }} successThreshold: {{ .Values.global.readinessProbe.successThreshold }} - failureThreshold: {{ .Values.global.readinessProbe.failureThreshold }} - {{- end }} + failureThreshold: {{ .Values.global.readinessProbe.failureThreshold }} + {{- end }} resources: {{- toYaml .Values.listener.resources | nindent 12 }} diff --git a/aggregator/templates/reporter/deployment-reporter.yaml b/aggregator/templates/reporter/deployment-reporter.yaml index 325292a0..809cf2ed 100644 --- a/aggregator/templates/reporter/deployment-reporter.yaml +++ b/aggregator/templates/reporter/deployment-reporter.yaml @@ -41,7 +41,7 @@ spec: - name: {{ .Chart.Name }} securityContext: {{- toYaml .Values.reporter.containerSecurityContext | nindent 12 }} - image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.tag | default .Chart.AppVersion }}" + image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.reporter-tag | default .Chart.AppVersion }}" imagePullPolicy: {{ .Values.global.image.pullPolicy }} {{- if .Values.global.secretManager.enabled }} env: diff --git a/aggregator/templates/worker/deployment-worker.yaml b/aggregator/templates/worker/deployment-worker.yaml index 93adada5..554c0a79 100644 --- a/aggregator/templates/worker/deployment-worker.yaml +++ b/aggregator/templates/worker/deployment-worker.yaml @@ -25,7 +25,7 @@ spec: serviceAccountName: {{ .Values.worker.serviceAccount.name }} securityContext: {{- toYaml .Values.worker.podSecurityContext | nindent 8 }} - {{- if .Values.global.affinity.enabled }} + {{- if .Values.global.affinity.enabled }} affinity: nodeAffinity: preferredDuringSchedulingIgnoredDuringExecution: @@ -36,113 +36,113 @@ spec: operator: In values: - {{ .Values.global.affinity.value }} - {{- end }} + {{- end }} containers: - name: {{ .Chart.Name }} securityContext: {{- toYaml .Values.worker.containerSecurityContext | nindent 12 }} - image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.tag | default .Chart.AppVersion }}" + image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.worker-tag | default .Chart.AppVersion }}" imagePullPolicy: {{ .Values.global.image.pullPolicy }} - {{- if .Values.global.secretManager.enabled }} + {{- if .Values.global.secretManager.enabled }} env: - - name: NODE_ENV + - name: NODE_ENV valueFrom: secretKeyRef: name: orakl-aggregator-secrets key: NODE_ENV - - name: ORAKL_NETWORK_API_URL + - name: ORAKL_NETWORK_API_URL valueFrom: secretKeyRef: name: orakl-aggregator-secrets key: ORAKL_NETWORK_API_URL - - name: ORAKL_NETWORK_DELEGATOR_URL + - name: ORAKL_NETWORK_DELEGATOR_URL valueFrom: secretKeyRef: name: orakl-aggregator-secrets - key: ORAKL_NETWORK_DELEGATOR_URL - - name: CHAIN + key: ORAKL_NETWORK_DELEGATOR_URL + - name: CHAIN valueFrom: secretKeyRef: name: orakl-aggregator-secrets key: CHAIN - - name: HEALTH_CHECK_PORT + - name: HEALTH_CHECK_PORT valueFrom: secretKeyRef: name: orakl-aggregator-secrets key: HEALTH_CHECK_PORT - - name: SLACK_WEBHOOK_URL + - name: SLACK_WEBHOOK_URL valueFrom: secretKeyRef: name: orakl-aggregator-secrets key: SLACK_WEBHOOK_URL - - name: LOG_LEVEL + - name: LOG_LEVEL valueFrom: secretKeyRef: name: orakl-aggregator-secrets key: LOG_LEVEL - - name: REDIS_HOST + - name: REDIS_HOST valueFrom: secretKeyRef: name: orakl-aggregator-secrets key: REDIS_HOST - - name: REDIS_PORT + - name: REDIS_PORT valueFrom: secretKeyRef: name: orakl-aggregator-secrets key: REDIS_PORT - - name: PROVIDER_URL + - name: PROVIDER_URL valueFrom: secretKeyRef: name: orakl-aggregator-secrets key: PROVIDER_URL - - name: WORKER_PORT - value: {{ .Values.worker.APP_PORT | default 5000 | int }} + - name: WORKER_PORT + value: {{ .Values.worker.APP_PORT | default 5000 | int }} {{ else }} - env: - - name: NODE_ENV + env: + - name: NODE_ENV valueFrom: secretKeyRef: name: aggregator-secrets key: NODE_ENV - - name: ORAKL_NETWORK_API_URL + - name: ORAKL_NETWORK_API_URL valueFrom: secretKeyRef: name: aggregator-secrets key: ORAKL_NETWORK_API_URL - - name: ORAKL_NETWORK_DELEGATOR_URL + - name: ORAKL_NETWORK_DELEGATOR_URL valueFrom: secretKeyRef: name: aggregator-secrets - key: ORAKL_NETWORK_DELEGATOR_URL - - name: CHAIN + key: ORAKL_NETWORK_DELEGATOR_URL + - name: CHAIN valueFrom: secretKeyRef: name: aggregator-secrets key: CHAIN - - name: LOG_LEVEL + - name: LOG_LEVEL valueFrom: secretKeyRef: name: aggregator-secrets key: LOG_LEVEL - - name: REDIS_HOST + - name: REDIS_HOST valueFrom: secretKeyRef: name: aggregator-secrets key: REDIS_HOST - - name: REDIS_PORT + - name: REDIS_PORT valueFrom: secretKeyRef: name: aggregator-secrets key: REDIS_PORT - - name: PROVIDER_URL + - name: PROVIDER_URL valueFrom: secretKeyRef: name: aggregator-secrets key: PROVIDER_URL - - name: WORKER_PORT + - name: WORKER_PORT value: "5000" - - name: HEALTH_CHECK_PORT - value: "8080" + - name: HEALTH_CHECK_PORT + value: "8080" {{ end }} command: ["yarn"] args: [start:worker:data_feed] @@ -153,7 +153,7 @@ spec: containerPort: 8080 {{- if .Values.global.livenessProbe.enabled }} livenessProbe: - httpGet: + httpGet: path: / port: healthcheck initialDelaySeconds: {{ .Values.global.livenessProbe.initialDelaySeconds }} @@ -164,15 +164,15 @@ spec: {{- end }} {{- if .Values.global.readinessProbe.enabled }} readinessProbe: - httpGet: + httpGet: path: / port: healthcheck initialDelaySeconds: {{ .Values.global.readinessProbe.initialDelaySeconds }} periodSeconds: {{ .Values.global.readinessProbe.periodSeconds }} timeoutSeconds: {{ .Values.global.readinessProbe.timeoutSeconds }} successThreshold: {{ .Values.global.readinessProbe.successThreshold }} - failureThreshold: {{ .Values.global.readinessProbe.failureThreshold }} - {{- end }} + failureThreshold: {{ .Values.global.readinessProbe.failureThreshold }} + {{- end }} resources: {{- toYaml .Values.worker.resources | nindent 12 }} diff --git a/aggregator/values.yaml b/aggregator/values.yaml index 6f3a85dd..f9cbd47c 100644 --- a/aggregator/values.yaml +++ b/aggregator/values.yaml @@ -6,7 +6,9 @@ global: image: repository: public.ecr.aws/u6t6w0e4/orakl-core #repository url pullPolicy: IfNotPresent - tag: "v0.4.0.20231114.0559.38c3f23" + listener-tag: "v0.5.0.20231115.0418.edbde75" + reporter-tag: "v0.5.0.20231115.0418.edbde75" + worker-tag: "v0.5.0.20231115.0418.edbde75" imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: [] diff --git a/request-response/templates/listener/deployment-listener.yaml b/request-response/templates/listener/deployment-listener.yaml index 76708fde..a815d543 100644 --- a/request-response/templates/listener/deployment-listener.yaml +++ b/request-response/templates/listener/deployment-listener.yaml @@ -29,7 +29,7 @@ spec: - name: {{ .Chart.Name }} securityContext: {{- toYaml .Values.listener.containerSecurityContext | nindent 12 }} - image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.tag | default .Chart.AppVersion }}" + image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.listener-tag | default .Chart.AppVersion }}" imagePullPolicy: {{ .Values.global.image.pullPolicy }} {{- if .Values.global.secretManager.enabled }} env: @@ -38,12 +38,12 @@ spec: secretKeyRef: name: orakl-request-response-secrets key: NODE_ENV - - name: ORAKL_NETWORK_API_URL + - name: ORAKL_NETWORK_API_URL valueFrom: secretKeyRef: name: orakl-request-response-secrets key: ORAKL_NETWORK_API_URL - - name: CHAIN + - name: CHAIN valueFrom: secretKeyRef: name: orakl-request-response-secrets @@ -58,7 +58,7 @@ spec: secretKeyRef: name: orakl-request-response-secrets key: SLACK_WEBHOOK_URL - - name: LOG_LEVEL + - name: LOG_LEVEL valueFrom: secretKeyRef: name: orakl-request-response-secrets @@ -73,16 +73,16 @@ spec: secretKeyRef: name: orakl-request-response-secrets key: REDIS_PORT - - name: PROVIDER_URL + - name: PROVIDER_URL valueFrom: secretKeyRef: name: orakl-request-response-secrets key: PROVIDER_URL - - name: LISTENER_PORT + - name: LISTENER_PORT valueFrom: secretKeyRef: name: orakl-request-response-secrets - key: LISTENER_PORT + key: LISTENER_PORT {{ else }} env: - name: NODE_ENV @@ -90,19 +90,19 @@ spec: secretKeyRef: name: request-response-secrets key: NODE_ENV - - name: ORAKL_NETWORK_API_URL + - name: ORAKL_NETWORK_API_URL valueFrom: secretKeyRef: name: request-response-secrets key: ORAKL_NETWORK_API_URL - - name: CHAIN + - name: CHAIN valueFrom: secretKeyRef: name: request-response-secrets key: CHAIN - name: HEALTH_CHECK_PORT value: "8080" - - name: LOG_LEVEL + - name: LOG_LEVEL valueFrom: secretKeyRef: name: request-response-secrets @@ -117,21 +117,21 @@ spec: secretKeyRef: name: request-response-secrets key: REDIS_PORT - - name: PROVIDER_URL + - name: PROVIDER_URL valueFrom: secretKeyRef: name: request-response-secrets key: PROVIDER_URL - - name: LISTENER_PORT + - name: LISTENER_PORT value: "4000" - {{ end }} + {{ end }} command: ["yarn"] args: [start:listener:request_response] ports: - name: healthcheck - containerPort: 8080 + containerPort: {{ .Values.global.config.HEALTH_CHECK_PORT | default 8080 | int }} - name: watchman - containerPort: {{ .Values.listener.APP_PORT | default 4000 | int }} + containerPort: {{ .Values.listener.APP_PORT | default 4000 | int }} {{- if .Values.global.livenessProbe.enabled }} livenessProbe: httpGet: @@ -152,8 +152,8 @@ spec: periodSeconds: {{ .Values.global.readinessProbe.periodSeconds }} timeoutSeconds: {{ .Values.global.readinessProbe.timeoutSeconds }} successThreshold: {{ .Values.global.readinessProbe.successThreshold }} - failureThreshold: {{ .Values.global.readinessProbe.failureThreshold }} - {{- end }} + failureThreshold: {{ .Values.global.readinessProbe.failureThreshold }} + {{- end }} resources: {{- toYaml .Values.listener.resources | nindent 12 }} diff --git a/request-response/templates/reporter/deployment-reporter.yaml b/request-response/templates/reporter/deployment-reporter.yaml index 589d178b..22ca9f57 100644 --- a/request-response/templates/reporter/deployment-reporter.yaml +++ b/request-response/templates/reporter/deployment-reporter.yaml @@ -25,7 +25,7 @@ spec: serviceAccountName: {{ .Values.reporter.serviceAccount.name }} securityContext: {{- toYaml .Values.reporter.podSecurityContext | nindent 8 }} - {{- if .Values.global.affinity.enabled }} + {{- if .Values.global.affinity.enabled }} affinity: nodeAffinity: preferredDuringSchedulingIgnoredDuringExecution: @@ -36,33 +36,33 @@ spec: operator: In values: - {{ .Values.global.affinity.value }} - {{- end }} + {{- end }} containers: - name: {{ .Chart.Name }} securityContext: {{- toYaml .Values.reporter.containerSecurityContext | nindent 12 }} - image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.tag | default .Chart.AppVersion }}" + image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.reporter-tag | default .Chart.AppVersion }}" imagePullPolicy: {{ .Values.global.image.pullPolicy }} - {{- if .Values.global.secretManager.enabled }} + {{- if .Values.global.secretManager.enabled }} env: - name: NODE_ENV valueFrom: secretKeyRef: name: orakl-request-response-secrets key: NODE_ENV - - name: ORAKL_NETWORK_API_URL + - name: ORAKL_NETWORK_API_URL valueFrom: secretKeyRef: name: orakl-request-response-secrets key: ORAKL_NETWORK_API_URL - - name: CHAIN + - name: CHAIN valueFrom: secretKeyRef: name: orakl-request-response-secrets key: CHAIN - name: HEALTH_CHECK_PORT value: "8080" - - name: LOG_LEVEL + - name: LOG_LEVEL valueFrom: secretKeyRef: name: orakl-request-response-secrets @@ -77,16 +77,16 @@ spec: secretKeyRef: name: orakl-request-response-secrets key: REDIS_PORT - - name: PROVIDER_URL + - name: PROVIDER_URL valueFrom: secretKeyRef: name: orakl-request-response-secrets key: PROVIDER_URL - - name: REPORTER_PORT + - name: REPORTER_PORT valueFrom: secretKeyRef: name: orakl-request-response-secrets - key: REPORTER_PORT + key: REPORTER_PORT {{ else }} env: - name: NODE_ENV @@ -94,19 +94,19 @@ spec: secretKeyRef: name: request-response-secrets key: NODE_ENV - - name: ORAKL_NETWORK_API_URL + - name: ORAKL_NETWORK_API_URL valueFrom: secretKeyRef: name: request-response-secrets key: ORAKL_NETWORK_API_URL - - name: CHAIN + - name: CHAIN valueFrom: secretKeyRef: name: request-response-secrets key: CHAIN - name: HEALTH_CHECK_PORT value: "8080" - - name: LOG_LEVEL + - name: LOG_LEVEL valueFrom: secretKeyRef: name: request-response-secrets @@ -121,21 +121,21 @@ spec: secretKeyRef: name: request-response-secrets key: REDIS_PORT - - name: PROVIDER_URL + - name: PROVIDER_URL valueFrom: secretKeyRef: name: request-response-secrets key: PROVIDER_URL - - name: REPORTER_PORT + - name: REPORTER_PORT value: "6000" - {{ end }} + {{ end }} command: ["yarn"] args: [start:reporter:request_response] ports: - name: watchman - containerPort: {{ .Values.reporter.APP_PORT | default 6000 | int }} + containerPort: {{ .Values.reporter.APP_PORT | default 6000 | int }} - name: healthcheck - containerPort: 8080 + containerPort: {{ .Values.global.config.HEALTH_CHECK_PORT | default 8080 | int }} {{- if .Values.global.livenessProbe.enabled }} livenessProbe: httpGet: @@ -156,8 +156,8 @@ spec: periodSeconds: {{ .Values.global.readinessProbe.periodSeconds }} timeoutSeconds: {{ .Values.global.readinessProbe.timeoutSeconds }} successThreshold: {{ .Values.global.readinessProbe.successThreshold }} - failureThreshold: {{ .Values.global.readinessProbe.failureThreshold }} - {{- end }} + failureThreshold: {{ .Values.global.readinessProbe.failureThreshold }} + {{- end }} resources: {{- toYaml .Values.reporter.resources | nindent 12 }} diff --git a/request-response/templates/worker/deployment-worker.yaml b/request-response/templates/worker/deployment-worker.yaml index 6eae207b..ebb5c5bd 100644 --- a/request-response/templates/worker/deployment-worker.yaml +++ b/request-response/templates/worker/deployment-worker.yaml @@ -25,7 +25,7 @@ spec: serviceAccountName: {{ .Values.worker.serviceAccount.name }} securityContext: {{- toYaml .Values.worker.podSecurityContext | nindent 8 }} - {{- if .Values.global.affinity.enabled }} + {{- if .Values.global.affinity.enabled }} affinity: nodeAffinity: preferredDuringSchedulingIgnoredDuringExecution: @@ -36,33 +36,33 @@ spec: operator: In values: - {{ .Values.global.affinity.value }} - {{- end }} + {{- end }} containers: - name: {{ .Chart.Name }} securityContext: {{- toYaml .Values.worker.containerSecurityContext | nindent 12 }} - image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.tag | default .Chart.AppVersion }}" + image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.worker-tag | default .Chart.AppVersion }}" imagePullPolicy: {{ .Values.global.image.pullPolicy }} - {{- if .Values.global.secretManager.enabled }} + {{- if .Values.global.secretManager.enabled }} env: - name: NODE_ENV valueFrom: secretKeyRef: name: orakl-request-response-secrets key: NODE_ENV - - name: ORAKL_NETWORK_API_URL + - name: ORAKL_NETWORK_API_URL valueFrom: secretKeyRef: name: orakl-request-response-secrets key: ORAKL_NETWORK_API_URL - - name: CHAIN + - name: CHAIN valueFrom: secretKeyRef: name: orakl-request-response-secrets key: CHAIN - name: HEALTH_CHECK_PORT value: "8080" - - name: LOG_LEVEL + - name: LOG_LEVEL valueFrom: secretKeyRef: name: orakl-request-response-secrets @@ -77,13 +77,13 @@ spec: secretKeyRef: name: orakl-request-response-secrets key: REDIS_PORT - - name: PROVIDER_URL + - name: PROVIDER_URL valueFrom: secretKeyRef: name: orakl-request-response-secrets key: PROVIDER_URL - - name: WORKER_PORT - value: "5000" + - name: WORKER_PORT + value: "5000" {{ else }} env: - name: NODE_ENV @@ -91,19 +91,19 @@ spec: secretKeyRef: name: request-response-secrets key: NODE_ENV - - name: ORAKL_NETWORK_API_URL + - name: ORAKL_NETWORK_API_URL valueFrom: secretKeyRef: name: request-response-secrets key: ORAKL_NETWORK_API_URL - - name: CHAIN + - name: CHAIN valueFrom: secretKeyRef: name: request-response-secrets key: CHAIN - name: HEALTH_CHECK_PORT value: "8080" - - name: LOG_LEVEL + - name: LOG_LEVEL valueFrom: secretKeyRef: name: request-response-secrets @@ -118,21 +118,21 @@ spec: secretKeyRef: name: request-response-secrets key: REDIS_PORT - - name: PROVIDER_URL + - name: PROVIDER_URL valueFrom: secretKeyRef: name: request-response-secrets key: PROVIDER_URL - - name: WORKER_PORT + - name: WORKER_PORT value: "5000" - {{ end }} + {{ end }} command: ["yarn"] args: [start:worker:request_response] ports: - name: healthcheck - containerPort: 8080 + containerPort: {{ .Values.global.config.HEALTH_CHECK_PORT | default 8080 | int }} - name: watchman - containerPort: {{ .Values.worker.APP_PORT | default 5000 | int }} + containerPort: {{ .Values.worker.APP_PORT | default 5000 | int }} {{- if .Values.global.livenessProbe.enabled }} livenessProbe: httpGet: @@ -153,8 +153,8 @@ spec: periodSeconds: {{ .Values.global.readinessProbe.periodSeconds }} timeoutSeconds: {{ .Values.global.readinessProbe.timeoutSeconds }} successThreshold: {{ .Values.global.readinessProbe.successThreshold }} - failureThreshold: {{ .Values.global.readinessProbe.failureThreshold }} - {{- end }} + failureThreshold: {{ .Values.global.readinessProbe.failureThreshold }} + {{- end }} resources: {{- toYaml .Values.worker.resources | nindent 12 }} diff --git a/request-response/values.yaml b/request-response/values.yaml index 40c38261..bcc15788 100644 --- a/request-response/values.yaml +++ b/request-response/values.yaml @@ -6,7 +6,9 @@ global: image: repository: public.ecr.aws/bisonai/orakl-core #repository url pullPolicy: IfNotPresent - tag: "v0.3.1.20231030.0230.ad46af8" + listener-tag: "v0.5.0.20231115.0418.edbde75" + reporter-tag: "v0.5.0.20231115.0418.edbde75" + worker-tag: "v0.5.0.20231115.0418.edbde75" imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: [] diff --git a/vrf/templates/listener/deployment-listener.yaml b/vrf/templates/listener/deployment-listener.yaml index 0014f68e..5af81d7a 100644 --- a/vrf/templates/listener/deployment-listener.yaml +++ b/vrf/templates/listener/deployment-listener.yaml @@ -29,21 +29,21 @@ spec: - name: {{ .Chart.Name }} securityContext: {{- toYaml .Values.listener.containerSecurityContext | nindent 12 }} - image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.tag | default .Chart.AppVersion }}" + image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.listener-tag | default .Chart.AppVersion }}" imagePullPolicy: {{ .Values.global.image.pullPolicy }} - {{- if .Values.global.secretManager.enabled }} + {{- if .Values.global.secretManager.enabled }} env: - name: NODE_ENV valueFrom: secretKeyRef: name: orakl-vrf-secrets key: NODE_ENV - - name: ORAKL_NETWORK_API_URL + - name: ORAKL_NETWORK_API_URL valueFrom: secretKeyRef: name: orakl-vrf-secrets key: ORAKL_NETWORK_API_URL - - name: CHAIN + - name: CHAIN valueFrom: secretKeyRef: name: orakl-vrf-secrets @@ -58,7 +58,7 @@ spec: secretKeyRef: name: orakl-vrf-secrets key: SLACK_WEBHOOK_URL - - name: LOG_LEVEL + - name: LOG_LEVEL valueFrom: secretKeyRef: name: orakl-vrf-secrets @@ -73,7 +73,7 @@ spec: secretKeyRef: name: orakl-vrf-secrets key: REDIS_PORT - - name: PROVIDER_URL + - name: PROVIDER_URL valueFrom: secretKeyRef: name: orakl-vrf-secrets @@ -90,19 +90,19 @@ spec: secretKeyRef: name: vrf-secrets key: NODE_ENV - - name: ORAKL_NETWORK_API_URL + - name: ORAKL_NETWORK_API_URL valueFrom: secretKeyRef: name: vrf-secrets key: ORAKL_NETWORK_API_URL - - name: CHAIN + - name: CHAIN valueFrom: secretKeyRef: name: vrf-secrets key: CHAIN - name: HEALTH_CHECK_PORT value: "8080" - - name: LOG_LEVEL + - name: LOG_LEVEL valueFrom: secretKeyRef: name: vrf-secrets @@ -117,21 +117,21 @@ spec: secretKeyRef: name: vrf-secrets key: REDIS_PORT - - name: PROVIDER_URL + - name: PROVIDER_URL valueFrom: secretKeyRef: name: vrf-secrets key: PROVIDER_URL - name: LISTENER_PORT value: "4000" - {{ end }} + {{ end }} command: ["yarn"] args: [start:listener:vrf] ports: - name: watchman - containerPort: {{ .Values.listener.APP_PORT | default 4000 | int }} + containerPort: {{ .Values.listener.APP_PORT | default 4000 | int }} - name: healthcheck - containerPort: 8080 + containerPort: 8080 {{- if .Values.global.livenessProbe.enabled }} livenessProbe: httpGet: @@ -152,8 +152,8 @@ spec: periodSeconds: {{ .Values.global.readinessProbe.periodSeconds }} timeoutSeconds: {{ .Values.global.readinessProbe.timeoutSeconds }} successThreshold: {{ .Values.global.readinessProbe.successThreshold }} - failureThreshold: {{ .Values.global.readinessProbe.failureThreshold }} - {{- end }} + failureThreshold: {{ .Values.global.readinessProbe.failureThreshold }} + {{- end }} resources: {{- toYaml .Values.listener.resources | nindent 12 }} diff --git a/vrf/templates/reporter/deployment-reporter.yaml b/vrf/templates/reporter/deployment-reporter.yaml index 90c2ccac..d18372d5 100644 --- a/vrf/templates/reporter/deployment-reporter.yaml +++ b/vrf/templates/reporter/deployment-reporter.yaml @@ -41,7 +41,7 @@ spec: - name: {{ .Chart.Name }} securityContext: {{- toYaml .Values.reporter.containerSecurityContext | nindent 12 }} - image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.tag | default .Chart.AppVersion }}" + image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.reporter-tag | default .Chart.AppVersion }}" imagePullPolicy: {{ .Values.global.image.pullPolicy }} {{- if .Values.global.secretManager.enabled }} env: diff --git a/vrf/templates/worker/deployment-worker.yaml b/vrf/templates/worker/deployment-worker.yaml index 70f9d41b..e58c92e5 100644 --- a/vrf/templates/worker/deployment-worker.yaml +++ b/vrf/templates/worker/deployment-worker.yaml @@ -25,7 +25,7 @@ spec: serviceAccountName: {{ .Values.worker.serviceAccount.name }} securityContext: {{- toYaml .Values.worker.podSecurityContext | nindent 8 }} - {{- if .Values.global.affinity.enabled }} + {{- if .Values.global.affinity.enabled }} affinity: nodeAffinity: preferredDuringSchedulingIgnoredDuringExecution: @@ -36,26 +36,26 @@ spec: operator: In values: - {{ .Values.global.affinity.value }} - {{- end }} + {{- end }} containers: - name: {{ .Chart.Name }} securityContext: {{- toYaml .Values.worker.containerSecurityContext | nindent 12 }} - image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.tag | default .Chart.AppVersion }}" + image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.worker-tag | default .Chart.AppVersion }}" imagePullPolicy: {{ .Values.global.image.pullPolicy }} - {{- if .Values.global.secretManager.enabled }} + {{- if .Values.global.secretManager.enabled }} env: - name: NODE_ENV valueFrom: secretKeyRef: name: orakl-vrf-secrets key: NODE_ENV - - name: ORAKL_NETWORK_API_URL + - name: ORAKL_NETWORK_API_URL valueFrom: secretKeyRef: name: orakl-vrf-secrets key: ORAKL_NETWORK_API_URL - - name: CHAIN + - name: CHAIN valueFrom: secretKeyRef: name: orakl-vrf-secrets @@ -70,7 +70,7 @@ spec: secretKeyRef: name: orakl-vrf-secrets key: SLACK_WEBHOOK_URL - - name: LOG_LEVEL + - name: LOG_LEVEL valueFrom: secretKeyRef: name: orakl-vrf-secrets @@ -85,7 +85,7 @@ spec: secretKeyRef: name: orakl-vrf-secrets key: REDIS_PORT - - name: PROVIDER_URL + - name: PROVIDER_URL valueFrom: secretKeyRef: name: orakl-vrf-secrets @@ -94,7 +94,7 @@ spec: valueFrom: secretKeyRef: name: orakl-vrf-secrets - key: WORKER_PORT + key: WORKER_PORT {{ else }} env: - name: NODE_ENV @@ -102,19 +102,19 @@ spec: secretKeyRef: name: vrf-secrets key: NODE_ENV - - name: ORAKL_NETWORK_API_URL + - name: ORAKL_NETWORK_API_URL valueFrom: secretKeyRef: name: vrf-secrets key: ORAKL_NETWORK_API_URL - - name: CHAIN + - name: CHAIN valueFrom: secretKeyRef: name: vrf-secrets key: CHAIN - name: HEALTH_CHECK_PORT value: "8080" - - name: LOG_LEVEL + - name: LOG_LEVEL valueFrom: secretKeyRef: name: vrf-secrets @@ -129,22 +129,22 @@ spec: secretKeyRef: name: vrf-secrets key: REDIS_PORT - - name: PROVIDER_URL + - name: PROVIDER_URL valueFrom: secretKeyRef: name: vrf-secrets key: PROVIDER_URL - name: WORKER_PORT value: "5000" - {{ end }} + {{ end }} command: ["yarn"] args: [start:worker:vrf] - ports: + ports: - name: watchman - containerPort: {{ .Values.worker.APP_PORT | default 5000 | int }} + containerPort: {{ .Values.worker.APP_PORT | default 5000 | int }} - name: healthcheck - containerPort: 8080 - + containerPort: 8080 + {{- if .Values.global.livenessProbe.enabled }} livenessProbe: httpGet: @@ -165,8 +165,8 @@ spec: periodSeconds: {{ .Values.global.readinessProbe.periodSeconds }} timeoutSeconds: {{ .Values.global.readinessProbe.timeoutSeconds }} successThreshold: {{ .Values.global.readinessProbe.successThreshold }} - failureThreshold: {{ .Values.global.readinessProbe.failureThreshold }} - {{- end }} + failureThreshold: {{ .Values.global.readinessProbe.failureThreshold }} + {{- end }} resources: {{- toYaml .Values.worker.resources | nindent 12 }} diff --git a/vrf/values.yaml b/vrf/values.yaml index 3fc69048..ef573cab 100644 --- a/vrf/values.yaml +++ b/vrf/values.yaml @@ -6,15 +6,17 @@ global: image: repository: public.ecr.aws/u6t6w0e4/orakl-core #repository url pullPolicy: IfNotPresent - tag: "v0.3.1.20231103.0653.19ca105" + listener-tag: "v0.5.0.20231115.0418.edbde75" + reporter-tag: "v0.5.0.20231115.0418.edbde75" + worker-tag: "v0.5.0.20231115.0418.edbde75" imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: [] secretManager: enabled: false - secretId: - versionId: + secretId: + versionId: affinity: enabled: false @@ -39,7 +41,7 @@ global: periodSeconds: 5 timeoutSeconds: 1 successThreshold: 1 - failureThreshold: 5 + failureThreshold: 5 listener: enabled: true @@ -59,7 +61,7 @@ listener: podSecurityContext: {} containerSecurityContext: {} - + resources: limits: cpu: 1000m @@ -86,7 +88,7 @@ worker: podSecurityContext: {} containerSecurityContext: {} - + resources: limits: cpu: 1000m @@ -107,13 +109,13 @@ reporter: annotations: {} # -- Automount API credentials for the Service Account automountServiceAccountToken: true - + APP_PORT: 6000 podSecurityContext: {} containerSecurityContext: {} - + resources: limits: cpu: 1000m From 716eadc11072f2381e957396acda7aa4443b7f41 Mon Sep 17 00:00:00 2001 From: Bayram Guvanjov Date: Tue, 21 Nov 2023 10:44:48 +0900 Subject: [PATCH 066/190] feat: update image tag for por (#39) --- scripts/cronjob-por.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/cronjob-por.yml b/scripts/cronjob-por.yml index 41be3694..4dbb2a51 100644 --- a/scripts/cronjob-por.yml +++ b/scripts/cronjob-por.yml @@ -22,7 +22,7 @@ spec: restartPolicy: Never containers: - name: proof-of-reserve - image: public.ecr.aws/u6t6w0e4/orakl-core:v0.5.0.20231115.0418.edbde75 + image: public.ecr.aws/u6t6w0e4/orakl-core:v0.5.0.20231120.0912.58b79f6 imagePullPolicy: IfNotPresent command: ["yarn"] args: [start:por] From c64c344f9e264b787bcc85e78c268b093d0c33db Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Tue, 21 Nov 2023 11:13:43 +0900 Subject: [PATCH 067/190] feat: add env vars for slack webhook (#41) --- scripts/cronjob-por.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/cronjob-por.yml b/scripts/cronjob-por.yml index 4dbb2a51..11c8b828 100644 --- a/scripts/cronjob-por.yml +++ b/scripts/cronjob-por.yml @@ -69,3 +69,8 @@ spec: key: PROVIDER_URL - name: POR_AGGREGATOR_HASH value: "0x952f883b8d2fd47a790307cb569118a215ea45eb861cefd4ed3b83ae7550f8e8" + - name: SLACK_WEBHOOK_URL + valueFrom: + secretKeyRef: + name: aggregator-secrets + key: SLACK_WEBHOOK_URL From a296ec10d4e60cf233f41887ce47da396b69fc95 Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Tue, 21 Nov 2023 11:21:52 +0900 Subject: [PATCH 068/190] feat: Add env vars for por (#42) * feat: add env vars for slack webhook * feat: Add env vars for por --- secret-store/aggregator-secret.yaml | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/secret-store/aggregator-secret.yaml b/secret-store/aggregator-secret.yaml index 05d8c109..64bfb440 100644 --- a/secret-store/aggregator-secret.yaml +++ b/secret-store/aggregator-secret.yaml @@ -15,28 +15,32 @@ spec: - secretKey: NODE_ENV remoteRef: key: baobab/aggregator - property: NODE_ENV + property: NODE_ENV - secretKey: LOG_LEVEL remoteRef: key: baobab/aggregator - property: LOG_LEVEL + property: LOG_LEVEL - secretKey: ORAKL_NETWORK_API_URL remoteRef: key: baobab/aggregator - property: ORAKL_NETWORK_API_URL + property: ORAKL_NETWORK_API_URL - secretKey: ORAKL_NETWORK_DELEGATOR_URL remoteRef: key: baobab/aggregator - property: ORAKL_NETWORK_DELEGATOR_URL + property: ORAKL_NETWORK_DELEGATOR_URL - secretKey: PROVIDER_URL remoteRef: key: baobab/aggregator - property: PROVIDER_URL + property: PROVIDER_URL - secretKey: REDIS_HOST remoteRef: key: baobab/aggregator - property: REDIS_HOST + property: REDIS_HOST - secretKey: REDIS_PORT remoteRef: key: baobab/aggregator - property: REDIS_PORT \ No newline at end of file + property: REDIS_PORT + - secretKey: SLACK_WEBHOOK_URL + remoteRef: + key: baobab/aggregator + property: SLACK_WEBHOOK_URL \ No newline at end of file From d7d26e1a0772388f9418f89ec79f61fb14ad6a5a Mon Sep 17 00:00:00 2001 From: Nick <148735107+nick-bisonai@users.noreply.github.com> Date: Wed, 22 Nov 2023 17:25:10 +0900 Subject: [PATCH 069/190] feat: update for faster query and proxy location (#44) --- api/Chart.yaml | 2 +- api/values.yaml | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/api/Chart.yaml b/api/Chart.yaml index 7484da58..206b00a9 100644 --- a/api/Chart.yaml +++ b/api/Chart.yaml @@ -21,4 +21,4 @@ version: 0.1.4 # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "0.1.0" +appVersion: "0.1.1" diff --git a/api/values.yaml b/api/values.yaml index fd1afb93..1ffc630c 100644 --- a/api/values.yaml +++ b/api/values.yaml @@ -2,22 +2,22 @@ ## created by Bisonai global: image: - repository: public.ecr.aws/bisonai/orakl-api + repository: public.ecr.aws/bisonai/orakl-api pullPolicy: IfNotPresent - tag: "v0.1.0.20230920.0750.99c4cdd" + tag: "v0.1.0.20231120.0919.985aa5f" imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: [] secretManager: enabled: false - secretId: - versionId: + secretId: + versionId: affinity: enabled: false key: kubernetes.io/hostname - value: + value: podAnnotations: {} @@ -37,7 +37,7 @@ global: periodSeconds: 5 timeoutSeconds: 5 successThreshold: 1 - failureThreshold: 5 + failureThreshold: 5 api: enabled: true @@ -55,9 +55,9 @@ api: podSecurityContext: {} containerSecurityContext: {} - + resources: - limits: + limits: cpu: 2000m memory: 4Gi requests: From 9df99194032b71dc2c34be02d3eb93a17daf3c47 Mon Sep 17 00:00:00 2001 From: Nick <148735107+nick-bisonai@users.noreply.github.com> Date: Wed, 22 Nov 2023 17:51:00 +0900 Subject: [PATCH 070/190] fix: fix migration file (#45) --- api/Chart.yaml | 2 +- api/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api/Chart.yaml b/api/Chart.yaml index 206b00a9..65c373c9 100644 --- a/api/Chart.yaml +++ b/api/Chart.yaml @@ -21,4 +21,4 @@ version: 0.1.4 # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "0.1.1" +appVersion: "0.1.2" diff --git a/api/values.yaml b/api/values.yaml index 1ffc630c..518e4119 100644 --- a/api/values.yaml +++ b/api/values.yaml @@ -4,7 +4,7 @@ global: image: repository: public.ecr.aws/bisonai/orakl-api pullPolicy: IfNotPresent - tag: "v0.1.0.20231120.0919.985aa5f" + tag: "v0.1.0.20231122.0840.f8fa086" imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: [] From 991154f25b8f722fed67e6c925e2f5eb576c9d95 Mon Sep 17 00:00:00 2001 From: Nick <148735107+nick-bisonai@users.noreply.github.com> Date: Thu, 23 Nov 2023 10:22:34 +0900 Subject: [PATCH 071/190] feat:update fetcher with new proxy settings (#46) --- fetcher/Chart.yaml | 4 ++-- fetcher/values.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fetcher/Chart.yaml b/fetcher/Chart.yaml index b56d5c12..3a81eeaf 100644 --- a/fetcher/Chart.yaml +++ b/fetcher/Chart.yaml @@ -15,10 +15,10 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.1.31 +version: 0.1.32 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "v0.0.1.20231115.0708.e386ea1" +appVersion: "v0.0.1.20231122.0914.5013059" diff --git a/fetcher/values.yaml b/fetcher/values.yaml index 4894ba49..9174f6d4 100644 --- a/fetcher/values.yaml +++ b/fetcher/values.yaml @@ -5,7 +5,7 @@ global: image: repository: public.ecr.aws/u6t6w0e4/orakl-fetcher #repository url pullPolicy: IfNotPresent - tag: "v0.0.1.20231115.0708.e386ea1" + tag: "v0.0.1.20231122.0914.5013059" imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: [] From e15e77fd3c05e9aa32783ffeebe28ad14d32a950 Mon Sep 17 00:00:00 2001 From: Bayram Guvanjov Date: Thu, 23 Nov 2023 10:41:58 +0900 Subject: [PATCH 072/190] feat: update por image tag (#48) --- scripts/cronjob-por.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/cronjob-por.yml b/scripts/cronjob-por.yml index 11c8b828..ddf9b84f 100644 --- a/scripts/cronjob-por.yml +++ b/scripts/cronjob-por.yml @@ -22,7 +22,7 @@ spec: restartPolicy: Never containers: - name: proof-of-reserve - image: public.ecr.aws/u6t6w0e4/orakl-core:v0.5.0.20231120.0912.58b79f6 + image: public.ecr.aws/u6t6w0e4/orakl-core:v0.5.1.20231123.0110.b3c548d imagePullPolicy: IfNotPresent command: ["yarn"] args: [start:por] From 5bc67592e3064ed01e73bcb94aa13920dddbdbc5 Mon Sep 17 00:00:00 2001 From: Nick <148735107+nick-bisonai@users.noreply.github.com> Date: Thu, 23 Nov 2023 14:28:29 +0900 Subject: [PATCH 073/190] fix: rollback item not found behavior (#50) --- api/Chart.yaml | 2 +- api/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api/Chart.yaml b/api/Chart.yaml index 65c373c9..948e9315 100644 --- a/api/Chart.yaml +++ b/api/Chart.yaml @@ -21,4 +21,4 @@ version: 0.1.4 # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "0.1.2" +appVersion: "v0.1.0.20231123.0522.bf71e2a" diff --git a/api/values.yaml b/api/values.yaml index 518e4119..1c1d2568 100644 --- a/api/values.yaml +++ b/api/values.yaml @@ -4,7 +4,7 @@ global: image: repository: public.ecr.aws/bisonai/orakl-api pullPolicy: IfNotPresent - tag: "v0.1.0.20231122.0840.f8fa086" + tag: "v0.1.0.20231123.0522.bf71e2a" imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: [] From 96cb5a17b006666d41e64d6438bc16bea1399e4c Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Mon, 27 Nov 2023 15:12:54 +0900 Subject: [PATCH 074/190] Add label for make PoR to measurable (#52) * feat: Add label * fix: Correcting typo * feat: Add label to metadata of cronjob --- scripts/cronjob-por.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/cronjob-por.yml b/scripts/cronjob-por.yml index ddf9b84f..f8b9b063 100644 --- a/scripts/cronjob-por.yml +++ b/scripts/cronjob-por.yml @@ -10,6 +10,8 @@ apiVersion: batch/v1 metadata: name: proof-of-reserve namespace: orakl + labels: + app.kubernetes.io/instance: "proof-of-reserve" spec: schedule: "* * * * *" jobTemplate: @@ -17,6 +19,9 @@ spec: backoffLimit: 0 ttlSecondsAfterFinished: 30 template: + metadata: + labels: + app.kubernetes.io/instance: "proof-of-reserve" spec: serviceAccountName: orakl-por restartPolicy: Never From 6c8f6d4de43c03a1820b0fe19158e014ddd39802 Mon Sep 17 00:00:00 2001 From: Nick <148735107+nick-bisonai@users.noreply.github.com> Date: Thu, 7 Dec 2023 16:41:27 +0900 Subject: [PATCH 075/190] feat: update api (#54) --- api/Chart.yaml | 2 +- api/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api/Chart.yaml b/api/Chart.yaml index 948e9315..35dd8d1b 100644 --- a/api/Chart.yaml +++ b/api/Chart.yaml @@ -21,4 +21,4 @@ version: 0.1.4 # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "v0.1.0.20231123.0522.bf71e2a" +appVersion: "v0.1.0.20231207.0733.00fdf29" diff --git a/api/values.yaml b/api/values.yaml index 1c1d2568..72232a41 100644 --- a/api/values.yaml +++ b/api/values.yaml @@ -4,7 +4,7 @@ global: image: repository: public.ecr.aws/bisonai/orakl-api pullPolicy: IfNotPresent - tag: "v0.1.0.20231123.0522.bf71e2a" + tag: "v0.1.0.20231207.0733.00fdf29" imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: [] From d8e93b86e89652a0afbd8b74057d2fa72532b0fd Mon Sep 17 00:00:00 2001 From: Nick <148735107+nick-bisonai@users.noreply.github.com> Date: Mon, 11 Dec 2023 13:27:07 +0900 Subject: [PATCH 076/190] feat: node 20 implementation to listener (#55) --- aggregator/Chart.yaml | 2 +- aggregator/values.yaml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/aggregator/Chart.yaml b/aggregator/Chart.yaml index 82704635..22b20f71 100644 --- a/aggregator/Chart.yaml +++ b/aggregator/Chart.yaml @@ -21,4 +21,4 @@ version: 0.3.14 # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "v0.4.0.20231114.0559.38c3f23" +appVersion: "v0.5.1.20231211.0351.127c944" diff --git a/aggregator/values.yaml b/aggregator/values.yaml index f9cbd47c..0bd4250d 100644 --- a/aggregator/values.yaml +++ b/aggregator/values.yaml @@ -6,7 +6,7 @@ global: image: repository: public.ecr.aws/u6t6w0e4/orakl-core #repository url pullPolicy: IfNotPresent - listener-tag: "v0.5.0.20231115.0418.edbde75" + listener-tag: "v0.5.1.20231211.0351.127c944" reporter-tag: "v0.5.0.20231115.0418.edbde75" worker-tag: "v0.5.0.20231115.0418.edbde75" imagePullPolicy: IfNotPresent @@ -56,7 +56,7 @@ listener: # -- Automount API credentials for the Service Account automountServiceAccountToken: true - APP_PORT : 4000 + APP_PORT: 4000 podSecurityContext: {} @@ -83,7 +83,7 @@ worker: # -- Automount API credentials for the Service Account automountServiceAccountToken: true - APP_PORT : 5000 + APP_PORT: 5000 podSecurityContext: {} @@ -110,7 +110,7 @@ reporter: # -- Automount API credentials for the Service Account automountServiceAccountToken: true - APP_PORT : 6000 + APP_PORT: 6000 podSecurityContext: {} From d83bfe3e95b889c10182823f139db487c3cf22ba Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Mon, 11 Dec 2023 14:06:56 +0900 Subject: [PATCH 077/190] fix: Fix synctax error (#57) --- aggregator/templates/listener/deployment-listener.yaml | 2 +- aggregator/templates/reporter/deployment-reporter.yaml | 2 +- aggregator/templates/worker/deployment-worker.yaml | 2 +- aggregator/values.yaml | 6 +++--- .../templates/listener/deployment-listener.yaml | 2 +- .../templates/reporter/deployment-reporter.yaml | 2 +- request-response/templates/worker/deployment-worker.yaml | 2 +- request-response/values.yaml | 6 +++--- vrf/templates/listener/deployment-listener.yaml | 2 +- vrf/templates/reporter/deployment-reporter.yaml | 2 +- vrf/templates/worker/deployment-worker.yaml | 2 +- vrf/values.yaml | 6 +++--- 12 files changed, 18 insertions(+), 18 deletions(-) diff --git a/aggregator/templates/listener/deployment-listener.yaml b/aggregator/templates/listener/deployment-listener.yaml index 997a1633..f087c077 100644 --- a/aggregator/templates/listener/deployment-listener.yaml +++ b/aggregator/templates/listener/deployment-listener.yaml @@ -29,7 +29,7 @@ spec: - name: {{ .Chart.Name }} securityContext: {{- toYaml .Values.listener.containerSecurityContext | nindent 12 }} - image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.listener-tag | default .Chart.AppVersion }}" + image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.listenerTag | default .Chart.AppVersion }}" imagePullPolicy: {{ .Values.global.image.pullPolicy }} {{- if .Values.global.secretManager.enabled }} env: diff --git a/aggregator/templates/reporter/deployment-reporter.yaml b/aggregator/templates/reporter/deployment-reporter.yaml index 809cf2ed..68a025c4 100644 --- a/aggregator/templates/reporter/deployment-reporter.yaml +++ b/aggregator/templates/reporter/deployment-reporter.yaml @@ -41,7 +41,7 @@ spec: - name: {{ .Chart.Name }} securityContext: {{- toYaml .Values.reporter.containerSecurityContext | nindent 12 }} - image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.reporter-tag | default .Chart.AppVersion }}" + image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.reporterTag | default .Chart.AppVersion }}" imagePullPolicy: {{ .Values.global.image.pullPolicy }} {{- if .Values.global.secretManager.enabled }} env: diff --git a/aggregator/templates/worker/deployment-worker.yaml b/aggregator/templates/worker/deployment-worker.yaml index 554c0a79..c66401f1 100644 --- a/aggregator/templates/worker/deployment-worker.yaml +++ b/aggregator/templates/worker/deployment-worker.yaml @@ -41,7 +41,7 @@ spec: - name: {{ .Chart.Name }} securityContext: {{- toYaml .Values.worker.containerSecurityContext | nindent 12 }} - image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.worker-tag | default .Chart.AppVersion }}" + image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.workerTag | default .Chart.AppVersion }}" imagePullPolicy: {{ .Values.global.image.pullPolicy }} {{- if .Values.global.secretManager.enabled }} env: diff --git a/aggregator/values.yaml b/aggregator/values.yaml index 0bd4250d..545065aa 100644 --- a/aggregator/values.yaml +++ b/aggregator/values.yaml @@ -6,9 +6,9 @@ global: image: repository: public.ecr.aws/u6t6w0e4/orakl-core #repository url pullPolicy: IfNotPresent - listener-tag: "v0.5.1.20231211.0351.127c944" - reporter-tag: "v0.5.0.20231115.0418.edbde75" - worker-tag: "v0.5.0.20231115.0418.edbde75" + listenerTag: "v0.5.1.20231211.0351.127c944" + reporterTag: "v0.5.0.20231115.0418.edbde75" + workerTag: "v0.5.0.20231115.0418.edbde75" imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: [] diff --git a/request-response/templates/listener/deployment-listener.yaml b/request-response/templates/listener/deployment-listener.yaml index a815d543..687b0cf3 100644 --- a/request-response/templates/listener/deployment-listener.yaml +++ b/request-response/templates/listener/deployment-listener.yaml @@ -29,7 +29,7 @@ spec: - name: {{ .Chart.Name }} securityContext: {{- toYaml .Values.listener.containerSecurityContext | nindent 12 }} - image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.listener-tag | default .Chart.AppVersion }}" + image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.listenerTag | default .Chart.AppVersion }}" imagePullPolicy: {{ .Values.global.image.pullPolicy }} {{- if .Values.global.secretManager.enabled }} env: diff --git a/request-response/templates/reporter/deployment-reporter.yaml b/request-response/templates/reporter/deployment-reporter.yaml index 22ca9f57..a6e74f5b 100644 --- a/request-response/templates/reporter/deployment-reporter.yaml +++ b/request-response/templates/reporter/deployment-reporter.yaml @@ -41,7 +41,7 @@ spec: - name: {{ .Chart.Name }} securityContext: {{- toYaml .Values.reporter.containerSecurityContext | nindent 12 }} - image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.reporter-tag | default .Chart.AppVersion }}" + image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.reporterTag | default .Chart.AppVersion }}" imagePullPolicy: {{ .Values.global.image.pullPolicy }} {{- if .Values.global.secretManager.enabled }} env: diff --git a/request-response/templates/worker/deployment-worker.yaml b/request-response/templates/worker/deployment-worker.yaml index ebb5c5bd..510b601d 100644 --- a/request-response/templates/worker/deployment-worker.yaml +++ b/request-response/templates/worker/deployment-worker.yaml @@ -41,7 +41,7 @@ spec: - name: {{ .Chart.Name }} securityContext: {{- toYaml .Values.worker.containerSecurityContext | nindent 12 }} - image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.worker-tag | default .Chart.AppVersion }}" + image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.workerTag | default .Chart.AppVersion }}" imagePullPolicy: {{ .Values.global.image.pullPolicy }} {{- if .Values.global.secretManager.enabled }} env: diff --git a/request-response/values.yaml b/request-response/values.yaml index bcc15788..ed796cd3 100644 --- a/request-response/values.yaml +++ b/request-response/values.yaml @@ -6,9 +6,9 @@ global: image: repository: public.ecr.aws/bisonai/orakl-core #repository url pullPolicy: IfNotPresent - listener-tag: "v0.5.0.20231115.0418.edbde75" - reporter-tag: "v0.5.0.20231115.0418.edbde75" - worker-tag: "v0.5.0.20231115.0418.edbde75" + listenerTag: "v0.5.0.20231115.0418.edbde75" + reporterTag: "v0.5.0.20231115.0418.edbde75" + workerTag: "v0.5.0.20231115.0418.edbde75" imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: [] diff --git a/vrf/templates/listener/deployment-listener.yaml b/vrf/templates/listener/deployment-listener.yaml index 5af81d7a..f2a87f7c 100644 --- a/vrf/templates/listener/deployment-listener.yaml +++ b/vrf/templates/listener/deployment-listener.yaml @@ -29,7 +29,7 @@ spec: - name: {{ .Chart.Name }} securityContext: {{- toYaml .Values.listener.containerSecurityContext | nindent 12 }} - image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.listener-tag | default .Chart.AppVersion }}" + image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.listenerTag | default .Chart.AppVersion }}" imagePullPolicy: {{ .Values.global.image.pullPolicy }} {{- if .Values.global.secretManager.enabled }} env: diff --git a/vrf/templates/reporter/deployment-reporter.yaml b/vrf/templates/reporter/deployment-reporter.yaml index d18372d5..cbce957c 100644 --- a/vrf/templates/reporter/deployment-reporter.yaml +++ b/vrf/templates/reporter/deployment-reporter.yaml @@ -41,7 +41,7 @@ spec: - name: {{ .Chart.Name }} securityContext: {{- toYaml .Values.reporter.containerSecurityContext | nindent 12 }} - image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.reporter-tag | default .Chart.AppVersion }}" + image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.reporterTag | default .Chart.AppVersion }}" imagePullPolicy: {{ .Values.global.image.pullPolicy }} {{- if .Values.global.secretManager.enabled }} env: diff --git a/vrf/templates/worker/deployment-worker.yaml b/vrf/templates/worker/deployment-worker.yaml index e58c92e5..52e56c60 100644 --- a/vrf/templates/worker/deployment-worker.yaml +++ b/vrf/templates/worker/deployment-worker.yaml @@ -41,7 +41,7 @@ spec: - name: {{ .Chart.Name }} securityContext: {{- toYaml .Values.worker.containerSecurityContext | nindent 12 }} - image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.worker-tag | default .Chart.AppVersion }}" + image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.workerTag | default .Chart.AppVersion }}" imagePullPolicy: {{ .Values.global.image.pullPolicy }} {{- if .Values.global.secretManager.enabled }} env: diff --git a/vrf/values.yaml b/vrf/values.yaml index ef573cab..2ea50fe4 100644 --- a/vrf/values.yaml +++ b/vrf/values.yaml @@ -6,9 +6,9 @@ global: image: repository: public.ecr.aws/u6t6w0e4/orakl-core #repository url pullPolicy: IfNotPresent - listener-tag: "v0.5.0.20231115.0418.edbde75" - reporter-tag: "v0.5.0.20231115.0418.edbde75" - worker-tag: "v0.5.0.20231115.0418.edbde75" + listenerTag: "v0.5.0.20231115.0418.edbde75" + reporterTag: "v0.5.0.20231115.0418.edbde75" + workerTag: "v0.5.0.20231115.0418.edbde75" imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: [] From 888965203278119caebdb0c61c4808c5559a86c4 Mon Sep 17 00:00:00 2001 From: Nick <148735107+nick-bisonai@users.noreply.github.com> Date: Mon, 11 Dec 2023 15:43:11 +0900 Subject: [PATCH 078/190] fix: update core Dockerimage file (#58) --- aggregator/Chart.yaml | 2 +- aggregator/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/aggregator/Chart.yaml b/aggregator/Chart.yaml index 22b20f71..d4797f10 100644 --- a/aggregator/Chart.yaml +++ b/aggregator/Chart.yaml @@ -21,4 +21,4 @@ version: 0.3.14 # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "v0.5.1.20231211.0351.127c944" +appVersion: "v0.5.1.20231211.0636.c10f3fc" diff --git a/aggregator/values.yaml b/aggregator/values.yaml index 545065aa..b2328297 100644 --- a/aggregator/values.yaml +++ b/aggregator/values.yaml @@ -6,7 +6,7 @@ global: image: repository: public.ecr.aws/u6t6w0e4/orakl-core #repository url pullPolicy: IfNotPresent - listenerTag: "v0.5.1.20231211.0351.127c944" + listenerTag: "v0.5.1.20231211.0636.c10f3fc" reporterTag: "v0.5.0.20231115.0418.edbde75" workerTag: "v0.5.0.20231115.0418.edbde75" imagePullPolicy: IfNotPresent From f5d13ace0acfe8fa25cee6f05c10e27b52efc086 Mon Sep 17 00:00:00 2001 From: Nick <148735107+nick-bisonai@users.noreply.github.com> Date: Mon, 11 Dec 2023 16:39:11 +0900 Subject: [PATCH 079/190] fix: update prisma version to 5.5.2 (#60) --- api/Chart.yaml | 2 +- api/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api/Chart.yaml b/api/Chart.yaml index 35dd8d1b..260f755b 100644 --- a/api/Chart.yaml +++ b/api/Chart.yaml @@ -21,4 +21,4 @@ version: 0.1.4 # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "v0.1.0.20231207.0733.00fdf29" +appVersion: "v0.1.0.20231211.0735.867d885" diff --git a/api/values.yaml b/api/values.yaml index 72232a41..2ae34089 100644 --- a/api/values.yaml +++ b/api/values.yaml @@ -4,7 +4,7 @@ global: image: repository: public.ecr.aws/bisonai/orakl-api pullPolicy: IfNotPresent - tag: "v0.1.0.20231207.0733.00fdf29" + tag: "v0.1.0.20231211.0735.867d885" imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: [] From 55a7982d440736c73ce66cdaaab067a0d33ef153 Mon Sep 17 00:00:00 2001 From: Nick <148735107+nick-bisonai@users.noreply.github.com> Date: Mon, 11 Dec 2023 19:49:36 +0900 Subject: [PATCH 080/190] fix: updates for node20 and prisma update (#61) --- delegator/Chart.yaml | 2 +- delegator/values.yaml | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/delegator/Chart.yaml b/delegator/Chart.yaml index 79bbf113..80e1bc6c 100644 --- a/delegator/Chart.yaml +++ b/delegator/Chart.yaml @@ -21,4 +21,4 @@ version: 0.1.5 # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "0.0.1" +appVersion: "v0.0.1.20231211.0735.867d885" diff --git a/delegator/values.yaml b/delegator/values.yaml index b7e5c2f5..5d40e73d 100644 --- a/delegator/values.yaml +++ b/delegator/values.yaml @@ -3,24 +3,24 @@ global: image: - repository: public.ecr.aws/bisonai/orakl-delegator #repository url + repository: public.ecr.aws/bisonai/orakl-delegator #repository url pullPolicy: IfNotPresent - tag: "v0.0.1.20230707.0137.513e9f9" + tag: "v0.0.1.20231211.0735.867d885" imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: [] secretManager: enabled: false - secretId: - versionId: + secretId: + versionId: affinity: enabled: false key: kubernetes.io/hostname - value: + value: - podAnnotations: + podAnnotations: livenessProbe: enabled: true @@ -38,7 +38,7 @@ global: periodSeconds: 5 timeoutSeconds: 1 successThreshold: 1 - failureThreshold: 5 + failureThreshold: 5 delegator: enabled: true @@ -56,7 +56,7 @@ delegator: podSecurityContext: {} containerSecurityContext: {} - + resources: limits: cpu: 500m @@ -67,4 +67,4 @@ delegator: nodeSelector: {} tolerations: [] -dotenv: {} \ No newline at end of file +dotenv: {} From 99b30df9b189b9f25822a049c91da41597ed5a0a Mon Sep 17 00:00:00 2001 From: Nick <148735107+nick-bisonai@users.noreply.github.com> Date: Thu, 14 Dec 2023 13:05:10 +0900 Subject: [PATCH 081/190] feat: implement redis store for aggregates (#62) --- api/Chart.yaml | 2 +- api/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api/Chart.yaml b/api/Chart.yaml index 260f755b..8e1955b6 100644 --- a/api/Chart.yaml +++ b/api/Chart.yaml @@ -21,4 +21,4 @@ version: 0.1.4 # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "v0.1.0.20231211.0735.867d885" +appVersion: "v0.1.0.20231213.1124.b7f0b33" diff --git a/api/values.yaml b/api/values.yaml index 2ae34089..580350aa 100644 --- a/api/values.yaml +++ b/api/values.yaml @@ -4,7 +4,7 @@ global: image: repository: public.ecr.aws/bisonai/orakl-api pullPolicy: IfNotPresent - tag: "v0.1.0.20231211.0735.867d885" + tag: "v0.1.0.20231213.1124.b7f0b33" imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: [] From 71a564112a92d491ee7c597d7abc103ee2405199 Mon Sep 17 00:00:00 2001 From: Nick <148735107+nick-bisonai@users.noreply.github.com> Date: Thu, 14 Dec 2023 13:13:37 +0900 Subject: [PATCH 082/190] add missing environment variable (#63) * fix: implement env * fix: remove double app port --- api/templates/deployment.yaml | 34 +++++++++++++++++++++++++++------- 1 file changed, 27 insertions(+), 7 deletions(-) diff --git a/api/templates/deployment.yaml b/api/templates/deployment.yaml index 038476dc..9cb45a8b 100644 --- a/api/templates/deployment.yaml +++ b/api/templates/deployment.yaml @@ -25,7 +25,7 @@ spec: serviceAccountName: {{ .Values.api.serviceAccount.name }} securityContext: {{- toYaml .Values.api.podSecurityContext | nindent 8 }} - {{- if .Values.global.affinity.enabled }} + {{- if .Values.global.affinity.enabled }} affinity: nodeAffinity: preferredDuringSchedulingIgnoredDuringExecution: @@ -36,7 +36,7 @@ spec: operator: In values: - {{ .Values.global.affinity.value }} - {{- end }} + {{- end }} containers: - name: {{ .Chart.Name }} securityContext: @@ -45,7 +45,7 @@ spec: imagePullPolicy: {{ .Values.global.image.pullPolicy }} {{- if .Values.global.secretManager.enabled }} env: - - name: DATABASE_URL + - name: DATABASE_URL valueFrom: secretKeyRef: name: orakl-api-secrets @@ -59,10 +59,20 @@ spec: valueFrom: secretKeyRef: name: orakl-api-secrets - key: APP_PORT + key: APP_PORT + - name: REDIS_HOST + valueFrom: + secretKeyRef: + name: orakl-api-secrets + key: REDIS_HOST + - name: REDIS_PORT + valueFrom: + secretKeyRef: + name: orakl-api-secrets + key: REDIS_PORT {{ else }} env: - - name: DATABASE_URL + - name: DATABASE_URL valueFrom: secretKeyRef: name: api-secrets @@ -74,6 +84,16 @@ spec: key: ENCRYPT_PASSWORD - name: APP_PORT value: "3030" + - name: REDIS_HOST + valueFrom: + secretKeyRef: + name: orakl-api-secrets + key: REDIS_HOST + - name: REDIS_PORT + valueFrom: + secretKeyRef: + name: orakl-api-secrets + key: REDIS_PORT {{ end }} command: ["yarn"] args: ["start:prod"] @@ -100,8 +120,8 @@ spec: periodSeconds: {{ .Values.global.readinessProbe.periodSeconds }} timeoutSeconds: {{ .Values.global.readinessProbe.timeoutSeconds }} successThreshold: {{ .Values.global.readinessProbe.successThreshold }} - failureThreshold: {{ .Values.global.readinessProbe.failureThreshold }} - {{- end }} + failureThreshold: {{ .Values.global.readinessProbe.failureThreshold }} + {{- end }} resources: {{- toYaml .Values.api.resources | nindent 12 }} From 8c95f91063c3c491df77b8f1552a3538ae09831e Mon Sep 17 00:00:00 2001 From: Nick <148735107+nick-bisonai@users.noreply.github.com> Date: Thu, 14 Dec 2023 13:22:27 +0900 Subject: [PATCH 083/190] fix: add secret in api-secret yaml file (#64) --- secret-store/api-secret.yaml | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/secret-store/api-secret.yaml b/secret-store/api-secret.yaml index debaddd0..dc504b74 100644 --- a/secret-store/api-secret.yaml +++ b/secret-store/api-secret.yaml @@ -8,11 +8,19 @@ spec: name: vault-backend kind: SecretStore data: - - secretKey: DATABASE_URL - remoteRef: - key: baobab/api - property: DATABASE_URL - - secretKey: ENCRYPT_PASSWORD - remoteRef: - key: baobab/api - property: ENCRYPT_PASSWORD \ No newline at end of file + - secretKey: DATABASE_URL + remoteRef: + key: baobab/api + property: DATABASE_URL + - secretKey: ENCRYPT_PASSWORD + remoteRef: + key: baobab/api + property: ENCRYPT_PASSWORD + - secretKey: REDIS_HOST + remoteRef: + key: baobab/api + property: REDIS_HOST + - secretKey: REDIS_PORT + remoteRef: + key: baobab/api + property: REDIS_PORT From 3c1b67c3201fe54dc3ca3b08f792685e11e354e1 Mon Sep 17 00:00:00 2001 From: Nick <148735107+nick-bisonai@users.noreply.github.com> Date: Thu, 14 Dec 2023 13:33:48 +0900 Subject: [PATCH 084/190] fix: fix typo (#65) --- api/templates/deployment.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/templates/deployment.yaml b/api/templates/deployment.yaml index 9cb45a8b..3447f221 100644 --- a/api/templates/deployment.yaml +++ b/api/templates/deployment.yaml @@ -87,12 +87,12 @@ spec: - name: REDIS_HOST valueFrom: secretKeyRef: - name: orakl-api-secrets + name: api-secrets key: REDIS_HOST - name: REDIS_PORT valueFrom: secretKeyRef: - name: orakl-api-secrets + name: api-secrets key: REDIS_PORT {{ end }} command: ["yarn"] From 18a01859bae3620526397781338164d1e85c5843 Mon Sep 17 00:00:00 2001 From: Nick <148735107+nick-bisonai@users.noreply.github.com> Date: Thu, 14 Dec 2023 13:57:49 +0900 Subject: [PATCH 085/190] fix: fix api route (#67) --- api/Chart.yaml | 2 +- api/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api/Chart.yaml b/api/Chart.yaml index 8e1955b6..84aadf43 100644 --- a/api/Chart.yaml +++ b/api/Chart.yaml @@ -21,4 +21,4 @@ version: 0.1.4 # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "v0.1.0.20231213.1124.b7f0b33" +appVersion: "v0.1.0.20231214.0451.cb4bd3a" diff --git a/api/values.yaml b/api/values.yaml index 580350aa..2cb66959 100644 --- a/api/values.yaml +++ b/api/values.yaml @@ -4,7 +4,7 @@ global: image: repository: public.ecr.aws/bisonai/orakl-api pullPolicy: IfNotPresent - tag: "v0.1.0.20231213.1124.b7f0b33" + tag: "v0.1.0.20231214.0451.cb4bd3a" imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: [] From 1ffd862fa2aba03644d8c129ce4f39e68eea32b1 Mon Sep 17 00:00:00 2001 From: Nick <148735107+nick-bisonai@users.noreply.github.com> Date: Thu, 14 Dec 2023 14:57:39 +0900 Subject: [PATCH 086/190] feat: reference new api call for aggregates (#68) --- aggregator/Chart.yaml | 2 +- aggregator/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/aggregator/Chart.yaml b/aggregator/Chart.yaml index d4797f10..e4eec6af 100644 --- a/aggregator/Chart.yaml +++ b/aggregator/Chart.yaml @@ -21,4 +21,4 @@ version: 0.3.14 # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "v0.5.1.20231211.0636.c10f3fc" +appVersion: "v0.5.1.20231213.0859.1c79088" diff --git a/aggregator/values.yaml b/aggregator/values.yaml index b2328297..bfff8aae 100644 --- a/aggregator/values.yaml +++ b/aggregator/values.yaml @@ -8,7 +8,7 @@ global: pullPolicy: IfNotPresent listenerTag: "v0.5.1.20231211.0636.c10f3fc" reporterTag: "v0.5.0.20231115.0418.edbde75" - workerTag: "v0.5.0.20231115.0418.edbde75" + workerTag: "v0.5.1.20231213.0859.1c79088" imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: [] From 24e3e3986b643bb7af7089e46e27d8d73fe0a828 Mon Sep 17 00:00:00 2001 From: Nick <148735107+nick-bisonai@users.noreply.github.com> Date: Thu, 14 Dec 2023 15:02:56 +0900 Subject: [PATCH 087/190] feat: deploy fetcher (#69) --- fetcher/Chart.yaml | 2 +- fetcher/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fetcher/Chart.yaml b/fetcher/Chart.yaml index 3a81eeaf..be0a684a 100644 --- a/fetcher/Chart.yaml +++ b/fetcher/Chart.yaml @@ -21,4 +21,4 @@ version: 0.1.32 # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "v0.0.1.20231122.0914.5013059" +appVersion: "v0.0.1.20231213.0859.1c79088" diff --git a/fetcher/values.yaml b/fetcher/values.yaml index 9174f6d4..c455bac2 100644 --- a/fetcher/values.yaml +++ b/fetcher/values.yaml @@ -5,7 +5,7 @@ global: image: repository: public.ecr.aws/u6t6w0e4/orakl-fetcher #repository url pullPolicy: IfNotPresent - tag: "v0.0.1.20231122.0914.5013059" + tag: "v0.0.1.20231213.0859.1c79088" imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: [] From c60ddc4848738dc156710569f846cf43f1694464 Mon Sep 17 00:00:00 2001 From: Nick <148735107+nick-bisonai@users.noreply.github.com> Date: Fri, 15 Dec 2023 15:37:35 +0900 Subject: [PATCH 088/190] feat: implement util workspace for reducer (#70) --- fetcher/Chart.yaml | 2 +- fetcher/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fetcher/Chart.yaml b/fetcher/Chart.yaml index be0a684a..700709a7 100644 --- a/fetcher/Chart.yaml +++ b/fetcher/Chart.yaml @@ -21,4 +21,4 @@ version: 0.1.32 # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "v0.0.1.20231213.0859.1c79088" +appVersion: "v0.0.1.20231215.0632.bf3889b" diff --git a/fetcher/values.yaml b/fetcher/values.yaml index c455bac2..2aea5932 100644 --- a/fetcher/values.yaml +++ b/fetcher/values.yaml @@ -5,7 +5,7 @@ global: image: repository: public.ecr.aws/u6t6w0e4/orakl-fetcher #repository url pullPolicy: IfNotPresent - tag: "v0.0.1.20231213.0859.1c79088" + tag: "v0.0.1.20231215.0632.bf3889b" imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: [] From 159288092ed913275487707de53d04f089604845 Mon Sep 17 00:00:00 2001 From: Nick <148735107+nick-bisonai@users.noreply.github.com> Date: Fri, 15 Dec 2023 15:54:10 +0900 Subject: [PATCH 089/190] feat: add util workspace reference in core (#71) --- request-response/Chart.yaml | 2 +- request-response/values.yaml | 2 +- scripts/cronjob-por.yml | 106 +++++++++++++++++------------------ 3 files changed, 55 insertions(+), 55 deletions(-) diff --git a/request-response/Chart.yaml b/request-response/Chart.yaml index 0085dd16..5387ee7b 100644 --- a/request-response/Chart.yaml +++ b/request-response/Chart.yaml @@ -21,4 +21,4 @@ version: 0.3.11 # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "0.3.4" +appVersion: "v0.5.1.20231215.0641.bf3889b" diff --git a/request-response/values.yaml b/request-response/values.yaml index ed796cd3..445a2d73 100644 --- a/request-response/values.yaml +++ b/request-response/values.yaml @@ -8,7 +8,7 @@ global: pullPolicy: IfNotPresent listenerTag: "v0.5.0.20231115.0418.edbde75" reporterTag: "v0.5.0.20231115.0418.edbde75" - workerTag: "v0.5.0.20231115.0418.edbde75" + workerTag: "v0.5.1.20231215.0641.bf3889b" imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: [] diff --git a/scripts/cronjob-por.yml b/scripts/cronjob-por.yml index f8b9b063..6076c047 100644 --- a/scripts/cronjob-por.yml +++ b/scripts/cronjob-por.yml @@ -26,56 +26,56 @@ spec: serviceAccountName: orakl-por restartPolicy: Never containers: - - name: proof-of-reserve - image: public.ecr.aws/u6t6w0e4/orakl-core:v0.5.1.20231123.0110.b3c548d - imagePullPolicy: IfNotPresent - command: ["yarn"] - args: [start:por] - env: - - name: NODE_ENV - valueFrom: - secretKeyRef: - name: aggregator-secrets - key: NODE_ENV - - name: ORAKL_NETWORK_API_URL - valueFrom: - secretKeyRef: - name: aggregator-secrets - key: ORAKL_NETWORK_API_URL - - name: ORAKL_NETWORK_DELEGATOR_URL - valueFrom: - secretKeyRef: - name: aggregator-secrets - key: ORAKL_NETWORK_DELEGATOR_URL - - name: CHAIN - valueFrom: - secretKeyRef: - name: aggregator-secrets - key: CHAIN - - name: LOG_LEVEL - valueFrom: - secretKeyRef: - name: aggregator-secrets - key: LOG_LEVEL - - name: REDIS_HOST - valueFrom: - secretKeyRef: - name: aggregator-secrets - key: REDIS_HOST - - name: REDIS_PORT - valueFrom: - secretKeyRef: - name: aggregator-secrets - key: REDIS_PORT - - name: PROVIDER_URL - valueFrom: - secretKeyRef: - name: aggregator-secrets - key: PROVIDER_URL - - name: POR_AGGREGATOR_HASH - value: "0x952f883b8d2fd47a790307cb569118a215ea45eb861cefd4ed3b83ae7550f8e8" - - name: SLACK_WEBHOOK_URL - valueFrom: - secretKeyRef: - name: aggregator-secrets - key: SLACK_WEBHOOK_URL + - name: proof-of-reserve + image: public.ecr.aws/u6t6w0e4/orakl-core:v0.5.1.20231215.0641.bf3889b + imagePullPolicy: IfNotPresent + command: ["yarn"] + args: [start:por] + env: + - name: NODE_ENV + valueFrom: + secretKeyRef: + name: aggregator-secrets + key: NODE_ENV + - name: ORAKL_NETWORK_API_URL + valueFrom: + secretKeyRef: + name: aggregator-secrets + key: ORAKL_NETWORK_API_URL + - name: ORAKL_NETWORK_DELEGATOR_URL + valueFrom: + secretKeyRef: + name: aggregator-secrets + key: ORAKL_NETWORK_DELEGATOR_URL + - name: CHAIN + valueFrom: + secretKeyRef: + name: aggregator-secrets + key: CHAIN + - name: LOG_LEVEL + valueFrom: + secretKeyRef: + name: aggregator-secrets + key: LOG_LEVEL + - name: REDIS_HOST + valueFrom: + secretKeyRef: + name: aggregator-secrets + key: REDIS_HOST + - name: REDIS_PORT + valueFrom: + secretKeyRef: + name: aggregator-secrets + key: REDIS_PORT + - name: PROVIDER_URL + valueFrom: + secretKeyRef: + name: aggregator-secrets + key: PROVIDER_URL + - name: POR_AGGREGATOR_HASH + value: "0x952f883b8d2fd47a790307cb569118a215ea45eb861cefd4ed3b83ae7550f8e8" + - name: SLACK_WEBHOOK_URL + valueFrom: + secretKeyRef: + name: aggregator-secrets + key: SLACK_WEBHOOK_URL From 0c464e09cbc8cba9158d0d444142cc3c033f4560 Mon Sep 17 00:00:00 2001 From: Martin Kersner Date: Fri, 15 Dec 2023 18:38:09 +0900 Subject: [PATCH 090/190] Boabab fetcher timeout (#73) --- fetcher/Chart.yaml | 2 +- fetcher/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fetcher/Chart.yaml b/fetcher/Chart.yaml index 700709a7..c9e4257c 100644 --- a/fetcher/Chart.yaml +++ b/fetcher/Chart.yaml @@ -21,4 +21,4 @@ version: 0.1.32 # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "v0.0.1.20231215.0632.bf3889b" +appVersion: "v0.0.1.20231215.0932.bbd20dc" diff --git a/fetcher/values.yaml b/fetcher/values.yaml index 2aea5932..4dc5927c 100644 --- a/fetcher/values.yaml +++ b/fetcher/values.yaml @@ -5,7 +5,7 @@ global: image: repository: public.ecr.aws/u6t6w0e4/orakl-fetcher #repository url pullPolicy: IfNotPresent - tag: "v0.0.1.20231215.0632.bf3889b" + tag: "v0.0.1.20231215.0932.bbd20dc" imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: [] From 11e2ada6a4ad030149b0a05d02115652fdf95596 Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Fri, 15 Dec 2023 18:46:57 +0900 Subject: [PATCH 091/190] fix: Modify health check port (#72) --- request-response/templates/listener/deployment-listener.yaml | 2 +- request-response/templates/reporter/deployment-reporter.yaml | 2 +- request-response/templates/worker/deployment-worker.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/request-response/templates/listener/deployment-listener.yaml b/request-response/templates/listener/deployment-listener.yaml index 687b0cf3..eea13c02 100644 --- a/request-response/templates/listener/deployment-listener.yaml +++ b/request-response/templates/listener/deployment-listener.yaml @@ -129,7 +129,7 @@ spec: args: [start:listener:request_response] ports: - name: healthcheck - containerPort: {{ .Values.global.config.HEALTH_CHECK_PORT | default 8080 | int }} + containerPort: 8080 - name: watchman containerPort: {{ .Values.listener.APP_PORT | default 4000 | int }} {{- if .Values.global.livenessProbe.enabled }} diff --git a/request-response/templates/reporter/deployment-reporter.yaml b/request-response/templates/reporter/deployment-reporter.yaml index a6e74f5b..17c0bd4a 100644 --- a/request-response/templates/reporter/deployment-reporter.yaml +++ b/request-response/templates/reporter/deployment-reporter.yaml @@ -135,7 +135,7 @@ spec: - name: watchman containerPort: {{ .Values.reporter.APP_PORT | default 6000 | int }} - name: healthcheck - containerPort: {{ .Values.global.config.HEALTH_CHECK_PORT | default 8080 | int }} + containerPort: 8080 {{- if .Values.global.livenessProbe.enabled }} livenessProbe: httpGet: diff --git a/request-response/templates/worker/deployment-worker.yaml b/request-response/templates/worker/deployment-worker.yaml index 510b601d..e4df4c80 100644 --- a/request-response/templates/worker/deployment-worker.yaml +++ b/request-response/templates/worker/deployment-worker.yaml @@ -130,7 +130,7 @@ spec: args: [start:worker:request_response] ports: - name: healthcheck - containerPort: {{ .Values.global.config.HEALTH_CHECK_PORT | default 8080 | int }} + containerPort: 8080 - name: watchman containerPort: {{ .Values.worker.APP_PORT | default 5000 | int }} {{- if .Values.global.livenessProbe.enabled }} From b885ee1674a705cc953563cf82dec1ebf670d87f Mon Sep 17 00:00:00 2001 From: Nick <148735107+nick-bisonai@users.noreply.github.com> Date: Mon, 18 Dec 2023 16:09:33 +0900 Subject: [PATCH 092/190] feat: deploy por updates (#76) --- scripts/cronjob-por.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/cronjob-por.yml b/scripts/cronjob-por.yml index 6076c047..ff77c6f8 100644 --- a/scripts/cronjob-por.yml +++ b/scripts/cronjob-por.yml @@ -27,11 +27,13 @@ spec: restartPolicy: Never containers: - name: proof-of-reserve - image: public.ecr.aws/u6t6w0e4/orakl-core:v0.5.1.20231215.0641.bf3889b + image: public.ecr.aws/u6t6w0e4/orakl-core:v0.5.1.20231218.0701.9afb27a imagePullPolicy: IfNotPresent command: ["yarn"] args: [start:por] env: + - name: FALLBACK_PROVIDER_URL + value: "https://public-en-baobab.klaytn.net" - name: NODE_ENV valueFrom: secretKeyRef: From 477654d5187fdf76d834335b7f3698b0258b68d3 Mon Sep 17 00:00:00 2001 From: Nick <148735107+nick-bisonai@users.noreply.github.com> Date: Wed, 20 Dec 2023 16:35:54 +0900 Subject: [PATCH 093/190] feat: implement queue optimization based on roundId (#81) --- aggregator/Chart.yaml | 2 +- aggregator/values.yaml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/aggregator/Chart.yaml b/aggregator/Chart.yaml index e4eec6af..e8d99757 100644 --- a/aggregator/Chart.yaml +++ b/aggregator/Chart.yaml @@ -21,4 +21,4 @@ version: 0.3.14 # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "v0.5.1.20231213.0859.1c79088" +appVersion: "v0.5.1.20231220.0727.cf19e5e" diff --git a/aggregator/values.yaml b/aggregator/values.yaml index bfff8aae..585adc46 100644 --- a/aggregator/values.yaml +++ b/aggregator/values.yaml @@ -6,9 +6,9 @@ global: image: repository: public.ecr.aws/u6t6w0e4/orakl-core #repository url pullPolicy: IfNotPresent - listenerTag: "v0.5.1.20231211.0636.c10f3fc" - reporterTag: "v0.5.0.20231115.0418.edbde75" - workerTag: "v0.5.1.20231213.0859.1c79088" + listenerTag: "v0.5.1.20231220.0727.cf19e5e" + reporterTag: "v0.5.1.20231220.0727.cf19e5e" + workerTag: "v0.5.1.20231220.0727.cf19e5e" imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: [] From 0d4046505b4417978eea041dca6ea6634919b8d9 Mon Sep 17 00:00:00 2001 From: Nick <148735107+nick-bisonai@users.noreply.github.com> Date: Wed, 20 Dec 2023 16:59:07 +0900 Subject: [PATCH 094/190] rollback (#83) --- aggregator/Chart.yaml | 2 +- aggregator/values.yaml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/aggregator/Chart.yaml b/aggregator/Chart.yaml index e8d99757..e4eec6af 100644 --- a/aggregator/Chart.yaml +++ b/aggregator/Chart.yaml @@ -21,4 +21,4 @@ version: 0.3.14 # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "v0.5.1.20231220.0727.cf19e5e" +appVersion: "v0.5.1.20231213.0859.1c79088" diff --git a/aggregator/values.yaml b/aggregator/values.yaml index 585adc46..bfff8aae 100644 --- a/aggregator/values.yaml +++ b/aggregator/values.yaml @@ -6,9 +6,9 @@ global: image: repository: public.ecr.aws/u6t6w0e4/orakl-core #repository url pullPolicy: IfNotPresent - listenerTag: "v0.5.1.20231220.0727.cf19e5e" - reporterTag: "v0.5.1.20231220.0727.cf19e5e" - workerTag: "v0.5.1.20231220.0727.cf19e5e" + listenerTag: "v0.5.1.20231211.0636.c10f3fc" + reporterTag: "v0.5.0.20231115.0418.edbde75" + workerTag: "v0.5.1.20231213.0859.1c79088" imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: [] From 053de465a3e3dc7dffdfdf3b2b686211f3fc0259 Mon Sep 17 00:00:00 2001 From: Nick <148735107+nick-bisonai@users.noreply.github.com> Date: Wed, 20 Dec 2023 17:50:41 +0900 Subject: [PATCH 095/190] feat: implement obliterate & roundId optimization (#84) --- aggregator/Chart.yaml | 2 +- aggregator/values.yaml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/aggregator/Chart.yaml b/aggregator/Chart.yaml index e4eec6af..e5a97a1e 100644 --- a/aggregator/Chart.yaml +++ b/aggregator/Chart.yaml @@ -21,4 +21,4 @@ version: 0.3.14 # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "v0.5.1.20231213.0859.1c79088" +appVersion: "v0.5.1.20231220.0844.dc89a0f" diff --git a/aggregator/values.yaml b/aggregator/values.yaml index bfff8aae..d38fc695 100644 --- a/aggregator/values.yaml +++ b/aggregator/values.yaml @@ -6,9 +6,9 @@ global: image: repository: public.ecr.aws/u6t6w0e4/orakl-core #repository url pullPolicy: IfNotPresent - listenerTag: "v0.5.1.20231211.0636.c10f3fc" - reporterTag: "v0.5.0.20231115.0418.edbde75" - workerTag: "v0.5.1.20231213.0859.1c79088" + listenerTag: "v0.5.1.20231220.0844.dc89a0f" + reporterTag: "v0.5.1.20231220.0844.dc89a0f" + workerTag: "v0.5.1.20231220.0844.dc89a0f" imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: [] From dcee3caafc03edf7aac871fa271c46786f7623d4 Mon Sep 17 00:00:00 2001 From: Nick <148735107+nick-bisonai@users.noreply.github.com> Date: Wed, 20 Dec 2023 18:35:34 +0900 Subject: [PATCH 096/190] fix: rollback roundId (#85) --- aggregator/Chart.yaml | 2 +- aggregator/values.yaml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/aggregator/Chart.yaml b/aggregator/Chart.yaml index e5a97a1e..19fc1768 100644 --- a/aggregator/Chart.yaml +++ b/aggregator/Chart.yaml @@ -21,4 +21,4 @@ version: 0.3.14 # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "v0.5.1.20231220.0844.dc89a0f" +appVersion: "v0.5.1.20231219.0456.32e974c" diff --git a/aggregator/values.yaml b/aggregator/values.yaml index d38fc695..3c9203c4 100644 --- a/aggregator/values.yaml +++ b/aggregator/values.yaml @@ -6,9 +6,9 @@ global: image: repository: public.ecr.aws/u6t6w0e4/orakl-core #repository url pullPolicy: IfNotPresent - listenerTag: "v0.5.1.20231220.0844.dc89a0f" - reporterTag: "v0.5.1.20231220.0844.dc89a0f" - workerTag: "v0.5.1.20231220.0844.dc89a0f" + listenerTag: "v0.5.1.20231219.0456.32e974c" + reporterTag: "v0.5.1.20231219.0456.32e974c" + workerTag: "v0.5.1.20231219.0456.32e974c" imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: [] From 8011c6ad2cf9978585eb87276c456ccaa584ea44 Mon Sep 17 00:00:00 2001 From: Nick <148735107+nick-bisonai@users.noreply.github.com> Date: Thu, 21 Dec 2023 11:20:11 +0900 Subject: [PATCH 097/190] fix: rollback (#90) --- aggregator/Chart.yaml | 2 +- aggregator/values.yaml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/aggregator/Chart.yaml b/aggregator/Chart.yaml index 19fc1768..723de7fd 100644 --- a/aggregator/Chart.yaml +++ b/aggregator/Chart.yaml @@ -21,4 +21,4 @@ version: 0.3.14 # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "v0.5.1.20231219.0456.32e974c" +appVersion: "v0.5.1.20231221.0205.5ff1278" diff --git a/aggregator/values.yaml b/aggregator/values.yaml index 3c9203c4..b963d30a 100644 --- a/aggregator/values.yaml +++ b/aggregator/values.yaml @@ -6,9 +6,9 @@ global: image: repository: public.ecr.aws/u6t6w0e4/orakl-core #repository url pullPolicy: IfNotPresent - listenerTag: "v0.5.1.20231219.0456.32e974c" - reporterTag: "v0.5.1.20231219.0456.32e974c" - workerTag: "v0.5.1.20231219.0456.32e974c" + listenerTag: "v0.5.1.20231221.0205.5ff1278" + reporterTag: "v0.5.1.20231221.0205.5ff1278" + workerTag: "v0.5.1.20231221.0205.5ff1278" imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: [] From 3bfa63898bb74f8bbeefc791d905b6d92d3ef0b2 Mon Sep 17 00:00:00 2001 From: Nick <148735107+nick-bisonai@users.noreply.github.com> Date: Fri, 22 Dec 2023 12:06:45 +0900 Subject: [PATCH 098/190] feat: implement queue obliterate on start (#91) --- fetcher/Chart.yaml | 2 +- fetcher/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fetcher/Chart.yaml b/fetcher/Chart.yaml index c9e4257c..8f2f3a67 100644 --- a/fetcher/Chart.yaml +++ b/fetcher/Chart.yaml @@ -21,4 +21,4 @@ version: 0.1.32 # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "v0.0.1.20231215.0932.bbd20dc" +appVersion: "v0.0.1.20231221.0248.5ff1278" diff --git a/fetcher/values.yaml b/fetcher/values.yaml index 4dc5927c..bee1062a 100644 --- a/fetcher/values.yaml +++ b/fetcher/values.yaml @@ -5,7 +5,7 @@ global: image: repository: public.ecr.aws/u6t6w0e4/orakl-fetcher #repository url pullPolicy: IfNotPresent - tag: "v0.0.1.20231215.0932.bbd20dc" + tag: "v0.0.1.20231221.0248.5ff1278" imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: [] From f5c4ff3e37ee11b8bd9465df19b07dc211d5502b Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Wed, 27 Dec 2023 17:48:08 +0900 Subject: [PATCH 099/190] (BAOBAB) Update Bisontry services (#98) * feat: Add bisontry-daily-report * feat: Change docker registry to use GCP * feat: Update bisonty services * feat: Update secret to match the changed env * fix: Correcting `imagePullSecrets` of bisontry --- bisontry-balance-checker/Chart.yaml | 2 +- .../templates/deployment.yaml | 2 +- bisontry-balance-checker/values.yaml | 4 +- bisontry-daily-report/Chart.yaml | 5 ++ .../templates/deployment.yaml | 23 ++++++ bisontry-daily-report/values.yaml | 8 ++ bisontry-event-checker/Chart.yaml | 2 +- .../templates/deployment.yaml | 2 +- bisontry-event-checker/values.yaml | 4 +- bisontry-health-checker/Chart.yaml | 2 +- .../templates/deployment.yaml | 2 +- bisontry-health-checker/values.yaml | 4 +- .../bisontry-daily-report-secret.yaml | 78 +++++++++++++++++++ .../bisontry-health-checker-secret.yaml | 4 + 14 files changed, 130 insertions(+), 12 deletions(-) create mode 100644 bisontry-daily-report/Chart.yaml create mode 100644 bisontry-daily-report/templates/deployment.yaml create mode 100644 bisontry-daily-report/values.yaml create mode 100644 secret-store/bisontry-daily-report-secret.yaml diff --git a/bisontry-balance-checker/Chart.yaml b/bisontry-balance-checker/Chart.yaml index 250afaed..fdceb7e3 100644 --- a/bisontry-balance-checker/Chart.yaml +++ b/bisontry-balance-checker/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v2 name: bisontry-balance-checker description: Bisontry Balance Checker service. version: 0.1.0 -appVersion: 1.0.0 +appVersion: v0.1.0.20231211.1601.c259821 diff --git a/bisontry-balance-checker/templates/deployment.yaml b/bisontry-balance-checker/templates/deployment.yaml index b79f049f..0ffdb841 100644 --- a/bisontry-balance-checker/templates/deployment.yaml +++ b/bisontry-balance-checker/templates/deployment.yaml @@ -13,7 +13,7 @@ spec: app: {{ .Values.deployment.name }} spec: imagePullSecrets: - - name: bisontry-ecr-secret + - name: bisontry-gar-json-key containers: - name: {{ .Values.deployment.name }} image: {{ .Values.image.repository }}:{{ .Values.image.tag }} diff --git a/bisontry-balance-checker/values.yaml b/bisontry-balance-checker/values.yaml index 2a7079d1..950270cf 100644 --- a/bisontry-balance-checker/values.yaml +++ b/bisontry-balance-checker/values.yaml @@ -1,6 +1,6 @@ image: - repository: 831311642255.dkr.ecr.ap-southeast-1.amazonaws.com/bisontry-balance-checker - tag: v0.1.0.20230831.0149.4809042 + repository: asia-southeast1-docker.pkg.dev/bisontry/bisontry/bisontry-balance-checker + tag: v0.1.0.20231211.1601.c259821 deployment: name: bisontry-balance-checker diff --git a/bisontry-daily-report/Chart.yaml b/bisontry-daily-report/Chart.yaml new file mode 100644 index 00000000..5c590a05 --- /dev/null +++ b/bisontry-daily-report/Chart.yaml @@ -0,0 +1,5 @@ +apiVersion: v2 +name: bisontry-daily-report +description: Bisontry Daily Report service. +version: 0.1.0 +appVersion: v0.1.0.20231219.0733.2bb7b86 diff --git a/bisontry-daily-report/templates/deployment.yaml b/bisontry-daily-report/templates/deployment.yaml new file mode 100644 index 00000000..0ffdb841 --- /dev/null +++ b/bisontry-daily-report/templates/deployment.yaml @@ -0,0 +1,23 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ .Values.deployment.name }} +spec: + replicas: {{ .Values.deployment.replicas }} + selector: + matchLabels: + app: {{ .Values.deployment.name }} + template: + metadata: + labels: + app: {{ .Values.deployment.name }} + spec: + imagePullSecrets: + - name: bisontry-gar-json-key + containers: + - name: {{ .Values.deployment.name }} + image: {{ .Values.image.repository }}:{{ .Values.image.tag }} + imagePullPolicy: Always + envFrom: + - secretRef: + name: {{ .Values.deployment.name }}-secrets diff --git a/bisontry-daily-report/values.yaml b/bisontry-daily-report/values.yaml new file mode 100644 index 00000000..9995e7de --- /dev/null +++ b/bisontry-daily-report/values.yaml @@ -0,0 +1,8 @@ +image: + repository: asia-southeast1-docker.pkg.dev/bisontry/bisontry/bisontry-daily-report + tag: v0.1.0.20231219.0733.2bb7b86 + +deployment: + name: bisontry-daily-report + replicas: 1 + resources: diff --git a/bisontry-event-checker/Chart.yaml b/bisontry-event-checker/Chart.yaml index ff318be5..f207b223 100644 --- a/bisontry-event-checker/Chart.yaml +++ b/bisontry-event-checker/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v2 name: bisontry-event-checker description: Bisontry Event Checker service. version: 0.1.0 -appVersion: 1.0.0 +appVersion: v0.0.1.20231219.0733.2bb7b86 diff --git a/bisontry-event-checker/templates/deployment.yaml b/bisontry-event-checker/templates/deployment.yaml index b79f049f..0ffdb841 100644 --- a/bisontry-event-checker/templates/deployment.yaml +++ b/bisontry-event-checker/templates/deployment.yaml @@ -13,7 +13,7 @@ spec: app: {{ .Values.deployment.name }} spec: imagePullSecrets: - - name: bisontry-ecr-secret + - name: bisontry-gar-json-key containers: - name: {{ .Values.deployment.name }} image: {{ .Values.image.repository }}:{{ .Values.image.tag }} diff --git a/bisontry-event-checker/values.yaml b/bisontry-event-checker/values.yaml index 95c49d3a..e1854957 100644 --- a/bisontry-event-checker/values.yaml +++ b/bisontry-event-checker/values.yaml @@ -1,6 +1,6 @@ image: - repository: 831311642255.dkr.ecr.ap-southeast-1.amazonaws.com/bisontry-event-checker - tag: v0.0.1.20230831.0828.a7e82bc + repository: asia-southeast1-docker.pkg.dev/bisontry/bisontry/bisontry-event-checker + tag: v0.0.1.20231219.0733.2bb7b86 deployment: name: bisontry-event-checker diff --git a/bisontry-health-checker/Chart.yaml b/bisontry-health-checker/Chart.yaml index 2c71e241..b52e3943 100644 --- a/bisontry-health-checker/Chart.yaml +++ b/bisontry-health-checker/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v2 name: bisontry-health-checker description: Bisontry Health Checker service. version: 0.1.0 -appVersion: 1.0.0 +appVersion: v0.1.0.20231219.0733.2bb7b86 diff --git a/bisontry-health-checker/templates/deployment.yaml b/bisontry-health-checker/templates/deployment.yaml index b79f049f..0ffdb841 100644 --- a/bisontry-health-checker/templates/deployment.yaml +++ b/bisontry-health-checker/templates/deployment.yaml @@ -13,7 +13,7 @@ spec: app: {{ .Values.deployment.name }} spec: imagePullSecrets: - - name: bisontry-ecr-secret + - name: bisontry-gar-json-key containers: - name: {{ .Values.deployment.name }} image: {{ .Values.image.repository }}:{{ .Values.image.tag }} diff --git a/bisontry-health-checker/values.yaml b/bisontry-health-checker/values.yaml index f36fd963..a54b37f3 100644 --- a/bisontry-health-checker/values.yaml +++ b/bisontry-health-checker/values.yaml @@ -1,6 +1,6 @@ image: - repository: 831311642255.dkr.ecr.ap-southeast-1.amazonaws.com/bisontry-health-checker - tag: v0.1.0.20230907.0539.ac90199 + repository: asia-southeast1-docker.pkg.dev/bisontry/bisontry/bisontry-health-checker + tag: v0.1.0.20231219.0733.2bb7b86 deployment: name: bisontry-health-checker diff --git a/secret-store/bisontry-daily-report-secret.yaml b/secret-store/bisontry-daily-report-secret.yaml new file mode 100644 index 00000000..1f1bca39 --- /dev/null +++ b/secret-store/bisontry-daily-report-secret.yaml @@ -0,0 +1,78 @@ +apiVersion: external-secrets.io/v1beta1 +kind: ExternalSecret +metadata: + name: bisontry-daily-report-secrets +spec: + refreshInterval: "15s" + secretStoreRef: + name: vault-backend + kind: SecretStore + data: + - secretKey: COMPANY + remoteRef: + key: baobab/bisontry-daily-report + property: COMPANY + - secretKey: OPERATOR + remoteRef: + key: baobab/bisontry-daily-report + property: OPERATOR + - secretKey: SYSTEM + remoteRef: + key: baobab/bisontry-daily-report + property: SYSTEM + - secretKey: NODE_ENV + remoteRef: + key: baobab/bisontry-daily-report + property: NODE_ENV + - secretKey: NETWORK + remoteRef: + key: baobab/bisontry-daily-report + property: NETWORK + - secretKey: MESSENGER_ENDPOINT + remoteRef: + key: baobab/bisontry-daily-report + property: MESSENGER_ENDPOINT + - secretKey: MONITOR_POSTGRES_USER + remoteRef: + key: baobab/bisontry-daily-report + property: MONITOR_POSTGRES_USER + - secretKey: MONITOR_POSTGRES_HOST + remoteRef: + key: baobab/bisontry-daily-report + property: MONITOR_POSTGRES_HOST + - secretKey: MONITOR_POSTGRES_DATABASE + remoteRef: + key: baobab/bisontry-daily-report + property: MONITOR_POSTGRES_DATABASE + - secretKey: MONITOR_POSTGRES_PASSWORD + remoteRef: + key: baobab/bisontry-daily-report + property: MONITOR_POSTGRES_PASSWORD + - secretKey: MONITOR_POSTGRES_PORT + remoteRef: + key: baobab/bisontry-daily-report + property: MONITOR_POSTGRES_PORT + - secretKey: GRAPHNODE_POSTGRES_USER + remoteRef: + key: baobab/bisontry-daily-report + property: GRAPHNODE_POSTGRES_USER + - secretKey: GRAPHNODE_POSTGRES_HOST + remoteRef: + key: baobab/bisontry-daily-report + property: GRAPHNODE_POSTGRES_HOST + - secretKey: GRAPHNODE_POSTGRES_DATABASE + remoteRef: + key: baobab/bisontry-daily-report + property: GRAPHNODE_POSTGRES_DATABASE + - secretKey: GRAPHNODE_POSTGRES_PASSWORD + remoteRef: + key: baobab/bisontry-daily-report + property: GRAPHNODE_POSTGRES_PASSWORD + - secretKey: GRAPHNODE_POSTGRES_PORT + remoteRef: + key: baobab/bisontry-daily-report + property: GRAPHNODE_POSTGRES_PORT + - secretKey: PROVIDER + remoteRef: + key: baobab/bisontry-daily-report + property: PROVIDER \ No newline at end of file diff --git a/secret-store/bisontry-health-checker-secret.yaml b/secret-store/bisontry-health-checker-secret.yaml index ffae1ca4..41033804 100644 --- a/secret-store/bisontry-health-checker-secret.yaml +++ b/secret-store/bisontry-health-checker-secret.yaml @@ -32,3 +32,7 @@ spec: remoteRef: key: baobab/bisontry-health-checker property: SYSTEM + - secretKey: NODE_ADDRESS + remoteRef: + key: baobab/bisontry-health-checker + property: NODE_ADDRESS From 3e0647f52c3e3d27ae188c03e8c9571534ebc325 Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Thu, 28 Dec 2023 21:45:50 +0900 Subject: [PATCH 100/190] (BAOBAB) Fix bisontry-balance-checker is not working (#100) * feat: Update tag of balance-checker --- bisontry-balance-checker/Chart.yaml | 2 +- bisontry-balance-checker/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bisontry-balance-checker/Chart.yaml b/bisontry-balance-checker/Chart.yaml index fdceb7e3..9ab47248 100644 --- a/bisontry-balance-checker/Chart.yaml +++ b/bisontry-balance-checker/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v2 name: bisontry-balance-checker description: Bisontry Balance Checker service. version: 0.1.0 -appVersion: v0.1.0.20231211.1601.c259821 +appVersion: v0.1.0.20231228.2125.41dd762 diff --git a/bisontry-balance-checker/values.yaml b/bisontry-balance-checker/values.yaml index 950270cf..43f4ad89 100644 --- a/bisontry-balance-checker/values.yaml +++ b/bisontry-balance-checker/values.yaml @@ -1,6 +1,6 @@ image: repository: asia-southeast1-docker.pkg.dev/bisontry/bisontry/bisontry-balance-checker - tag: v0.1.0.20231211.1601.c259821 + tag: v0.1.0.20231228.2125.41dd762 deployment: name: bisontry-balance-checker From 0808416211f0cb8c93a260279d91d5c13d217921 Mon Sep 17 00:00:00 2001 From: Nick <148735107+nick-bisonai@users.noreply.github.com> Date: Mon, 15 Jan 2024 10:04:21 +0700 Subject: [PATCH 101/190] (Baobab) Deploy new grafana version (#110) * feat: deploy new grafana version * feat: update appVersion, add environment variable --- monitor-api/Chart.yaml | 2 +- monitor-api/templates/deployment.yaml | 11 +++++++---- monitor-api/values.yaml | 4 ++-- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/monitor-api/Chart.yaml b/monitor-api/Chart.yaml index d9a0c9e8..4a77cd08 100644 --- a/monitor-api/Chart.yaml +++ b/monitor-api/Chart.yaml @@ -21,4 +21,4 @@ version: 0.1.5 # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "0.1.0" +appVersion: "monitor.v1.0.0.20240111.0801.044e1af" diff --git a/monitor-api/templates/deployment.yaml b/monitor-api/templates/deployment.yaml index 832f4159..845f2ec9 100644 --- a/monitor-api/templates/deployment.yaml +++ b/monitor-api/templates/deployment.yaml @@ -25,7 +25,7 @@ spec: serviceAccountName: {{ .Values.monitorApi.serviceAccount.name }} securityContext: {{- toYaml .Values.monitorApi.podSecurityContext | nindent 8 }} - {{- if .Values.global.affinity.enabled }} + {{- if .Values.global.affinity.enabled }} affinity: nodeAffinity: preferredDuringSchedulingIgnoredDuringExecution: @@ -36,7 +36,7 @@ spec: operator: In values: - {{ .Values.global.affinity.value }} - {{- end }} + {{- end }} containers: - name: {{ .Chart.Name }} securityContext: @@ -46,6 +46,9 @@ spec: envFrom: - secretRef: name: monitor-secrets + env: + - name: NETWORK + value: "baobab" command: ["yarn"] args: ["start:prod"] ports: @@ -71,8 +74,8 @@ spec: periodSeconds: {{ .Values.global.readinessProbe.periodSeconds }} timeoutSeconds: {{ .Values.global.readinessProbe.timeoutSeconds }} successThreshold: {{ .Values.global.readinessProbe.successThreshold }} - failureThreshold: {{ .Values.global.readinessProbe.failureThreshold }} - {{- end }} + failureThreshold: {{ .Values.global.readinessProbe.failureThreshold }} + {{- end }} resources: {{- toYaml .Values.monitorApi.resources | nindent 12 }} diff --git a/monitor-api/values.yaml b/monitor-api/values.yaml index 70a973cd..8173937a 100644 --- a/monitor-api/values.yaml +++ b/monitor-api/values.yaml @@ -2,9 +2,9 @@ ## created by Bisonai global: image: - repository: public.ecr.aws/bisonai/orakl-general #repository url + repository: public.ecr.aws/bisonai/orakl-grafana #repository url pullPolicy: IfNotPresent - tag: "monitor.v.20230905.0521.48fdf0a" + tag: "monitor.v1.0.0.20240111.0801.044e1af" imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: [] From 6dda41b9d146353cfb988f5203c6216b0b73a10a Mon Sep 17 00:00:00 2001 From: Nick <148735107+nick-bisonai@users.noreply.github.com> Date: Tue, 16 Jan 2024 10:27:21 +0700 Subject: [PATCH 102/190] fix: rollback wrong pr (#111) --- monitor-api/Chart.yaml | 2 +- monitor-api/templates/deployment.yaml | 3 --- monitor-api/values.yaml | 4 ++-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/monitor-api/Chart.yaml b/monitor-api/Chart.yaml index 4a77cd08..d9a0c9e8 100644 --- a/monitor-api/Chart.yaml +++ b/monitor-api/Chart.yaml @@ -21,4 +21,4 @@ version: 0.1.5 # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "monitor.v1.0.0.20240111.0801.044e1af" +appVersion: "0.1.0" diff --git a/monitor-api/templates/deployment.yaml b/monitor-api/templates/deployment.yaml index 845f2ec9..8800dfab 100644 --- a/monitor-api/templates/deployment.yaml +++ b/monitor-api/templates/deployment.yaml @@ -46,9 +46,6 @@ spec: envFrom: - secretRef: name: monitor-secrets - env: - - name: NETWORK - value: "baobab" command: ["yarn"] args: ["start:prod"] ports: diff --git a/monitor-api/values.yaml b/monitor-api/values.yaml index 8173937a..70a973cd 100644 --- a/monitor-api/values.yaml +++ b/monitor-api/values.yaml @@ -2,9 +2,9 @@ ## created by Bisonai global: image: - repository: public.ecr.aws/bisonai/orakl-grafana #repository url + repository: public.ecr.aws/bisonai/orakl-general #repository url pullPolicy: IfNotPresent - tag: "monitor.v1.0.0.20240111.0801.044e1af" + tag: "monitor.v.20230905.0521.48fdf0a" imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: [] From 23f579f4676176954f61a0535dafd6fc447e64e2 Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Tue, 16 Jan 2024 12:52:26 +0900 Subject: [PATCH 103/190] (BAOBAB) Deploy `orakl-grafana` (#112) * feat: Add `grafana-as-code` service * feat: Add app to ArgoCD * feat: Add environment variable for anonymous authentication --- grafana-as-code/Chart.yaml | 6 ++++++ grafana-as-code/templates/deployment.yaml | 19 +++++++++++++++++++ grafana-as-code/values.yaml | 17 +++++++++++++++++ manifest/argocd/baobab/grafana-as-code.yaml | 15 +++++++++++++++ 4 files changed, 57 insertions(+) create mode 100644 grafana-as-code/Chart.yaml create mode 100644 grafana-as-code/templates/deployment.yaml create mode 100644 grafana-as-code/values.yaml create mode 100644 manifest/argocd/baobab/grafana-as-code.yaml diff --git a/grafana-as-code/Chart.yaml b/grafana-as-code/Chart.yaml new file mode 100644 index 00000000..468d2bf9 --- /dev/null +++ b/grafana-as-code/Chart.yaml @@ -0,0 +1,6 @@ +apiVersion: v2 +name: orakl-grafana-as-code +description: A Grafana dashboard made by code +type: application +version: 0.1.0 +appVersion: "monitor.v1.0.0.20240111.0801.044e1af" diff --git a/grafana-as-code/templates/deployment.yaml b/grafana-as-code/templates/deployment.yaml new file mode 100644 index 00000000..9f7a157d --- /dev/null +++ b/grafana-as-code/templates/deployment.yaml @@ -0,0 +1,19 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ .Values.deployment.name }} +spec: + replicas: {{ .Values.deployment.replicas }} + selector: + matchLabels: + app: {{ .Values.deployment.name }} + template: + metadata: + labels: + app: {{ .Values.deployment.name }} + spec: + containers: + - name: {{ .Values.deployment.name }} + image: {{ .Values.image.repository }}:{{ .Values.image.tag }} + imagePullPolicy: Always + env: {{- toYaml .Values.env | nindent 12 }} diff --git a/grafana-as-code/values.yaml b/grafana-as-code/values.yaml new file mode 100644 index 00000000..c2dd4db1 --- /dev/null +++ b/grafana-as-code/values.yaml @@ -0,0 +1,17 @@ +image: + repository: public.ecr.aws/bisonai/orakl-grafana #repository url + pullPolicy: IfNotPresent + tag: "monitor.v1.0.0.20240111.0801.044e1af" + imagePullPolicy: IfNotPresent + # -- If defined, uses a Secret to pull an image from a private Docker registry or repository + imagePullSecrets: [] + +deployment: + name: orakl-grafana-as-code + replicas: 1 + +env: + - name: NETWORK + value: "baobab" + - name: GF_AUTH_ANONYMOUS_ENABLED + value: "true" \ No newline at end of file diff --git a/manifest/argocd/baobab/grafana-as-code.yaml b/manifest/argocd/baobab/grafana-as-code.yaml new file mode 100644 index 00000000..feb61963 --- /dev/null +++ b/manifest/argocd/baobab/grafana-as-code.yaml @@ -0,0 +1,15 @@ +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: grafana-as-code + namespace: argocd +spec: + destination: + namespace: orakl + server: https://kubernetes.default.svc + project: default + source: + path: grafana-as-code/ + repoURL: https://github.com/Bisonai/orakl-helm-charts.git + targetRevision: gcp-baobab-prod + syncPolicy: {} From 6faed65f62591935c6b76a7aff8f6db4eecbc7ab Mon Sep 17 00:00:00 2001 From: Nick <148735107+nick-bisonai@users.noreply.github.com> Date: Tue, 16 Jan 2024 14:10:57 +0700 Subject: [PATCH 104/190] Setup vault for grafana as code (#113) * fix: add vault secret keys * feat: add secret-store settings --- grafana-as-code/templates/deployment.yaml | 28 ++++++++++++++++++++++- grafana-as-code/values.yaml | 6 ----- secret-store/grafana-as-code-secret.yaml | 26 +++++++++++++++++++++ 3 files changed, 53 insertions(+), 7 deletions(-) create mode 100644 secret-store/grafana-as-code-secret.yaml diff --git a/grafana-as-code/templates/deployment.yaml b/grafana-as-code/templates/deployment.yaml index 9f7a157d..9c9d5f3d 100644 --- a/grafana-as-code/templates/deployment.yaml +++ b/grafana-as-code/templates/deployment.yaml @@ -16,4 +16,30 @@ spec: - name: {{ .Values.deployment.name }} image: {{ .Values.image.repository }}:{{ .Values.image.tag }} imagePullPolicy: Always - env: {{- toYaml .Values.env | nindent 12 }} + env: + - name: BAOBAB_DELEGATOR_DB_PW + valueFrom: + secretKeyRef: + name: grafana-as-code-secrets + key: BAOBAB_DELEGATOR_DB_PW + - name: BAOBAB_GRAPHNODE_DB_PW + valueFrom: + secretKeyRef: + name: grafana-as-code-secrets + key: BAOBAB_GRAPHNODE_DB_PW + - name: BAOBAB_MAIN_DB_PW + valueFrom: + secretKeyRef: + name: grafana-as-code-secrets + key: BAOBAB_MAIN_DB_PW + - name: BAOBAB_MONITOR_DB_PW + valueFrom: + secretKeyRef: + name: grafana-as-code-secrets + key: BAOBAB_MONITOR_DB_PW + - name: NETWORK + value: "baobab" + - name: GF_AUTH_ANONYMOUS_ENABLED + value: "true" + + diff --git a/grafana-as-code/values.yaml b/grafana-as-code/values.yaml index c2dd4db1..d4de29d7 100644 --- a/grafana-as-code/values.yaml +++ b/grafana-as-code/values.yaml @@ -9,9 +9,3 @@ image: deployment: name: orakl-grafana-as-code replicas: 1 - -env: - - name: NETWORK - value: "baobab" - - name: GF_AUTH_ANONYMOUS_ENABLED - value: "true" \ No newline at end of file diff --git a/secret-store/grafana-as-code-secret.yaml b/secret-store/grafana-as-code-secret.yaml new file mode 100644 index 00000000..73ef244e --- /dev/null +++ b/secret-store/grafana-as-code-secret.yaml @@ -0,0 +1,26 @@ +apiVersion: external-secrets.io/v1beta1 +kind: ExternalSecret +metadata: + name: grafana-as-code-secrets +spec: + refreshInterval: "15s" + secretStoreRef: + name: vault-backend + kind: SecretStore + data: + - secretKey: BAOBAB_DELEGATOR_DB_PW + remoteRef: + key: baobab/grafana-as-code + property: BAOBAB_DELEGATOR_DB_PW + - secretKey: BAOBAB_GRAPHNODE_DB_PW + remoteRef: + key: baobab/grafana-as-code + property: BAOBAB_GRAPHNODE_DB_PW + - secretKey: BAOBAB_MAIN_DB_PW + remoteRef: + key: baobab/grafana-as-code + property: BAOBAB_MAIN_DB_PW + - secretKey: BAOBAB_MONITOR_DB_PW + remoteRef: + key: baobab/grafana-as-code + property: BAOBAB_MONITOR_DB_PW From 397a4f1aef0aa6809ac82f9c11883cb028170da1 Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Wed, 17 Jan 2024 14:38:47 +0900 Subject: [PATCH 105/190] (BAOBAB) Update image tag of pods that can't started. (#116) * feat: Update tag of CLI * feat: Update LRW tag of RR * feat: Update LWR tag of VRF * feat: Update image tag of PoR --- cli/Chart.yaml | 2 +- cli/values.yaml | 14 +++++++------- request-response/values.yaml | 6 +++--- scripts/cronjob-por.yml | 2 +- vrf/values.yaml | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/cli/Chart.yaml b/cli/Chart.yaml index 5d984531..d15a9068 100644 --- a/cli/Chart.yaml +++ b/cli/Chart.yaml @@ -3,4 +3,4 @@ name: orakl-cli description: A Helm chart for Kubernetes type: application version: 0.1.2 -appVersion: "0.6.0" +appVersion: "v0.6.0.20231229.0312.9433d53" diff --git a/cli/values.yaml b/cli/values.yaml index 15c5dca1..068170b1 100644 --- a/cli/values.yaml +++ b/cli/values.yaml @@ -5,17 +5,17 @@ global: image: repository: public.ecr.aws/u6t6w0e4/orakl-cli pullPolicy: IfNotPresent - tag: "v0.6.0.20230920.0750.99c4cdd" + tag: "v0.6.0.20231229.0312.9433d53" imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: [] secretManager: enabled: false - secretId: - versionId: + secretId: + versionId: - hostPath: + hostPath: enable: false volumes: @@ -24,7 +24,7 @@ global: affinity: enabled: false key: kubernetes.io/hostname - value: + value: podAnnotations: {} @@ -42,7 +42,7 @@ global: periodSeconds: 5 timeoutSeconds: 1 successThreshold: 1 - failureThreshold: 5 + failureThreshold: 5 cli: enabled: true @@ -60,7 +60,7 @@ cli: podSecurityContext: {} containerSecurityContext: {} - + resources: limits: cpu: 400m diff --git a/request-response/values.yaml b/request-response/values.yaml index 445a2d73..4e652128 100644 --- a/request-response/values.yaml +++ b/request-response/values.yaml @@ -6,9 +6,9 @@ global: image: repository: public.ecr.aws/bisonai/orakl-core #repository url pullPolicy: IfNotPresent - listenerTag: "v0.5.0.20231115.0418.edbde75" - reporterTag: "v0.5.0.20231115.0418.edbde75" - workerTag: "v0.5.1.20231215.0641.bf3889b" + listenerTag: "v0.5.1.20240111.1440.dacb2ef" + reporterTag: "v0.5.1.20240111.1440.dacb2ef" + workerTag: "v0.5.1.20240111.1440.dacb2ef" imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: [] diff --git a/scripts/cronjob-por.yml b/scripts/cronjob-por.yml index ff77c6f8..6ece2126 100644 --- a/scripts/cronjob-por.yml +++ b/scripts/cronjob-por.yml @@ -27,7 +27,7 @@ spec: restartPolicy: Never containers: - name: proof-of-reserve - image: public.ecr.aws/u6t6w0e4/orakl-core:v0.5.1.20231218.0701.9afb27a + image: public.ecr.aws/u6t6w0e4/orakl-core:v0.5.1.20240111.1440.dacb2ef imagePullPolicy: IfNotPresent command: ["yarn"] args: [start:por] diff --git a/vrf/values.yaml b/vrf/values.yaml index 2ea50fe4..aa616b4c 100644 --- a/vrf/values.yaml +++ b/vrf/values.yaml @@ -6,9 +6,9 @@ global: image: repository: public.ecr.aws/u6t6w0e4/orakl-core #repository url pullPolicy: IfNotPresent - listenerTag: "v0.5.0.20231115.0418.edbde75" - reporterTag: "v0.5.0.20231115.0418.edbde75" - workerTag: "v0.5.0.20231115.0418.edbde75" + listenerTag: "v0.5.1.20240111.1440.dacb2ef" + reporterTag: "v0.5.1.20240111.1440.dacb2ef" + workerTag: "v0.5.1.20240111.1440.dacb2ef" imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: [] From 25ddf553ca504847a75949aac79fae6b82285a2d Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Thu, 18 Jan 2024 11:11:31 +0900 Subject: [PATCH 106/190] (BAOBAB) Open new Grafana to inside of K8s (#118) * feat: Add port configuration for Grafana deployment and create service * fix: Fix selector syntax in service.yaml --- grafana-as-code/templates/deployment.yaml | 3 +++ grafana-as-code/templates/service.yaml | 12 ++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 grafana-as-code/templates/service.yaml diff --git a/grafana-as-code/templates/deployment.yaml b/grafana-as-code/templates/deployment.yaml index 9c9d5f3d..b57b2aa1 100644 --- a/grafana-as-code/templates/deployment.yaml +++ b/grafana-as-code/templates/deployment.yaml @@ -16,6 +16,9 @@ spec: - name: {{ .Values.deployment.name }} image: {{ .Values.image.repository }}:{{ .Values.image.tag }} imagePullPolicy: Always + ports: + - name: grafana + containerPort: 3000 env: - name: BAOBAB_DELEGATOR_DB_PW valueFrom: diff --git a/grafana-as-code/templates/service.yaml b/grafana-as-code/templates/service.yaml new file mode 100644 index 00000000..b63c88ef --- /dev/null +++ b/grafana-as-code/templates/service.yaml @@ -0,0 +1,12 @@ +apiVersion: v1 +kind: Service +metadata: + name: {{ .Values.deployment.name }} +spec: + selector: + app: {{ .Values.deployment.name }} + ports: + - name: grafana + protocol: TCP + port: 80 + targetPort: 3000 From 896bc810281faca7566991a755afce56bef0c510 Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Thu, 18 Jan 2024 14:17:23 +0900 Subject: [PATCH 107/190] (BAOBAB) Add type: LoadBalancer to the service of new Grafana (#121) * feat: Add LoadBalancer type to service.yaml --- grafana-as-code/templates/service.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/grafana-as-code/templates/service.yaml b/grafana-as-code/templates/service.yaml index b63c88ef..7f5d7b02 100644 --- a/grafana-as-code/templates/service.yaml +++ b/grafana-as-code/templates/service.yaml @@ -10,3 +10,4 @@ spec: protocol: TCP port: 80 targetPort: 3000 + type: LoadBalancer From 6f1a51acd9a06cd09b6550331c76deb3c872ec52 Mon Sep 17 00:00:00 2001 From: Nick <148735107+nick-bisonai@users.noreply.github.com> Date: Mon, 22 Jan 2024 11:40:42 +0900 Subject: [PATCH 108/190] feat: delegated fee fallback (#126) --- aggregator/Chart.yaml | 2 +- aggregator/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/aggregator/Chart.yaml b/aggregator/Chart.yaml index 723de7fd..a747dabb 100644 --- a/aggregator/Chart.yaml +++ b/aggregator/Chart.yaml @@ -21,4 +21,4 @@ version: 0.3.14 # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "v0.5.1.20231221.0205.5ff1278" +appVersion: "v0.5.1.20240122.0131.44014e7" diff --git a/aggregator/values.yaml b/aggregator/values.yaml index b963d30a..35eb140e 100644 --- a/aggregator/values.yaml +++ b/aggregator/values.yaml @@ -7,7 +7,7 @@ global: repository: public.ecr.aws/u6t6w0e4/orakl-core #repository url pullPolicy: IfNotPresent listenerTag: "v0.5.1.20231221.0205.5ff1278" - reporterTag: "v0.5.1.20231221.0205.5ff1278" + reporterTag: "v0.5.1.20240122.0131.44014e7" workerTag: "v0.5.1.20231221.0205.5ff1278" imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository From 7bdb5f66ff090e02b6dd8ad09f77e0d3fb99d0b9 Mon Sep 17 00:00:00 2001 From: Nick <148735107+nick-bisonai@users.noreply.github.com> Date: Mon, 22 Jan 2024 15:03:53 +0900 Subject: [PATCH 109/190] feat: datetime formatting with iso format (#129) --- fetcher/Chart.yaml | 2 +- fetcher/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fetcher/Chart.yaml b/fetcher/Chart.yaml index 8f2f3a67..225affb7 100644 --- a/fetcher/Chart.yaml +++ b/fetcher/Chart.yaml @@ -21,4 +21,4 @@ version: 0.1.32 # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "v0.0.1.20231221.0248.5ff1278" +appVersion: "v0.0.1.20240122.0240.1672788" diff --git a/fetcher/values.yaml b/fetcher/values.yaml index bee1062a..212d1790 100644 --- a/fetcher/values.yaml +++ b/fetcher/values.yaml @@ -5,7 +5,7 @@ global: image: repository: public.ecr.aws/u6t6w0e4/orakl-fetcher #repository url pullPolicy: IfNotPresent - tag: "v0.0.1.20231221.0248.5ff1278" + tag: "v0.0.1.20240122.0240.1672788" imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: [] From b10e2c28069d6cdf7f35abd469f56a2b4051b192 Mon Sep 17 00:00:00 2001 From: Nick <148735107+nick-bisonai@users.noreply.github.com> Date: Mon, 22 Jan 2024 15:11:07 +0900 Subject: [PATCH 110/190] feat: updated datetime format for worker and por (#130) --- aggregator/Chart.yaml | 2 +- aggregator/values.yaml | 2 +- scripts/cronjob-por.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/aggregator/Chart.yaml b/aggregator/Chart.yaml index a747dabb..77fb5a19 100644 --- a/aggregator/Chart.yaml +++ b/aggregator/Chart.yaml @@ -21,4 +21,4 @@ version: 0.3.14 # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "v0.5.1.20240122.0131.44014e7" +appVersion: "v0.5.1.20240122.0240.1672788" diff --git a/aggregator/values.yaml b/aggregator/values.yaml index 35eb140e..24efad10 100644 --- a/aggregator/values.yaml +++ b/aggregator/values.yaml @@ -8,7 +8,7 @@ global: pullPolicy: IfNotPresent listenerTag: "v0.5.1.20231221.0205.5ff1278" reporterTag: "v0.5.1.20240122.0131.44014e7" - workerTag: "v0.5.1.20231221.0205.5ff1278" + workerTag: "v0.5.1.20240122.0240.1672788" imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: [] diff --git a/scripts/cronjob-por.yml b/scripts/cronjob-por.yml index 6ece2126..f9850d11 100644 --- a/scripts/cronjob-por.yml +++ b/scripts/cronjob-por.yml @@ -27,7 +27,7 @@ spec: restartPolicy: Never containers: - name: proof-of-reserve - image: public.ecr.aws/u6t6w0e4/orakl-core:v0.5.1.20240111.1440.dacb2ef + image: public.ecr.aws/u6t6w0e4/orakl-core:v0.5.1.20240122.0240.1672788 imagePullPolicy: IfNotPresent command: ["yarn"] args: [start:por] From d14b05bf19f1e557ea1979186ebe97a4439e8e51 Mon Sep 17 00:00:00 2001 From: Nick <148735107+nick-bisonai@users.noreply.github.com> Date: Tue, 23 Jan 2024 13:09:57 +0900 Subject: [PATCH 111/190] feat: update rr worker (#131) --- request-response/Chart.yaml | 2 +- request-response/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/request-response/Chart.yaml b/request-response/Chart.yaml index 5387ee7b..89c11ecf 100644 --- a/request-response/Chart.yaml +++ b/request-response/Chart.yaml @@ -21,4 +21,4 @@ version: 0.3.11 # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "v0.5.1.20231215.0641.bf3889b" +appVersion: "v0.5.1.20240122.0240.1672788" diff --git a/request-response/values.yaml b/request-response/values.yaml index 4e652128..448d1ce3 100644 --- a/request-response/values.yaml +++ b/request-response/values.yaml @@ -8,7 +8,7 @@ global: pullPolicy: IfNotPresent listenerTag: "v0.5.1.20240111.1440.dacb2ef" reporterTag: "v0.5.1.20240111.1440.dacb2ef" - workerTag: "v0.5.1.20240111.1440.dacb2ef" + workerTag: "v0.5.1.20240122.0240.1672788" imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: [] From 713615378e4ace688e96667cbe829db7516e5e19 Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Wed, 24 Jan 2024 17:10:20 +0900 Subject: [PATCH 112/190] (BAOBAB) Cleanup Grafana (#137) * feat: Pull image from GAR * test: Deploy to test pull from GAR * feat: Enable auto sync in grafana * test: Test ArgoCD's auto sync * feat: Set ArgoCD's sync period to 10 second * feat: Add `imagePullSecrets` * fix: Fixing syntax error from `imagePullSecrets` * fix: Correcting indent and `-` * fix: Remove blank before `-` * chore: Remove old Grafana * chore: Revert `targetRevision` of new Grafana --- argocd/values.yaml | 10 +- grafana-as-code/Chart.yaml | 2 +- grafana-as-code/templates/deployment.yaml | 4 + grafana-as-code/values.yaml | 9 +- grafana/service.yaml | 10 - grafana/value.yaml | 1202 --------------- grafana/vrf.json | 1444 ------------------- manifest/argocd/baobab/grafana-as-code.yaml | 4 +- 8 files changed, 18 insertions(+), 2667 deletions(-) delete mode 100644 grafana/service.yaml delete mode 100644 grafana/value.yaml delete mode 100644 grafana/vrf.json diff --git a/argocd/values.yaml b/argocd/values.yaml index 8c7a1c83..ffb4db8d 100644 --- a/argocd/values.yaml +++ b/argocd/values.yaml @@ -118,7 +118,7 @@ controller: # -- define the application controller `--operation-processors` operationProcessors: "10" # -- define the application controller `--app-resync` - appResyncPeriod: "180" + appResyncPeriod: "10" # -- define the application controller `--self-heal-timeout-seconds` selfHealTimeout: "5" # -- define the application controller `--repo-server-timeout-seconds` @@ -1075,16 +1075,16 @@ server: # -- Enable an ingress resource for the Argo CD server enabled: false # -- Additional ingress annotations - annotations: + annotations: kubernetes.io/ingress.class: alb alb.ingress.kubernetes.io/target-type: ip alb.ingress.kubernetes.io/scheme: internet-facing alb.ingress.kubernetes.io/listen-ports: '[{"HTTPS":443}]' - alb.ingress.kubernetes.io/healthcheck-path: /health + alb.ingress.kubernetes.io/healthcheck-path: /health # -- Additional ingress labels - labels: + labels: # -- Defines which ingress controller will implement the resource - ingressClassName: + ingressClassName: type: LoadBalanacer diff --git a/grafana-as-code/Chart.yaml b/grafana-as-code/Chart.yaml index 468d2bf9..868dbe1f 100644 --- a/grafana-as-code/Chart.yaml +++ b/grafana-as-code/Chart.yaml @@ -3,4 +3,4 @@ name: orakl-grafana-as-code description: A Grafana dashboard made by code type: application version: 0.1.0 -appVersion: "monitor.v1.0.0.20240111.0801.044e1af" +appVersion: "monitor.v1.0.0.20240119.0735.12e7f08" diff --git a/grafana-as-code/templates/deployment.yaml b/grafana-as-code/templates/deployment.yaml index b57b2aa1..72697c1c 100644 --- a/grafana-as-code/templates/deployment.yaml +++ b/grafana-as-code/templates/deployment.yaml @@ -12,6 +12,10 @@ spec: labels: app: {{ .Values.deployment.name }} spec: + {{- with .Values.image.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} containers: - name: {{ .Values.deployment.name }} image: {{ .Values.image.repository }}:{{ .Values.image.tag }} diff --git a/grafana-as-code/values.yaml b/grafana-as-code/values.yaml index d4de29d7..fd3f34b9 100644 --- a/grafana-as-code/values.yaml +++ b/grafana-as-code/values.yaml @@ -1,11 +1,12 @@ image: - repository: public.ecr.aws/bisonai/orakl-grafana #repository url + repository: asia-southeast1-docker.pkg.dev/vpc-host-orakl-prod/orakl/orakl-grafana #repository url pullPolicy: IfNotPresent - tag: "monitor.v1.0.0.20240111.0801.044e1af" + tag: "monitor.v1.0.0.20240119.0735.12e7f08" imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository - imagePullSecrets: [] + imagePullSecrets: + - name: gar-json-key deployment: name: orakl-grafana-as-code - replicas: 1 + replicas: 1 \ No newline at end of file diff --git a/grafana/service.yaml b/grafana/service.yaml deleted file mode 100644 index 311f5003..00000000 --- a/grafana/service.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: grafana -spec: - ports: - - port: 80 - targetPort: 3000 - protocol: TCP - type: LoadBalancer diff --git a/grafana/value.yaml b/grafana/value.yaml deleted file mode 100644 index f34439a2..00000000 --- a/grafana/value.yaml +++ /dev/null @@ -1,1202 +0,0 @@ -global: - # To help compatibility with other charts which use global.imagePullSecrets. - # Allow either an array of {name: pullSecret} maps (k8s-style), or an array of strings (more common helm-style). - # Can be tempalted. - # global: - # imagePullSecrets: - # - name: pullSecret1 - # - name: pullSecret2 - # or - # global: - # imagePullSecrets: - # - pullSecret1 - # - pullSecret2 - imagePullSecrets: [] - -rbac: - create: true - ## Use an existing ClusterRole/Role (depending on rbac.namespaced false/true) - # useExistingRole: name-of-some-(cluster)role - pspEnabled: false - pspUseAppArmor: false - namespaced: false - extraRoleRules: [] - # - apiGroups: [] - # resources: [] - # verbs: [] - extraClusterRoleRules: [] - # - apiGroups: [] - # resources: [] - # verbs: [] -serviceAccount: - create: true - name: - nameTest: - ## ServiceAccount labels. - labels: {} -## Service account annotations. Can be templated. -# annotations: -# eks.amazonaws.com/role-arn: arn:aws:iam::123456789000:role/iam-role-name-here - autoMount: true - -replicas: 1 - -## Create a headless service for the deployment -headlessService: false - -## Create HorizontalPodAutoscaler object for deployment type -# -autoscaling: - enabled: false - minReplicas: 1 - maxReplicas: 5 - targetCPU: "60" - targetMemory: "" - behavior: {} - -## See `kubectl explain poddisruptionbudget.spec` for more -## ref: https://kubernetes.io/docs/tasks/run-application/configure-pdb/ -podDisruptionBudget: {} -# minAvailable: 1 -# maxUnavailable: 1 - -## See `kubectl explain deployment.spec.strategy` for more -## ref: https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#strategy -deploymentStrategy: - type: RollingUpdate - -readinessProbe: - httpGet: - path: /api/health - port: 3000 - -livenessProbe: - httpGet: - path: /api/health - port: 3000 - initialDelaySeconds: 60 - timeoutSeconds: 30 - failureThreshold: 10 - -## Use an alternate scheduler, e.g. "stork". -## ref: https://kubernetes.io/docs/tasks/administer-cluster/configure-multiple-schedulers/ -## -# schedulerName: "default-scheduler" - -image: - repository: grafana/grafana - # Overrides the Grafana image tag whose default is the chart appVersion - tag: "" - sha: "" - pullPolicy: IfNotPresent - - ## Optionally specify an array of imagePullSecrets. - ## Secrets must be manually created in the namespace. - ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ - ## Can be templated. - ## - pullSecrets: [] - # - myRegistrKeySecretName - -testFramework: - enabled: true - image: "bats/bats" - tag: "v1.4.1" - imagePullPolicy: IfNotPresent - securityContext: {} - -securityContext: - runAsUser: 472 - runAsGroup: 472 - fsGroup: 472 - -containerSecurityContext: {} - -# Enable creating the grafana configmap -createConfigmap: true - -# Extra configmaps to mount in grafana pods -# Values are templated. -extraConfigmapMounts: [] - # - name: certs-configmap - # mountPath: /etc/grafana/ssl/ - # subPath: certificates.crt # (optional) - # configMap: certs-configmap - # readOnly: true - - -extraEmptyDirMounts: [] - # - name: provisioning-notifiers - # mountPath: /etc/grafana/provisioning/notifiers - - -# Apply extra labels to common labels. -extraLabels: {} - -## Assign a PriorityClassName to pods if set -# priorityClassName: - -downloadDashboardsImage: - repository: curlimages/curl - tag: 7.85.0 - sha: "" - pullPolicy: IfNotPresent - -downloadDashboards: - env: {} - envFromSecret: "" - resources: {} - securityContext: {} - envValueFrom: {} - # ENV_NAME: - # configMapKeyRef: - # name: configmap-name - # key: value_key - -## Pod Annotations -# podAnnotations: {} - -## Pod Labels -# podLabels: {} - -podPortName: grafana -gossipPortName: gossip -## Deployment annotations -# annotations: {} - -## Expose the grafana service to be accessed from outside the cluster (LoadBalancer service). -## or access it from within the cluster (ClusterIP service). Set the service type and the port to serve it. -## ref: http://kubernetes.io/docs/user-guide/services/ -## -service: - enabled: true - type: ClusterIP - port: 80 - targetPort: 3000 - # targetPort: 4181 To be used with a proxy extraContainer - ## Service annotations. Can be templated. - annotations: {} - labels: {} - portName: service - # Adds the appProtocol field to the service. This allows to work with istio protocol selection. Ex: "http" or "tcp" - appProtocol: "" - -serviceMonitor: - ## If true, a ServiceMonitor CRD is created for a prometheus operator - ## https://github.com/coreos/prometheus-operator - ## - enabled: false - path: /metrics - # namespace: monitoring (defaults to use the namespace this chart is deployed to) - labels: {} - interval: 1m - scheme: http - tlsConfig: {} - scrapeTimeout: 30s - relabelings: [] - targetLabels: [] - -extraExposePorts: [] - # - name: keycloak - # port: 8080 - # targetPort: 8080 - # type: ClusterIP - -# overrides pod.spec.hostAliases in the grafana deployment's pods -hostAliases: [] - # - ip: "1.2.3.4" - # hostnames: - # - "my.host.com" - -ingress: - enabled: false - # For Kubernetes >= 1.18 you should specify the ingress-controller via the field ingressClassName - # See https://kubernetes.io/blog/2020/04/02/improvements-to-the-ingress-api-in-kubernetes-1.18/#specifying-the-class-of-an-ingress - # ingressClassName: nginx - # Values can be templated - annotations: - kubernetes.io/ingress.class: alb - alb.ingress.kubernetes.io/target-type: ip - alb.ingress.kubernetes.io/scheme: internet-facing - alb.ingress.kubernetes.io/listen-ports: '[{"HTTPS":443}]' - labels: {} - path: / - - # pathType is only for k8s >= 1.1= - pathType: Prefix - - hosts: - - monitor.orakl.bisonai.net - ## Extra paths to prepend to every host configuration. This is useful when working with annotation based services. - extraPaths: [] - # - path: /* - # backend: - # serviceName: ssl-redirect - # servicePort: use-annotation - ## Or for k8s > 1.19 - # - path: /* - # pathType: Prefix - # backend: - # service: - # name: ssl-redirect - # port: - # name: use-annotation - - - tls: [] - # - secretName: chart-example-tls - # hosts: - # - chart-example.local - -resources: {} -# limits: -# cpu: 100m -# memory: 128Mi -# requests: -# cpu: 100m -# memory: 128Mi - -## Node labels for pod assignment -## ref: https://kubernetes.io/docs/user-guide/node-selection/ -# -nodeSelector: {} - -## Tolerations for pod assignment -## ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ -## -tolerations: [] - -## Affinity for pod assignment (evaluated as template) -## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity -## -affinity: {} - -## Topology Spread Constraints -## ref: https://kubernetes.io/docs/concepts/workloads/pods/pod-topology-spread-constraints/ -## -topologySpreadConstraints: [] - -## Additional init containers (evaluated as template) -## ref: https://kubernetes.io/docs/concepts/workloads/pods/init-containers/ -## -extraInitContainers: [] - -## Enable an Specify container in extraContainers. This is meant to allow adding an authentication proxy to a grafana pod -extraContainers: "" -# extraContainers: | -# - name: proxy -# image: quay.io/gambol99/keycloak-proxy:latest -# args: -# - -provider=github -# - -client-id= -# - -client-secret= -# - -github-org= -# - -email-domain=* -# - -cookie-secret= -# - -http-address=http://0.0.0.0:4181 -# - -upstream-url=http://127.0.0.1:3000 -# ports: -# - name: proxy-web -# containerPort: 4181 - -## Volumes that can be used in init containers that will not be mounted to deployment pods -extraContainerVolumes: [] -# - name: volume-from-secret -# secret: -# secretName: secret-to-mount -# - name: empty-dir-volume -# emptyDir: {} - -## Enable persistence using Persistent Volume Claims -## ref: http://kubernetes.io/docs/user-guide/persistent-volumes/ -## -persistence: - type: pvc - enabled: true - # storageClassName: default - accessModes: - - ReadWriteOnce - size: 10Gi - # annotations: {} - finalizers: - - kubernetes.io/pvc-protection - # selectorLabels: {} - ## Sub-directory of the PV to mount. Can be templated. - # subPath: "" - ## Name of an existing PVC. Can be templated. - # existingClaim: - ## Extra labels to apply to a PVC. - extraPvcLabels: {} - - ## If persistence is not enabled, this allows to mount the - ## local storage in-memory to improve performance - ## - inMemory: - enabled: false - ## The maximum usage on memory medium EmptyDir would be - ## the minimum value between the SizeLimit specified - ## here and the sum of memory limits of all containers in a pod - ## - # sizeLimit: 300Mi - -initChownData: - ## If false, data ownership will not be reset at startup - ## This allows the grafana-server to be run with an arbitrary user - ## - enabled: true - - ## initChownData container image - ## - image: - repository: busybox - tag: "1.31.1" - sha: "" - pullPolicy: IfNotPresent - - ## initChownData resource requests and limits - ## Ref: http://kubernetes.io/docs/user-guide/compute-resources/ - ## - resources: {} - # limits: - # cpu: 100m - # memory: 128Mi - # requests: - # cpu: 100m - # memory: 128Mi - securityContext: - runAsNonRoot: false - runAsUser: 0 - - -# Administrator credentials when not using an existing secret (see below) -adminUser: admin -# adminPassword: strongpassword - -# Use an existing secret for the admin user. -admin: - ## Name of the secret. Can be templated. - existingSecret: "" - userKey: admin-user - passwordKey: admin-password - -## Define command to be executed at startup by grafana container -## Needed if using `vault-env` to manage secrets (ref: https://banzaicloud.com/blog/inject-secrets-into-pods-vault/) -## Default is "run.sh" as defined in grafana's Dockerfile -# command: -# - "sh" -# - "/run.sh" - -## Optionally define args if command is used -## Needed if using `hashicorp/envconsul` to manage secrets -## By default no arguments are set -# args: -# - "-secret" -# - "secret/grafana" -# - "./grafana" - -## Extra environment variables that will be pass onto deployment pods -## -## to provide grafana with access to CloudWatch on AWS EKS: -## 1. create an iam role of type "Web identity" with provider oidc.eks.* (note the provider for later) -## 2. edit the "Trust relationships" of the role, add a line inside the StringEquals clause using the -## same oidc eks provider as noted before (same as the existing line) -## also, replace NAMESPACE and prometheus-operator-grafana with the service account namespace and name -## -## "oidc.eks.us-east-1.amazonaws.com/id/XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX:sub": "system:serviceaccount:NAMESPACE:prometheus-operator-grafana", -## -## 3. attach a policy to the role, you can use a built in policy called CloudWatchReadOnlyAccess -## 4. use the following env: (replace 123456789000 and iam-role-name-here with your aws account number and role name) -## -## env: -## AWS_ROLE_ARN: arn:aws:iam::123456789000:role/iam-role-name-here -## AWS_WEB_IDENTITY_TOKEN_FILE: /var/run/secrets/eks.amazonaws.com/serviceaccount/token -## AWS_REGION: us-east-1 -## -## 5. uncomment the EKS section in extraSecretMounts: below -## 6. uncomment the annotation section in the serviceAccount: above -## make sure to replace arn:aws:iam::123456789000:role/iam-role-name-here with your role arn - -env: {} - -## "valueFrom" environment variable references that will be added to deployment pods. Name is templated. -## ref: https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.19/#envvarsource-v1-core -## Renders in container spec as: -## env: -## ... -## - name: -## valueFrom: -## -envValueFrom: {} - # ENV_NAME: - # configMapKeyRef: - # name: configmap-name - # key: value_key - -## The name of a secret in the same kubernetes namespace which contain values to be added to the environment -## This can be useful for auth tokens, etc. Value is templated. -envFromSecret: "" - -## Sensible environment variables that will be rendered as new secret object -## This can be useful for auth tokens, etc -envRenderSecret: {} - -## The names of secrets in the same kubernetes namespace which contain values to be added to the environment -## Each entry should contain a name key, and can optionally specify whether the secret must be defined with an optional key. -## Name is templated. -envFromSecrets: [] -## - name: secret-name -## optional: true - -## The names of conifgmaps in the same kubernetes namespace which contain values to be added to the environment -## Each entry should contain a name key, and can optionally specify whether the configmap must be defined with an optional key. -## Name is templated. -## ref: https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#configmapenvsource-v1-core -envFromConfigMaps: [] -## - name: configmap-name -## optional: true - -# Inject Kubernetes services as environment variables. -# See https://kubernetes.io/docs/concepts/services-networking/connect-applications-service/#environment-variables -enableServiceLinks: true - -## Additional grafana server secret mounts -# Defines additional mounts with secrets. Secrets must be manually created in the namespace. -extraSecretMounts: [] - # - name: secret-files - # mountPath: /etc/secrets - # secretName: grafana-secret-files - # readOnly: true - # subPath: "" - # - # for AWS EKS (cloudwatch) use the following (see also instruction in env: above) - # - name: aws-iam-token - # mountPath: /var/run/secrets/eks.amazonaws.com/serviceaccount - # readOnly: true - # projected: - # defaultMode: 420 - # sources: - # - serviceAccountToken: - # audience: sts.amazonaws.com - # expirationSeconds: 86400 - # path: token - # - # for CSI e.g. Azure Key Vault use the following - # - name: secrets-store-inline - # mountPath: /run/secrets - # readOnly: true - # csi: - # driver: secrets-store.csi.k8s.io - # readOnly: true - # volumeAttributes: - # secretProviderClass: "akv-grafana-spc" - # nodePublishSecretRef: # Only required when using service principal mode - # name: grafana-akv-creds # Only required when using service principal mode - -## Additional grafana server volume mounts -# Defines additional volume mounts. -extraVolumeMounts: [] - # - name: extra-volume-0 - # mountPath: /mnt/volume0 - # readOnly: true - # existingClaim: volume-claim - # - name: extra-volume-1 - # mountPath: /mnt/volume1 - # readOnly: true - # hostPath: /usr/shared/ - # - name: grafana-secrets - # csi: true - # data: - # driver: secrets-store.csi.k8s.io - # readOnly: true - # volumeAttributes: - # secretProviderClass: "grafana-env-spc" - -## Container Lifecycle Hooks. Execute a specific bash command or make an HTTP request -lifecycleHooks: {} - # postStart: - # exec: - # command: [] - -## Pass the plugins you want installed as a list. -## -plugins: [] - # - digrich-bubblechart-panel - # - grafana-clock-panel - ## You can also use other plugin download URL, as long as they are valid zip files, - ## and specify the name of the plugin after the semicolon. Like this: - # - https://grafana.com/api/plugins/marcusolsson-json-datasource/versions/1.3.2/download;marcusolsson-json-datasource - -## Configure grafana datasources -## ref: http://docs.grafana.org/administration/provisioning/#datasources -## -datasources: {} -# datasources.yaml: -# apiVersion: 1 -# datasources: -# - name: Prometheus -# type: prometheus -# url: http://prometheus-prometheus-server -# access: proxy -# isDefault: true -# - name: CloudWatch -# type: cloudwatch -# access: proxy -# uid: cloudwatch -# editable: false -# jsonData: -# authType: default -# defaultRegion: us-east-1 - -## Configure grafana alerting (can be templated) -## ref: http://docs.grafana.org/administration/provisioning/#alerting -## -alerting: {} - # rules.yaml: - # apiVersion: 1 - # groups: - # - orgId: 1 - # name: '{{ .Chart.Name }}_my_rule_group' - # folder: my_first_folder - # interval: 60s - # rules: - # - uid: my_id_1 - # title: my_first_rule - # condition: A - # data: - # - refId: A - # datasourceUid: '-100' - # model: - # conditions: - # - evaluator: - # params: - # - 3 - # type: gt - # operator: - # type: and - # query: - # params: - # - A - # reducer: - # type: last - # type: query - # datasource: - # type: __expr__ - # uid: '-100' - # expression: 1==0 - # intervalMs: 1000 - # maxDataPoints: 43200 - # refId: A - # type: math - # dashboardUid: my_dashboard - # panelId: 123 - # noDataState: Alerting - # for: 60s - # annotations: - # some_key: some_value - # labels: - # team: sre_team_1 - # contactpoints.yaml: - # apiVersion: 1 - # contactPoints: - # - orgId: 1 - # name: cp_1 - # receivers: - # - uid: first_uid - # type: pagerduty - # settings: - # integrationKey: XXX - # severity: critical - # class: ping failure - # component: Grafana - # group: app-stack - # summary: | - # {{ `{{ include "default.message" . }}` }} - -## Configure notifiers -## ref: http://docs.grafana.org/administration/provisioning/#alert-notification-channels -## -notifiers: {} -# notifiers.yaml: -# notifiers: -# - name: email-notifier -# type: email -# uid: email1 -# # either: -# org_id: 1 -# # or -# org_name: Main Org. -# is_default: true -# settings: -# addresses: an_email_address@example.com -# delete_notifiers: - -## Configure grafana dashboard providers -## ref: http://docs.grafana.org/administration/provisioning/#dashboards -## -## `path` must be /var/lib/grafana/dashboards/ -## -dashboardProviders: {} -# dashboardproviders.yaml: -# apiVersion: 1 -# providers: -# - name: 'default' -# orgId: 1 -# folder: '' -# type: file -# disableDeletion: false -# editable: true -# options: -# path: /var/lib/grafana/dashboards/default - -## Configure grafana dashboard to import -## NOTE: To use dashboards you must also enable/configure dashboardProviders -## ref: https://grafana.com/dashboards -## -## dashboards per provider, use provider name as key. -## -dashboards: {} - # default: - # some-dashboard: - # json: | - # $RAW_JSON - # custom-dashboard: - # file: dashboards/custom-dashboard.json - # prometheus-stats: - # gnetId: 2 - # revision: 2 - # datasource: Prometheus - # local-dashboard: - # url: https://example.com/repository/test.json - # token: '' - # local-dashboard-base64: - # url: https://example.com/repository/test-b64.json - # token: '' - # b64content: true - # local-dashboard-gitlab: - # url: https://example.com/repository/test-gitlab.json - # gitlabToken: '' - # local-dashboard-bitbucket: - # url: https://example.com/repository/test-bitbucket.json - # bearerToken: '' - # local-dashboard-azure: - # url: https://example.com/repository/test-azure.json - # basic: '' - # acceptHeader: '*/*' - -## Reference to external ConfigMap per provider. Use provider name as key and ConfigMap name as value. -## A provider dashboards must be defined either by external ConfigMaps or in values.yaml, not in both. -## ConfigMap data example: -## -## data: -## example-dashboard.json: | -## RAW_JSON -## -dashboardsConfigMaps: {} -# default: "" - -## Grafana's primary configuration -## NOTE: values in map will be converted to ini format -## ref: http://docs.grafana.org/installation/configuration/ -## -grafana.ini: - paths: - data: /var/lib/grafana/ - logs: /var/log/grafana - plugins: /var/lib/grafana/plugins - provisioning: /etc/grafana/provisioning - analytics: - check_for_updates: true - log: - mode: console - grafana_net: - url: https://grafana.net - server: - domain: "{{ if (and .Values.ingress.enabled .Values.ingress.hosts) }}{{ .Values.ingress.hosts | first }}{{ else }}''{{ end }}" -## grafana Authentication can be enabled with the following values on grafana.ini - # server: - # The full public facing url you use in browser, used for redirects and emails - # root_url: - # https://grafana.com/docs/grafana/latest/auth/github/#enable-github-in-grafana - # auth.github: - # enabled: false - # allow_sign_up: false - # scopes: user:email,read:org - # auth_url: https://github.com/login/oauth/authorize - # token_url: https://github.com/login/oauth/access_token - # api_url: https://api.github.com/user - # team_ids: - # allowed_organizations: - # client_id: - # client_secret: -## LDAP Authentication can be enabled with the following values on grafana.ini -## NOTE: Grafana will fail to start if the value for ldap.toml is invalid - # auth.ldap: - # enabled: true - # allow_sign_up: true - # config_file: /etc/grafana/ldap.toml - -## Grafana's LDAP configuration -## Templated by the template in _helpers.tpl -## NOTE: To enable the grafana.ini must be configured with auth.ldap.enabled -## ref: http://docs.grafana.org/installation/configuration/#auth-ldap -## ref: http://docs.grafana.org/installation/ldap/#configuration -ldap: - enabled: false - # `existingSecret` is a reference to an existing secret containing the ldap configuration - # for Grafana in a key `ldap-toml`. - existingSecret: "" - # `config` is the content of `ldap.toml` that will be stored in the created secret - config: "" - # config: |- - # verbose_logging = true - - # [[servers]] - # host = "my-ldap-server" - # port = 636 - # use_ssl = true - # start_tls = false - # ssl_skip_verify = false - # bind_dn = "uid=%s,ou=users,dc=myorg,dc=com" - -## Grafana's SMTP configuration -## NOTE: To enable, grafana.ini must be configured with smtp.enabled -## ref: http://docs.grafana.org/installation/configuration/#smtp -smtp: - # `existingSecret` is a reference to an existing secret containing the smtp configuration - # for Grafana. - existingSecret: "" - userKey: "user" - passwordKey: "password" - -## Sidecars that collect the configmaps with specified label and stores the included files them into the respective folders -## Requires at least Grafana 5 to work and can't be used together with parameters dashboardProviders, datasources and dashboards -sidecar: - image: - repository: quay.io/kiwigrid/k8s-sidecar - tag: 1.22.0 - sha: "" - imagePullPolicy: IfNotPresent - resources: {} -# limits: -# cpu: 100m -# memory: 100Mi -# requests: -# cpu: 50m -# memory: 50Mi - securityContext: {} - # skipTlsVerify Set to true to skip tls verification for kube api calls - # skipTlsVerify: true - enableUniqueFilenames: false - readinessProbe: {} - livenessProbe: {} - # Log level default for all sidecars. Can be one of: DEBUG, INFO, WARN, ERROR, CRITICAL. Defaults to INFO - # logLevel: INFO - alerts: - enabled: false - # Additional environment variables for the alerts sidecar - env: {} - # Do not reprocess already processed unchanged resources on k8s API reconnect. - # ignoreAlreadyProcessed: true - # label that the configmaps with alert are marked with - label: grafana_alert - # value of label that the configmaps with alert are set to - labelValue: "" - # Log level. Can be one of: DEBUG, INFO, WARN, ERROR, CRITICAL. - # logLevel: INFO - # If specified, the sidecar will search for alert config-maps inside this namespace. - # Otherwise the namespace in which the sidecar is running will be used. - # It's also possible to specify ALL to search in all namespaces - searchNamespace: null - # Method to use to detect ConfigMap changes. With WATCH the sidecar will do a WATCH requests, with SLEEP it will list all ConfigMaps, then sleep for 60 seconds. - watchMethod: WATCH - # search in configmap, secret or both - resource: both - # watchServerTimeout: request to the server, asking it to cleanly close the connection after that. - # defaults to 60sec; much higher values like 3600 seconds (1h) are feasible for non-Azure K8S - # watchServerTimeout: 3600 - # - # watchClientTimeout: is a client-side timeout, configuring your local socket. - # If you have a network outage dropping all packets with no RST/FIN, - # this is how long your client waits before realizing & dropping the connection. - # defaults to 66sec (sic!) - # watchClientTimeout: 60 - # - # Endpoint to send request to reload alerts - reloadURL: "http://localhost:3000/api/admin/provisioning/alerting/reload" - # Absolute path to shell script to execute after a alert got reloaded - script: null - skipReload: false - # Deploy the alert sidecar as an initContainer in addition to a container. - # Sets the size limit of the alert sidecar emptyDir volume - sizeLimit: {} - dashboards: - enabled: false - # Additional environment variables for the dashboards sidecar - env: {} - # Do not reprocess already processed unchanged resources on k8s API reconnect. - # ignoreAlreadyProcessed: true - SCProvider: true - # label that the configmaps with dashboards are marked with - label: grafana_dashboard - # value of label that the configmaps with dashboards are set to - labelValue: "" - # Log level. Can be one of: DEBUG, INFO, WARN, ERROR, CRITICAL. - # logLevel: INFO - # folder in the pod that should hold the collected dashboards (unless `defaultFolderName` is set) - folder: /tmp/dashboards - # The default folder name, it will create a subfolder under the `folder` and put dashboards in there instead - defaultFolderName: null - # Namespaces list. If specified, the sidecar will search for config-maps/secrets inside these namespaces. - # Otherwise the namespace in which the sidecar is running will be used. - # It's also possible to specify ALL to search in all namespaces. - searchNamespace: null - # Method to use to detect ConfigMap changes. With WATCH the sidecar will do a WATCH requests, with SLEEP it will list all ConfigMaps, then sleep for 60 seconds. - watchMethod: WATCH - # search in configmap, secret or both - resource: both - # If specified, the sidecar will look for annotation with this name to create folder and put graph here. - # You can use this parameter together with `provider.foldersFromFilesStructure`to annotate configmaps and create folder structure. - folderAnnotation: null - # Endpoint to send request to reload alerts - reloadURL: "http://localhost:3000/api/admin/provisioning/dashboards/reload" - # Absolute path to shell script to execute after a configmap got reloaded - script: null - skipReload: false - # watchServerTimeout: request to the server, asking it to cleanly close the connection after that. - # defaults to 60sec; much higher values like 3600 seconds (1h) are feasible for non-Azure K8S - # watchServerTimeout: 3600 - # - # watchClientTimeout: is a client-side timeout, configuring your local socket. - # If you have a network outage dropping all packets with no RST/FIN, - # this is how long your client waits before realizing & dropping the connection. - # defaults to 66sec (sic!) - # watchClientTimeout: 60 - # - # provider configuration that lets grafana manage the dashboards - provider: - # name of the provider, should be unique - name: sidecarProvider - # orgid as configured in grafana - orgid: 1 - # folder in which the dashboards should be imported in grafana - folder: '' - # type of the provider - type: file - # disableDelete to activate a import-only behaviour - disableDelete: false - # allow updating provisioned dashboards from the UI - allowUiUpdates: false - # allow Grafana to replicate dashboard structure from filesystem - foldersFromFilesStructure: false - # Additional dashboard sidecar volume mounts - extraMounts: [] - # Sets the size limit of the dashboard sidecar emptyDir volume - sizeLimit: {} - datasources: - enabled: false - # Additional environment variables for the datasourcessidecar - env: {} - # Do not reprocess already processed unchanged resources on k8s API reconnect. - # ignoreAlreadyProcessed: true - # label that the configmaps with datasources are marked with - label: grafana_datasource - # value of label that the configmaps with datasources are set to - labelValue: "" - # Log level. Can be one of: DEBUG, INFO, WARN, ERROR, CRITICAL. - # logLevel: INFO - # If specified, the sidecar will search for datasource config-maps inside this namespace. - # Otherwise the namespace in which the sidecar is running will be used. - # It's also possible to specify ALL to search in all namespaces - searchNamespace: null - # Method to use to detect ConfigMap changes. With WATCH the sidecar will do a WATCH requests, with SLEEP it will list all ConfigMaps, then sleep for 60 seconds. - watchMethod: WATCH - # search in configmap, secret or both - resource: both - # watchServerTimeout: request to the server, asking it to cleanly close the connection after that. - # defaults to 60sec; much higher values like 3600 seconds (1h) are feasible for non-Azure K8S - # watchServerTimeout: 3600 - # - # watchClientTimeout: is a client-side timeout, configuring your local socket. - # If you have a network outage dropping all packets with no RST/FIN, - # this is how long your client waits before realizing & dropping the connection. - # defaults to 66sec (sic!) - # watchClientTimeout: 60 - # - # Endpoint to send request to reload datasources - reloadURL: "http://localhost:3000/api/admin/provisioning/datasources/reload" - # Absolute path to shell script to execute after a datasource got reloaded - script: null - skipReload: false - # Deploy the datasource sidecar as an initContainer in addition to a container. - # This is needed if skipReload is true, to load any datasources defined at startup time. - initDatasources: false - # Sets the size limit of the datasource sidecar emptyDir volume - sizeLimit: {} - plugins: - enabled: false - # Additional environment variables for the plugins sidecar - env: {} - # Do not reprocess already processed unchanged resources on k8s API reconnect. - # ignoreAlreadyProcessed: true - # label that the configmaps with plugins are marked with - label: grafana_plugin - # value of label that the configmaps with plugins are set to - labelValue: "" - # Log level. Can be one of: DEBUG, INFO, WARN, ERROR, CRITICAL. - # logLevel: INFO - # If specified, the sidecar will search for plugin config-maps inside this namespace. - # Otherwise the namespace in which the sidecar is running will be used. - # It's also possible to specify ALL to search in all namespaces - searchNamespace: null - # Method to use to detect ConfigMap changes. With WATCH the sidecar will do a WATCH requests, with SLEEP it will list all ConfigMaps, then sleep for 60 seconds. - watchMethod: WATCH - # search in configmap, secret or both - resource: both - # watchServerTimeout: request to the server, asking it to cleanly close the connection after that. - # defaults to 60sec; much higher values like 3600 seconds (1h) are feasible for non-Azure K8S - # watchServerTimeout: 3600 - # - # watchClientTimeout: is a client-side timeout, configuring your local socket. - # If you have a network outage dropping all packets with no RST/FIN, - # this is how long your client waits before realizing & dropping the connection. - # defaults to 66sec (sic!) - # watchClientTimeout: 60 - # - # Endpoint to send request to reload plugins - reloadURL: "http://localhost:3000/api/admin/provisioning/plugins/reload" - # Absolute path to shell script to execute after a plugin got reloaded - script: null - skipReload: false - # Deploy the datasource sidecar as an initContainer in addition to a container. - # This is needed if skipReload is true, to load any plugins defined at startup time. - initPlugins: false - # Sets the size limit of the plugin sidecar emptyDir volume - sizeLimit: {} - notifiers: - enabled: false - # Additional environment variables for the notifierssidecar - env: {} - # Do not reprocess already processed unchanged resources on k8s API reconnect. - # ignoreAlreadyProcessed: true - # label that the configmaps with notifiers are marked with - label: grafana_notifier - # value of label that the configmaps with notifiers are set to - labelValue: "" - # Log level. Can be one of: DEBUG, INFO, WARN, ERROR, CRITICAL. - # logLevel: INFO - # If specified, the sidecar will search for notifier config-maps inside this namespace. - # Otherwise the namespace in which the sidecar is running will be used. - # It's also possible to specify ALL to search in all namespaces - searchNamespace: null - # Method to use to detect ConfigMap changes. With WATCH the sidecar will do a WATCH requests, with SLEEP it will list all ConfigMaps, then sleep for 60 seconds. - watchMethod: WATCH - # search in configmap, secret or both - resource: both - # watchServerTimeout: request to the server, asking it to cleanly close the connection after that. - # defaults to 60sec; much higher values like 3600 seconds (1h) are feasible for non-Azure K8S - # watchServerTimeout: 3600 - # - # watchClientTimeout: is a client-side timeout, configuring your local socket. - # If you have a network outage dropping all packets with no RST/FIN, - # this is how long your client waits before realizing & dropping the connection. - # defaults to 66sec (sic!) - # watchClientTimeout: 60 - # - # Endpoint to send request to reload notifiers - reloadURL: "http://localhost:3000/api/admin/provisioning/notifications/reload" - # Absolute path to shell script to execute after a notifier got reloaded - script: null - skipReload: false - # Deploy the notifier sidecar as an initContainer in addition to a container. - # This is needed if skipReload is true, to load any notifiers defined at startup time. - initNotifiers: false - # Sets the size limit of the notifier sidecar emptyDir volume - sizeLimit: {} - -## Override the deployment namespace -## -namespaceOverride: "" - -## Number of old ReplicaSets to retain -## -revisionHistoryLimit: 10 - -## Add a seperate remote image renderer deployment/service -imageRenderer: - deploymentStrategy: {} - # Enable the image-renderer deployment & service - enabled: false - replicas: 1 - autoscaling: - enabled: false - minReplicas: 1 - maxReplicas: 5 - targetCPU: "60" - targetMemory: "" - behavior: {} - image: - # image-renderer Image repository - repository: grafana/grafana-image-renderer - # image-renderer Image tag - tag: latest - # image-renderer Image sha (optional) - sha: "" - # image-renderer ImagePullPolicy - pullPolicy: Always - # extra environment variables - env: - HTTP_HOST: "0.0.0.0" - # RENDERING_ARGS: --no-sandbox,--disable-gpu,--window-size=1280x758 - # RENDERING_MODE: clustered - # IGNORE_HTTPS_ERRORS: true - # image-renderer deployment serviceAccount - serviceAccountName: "" - # image-renderer deployment securityContext - securityContext: {} - # image-renderer deployment container securityContext - containerSecurityContext: - capabilities: - drop: ['ALL'] - allowPrivilegeEscalation: false - readOnlyRootFilesystem: true - # image-renderer deployment Host Aliases - hostAliases: [] - # image-renderer deployment priority class - priorityClassName: '' - service: - # Enable the image-renderer service - enabled: true - # image-renderer service port name - portName: 'http' - # image-renderer service port used by both service and deployment - port: 8081 - targetPort: 8081 - # Adds the appProtocol field to the image-renderer service. This allows to work with istio protocol selection. Ex: "http" or "tcp" - appProtocol: "" - serviceMonitor: - ## If true, a ServiceMonitor CRD is created for a prometheus operator - ## https://github.com/coreos/prometheus-operator - ## - enabled: false - path: /metrics - # namespace: monitoring (defaults to use the namespace this chart is deployed to) - labels: {} - interval: 1m - scheme: http - tlsConfig: {} - scrapeTimeout: 30s - relabelings: [] - # See: https://doc.crds.dev/github.com/prometheus-operator/kube-prometheus/monitoring.coreos.com/ServiceMonitor/v1@v0.11.0#spec-targetLabels - targetLabels: [] - # - targetLabel1 - # - targetLabel2 - # If https is enabled in Grafana, this needs to be set as 'https' to correctly configure the callback used in Grafana - grafanaProtocol: http - # In case a sub_path is used this needs to be added to the image renderer callback - grafanaSubPath: "" - # name of the image-renderer port on the pod - podPortName: http - # number of image-renderer replica sets to keep - revisionHistoryLimit: 10 - networkPolicy: - # Enable a NetworkPolicy to limit inbound traffic to only the created grafana pods - limitIngress: true - # Enable a NetworkPolicy to limit outbound traffic to only the created grafana pods - limitEgress: false - # Allow additional services to access image-renderer (eg. Prometheus operator when ServiceMonitor is enabled) - extraIngressSelectors: [] - resources: {} -# limits: -# cpu: 100m -# memory: 100Mi -# requests: -# cpu: 50m -# memory: 50Mi - ## Node labels for pod assignment - ## ref: https://kubernetes.io/docs/user-guide/node-selection/ - # - nodeSelector: {} - - ## Tolerations for pod assignment - ## ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ - ## - tolerations: [] - - ## Affinity for pod assignment (evaluated as template) - ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity - ## - affinity: {} - - ## Use an alternate scheduler, e.g. "stork". - ## ref: https://kubernetes.io/docs/tasks/administer-cluster/configure-multiple-schedulers/ - ## - # schedulerName: "default-scheduler" - -networkPolicy: - ## @param networkPolicy.enabled Enable creation of NetworkPolicy resources. Only Ingress traffic is filtered for now. - ## - enabled: false - ## @param networkPolicy.allowExternal Don't require client label for connections - ## The Policy model to apply. When set to false, only pods with the correct - ## client label will have network access to grafana port defined. - ## When true, grafana will accept connections from any source - ## (with the correct destination port). - ## - ingress: true - ## @param networkPolicy.ingress When true enables the creation - ## an ingress network policy - ## - allowExternal: true - ## @param networkPolicy.explicitNamespacesSelector A Kubernetes LabelSelector to explicitly select namespaces from which traffic could be allowed - ## If explicitNamespacesSelector is missing or set to {}, only client Pods that are in the networkPolicy's namespace - ## and that match other criteria, the ones that have the good label, can reach the grafana. - ## But sometimes, we want the grafana to be accessible to clients from other namespaces, in this case, we can use this - ## LabelSelector to select these namespaces, note that the networkPolicy's namespace should also be explicitly added. - ## - ## Example: - ## explicitNamespacesSelector: - ## matchLabels: - ## role: frontend - ## matchExpressions: - ## - {key: role, operator: In, values: [frontend]} - ## - explicitNamespacesSelector: {} - ## - ## - ## - ## - ## - ## - egress: - ## @param networkPolicy.egress.enabled When enabled, an egress network policy will be - ## created allowing grafana to connect to external data sources from kubernetes cluster. - enabled: false - ## - ## @param networkPolicy.egress.ports Add individual ports to be allowed by the egress - ports: [] - ## Add ports to the egress by specifying - port: - ## E.X. - ## ports: - ## - port: 80 - ## - port: 443 - ## - ## - ## - ## - ## - ## - -# Enable backward compatibility of kubernetes where version below 1.13 doesn't have the enableServiceLinks option -enableKubeBackwardCompatibility: false -useStatefulSet: false -# Create a dynamic manifests via values: -extraObjects: [] - # - apiVersion: "kubernetes-client.io/v1" - # kind: ExternalSecret - # metadata: - # name: grafana-secrets - # spec: - # backendType: gcpSecretsManager - # data: - # - key: grafana-admin-password - # name: adminPassword \ No newline at end of file diff --git a/grafana/vrf.json b/grafana/vrf.json deleted file mode 100644 index dbc2cbd0..00000000 --- a/grafana/vrf.json +++ /dev/null @@ -1,1444 +0,0 @@ -{ - "annotations": { - "list": [ - { - "builtIn": 1, - "datasource": { - "type": "grafana", - "uid": "-- Grafana --" - }, - "enable": true, - "hide": true, - "iconColor": "rgba(0, 211, 255, 1)", - "name": "Annotations & Alerts", - "target": { - "limit": 100, - "matchAny": false, - "tags": [], - "type": "dashboard" - }, - "type": "dashboard" - } - ] - }, - "editable": true, - "fiscalYearStartMonth": 0, - "graphTooltip": 0, - "id": 4, - "links": [], - "liveNow": false, - "panels": [ - { - "datasource": { - "type": "postgres", - "uid": "l_3DTLB4k" - }, - "fieldConfig": { - "defaults": { - "mappings": [], - "thresholds": { - "mode": "percentage", - "steps": [ - { - "color": "green", - "value": null - }, - { - "color": "orange", - "value": 70 - }, - { - "color": "red", - "value": 85 - } - ] - } - }, - "overrides": [] - }, - "gridPos": { - "h": 6, - "w": 3, - "x": 0, - "y": 0 - }, - "id": 23, - "options": { - "orientation": "auto", - "reduceOptions": { - "calcs": [ - "lastNotNull" - ], - "fields": "", - "values": false - }, - "showThresholdLabels": false, - "showThresholdMarkers": true - }, - "pluginVersion": "9.4.7", - "targets": [ - { - "datasource": { - "type": "postgres", - "uid": "l_3DTLB4k" - }, - "editorMode": "code", - "format": "table", - "rawQuery": true, - "rawSql": "select count(*) total from sgd1.chain_event", - "refId": "A", - "sql": { - "columns": [ - { - "parameters": [], - "type": "function" - } - ], - "groupBy": [ - { - "property": { - "type": "string" - }, - "type": "groupBy" - } - ], - "limit": 50 - } - } - ], - "title": "Total Events", - "type": "gauge" - }, - { - "datasource": { - "type": "postgres", - "uid": "l_3DTLB4k" - }, - "description": "", - "fieldConfig": { - "defaults": { - "color": { - "mode": "thresholds" - }, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - }, - { - "color": "red", - "value": 80 - } - ] - } - }, - "overrides": [] - }, - "gridPos": { - "h": 3, - "w": 6, - "x": 3, - "y": 0 - }, - "id": 25, - "options": { - "colorMode": "value", - "graphMode": "area", - "justifyMode": "auto", - "orientation": "auto", - "reduceOptions": { - "calcs": [ - "lastNotNull" - ], - "fields": "", - "values": false - }, - "textMode": "auto" - }, - "pluginVersion": "9.4.7", - "targets": [ - { - "datasource": { - "type": "postgres", - "uid": "l_3DTLB4k" - }, - "editorMode": "code", - "format": "table", - "rawQuery": true, - "rawSql": "select number from chain1.blocks order by number desc limit 1", - "refId": "A", - "sql": { - "columns": [ - { - "parameters": [], - "type": "function" - } - ], - "groupBy": [ - { - "property": { - "type": "string" - }, - "type": "groupBy" - } - ], - "limit": 50 - } - } - ], - "title": "Latest Block Number", - "type": "stat" - }, - { - "datasource": { - "type": "postgres", - "uid": "mQGxoLf4z" - }, - "description": "", - "fieldConfig": { - "defaults": { - "color": { - "mode": "thresholds" - }, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - }, - { - "color": "red", - "value": 80 - } - ] - } - }, - "overrides": [] - }, - "gridPos": { - "h": 3, - "w": 10, - "x": 9, - "y": 0 - }, - "id": 52, - "options": { - "colorMode": "value", - "graphMode": "area", - "justifyMode": "auto", - "orientation": "auto", - "reduceOptions": { - "calcs": [], - "fields": "/.*/", - "values": true - }, - "textMode": "auto" - }, - "pluginVersion": "9.4.7", - "targets": [ - { - "datasource": { - "type": "postgres", - "uid": "mQGxoLf4z" - }, - "editorMode": "code", - "format": "table", - "rawQuery": true, - "rawSql": "select address::text from account where name = 'vrf'", - "refId": "A", - "sql": { - "columns": [ - { - "parameters": [], - "type": "function" - } - ], - "groupBy": [ - { - "property": { - "type": "string" - }, - "type": "groupBy" - } - ], - "limit": 50 - } - } - ], - "title": "VRF Reporter Account Address", - "type": "stat" - }, - { - "datasource": { - "type": "postgres", - "uid": "mQGxoLf4z" - }, - "fieldConfig": { - "defaults": { - "color": { - "mode": "thresholds" - }, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - }, - { - "color": "red", - "value": 80 - } - ] - } - }, - "overrides": [] - }, - "gridPos": { - "h": 3, - "w": 5, - "x": 19, - "y": 0 - }, - "id": 34, - "options": { - "colorMode": "none", - "graphMode": "area", - "justifyMode": "auto", - "orientation": "auto", - "reduceOptions": { - "calcs": [], - "fields": "/.*/", - "limit": 25, - "values": true - }, - "text": {}, - "textMode": "auto" - }, - "pluginVersion": "9.4.7", - "targets": [ - { - "datasource": { - "type": "postgres", - "uid": "mQGxoLf4z" - }, - "editorMode": "code", - "format": "table", - "rawQuery": true, - "rawSql": "select balance from balance where address = '0x1CBd3b2770909D4e10f157cABC84C7264073C9Ec'", - "refId": "A", - "sql": { - "columns": [ - { - "parameters": [], - "type": "function" - } - ], - "groupBy": [ - { - "property": { - "type": "string" - }, - "type": "groupBy" - } - ], - "limit": 50 - } - } - ], - "title": "Account Balance", - "type": "stat" - }, - { - "datasource": { - "type": "postgres", - "uid": "l_3DTLB4k" - }, - "fieldConfig": { - "defaults": { - "color": { - "mode": "thresholds" - }, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - }, - { - "color": "red", - "value": 80 - } - ] - } - }, - "overrides": [] - }, - "gridPos": { - "h": 3, - "w": 10, - "x": 3, - "y": 3 - }, - "id": 50, - "options": { - "colorMode": "value", - "graphMode": "area", - "justifyMode": "auto", - "orientation": "auto", - "reduceOptions": { - "calcs": [], - "fields": "/.*/", - "values": true - }, - "textMode": "auto" - }, - "pluginVersion": "9.4.7", - "targets": [ - { - "datasource": { - "type": "postgres", - "uid": "l_3DTLB4k" - }, - "editorMode": "code", - "format": "table", - "rawQuery": true, - "rawSql": "select replace(address::varchar, '\\x', '0x') AS contract from sgd1.chain_event limit 1;", - "refId": "A", - "sql": { - "columns": [ - { - "parameters": [], - "type": "function" - } - ], - "groupBy": [ - { - "property": { - "type": "string" - }, - "type": "groupBy" - } - ], - "limit": 50 - } - } - ], - "title": "VRF Coordinator Contract Address", - "type": "stat" - }, - { - "datasource": { - "type": "postgres", - "uid": "l_3DTLB4k" - }, - "fieldConfig": { - "defaults": { - "custom": { - "align": "center", - "cellOptions": { - "type": "auto" - }, - "inspect": false - }, - "decimals": 13, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "text", - "value": null - } - ] - } - }, - "overrides": [] - }, - "gridPos": { - "h": 3, - "w": 4, - "x": 13, - "y": 3 - }, - "id": 40, - "options": { - "footer": { - "countRows": false, - "fields": "", - "reducer": [ - "sum" - ], - "show": false - }, - "showHeader": false - }, - "pluginVersion": "9.4.7", - "targets": [ - { - "datasource": { - "type": "postgres", - "uid": "l_3DTLB4k" - }, - "editorMode": "code", - "format": "table", - "rawQuery": true, - "rawSql": "select (min_balance/1000000000000000000) as min_Balance from sgd1.vrf_min_balance_set", - "refId": "A", - "sql": { - "columns": [ - { - "parameters": [], - "type": "function" - } - ], - "groupBy": [ - { - "property": { - "type": "string" - }, - "type": "groupBy" - } - ], - "limit": 50 - } - } - ], - "title": "Min Balance", - "type": "table" - }, - { - "datasource": { - "type": "postgres", - "uid": "l_3DTLB4k" - }, - "fieldConfig": { - "defaults": { - "color": { - "mode": "continuous-GrYlRd" - }, - "custom": { - "align": "center", - "cellOptions": { - "type": "auto" - }, - "inspect": false - }, - "decimals": 13, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - }, - { - "color": "red", - "value": 80 - } - ] - } - }, - "overrides": [] - }, - "gridPos": { - "h": 3, - "w": 7, - "x": 17, - "y": 3 - }, - "id": 38, - "options": { - "footer": { - "countRows": false, - "fields": "", - "reducer": [ - "sum" - ], - "show": false - }, - "showHeader": true, - "sortBy": [ - { - "desc": true, - "displayName": "fulfillmentfee" - } - ] - }, - "pluginVersion": "9.4.7", - "targets": [ - { - "datasource": { - "type": "postgres", - "uid": "l_3DTLB4k" - }, - "editorMode": "code", - "format": "table", - "rawQuery": true, - "rawSql": "select \n(fulfillment_fee/1000000000000000000) as \"Fulfillment Fee\", \n(base_fee/1000000000000000000) as \"Base Fee\"\nfrom sgd1.vrf_direct_payment_config_set", - "refId": "A", - "sql": { - "columns": [ - { - "parameters": [], - "type": "function" - } - ], - "groupBy": [ - { - "property": { - "type": "string" - }, - "type": "groupBy" - } - ], - "limit": 50 - } - } - ], - "type": "table" - }, - { - "datasource": { - "type": "postgres", - "uid": "l_3DTLB4k" - }, - "fieldConfig": { - "defaults": { - "color": { - "mode": "continuous-GrYlRd" - }, - "custom": { - "align": "center", - "cellOptions": { - "type": "auto" - }, - "inspect": false - }, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - }, - { - "color": "red", - "value": 80 - } - ] - } - }, - "overrides": [] - }, - "gridPos": { - "h": 3, - "w": 24, - "x": 0, - "y": 6 - }, - "id": 36, - "options": { - "footer": { - "countRows": false, - "enablePagination": false, - "fields": "", - "reducer": [ - "sum" - ], - "show": false - }, - "showHeader": true, - "sortBy": [ - { - "desc": false, - "displayName": "gasafterpaymentcalculation" - } - ] - }, - "pluginVersion": "9.4.7", - "targets": [ - { - "datasource": { - "type": "postgres", - "uid": "l_3DTLB4k" - }, - "editorMode": "code", - "format": "table", - "rawQuery": true, - "rawSql": "select \nmax_gas_limit as max_gas_limit, \ngas_after_payment_calculation as apc_gas, \nfulfillment_flat_fee_klay_ppm_tier_1 as fee_ppmt_tier1,\nfulfillment_flat_fee_klay_ppm_tier_2 as fee_ppmt_tier2, \nfulfillment_flat_fee_klay_ppm_tier_3 as fee_ppmt_tier3, \nfulfillment_flat_fee_klay_ppm_tier_4 as fee_ppmt_tier4, \nfulfillment_flat_fee_klay_ppm_tier_5 as fee_ppmt_tier5, \nreqs_for_tier_2 as reqs_tier2, \nreqs_for_tier_3 as reqs_tier3, \nreqs_for_tier_4 as reqs_tier4, \nreqs_for_tier_5 as reqs_tier5 \nfrom sgd1.vrf_config_set", - "refId": "A", - "sql": { - "columns": [ - { - "parameters": [], - "type": "function" - } - ], - "groupBy": [ - { - "property": { - "type": "string" - }, - "type": "groupBy" - } - ], - "limit": 50 - } - } - ], - "type": "table" - }, - { - "datasource": { - "type": "postgres", - "uid": "l_3DTLB4k" - }, - "fieldConfig": { - "defaults": { - "color": { - "mode": "palette-classic" - }, - "custom": { - "hideFrom": { - "legend": false, - "tooltip": false, - "viz": false - } - }, - "mappings": [] - }, - "overrides": [] - }, - "gridPos": { - "h": 6, - "w": 6, - "x": 0, - "y": 9 - }, - "id": 46, - "options": { - "displayLabels": [ - "percent" - ], - "legend": { - "displayMode": "list", - "placement": "right", - "showLegend": true, - "values": [] - }, - "pieType": "pie", - "reduceOptions": { - "calcs": [ - "lastNotNull" - ], - "fields": "", - "values": false - }, - "tooltip": { - "mode": "single", - "sort": "none" - } - }, - "pluginVersion": "9.3.6", - "targets": [ - { - "datasource": { - "type": "postgres", - "uid": "l_3DTLB4k" - }, - "editorMode": "code", - "format": "table", - "rawQuery": true, - "rawSql": "select sum(CASE WHEN is_direct_payment is TRUE then 1 else 0 END) AS direct_Payment, sum(CASE WHEN is_direct_payment is False then 1 else 0 END) AS pre_Payment from sgd1.vrf_random_words_requested", - "refId": "A", - "sql": { - "columns": [ - { - "parameters": [], - "type": "function" - } - ], - "groupBy": [ - { - "property": { - "type": "string" - }, - "type": "groupBy" - } - ], - "limit": 50 - } - } - ], - "title": "Payment Method", - "type": "piechart" - }, - { - "datasource": { - "type": "postgres", - "uid": "l_3DTLB4k" - }, - "fieldConfig": { - "defaults": { - "custom": { - "align": "center", - "cellOptions": { - "type": "auto" - }, - "inspect": false - }, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - }, - { - "color": "red", - "value": 80 - } - ] - } - }, - "overrides": [] - }, - "gridPos": { - "h": 6, - "w": 18, - "x": 6, - "y": 9 - }, - "id": 42, - "options": { - "footer": { - "countRows": false, - "fields": "", - "reducer": [ - "sum" - ], - "show": false - }, - "showHeader": true, - "sortBy": [ - { - "desc": true, - "displayName": "oracl" - } - ] - }, - "pluginVersion": "9.4.7", - "targets": [ - { - "datasource": { - "type": "postgres", - "uid": "l_3DTLB4k" - }, - "editorMode": "code", - "format": "table", - "rawQuery": true, - "rawSql": " select replace(key_hash::varchar, '\\x', '0x') as \"Key Hash\", replace(oracle::varchar, '\\x', '0x') as \"Oracle\"\n from sgd1.vrf_proving_key_registered\n where key_hash not in (select key_hash from sgd1.vrf_proving_key_deregistered)", - "refId": "A", - "sql": { - "columns": [ - { - "parameters": [], - "type": "function" - } - ], - "groupBy": [ - { - "property": { - "type": "string" - }, - "type": "groupBy" - } - ], - "limit": 50 - } - } - ], - "title": "Registered Proving Keys", - "type": "table" - }, - { - "datasource": { - "type": "postgres", - "uid": "l_3DTLB4k" - }, - "fieldConfig": { - "defaults": { - "color": { - "mode": "palette-classic" - }, - "custom": { - "axisCenteredZero": false, - "axisColorMode": "text", - "axisLabel": "", - "axisPlacement": "auto", - "barAlignment": 0, - "drawStyle": "line", - "fillOpacity": 0, - "gradientMode": "none", - "hideFrom": { - "legend": false, - "tooltip": false, - "viz": false - }, - "lineInterpolation": "smooth", - "lineWidth": 1, - "pointSize": 5, - "scaleDistribution": { - "type": "linear" - }, - "showPoints": "auto", - "spanNulls": false, - "stacking": { - "group": "A", - "mode": "none" - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - }, - { - "color": "red", - "value": 80 - } - ] - } - }, - "overrides": [] - }, - "gridPos": { - "h": 8, - "w": 12, - "x": 0, - "y": 15 - }, - "id": 1, - "interval": "60m", - "options": { - "legend": { - "calcs": [], - "displayMode": "list", - "placement": "right", - "showLegend": true - }, - "tooltip": { - "mode": "single", - "sort": "none" - } - }, - "targets": [ - { - "datasource": { - "type": "postgres", - "uid": "l_3DTLB4k" - }, - "editorMode": "code", - "format": "time_series", - "key": "Q-4aa9504c-9494-487a-b9ce-29ff4186b0f5-0", - "rawQuery": true, - "rawSql": "select sum(vrf_random_words_requested) requested, sum(vrf_random_words_fulfilled) fulfilled, time from sgd1.vrf_requested_fulfilled_hour where time <= NOW() - INTERVAL '1 hour' GROUP BY \ntime order by time asc ", - "refId": "A", - "sql": { - "columns": [ - { - "parameters": [], - "type": "function" - } - ], - "groupBy": [ - { - "property": { - "type": "string" - }, - "type": "groupBy" - } - ], - "limit": 50 - } - } - ], - "title": "Event: Requested&Fulfilled by Hour", - "type": "timeseries" - }, - { - "datasource": { - "type": "postgres", - "uid": "l_3DTLB4k" - }, - "fieldConfig": { - "defaults": { - "color": { - "mode": "palette-classic" - }, - "custom": { - "axisCenteredZero": false, - "axisColorMode": "text", - "axisLabel": "", - "axisPlacement": "auto", - "barAlignment": 0, - "drawStyle": "line", - "fillOpacity": 0, - "gradientMode": "none", - "hideFrom": { - "legend": false, - "tooltip": false, - "viz": false - }, - "lineInterpolation": "smooth", - "lineWidth": 1, - "pointSize": 5, - "scaleDistribution": { - "type": "linear" - }, - "showPoints": "auto", - "spanNulls": false, - "stacking": { - "group": "A", - "mode": "none" - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - }, - { - "color": "red", - "value": 80 - } - ] - } - }, - "overrides": [] - }, - "gridPos": { - "h": 8, - "w": 12, - "x": 12, - "y": 15 - }, - "id": 3, - "options": { - "legend": { - "calcs": [], - "displayMode": "list", - "placement": "right", - "showLegend": true - }, - "tooltip": { - "mode": "single", - "sort": "none" - } - }, - "targets": [ - { - "datasource": { - "type": "postgres", - "uid": "l_3DTLB4k" - }, - "editorMode": "code", - "format": "time_series", - "rawQuery": true, - "rawSql": "select sum(vrf_random_words_requested) requested, sum(vrf_random_words_fulfilled) fulfilled, time from sgd1.vrf_requested_fulfilled_min where time <= NOW() - INTERVAL '1 min' GROUP BY \ntime order by time asc ", - "refId": "A", - "sql": { - "columns": [ - { - "parameters": [], - "type": "function" - } - ], - "groupBy": [ - { - "property": { - "type": "string" - }, - "type": "groupBy" - } - ], - "limit": 50 - } - } - ], - "title": "Event: Requested&Fulfilled by Min", - "type": "timeseries" - }, - { - "datasource": { - "type": "postgres", - "uid": "l_3DTLB4k" - }, - "fieldConfig": { - "defaults": { - "mappings": [], - "thresholds": { - "mode": "percentage", - "steps": [ - { - "color": "green" - }, - { - "color": "orange", - "value": 70 - }, - { - "color": "red", - "value": 85 - } - ] - } - }, - "overrides": [] - }, - "gridPos": { - "h": 6, - "w": 8, - "x": 0, - "y": 23 - }, - "id": 27, - "options": { - "orientation": "auto", - "reduceOptions": { - "calcs": [ - "lastNotNull" - ], - "fields": "", - "values": false - }, - "showThresholdLabels": false, - "showThresholdMarkers": true - }, - "pluginVersion": "9.4.7", - "targets": [ - { - "datasource": { - "type": "postgres", - "uid": "l_3DTLB4k" - }, - "editorMode": "code", - "format": "table", - "rawQuery": true, - "rawSql": "select \n(select count(*) from sgd1.vrf_random_words_requested where to_timestamp(time) > current_timestamp - interval '1 mins') AS random_words_requested,\n(select count(*) from sgd1.vrf_random_words_fulfilled where to_timestamp(time) > current_timestamp - interval '1 mins') AS random_words_fulfilled", - "refId": "A", - "sql": { - "columns": [ - { - "parameters": [], - "type": "function" - } - ], - "groupBy": [ - { - "property": { - "type": "string" - }, - "type": "groupBy" - } - ], - "limit": 50 - } - } - ], - "title": "Requested VS Fulfilled (1 min)", - "type": "gauge" - }, - { - "datasource": { - "type": "postgres", - "uid": "l_3DTLB4k" - }, - "fieldConfig": { - "defaults": { - "mappings": [], - "thresholds": { - "mode": "percentage", - "steps": [ - { - "color": "green" - }, - { - "color": "orange", - "value": 70 - }, - { - "color": "red", - "value": 85 - } - ] - } - }, - "overrides": [] - }, - "gridPos": { - "h": 6, - "w": 8, - "x": 8, - "y": 23 - }, - "id": 32, - "options": { - "orientation": "auto", - "reduceOptions": { - "calcs": [ - "lastNotNull" - ], - "fields": "", - "values": false - }, - "showThresholdLabels": false, - "showThresholdMarkers": true - }, - "pluginVersion": "9.4.7", - "targets": [ - { - "datasource": { - "type": "postgres", - "uid": "l_3DTLB4k" - }, - "editorMode": "code", - "format": "table", - "rawQuery": true, - "rawSql": "select \n(select count(*) from sgd1.vrf_random_words_requested where to_timestamp(time) > current_timestamp - interval '1 hours') AS random_words_requested,\n(select count(*) from sgd1.vrf_random_words_fulfilled where to_timestamp(time) > current_timestamp - interval '1 hours') AS random_words_fulfilled", - "refId": "A", - "sql": { - "columns": [ - { - "parameters": [], - "type": "function" - } - ], - "groupBy": [ - { - "property": { - "type": "string" - }, - "type": "groupBy" - } - ], - "limit": 50 - } - } - ], - "title": "Requested VS Fulfilled (1 hour)", - "type": "gauge" - }, - { - "datasource": { - "type": "postgres", - "uid": "l_3DTLB4k" - }, - "fieldConfig": { - "defaults": { - "mappings": [], - "thresholds": { - "mode": "percentage", - "steps": [ - { - "color": "green" - }, - { - "color": "orange", - "value": 70 - }, - { - "color": "red", - "value": 85 - } - ] - } - }, - "overrides": [] - }, - "gridPos": { - "h": 6, - "w": 8, - "x": 16, - "y": 23 - }, - "id": 29, - "options": { - "orientation": "auto", - "reduceOptions": { - "calcs": [ - "lastNotNull" - ], - "fields": "", - "values": false - }, - "showThresholdLabels": false, - "showThresholdMarkers": true - }, - "pluginVersion": "9.4.7", - "targets": [ - { - "datasource": { - "type": "postgres", - "uid": "l_3DTLB4k" - }, - "editorMode": "code", - "format": "table", - "rawQuery": true, - "rawSql": "select \n(select count(*) from sgd1.vrf_random_words_requested where to_timestamp(time) > current_timestamp - interval '24 hours') AS random_words_requested,\n(select count(*) from sgd1.vrf_random_words_fulfilled where to_timestamp(time) > current_timestamp - interval '24 hours') AS random_words_fulfilled", - "refId": "A", - "sql": { - "columns": [ - { - "parameters": [], - "type": "function" - } - ], - "groupBy": [ - { - "property": { - "type": "string" - }, - "type": "groupBy" - } - ], - "limit": 50 - } - } - ], - "title": "Requested VS Fulfilled (1 day)", - "type": "gauge" - }, - { - "datasource": { - "type": "postgres", - "uid": "l_3DTLB4k" - }, - "fieldConfig": { - "defaults": { - "custom": { - "align": "auto", - "cellOptions": { - "type": "auto" - }, - "filterable": true, - "inspect": false - }, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green" - }, - { - "color": "red", - "value": 80 - } - ] - } - }, - "overrides": [] - }, - "gridPos": { - "h": 22, - "w": 24, - "x": 0, - "y": 29 - }, - "id": 48, - "options": { - "footer": { - "countRows": false, - "fields": "", - "reducer": [ - "sum" - ], - "show": false - }, - "showHeader": true, - "sortBy": [ - { - "desc": true, - "displayName": "time" - } - ] - }, - "pluginVersion": "9.4.7", - "targets": [ - { - "datasource": { - "type": "postgres", - "uid": "l_3DTLB4k" - }, - "editorMode": "code", - "format": "table", - "rawQuery": true, - "rawSql": "select T1.id, T1.request_id::varchar, T1.acc_id, T1.callback_gas_limit, T1.num_words, replace(T1.sender::varchar, '\\x', '0x') AS sender, T1.is_direct_payment, T1.time from sgd1.vrf_random_words_requested AS T1 LEFT JOIN sgd1.vrf_random_words_fulfilled AS T2 ON T1.request_id = T2.request_id where T2.vid is null order by T1.time desc limit 20;", - "refId": "A", - "sql": { - "columns": [ - { - "parameters": [], - "type": "function" - } - ], - "groupBy": [ - { - "property": { - "type": "string" - }, - "type": "groupBy" - } - ], - "limit": 50 - } - } - ], - "title": "Last 20 request not fulfilled", - "type": "table" - } - ], - "refresh": "5s", - "revision": 1, - "schemaVersion": 38, - "style": "dark", - "tags": [], - "templating": { - "list": [] - }, - "time": { - "from": "now-24h", - "to": "now" - }, - "timepicker": {}, - "timezone": "browser", - "title": "VRF", - "uid": "l1QVecJ4z", - "version": 13, - "weekStart": "" - } \ No newline at end of file diff --git a/manifest/argocd/baobab/grafana-as-code.yaml b/manifest/argocd/baobab/grafana-as-code.yaml index feb61963..4df41a1a 100644 --- a/manifest/argocd/baobab/grafana-as-code.yaml +++ b/manifest/argocd/baobab/grafana-as-code.yaml @@ -12,4 +12,6 @@ spec: path: grafana-as-code/ repoURL: https://github.com/Bisonai/orakl-helm-charts.git targetRevision: gcp-baobab-prod - syncPolicy: {} + syncPolicy: + automated: + prune: true From 76a119127140635df4dd208edfb1c74635dbf726 Mon Sep 17 00:00:00 2001 From: Nick <148735107+nick-bisonai@users.noreply.github.com> Date: Mon, 29 Jan 2024 15:51:37 +0900 Subject: [PATCH 113/190] feat: update grafana monitor db url (#143) --- grafana-as-code/Chart.yaml | 2 +- grafana-as-code/values.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/grafana-as-code/Chart.yaml b/grafana-as-code/Chart.yaml index 868dbe1f..63be84fe 100644 --- a/grafana-as-code/Chart.yaml +++ b/grafana-as-code/Chart.yaml @@ -3,4 +3,4 @@ name: orakl-grafana-as-code description: A Grafana dashboard made by code type: application version: 0.1.0 -appVersion: "monitor.v1.0.0.20240119.0735.12e7f08" +appVersion: "monitor.v1.0.0.20240129.0626.292d2c0" diff --git a/grafana-as-code/values.yaml b/grafana-as-code/values.yaml index fd3f34b9..6f25b187 100644 --- a/grafana-as-code/values.yaml +++ b/grafana-as-code/values.yaml @@ -1,7 +1,7 @@ image: repository: asia-southeast1-docker.pkg.dev/vpc-host-orakl-prod/orakl/orakl-grafana #repository url pullPolicy: IfNotPresent - tag: "monitor.v1.0.0.20240119.0735.12e7f08" + tag: "monitor.v1.0.0.20240129.0626.292d2c0" imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: @@ -9,4 +9,4 @@ image: deployment: name: orakl-grafana-as-code - replicas: 1 \ No newline at end of file + replicas: 1 From 0a6a7f01acf1032dcf31475b156e58a907447688 Mon Sep 17 00:00:00 2001 From: Nick <148735107+nick-bisonai@users.noreply.github.com> Date: Tue, 30 Jan 2024 14:06:49 +0900 Subject: [PATCH 114/190] fix: update url (#146) --- grafana-as-code/Chart.yaml | 2 +- grafana-as-code/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/grafana-as-code/Chart.yaml b/grafana-as-code/Chart.yaml index 63be84fe..7f2d3868 100644 --- a/grafana-as-code/Chart.yaml +++ b/grafana-as-code/Chart.yaml @@ -3,4 +3,4 @@ name: orakl-grafana-as-code description: A Grafana dashboard made by code type: application version: 0.1.0 -appVersion: "monitor.v1.0.0.20240129.0626.292d2c0" +appVersion: "monitor.v1.0.0.20240130.0252.f052f5f" diff --git a/grafana-as-code/values.yaml b/grafana-as-code/values.yaml index 6f25b187..5b35a181 100644 --- a/grafana-as-code/values.yaml +++ b/grafana-as-code/values.yaml @@ -1,7 +1,7 @@ image: repository: asia-southeast1-docker.pkg.dev/vpc-host-orakl-prod/orakl/orakl-grafana #repository url pullPolicy: IfNotPresent - tag: "monitor.v1.0.0.20240129.0626.292d2c0" + tag: "monitor.v1.0.0.20240130.0252.f052f5f" imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: From a8bfe77b711b32ed25018cba8b5cfa5adcebaf24 Mon Sep 17 00:00:00 2001 From: Nick <148735107+nick-bisonai@users.noreply.github.com> Date: Tue, 30 Jan 2024 14:33:40 +0900 Subject: [PATCH 115/190] (BAOBAB) goapi baobab deployment (#139) * feat: helm chart for goapi baobab deployment * feat: add deployment.yaml * fix: updates based on feedbacks * fix: update based on feedback --- goapi/Chart.yaml | 24 +++++++ goapi/templates/deployment.yaml | 104 ++++++++++++++++++++++++++++++ goapi/templates/service.yaml | 10 +++ goapi/values.yaml | 58 +++++++++++++++++ manifest/argocd/baobab/goapi.yaml | 15 +++++ secret-store/goapi-secret.yaml | 26 ++++++++ 6 files changed, 237 insertions(+) create mode 100644 goapi/Chart.yaml create mode 100644 goapi/templates/deployment.yaml create mode 100644 goapi/templates/service.yaml create mode 100644 goapi/values.yaml create mode 100644 manifest/argocd/baobab/goapi.yaml create mode 100644 secret-store/goapi-secret.yaml diff --git a/goapi/Chart.yaml b/goapi/Chart.yaml new file mode 100644 index 00000000..08816594 --- /dev/null +++ b/goapi/Chart.yaml @@ -0,0 +1,24 @@ +apiVersion: v2 +name: orakl-goapi +description: A Helm chart for Kubernetes + +# A chart can be either an 'application' or a 'library' chart. +# +# Application charts are a collection of templates that can be packaged into versioned archives +# to be deployed. +# +# Library charts provide useful utilities or functions for the chart developer. They're included as +# a dependency of application charts to inject those utilities and functions into the rendering +# pipeline. Library charts do not define any templates and therefore cannot be deployed. +type: application + +# This is the chart version. This version number should be incremented each time you make changes +# to the chart and its templates, including the app version. +# Versions are expected to follow Semantic Versioning (https://semver.org/) +version: 0.1.0 + +# This is the version number of the application being deployed. This version number should be +# incremented each time you make changes to the application. Versions are not expected to +# follow Semantic Versioning. They should reflect the version the application is using. +# It is recommended to use it with quotes. +appVersion: "v0.0.1.20240129.0259.73fc98c" diff --git a/goapi/templates/deployment.yaml b/goapi/templates/deployment.yaml new file mode 100644 index 00000000..8b46277c --- /dev/null +++ b/goapi/templates/deployment.yaml @@ -0,0 +1,104 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: goapi + +spec: + replicas: {{ .Values.api.replicas }} + selector: + matchLabels: + app: {{ .Values.deployment.name }} + template: + metadata: + {{- with .Values.global.podAnnotations }} + annotations: + {{- toYaml . | nindent 8 }} + {{- end }} + labels: + app: {{ .Values.deployment.name }} + spec: + {{- with .Values.global.image.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} + securityContext: + {{- toYaml .Values.api.podSecurityContext | nindent 8 }} + {{- if .Values.global.affinity.enabled }} + affinity: + nodeAffinity: + preferredDuringSchedulingIgnoredDuringExecution: + - weight: 1 + preference: + matchExpressions: + - key: {{ .Values.global.affinity.key }} + operator: In + values: + - {{ .Values.global.affinity.value }} + {{- end }} + containers: + - name: {{ .Chart.Name }} + securityContext: + {{- toYaml .Values.api.containerSecurityContext | nindent 12 }} + image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.tag | default .Chart.AppVersion }}" + imagePullPolicy: {{ .Values.global.image.pullPolicy }} + env: + - name: DATABASE_URL + valueFrom: + secretKeyRef: + name: goapi-secrets + key: DATABASE_URL + - name: ENCRYPT_PASSWORD + valueFrom: + secretKeyRef: + name: goapi-secrets + key: ENCRYPT_PASSWORD + - name: APP_PORT + value: "3030" + - name: REDIS_HOST + valueFrom: + secretKeyRef: + name: goapi-secrets + key: REDIS_HOST + - name: REDIS_PORT + valueFrom: + secretKeyRef: + name: goapi-secrets + key: REDIS_PORT + command: ["yarn"] + args: ["start:prod"] + ports: + - name: http + containerPort: 3030 + {{- if .Values.global.livenessProbe.enabled }} + livenessProbe: + httpGet: + path: {{ .Values.global.livenessProbe.path }} + port: 3030 + initialDelaySeconds: {{ .Values.global.livenessProbe.initialDelaySeconds }} + periodSeconds: {{ .Values.global.livenessProbe.periodSeconds }} + timeoutSeconds: {{ .Values.global.livenessProbe.timeoutSeconds }} + successThreshold: {{ .Values.global.livenessProbe.successThreshold }} + failureThreshold: {{ .Values.global.livenessProbe.failureThreshold }} + {{- end }} + {{- if .Values.global.readinessProbe.enabled }} + readinessProbe: + httpGet: + path: {{ .Values.global.readinessProbe.path }} + port: 3030 + initialDelaySeconds: {{ .Values.global.readinessProbe.initialDelaySeconds }} + periodSeconds: {{ .Values.global.readinessProbe.periodSeconds }} + timeoutSeconds: {{ .Values.global.readinessProbe.timeoutSeconds }} + successThreshold: {{ .Values.global.readinessProbe.successThreshold }} + failureThreshold: {{ .Values.global.readinessProbe.failureThreshold }} + {{- end }} + resources: + {{- toYaml .Values.api.resources | nindent 12 }} + + {{- with .Values.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.tolerations }} + tolerations: + {{- toYaml . | nindent 8 }} + {{- end }} diff --git a/goapi/templates/service.yaml b/goapi/templates/service.yaml new file mode 100644 index 00000000..bcc6e933 --- /dev/null +++ b/goapi/templates/service.yaml @@ -0,0 +1,10 @@ +apiVersion: v1 +kind: Service +metadata: + name: orakl-goapi +spec: + type: ClusterIP + ports: + - port: 3030 + targetPort: http + protocol: TCP diff --git a/goapi/values.yaml b/goapi/values.yaml new file mode 100644 index 00000000..f72006cf --- /dev/null +++ b/goapi/values.yaml @@ -0,0 +1,58 @@ +## Klaytn Orakl Api Configuration +## created by Bisonai +global: + image: + repository: public.ecr.aws/bisonai/orakl-goapi + pullPolicy: IfNotPresent + tag: "v0.0.1.20240129.0259.73fc98c" + imagePullPolicy: IfNotPresent + # -- If defined, uses a Secret to pull an image from a private Docker registry or repository + imagePullSecrets: [] + + affinity: + enabled: false + key: kubernetes.io/hostname + value: + + podAnnotations: {} + + livenessProbe: + enabled: true + path: /api/v1/ + initialDelaySeconds: 10 + periodSeconds: 5 + timeoutSeconds: 5 + successThreshold: 1 + failureThreshold: 5 + + readinessProbe: + enabled: true + path: /api/v1/ + initialDelaySeconds: 10 + periodSeconds: 5 + timeoutSeconds: 5 + successThreshold: 1 + failureThreshold: 5 + +api: + enabled: true + replicas: 1 + podSecurityContext: {} + + containerSecurityContext: {} + + resources: + limits: + cpu: 2000m + memory: 4Gi + requests: + cpu: 2000m + memory: 4Gi + +nodeSelector: {} +tolerations: [] +dotenv: {} + +deployment: + name: orakl-goapi + replicas: 1 diff --git a/manifest/argocd/baobab/goapi.yaml b/manifest/argocd/baobab/goapi.yaml new file mode 100644 index 00000000..cf482747 --- /dev/null +++ b/manifest/argocd/baobab/goapi.yaml @@ -0,0 +1,15 @@ +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: goapi + namespace: argocd +spec: + destination: + namespace: orakl + server: https://kubernetes.default.svc + project: default + source: + path: goapi/ + repoURL: https://github.com/Bisonai/orakl-helm-charts.git + targetRevision: gcp-baobab-prod + syncPolicy: {} diff --git a/secret-store/goapi-secret.yaml b/secret-store/goapi-secret.yaml new file mode 100644 index 00000000..1bac1010 --- /dev/null +++ b/secret-store/goapi-secret.yaml @@ -0,0 +1,26 @@ +apiVersion: external-secrets.io/v1beta1 +kind: ExternalSecret +metadata: + name: goapi-secrets +spec: + refreshInterval: "15s" + secretStoreRef: + name: vault-backend + kind: SecretStore + data: + - secretKey: DATABASE_URL + remoteRef: + key: baobab/goapi + property: DATABASE_URL + - secretKey: ENCRYPT_PASSWORD + remoteRef: + key: baobab/goapi + property: ENCRYPT_PASSWORD + - secretKey: REDIS_HOST + remoteRef: + key: baobab/goapi + property: REDIS_HOST + - secretKey: REDIS_PORT + remoteRef: + key: baobab/goapi + property: REDIS_PORT From 4eea72cd4994b8fb49b42fdd94d7963df7b1bfef Mon Sep 17 00:00:00 2001 From: Nick <148735107+nick-bisonai@users.noreply.github.com> Date: Tue, 30 Jan 2024 15:12:54 +0900 Subject: [PATCH 116/190] fix: remove start command for goapi (#147) --- goapi/templates/deployment.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/goapi/templates/deployment.yaml b/goapi/templates/deployment.yaml index 8b46277c..332da5a2 100644 --- a/goapi/templates/deployment.yaml +++ b/goapi/templates/deployment.yaml @@ -64,8 +64,6 @@ spec: secretKeyRef: name: goapi-secrets key: REDIS_PORT - command: ["yarn"] - args: ["start:prod"] ports: - name: http containerPort: 3030 From 1f5d052b94b3c405aa1129ca391db2a5b6c264c5 Mon Sep 17 00:00:00 2001 From: Nick <148735107+nick-bisonai@users.noreply.github.com> Date: Tue, 30 Jan 2024 15:41:24 +0900 Subject: [PATCH 117/190] fix: update command for goapi (#148) --- goapi/Chart.yaml | 2 +- goapi/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/goapi/Chart.yaml b/goapi/Chart.yaml index 08816594..bd44e52f 100644 --- a/goapi/Chart.yaml +++ b/goapi/Chart.yaml @@ -21,4 +21,4 @@ version: 0.1.0 # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "v0.0.1.20240129.0259.73fc98c" +appVersion: "v0.0.1.20240130.0632.e92545f" diff --git a/goapi/values.yaml b/goapi/values.yaml index f72006cf..4764dc95 100644 --- a/goapi/values.yaml +++ b/goapi/values.yaml @@ -4,7 +4,7 @@ global: image: repository: public.ecr.aws/bisonai/orakl-goapi pullPolicy: IfNotPresent - tag: "v0.0.1.20240129.0259.73fc98c" + tag: "v0.0.1.20240130.0632.e92545f" imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: [] From c2519a6660c6182127c23516c447b5d5a87ee06f Mon Sep 17 00:00:00 2001 From: Nick <148735107+nick-bisonai@users.noreply.github.com> Date: Tue, 30 Jan 2024 16:06:17 +0900 Subject: [PATCH 118/190] fix: update docker image (#149) --- goapi/Chart.yaml | 2 +- goapi/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/goapi/Chart.yaml b/goapi/Chart.yaml index bd44e52f..4c7c27b8 100644 --- a/goapi/Chart.yaml +++ b/goapi/Chart.yaml @@ -21,4 +21,4 @@ version: 0.1.0 # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "v0.0.1.20240130.0632.e92545f" +appVersion: "v0.0.1.20240130.0700.3051e99" diff --git a/goapi/values.yaml b/goapi/values.yaml index 4764dc95..4b677638 100644 --- a/goapi/values.yaml +++ b/goapi/values.yaml @@ -4,7 +4,7 @@ global: image: repository: public.ecr.aws/bisonai/orakl-goapi pullPolicy: IfNotPresent - tag: "v0.0.1.20240130.0632.e92545f" + tag: "v0.0.1.20240130.0700.3051e99" imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: [] From a071531115c284053a2107ac97a0b7f1593f7bfd Mon Sep 17 00:00:00 2001 From: Nick <148735107+nick-bisonai@users.noreply.github.com> Date: Tue, 30 Jan 2024 17:12:54 +0900 Subject: [PATCH 119/190] fix: update baobab goapi version (#150) --- goapi/Chart.yaml | 2 +- goapi/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/goapi/Chart.yaml b/goapi/Chart.yaml index 4c7c27b8..cec88125 100644 --- a/goapi/Chart.yaml +++ b/goapi/Chart.yaml @@ -21,4 +21,4 @@ version: 0.1.0 # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "v0.0.1.20240130.0700.3051e99" +appVersion: "v0.0.1.20240130.0807.28db8b9" diff --git a/goapi/values.yaml b/goapi/values.yaml index 4b677638..c05a1695 100644 --- a/goapi/values.yaml +++ b/goapi/values.yaml @@ -4,7 +4,7 @@ global: image: repository: public.ecr.aws/bisonai/orakl-goapi pullPolicy: IfNotPresent - tag: "v0.0.1.20240130.0700.3051e99" + tag: "v0.0.1.20240130.0807.28db8b9" imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: [] From 2698612d509b637006e0706e7899d74c80d87b89 Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Tue, 30 Jan 2024 18:17:10 +0900 Subject: [PATCH 120/190] (BAOBAB) Add labels to deployment.yaml and selector to service.yaml (#151) --- goapi/templates/deployment.yaml | 3 ++- goapi/templates/service.yaml | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/goapi/templates/deployment.yaml b/goapi/templates/deployment.yaml index 332da5a2..368aa447 100644 --- a/goapi/templates/deployment.yaml +++ b/goapi/templates/deployment.yaml @@ -2,12 +2,13 @@ apiVersion: apps/v1 kind: Deployment metadata: name: goapi - spec: replicas: {{ .Values.api.replicas }} selector: matchLabels: app: {{ .Values.deployment.name }} + app.kubernetes.io/name: {{ .Values.deployment.name }} + app.kubernetes.io/instance: {{ .Values.deployment.name }} template: metadata: {{- with .Values.global.podAnnotations }} diff --git a/goapi/templates/service.yaml b/goapi/templates/service.yaml index bcc6e933..d0c0cc68 100644 --- a/goapi/templates/service.yaml +++ b/goapi/templates/service.yaml @@ -8,3 +8,5 @@ spec: - port: 3030 targetPort: http protocol: TCP + selector: + app: {{ .Values.deployment.name }} \ No newline at end of file From 88473431fd26cac3b5c7faa44d20355bc49c2084 Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Tue, 30 Jan 2024 18:53:16 +0900 Subject: [PATCH 121/190] (BAOBAB) Fix goapi's sync error in ArgoCD (#152) * fix: Add more labels * feat: Update deployment labels to include "-goapi" suffix * feat: Update deployment labels in deployment.yaml * feat: Update deployment labels in deployment.yaml --- goapi/templates/deployment.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/goapi/templates/deployment.yaml b/goapi/templates/deployment.yaml index 368aa447..e092826e 100644 --- a/goapi/templates/deployment.yaml +++ b/goapi/templates/deployment.yaml @@ -2,6 +2,10 @@ apiVersion: apps/v1 kind: Deployment metadata: name: goapi + labels: + app: {{ .Values.deployment.name }} + app.kubernetes.io/name: {{ .Values.deployment.name }} + app.kubernetes.io/instance: {{ .Values.deployment.name }} spec: replicas: {{ .Values.api.replicas }} selector: @@ -17,6 +21,8 @@ spec: {{- end }} labels: app: {{ .Values.deployment.name }} + app.kubernetes.io/name: {{ .Values.deployment.name }} + app.kubernetes.io/instance: {{ .Values.deployment.name }} spec: {{- with .Values.global.image.imagePullSecrets }} imagePullSecrets: From ceb2535403d3ba28f087be9584dbee30c1c50a5f Mon Sep 17 00:00:00 2001 From: Nick <148735107+nick-bisonai@users.noreply.github.com> Date: Tue, 30 Jan 2024 19:02:56 +0900 Subject: [PATCH 122/190] fix: update image (#153) --- goapi/Chart.yaml | 2 +- goapi/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/goapi/Chart.yaml b/goapi/Chart.yaml index cec88125..a18a9cb3 100644 --- a/goapi/Chart.yaml +++ b/goapi/Chart.yaml @@ -21,4 +21,4 @@ version: 0.1.0 # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "v0.0.1.20240130.0807.28db8b9" +appVersion: "v0.0.1.20240130.0951.47bb0fa" diff --git a/goapi/values.yaml b/goapi/values.yaml index c05a1695..2d0dd29c 100644 --- a/goapi/values.yaml +++ b/goapi/values.yaml @@ -4,7 +4,7 @@ global: image: repository: public.ecr.aws/bisonai/orakl-goapi pullPolicy: IfNotPresent - tag: "v0.0.1.20240130.0807.28db8b9" + tag: "v0.0.1.20240130.0951.47bb0fa" imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: [] From a43d7a49a824e58caf3755989fa2a6cf43b38399 Mon Sep 17 00:00:00 2001 From: Nick <148735107+nick-bisonai@users.noreply.github.com> Date: Tue, 30 Jan 2024 19:40:36 +0900 Subject: [PATCH 123/190] fix: goapi logging (#154) --- goapi/Chart.yaml | 2 +- goapi/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/goapi/Chart.yaml b/goapi/Chart.yaml index a18a9cb3..e2ef8fcf 100644 --- a/goapi/Chart.yaml +++ b/goapi/Chart.yaml @@ -21,4 +21,4 @@ version: 0.1.0 # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "v0.0.1.20240130.0951.47bb0fa" +appVersion: "v0.0.1.20240130.1033.0085751" diff --git a/goapi/values.yaml b/goapi/values.yaml index 2d0dd29c..0071a181 100644 --- a/goapi/values.yaml +++ b/goapi/values.yaml @@ -4,7 +4,7 @@ global: image: repository: public.ecr.aws/bisonai/orakl-goapi pullPolicy: IfNotPresent - tag: "v0.0.1.20240130.0951.47bb0fa" + tag: "v0.0.1.20240130.1033.0085751" imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: [] From 50098bce7b390fe3705710bd1459613eaf70be70 Mon Sep 17 00:00:00 2001 From: Nick <148735107+nick-bisonai@users.noreply.github.com> Date: Wed, 31 Jan 2024 10:06:19 +0900 Subject: [PATCH 124/190] fix: use pgxPool instead of pgxConn (#155) --- goapi/Chart.yaml | 2 +- goapi/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/goapi/Chart.yaml b/goapi/Chart.yaml index e2ef8fcf..e24f054e 100644 --- a/goapi/Chart.yaml +++ b/goapi/Chart.yaml @@ -21,4 +21,4 @@ version: 0.1.0 # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "v0.0.1.20240130.1033.0085751" +appVersion: "v0.0.1.20240130.1147.acdb984" diff --git a/goapi/values.yaml b/goapi/values.yaml index 0071a181..5ed33127 100644 --- a/goapi/values.yaml +++ b/goapi/values.yaml @@ -4,7 +4,7 @@ global: image: repository: public.ecr.aws/bisonai/orakl-goapi pullPolicy: IfNotPresent - tag: "v0.0.1.20240130.1033.0085751" + tag: "v0.0.1.20240130.1147.acdb984" imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: [] From bbcb61518b720fe27540bcc473fbfdff4163ed9b Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Wed, 31 Jan 2024 14:32:24 +0900 Subject: [PATCH 125/190] (BAOBAB) The health-check URL of api change to goapi (#156) --- bisontry-health-checker/Chart.yaml | 2 +- bisontry-health-checker/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bisontry-health-checker/Chart.yaml b/bisontry-health-checker/Chart.yaml index b52e3943..ad883016 100644 --- a/bisontry-health-checker/Chart.yaml +++ b/bisontry-health-checker/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v2 name: bisontry-health-checker description: Bisontry Health Checker service. version: 0.1.0 -appVersion: v0.1.0.20231219.0733.2bb7b86 +appVersion: v0.1.0.20240131.0523.c3d8172 diff --git a/bisontry-health-checker/values.yaml b/bisontry-health-checker/values.yaml index a54b37f3..8d8a5e46 100644 --- a/bisontry-health-checker/values.yaml +++ b/bisontry-health-checker/values.yaml @@ -1,6 +1,6 @@ image: repository: asia-southeast1-docker.pkg.dev/bisontry/bisontry/bisontry-health-checker - tag: v0.1.0.20231219.0733.2bb7b86 + tag: v0.1.0.20240131.0523.c3d8172 deployment: name: bisontry-health-checker From d8eb29883481f41e5ed51174ceb67d9932c88dbd Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Wed, 31 Jan 2024 14:50:44 +0900 Subject: [PATCH 126/190] (BAOBAB) Fix baobab-health-check error (#157) --- bisontry-health-checker/Chart.yaml | 2 +- bisontry-health-checker/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bisontry-health-checker/Chart.yaml b/bisontry-health-checker/Chart.yaml index ad883016..9aa519e4 100644 --- a/bisontry-health-checker/Chart.yaml +++ b/bisontry-health-checker/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v2 name: bisontry-health-checker description: Bisontry Health Checker service. version: 0.1.0 -appVersion: v0.1.0.20240131.0523.c3d8172 +appVersion: v0.1.0.20240131.0543.c3d8172 diff --git a/bisontry-health-checker/values.yaml b/bisontry-health-checker/values.yaml index 8d8a5e46..2ba0edc3 100644 --- a/bisontry-health-checker/values.yaml +++ b/bisontry-health-checker/values.yaml @@ -1,6 +1,6 @@ image: repository: asia-southeast1-docker.pkg.dev/bisontry/bisontry/bisontry-health-checker - tag: v0.1.0.20240131.0523.c3d8172 + tag: v0.1.0.20240131.0543.c3d8172 deployment: name: bisontry-health-checker From d51db842e39710c5599989b0f569f1a7c397b84c Mon Sep 17 00:00:00 2001 From: Nick <148735107+nick-bisonai@users.noreply.github.com> Date: Mon, 5 Feb 2024 14:43:50 +0900 Subject: [PATCH 127/190] feat: print out more information (#161) --- cli/Chart.yaml | 2 +- cli/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cli/Chart.yaml b/cli/Chart.yaml index d15a9068..a4e4597e 100644 --- a/cli/Chart.yaml +++ b/cli/Chart.yaml @@ -3,4 +3,4 @@ name: orakl-cli description: A Helm chart for Kubernetes type: application version: 0.1.2 -appVersion: "v0.6.0.20231229.0312.9433d53" +appVersion: "v0.6.0.20240202.1047.fd40ed0" diff --git a/cli/values.yaml b/cli/values.yaml index 068170b1..ff230c4d 100644 --- a/cli/values.yaml +++ b/cli/values.yaml @@ -5,7 +5,7 @@ global: image: repository: public.ecr.aws/u6t6w0e4/orakl-cli pullPolicy: IfNotPresent - tag: "v0.6.0.20231229.0312.9433d53" + tag: "v0.6.0.20240202.1047.fd40ed0" imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: [] From 3644dbc96d76d0d470bd907762be25b29d4d1d7a Mon Sep 17 00:00:00 2001 From: Nick <148735107+nick-bisonai@users.noreply.github.com> Date: Mon, 5 Feb 2024 16:48:02 +0900 Subject: [PATCH 128/190] fix: update package version (#164) --- cli/Chart.yaml | 2 +- cli/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cli/Chart.yaml b/cli/Chart.yaml index a4e4597e..e16051e6 100644 --- a/cli/Chart.yaml +++ b/cli/Chart.yaml @@ -3,4 +3,4 @@ name: orakl-cli description: A Helm chart for Kubernetes type: application version: 0.1.2 -appVersion: "v0.6.0.20240202.1047.fd40ed0" +appVersion: "v0.6.1.20240205.0735.6bc55d4" diff --git a/cli/values.yaml b/cli/values.yaml index ff230c4d..98afe4e1 100644 --- a/cli/values.yaml +++ b/cli/values.yaml @@ -5,7 +5,7 @@ global: image: repository: public.ecr.aws/u6t6w0e4/orakl-cli pullPolicy: IfNotPresent - tag: "v0.6.0.20240202.1047.fd40ed0" + tag: "v0.6.1.20240205.0735.6bc55d4" imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: [] From f055e42f2afe23ee1a72d972f5b86cc089a819a6 Mon Sep 17 00:00:00 2001 From: Nick <148735107+nick-bisonai@users.noreply.github.com> Date: Mon, 5 Feb 2024 17:04:15 +0900 Subject: [PATCH 129/190] feat: reporter warning on invalid keys (#162) --- aggregator/Chart.yaml | 2 +- aggregator/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/aggregator/Chart.yaml b/aggregator/Chart.yaml index 77fb5a19..a5d006b2 100644 --- a/aggregator/Chart.yaml +++ b/aggregator/Chart.yaml @@ -21,4 +21,4 @@ version: 0.3.14 # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "v0.5.1.20240122.0240.1672788" +appVersion: "v0.5.1.20240202.0856.9696813" diff --git a/aggregator/values.yaml b/aggregator/values.yaml index 24efad10..27c8be1f 100644 --- a/aggregator/values.yaml +++ b/aggregator/values.yaml @@ -7,7 +7,7 @@ global: repository: public.ecr.aws/u6t6w0e4/orakl-core #repository url pullPolicy: IfNotPresent listenerTag: "v0.5.1.20231221.0205.5ff1278" - reporterTag: "v0.5.1.20240122.0131.44014e7" + reporterTag: "v0.5.1.20240202.0856.9696813" workerTag: "v0.5.1.20240122.0240.1672788" imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository From b9edf3ff6929ffdb3b11d1e42a1cb39e3338ad71 Mon Sep 17 00:00:00 2001 From: Nick <148735107+nick-bisonai@users.noreply.github.com> Date: Mon, 5 Feb 2024 17:07:44 +0900 Subject: [PATCH 130/190] feat: improve goapi logging (#163) --- goapi/Chart.yaml | 2 +- goapi/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/goapi/Chart.yaml b/goapi/Chart.yaml index e24f054e..a940230f 100644 --- a/goapi/Chart.yaml +++ b/goapi/Chart.yaml @@ -21,4 +21,4 @@ version: 0.1.0 # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "v0.0.1.20240130.1147.acdb984" +appVersion: "v0.0.1.20240205.0346.c0a6c84" diff --git a/goapi/values.yaml b/goapi/values.yaml index 5ed33127..24b7b6b0 100644 --- a/goapi/values.yaml +++ b/goapi/values.yaml @@ -4,7 +4,7 @@ global: image: repository: public.ecr.aws/bisonai/orakl-goapi pullPolicy: IfNotPresent - tag: "v0.0.1.20240130.1147.acdb984" + tag: "v0.0.1.20240205.0346.c0a6c84" imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: [] From c982ae7ca2ac81cbce1191d3b04fdccb21b02e37 Mon Sep 17 00:00:00 2001 From: Nick <148735107+nick-bisonai@users.noreply.github.com> Date: Wed, 7 Feb 2024 15:58:07 +0900 Subject: [PATCH 131/190] (BAOBAB) Api implement empty row handling (#170) * feat: implement empty row handling * fix: update default behavior --- goapi/Chart.yaml | 2 +- goapi/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/goapi/Chart.yaml b/goapi/Chart.yaml index a940230f..73a38a1b 100644 --- a/goapi/Chart.yaml +++ b/goapi/Chart.yaml @@ -21,4 +21,4 @@ version: 0.1.0 # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "v0.0.1.20240205.0346.c0a6c84" +appVersion: "v0.0.1.20240207.0624.556df2a" diff --git a/goapi/values.yaml b/goapi/values.yaml index 24b7b6b0..3c9c1b3b 100644 --- a/goapi/values.yaml +++ b/goapi/values.yaml @@ -4,7 +4,7 @@ global: image: repository: public.ecr.aws/bisonai/orakl-goapi pullPolicy: IfNotPresent - tag: "v0.0.1.20240205.0346.c0a6c84" + tag: "v0.0.1.20240207.0624.556df2a" imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: [] From a03aa8e24aedae8753ee946cf6cc0c28517fe101 Mon Sep 17 00:00:00 2001 From: Nick <148735107+nick-bisonai@users.noreply.github.com> Date: Thu, 8 Feb 2024 14:06:23 +0900 Subject: [PATCH 132/190] fix: aggregator hash fix validation (#172) --- goapi/Chart.yaml | 2 +- goapi/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/goapi/Chart.yaml b/goapi/Chart.yaml index 73a38a1b..6031080d 100644 --- a/goapi/Chart.yaml +++ b/goapi/Chart.yaml @@ -21,4 +21,4 @@ version: 0.1.0 # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "v0.0.1.20240207.0624.556df2a" +appVersion: "v0.0.1.20240207.1046.fc31d76" diff --git a/goapi/values.yaml b/goapi/values.yaml index 3c9c1b3b..1b140265 100644 --- a/goapi/values.yaml +++ b/goapi/values.yaml @@ -4,7 +4,7 @@ global: image: repository: public.ecr.aws/bisonai/orakl-goapi pullPolicy: IfNotPresent - tag: "v0.0.1.20240207.0624.556df2a" + tag: "v0.0.1.20240207.1046.fc31d76" imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: [] From abe4e6a931d2434f08a72512073c918309ed8e4e Mon Sep 17 00:00:00 2001 From: Nick <148735107+nick-bisonai@users.noreply.github.com> Date: Thu, 8 Feb 2024 14:28:09 +0900 Subject: [PATCH 133/190] fix: cli compatibility updates (#174) --- cli/Chart.yaml | 2 +- cli/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cli/Chart.yaml b/cli/Chart.yaml index e16051e6..6c04a57d 100644 --- a/cli/Chart.yaml +++ b/cli/Chart.yaml @@ -3,4 +3,4 @@ name: orakl-cli description: A Helm chart for Kubernetes type: application version: 0.1.2 -appVersion: "v0.6.1.20240205.0735.6bc55d4" +appVersion: "v0.6.1.20240208.0505.ce676ce" diff --git a/cli/values.yaml b/cli/values.yaml index 98afe4e1..48193ed9 100644 --- a/cli/values.yaml +++ b/cli/values.yaml @@ -5,7 +5,7 @@ global: image: repository: public.ecr.aws/u6t6w0e4/orakl-cli pullPolicy: IfNotPresent - tag: "v0.6.1.20240205.0735.6bc55d4" + tag: "v0.6.1.20240208.0505.ce676ce" imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: [] From 8d94e0597229068f43cc20f9e19b7a7518ae7370 Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Tue, 13 Feb 2024 12:50:36 +0900 Subject: [PATCH 134/190] (baobab) Update CI Helm Lint workflow to include pull request events (#176) * feat: Add actions workflow to linting helm charts * feat: Update Helm setup and linting process * feat: Update helm chart change detection logic * fix: Fix can't detect changed charts * feat: Update ci.helm-lint.yaml to set output variable for changed charts * feat: Stop workflow when lint returned ERROR * fix: Update Helm lint command to check for "failed" instead of "[ERROR]". * fix: Fix workflow can't find HEAD~1 git commit * feat: Make workflow be failed when Lint returned error * feat: Store failed services to output of workflow * refactor: Remove unnecessary code in ci.helm-lint.yaml * feat: Add failed services output to GitHub Actions workflow * fix: Fix linting script to display failed services * feat: Update CI Helm Lint workflow to include pull request events * fix: Remove unnecessary branches from CI workflow --- .github/workflows/ci.helm-lint.yaml | 46 +++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 .github/workflows/ci.helm-lint.yaml diff --git a/.github/workflows/ci.helm-lint.yaml b/.github/workflows/ci.helm-lint.yaml new file mode 100644 index 00000000..56bad82b --- /dev/null +++ b/.github/workflows/ci.helm-lint.yaml @@ -0,0 +1,46 @@ +name: CI Helm Lint + +on: + workflow_dispatch: + pull_request: + types: + - opened + branches: + - gcp-baobab-prod + +jobs: + lint: + runs-on: ubuntu-latest + + steps: + - name: Checkout repository + uses: actions/checkout@v3 + with: + fetch-depth: 0 + + - name: Run Helm lint + uses: WyriHaximus/github-action-helm3@v3 + id: lint + with: + exec: | + failed_services="" + for file in $(git diff --name-only HEAD~1..HEAD); do + dir=$(dirname $file) + if [ -f "$dir/Chart.yaml" ]; then + if ! helm lint $dir; then + failed_services+="'$(basename $dir)', " + fi + fi + done + + if [ -n "$failed_services" ]; then + # Remove the trailing comma and space + failed_services=${failed_services%??} + echo "failed_services=$failed_services" >> $GITHUB_OUTPUT + fi + + - name: Failed services + if: steps.lint.outputs.failed_services + run: | + echo "Failed services: ${{ steps.lint.outputs.failed_services }}" + exit 1 From 4d668971c843883401c6c320095008a198f2c767 Mon Sep 17 00:00:00 2001 From: Nick <148735107+nick-bisonai@users.noreply.github.com> Date: Fri, 16 Feb 2024 13:01:05 +0900 Subject: [PATCH 135/190] (BAOBAB) Clean up nodejs api (#179) * fix: (BAOBAB) remove legacy api * fix: remove manifest * fix: lint fix * feat: image version with published to new ecr * feat: Update `health-checker` to apply svc URL changes --------- Co-authored-by: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> --- api/.helmignore | 23 ----- api/Chart.yaml | 6 +- api/README.md | 2 - api/index.yaml | 3 - api/templates/NOTES.txt | 1 - api/templates/_helpers.tpl | 71 --------------- api/templates/aws-secrets.yaml | 11 --- api/templates/deployment.yaml | 44 ++------- api/templates/sa.yaml | 12 --- api/templates/service.yaml | 8 +- api/templates/tests/test-connection.yaml | 15 ---- api/values.yaml | 21 ++--- bisontry-health-checker/Chart.yaml | 2 +- bisontry-health-checker/values.yaml | 2 +- goapi/Chart.yaml | 24 ----- goapi/templates/deployment.yaml | 109 ----------------------- goapi/templates/service.yaml | 12 --- goapi/values.yaml | 58 ------------ manifest/argocd/baobab/goapi.yaml | 15 ---- secret-store/goapi-secret.yaml | 26 ------ 20 files changed, 23 insertions(+), 442 deletions(-) delete mode 100644 api/.helmignore delete mode 100644 api/README.md delete mode 100644 api/index.yaml delete mode 100644 api/templates/NOTES.txt delete mode 100644 api/templates/_helpers.tpl delete mode 100644 api/templates/aws-secrets.yaml delete mode 100644 api/templates/sa.yaml delete mode 100644 api/templates/tests/test-connection.yaml delete mode 100644 goapi/Chart.yaml delete mode 100644 goapi/templates/deployment.yaml delete mode 100644 goapi/templates/service.yaml delete mode 100644 goapi/values.yaml delete mode 100644 manifest/argocd/baobab/goapi.yaml delete mode 100644 secret-store/goapi-secret.yaml diff --git a/api/.helmignore b/api/.helmignore deleted file mode 100644 index 0e8a0eb3..00000000 --- a/api/.helmignore +++ /dev/null @@ -1,23 +0,0 @@ -# Patterns to ignore when building packages. -# This supports shell glob matching, relative path matching, and -# negation (prefixed with !). Only one pattern per line. -.DS_Store -# Common VCS dirs -.git/ -.gitignore -.bzr/ -.bzrignore -.hg/ -.hgignore -.svn/ -# Common backup files -*.swp -*.bak -*.tmp -*.orig -*~ -# Various IDEs -.project -.idea/ -*.tmproj -.vscode/ diff --git a/api/Chart.yaml b/api/Chart.yaml index 84aadf43..71c1c72c 100644 --- a/api/Chart.yaml +++ b/api/Chart.yaml @@ -1,4 +1,4 @@ -apiVersion: v1 +apiVersion: v2 name: orakl-api description: A Helm chart for Kubernetes @@ -15,10 +15,10 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.1.4 +version: 0.1.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "v0.1.0.20231214.0451.cb4bd3a" +appVersion: "v0.0.1.20240215.1237.1c4d022" diff --git a/api/README.md b/api/README.md deleted file mode 100644 index 2830a6ae..00000000 --- a/api/README.md +++ /dev/null @@ -1,2 +0,0 @@ -## Orakl Api ## - diff --git a/api/index.yaml b/api/index.yaml deleted file mode 100644 index 55ba9b36..00000000 --- a/api/index.yaml +++ /dev/null @@ -1,3 +0,0 @@ -apiVersion: v1 -entries: {} -generated: "2023-03-17T00:07:44.413794+09:00" diff --git a/api/templates/NOTES.txt b/api/templates/NOTES.txt deleted file mode 100644 index 31e61723..00000000 --- a/api/templates/NOTES.txt +++ /dev/null @@ -1 +0,0 @@ -Welcome to orakl-api diff --git a/api/templates/_helpers.tpl b/api/templates/_helpers.tpl deleted file mode 100644 index 4549b5d5..00000000 --- a/api/templates/_helpers.tpl +++ /dev/null @@ -1,71 +0,0 @@ -{{/* -Expand the name of the chart. -*/}} -{{- define "orakl-api.name" -}} -{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} -{{- end }} - -{{/* -Create a default fully qualified app name. -We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). -If release name contains chart name it will be used as a full name. -*/}} -{{- define "orakl-api.fullname" -}} -{{- if .Values.fullnameOverride }} -{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} -{{- else }} -{{- $name := default .Chart.Name .Values.nameOverride }} -{{- if contains $name .Release.Name }} -{{- .Release.Name | trunc 63 | trimSuffix "-" }} -{{- else }} -{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }} -{{- end }} -{{- end }} -{{- end }} - -{{/* -Create chart name and version as used by the chart label. -*/}} -{{- define "orakl-api.chart" -}} -{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} -{{- end }} - -{{/* -Common labels -*/}} -{{- define "orakl-api.labels" -}} -helm.sh/chart: {{ include "orakl-api.chart" . }} -{{ include "orakl-api.selectorLabels" . }} -{{- if .Chart.AppVersion }} -app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} -{{- end }} -app.kubernetes.io/managed-by: {{ .Release.Service }} -{{- end }} - -{{/* -Selector labels -*/}} -{{- define "orakl-api.selectorLabels" -}} -app.kubernetes.io/name: {{ include "orakl-api.name" . }} -app.kubernetes.io/instance: {{ .Release.Name }} -{{- end }} - -{{/* -Common labels for api -*/}} -{{- define "orakl-api.labels.api" -}} -helm.sh/chart: {{ include "orakl-api.chart" . }} -{{ include "orakl-api.selectorLabels.api" . }} -{{- if .Chart.AppVersion }} -app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} -{{- end }} -app.kubernetes.io/managed-by: {{ .Release.Service }} -{{- end }} - -{{/* -Selector labels for api -*/}} -{{- define "orakl-api.selectorLabels.api" -}} -app.kubernetes.io/name: {{ include "orakl-api.name" . }}-api -app.kubernetes.io/instance: {{ .Release.Name }} -{{- end }} \ No newline at end of file diff --git a/api/templates/aws-secrets.yaml b/api/templates/aws-secrets.yaml deleted file mode 100644 index 12c4c100..00000000 --- a/api/templates/aws-secrets.yaml +++ /dev/null @@ -1,11 +0,0 @@ -{{- if .Values.global.secretManager.enabled }} -apiVersion: mumoshu.github.io/v1alpha1 -kind: AWSSecret -metadata: - name: orakl-api-secrets -spec: - stringDataFrom: - secretsManagerSecretRef: - secretId: {{ .Values.global.secretManager.secretId }} - versionId: {{ .Values.global.secretManager.versionId }} -{{ end }} \ No newline at end of file diff --git a/api/templates/deployment.yaml b/api/templates/deployment.yaml index 3447f221..d44c7146 100644 --- a/api/templates/deployment.yaml +++ b/api/templates/deployment.yaml @@ -3,12 +3,16 @@ kind: Deployment metadata: name: api labels: - {{- include "orakl-api.labels.api" . | nindent 4 }} + app: {{ .Values.deployment.name }} + app.kubernetes.io/name: {{ .Values.deployment.name }} + app.kubernetes.io/instance: {{ .Values.deployment.name }} spec: replicas: {{ .Values.api.replicas }} selector: matchLabels: - {{- include "orakl-api.selectorLabels.api" . | nindent 6 }} + app: {{ .Values.deployment.name }} + app.kubernetes.io/name: {{ .Values.deployment.name }} + app.kubernetes.io/instance: {{ .Values.deployment.name }} template: metadata: {{- with .Values.global.podAnnotations }} @@ -16,13 +20,14 @@ spec: {{- toYaml . | nindent 8 }} {{- end }} labels: - {{- include "orakl-api.selectorLabels.api" . | nindent 8 }} + app: {{ .Values.deployment.name }} + app.kubernetes.io/name: {{ .Values.deployment.name }} + app.kubernetes.io/instance: {{ .Values.deployment.name }} spec: {{- with .Values.global.image.imagePullSecrets }} imagePullSecrets: {{- toYaml . | nindent 8 }} {{- end }} - serviceAccountName: {{ .Values.api.serviceAccount.name }} securityContext: {{- toYaml .Values.api.podSecurityContext | nindent 8 }} {{- if .Values.global.affinity.enabled }} @@ -43,34 +48,6 @@ spec: {{- toYaml .Values.api.containerSecurityContext | nindent 12 }} image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.tag | default .Chart.AppVersion }}" imagePullPolicy: {{ .Values.global.image.pullPolicy }} - {{- if .Values.global.secretManager.enabled }} - env: - - name: DATABASE_URL - valueFrom: - secretKeyRef: - name: orakl-api-secrets - key: DATABASE_URL - - name: ENCRYPT_PASSWORD - valueFrom: - secretKeyRef: - name: orakl-api-secrets - key: ENCRYPT_PASSWORD - - name: APP_PORT - valueFrom: - secretKeyRef: - name: orakl-api-secrets - key: APP_PORT - - name: REDIS_HOST - valueFrom: - secretKeyRef: - name: orakl-api-secrets - key: REDIS_HOST - - name: REDIS_PORT - valueFrom: - secretKeyRef: - name: orakl-api-secrets - key: REDIS_PORT - {{ else }} env: - name: DATABASE_URL valueFrom: @@ -94,9 +71,6 @@ spec: secretKeyRef: name: api-secrets key: REDIS_PORT - {{ end }} - command: ["yarn"] - args: ["start:prod"] ports: - name: http containerPort: 3030 diff --git a/api/templates/sa.yaml b/api/templates/sa.yaml deleted file mode 100644 index ba84d826..00000000 --- a/api/templates/sa.yaml +++ /dev/null @@ -1,12 +0,0 @@ -{{- if .Values.api.serviceAccount.create -}} -apiVersion: v1 -kind: ServiceAccount -metadata: - name: {{ .Values.api.serviceAccount.name }} - labels: - {{- include "orakl-api.labels.api" . | nindent 4 }} - {{- with .Values.api.serviceAccount.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} -{{- end }} \ No newline at end of file diff --git a/api/templates/service.yaml b/api/templates/service.yaml index bec43709..b5f754da 100644 --- a/api/templates/service.yaml +++ b/api/templates/service.yaml @@ -5,8 +5,8 @@ metadata: spec: type: ClusterIP ports: - - port: 3030 - targetPort: http - protocol: TCP + - port: 3030 + targetPort: http + protocol: TCP selector: - {{- include "orakl-api.selectorLabels.api" . | nindent 6 }} \ No newline at end of file + app: {{ .Values.deployment.name }} diff --git a/api/templates/tests/test-connection.yaml b/api/templates/tests/test-connection.yaml deleted file mode 100644 index dc4bfa43..00000000 --- a/api/templates/tests/test-connection.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: v1 -kind: Pod -metadata: - name: "{{ include "orakl-api.fullname" . }}-test-connection" - labels: - {{- include "orakl-api.labels" . | nindent 4 }} - annotations: - "helm.sh/hook": test -spec: - containers: - - name: wget - image: busybox - command: ['wget'] - args: ['{{ include "orakl-api.fullname" . }}'] - restartPolicy: Never diff --git a/api/values.yaml b/api/values.yaml index 2cb66959..d467e291 100644 --- a/api/values.yaml +++ b/api/values.yaml @@ -4,16 +4,11 @@ global: image: repository: public.ecr.aws/bisonai/orakl-api pullPolicy: IfNotPresent - tag: "v0.1.0.20231214.0451.cb4bd3a" + tag: "v0.0.1.20240215.1237.1c4d022" imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: [] - secretManager: - enabled: false - secretId: - versionId: - affinity: enabled: false key: kubernetes.io/hostname @@ -42,16 +37,6 @@ global: api: enabled: true replicas: 1 - serviceAccount: - # -- Create a service account for the application controller - create: true - # -- Service account name - name: orakl-api - # -- Annotations applied to created service account - annotations: {} - # -- Automount API credentials for the Service Account - automountServiceAccountToken: true - podSecurityContext: {} containerSecurityContext: {} @@ -67,3 +52,7 @@ api: nodeSelector: {} tolerations: [] dotenv: {} + +deployment: + name: orakl-api + replicas: 1 diff --git a/bisontry-health-checker/Chart.yaml b/bisontry-health-checker/Chart.yaml index 9aa519e4..70632f12 100644 --- a/bisontry-health-checker/Chart.yaml +++ b/bisontry-health-checker/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v2 name: bisontry-health-checker description: Bisontry Health Checker service. version: 0.1.0 -appVersion: v0.1.0.20240131.0543.c3d8172 +appVersion: v0.1.0.20240216.0351.30594bb diff --git a/bisontry-health-checker/values.yaml b/bisontry-health-checker/values.yaml index 2ba0edc3..1701fc28 100644 --- a/bisontry-health-checker/values.yaml +++ b/bisontry-health-checker/values.yaml @@ -1,6 +1,6 @@ image: repository: asia-southeast1-docker.pkg.dev/bisontry/bisontry/bisontry-health-checker - tag: v0.1.0.20240131.0543.c3d8172 + tag: v0.1.0.20240216.0351.30594bb deployment: name: bisontry-health-checker diff --git a/goapi/Chart.yaml b/goapi/Chart.yaml deleted file mode 100644 index 6031080d..00000000 --- a/goapi/Chart.yaml +++ /dev/null @@ -1,24 +0,0 @@ -apiVersion: v2 -name: orakl-goapi -description: A Helm chart for Kubernetes - -# A chart can be either an 'application' or a 'library' chart. -# -# Application charts are a collection of templates that can be packaged into versioned archives -# to be deployed. -# -# Library charts provide useful utilities or functions for the chart developer. They're included as -# a dependency of application charts to inject those utilities and functions into the rendering -# pipeline. Library charts do not define any templates and therefore cannot be deployed. -type: application - -# This is the chart version. This version number should be incremented each time you make changes -# to the chart and its templates, including the app version. -# Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.1.0 - -# This is the version number of the application being deployed. This version number should be -# incremented each time you make changes to the application. Versions are not expected to -# follow Semantic Versioning. They should reflect the version the application is using. -# It is recommended to use it with quotes. -appVersion: "v0.0.1.20240207.1046.fc31d76" diff --git a/goapi/templates/deployment.yaml b/goapi/templates/deployment.yaml deleted file mode 100644 index e092826e..00000000 --- a/goapi/templates/deployment.yaml +++ /dev/null @@ -1,109 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: goapi - labels: - app: {{ .Values.deployment.name }} - app.kubernetes.io/name: {{ .Values.deployment.name }} - app.kubernetes.io/instance: {{ .Values.deployment.name }} -spec: - replicas: {{ .Values.api.replicas }} - selector: - matchLabels: - app: {{ .Values.deployment.name }} - app.kubernetes.io/name: {{ .Values.deployment.name }} - app.kubernetes.io/instance: {{ .Values.deployment.name }} - template: - metadata: - {{- with .Values.global.podAnnotations }} - annotations: - {{- toYaml . | nindent 8 }} - {{- end }} - labels: - app: {{ .Values.deployment.name }} - app.kubernetes.io/name: {{ .Values.deployment.name }} - app.kubernetes.io/instance: {{ .Values.deployment.name }} - spec: - {{- with .Values.global.image.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - securityContext: - {{- toYaml .Values.api.podSecurityContext | nindent 8 }} - {{- if .Values.global.affinity.enabled }} - affinity: - nodeAffinity: - preferredDuringSchedulingIgnoredDuringExecution: - - weight: 1 - preference: - matchExpressions: - - key: {{ .Values.global.affinity.key }} - operator: In - values: - - {{ .Values.global.affinity.value }} - {{- end }} - containers: - - name: {{ .Chart.Name }} - securityContext: - {{- toYaml .Values.api.containerSecurityContext | nindent 12 }} - image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.tag | default .Chart.AppVersion }}" - imagePullPolicy: {{ .Values.global.image.pullPolicy }} - env: - - name: DATABASE_URL - valueFrom: - secretKeyRef: - name: goapi-secrets - key: DATABASE_URL - - name: ENCRYPT_PASSWORD - valueFrom: - secretKeyRef: - name: goapi-secrets - key: ENCRYPT_PASSWORD - - name: APP_PORT - value: "3030" - - name: REDIS_HOST - valueFrom: - secretKeyRef: - name: goapi-secrets - key: REDIS_HOST - - name: REDIS_PORT - valueFrom: - secretKeyRef: - name: goapi-secrets - key: REDIS_PORT - ports: - - name: http - containerPort: 3030 - {{- if .Values.global.livenessProbe.enabled }} - livenessProbe: - httpGet: - path: {{ .Values.global.livenessProbe.path }} - port: 3030 - initialDelaySeconds: {{ .Values.global.livenessProbe.initialDelaySeconds }} - periodSeconds: {{ .Values.global.livenessProbe.periodSeconds }} - timeoutSeconds: {{ .Values.global.livenessProbe.timeoutSeconds }} - successThreshold: {{ .Values.global.livenessProbe.successThreshold }} - failureThreshold: {{ .Values.global.livenessProbe.failureThreshold }} - {{- end }} - {{- if .Values.global.readinessProbe.enabled }} - readinessProbe: - httpGet: - path: {{ .Values.global.readinessProbe.path }} - port: 3030 - initialDelaySeconds: {{ .Values.global.readinessProbe.initialDelaySeconds }} - periodSeconds: {{ .Values.global.readinessProbe.periodSeconds }} - timeoutSeconds: {{ .Values.global.readinessProbe.timeoutSeconds }} - successThreshold: {{ .Values.global.readinessProbe.successThreshold }} - failureThreshold: {{ .Values.global.readinessProbe.failureThreshold }} - {{- end }} - resources: - {{- toYaml .Values.api.resources | nindent 12 }} - - {{- with .Values.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} diff --git a/goapi/templates/service.yaml b/goapi/templates/service.yaml deleted file mode 100644 index d0c0cc68..00000000 --- a/goapi/templates/service.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: orakl-goapi -spec: - type: ClusterIP - ports: - - port: 3030 - targetPort: http - protocol: TCP - selector: - app: {{ .Values.deployment.name }} \ No newline at end of file diff --git a/goapi/values.yaml b/goapi/values.yaml deleted file mode 100644 index 1b140265..00000000 --- a/goapi/values.yaml +++ /dev/null @@ -1,58 +0,0 @@ -## Klaytn Orakl Api Configuration -## created by Bisonai -global: - image: - repository: public.ecr.aws/bisonai/orakl-goapi - pullPolicy: IfNotPresent - tag: "v0.0.1.20240207.1046.fc31d76" - imagePullPolicy: IfNotPresent - # -- If defined, uses a Secret to pull an image from a private Docker registry or repository - imagePullSecrets: [] - - affinity: - enabled: false - key: kubernetes.io/hostname - value: - - podAnnotations: {} - - livenessProbe: - enabled: true - path: /api/v1/ - initialDelaySeconds: 10 - periodSeconds: 5 - timeoutSeconds: 5 - successThreshold: 1 - failureThreshold: 5 - - readinessProbe: - enabled: true - path: /api/v1/ - initialDelaySeconds: 10 - periodSeconds: 5 - timeoutSeconds: 5 - successThreshold: 1 - failureThreshold: 5 - -api: - enabled: true - replicas: 1 - podSecurityContext: {} - - containerSecurityContext: {} - - resources: - limits: - cpu: 2000m - memory: 4Gi - requests: - cpu: 2000m - memory: 4Gi - -nodeSelector: {} -tolerations: [] -dotenv: {} - -deployment: - name: orakl-goapi - replicas: 1 diff --git a/manifest/argocd/baobab/goapi.yaml b/manifest/argocd/baobab/goapi.yaml deleted file mode 100644 index cf482747..00000000 --- a/manifest/argocd/baobab/goapi.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: goapi - namespace: argocd -spec: - destination: - namespace: orakl - server: https://kubernetes.default.svc - project: default - source: - path: goapi/ - repoURL: https://github.com/Bisonai/orakl-helm-charts.git - targetRevision: gcp-baobab-prod - syncPolicy: {} diff --git a/secret-store/goapi-secret.yaml b/secret-store/goapi-secret.yaml deleted file mode 100644 index 1bac1010..00000000 --- a/secret-store/goapi-secret.yaml +++ /dev/null @@ -1,26 +0,0 @@ -apiVersion: external-secrets.io/v1beta1 -kind: ExternalSecret -metadata: - name: goapi-secrets -spec: - refreshInterval: "15s" - secretStoreRef: - name: vault-backend - kind: SecretStore - data: - - secretKey: DATABASE_URL - remoteRef: - key: baobab/goapi - property: DATABASE_URL - - secretKey: ENCRYPT_PASSWORD - remoteRef: - key: baobab/goapi - property: ENCRYPT_PASSWORD - - secretKey: REDIS_HOST - remoteRef: - key: baobab/goapi - property: REDIS_HOST - - secretKey: REDIS_PORT - remoteRef: - key: baobab/goapi - property: REDIS_PORT From 77285d84f60b4c345ea0e45499b87c9483697b04 Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Fri, 16 Feb 2024 15:26:55 +0900 Subject: [PATCH 136/190] (BAOBAB) Hotfix sync error api (#180) fix: Modify name in templates to use name from values.yaml --- api/templates/deployment.yaml | 2 +- api/templates/service.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api/templates/deployment.yaml b/api/templates/deployment.yaml index d44c7146..5e8c3d4a 100644 --- a/api/templates/deployment.yaml +++ b/api/templates/deployment.yaml @@ -1,7 +1,7 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: api + name: {{ .Values.deployment.name }} labels: app: {{ .Values.deployment.name }} app.kubernetes.io/name: {{ .Values.deployment.name }} diff --git a/api/templates/service.yaml b/api/templates/service.yaml index b5f754da..316fb7d3 100644 --- a/api/templates/service.yaml +++ b/api/templates/service.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: Service metadata: - name: orakl-api + name: {{ .Values.deployment.name }} spec: type: ClusterIP ports: From 9f5f7fe6504884f40f2c3c042bb41c8fd393823f Mon Sep 17 00:00:00 2001 From: Nick <148735107+nick-bisonai@users.noreply.github.com> Date: Tue, 20 Feb 2024 14:12:57 +0900 Subject: [PATCH 137/190] feat: update grafana as code (#187) --- grafana-as-code/Chart.yaml | 2 +- grafana-as-code/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/grafana-as-code/Chart.yaml b/grafana-as-code/Chart.yaml index 7f2d3868..4b2110ec 100644 --- a/grafana-as-code/Chart.yaml +++ b/grafana-as-code/Chart.yaml @@ -3,4 +3,4 @@ name: orakl-grafana-as-code description: A Grafana dashboard made by code type: application version: 0.1.0 -appVersion: "monitor.v1.0.0.20240130.0252.f052f5f" +appVersion: "monitor.v1.0.0.20240219.0829.923bdfd" diff --git a/grafana-as-code/values.yaml b/grafana-as-code/values.yaml index 5b35a181..fac87460 100644 --- a/grafana-as-code/values.yaml +++ b/grafana-as-code/values.yaml @@ -1,7 +1,7 @@ image: repository: asia-southeast1-docker.pkg.dev/vpc-host-orakl-prod/orakl/orakl-grafana #repository url pullPolicy: IfNotPresent - tag: "monitor.v1.0.0.20240130.0252.f052f5f" + tag: "monitor.v1.0.0.20240219.0829.923bdfd" imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: From 3ba3476b273a8fcf358074a32806441169c3d286 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jay=28=EA=B9=80=EC=9E=AC=ED=9B=88=29?= Date: Thu, 22 Feb 2024 12:12:45 +0900 Subject: [PATCH 138/190] (Baobab) Hotfix: Update listener, it's use old one (#189) * chore: update appVersion and image tag of listener to latest versions --- aggregator/Chart.yaml | 2 +- aggregator/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/aggregator/Chart.yaml b/aggregator/Chart.yaml index a5d006b2..5e225adf 100644 --- a/aggregator/Chart.yaml +++ b/aggregator/Chart.yaml @@ -21,4 +21,4 @@ version: 0.3.14 # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "v0.5.1.20240202.0856.9696813" +appVersion: "v0.5.1.20240219.0726.1531a51" diff --git a/aggregator/values.yaml b/aggregator/values.yaml index 27c8be1f..366f3718 100644 --- a/aggregator/values.yaml +++ b/aggregator/values.yaml @@ -6,7 +6,7 @@ global: image: repository: public.ecr.aws/u6t6w0e4/orakl-core #repository url pullPolicy: IfNotPresent - listenerTag: "v0.5.1.20231221.0205.5ff1278" + listenerTag: "v0.5.1.20240219.0726.1531a51" reporterTag: "v0.5.1.20240202.0856.9696813" workerTag: "v0.5.1.20240122.0240.1672788" imagePullPolicy: IfNotPresent From 4e3ba6b17c12218905bf62bf6ef7c3fa5e2dfea1 Mon Sep 17 00:00:00 2001 From: Nick <148735107+nick-bisonai@users.noreply.github.com> Date: Fri, 23 Feb 2024 13:21:15 +0900 Subject: [PATCH 139/190] (BAOBAB) Reduce fetcher logs (#190) * fix: reduce baobab fetcher logs * fix: update based on linter --- fetcher/Chart.yaml | 4 ++-- fetcher/values.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fetcher/Chart.yaml b/fetcher/Chart.yaml index 225affb7..04c085f6 100644 --- a/fetcher/Chart.yaml +++ b/fetcher/Chart.yaml @@ -1,4 +1,4 @@ -apiVersion: v1 +apiVersion: v2 name: orakl-fetcher description: A Helm chart for Kubernetes @@ -21,4 +21,4 @@ version: 0.1.32 # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "v0.0.1.20240122.0240.1672788" +appVersion: "v0.0.1.20240223.0229.d4b61d8" diff --git a/fetcher/values.yaml b/fetcher/values.yaml index 212d1790..fec4547f 100644 --- a/fetcher/values.yaml +++ b/fetcher/values.yaml @@ -5,7 +5,7 @@ global: image: repository: public.ecr.aws/u6t6w0e4/orakl-fetcher #repository url pullPolicy: IfNotPresent - tag: "v0.0.1.20240122.0240.1672788" + tag: "v0.0.1.20240223.0229.d4b61d8" imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: [] From 94cd4efca43758f707ce2d511fac23a2adfa0179 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jay=28=EA=B9=80=EC=9E=AC=ED=9B=88=29?= Date: Fri, 23 Feb 2024 14:20:18 +0900 Subject: [PATCH 140/190] (Baobab) Update whole VRF, (listener and reporter) of RR (#195) * chore: Update VRF * chore: Update RR l and r --------- Co-authored-by: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> --- request-response/Chart.yaml | 2 +- request-response/values.yaml | 4 ++-- vrf/Chart.yaml | 2 +- vrf/values.yaml | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/request-response/Chart.yaml b/request-response/Chart.yaml index 89c11ecf..0c1cf25b 100644 --- a/request-response/Chart.yaml +++ b/request-response/Chart.yaml @@ -21,4 +21,4 @@ version: 0.3.11 # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "v0.5.1.20240122.0240.1672788" +appVersion: "v0.5.1.20240223.0352.eec1c2d" diff --git a/request-response/values.yaml b/request-response/values.yaml index 448d1ce3..83cc7aac 100644 --- a/request-response/values.yaml +++ b/request-response/values.yaml @@ -6,8 +6,8 @@ global: image: repository: public.ecr.aws/bisonai/orakl-core #repository url pullPolicy: IfNotPresent - listenerTag: "v0.5.1.20240111.1440.dacb2ef" - reporterTag: "v0.5.1.20240111.1440.dacb2ef" + listenerTag: "v0.5.1.20240223.0352.eec1c2d" + reporterTag: "v0.5.1.20240223.0352.eec1c2d" workerTag: "v0.5.1.20240122.0240.1672788" imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository diff --git a/vrf/Chart.yaml b/vrf/Chart.yaml index b176d0cb..a872c3a4 100644 --- a/vrf/Chart.yaml +++ b/vrf/Chart.yaml @@ -21,4 +21,4 @@ version: 0.3.8 # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "0.3.1" +appVersion: "v0.5.1.20240223.0352.eec1c2d" diff --git a/vrf/values.yaml b/vrf/values.yaml index aa616b4c..cfead9c8 100644 --- a/vrf/values.yaml +++ b/vrf/values.yaml @@ -6,9 +6,9 @@ global: image: repository: public.ecr.aws/u6t6w0e4/orakl-core #repository url pullPolicy: IfNotPresent - listenerTag: "v0.5.1.20240111.1440.dacb2ef" - reporterTag: "v0.5.1.20240111.1440.dacb2ef" - workerTag: "v0.5.1.20240111.1440.dacb2ef" + listenerTag: "v0.5.1.20240223.0352.eec1c2d" + reporterTag: "v0.5.1.20240223.0352.eec1c2d" + workerTag: "v0.5.1.20240223.0352.eec1c2d" imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: [] From 43e244a85e7e7421df51ef43f0b1511b50aeb01e Mon Sep 17 00:00:00 2001 From: Nick <148735107+nick-bisonai@users.noreply.github.com> Date: Fri, 23 Feb 2024 14:23:11 +0900 Subject: [PATCH 141/190] (BAOBAB) Reduce listener logs (#192) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: level down listener logs * fix: update log levels * fix: update log level into "info" * fix: update log levels --------- Co-authored-by: Jay(김재훈) --- aggregator/Chart.yaml | 2 +- aggregator/templates/listener/deployment-listener.yaml | 5 +---- aggregator/templates/reporter/deployment-reporter.yaml | 5 +---- aggregator/templates/worker/deployment-worker.yaml | 5 +---- aggregator/values.yaml | 2 +- request-response/templates/listener/deployment-listener.yaml | 5 +---- request-response/templates/reporter/deployment-reporter.yaml | 5 +---- request-response/templates/worker/deployment-worker.yaml | 5 +---- vrf/templates/listener/deployment-listener.yaml | 5 +---- vrf/templates/reporter/deployment-reporter.yaml | 5 +---- vrf/templates/worker/deployment-worker.yaml | 5 +---- vrf/values.yaml | 2 +- 12 files changed, 12 insertions(+), 39 deletions(-) diff --git a/aggregator/Chart.yaml b/aggregator/Chart.yaml index 5e225adf..e80db6cf 100644 --- a/aggregator/Chart.yaml +++ b/aggregator/Chart.yaml @@ -21,4 +21,4 @@ version: 0.3.14 # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "v0.5.1.20240219.0726.1531a51" +appVersion: "v0.5.1.20240223.0352.eec1c2d" diff --git a/aggregator/templates/listener/deployment-listener.yaml b/aggregator/templates/listener/deployment-listener.yaml index f087c077..50892dab 100644 --- a/aggregator/templates/listener/deployment-listener.yaml +++ b/aggregator/templates/listener/deployment-listener.yaml @@ -108,10 +108,7 @@ spec: name: aggregator-secrets key: CHAIN - name: LOG_LEVEL - valueFrom: - secretKeyRef: - name: aggregator-secrets - key: LOG_LEVEL + value: "info" - name: REDIS_HOST valueFrom: secretKeyRef: diff --git a/aggregator/templates/reporter/deployment-reporter.yaml b/aggregator/templates/reporter/deployment-reporter.yaml index 68a025c4..ac059e34 100644 --- a/aggregator/templates/reporter/deployment-reporter.yaml +++ b/aggregator/templates/reporter/deployment-reporter.yaml @@ -122,10 +122,7 @@ spec: name: aggregator-secrets key: CHAIN - name: LOG_LEVEL - valueFrom: - secretKeyRef: - name: aggregator-secrets - key: LOG_LEVEL + value: "info" - name: REDIS_HOST valueFrom: secretKeyRef: diff --git a/aggregator/templates/worker/deployment-worker.yaml b/aggregator/templates/worker/deployment-worker.yaml index c66401f1..7b2ca7fe 100644 --- a/aggregator/templates/worker/deployment-worker.yaml +++ b/aggregator/templates/worker/deployment-worker.yaml @@ -120,10 +120,7 @@ spec: name: aggregator-secrets key: CHAIN - name: LOG_LEVEL - valueFrom: - secretKeyRef: - name: aggregator-secrets - key: LOG_LEVEL + value: "info" - name: REDIS_HOST valueFrom: secretKeyRef: diff --git a/aggregator/values.yaml b/aggregator/values.yaml index 366f3718..c43d86a1 100644 --- a/aggregator/values.yaml +++ b/aggregator/values.yaml @@ -6,7 +6,7 @@ global: image: repository: public.ecr.aws/u6t6w0e4/orakl-core #repository url pullPolicy: IfNotPresent - listenerTag: "v0.5.1.20240219.0726.1531a51" + listenerTag: "v0.5.1.20240223.0352.eec1c2d" reporterTag: "v0.5.1.20240202.0856.9696813" workerTag: "v0.5.1.20240122.0240.1672788" imagePullPolicy: IfNotPresent diff --git a/request-response/templates/listener/deployment-listener.yaml b/request-response/templates/listener/deployment-listener.yaml index eea13c02..5fce51f2 100644 --- a/request-response/templates/listener/deployment-listener.yaml +++ b/request-response/templates/listener/deployment-listener.yaml @@ -103,10 +103,7 @@ spec: - name: HEALTH_CHECK_PORT value: "8080" - name: LOG_LEVEL - valueFrom: - secretKeyRef: - name: request-response-secrets - key: LOG_LEVEL + value: "info" - name: REDIS_HOST valueFrom: secretKeyRef: diff --git a/request-response/templates/reporter/deployment-reporter.yaml b/request-response/templates/reporter/deployment-reporter.yaml index 17c0bd4a..0560f3ef 100644 --- a/request-response/templates/reporter/deployment-reporter.yaml +++ b/request-response/templates/reporter/deployment-reporter.yaml @@ -107,10 +107,7 @@ spec: - name: HEALTH_CHECK_PORT value: "8080" - name: LOG_LEVEL - valueFrom: - secretKeyRef: - name: request-response-secrets - key: LOG_LEVEL + value: "info" - name: REDIS_HOST valueFrom: secretKeyRef: diff --git a/request-response/templates/worker/deployment-worker.yaml b/request-response/templates/worker/deployment-worker.yaml index e4df4c80..9e04d9d4 100644 --- a/request-response/templates/worker/deployment-worker.yaml +++ b/request-response/templates/worker/deployment-worker.yaml @@ -104,10 +104,7 @@ spec: - name: HEALTH_CHECK_PORT value: "8080" - name: LOG_LEVEL - valueFrom: - secretKeyRef: - name: request-response-secrets - key: LOG_LEVEL + value: "info" - name: REDIS_HOST valueFrom: secretKeyRef: diff --git a/vrf/templates/listener/deployment-listener.yaml b/vrf/templates/listener/deployment-listener.yaml index f2a87f7c..66d48e40 100644 --- a/vrf/templates/listener/deployment-listener.yaml +++ b/vrf/templates/listener/deployment-listener.yaml @@ -103,10 +103,7 @@ spec: - name: HEALTH_CHECK_PORT value: "8080" - name: LOG_LEVEL - valueFrom: - secretKeyRef: - name: vrf-secrets - key: LOG_LEVEL + value: "info" - name: REDIS_HOST valueFrom: secretKeyRef: diff --git a/vrf/templates/reporter/deployment-reporter.yaml b/vrf/templates/reporter/deployment-reporter.yaml index cbce957c..4e0d0d02 100644 --- a/vrf/templates/reporter/deployment-reporter.yaml +++ b/vrf/templates/reporter/deployment-reporter.yaml @@ -115,10 +115,7 @@ spec: - name: HEALTH_CHECK_PORT value: "8080" - name: LOG_LEVEL - valueFrom: - secretKeyRef: - name: vrf-secrets - key: LOG_LEVEL + value: "info" - name: REDIS_HOST valueFrom: secretKeyRef: diff --git a/vrf/templates/worker/deployment-worker.yaml b/vrf/templates/worker/deployment-worker.yaml index 52e56c60..dfb01736 100644 --- a/vrf/templates/worker/deployment-worker.yaml +++ b/vrf/templates/worker/deployment-worker.yaml @@ -115,10 +115,7 @@ spec: - name: HEALTH_CHECK_PORT value: "8080" - name: LOG_LEVEL - valueFrom: - secretKeyRef: - name: vrf-secrets - key: LOG_LEVEL + value: "info" - name: REDIS_HOST valueFrom: secretKeyRef: diff --git a/vrf/values.yaml b/vrf/values.yaml index cfead9c8..79944524 100644 --- a/vrf/values.yaml +++ b/vrf/values.yaml @@ -4,7 +4,7 @@ global: appName: orakl-vrf image: - repository: public.ecr.aws/u6t6w0e4/orakl-core #repository url + repository: public.ecr.aws/u6t6w0e4/orakl-core #repository url pullPolicy: IfNotPresent listenerTag: "v0.5.1.20240223.0352.eec1c2d" reporterTag: "v0.5.1.20240223.0352.eec1c2d" From e744ca7ecfd0c9af7650f48c63bc29d22c72c0cf Mon Sep 17 00:00:00 2001 From: Nick <148735107+nick-bisonai@users.noreply.github.com> Date: Mon, 26 Feb 2024 12:39:17 +0900 Subject: [PATCH 142/190] fix: update connection addr (#199) --- grafana-as-code/Chart.yaml | 2 +- grafana-as-code/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/grafana-as-code/Chart.yaml b/grafana-as-code/Chart.yaml index 4b2110ec..2fcdd07b 100644 --- a/grafana-as-code/Chart.yaml +++ b/grafana-as-code/Chart.yaml @@ -3,4 +3,4 @@ name: orakl-grafana-as-code description: A Grafana dashboard made by code type: application version: 0.1.0 -appVersion: "monitor.v1.0.0.20240219.0829.923bdfd" +appVersion: "monitor.v1.0.0.20240226.0230.481b977" diff --git a/grafana-as-code/values.yaml b/grafana-as-code/values.yaml index fac87460..eeb022bb 100644 --- a/grafana-as-code/values.yaml +++ b/grafana-as-code/values.yaml @@ -1,7 +1,7 @@ image: repository: asia-southeast1-docker.pkg.dev/vpc-host-orakl-prod/orakl/orakl-grafana #repository url pullPolicy: IfNotPresent - tag: "monitor.v1.0.0.20240219.0829.923bdfd" + tag: "monitor.v1.0.0.20240226.0230.481b977" imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: From d865b015cf77897c4736e471e4ad7847911b1527 Mon Sep 17 00:00:00 2001 From: Nick <148735107+nick-bisonai@users.noreply.github.com> Date: Wed, 28 Feb 2024 15:05:30 +0900 Subject: [PATCH 143/190] feat: update dex fetcher (#200) --- fetcher/Chart.yaml | 2 +- fetcher/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fetcher/Chart.yaml b/fetcher/Chart.yaml index 04c085f6..98b7a4fd 100644 --- a/fetcher/Chart.yaml +++ b/fetcher/Chart.yaml @@ -21,4 +21,4 @@ version: 0.1.32 # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "v0.0.1.20240223.0229.d4b61d8" +appVersion: "v0.0.1.20240224.0402.541c45d" diff --git a/fetcher/values.yaml b/fetcher/values.yaml index fec4547f..caca3a29 100644 --- a/fetcher/values.yaml +++ b/fetcher/values.yaml @@ -5,7 +5,7 @@ global: image: repository: public.ecr.aws/u6t6w0e4/orakl-fetcher #repository url pullPolicy: IfNotPresent - tag: "v0.0.1.20240223.0229.d4b61d8" + tag: "v0.0.1.20240224.0402.541c45d" imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: [] From c0f9b0670d584847f7c0df7265cddbccfce47515 Mon Sep 17 00:00:00 2001 From: Nick <148735107+nick-bisonai@users.noreply.github.com> Date: Wed, 28 Feb 2024 15:46:35 +0900 Subject: [PATCH 144/190] fix: includes dex feed for eth usdt (#201) --- grafana-as-code/Chart.yaml | 2 +- grafana-as-code/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/grafana-as-code/Chart.yaml b/grafana-as-code/Chart.yaml index 2fcdd07b..8083c27a 100644 --- a/grafana-as-code/Chart.yaml +++ b/grafana-as-code/Chart.yaml @@ -3,4 +3,4 @@ name: orakl-grafana-as-code description: A Grafana dashboard made by code type: application version: 0.1.0 -appVersion: "monitor.v1.0.0.20240226.0230.481b977" +appVersion: "monitor.v1.0.0.20240228.0641.481b977" diff --git a/grafana-as-code/values.yaml b/grafana-as-code/values.yaml index eeb022bb..e7876d93 100644 --- a/grafana-as-code/values.yaml +++ b/grafana-as-code/values.yaml @@ -1,7 +1,7 @@ image: repository: asia-southeast1-docker.pkg.dev/vpc-host-orakl-prod/orakl/orakl-grafana #repository url pullPolicy: IfNotPresent - tag: "monitor.v1.0.0.20240226.0230.481b977" + tag: "monitor.v1.0.0.20240228.0641.481b977" imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: From 4ee77cc8f7ed2c96b7b128e705df25e8d2368d1f Mon Sep 17 00:00:00 2001 From: Nick <148735107+nick-bisonai@users.noreply.github.com> Date: Wed, 28 Feb 2024 23:18:45 +0900 Subject: [PATCH 145/190] (BAOBAB) Updates for go delegator (#183) * feat: updates for go delegator * fix: fix linter error * feat: set image version * fix: update filenames and var names * refactor: Remove unused part of code * feat: Add service account for get secret --------- Co-authored-by: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> --- godelegator/Chart.yaml | 24 +++++ godelegator/templates/deployment.yaml | 111 ++++++++++++++++++++++++ godelegator/templates/sa.yaml | 10 +++ godelegator/templates/service.yaml | 14 +++ godelegator/values.yaml | 63 ++++++++++++++ manifest/argocd/baobab/godelegator.yaml | 15 ++++ secret-store/godelegator-secret.yaml | 26 ++++++ 7 files changed, 263 insertions(+) create mode 100644 godelegator/Chart.yaml create mode 100644 godelegator/templates/deployment.yaml create mode 100644 godelegator/templates/sa.yaml create mode 100644 godelegator/templates/service.yaml create mode 100644 godelegator/values.yaml create mode 100644 manifest/argocd/baobab/godelegator.yaml create mode 100644 secret-store/godelegator-secret.yaml diff --git a/godelegator/Chart.yaml b/godelegator/Chart.yaml new file mode 100644 index 00000000..9d8230d8 --- /dev/null +++ b/godelegator/Chart.yaml @@ -0,0 +1,24 @@ +apiVersion: v2 +name: orakl-godelegator +description: A Helm chart for Kubernetes + +# A chart can be either an 'application' or a 'library' chart. +# +# Application charts are a collection of templates that can be packaged into versioned archives +# to be deployed. +# +# Library charts provide useful utilities or functions for the chart developer. They're included as +# a dependency of application charts to inject those utilities and functions into the rendering +# pipeline. Library charts do not define any templates and therefore cannot be deployed. +type: application + +# This is the chart version. This version number should be incremented each time you make changes +# to the chart and its templates, including the app version. +# Versions are expected to follow Semantic Versioning (https://semver.org/) +version: 0.0.1 + +# This is the version number of the application being deployed. This version number should be +# incremented each time you make changes to the application. Versions are not expected to +# follow Semantic Versioning. They should reflect the version the application is using. +# It is recommended to use it with quotes. +appVersion: "v0.0.1.20240219.0806.65e29cc" diff --git a/godelegator/templates/deployment.yaml b/godelegator/templates/deployment.yaml new file mode 100644 index 00000000..f81815c3 --- /dev/null +++ b/godelegator/templates/deployment.yaml @@ -0,0 +1,111 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ .Values.deployment.name }} + labels: + app: {{ .Values.deployment.name }} + app.kubernetes.io/name: {{ .Values.deployment.name }} + app.kubernetes.io/instance: {{ .Values.deployment.name }} +spec: + replicas: {{ .Values.godelegator.replicas }} + selector: + matchLabels: + app: {{ .Values.deployment.name }} + app.kubernetes.io/name: {{ .Values.deployment.name }} + app.kubernetes.io/instance: {{ .Values.deployment.name }} + template: + metadata: + {{- with .Values.global.podAnnotations }} + annotations: + {{- toYaml . | nindent 8 }} + {{- end }} + labels: + app: {{ .Values.deployment.name }} + app.kubernetes.io/name: {{ .Values.deployment.name }} + app.kubernetes.io/instance: {{ .Values.deployment.name }} + spec: + {{- with .Values.global.image.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} + # serviceAccountName: {{ .Values.godelegator.serviceAccount.name }} + securityContext: + {{- toYaml .Values.godelegator.podSecurityContext | nindent 8 }} + {{- if .Values.global.affinity.enabled }} + affinity: + nodeAffinity: + preferredDuringSchedulingIgnoredDuringExecution: + - weight: 1 + preference: + matchExpressions: + - key: {{ .Values.global.affinity.key }} + operator: In + values: + - {{ .Values.global.affinity.value }} + {{- end }} + containers: + - name: {{ .Chart.Name }} + securityContext: + {{- toYaml .Values.godelegator.containerSecurityContext | nindent 12 }} + image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.tag | default .Chart.AppVersion }}" + imagePullPolicy: {{ .Values.global.image.pullPolicy }} + env: + - name: DATABASE_URL + valueFrom: + secretKeyRef: + name: godelegator-secrets + key: DATABASE_URL + - name: PROVIDER_URL + valueFrom: + secretKeyRef: + name: godelegator-secrets + key: PROVIDER_URL + - name: USE_GOOGLE_SECRET_MANAGER + valueFrom: + secretKeyRef: + name: godelegator-secrets + key: USE_GOOGLE_SECRET_MANAGER + - name: GOOGLE_SECRET_PATH + valueFrom: + secretKeyRef: + name: godelegator-secrets + key: GOOGLE_SECRET_PATH + - name: APP_PORT + value: "5050" + ports: + - name: http + containerPort: 5050 + protocol: TCP + {{- if .Values.global.livenessProbe.enabled }} + livenessProbe: + httpGet: + path: {{ .Values.global.livenessProbe.path }} + port: 5050 + initialDelaySeconds: {{ .Values.global.livenessProbe.initialDelaySeconds }} + periodSeconds: {{ .Values.global.livenessProbe.periodSeconds }} + timeoutSeconds: {{ .Values.global.livenessProbe.timeoutSeconds }} + successThreshold: {{ .Values.global.livenessProbe.successThreshold }} + failureThreshold: {{ .Values.global.livenessProbe.failureThreshold }} + {{- end }} + {{- if .Values.global.readinessProbe.enabled }} + readinessProbe: + httpGet: + path: {{ .Values.global.readinessProbe.path }} + port: 5050 + initialDelaySeconds: {{ .Values.global.readinessProbe.initialDelaySeconds }} + periodSeconds: {{ .Values.global.readinessProbe.periodSeconds }} + timeoutSeconds: {{ .Values.global.readinessProbe.timeoutSeconds }} + successThreshold: {{ .Values.global.readinessProbe.successThreshold }} + failureThreshold: {{ .Values.global.readinessProbe.failureThreshold }} + {{- end }} + resources: + {{- toYaml .Values.godelegator.resources | nindent 12 }} + + {{- with .Values.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.tolerations }} + tolerations: + {{- toYaml . | nindent 8 }} + {{- end }} diff --git a/godelegator/templates/sa.yaml b/godelegator/templates/sa.yaml new file mode 100644 index 00000000..9d0cf9e5 --- /dev/null +++ b/godelegator/templates/sa.yaml @@ -0,0 +1,10 @@ +{{- if .Values.global.secretManager -}} +apiVersion: v1 +kind: ServiceAccount +metadata: + name: {{ .Values.deployment.name }}-sa + labels: {{ .Values.deployment.name }} + # TODO: This annotation should be sync with GCP SA email injected from GH actions + # annotations: + # iam.gke.io/gcp-service-account: +{{- end }} diff --git a/godelegator/templates/service.yaml b/godelegator/templates/service.yaml new file mode 100644 index 00000000..576e3531 --- /dev/null +++ b/godelegator/templates/service.yaml @@ -0,0 +1,14 @@ +apiVersion: v1 +kind: Service +metadata: + name: {{ .Values.deployment.name }} +spec: + # type: ClusterIP + ports: + - port: 5050 + targetPort: http + protocol: TCP + type: LoadBalancer + loadBalancerIP: 34.87.152.175 + selector: + app: {{ .Values.deployment.name }} diff --git a/godelegator/values.yaml b/godelegator/values.yaml new file mode 100644 index 00000000..600984ab --- /dev/null +++ b/godelegator/values.yaml @@ -0,0 +1,63 @@ +## Klaytn Orakl Go Delegator Configuration +## created by Bisonai + +global: + image: + repository: public.ecr.aws/bisonai/orakl-godelegator #repository url + pullPolicy: IfNotPresent + tag: "v0.0.1.20240219.0806.65e29cc" + imagePullPolicy: IfNotPresent + # -- If defined, uses a Secret to pull an image from a private Docker registry or repository + imagePullSecrets: [] + + secretManager: + enabled: true + secretId: + versionId: + + affinity: + enabled: false + key: kubernetes.io/hostname + value: + + podAnnotations: + + livenessProbe: + enabled: true + path: /api/v1/ + initialDelaySeconds: 10 + periodSeconds: 5 + timeoutSeconds: 5 + successThreshold: 1 + failureThreshold: 5 + + readinessProbe: + enabled: true + path: /api/v1/ + initialDelaySeconds: 10ß + periodSeconds: 5 + timeoutSeconds: 1 + successThreshold: 1 + failureThreshold: 5 + +godelegator: + enabled: true + replicas: 1 + + podSecurityContext: {} + containerSecurityContext: {} + + resources: + limits: + cpu: 500m + memory: 1Gi + requests: + cpu: 500m + memory: 1Gi + +nodeSelector: {} +tolerations: [] +dotenv: {} +deployment: + name: orakl-godelegator + replicas: 1 diff --git a/manifest/argocd/baobab/godelegator.yaml b/manifest/argocd/baobab/godelegator.yaml new file mode 100644 index 00000000..9416d42d --- /dev/null +++ b/manifest/argocd/baobab/godelegator.yaml @@ -0,0 +1,15 @@ +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: godelegator + namespace: argocd +spec: + destination: + namespace: orakl + server: https://kubernetes.default.svc + project: default + source: + path: godelegator/ + repoURL: https://github.com/Bisonai/orakl-helm-charts.git + targetRevision: gcp-baobab-prod + syncPolicy: {} diff --git a/secret-store/godelegator-secret.yaml b/secret-store/godelegator-secret.yaml new file mode 100644 index 00000000..fbf0e62d --- /dev/null +++ b/secret-store/godelegator-secret.yaml @@ -0,0 +1,26 @@ +apiVersion: external-secrets.io/v1beta1 +kind: ExternalSecret +metadata: + name: godelegator-secrets +spec: + refreshInterval: "15s" + secretStoreRef: + name: vault-backend + kind: SecretStore + data: + - secretKey: DATABASE_URL + remoteRef: + key: baobab/godelegator + property: DATABASE_URL + - secretKey: PROVIDER_URL + remoteRef: + key: baobab/godelegator + property: PROVIDER_URL + - secretKey: USE_GOOGLE_SECRET_MANAGER + remoteRef: + key: baobab/godelegator + property: USE_GOOGLE_SECRET_MANAGER + - secretKey: GOOGLE_SECRET_PATH + remoteRef: + key: baobab/godelegator + property: GOOGLE_SECRET_PATH From fe5be02c4c8921b3fc05faf39ee862f92e35b7ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jay=28=EA=B9=80=EC=9E=AC=ED=9B=88=29?= Date: Wed, 28 Feb 2024 23:53:42 +0900 Subject: [PATCH 146/190] (Baobab) Hotfix error (#202) * fix: Revert deletion `serviceAccount` field from values.yaml to fix error * fix: Correct typo --------- Co-authored-by: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> --- godelegator/templates/sa.yaml | 2 +- godelegator/values.yaml | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/godelegator/templates/sa.yaml b/godelegator/templates/sa.yaml index 9d0cf9e5..4c18f44f 100644 --- a/godelegator/templates/sa.yaml +++ b/godelegator/templates/sa.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: ServiceAccount metadata: - name: {{ .Values.deployment.name }}-sa + name: {{ .Values.deployment.name }}-{{ .Values.godelegator.serviceAccount.name }} labels: {{ .Values.deployment.name }} # TODO: This annotation should be sync with GCP SA email injected from GH actions # annotations: diff --git a/godelegator/values.yaml b/godelegator/values.yaml index 600984ab..7c87894b 100644 --- a/godelegator/values.yaml +++ b/godelegator/values.yaml @@ -43,7 +43,12 @@ global: godelegator: enabled: true replicas: 1 - + serviceAccount: + create: true + name: sa + annotations: {} + automountServiceAccountToken: true + podSecurityContext: {} containerSecurityContext: {} From 8d9fdc52261b03ed661cb9548e58b9a8d89cf10c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jay=28=EA=B9=80=EC=9E=AC=ED=9B=88=29?= Date: Thu, 29 Feb 2024 11:03:45 +0900 Subject: [PATCH 147/190] (Baobab) Hotfix godelegator (#204) * fix: Revert deletion `serviceAccount` field from values.yaml to fix error * fix: Correct typo * fix: Correcting typo --------- Co-authored-by: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> --- godelegator/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/godelegator/values.yaml b/godelegator/values.yaml index 7c87894b..db1e9c93 100644 --- a/godelegator/values.yaml +++ b/godelegator/values.yaml @@ -34,7 +34,7 @@ global: readinessProbe: enabled: true path: /api/v1/ - initialDelaySeconds: 10ß + initialDelaySeconds: 10 periodSeconds: 5 timeoutSeconds: 1 successThreshold: 1 From 8ef2820d670caf440f60e93c5bc1f86cd8b7cbc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jay=28=EA=B9=80=EC=9E=AC=ED=9B=88=29?= Date: Thu, 29 Feb 2024 11:59:30 +0900 Subject: [PATCH 148/190] (Baobab) Hotfix godelegator (#205) * fix: Revert deletion `serviceAccount` field from values.yaml to fix error * fix: Correct typo * fix: Correcting typo * feat: Enable SA in deployment * fix: Remove unnecessary if statement * fix: Correcting SA name in deployment --------- Co-authored-by: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> --- godelegator/templates/deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/godelegator/templates/deployment.yaml b/godelegator/templates/deployment.yaml index f81815c3..e3ca29a2 100644 --- a/godelegator/templates/deployment.yaml +++ b/godelegator/templates/deployment.yaml @@ -28,7 +28,7 @@ spec: imagePullSecrets: {{- toYaml . | nindent 8 }} {{- end }} - # serviceAccountName: {{ .Values.godelegator.serviceAccount.name }} + serviceAccountName: {{ .Values.deployment.name }}-{{ .Values.godelegator.serviceAccount.name }} securityContext: {{- toYaml .Values.godelegator.podSecurityContext | nindent 8 }} {{- if .Values.global.affinity.enabled }} From a2926dd5af5be42c2a6e56c16b2441bfb1533e88 Mon Sep 17 00:00:00 2001 From: Nick <148735107+nick-bisonai@users.noreply.github.com> Date: Thu, 29 Feb 2024 16:02:29 +0900 Subject: [PATCH 149/190] feat: remove busd from grafana (#206) --- grafana-as-code/Chart.yaml | 2 +- grafana-as-code/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/grafana-as-code/Chart.yaml b/grafana-as-code/Chart.yaml index 8083c27a..eb9f4443 100644 --- a/grafana-as-code/Chart.yaml +++ b/grafana-as-code/Chart.yaml @@ -3,4 +3,4 @@ name: orakl-grafana-as-code description: A Grafana dashboard made by code type: application version: 0.1.0 -appVersion: "monitor.v1.0.0.20240228.0641.481b977" +appVersion: "monitor.v1.0.0.20240229.0613.748eb76" diff --git a/grafana-as-code/values.yaml b/grafana-as-code/values.yaml index e7876d93..d116ba24 100644 --- a/grafana-as-code/values.yaml +++ b/grafana-as-code/values.yaml @@ -1,7 +1,7 @@ image: repository: asia-southeast1-docker.pkg.dev/vpc-host-orakl-prod/orakl/orakl-grafana #repository url pullPolicy: IfNotPresent - tag: "monitor.v1.0.0.20240228.0641.481b977" + tag: "monitor.v1.0.0.20240229.0613.748eb76" imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: From f5dad0872da6f5c4d30ab45ee6e01ea5de13d17c Mon Sep 17 00:00:00 2001 From: Nick <148735107+nick-bisonai@users.noreply.github.com> Date: Thu, 29 Feb 2024 16:14:51 +0900 Subject: [PATCH 150/190] feat: add checks if string empty (#208) --- godelegator/Chart.yaml | 2 +- godelegator/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/godelegator/Chart.yaml b/godelegator/Chart.yaml index 9d8230d8..358d9c1f 100644 --- a/godelegator/Chart.yaml +++ b/godelegator/Chart.yaml @@ -21,4 +21,4 @@ version: 0.0.1 # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "v0.0.1.20240219.0806.65e29cc" +appVersion: "v0.0.1.20240229.0707.88629b5" diff --git a/godelegator/values.yaml b/godelegator/values.yaml index db1e9c93..10744b96 100644 --- a/godelegator/values.yaml +++ b/godelegator/values.yaml @@ -5,7 +5,7 @@ global: image: repository: public.ecr.aws/bisonai/orakl-godelegator #repository url pullPolicy: IfNotPresent - tag: "v0.0.1.20240219.0806.65e29cc" + tag: "v0.0.1.20240229.0707.88629b5" imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: [] From be65efd1d0d033cc6af25acb6949ba3c62b031d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jay=28=EA=B9=80=EC=9E=AC=ED=9B=88=29?= Date: Thu, 29 Feb 2024 16:25:33 +0900 Subject: [PATCH 151/190] (Baobab) Remove BUSD-USDT from bisontry-event-checker (#209) * feat: Update tag version Co-authored-by: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> --- bisontry-event-checker/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bisontry-event-checker/values.yaml b/bisontry-event-checker/values.yaml index e1854957..1dc0703c 100644 --- a/bisontry-event-checker/values.yaml +++ b/bisontry-event-checker/values.yaml @@ -1,6 +1,6 @@ image: repository: asia-southeast1-docker.pkg.dev/bisontry/bisontry/bisontry-event-checker - tag: v0.0.1.20231219.0733.2bb7b86 + tag: v0.0.1.20240229.0628.c5f12c9 deployment: name: bisontry-event-checker From f21255f6c0764dfcd946f56d3b776bf934c625fb Mon Sep 17 00:00:00 2001 From: Nick <148735107+nick-bisonai@users.noreply.github.com> Date: Thu, 29 Feb 2024 16:38:28 +0900 Subject: [PATCH 152/190] feat: update godelegator with trimming (#211) --- godelegator/Chart.yaml | 2 +- godelegator/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/godelegator/Chart.yaml b/godelegator/Chart.yaml index 358d9c1f..e93c2637 100644 --- a/godelegator/Chart.yaml +++ b/godelegator/Chart.yaml @@ -21,4 +21,4 @@ version: 0.0.1 # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "v0.0.1.20240229.0707.88629b5" +appVersion: "v0.0.1.20240229.0732.a084a43" diff --git a/godelegator/values.yaml b/godelegator/values.yaml index 10744b96..aeb26f42 100644 --- a/godelegator/values.yaml +++ b/godelegator/values.yaml @@ -5,7 +5,7 @@ global: image: repository: public.ecr.aws/bisonai/orakl-godelegator #repository url pullPolicy: IfNotPresent - tag: "v0.0.1.20240229.0707.88629b5" + tag: "v0.0.1.20240229.0732.a084a43" imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: [] From f7a6e1e7231ce6f20f0b27c56f00826da85d4849 Mon Sep 17 00:00:00 2001 From: Nick <148735107+nick-bisonai@users.noreply.github.com> Date: Fri, 8 Mar 2024 17:33:46 +0900 Subject: [PATCH 153/190] fix: update healthcheck delegator (#221) --- bisontry-health-checker/Chart.yaml | 2 +- bisontry-health-checker/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bisontry-health-checker/Chart.yaml b/bisontry-health-checker/Chart.yaml index 70632f12..2033c4d3 100644 --- a/bisontry-health-checker/Chart.yaml +++ b/bisontry-health-checker/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v2 name: bisontry-health-checker description: Bisontry Health Checker service. version: 0.1.0 -appVersion: v0.1.0.20240216.0351.30594bb +appVersion: v0.1.0.20240308.0747.45e1d8f diff --git a/bisontry-health-checker/values.yaml b/bisontry-health-checker/values.yaml index 1701fc28..4cd97e1c 100644 --- a/bisontry-health-checker/values.yaml +++ b/bisontry-health-checker/values.yaml @@ -1,6 +1,6 @@ image: repository: asia-southeast1-docker.pkg.dev/bisontry/bisontry/bisontry-health-checker - tag: v0.1.0.20240216.0351.30594bb + tag: v0.1.0.20240308.0747.45e1d8f deployment: name: bisontry-health-checker From b2d4416d504e35b39be6539ff098ca554c07cfc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jay=28=EA=B9=80=EC=9E=AC=ED=9B=88=29?= Date: Fri, 8 Mar 2024 17:59:16 +0900 Subject: [PATCH 154/190] (Baobab) Automate adding ArgoCD app (#212) * chore: Add name and namespace to `values.yaml` * test: Remove parent field * feat: Move name and namespace to child of global field * feat: Remove `orakl-` prefix * feat: Add `global.name` and `global.namespace` value to every chart * feat: Separate redis to multiple directory * feat: Delete unused charts * feat: Add charts to ArgoCD app automate * feat: Add redis-fetcher * fix: Add name and namespace because redis charts not contain * feat: Delete ArgoCD app manifests, it's unused * feat: Modify targetBranch to use `gcp-baobab-prod` --------- Co-authored-by: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> --- admin/values.yaml | 4 + aggregator/values.yaml | 2 + api/values.yaml | 2 + argocd/.helmignore | 4 - argocd/Chart.lock | 6 - argocd/Chart.yaml | 25 - argocd/README.md | 949 --- argocd/charts/redis-ha/Chart.yaml | 21 - argocd/charts/redis-ha/README.md | 382 - .../redis-ha/ci/haproxy-enabled-values.yaml | 10 - argocd/charts/redis-ha/templates/NOTES.txt | 25 - argocd/charts/redis-ha/templates/_configs.tpl | 692 -- argocd/charts/redis-ha/templates/_helpers.tpl | 83 - .../redis-ha/templates/redis-auth-secret.yaml | 15 - .../templates/redis-ha-announce-service.yaml | 60 - .../templates/redis-ha-configmap.yaml | 37 - .../redis-ha-exporter-script-configmap.yaml | 14 - .../templates/redis-ha-health-configmap.yaml | 20 - .../templates/redis-ha-network-policy.yaml | 86 - .../redis-ha/templates/redis-ha-pdb.yaml | 21 - .../templates/redis-ha-prometheus-rule.yaml | 17 - .../redis-ha/templates/redis-ha-psp.yaml | 48 - .../redis-ha/templates/redis-ha-role.yaml | 29 - .../templates/redis-ha-rolebinding.yaml | 19 - .../redis-ha/templates/redis-ha-secret.yaml | 32 - .../redis-ha/templates/redis-ha-service.yaml | 57 - .../templates/redis-ha-serviceaccount.yaml | 27 - .../templates/redis-ha-servicemonitor.yaml | 36 - .../templates/redis-ha-statefulset.yaml | 593 -- .../templates/redis-haproxy-deployment.yaml | 200 - .../redis-ha/templates/redis-haproxy-pdb.yaml | 18 - .../redis-ha/templates/redis-haproxy-psp.yaml | 42 - .../templates/redis-haproxy-role.yaml | 32 - .../templates/redis-haproxy-rolebinding.yaml | 22 - .../templates/redis-haproxy-service.yaml | 54 - .../redis-haproxy-serviceaccount.yaml | 15 - .../redis-haproxy-servicemonitor.yaml | 36 - .../redis-ha/templates/redis-tls-secret.yaml | 27 - .../templates/sentinel-auth-secret.yaml | 15 - .../tests/test-redis-ha-configmap.yaml | 27 - .../templates/tests/test-redis-ha-pod.yaml | 22 - argocd/charts/redis-ha/values.yaml | 677 -- argocd/crds/crd-application.yaml | 2150 ------ argocd/crds/crd-applicationset.yaml | 6529 ----------------- argocd/crds/crd-extension.yaml | 96 - argocd/crds/crd-project.yaml | 312 - argocd/templates/NOTES.txt | 28 - argocd/templates/_helpers.tpl | 312 - argocd/templates/argocd-aggregate-roles.yaml | 70 - .../clusterrole.yaml | 23 - .../clusterrolebinding.yaml | 16 - .../deployment.yaml | 177 - .../metrics-service.yaml | 25 - .../networkpolicy.yaml | 19 - .../poddisruptionbudget.yaml | 26 - .../prometheusrule.yaml | 22 - .../argocd-application-controller/role.yaml | 36 - .../rolebinding.yaml | 14 - .../service.yaml | 19 - .../serviceaccount.yaml | 15 - .../servicemonitor.yaml | 45 - .../argocd-applicationset/deployment.yaml | 131 - .../metrics-service.yaml | 25 - .../argocd-applicationset/networkpolicy.yaml | 25 - .../templates/argocd-applicationset/role.yaml | 85 - .../argocd-applicationset/rolebinding.yaml | 16 - .../argocd-applicationset/service.yaml | 21 - .../argocd-applicationset/serviceaccount.yaml | 15 - .../argocd-applicationset/servicemonitor.yaml | 47 - .../webhook-ingress.yaml | 89 - .../argocd-configs/applications.yaml | 42 - .../templates/argocd-configs/argocd-cm.yaml | 15 - .../argocd-configs/argocd-gpg-keys-cm.yaml | 16 - .../argocd-configs/argocd-rbac-cm.yaml | 18 - .../argocd-configs/argocd-secret.yaml | 45 - .../argocd-ssh-known-hosts-cm.yaml | 13 - .../argocd-configs/argocd-styles-cm.yaml | 11 - .../argocd-configs/argocd-tls-certs-cm.yaml | 15 - .../argocd-configs/cluster-secrets.yaml | 31 - .../argocd-configs/externalredis-secret.yaml | 15 - argocd/templates/argocd-configs/projects.yaml | 62 - .../repository-credentials-secret-legacy.yaml | 13 - .../repository-credentials-secret.yaml | 18 - .../argocd-configs/repository-secret.yaml | 18 - .../bots/slack/deployment.yaml | 53 - .../argocd-notifications/bots/slack/role.yaml | 27 - .../bots/slack/rolebinding.yaml | 13 - .../bots/slack/service.yaml | 19 - .../bots/slack/serviceaccount.yaml | 15 - .../argocd-notifications/configmap.yaml | 27 - .../argocd-notifications/deployment.yaml | 107 - .../argocd-notifications/networkpolicy.yaml | 19 - .../templates/argocd-notifications/role.yaml | 44 - .../argocd-notifications/rolebinding.yaml | 16 - .../argocd-notifications/secret.yaml | 19 - .../argocd-notifications/service-metrics.yaml | 25 - .../argocd-notifications/serviceaccount.yaml | 15 - .../argocd-notifications/servicemonitor.yaml | 40 - .../argocd-repo-server/clusterrole.yaml | 23 - .../clusterrolebinding.yaml | 16 - .../argocd-repo-server/deployment.yaml | 220 - argocd/templates/argocd-repo-server/hpa.yaml | 40 - .../argocd-repo-server/metrics-service.yaml | 25 - .../argocd-repo-server/networkpolicy.yaml | 41 - .../poddisruptionbudget.yaml | 26 - argocd/templates/argocd-repo-server/role.yaml | 12 - .../argocd-repo-server/rolebinding.yaml | 16 - .../templates/argocd-repo-server/service.yaml | 20 - .../argocd-repo-server/serviceaccount.yaml | 15 - .../argocd-repo-server/servicemonitor.yaml | 45 - .../argocd-server/alb-grpc-service.yaml | 24 - .../argocd-server/backendconfig.yaml | 10 - .../templates/argocd-server/certificate.yaml | 38 - .../templates/argocd-server/clusterrole.yaml | 38 - .../argocd-server/clusterrolebinding.yaml | 16 - .../templates/argocd-server/deployment.yaml | 231 - .../argocd-server/extensions-rolebinding.yaml | 15 - .../templates/argocd-server/extensions.yaml | 17 - .../argocd-server/extentions-role.yaml | 21 - .../argocd-server/frontendconfig.yaml | 10 - argocd/templates/argocd-server/hpa.yaml | 40 - .../templates/argocd-server/ingress-grpc.yaml | 89 - argocd/templates/argocd-server/ingress.yaml | 113 - .../argocd-server/managedCertificate.yaml | 11 - .../argocd-server/metrics-service.yaml | 25 - .../argocd-server/networkpolicy.yaml | 16 - .../argocd-server/poddisruptionbudget.yaml | 26 - argocd/templates/argocd-server/role.yaml | 40 - .../templates/argocd-server/rolebinding.yaml | 14 - argocd/templates/argocd-server/route.yaml | 26 - argocd/templates/argocd-server/service.yaml | 52 - .../argocd-server/serviceaccount.yaml | 15 - .../argocd-server/servicemonitor.yaml | 45 - argocd/templates/dex/deployment.yaml | 158 - argocd/templates/dex/networkpolicy.yaml | 31 - argocd/templates/dex/poddisruptionbudget.yaml | 26 - argocd/templates/dex/role.yaml | 18 - argocd/templates/dex/rolebinding.yaml | 16 - argocd/templates/dex/service.yaml | 35 - argocd/templates/dex/serviceaccount.yaml | 15 - argocd/templates/dex/servicemonitor.yaml | 45 - argocd/templates/extra-manifests.yaml | 4 - .../templates/networkpolicy-default-deny.yaml | 12 - argocd/templates/redis/deployment.yaml | 124 - argocd/templates/redis/metrics-service.yaml | 30 - argocd/templates/redis/networkpolicy.yaml | 36 - .../templates/redis/poddisruptionbudget.yaml | 26 - argocd/templates/redis/service.yaml | 25 - argocd/templates/redis/serviceaccount.yaml | 15 - argocd/templates/redis/servicemonitor.yaml | 46 - argocd/values.yaml | 2701 ------- bisontry-balance-checker/values.yaml | 4 + bisontry-daily-report/values.yaml | 4 + bisontry-event-checker/values.yaml | 4 + bisontry-health-checker/values.yaml | 3 + bull-exporter/deployment.yaml | 69 - bull-monitor/Chart.yaml | 9 - bull-monitor/NOTES.txt | 1 - bull-monitor/README.md | 1 - bull-monitor/templates/bull-config.yaml | 11 - bull-monitor/templates/bull-deployment.yaml | 43 - bull-monitor/templates/bull-service.yaml | 15 - bull-monitor/values.yaml | 21 - cli/values.yaml | 3 + cron/multiple/Dockerfile | 17 - cron/multiple/deployment.yaml | 64 - cron/multiple/docker-compose.build.yaml | 8 - cron/multiple/logrotate.conf | 84 - delegator/values.yaml | 3 + fetcher/values.yaml | 3 + godelegator/values.yaml | 3 + grafana-as-code/values.yaml | 4 + loki/loki-stack-values.yaml | 111 - loki/value.yaml | 1252 ---- manifest/argocd/applicationSet.yaml | 33 + manifest/argocd/baobab/admin.yaml | 15 - manifest/argocd/baobab/aggregator.yaml | 15 - manifest/argocd/baobab/api.yaml | 15 - .../baobab/bisontry-balance-checker.yaml | 15 - .../argocd/baobab/bisontry-event-checker.yaml | 15 - .../baobab/bisontry-health-checker.yaml | 15 - manifest/argocd/baobab/cli.yaml | 15 - manifest/argocd/baobab/delegator.yaml | 15 - manifest/argocd/baobab/fetcher.yaml | 15 - manifest/argocd/baobab/godelegator.yaml | 15 - manifest/argocd/baobab/grafana-as-code.yaml | 17 - manifest/argocd/baobab/monitor.yaml | 15 - manifest/argocd/baobab/redis.yaml | 66 - manifest/argocd/baobab/request-response.yaml | 15 - manifest/argocd/baobab/vrf.yaml | 15 - monitor-api/values.yaml | 3 + prometheus/.gitignore | 1 - prometheus/Chart.lock | 15 - prometheus/Chart.yaml | 51 - prometheus/README.md | 297 - prometheus/templates/NOTES.txt | 113 - prometheus/templates/_helpers.tpl | 287 - prometheus/templates/clusterrole.yaml | 48 - prometheus/templates/clusterrolebinding.yaml | 16 - prometheus/templates/cm.yaml | 84 - prometheus/templates/deploy.yaml | 330 - prometheus/templates/extra-manifests.yaml | 4 - prometheus/templates/headless-svc.yaml | 35 - prometheus/templates/ingress.yaml | 57 - prometheus/templates/network-policy.yaml | 16 - prometheus/templates/pdb.yaml | 14 - prometheus/templates/psp.yaml | 53 - prometheus/templates/pvc.yaml | 40 - prometheus/templates/rolebinding.yaml | 20 - prometheus/templates/service.yaml | 60 - prometheus/templates/serviceaccount.yaml | 11 - prometheus/templates/sts.yaml | 350 - prometheus/templates/vpa.yaml | 26 - prometheus/values.yaml | 1119 --- {redis => redis-data-feed}/.helmignore | 0 {redis => redis-data-feed}/Chart.lock | 0 {redis => redis-data-feed}/Chart.yaml | 0 {redis => redis-data-feed}/README.md | 0 .../charts/common-2.2.2.tgz | Bin .../img/redis-cluster-topology.png | Bin .../img/redis-topology.png | Bin .../templates/NOTES.txt | 0 .../templates/_helpers.tpl | 0 .../templates/configmap.yaml | 0 .../templates/extra-list.yaml | 0 .../templates/headless-svc.yaml | 0 .../templates/health-configmap.yaml | 0 .../templates/master/application.yaml | 0 .../templates/master/psp.yaml | 0 .../templates/master/pvc.yaml | 0 .../templates/master/service.yaml | 0 .../templates/master/serviceaccount.yaml | 0 .../templates/metrics-svc.yaml | 0 .../templates/networkpolicy.yaml | 0 {redis => redis-data-feed}/templates/pdb.yaml | 0 .../templates/prometheusrule.yaml | 0 .../templates/replicas/hpa.yaml | 0 .../templates/replicas/service.yaml | 0 .../templates/replicas/serviceaccount.yaml | 0 .../templates/replicas/statefulset.yaml | 0 .../templates/role.yaml | 0 .../templates/rolebinding.yaml | 0 .../templates/scripts-configmap.yaml | 0 .../templates/secret.yaml | 0 .../templates/sentinel/hpa.yaml | 0 .../templates/sentinel/node-services.yaml | 0 .../templates/sentinel/ports-configmap.yaml | 0 .../templates/sentinel/service.yaml | 0 .../templates/sentinel/statefulset.yaml | 0 .../templates/serviceaccount.yaml | 0 .../templates/servicemonitor.yaml | 0 .../templates/tls-secret.yaml | 0 {redis => redis-data-feed}/values.schema.json | 0 redis-data-feed/values.yaml | 1746 +++++ {prometheus => redis-fetcher}/.helmignore | 2 - redis-fetcher/Chart.lock | 6 + redis-fetcher/Chart.yaml | 25 + redis-fetcher/README.md | 950 +++ redis-fetcher/charts/common-2.2.2.tgz | Bin 0 -> 14851 bytes redis-fetcher/img/redis-cluster-topology.png | Bin 0 -> 11448 bytes redis-fetcher/img/redis-topology.png | Bin 0 -> 9709 bytes redis-fetcher/templates/NOTES.txt | 191 + redis-fetcher/templates/_helpers.tpl | 321 + redis-fetcher/templates/configmap.yaml | 59 + redis-fetcher/templates/extra-list.yaml | 4 + redis-fetcher/templates/headless-svc.yaml | 30 + redis-fetcher/templates/health-configmap.yaml | 192 + .../templates/master/application.yaml | 516 ++ redis-fetcher/templates/master/psp.yaml | 46 + redis-fetcher/templates/master/pvc.yaml | 27 + redis-fetcher/templates/master/service.yaml | 61 + .../templates/master/serviceaccount.yaml | 21 + redis-fetcher/templates/metrics-svc.yaml | 41 + redis-fetcher/templates/networkpolicy.yaml | 82 + redis-fetcher/templates/pdb.yaml | 23 + redis-fetcher/templates/prometheusrule.yaml | 21 + redis-fetcher/templates/replicas/hpa.yaml | 47 + redis-fetcher/templates/replicas/service.yaml | 58 + .../templates/replicas/serviceaccount.yaml | 21 + .../templates/replicas/statefulset.yaml | 515 ++ redis-fetcher/templates/role.yaml | 28 + redis-fetcher/templates/rolebinding.yaml | 21 + .../templates/scripts-configmap.yaml | 713 ++ redis-fetcher/templates/secret.yaml | 23 + redis-fetcher/templates/sentinel/hpa.yaml | 47 + .../templates/sentinel/node-services.yaml | 70 + .../templates/sentinel/ports-configmap.yaml | 100 + redis-fetcher/templates/sentinel/service.yaml | 103 + .../templates/sentinel/statefulset.yaml | 774 ++ redis-fetcher/templates/serviceaccount.yaml | 21 + redis-fetcher/templates/servicemonitor.yaml | 44 + redis-fetcher/templates/tls-secret.yaml | 30 + redis-fetcher/values.schema.json | 156 + redis-fetcher/values.yaml | 1746 +++++ redis-request-response/.helmignore | 21 + redis-request-response/Chart.lock | 6 + redis-request-response/Chart.yaml | 25 + redis-request-response/README.md | 950 +++ .../charts/common-2.2.2.tgz | Bin 0 -> 14851 bytes .../img/redis-cluster-topology.png | Bin 0 -> 11448 bytes redis-request-response/img/redis-topology.png | Bin 0 -> 9709 bytes redis-request-response/templates/NOTES.txt | 191 + redis-request-response/templates/_helpers.tpl | 321 + .../templates/configmap.yaml | 59 + .../templates/extra-list.yaml | 4 + .../templates/headless-svc.yaml | 30 + .../templates/health-configmap.yaml | 192 + .../templates/master/application.yaml | 516 ++ .../templates/master/psp.yaml | 46 + .../templates/master/pvc.yaml | 27 + .../templates/master/service.yaml | 61 + .../templates/master/serviceaccount.yaml | 21 + .../templates/metrics-svc.yaml | 41 + .../templates/networkpolicy.yaml | 82 + redis-request-response/templates/pdb.yaml | 23 + .../templates/prometheusrule.yaml | 21 + .../templates/replicas/hpa.yaml | 47 + .../templates/replicas/service.yaml | 58 + .../templates/replicas/serviceaccount.yaml | 21 + .../templates/replicas/statefulset.yaml | 515 ++ redis-request-response/templates/role.yaml | 28 + .../templates/rolebinding.yaml | 21 + .../templates/scripts-configmap.yaml | 713 ++ redis-request-response/templates/secret.yaml | 23 + .../templates/sentinel/hpa.yaml | 47 + .../templates/sentinel/node-services.yaml | 70 + .../templates/sentinel/ports-configmap.yaml | 100 + .../templates/sentinel/service.yaml | 103 + .../templates/sentinel/statefulset.yaml | 774 ++ .../templates/serviceaccount.yaml | 21 + .../templates/servicemonitor.yaml | 44 + .../templates/tls-secret.yaml | 30 + redis-request-response/values.schema.json | 156 + redis-request-response/values.yaml | 1746 +++++ redis-vrf/.helmignore | 21 + redis-vrf/Chart.lock | 6 + redis-vrf/Chart.yaml | 25 + redis-vrf/README.md | 950 +++ redis-vrf/charts/common-2.2.2.tgz | Bin 0 -> 14851 bytes redis-vrf/img/redis-cluster-topology.png | Bin 0 -> 11448 bytes redis-vrf/img/redis-topology.png | Bin 0 -> 9709 bytes redis-vrf/templates/NOTES.txt | 191 + redis-vrf/templates/_helpers.tpl | 321 + redis-vrf/templates/configmap.yaml | 59 + redis-vrf/templates/extra-list.yaml | 4 + redis-vrf/templates/headless-svc.yaml | 30 + redis-vrf/templates/health-configmap.yaml | 192 + redis-vrf/templates/master/application.yaml | 516 ++ redis-vrf/templates/master/psp.yaml | 46 + redis-vrf/templates/master/pvc.yaml | 27 + redis-vrf/templates/master/service.yaml | 61 + .../templates/master/serviceaccount.yaml | 21 + redis-vrf/templates/metrics-svc.yaml | 41 + redis-vrf/templates/networkpolicy.yaml | 82 + redis-vrf/templates/pdb.yaml | 23 + redis-vrf/templates/prometheusrule.yaml | 21 + redis-vrf/templates/replicas/hpa.yaml | 47 + redis-vrf/templates/replicas/service.yaml | 58 + .../templates/replicas/serviceaccount.yaml | 21 + redis-vrf/templates/replicas/statefulset.yaml | 515 ++ redis-vrf/templates/role.yaml | 28 + redis-vrf/templates/rolebinding.yaml | 21 + redis-vrf/templates/scripts-configmap.yaml | 713 ++ redis-vrf/templates/secret.yaml | 23 + redis-vrf/templates/sentinel/hpa.yaml | 47 + .../templates/sentinel/node-services.yaml | 70 + .../templates/sentinel/ports-configmap.yaml | 100 + redis-vrf/templates/sentinel/service.yaml | 103 + redis-vrf/templates/sentinel/statefulset.yaml | 774 ++ redis-vrf/templates/serviceaccount.yaml | 21 + redis-vrf/templates/servicemonitor.yaml | 44 + redis-vrf/templates/tls-secret.yaml | 30 + redis-vrf/values.schema.json | 156 + {redis => redis-vrf}/values.yaml | 3 + request-response/values.yaml | 3 + storage-aws/Chart.yaml | 9 - storage-aws/NOTES.txt | 1 - storage-aws/README.md | 24 - storage-aws/templates/log-pv.yaml | 17 - storage-aws/templates/log-pvc.yaml | 18 - storage-aws/templates/sc.yaml | 5 - storage-aws/values.yaml | 8 - storage-gcp/Chart.yaml | 9 - storage-gcp/NOTES.txt | 1 - storage-gcp/README.md | 24 - storage-gcp/templates/log-pv.yaml | 13 - storage-gcp/templates/log-pvc.yaml | 13 - storage-gcp/templates/sc.yaml | 6 - storage-gcp/values.yaml | 6 - vrf/values.yaml | 3 + 390 files changed, 21525 insertions(+), 25635 deletions(-) delete mode 100644 argocd/.helmignore delete mode 100644 argocd/Chart.lock delete mode 100644 argocd/Chart.yaml delete mode 100644 argocd/README.md delete mode 100644 argocd/charts/redis-ha/Chart.yaml delete mode 100644 argocd/charts/redis-ha/README.md delete mode 100644 argocd/charts/redis-ha/ci/haproxy-enabled-values.yaml delete mode 100644 argocd/charts/redis-ha/templates/NOTES.txt delete mode 100644 argocd/charts/redis-ha/templates/_configs.tpl delete mode 100644 argocd/charts/redis-ha/templates/_helpers.tpl delete mode 100644 argocd/charts/redis-ha/templates/redis-auth-secret.yaml delete mode 100644 argocd/charts/redis-ha/templates/redis-ha-announce-service.yaml delete mode 100644 argocd/charts/redis-ha/templates/redis-ha-configmap.yaml delete mode 100644 argocd/charts/redis-ha/templates/redis-ha-exporter-script-configmap.yaml delete mode 100644 argocd/charts/redis-ha/templates/redis-ha-health-configmap.yaml delete mode 100644 argocd/charts/redis-ha/templates/redis-ha-network-policy.yaml delete mode 100644 argocd/charts/redis-ha/templates/redis-ha-pdb.yaml delete mode 100644 argocd/charts/redis-ha/templates/redis-ha-prometheus-rule.yaml delete mode 100644 argocd/charts/redis-ha/templates/redis-ha-psp.yaml delete mode 100644 argocd/charts/redis-ha/templates/redis-ha-role.yaml delete mode 100644 argocd/charts/redis-ha/templates/redis-ha-rolebinding.yaml delete mode 100644 argocd/charts/redis-ha/templates/redis-ha-secret.yaml delete mode 100644 argocd/charts/redis-ha/templates/redis-ha-service.yaml delete mode 100644 argocd/charts/redis-ha/templates/redis-ha-serviceaccount.yaml delete mode 100644 argocd/charts/redis-ha/templates/redis-ha-servicemonitor.yaml delete mode 100644 argocd/charts/redis-ha/templates/redis-ha-statefulset.yaml delete mode 100644 argocd/charts/redis-ha/templates/redis-haproxy-deployment.yaml delete mode 100644 argocd/charts/redis-ha/templates/redis-haproxy-pdb.yaml delete mode 100644 argocd/charts/redis-ha/templates/redis-haproxy-psp.yaml delete mode 100644 argocd/charts/redis-ha/templates/redis-haproxy-role.yaml delete mode 100644 argocd/charts/redis-ha/templates/redis-haproxy-rolebinding.yaml delete mode 100644 argocd/charts/redis-ha/templates/redis-haproxy-service.yaml delete mode 100644 argocd/charts/redis-ha/templates/redis-haproxy-serviceaccount.yaml delete mode 100644 argocd/charts/redis-ha/templates/redis-haproxy-servicemonitor.yaml delete mode 100644 argocd/charts/redis-ha/templates/redis-tls-secret.yaml delete mode 100644 argocd/charts/redis-ha/templates/sentinel-auth-secret.yaml delete mode 100644 argocd/charts/redis-ha/templates/tests/test-redis-ha-configmap.yaml delete mode 100644 argocd/charts/redis-ha/templates/tests/test-redis-ha-pod.yaml delete mode 100644 argocd/charts/redis-ha/values.yaml delete mode 100644 argocd/crds/crd-application.yaml delete mode 100644 argocd/crds/crd-applicationset.yaml delete mode 100644 argocd/crds/crd-extension.yaml delete mode 100644 argocd/crds/crd-project.yaml delete mode 100644 argocd/templates/NOTES.txt delete mode 100644 argocd/templates/_helpers.tpl delete mode 100644 argocd/templates/argocd-aggregate-roles.yaml delete mode 100644 argocd/templates/argocd-application-controller/clusterrole.yaml delete mode 100644 argocd/templates/argocd-application-controller/clusterrolebinding.yaml delete mode 100644 argocd/templates/argocd-application-controller/deployment.yaml delete mode 100644 argocd/templates/argocd-application-controller/metrics-service.yaml delete mode 100644 argocd/templates/argocd-application-controller/networkpolicy.yaml delete mode 100644 argocd/templates/argocd-application-controller/poddisruptionbudget.yaml delete mode 100644 argocd/templates/argocd-application-controller/prometheusrule.yaml delete mode 100644 argocd/templates/argocd-application-controller/role.yaml delete mode 100644 argocd/templates/argocd-application-controller/rolebinding.yaml delete mode 100644 argocd/templates/argocd-application-controller/service.yaml delete mode 100644 argocd/templates/argocd-application-controller/serviceaccount.yaml delete mode 100644 argocd/templates/argocd-application-controller/servicemonitor.yaml delete mode 100644 argocd/templates/argocd-applicationset/deployment.yaml delete mode 100644 argocd/templates/argocd-applicationset/metrics-service.yaml delete mode 100644 argocd/templates/argocd-applicationset/networkpolicy.yaml delete mode 100644 argocd/templates/argocd-applicationset/role.yaml delete mode 100644 argocd/templates/argocd-applicationset/rolebinding.yaml delete mode 100644 argocd/templates/argocd-applicationset/service.yaml delete mode 100644 argocd/templates/argocd-applicationset/serviceaccount.yaml delete mode 100644 argocd/templates/argocd-applicationset/servicemonitor.yaml delete mode 100644 argocd/templates/argocd-applicationset/webhook-ingress.yaml delete mode 100644 argocd/templates/argocd-configs/applications.yaml delete mode 100644 argocd/templates/argocd-configs/argocd-cm.yaml delete mode 100644 argocd/templates/argocd-configs/argocd-gpg-keys-cm.yaml delete mode 100644 argocd/templates/argocd-configs/argocd-rbac-cm.yaml delete mode 100644 argocd/templates/argocd-configs/argocd-secret.yaml delete mode 100644 argocd/templates/argocd-configs/argocd-ssh-known-hosts-cm.yaml delete mode 100644 argocd/templates/argocd-configs/argocd-styles-cm.yaml delete mode 100644 argocd/templates/argocd-configs/argocd-tls-certs-cm.yaml delete mode 100644 argocd/templates/argocd-configs/cluster-secrets.yaml delete mode 100644 argocd/templates/argocd-configs/externalredis-secret.yaml delete mode 100644 argocd/templates/argocd-configs/projects.yaml delete mode 100644 argocd/templates/argocd-configs/repository-credentials-secret-legacy.yaml delete mode 100644 argocd/templates/argocd-configs/repository-credentials-secret.yaml delete mode 100644 argocd/templates/argocd-configs/repository-secret.yaml delete mode 100644 argocd/templates/argocd-notifications/bots/slack/deployment.yaml delete mode 100644 argocd/templates/argocd-notifications/bots/slack/role.yaml delete mode 100644 argocd/templates/argocd-notifications/bots/slack/rolebinding.yaml delete mode 100644 argocd/templates/argocd-notifications/bots/slack/service.yaml delete mode 100644 argocd/templates/argocd-notifications/bots/slack/serviceaccount.yaml delete mode 100644 argocd/templates/argocd-notifications/configmap.yaml delete mode 100644 argocd/templates/argocd-notifications/deployment.yaml delete mode 100644 argocd/templates/argocd-notifications/networkpolicy.yaml delete mode 100644 argocd/templates/argocd-notifications/role.yaml delete mode 100644 argocd/templates/argocd-notifications/rolebinding.yaml delete mode 100644 argocd/templates/argocd-notifications/secret.yaml delete mode 100644 argocd/templates/argocd-notifications/service-metrics.yaml delete mode 100644 argocd/templates/argocd-notifications/serviceaccount.yaml delete mode 100644 argocd/templates/argocd-notifications/servicemonitor.yaml delete mode 100644 argocd/templates/argocd-repo-server/clusterrole.yaml delete mode 100644 argocd/templates/argocd-repo-server/clusterrolebinding.yaml delete mode 100644 argocd/templates/argocd-repo-server/deployment.yaml delete mode 100644 argocd/templates/argocd-repo-server/hpa.yaml delete mode 100644 argocd/templates/argocd-repo-server/metrics-service.yaml delete mode 100644 argocd/templates/argocd-repo-server/networkpolicy.yaml delete mode 100644 argocd/templates/argocd-repo-server/poddisruptionbudget.yaml delete mode 100644 argocd/templates/argocd-repo-server/role.yaml delete mode 100644 argocd/templates/argocd-repo-server/rolebinding.yaml delete mode 100644 argocd/templates/argocd-repo-server/service.yaml delete mode 100644 argocd/templates/argocd-repo-server/serviceaccount.yaml delete mode 100644 argocd/templates/argocd-repo-server/servicemonitor.yaml delete mode 100644 argocd/templates/argocd-server/alb-grpc-service.yaml delete mode 100644 argocd/templates/argocd-server/backendconfig.yaml delete mode 100644 argocd/templates/argocd-server/certificate.yaml delete mode 100644 argocd/templates/argocd-server/clusterrole.yaml delete mode 100644 argocd/templates/argocd-server/clusterrolebinding.yaml delete mode 100644 argocd/templates/argocd-server/deployment.yaml delete mode 100644 argocd/templates/argocd-server/extensions-rolebinding.yaml delete mode 100644 argocd/templates/argocd-server/extensions.yaml delete mode 100644 argocd/templates/argocd-server/extentions-role.yaml delete mode 100644 argocd/templates/argocd-server/frontendconfig.yaml delete mode 100644 argocd/templates/argocd-server/hpa.yaml delete mode 100644 argocd/templates/argocd-server/ingress-grpc.yaml delete mode 100644 argocd/templates/argocd-server/ingress.yaml delete mode 100644 argocd/templates/argocd-server/managedCertificate.yaml delete mode 100644 argocd/templates/argocd-server/metrics-service.yaml delete mode 100644 argocd/templates/argocd-server/networkpolicy.yaml delete mode 100644 argocd/templates/argocd-server/poddisruptionbudget.yaml delete mode 100644 argocd/templates/argocd-server/role.yaml delete mode 100644 argocd/templates/argocd-server/rolebinding.yaml delete mode 100644 argocd/templates/argocd-server/route.yaml delete mode 100644 argocd/templates/argocd-server/service.yaml delete mode 100644 argocd/templates/argocd-server/serviceaccount.yaml delete mode 100644 argocd/templates/argocd-server/servicemonitor.yaml delete mode 100644 argocd/templates/dex/deployment.yaml delete mode 100644 argocd/templates/dex/networkpolicy.yaml delete mode 100644 argocd/templates/dex/poddisruptionbudget.yaml delete mode 100644 argocd/templates/dex/role.yaml delete mode 100644 argocd/templates/dex/rolebinding.yaml delete mode 100644 argocd/templates/dex/service.yaml delete mode 100644 argocd/templates/dex/serviceaccount.yaml delete mode 100644 argocd/templates/dex/servicemonitor.yaml delete mode 100644 argocd/templates/extra-manifests.yaml delete mode 100644 argocd/templates/networkpolicy-default-deny.yaml delete mode 100644 argocd/templates/redis/deployment.yaml delete mode 100644 argocd/templates/redis/metrics-service.yaml delete mode 100644 argocd/templates/redis/networkpolicy.yaml delete mode 100644 argocd/templates/redis/poddisruptionbudget.yaml delete mode 100644 argocd/templates/redis/service.yaml delete mode 100644 argocd/templates/redis/serviceaccount.yaml delete mode 100644 argocd/templates/redis/servicemonitor.yaml delete mode 100644 argocd/values.yaml delete mode 100644 bull-exporter/deployment.yaml delete mode 100644 bull-monitor/Chart.yaml delete mode 100644 bull-monitor/NOTES.txt delete mode 100644 bull-monitor/README.md delete mode 100644 bull-monitor/templates/bull-config.yaml delete mode 100644 bull-monitor/templates/bull-deployment.yaml delete mode 100644 bull-monitor/templates/bull-service.yaml delete mode 100644 bull-monitor/values.yaml delete mode 100644 cron/multiple/Dockerfile delete mode 100644 cron/multiple/deployment.yaml delete mode 100644 cron/multiple/docker-compose.build.yaml delete mode 100644 cron/multiple/logrotate.conf delete mode 100644 loki/loki-stack-values.yaml delete mode 100644 loki/value.yaml create mode 100644 manifest/argocd/applicationSet.yaml delete mode 100644 manifest/argocd/baobab/admin.yaml delete mode 100644 manifest/argocd/baobab/aggregator.yaml delete mode 100644 manifest/argocd/baobab/api.yaml delete mode 100644 manifest/argocd/baobab/bisontry-balance-checker.yaml delete mode 100644 manifest/argocd/baobab/bisontry-event-checker.yaml delete mode 100644 manifest/argocd/baobab/bisontry-health-checker.yaml delete mode 100644 manifest/argocd/baobab/cli.yaml delete mode 100644 manifest/argocd/baobab/delegator.yaml delete mode 100644 manifest/argocd/baobab/fetcher.yaml delete mode 100644 manifest/argocd/baobab/godelegator.yaml delete mode 100644 manifest/argocd/baobab/grafana-as-code.yaml delete mode 100644 manifest/argocd/baobab/monitor.yaml delete mode 100644 manifest/argocd/baobab/redis.yaml delete mode 100644 manifest/argocd/baobab/request-response.yaml delete mode 100644 manifest/argocd/baobab/vrf.yaml delete mode 100644 prometheus/.gitignore delete mode 100644 prometheus/Chart.lock delete mode 100644 prometheus/Chart.yaml delete mode 100644 prometheus/README.md delete mode 100644 prometheus/templates/NOTES.txt delete mode 100644 prometheus/templates/_helpers.tpl delete mode 100644 prometheus/templates/clusterrole.yaml delete mode 100644 prometheus/templates/clusterrolebinding.yaml delete mode 100644 prometheus/templates/cm.yaml delete mode 100644 prometheus/templates/deploy.yaml delete mode 100644 prometheus/templates/extra-manifests.yaml delete mode 100644 prometheus/templates/headless-svc.yaml delete mode 100644 prometheus/templates/ingress.yaml delete mode 100644 prometheus/templates/network-policy.yaml delete mode 100644 prometheus/templates/pdb.yaml delete mode 100644 prometheus/templates/psp.yaml delete mode 100644 prometheus/templates/pvc.yaml delete mode 100644 prometheus/templates/rolebinding.yaml delete mode 100644 prometheus/templates/service.yaml delete mode 100644 prometheus/templates/serviceaccount.yaml delete mode 100644 prometheus/templates/sts.yaml delete mode 100644 prometheus/templates/vpa.yaml delete mode 100644 prometheus/values.yaml rename {redis => redis-data-feed}/.helmignore (100%) rename {redis => redis-data-feed}/Chart.lock (100%) rename {redis => redis-data-feed}/Chart.yaml (100%) rename {redis => redis-data-feed}/README.md (100%) rename {redis => redis-data-feed}/charts/common-2.2.2.tgz (100%) rename {redis => redis-data-feed}/img/redis-cluster-topology.png (100%) rename {redis => redis-data-feed}/img/redis-topology.png (100%) rename {redis => redis-data-feed}/templates/NOTES.txt (100%) rename {redis => redis-data-feed}/templates/_helpers.tpl (100%) rename {redis => redis-data-feed}/templates/configmap.yaml (100%) rename {redis => redis-data-feed}/templates/extra-list.yaml (100%) rename {redis => redis-data-feed}/templates/headless-svc.yaml (100%) rename {redis => redis-data-feed}/templates/health-configmap.yaml (100%) rename {redis => redis-data-feed}/templates/master/application.yaml (100%) rename {redis => redis-data-feed}/templates/master/psp.yaml (100%) rename {redis => redis-data-feed}/templates/master/pvc.yaml (100%) rename {redis => redis-data-feed}/templates/master/service.yaml (100%) rename {redis => redis-data-feed}/templates/master/serviceaccount.yaml (100%) rename {redis => redis-data-feed}/templates/metrics-svc.yaml (100%) rename {redis => redis-data-feed}/templates/networkpolicy.yaml (100%) rename {redis => redis-data-feed}/templates/pdb.yaml (100%) rename {redis => redis-data-feed}/templates/prometheusrule.yaml (100%) rename {redis => redis-data-feed}/templates/replicas/hpa.yaml (100%) rename {redis => redis-data-feed}/templates/replicas/service.yaml (100%) rename {redis => redis-data-feed}/templates/replicas/serviceaccount.yaml (100%) rename {redis => redis-data-feed}/templates/replicas/statefulset.yaml (100%) rename {redis => redis-data-feed}/templates/role.yaml (100%) rename {redis => redis-data-feed}/templates/rolebinding.yaml (100%) rename {redis => redis-data-feed}/templates/scripts-configmap.yaml (100%) rename {redis => redis-data-feed}/templates/secret.yaml (100%) rename {redis => redis-data-feed}/templates/sentinel/hpa.yaml (100%) rename {redis => redis-data-feed}/templates/sentinel/node-services.yaml (100%) rename {redis => redis-data-feed}/templates/sentinel/ports-configmap.yaml (100%) rename {redis => redis-data-feed}/templates/sentinel/service.yaml (100%) rename {redis => redis-data-feed}/templates/sentinel/statefulset.yaml (100%) rename {redis => redis-data-feed}/templates/serviceaccount.yaml (100%) rename {redis => redis-data-feed}/templates/servicemonitor.yaml (100%) rename {redis => redis-data-feed}/templates/tls-secret.yaml (100%) rename {redis => redis-data-feed}/values.schema.json (100%) create mode 100644 redis-data-feed/values.yaml rename {prometheus => redis-fetcher}/.helmignore (97%) create mode 100644 redis-fetcher/Chart.lock create mode 100644 redis-fetcher/Chart.yaml create mode 100644 redis-fetcher/README.md create mode 100644 redis-fetcher/charts/common-2.2.2.tgz create mode 100644 redis-fetcher/img/redis-cluster-topology.png create mode 100644 redis-fetcher/img/redis-topology.png create mode 100644 redis-fetcher/templates/NOTES.txt create mode 100644 redis-fetcher/templates/_helpers.tpl create mode 100644 redis-fetcher/templates/configmap.yaml create mode 100644 redis-fetcher/templates/extra-list.yaml create mode 100644 redis-fetcher/templates/headless-svc.yaml create mode 100644 redis-fetcher/templates/health-configmap.yaml create mode 100644 redis-fetcher/templates/master/application.yaml create mode 100644 redis-fetcher/templates/master/psp.yaml create mode 100644 redis-fetcher/templates/master/pvc.yaml create mode 100644 redis-fetcher/templates/master/service.yaml create mode 100644 redis-fetcher/templates/master/serviceaccount.yaml create mode 100644 redis-fetcher/templates/metrics-svc.yaml create mode 100644 redis-fetcher/templates/networkpolicy.yaml create mode 100644 redis-fetcher/templates/pdb.yaml create mode 100644 redis-fetcher/templates/prometheusrule.yaml create mode 100644 redis-fetcher/templates/replicas/hpa.yaml create mode 100644 redis-fetcher/templates/replicas/service.yaml create mode 100644 redis-fetcher/templates/replicas/serviceaccount.yaml create mode 100644 redis-fetcher/templates/replicas/statefulset.yaml create mode 100644 redis-fetcher/templates/role.yaml create mode 100644 redis-fetcher/templates/rolebinding.yaml create mode 100644 redis-fetcher/templates/scripts-configmap.yaml create mode 100644 redis-fetcher/templates/secret.yaml create mode 100644 redis-fetcher/templates/sentinel/hpa.yaml create mode 100644 redis-fetcher/templates/sentinel/node-services.yaml create mode 100644 redis-fetcher/templates/sentinel/ports-configmap.yaml create mode 100644 redis-fetcher/templates/sentinel/service.yaml create mode 100644 redis-fetcher/templates/sentinel/statefulset.yaml create mode 100644 redis-fetcher/templates/serviceaccount.yaml create mode 100644 redis-fetcher/templates/servicemonitor.yaml create mode 100644 redis-fetcher/templates/tls-secret.yaml create mode 100644 redis-fetcher/values.schema.json create mode 100644 redis-fetcher/values.yaml create mode 100644 redis-request-response/.helmignore create mode 100644 redis-request-response/Chart.lock create mode 100644 redis-request-response/Chart.yaml create mode 100644 redis-request-response/README.md create mode 100644 redis-request-response/charts/common-2.2.2.tgz create mode 100644 redis-request-response/img/redis-cluster-topology.png create mode 100644 redis-request-response/img/redis-topology.png create mode 100644 redis-request-response/templates/NOTES.txt create mode 100644 redis-request-response/templates/_helpers.tpl create mode 100644 redis-request-response/templates/configmap.yaml create mode 100644 redis-request-response/templates/extra-list.yaml create mode 100644 redis-request-response/templates/headless-svc.yaml create mode 100644 redis-request-response/templates/health-configmap.yaml create mode 100644 redis-request-response/templates/master/application.yaml create mode 100644 redis-request-response/templates/master/psp.yaml create mode 100644 redis-request-response/templates/master/pvc.yaml create mode 100644 redis-request-response/templates/master/service.yaml create mode 100644 redis-request-response/templates/master/serviceaccount.yaml create mode 100644 redis-request-response/templates/metrics-svc.yaml create mode 100644 redis-request-response/templates/networkpolicy.yaml create mode 100644 redis-request-response/templates/pdb.yaml create mode 100644 redis-request-response/templates/prometheusrule.yaml create mode 100644 redis-request-response/templates/replicas/hpa.yaml create mode 100644 redis-request-response/templates/replicas/service.yaml create mode 100644 redis-request-response/templates/replicas/serviceaccount.yaml create mode 100644 redis-request-response/templates/replicas/statefulset.yaml create mode 100644 redis-request-response/templates/role.yaml create mode 100644 redis-request-response/templates/rolebinding.yaml create mode 100644 redis-request-response/templates/scripts-configmap.yaml create mode 100644 redis-request-response/templates/secret.yaml create mode 100644 redis-request-response/templates/sentinel/hpa.yaml create mode 100644 redis-request-response/templates/sentinel/node-services.yaml create mode 100644 redis-request-response/templates/sentinel/ports-configmap.yaml create mode 100644 redis-request-response/templates/sentinel/service.yaml create mode 100644 redis-request-response/templates/sentinel/statefulset.yaml create mode 100644 redis-request-response/templates/serviceaccount.yaml create mode 100644 redis-request-response/templates/servicemonitor.yaml create mode 100644 redis-request-response/templates/tls-secret.yaml create mode 100644 redis-request-response/values.schema.json create mode 100644 redis-request-response/values.yaml create mode 100644 redis-vrf/.helmignore create mode 100644 redis-vrf/Chart.lock create mode 100644 redis-vrf/Chart.yaml create mode 100644 redis-vrf/README.md create mode 100644 redis-vrf/charts/common-2.2.2.tgz create mode 100644 redis-vrf/img/redis-cluster-topology.png create mode 100644 redis-vrf/img/redis-topology.png create mode 100644 redis-vrf/templates/NOTES.txt create mode 100644 redis-vrf/templates/_helpers.tpl create mode 100644 redis-vrf/templates/configmap.yaml create mode 100644 redis-vrf/templates/extra-list.yaml create mode 100644 redis-vrf/templates/headless-svc.yaml create mode 100644 redis-vrf/templates/health-configmap.yaml create mode 100644 redis-vrf/templates/master/application.yaml create mode 100644 redis-vrf/templates/master/psp.yaml create mode 100644 redis-vrf/templates/master/pvc.yaml create mode 100644 redis-vrf/templates/master/service.yaml create mode 100644 redis-vrf/templates/master/serviceaccount.yaml create mode 100644 redis-vrf/templates/metrics-svc.yaml create mode 100644 redis-vrf/templates/networkpolicy.yaml create mode 100644 redis-vrf/templates/pdb.yaml create mode 100644 redis-vrf/templates/prometheusrule.yaml create mode 100644 redis-vrf/templates/replicas/hpa.yaml create mode 100644 redis-vrf/templates/replicas/service.yaml create mode 100644 redis-vrf/templates/replicas/serviceaccount.yaml create mode 100644 redis-vrf/templates/replicas/statefulset.yaml create mode 100644 redis-vrf/templates/role.yaml create mode 100644 redis-vrf/templates/rolebinding.yaml create mode 100644 redis-vrf/templates/scripts-configmap.yaml create mode 100644 redis-vrf/templates/secret.yaml create mode 100644 redis-vrf/templates/sentinel/hpa.yaml create mode 100644 redis-vrf/templates/sentinel/node-services.yaml create mode 100644 redis-vrf/templates/sentinel/ports-configmap.yaml create mode 100644 redis-vrf/templates/sentinel/service.yaml create mode 100644 redis-vrf/templates/sentinel/statefulset.yaml create mode 100644 redis-vrf/templates/serviceaccount.yaml create mode 100644 redis-vrf/templates/servicemonitor.yaml create mode 100644 redis-vrf/templates/tls-secret.yaml create mode 100644 redis-vrf/values.schema.json rename {redis => redis-vrf}/values.yaml (99%) delete mode 100644 storage-aws/Chart.yaml delete mode 100644 storage-aws/NOTES.txt delete mode 100644 storage-aws/README.md delete mode 100644 storage-aws/templates/log-pv.yaml delete mode 100644 storage-aws/templates/log-pvc.yaml delete mode 100644 storage-aws/templates/sc.yaml delete mode 100644 storage-aws/values.yaml delete mode 100644 storage-gcp/Chart.yaml delete mode 100644 storage-gcp/NOTES.txt delete mode 100644 storage-gcp/README.md delete mode 100644 storage-gcp/templates/log-pv.yaml delete mode 100644 storage-gcp/templates/log-pvc.yaml delete mode 100644 storage-gcp/templates/sc.yaml delete mode 100644 storage-gcp/values.yaml diff --git a/admin/values.yaml b/admin/values.yaml index 60dd6e82..4ca01a35 100644 --- a/admin/values.yaml +++ b/admin/values.yaml @@ -1,3 +1,7 @@ +global: + name: admin + namespace: orakl + image: repository: public.ecr.aws/bisonai/orakl-general tag: admin.v0.1.0.20230802.0109.13ce71f diff --git a/aggregator/values.yaml b/aggregator/values.yaml index c43d86a1..67f68194 100644 --- a/aggregator/values.yaml +++ b/aggregator/values.yaml @@ -2,6 +2,8 @@ ## created by Bisonai global: + name: aggregator + namespace: orakl appName: orakl-aggregator image: repository: public.ecr.aws/u6t6w0e4/orakl-core #repository url diff --git a/api/values.yaml b/api/values.yaml index d467e291..22ff4199 100644 --- a/api/values.yaml +++ b/api/values.yaml @@ -1,6 +1,8 @@ ## Klaytn Orakl Api Configuration ## created by Bisonai global: + name: api + namespace: orakl image: repository: public.ecr.aws/bisonai/orakl-api pullPolicy: IfNotPresent diff --git a/argocd/.helmignore b/argocd/.helmignore deleted file mode 100644 index 3a063296..00000000 --- a/argocd/.helmignore +++ /dev/null @@ -1,4 +0,0 @@ -/*.tgz -output -ci/ -*.gotmpl diff --git a/argocd/Chart.lock b/argocd/Chart.lock deleted file mode 100644 index 02e8942b..00000000 --- a/argocd/Chart.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: redis-ha - repository: https://dandydeveloper.github.io/charts/ - version: 4.17.1 -digest: sha256:eecc8c4bee9af2f12aa6c7e6d0d76c87a8c0b06aa3f2af8405578c4725a5f501 -generated: "2022-06-29T14:57:19.381444853+02:00" diff --git a/argocd/Chart.yaml b/argocd/Chart.yaml deleted file mode 100644 index bad92b26..00000000 --- a/argocd/Chart.yaml +++ /dev/null @@ -1,25 +0,0 @@ -annotations: - artifacthub.io/changes: | - - "[Changed]: Improved documentation" -apiVersion: v2 -appVersion: v2.4.10 -dependencies: -- condition: redis-ha.enabled - name: redis-ha - repository: https://dandydeveloper.github.io/charts/ - version: 4.17.1 -description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool - for Kubernetes. -home: https://github.com/argoproj/argo-helm -icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png -keywords: -- argoproj -- argocd -- gitops -maintainers: -- name: alexec -- name: alexmt -- name: jessesuen -- name: seanson -name: argo-cd -version: 4.10.8 diff --git a/argocd/README.md b/argocd/README.md deleted file mode 100644 index 635ccaaa..00000000 --- a/argocd/README.md +++ /dev/null @@ -1,949 +0,0 @@ -# Install Argocd for Orakl - -### Git + Argocd ---- - ->Install Argocd (CICD) - -
- -#### + Create namespace - -```bash -kubectl create namespace argocd -``` - -#### + Install argocd with namespace - -```bash -helm install argocd -n argocd argocd/. -``` - -#### + Port forwarding -```bash -kubectl port-forward service/argocd-server -n argocd 8080:443 -``` - -#### + Get admin temporary password -```bash -kubectl -n argocd get secret argocd-initial-admin-secret -o jsonpath="{.data.password}" | base64 -d -``` -##### * Remove '%' in the end of the password if it exists. - -
- -#### + Access Argocd UI admin(http://localhost:8080) and changed admin password. (_User Info -> Update Password_) - -
- - -# Argo CD Chart - -A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes. - -Source code can be found [here](https://argo-cd.readthedocs.io/en/stable/) - -## Additional Information - -This is a **community maintained** chart. This chart installs [argo-cd](https://argo-cd.readthedocs.io/en/stable/), a declarative, GitOps continuous delivery tool for Kubernetes. - -The default installation is intended to be similar to the provided Argo CD [releases](https://github.com/argoproj/argo-cd/releases). - -If you want to avoid including sensitive information unencrypted (clear text) in your version control, make use of the [declarative set up](https://argo-cd.readthedocs.io/en/stable/operator-manual/declarative-setup/) of Argo CD. -For instance, rather than adding repositories and their keys in your Helm values, you could deploy [SealedSecrets](https://github.com/bitnami-labs/sealed-secrets) with contents as seen in this [repositories section](https://argo-cd.readthedocs.io/en/stable/operator-manual/declarative-setup/#repositories) or any other secrets manager service (i.e. HashiCorp Vault, AWS/GCP Secrets Manager, etc.). - -## High Availability - -This chart installs the non-HA version of Argo CD by default. If you want to run Argo CD in HA mode, you can use one of the example values in the next sections. -Please also have a look into the upstream [Operator Manual regarding High Availability](https://argo-cd.readthedocs.io/en/stable/operator-manual/high_availability/) to understand how scaling of Argo CD works in detail. - -> **Warning:** -> You need at least 3 worker nodes as the HA mode of redis enforces Pods to run on separate nodes. - -### HA mode with autoscaling - -```yaml -redis-ha: - enabled: true - -controller: - replicas: 1 - -server: - autoscaling: - enabled: true - minReplicas: 2 - -repoServer: - autoscaling: - enabled: true - minReplicas: 2 - -applicationSet: - replicas: 2 -``` - -### HA mode without autoscaling - -```yaml -redis-ha: - enabled: true - -controller: - replicas: 1 - -server: - replicas: 2 - -repoServer: - replicas: 2 - -applicationSet: - replicas: 2 -``` - -### Synchronizing Changes from Original Repository - -In the original [Argo CD repository](https://github.com/argoproj/argo-cd/) an [`manifests/install.yaml`](https://github.com/argoproj/argo-cd/blob/master/manifests/install.yaml) is generated using `kustomize`. It's the basis for the installation as [described in the docs](https://argo-cd.readthedocs.io/en/stable/getting_started/#1-install-argo-cd). - -When installing Argo CD using this helm chart the user should have a similar experience and configuration rolled out. Hence, it makes sense to try to achieve a similar output of rendered `.yaml` resources when calling `helm template` using the default settings in `values.yaml`. - -To update the templates and default settings in `values.yaml` it may come in handy to look up the diff of the `manifests/install.yaml` between two versions accordingly. This can either be done directly via github and look for `manifests/install.yaml`: - -https://github.com/argoproj/argo-cd/compare/v1.8.7...v2.0.0#files_bucket - -Or you clone the repository and do a local `git-diff`: - -```bash -git clone https://github.com/argoproj/argo-cd.git -cd argo-cd -git diff v1.8.7 v2.0.0 -- manifests/install.yaml -``` - -Changes in the `CustomResourceDefinition` resources shall be fixed easily by copying 1:1 from the [`manifests/crds` folder](https://github.com/argoproj/argo-cd/tree/master/manifests/crds) into this [`charts/argo-cd/crds` folder](https://github.com/argoproj/argo-helm/tree/master/charts/argo-cd/crds). - -## Upgrading - -### Custom resource definitions - -Helm cannot upgrade custom resource definitions [by design](https://helm.sh/docs/chart_best_practices/custom_resource_definitions/#some-caveats-and-explanations). - -Please use `kubectl` to upgrade CRDs manually from [crds](crds/) folder or via the manifests from the upstream project repo: - -```bash -kubectl apply -k "https://github.com/argoproj/argo-cd/manifests/crds?ref=" - -# Eg. version v2.4.9 -kubectl apply -k "https://github.com/argoproj/argo-cd/manifests/crds?ref=v2.4.9" -``` - -### 4.9.0 - -This version starts to use upstream image with applicationset binary. Start command was changed from `applicationset-controller` to `argocd-applicationset-controller` - -### 4.3.* - -With this minor version, the notification notifier's `service.slack` is no longer configured by default. - -### 4.0.0 and above - -This helm chart version deploys Argo CD v2.3. The Argo CD Notifications and ApplicationSet are part of Argo CD now. You no longer need to install them separately. The Notifications and ApplicationSet components **are bundled into default** Argo CD installation. -Please read the [v2.2 to 2.3 upgrade instructions] in the upstream repository. - -### 3.13.0 - -This release removes the flag `--staticassets` from argocd server as it has been dropped upstream. If this flag needs to be enabled e.g for older releases of Argo CD, it can be passed via the `server.extraArgs` field - -### 3.10.2 - -Argo CD has recently deprecated the flag `--staticassets` and from chart version `3.10.2` has been disabled by default -It can be re-enabled by setting `server.staticAssets.enabled` to true - -### 3.8.1 - -This bugfix version potentially introduces a rename (and recreation) of one or more ServiceAccounts. It _only happens_ when you use one of these customization: - -```yaml -# Case 1) - only happens when you do not specify a custom name (repoServer.serviceAccount.name) -repoServer: - serviceAccount: - create: true - -# Case 2) -controller: - serviceAccount: - name: "" # or - -# Case 3) -dex: - serviceAccount: - name: "" # or - -# Case 4) -server: - serviceAccount: - name: "" # or -``` - -Please check if you are affected by one of these cases **before you upgrade**, especially when you use **cloud IAM roles for service accounts.** (eg. IRSA on AWS or Workload Identity for GKE) - -### 3.2.* - -With this minor version we introduced the evaluation for the ingress manifest (depending on the capabilities version), See [Pull Request](https://github.com/argoproj/argo-helm/pull/637). -[Issue 703](https://github.com/argoproj/argo-helm/issues/703) reported that the capabilities evaluation is **not handled correctly when deploying the chart via an Argo CD instance**, -especially deploying on clusters running a cluster version prior to `1.19` (which misses `Ingress` on apiVersion `networking.k8s.io/v1`). - -If you are running a cluster version prior to `1.19` you can avoid this issue by directly installing chart version `3.6.0` and setting `kubeVersionOverride` like: - -```yaml -kubeVersionOverride: "1.18.0" -``` - -Then you should no longer encounter this issue. - -### 3.0.0 and above - -Helm apiVersion switched to `v2`. Requires Helm `3.0.0` or above to install. [Read More](https://helm.sh/blog/migrate-from-helm-v2-to-helm-v3/) on how to migrate your release from Helm 2 to Helm 3. - -### 2.14.7 and above - -The `matchLabels` key in the Argo CD Application Controller is no longer hard-coded. Note that labels are immutable so caution should be exercised when making changes to this resource. - -### 2.10.x to 2.11.0 - -The application controller is now available as a `StatefulSet` when the `controller.enableStatefulSet` flag is set to true. Depending on your Helm deployment this may be a downtime or breaking change if enabled when using HA and will become the default in 3.x. - -### 1.8.7 to 2.x.x - -`controller.extraArgs`, `repoServer.extraArgs` and `server.extraArgs` are now arrays of strings instead of a map - -What was - -```yaml -server: - extraArgs: - insecure: "" -``` - -is now - -```yaml -server: - extraArgs: - - --insecure -``` - -## Prerequisites - -- Kubernetes 1.7+ -- Helm v3.0.0+ - -## Installing the Chart - -To install the chart with the release name `my-release`: - -```console -$ helm repo add argo https://argoproj.github.io/argo-helm -"argo" has been added to your repositories - -$ helm install my-release argo/argo-cd -NAME: my-release -... -``` - -## General parameters - -| Key | Type | Default | Description | -|-----|------|---------|-------------| -| apiVersionOverrides.autoscaling | string | `""` | String to override apiVersion of autoscaling rendered by this helm chart | -| apiVersionOverrides.certmanager | string | `""` | String to override apiVersion of certmanager resources rendered by this helm chart | -| apiVersionOverrides.ingress | string | `""` | String to override apiVersion of ingresses rendered by this helm chart | -| createAggregateRoles | bool | `false` | Create clusterroles that extend existing clusterroles to interact with argo-cd crds | -| extraObjects | list | `[]` | Array of extra K8s manifests to deploy | -| fullnameOverride | string | `""` | String to fully override `"argo-cd.fullname"` | -| global.additionalLabels | object | `{}` | Additional labels to add to all resources | -| global.hostAliases | list | `[]` | Mapping between IP and hostnames that will be injected as entries in the pod's hosts files | -| global.image.imagePullPolicy | string | `"IfNotPresent"` | If defined, a imagePullPolicy applied to all Argo CD deployments | -| global.image.repository | string | `"quay.io/argoproj/argocd"` | If defined, a repository applied to all Argo CD deployments | -| global.image.tag | string | `""` | Overrides the global Argo CD image tag whose default is the chart appVersion | -| global.imagePullSecrets | list | `[]` | If defined, uses a Secret to pull an image from a private Docker registry or repository | -| global.networkPolicy.create | bool | `false` | Create NetworkPolicy objects for all components | -| global.networkPolicy.defaultDenyIngress | bool | `false` | Default deny all ingress traffic | -| global.podAnnotations | object | `{}` | Annotations for the all deployed pods | -| global.podLabels | object | `{}` | Labels for the all deployed pods | -| global.securityContext | object | `{}` | Toggle and define securityContext. See [values.yaml] | -| kubeVersionOverride | string | `""` | Override the Kubernetes version, which is used to evaluate certain manifests | -| nameOverride | string | `"argocd"` | Provide a name in place of `argocd` | -| openshift.enabled | bool | `false` | enables using arbitrary uid for argo repo server | -| server.additionalApplications | list | `[]` (See [values.yaml]) | Deploy Argo CD Applications within this helm release | -| server.additionalProjects | list | `[]` (See [values.yaml]) | Deploy Argo CD Projects within this helm release | - -## Argo CD Configs - -| Key | Type | Default | Description | -|-----|------|---------|-------------| -| configs.clusterCredentials | list | `[]` (See [values.yaml]) | Provide one or multiple [external cluster credentials] | -| configs.credentialTemplates | object | `{}` | Repository credentials to be used as Templates for other repos | -| configs.credentialTemplatesAnnotations | object | `{}` | Annotations to be added to `configs.credentialTemplates` Secret | -| configs.gpgKeys | object | `{}` (See [values.yaml]) | [GnuPG](https://argo-cd.readthedocs.io/en/stable/user-guide/gpg-verification/) keys to add to the key ring | -| configs.gpgKeysAnnotations | object | `{}` | GnuPG key ring annotations | -| configs.knownHosts.data.ssh_known_hosts | string | See [values.yaml] | Known Hosts | -| configs.knownHostsAnnotations | object | `{}` | Known Hosts configmap annotations | -| configs.repositories | object | `{}` | Repositories list to be used by applications | -| configs.repositoriesAnnotations | object | `{}` | Annotations to be added to `configs.repositories` Secret | -| configs.repositoryCredentials | object | `{}` | *DEPRECATED:* Instead, use `configs.credentialTemplates` and/or `configs.repositories` | -| configs.secret.annotations | object | `{}` | Annotations to be added to argocd-secret | -| configs.secret.argocdServerAdminPassword | string | `""` | Bcrypt hashed admin password | -| configs.secret.argocdServerAdminPasswordMtime | string | `""` (defaults to current time) | Admin password modification time. Eg. `"2006-01-02T15:04:05Z"` | -| configs.secret.argocdServerTlsConfig | object | `{}` | Argo TLS Data | -| configs.secret.bitbucketServerSecret | string | `""` | Shared secret for authenticating BitbucketServer webhook events | -| configs.secret.bitbucketUUID | string | `""` | UUID for authenticating Bitbucket webhook events | -| configs.secret.createSecret | bool | `true` | Create the argocd-secret | -| configs.secret.extra | object | `{}` | add additional secrets to be added to argocd-secret | -| configs.secret.githubSecret | string | `""` | Shared secret for authenticating GitHub webhook events | -| configs.secret.gitlabSecret | string | `""` | Shared secret for authenticating GitLab webhook events | -| configs.secret.gogsSecret | string | `""` | Shared secret for authenticating Gogs webhook events | -| configs.styles | string | `""` (See [values.yaml]) | Define custom [CSS styles] for your argo instance. This setting will automatically mount the provided CSS and reference it in the argo configuration. | -| configs.tlsCerts | object | See [values.yaml] | TLS certificate | -| configs.tlsCertsAnnotations | object | `{}` | TLS certificate configmap annotations | - -## Argo CD Controller - -| Key | Type | Default | Description | -|-----|------|---------|-------------| -| controller.affinity | object | `{}` | Assign custom [affinity] rules to the deployment | -| controller.args.appResyncPeriod | string | `"180"` | define the application controller `--app-resync` | -| controller.args.operationProcessors | string | `"10"` | define the application controller `--operation-processors` | -| controller.args.repoServerTimeoutSeconds | string | `"60"` | define the application controller `--repo-server-timeout-seconds` | -| controller.args.selfHealTimeout | string | `"5"` | define the application controller `--self-heal-timeout-seconds` | -| controller.args.statusProcessors | string | `"20"` | define the application controller `--status-processors` | -| controller.clusterAdminAccess.enabled | bool | `true` | Enable RBAC for local cluster deployments | -| controller.clusterRoleRules.enabled | bool | `false` | Enable custom rules for the application controller's ClusterRole resource | -| controller.clusterRoleRules.rules | list | `[]` | List of custom rules for the application controller's ClusterRole resource | -| controller.containerPort | int | `8082` | Application controller listening port | -| controller.containerSecurityContext | object | `{}` | Application controller container-level security context | -| controller.enableStatefulSet | bool | `true` | Deploy the application controller as a StatefulSet instead of a Deployment, this is required for HA capability. | -| controller.env | list | `[]` | Environment variables to pass to application controller | -| controller.envFrom | list | `[]` (See [values.yaml]) | envFrom to pass to application controller | -| controller.extraArgs | list | `[]` | Additional command line arguments to pass to application controller | -| controller.extraContainers | list | `[]` | Additional containers to be added to the application controller pod | -| controller.image.imagePullPolicy | string | `""` (defaults to global.image.imagePullPolicy) | Image pull policy for the application controller | -| controller.image.repository | string | `""` (defaults to global.image.repository) | Repository to use for the application controller | -| controller.image.tag | string | `""` (defaults to global.image.tag) | Tag to use for the application controller | -| controller.imagePullSecrets | list | `[]` | Secrets with credentials to pull images from a private registry | -| controller.initContainers | list | `[]` | Init containers to add to the application controller pod | -| controller.livenessProbe.failureThreshold | int | `3` | Minimum consecutive failures for the [probe] to be considered failed after having succeeded | -| controller.livenessProbe.initialDelaySeconds | int | `10` | Number of seconds after the container has started before [probe] is initiated | -| controller.livenessProbe.periodSeconds | int | `10` | How often (in seconds) to perform the [probe] | -| controller.livenessProbe.successThreshold | int | `1` | Minimum consecutive successes for the [probe] to be considered successful after having failed | -| controller.livenessProbe.timeoutSeconds | int | `1` | Number of seconds after which the [probe] times out | -| controller.logFormat | string | `"text"` | Application controller log format. Either `text` or `json` | -| controller.logLevel | string | `"info"` | Application controller log level | -| controller.metrics.applicationLabels.enabled | bool | `false` | Enables additional labels in argocd_app_labels metric | -| controller.metrics.applicationLabels.labels | list | `[]` | Additional labels | -| controller.metrics.enabled | bool | `false` | Deploy metrics service | -| controller.metrics.rules.enabled | bool | `false` | Deploy a PrometheusRule for the application controller | -| controller.metrics.rules.spec | list | `[]` | PrometheusRule.Spec for the application controller | -| controller.metrics.service.annotations | object | `{}` | Metrics service annotations | -| controller.metrics.service.labels | object | `{}` | Metrics service labels | -| controller.metrics.service.portName | string | `"http-metrics"` | Metrics service port name | -| controller.metrics.service.servicePort | int | `8082` | Metrics service port | -| controller.metrics.serviceMonitor.additionalLabels | object | `{}` | Prometheus ServiceMonitor labels | -| controller.metrics.serviceMonitor.enabled | bool | `false` | Enable a prometheus ServiceMonitor | -| controller.metrics.serviceMonitor.interval | string | `"30s"` | Prometheus ServiceMonitor interval | -| controller.metrics.serviceMonitor.metricRelabelings | list | `[]` | Prometheus [MetricRelabelConfigs] to apply to samples before ingestion | -| controller.metrics.serviceMonitor.namespace | string | `""` | Prometheus ServiceMonitor namespace | -| controller.metrics.serviceMonitor.relabelings | list | `[]` | Prometheus [RelabelConfigs] to apply to samples before scraping | -| controller.metrics.serviceMonitor.scheme | string | `""` | Prometheus ServiceMonitor scheme | -| controller.metrics.serviceMonitor.selector | object | `{}` | Prometheus ServiceMonitor selector | -| controller.metrics.serviceMonitor.tlsConfig | object | `{}` | Prometheus ServiceMonitor tlsConfig | -| controller.name | string | `"application-controller"` | Application controller name string | -| controller.nodeSelector | object | `{}` | [Node selector] | -| controller.pdb.annotations | object | `{}` | Annotations to be added to application controller pdb | -| controller.pdb.enabled | bool | `false` | Deploy a Poddisruptionbudget for the application controller | -| controller.pdb.labels | object | `{}` | Labels to be added to application controller pdb | -| controller.podAnnotations | object | `{}` | Annotations to be added to application controller pods | -| controller.podLabels | object | `{}` | Labels to be added to application controller pods | -| controller.priorityClassName | string | `""` | Priority class for the application controller pods | -| controller.readinessProbe.failureThreshold | int | `3` | Minimum consecutive failures for the [probe] to be considered failed after having succeeded | -| controller.readinessProbe.initialDelaySeconds | int | `10` | Number of seconds after the container has started before [probe] is initiated | -| controller.readinessProbe.periodSeconds | int | `10` | How often (in seconds) to perform the [probe] | -| controller.readinessProbe.successThreshold | int | `1` | Minimum consecutive successes for the [probe] to be considered successful after having failed | -| controller.readinessProbe.timeoutSeconds | int | `1` | Number of seconds after which the [probe] times out | -| controller.replicas | int | `1` | The number of application controller pods to run. If changing the number of replicas you must pass the number as `ARGOCD_CONTROLLER_REPLICAS` as an environment variable | -| controller.resources | object | `{}` | Resource limits and requests for the application controller pods | -| controller.service.annotations | object | `{}` | Application controller service annotations | -| controller.service.labels | object | `{}` | Application controller service labels | -| controller.service.port | int | `8082` | Application controller service port | -| controller.service.portName | string | `"https-controller"` | Application controller service port name | -| controller.serviceAccount.annotations | object | `{}` | Annotations applied to created service account | -| controller.serviceAccount.automountServiceAccountToken | bool | `true` | Automount API credentials for the Service Account | -| controller.serviceAccount.create | bool | `true` | Create a service account for the application controller | -| controller.serviceAccount.name | string | `"argocd-application-controller"` | Service account name | -| controller.tolerations | list | `[]` | [Tolerations] for use with node taints | -| controller.topologySpreadConstraints | list | `[]` | Assign custom [TopologySpreadConstraints] rules to the application controller | -| controller.volumeMounts | list | `[]` | Additional volumeMounts to the application controller main container | -| controller.volumes | list | `[]` | Additional volumes to the application controller pod | - -## Argo Repo Server - -| Key | Type | Default | Description | -|-----|------|---------|-------------| -| repoServer.affinity | object | `{}` | Assign custom [affinity] rules to the deployment | -| repoServer.autoscaling.enabled | bool | `false` | Enable Horizontal Pod Autoscaler ([HPA]) for the repo server | -| repoServer.autoscaling.maxReplicas | int | `5` | Maximum number of replicas for the repo server [HPA] | -| repoServer.autoscaling.minReplicas | int | `1` | Minimum number of replicas for the repo server [HPA] | -| repoServer.autoscaling.targetCPUUtilizationPercentage | int | `50` | Average CPU utilization percentage for the repo server [HPA] | -| repoServer.autoscaling.targetMemoryUtilizationPercentage | int | `50` | Average memory utilization percentage for the repo server [HPA] | -| repoServer.clusterAdminAccess.enabled | bool | `false` | Enable RBAC for local cluster deployments | -| repoServer.clusterRoleRules.enabled | bool | `false` | Enable custom rules for the Repo server's Cluster Role resource | -| repoServer.clusterRoleRules.rules | list | `[]` | List of custom rules for the Repo server's Cluster Role resource | -| repoServer.containerPort | int | `8081` | Configures the repo server port | -| repoServer.containerSecurityContext | object | `{}` | Repo server container-level security context | -| repoServer.copyutil.resources | object | `{}` | Resource limits and requests for the copyutil initContainer | -| repoServer.env | list | `[]` | Environment variables to pass to repo server | -| repoServer.envFrom | list | `[]` (See [values.yaml]) | envFrom to pass to repo server | -| repoServer.extraArgs | list | `[]` | Additional command line arguments to pass to repo server | -| repoServer.extraContainers | list | `[]` | Additional containers to be added to the repo server pod | -| repoServer.image.imagePullPolicy | string | `""` (defaults to global.image.imagePullPolicy) | Image pull policy for the repo server | -| repoServer.image.repository | string | `""` (defaults to global.image.repository) | Repository to use for the repo server | -| repoServer.image.tag | string | `""` (defaults to global.image.tag) | Tag to use for the repo server | -| repoServer.imagePullSecrets | list | `[]` | Secrets with credentials to pull images from a private registry | -| repoServer.initContainers | list | `[]` | Init containers to add to the repo server pods | -| repoServer.livenessProbe.failureThreshold | int | `3` | Minimum consecutive failures for the [probe] to be considered failed after having succeeded | -| repoServer.livenessProbe.initialDelaySeconds | int | `10` | Number of seconds after the container has started before [probe] is initiated | -| repoServer.livenessProbe.periodSeconds | int | `10` | How often (in seconds) to perform the [probe] | -| repoServer.livenessProbe.successThreshold | int | `1` | Minimum consecutive successes for the [probe] to be considered successful after having failed | -| repoServer.livenessProbe.timeoutSeconds | int | `1` | Number of seconds after which the [probe] times out | -| repoServer.logFormat | string | `"text"` | Repo server log format: Either `text` or `json` | -| repoServer.logLevel | string | `"info"` | Repo server log level | -| repoServer.metrics.enabled | bool | `false` | Deploy metrics service | -| repoServer.metrics.service.annotations | object | `{}` | Metrics service annotations | -| repoServer.metrics.service.labels | object | `{}` | Metrics service labels | -| repoServer.metrics.service.portName | string | `"http-metrics"` | Metrics service port name | -| repoServer.metrics.service.servicePort | int | `8084` | Metrics service port | -| repoServer.metrics.serviceMonitor.additionalLabels | object | `{}` | Prometheus ServiceMonitor labels | -| repoServer.metrics.serviceMonitor.enabled | bool | `false` | Enable a prometheus ServiceMonitor | -| repoServer.metrics.serviceMonitor.interval | string | `"30s"` | Prometheus ServiceMonitor interval | -| repoServer.metrics.serviceMonitor.metricRelabelings | list | `[]` | Prometheus [MetricRelabelConfigs] to apply to samples before ingestion | -| repoServer.metrics.serviceMonitor.namespace | string | `""` | Prometheus ServiceMonitor namespace | -| repoServer.metrics.serviceMonitor.relabelings | list | `[]` | Prometheus [RelabelConfigs] to apply to samples before scraping | -| repoServer.metrics.serviceMonitor.scheme | string | `""` | Prometheus ServiceMonitor scheme | -| repoServer.metrics.serviceMonitor.selector | object | `{}` | Prometheus ServiceMonitor selector | -| repoServer.metrics.serviceMonitor.tlsConfig | object | `{}` | Prometheus ServiceMonitor tlsConfig | -| repoServer.name | string | `"repo-server"` | Repo server name | -| repoServer.nodeSelector | object | `{}` | [Node selector] | -| repoServer.pdb.annotations | object | `{}` | Annotations to be added to Repo server pdb | -| repoServer.pdb.enabled | bool | `false` | Deploy a Poddisruptionbudget for the Repo server | -| repoServer.pdb.labels | object | `{}` | Labels to be added to Repo server pdb | -| repoServer.podAnnotations | object | `{}` | Annotations to be added to repo server pods | -| repoServer.podLabels | object | `{}` | Labels to be added to repo server pods | -| repoServer.priorityClassName | string | `""` | Priority class for the repo server | -| repoServer.rbac | list | `[]` | Repo server rbac rules | -| repoServer.readinessProbe.failureThreshold | int | `3` | Minimum consecutive failures for the [probe] to be considered failed after having succeeded | -| repoServer.readinessProbe.initialDelaySeconds | int | `10` | Number of seconds after the container has started before [probe] is initiated | -| repoServer.readinessProbe.periodSeconds | int | `10` | How often (in seconds) to perform the [probe] | -| repoServer.readinessProbe.successThreshold | int | `1` | Minimum consecutive successes for the [probe] to be considered successful after having failed | -| repoServer.readinessProbe.timeoutSeconds | int | `1` | Number of seconds after which the [probe] times out | -| repoServer.replicas | int | `1` | The number of repo server pods to run | -| repoServer.resources | object | `{}` | Resource limits and requests for the repo server pods | -| repoServer.service.annotations | object | `{}` | Repo server service annotations | -| repoServer.service.labels | object | `{}` | Repo server service labels | -| repoServer.service.port | int | `8081` | Repo server service port | -| repoServer.service.portName | string | `"https-repo-server"` | Repo server service port name | -| repoServer.serviceAccount.annotations | object | `{}` | Annotations applied to created service account | -| repoServer.serviceAccount.automountServiceAccountToken | bool | `true` | Automount API credentials for the Service Account | -| repoServer.serviceAccount.create | bool | `true` | Create repo server service account | -| repoServer.serviceAccount.name | string | `""` | Repo server service account name | -| repoServer.tolerations | list | `[]` | [Tolerations] for use with node taints | -| repoServer.topologySpreadConstraints | list | `[]` | Assign custom [TopologySpreadConstraints] rules to the repo server | -| repoServer.volumeMounts | list | `[]` | Additional volumeMounts to the repo server main container | -| repoServer.volumes | list | `[]` | Additional volumes to the repo server pod | - -## Argo Server - -| Key | Type | Default | Description | -|-----|------|---------|-------------| -| server.GKEbackendConfig.enabled | bool | `false` | Enable BackendConfig custom resource for Google Kubernetes Engine | -| server.GKEbackendConfig.spec | object | `{}` | [BackendConfigSpec] | -| server.GKEfrontendConfig.enabled | bool | `false` | Enable FrontConfig custom resource for Google Kubernetes Engine | -| server.GKEfrontendConfig.spec | object | `{}` | [FrontendConfigSpec] | -| server.GKEmanagedCertificate.domains | list | `["argocd.example.com"]` | Domains for the Google Managed Certificate | -| server.GKEmanagedCertificate.enabled | bool | `false` | Enable ManagedCertificate custom resource for Google Kubernetes Engine. | -| server.affinity | object | `{}` | Assign custom [affinity] rules to the deployment | -| server.autoscaling.enabled | bool | `false` | Enable Horizontal Pod Autoscaler ([HPA]) for the Argo CD server | -| server.autoscaling.maxReplicas | int | `5` | Maximum number of replicas for the Argo CD server [HPA] | -| server.autoscaling.minReplicas | int | `1` | Minimum number of replicas for the Argo CD server [HPA] | -| server.autoscaling.targetCPUUtilizationPercentage | int | `50` | Average CPU utilization percentage for the Argo CD server [HPA] | -| server.autoscaling.targetMemoryUtilizationPercentage | int | `50` | Average memory utilization percentage for the Argo CD server [HPA] | -| server.certificate.additionalHosts | list | `[]` | Certificate manager additional hosts | -| server.certificate.domain | string | `"argocd.example.com"` | Certificate primary domain (commonName) | -| server.certificate.duration | string | `""` | The requested 'duration' (i.e. lifetime) of the Certificate. Value must be in units accepted by Go time.ParseDuration | -| server.certificate.enabled | bool | `false` | Deploy a Certificate resource (requires cert-manager) | -| server.certificate.issuer.group | string | `""` | Certificate issuer group. Set if using an external issuer. Eg. `cert-manager.io` | -| server.certificate.issuer.kind | string | `""` | Certificate issuer kind. Either `Issuer` or `ClusterIssuer` | -| server.certificate.issuer.name | string | `""` | Certificate isser name. Eg. `letsencrypt` | -| server.certificate.renewBefore | string | `""` | How long before the currently issued certificate's expiry cert-manager should renew the certificate. Value must be in units accepted by Go time.ParseDuration | -| server.certificate.secretName | string | `"argocd-server-tls"` | The name of the Secret that will be automatically created and managed by this Certificate resource | -| server.clusterAdminAccess.enabled | bool | `true` | Enable RBAC for local cluster deployments | -| server.config | object | See [values.yaml] | [General Argo CD configuration] | -| server.configAnnotations | object | `{}` | Annotations to be added to Argo CD ConfigMap | -| server.configEnabled | bool | `true` | Manage Argo CD configmap (Declarative Setup) | -| server.containerPort | int | `8080` | Configures the server port | -| server.containerSecurityContext | object | `{}` | Servers container-level security context | -| server.env | list | `[]` | Environment variables to pass to Argo CD server | -| server.envFrom | list | `[]` (See [values.yaml]) | envFrom to pass to Argo CD server | -| server.extensions.contents | list | `[]` | Extensions to be loaded into the server | -| server.extensions.enabled | bool | `false` | Enable support for extensions | -| server.extensions.image.imagePullPolicy | string | `"IfNotPresent"` | Image pull policy for extensions | -| server.extensions.image.repository | string | `"ghcr.io/argoproj-labs/argocd-extensions"` | Repository to use for extensions image | -| server.extensions.image.tag | string | `"v0.1.0"` | Tag to use for extensions image | -| server.extensions.resources | object | `{}` | Resource limits and requests for the argocd-extensions container | -| server.extraArgs | list | `[]` | Additional command line arguments to pass to Argo CD server | -| server.extraContainers | list | `[]` | Additional containers to be added to the server pod | -| server.image.imagePullPolicy | string | `""` (defaults to global.image.imagePullPolicy) | Image pull policy for the Argo CD server | -| server.image.repository | string | `""` (defaults to global.image.repository) | Repository to use for the Argo CD server | -| server.image.tag | string | `""` (defaults to global.image.tag) | Tag to use for the Argo CD server | -| server.imagePullSecrets | list | `[]` | Secrets with credentials to pull images from a private registry | -| server.ingress.annotations | object | `{}` | Additional ingress annotations | -| server.ingress.enabled | bool | `false` | Enable an ingress resource for the Argo CD server | -| server.ingress.extraPaths | list | `[]` | Additional ingress paths | -| server.ingress.hosts | list | `[]` | List of ingress hosts | -| server.ingress.https | bool | `false` | Uses `server.service.servicePortHttps` instead `server.service.servicePortHttp` | -| server.ingress.ingressClassName | string | `""` | Defines which ingress controller will implement the resource | -| server.ingress.labels | object | `{}` | Additional ingress labels | -| server.ingress.pathType | string | `"Prefix"` | Ingress path type. One of `Exact`, `Prefix` or `ImplementationSpecific` | -| server.ingress.paths | list | `["/"]` | List of ingress paths | -| server.ingress.tls | list | `[]` | Ingress TLS configuration | -| server.ingressGrpc.annotations | object | `{}` | Additional ingress annotations for dedicated [gRPC-ingress] | -| server.ingressGrpc.awsALB.backendProtocolVersion | string | `"HTTP2"` | Backend protocol version for the AWS ALB gRPC service | -| server.ingressGrpc.awsALB.serviceType | string | `"NodePort"` | Service type for the AWS ALB gRPC service | -| server.ingressGrpc.enabled | bool | `false` | Enable an ingress resource for the Argo CD server for dedicated [gRPC-ingress] | -| server.ingressGrpc.extraPaths | list | `[]` | Additional ingress paths for dedicated [gRPC-ingress] | -| server.ingressGrpc.hosts | list | `[]` | List of ingress hosts for dedicated [gRPC-ingress] | -| server.ingressGrpc.https | bool | `false` | Uses `server.service.servicePortHttps` instead `server.service.servicePortHttp` | -| server.ingressGrpc.ingressClassName | string | `""` | Defines which ingress controller will implement the resource [gRPC-ingress] | -| server.ingressGrpc.isAWSALB | bool | `false` | Setup up gRPC ingress to work with an AWS ALB | -| server.ingressGrpc.labels | object | `{}` | Additional ingress labels for dedicated [gRPC-ingress] | -| server.ingressGrpc.pathType | string | `"Prefix"` | Ingress path type for dedicated [gRPC-ingress]. One of `Exact`, `Prefix` or `ImplementationSpecific` | -| server.ingressGrpc.paths | list | `["/"]` | List of ingress paths for dedicated [gRPC-ingress] | -| server.ingressGrpc.tls | list | `[]` | Ingress TLS configuration for dedicated [gRPC-ingress] | -| server.initContainers | list | `[]` | Init containers to add to the server pod | -| server.lifecycle | object | `{}` | Specify postStart and preStop lifecycle hooks for your argo-cd-server container | -| server.livenessProbe.failureThreshold | int | `3` | Minimum consecutive failures for the [probe] to be considered failed after having succeeded | -| server.livenessProbe.initialDelaySeconds | int | `10` | Number of seconds after the container has started before [probe] is initiated | -| server.livenessProbe.periodSeconds | int | `10` | How often (in seconds) to perform the [probe] | -| server.livenessProbe.successThreshold | int | `1` | Minimum consecutive successes for the [probe] to be considered successful after having failed | -| server.livenessProbe.timeoutSeconds | int | `1` | Number of seconds after which the [probe] times out | -| server.logFormat | string | `"text"` | Argo CD server log format: Either `text` or `json` | -| server.logLevel | string | `"info"` | Argo CD server log level | -| server.metrics.enabled | bool | `false` | Deploy metrics service | -| server.metrics.service.annotations | object | `{}` | Metrics service annotations | -| server.metrics.service.labels | object | `{}` | Metrics service labels | -| server.metrics.service.portName | string | `"http-metrics"` | Metrics service port name | -| server.metrics.service.servicePort | int | `8083` | Metrics service port | -| server.metrics.serviceMonitor.additionalLabels | object | `{}` | Prometheus ServiceMonitor labels | -| server.metrics.serviceMonitor.enabled | bool | `false` | Enable a prometheus ServiceMonitor | -| server.metrics.serviceMonitor.interval | string | `"30s"` | Prometheus ServiceMonitor interval | -| server.metrics.serviceMonitor.metricRelabelings | list | `[]` | Prometheus [MetricRelabelConfigs] to apply to samples before ingestion | -| server.metrics.serviceMonitor.namespace | string | `""` | Prometheus ServiceMonitor namespace | -| server.metrics.serviceMonitor.relabelings | list | `[]` | Prometheus [RelabelConfigs] to apply to samples before scraping | -| server.metrics.serviceMonitor.scheme | string | `""` | Prometheus ServiceMonitor scheme | -| server.metrics.serviceMonitor.selector | object | `{}` | Prometheus ServiceMonitor selector | -| server.metrics.serviceMonitor.tlsConfig | object | `{}` | Prometheus ServiceMonitor tlsConfig | -| server.name | string | `"server"` | Argo CD server name | -| server.nodeSelector | object | `{}` | [Node selector] | -| server.pdb.annotations | object | `{}` | Annotations to be added to server pdb | -| server.pdb.enabled | bool | `false` | Deploy a Poddisruptionbudget for the server | -| server.pdb.labels | object | `{}` | Labels to be added to server pdb | -| server.podAnnotations | object | `{}` | Annotations to be added to server pods | -| server.podLabels | object | `{}` | Labels to be added to server pods | -| server.priorityClassName | string | `""` | Priority class for the Argo CD server | -| server.rbacConfig | object | `{}` | Argo CD rbac config ([Argo CD RBAC policy]) | -| server.rbacConfigAnnotations | object | `{}` | Annotations to be added to Argo CD rbac ConfigMap | -| server.rbacConfigCreate | bool | `true` | Whether or not to create the configmap. If false, it is expected the configmap will be created by something else. Argo CD will not work if there is no configMap created with the name above. | -| server.readinessProbe.failureThreshold | int | `3` | Minimum consecutive failures for the [probe] to be considered failed after having succeeded | -| server.readinessProbe.initialDelaySeconds | int | `10` | Number of seconds after the container has started before [probe] is initiated | -| server.readinessProbe.periodSeconds | int | `10` | How often (in seconds) to perform the [probe] | -| server.readinessProbe.successThreshold | int | `1` | Minimum consecutive successes for the [probe] to be considered successful after having failed | -| server.readinessProbe.timeoutSeconds | int | `1` | Number of seconds after which the [probe] times out | -| server.replicas | int | `1` | The number of server pods to run | -| server.resources | object | `{}` | Resource limits and requests for the Argo CD server | -| server.route.annotations | object | `{}` | Openshift Route annotations | -| server.route.enabled | bool | `false` | Enable an OpenShift Route for the Argo CD server | -| server.route.hostname | string | `""` | Hostname of OpenShift Route | -| server.route.termination_policy | string | `"None"` | Termination policy of Openshift Route | -| server.route.termination_type | string | `"passthrough"` | Termination type of Openshift Route | -| server.service.annotations | object | `{}` | Server service annotations | -| server.service.externalIPs | list | `[]` | Server service external IPs | -| server.service.externalTrafficPolicy | string | `""` | Denotes if this Service desires to route external traffic to node-local or cluster-wide endpoints | -| server.service.labels | object | `{}` | Server service labels | -| server.service.loadBalancerIP | string | `""` | LoadBalancer will get created with the IP specified in this field | -| server.service.loadBalancerSourceRanges | list | `[]` | Source IP ranges to allow access to service from | -| server.service.namedTargetPort | bool | `true` | Use named target port for argocd | -| server.service.nodePortHttp | int | `30080` | Server service http port for NodePort service type (only if `server.service.type` is set to "NodePort") | -| server.service.nodePortHttps | int | `30443` | Server service https port for NodePort service type (only if `server.service.type` is set to "NodePort") | -| server.service.servicePortHttp | int | `80` | Server service http port | -| server.service.servicePortHttpName | string | `"http"` | Server service http port name, can be used to route traffic via istio | -| server.service.servicePortHttps | int | `443` | Server service https port | -| server.service.servicePortHttpsName | string | `"https"` | Server service https port name, can be used to route traffic via istio | -| server.service.sessionAffinity | string | `""` | Used to maintain session affinity. Supports `ClientIP` and `None` | -| server.service.type | string | `"ClusterIP"` | Server service type | -| server.serviceAccount.annotations | object | `{}` | Annotations applied to created service account | -| server.serviceAccount.automountServiceAccountToken | bool | `true` | Automount API credentials for the Service Account | -| server.serviceAccount.create | bool | `true` | Create server service account | -| server.serviceAccount.name | string | `"argocd-server"` | Server service account name | -| server.staticAssets.enabled | bool | `true` | Disable deprecated flag `--staticassets` | -| server.tolerations | list | `[]` | [Tolerations] for use with node taints | -| server.topologySpreadConstraints | list | `[]` | Assign custom [TopologySpreadConstraints] rules to the Argo CD server | -| server.volumeMounts | list | `[]` | Additional volumeMounts to the server main container | -| server.volumes | list | `[]` | Additional volumes to the server pod | - -## Dex - -| Key | Type | Default | Description | -|-----|------|---------|-------------| -| dex.affinity | object | `{}` | Assign custom [affinity] rules to the deployment | -| dex.containerPortGrpc | int | `5557` | Container port for gRPC access | -| dex.containerPortHttp | int | `5556` | Container port for HTTP access | -| dex.containerPortMetrics | int | `5558` | Container port for metrics access | -| dex.containerSecurityContext | object | `{}` | Dex container-level security context | -| dex.enabled | bool | `true` | Enable dex | -| dex.env | list | `[]` | Environment variables to pass to the Dex server | -| dex.envFrom | list | `[]` (See [values.yaml]) | envFrom to pass to the Dex server | -| dex.extraArgs | list | `[]` | Additional command line arguments to pass to the Dex server | -| dex.extraContainers | list | `[]` | Additional containers to be added to the dex pod | -| dex.extraVolumeMounts | list | `[]` | Extra volumeMounts to the dex pod | -| dex.extraVolumes | list | `[]` | Extra volumes to the dex pod | -| dex.image.imagePullPolicy | string | `""` (defaults to global.image.imagePullPolicy) | Dex imagePullPolicy | -| dex.image.repository | string | `"ghcr.io/dexidp/dex"` | Dex image repository | -| dex.image.tag | string | `"v2.30.2"` | Dex image tag | -| dex.imagePullSecrets | list | `[]` | Secrets with credentials to pull images from a private registry | -| dex.initContainers | list | `[]` | Init containers to add to the dex pod | -| dex.initImage.imagePullPolicy | string | `""` (defaults to global.image.imagePullPolicy) | Argo CD init image imagePullPolicy | -| dex.initImage.repository | string | `""` (defaults to global.image.repository) | Argo CD init image repository | -| dex.initImage.tag | string | `""` (defaults to global.image.tag) | Argo CD init image tag | -| dex.livenessProbe.enabled | bool | `false` | Enable Kubernetes liveness probe for Dex >= 2.28.0 | -| dex.livenessProbe.failureThreshold | int | `3` | Minimum consecutive failures for the [probe] to be considered failed after having succeeded | -| dex.livenessProbe.initialDelaySeconds | int | `10` | Number of seconds after the container has started before [probe] is initiated | -| dex.livenessProbe.periodSeconds | int | `10` | How often (in seconds) to perform the [probe] | -| dex.livenessProbe.successThreshold | int | `1` | Minimum consecutive successes for the [probe] to be considered successful after having failed | -| dex.livenessProbe.timeoutSeconds | int | `1` | Number of seconds after which the [probe] times out | -| dex.metrics.enabled | bool | `false` | Deploy metrics service | -| dex.metrics.service.annotations | object | `{}` | Metrics service annotations | -| dex.metrics.service.labels | object | `{}` | Metrics service labels | -| dex.metrics.service.portName | string | `"http-metrics"` | Metrics service port name | -| dex.metrics.serviceMonitor.additionalLabels | object | `{}` | Prometheus ServiceMonitor labels | -| dex.metrics.serviceMonitor.enabled | bool | `false` | Enable a prometheus ServiceMonitor | -| dex.metrics.serviceMonitor.interval | string | `"30s"` | Prometheus ServiceMonitor interval | -| dex.metrics.serviceMonitor.metricRelabelings | list | `[]` | Prometheus [MetricRelabelConfigs] to apply to samples before ingestion | -| dex.metrics.serviceMonitor.namespace | string | `""` | Prometheus ServiceMonitor namespace | -| dex.metrics.serviceMonitor.relabelings | list | `[]` | Prometheus [RelabelConfigs] to apply to samples before scraping | -| dex.metrics.serviceMonitor.scheme | string | `""` | Prometheus ServiceMonitor scheme | -| dex.metrics.serviceMonitor.selector | object | `{}` | Prometheus ServiceMonitor selector | -| dex.metrics.serviceMonitor.tlsConfig | object | `{}` | Prometheus ServiceMonitor tlsConfig | -| dex.name | string | `"dex-server"` | Dex name | -| dex.nodeSelector | object | `{}` | [Node selector] | -| dex.pdb.annotations | object | `{}` | Annotations to be added to Dex server pdb | -| dex.pdb.enabled | bool | `false` | Deploy a Poddisruptionbudget for the Dex server | -| dex.pdb.labels | object | `{}` | Labels to be added to Dex server pdb | -| dex.podAnnotations | object | `{}` | Annotations to be added to the Dex server pods | -| dex.podLabels | object | `{}` | Labels to be added to the Dex server pods | -| dex.priorityClassName | string | `""` | Priority class for dex | -| dex.readinessProbe.enabled | bool | `false` | Enable Kubernetes readiness probe for Dex >= 2.28.0 | -| dex.readinessProbe.failureThreshold | int | `3` | Minimum consecutive failures for the [probe] to be considered failed after having succeeded | -| dex.readinessProbe.initialDelaySeconds | int | `10` | Number of seconds after the container has started before [probe] is initiated | -| dex.readinessProbe.periodSeconds | int | `10` | How often (in seconds) to perform the [probe] | -| dex.readinessProbe.successThreshold | int | `1` | Minimum consecutive successes for the [probe] to be considered successful after having failed | -| dex.readinessProbe.timeoutSeconds | int | `1` | Number of seconds after which the [probe] times out | -| dex.resources | object | `{}` | Resource limits and requests for dex | -| dex.serviceAccount.annotations | object | `{}` | Annotations applied to created service account | -| dex.serviceAccount.automountServiceAccountToken | bool | `true` | Automount API credentials for the Service Account | -| dex.serviceAccount.create | bool | `true` | Create dex service account | -| dex.serviceAccount.name | string | `"argocd-dex-server"` | Dex service account name | -| dex.servicePortGrpc | int | `5557` | Service port for gRPC access | -| dex.servicePortGrpcName | string | `"grpc"` | Service port name for gRPC access | -| dex.servicePortHttp | int | `5556` | Service port for HTTP access | -| dex.servicePortHttpName | string | `"http"` | Service port name for HTTP access | -| dex.servicePortMetrics | int | `5558` | Service port for metrics access | -| dex.tolerations | list | `[]` | [Tolerations] for use with node taints | -| dex.topologySpreadConstraints | list | `[]` | Assign custom [TopologySpreadConstraints] rules to dex | -| dex.volumeMounts | list | `[{"mountPath":"/shared","name":"static-files"}]` | Additional volumeMounts to the dex main container | -| dex.volumes | list | `[{"emptyDir":{},"name":"static-files"}]` | Additional volumes to the dex pod | - -## Redis - -### Option 1 - Single Redis instance (default option) - -| Key | Type | Default | Description | -|-----|------|---------|-------------| -| redis.affinity | object | `{}` | Assign custom [affinity] rules to the deployment | -| redis.containerPort | int | `6379` | Redis container port | -| redis.containerSecurityContext | object | `{}` | Redis container-level security context | -| redis.enabled | bool | `true` | Enable redis | -| redis.env | list | `[]` | Environment variables to pass to the Redis server | -| redis.envFrom | list | `[]` (See [values.yaml]) | envFrom to pass to the Redis server | -| redis.extraArgs | list | `[]` | Additional command line arguments to pass to redis-server | -| redis.extraContainers | list | `[]` | Additional containers to be added to the redis pod | -| redis.image.imagePullPolicy | string | `"IfNotPresent"` | Redis imagePullPolicy | -| redis.image.repository | string | `"public.ecr.aws/docker/library/redis"` | Redis repository | -| redis.image.tag | string | `"7.0.4-alpine"` | Redis tag | -| redis.imagePullSecrets | list | `[]` | Secrets with credentials to pull images from a private registry | -| redis.initContainers | list | `[]` | Init containers to add to the redis pod | -| redis.metrics.containerPort | int | `9121` | Port to use for redis-exporter sidecar | -| redis.metrics.enabled | bool | `false` | Deploy metrics service and redis-exporter sidecar | -| redis.metrics.image.imagePullPolicy | string | `"IfNotPresent"` | redis-exporter image PullPolicy | -| redis.metrics.image.repository | string | `"public.ecr.aws/bitnami/redis-exporter"` | redis-exporter image repository | -| redis.metrics.image.tag | string | `"1.26.0-debian-10-r2"` | redis-exporter image tag | -| redis.metrics.resources | object | `{}` | Resource limits and requests for redis-exporter sidecar | -| redis.metrics.service.annotations | object | `{}` | Metrics service annotations | -| redis.metrics.service.clusterIP | string | `"None"` | Metrics service clusterIP. `None` makes a "headless service" (no virtual IP) | -| redis.metrics.service.labels | object | `{}` | Metrics service labels | -| redis.metrics.service.portName | string | `"http-metrics"` | Metrics service port name | -| redis.metrics.service.servicePort | int | `9121` | Metrics service port | -| redis.metrics.service.type | string | `"ClusterIP"` | Metrics service type | -| redis.metrics.serviceMonitor.additionalLabels | object | `{}` | Prometheus ServiceMonitor labels | -| redis.metrics.serviceMonitor.enabled | bool | `false` | Enable a prometheus ServiceMonitor | -| redis.metrics.serviceMonitor.interval | string | `"30s"` | Interval at which metrics should be scraped | -| redis.metrics.serviceMonitor.metricRelabelings | list | `[]` | Prometheus [MetricRelabelConfigs] to apply to samples before ingestion | -| redis.metrics.serviceMonitor.namespace | string | `""` | Prometheus ServiceMonitor namespace | -| redis.metrics.serviceMonitor.relabelings | list | `[]` | Prometheus [RelabelConfigs] to apply to samples before scraping | -| redis.metrics.serviceMonitor.scheme | string | `""` | Prometheus ServiceMonitor scheme | -| redis.metrics.serviceMonitor.selector | object | `{}` | Prometheus ServiceMonitor selector | -| redis.metrics.serviceMonitor.tlsConfig | object | `{}` | Prometheus ServiceMonitor tlsConfig | -| redis.name | string | `"redis"` | Redis name | -| redis.nodeSelector | object | `{}` | [Node selector] | -| redis.pdb.annotations | object | `{}` | Annotations to be added to Redis server pdb | -| redis.pdb.enabled | bool | `false` | Deploy a Poddisruptionbudget for the Redis server | -| redis.pdb.labels | object | `{}` | Labels to be added to Redis server pdb | -| redis.podAnnotations | object | `{}` | Annotations to be added to the Redis server pods | -| redis.podLabels | object | `{}` | Labels to be added to the Redis server pods | -| redis.priorityClassName | string | `""` | Priority class for redis | -| redis.resources | object | `{}` | Resource limits and requests for redis | -| redis.securityContext | object | `{"runAsNonRoot":true,"runAsUser":999}` | Redis pod-level security context | -| redis.service.annotations | object | `{}` | Redis service annotations | -| redis.service.labels | object | `{}` | Additional redis service labels | -| redis.serviceAccount.annotations | object | `{}` | Annotations applied to created service account | -| redis.serviceAccount.automountServiceAccountToken | bool | `false` | Automount API credentials for the Service Account | -| redis.serviceAccount.create | bool | `false` | Create a service account for the redis pod | -| redis.serviceAccount.name | string | `""` | Service account name for redis pod | -| redis.servicePort | int | `6379` | Redis service port | -| redis.tolerations | list | `[]` | [Tolerations] for use with node taints | -| redis.topologySpreadConstraints | list | `[]` | Assign custom [TopologySpreadConstraints] rules to redis | -| redis.volumeMounts | list | `[]` | Additional volumeMounts to the redis container | -| redis.volumes | list | `[]` | Additional volumes to the redis pod | - -### Option 2 - Redis HA - -This option uses the following third-party chart to bootstrap a clustered Redis: https://github.com/DandyDeveloper/charts/tree/master/charts/redis-ha. -For all available configuration options, please read upstream README and/or chart source. -The main options are listed here: - -| Key | Type | Default | Description | -|-----|------|---------|-------------| -| redis-ha.enabled | bool | `false` | Enables the Redis HA subchart and disables the custom Redis single node deployment | -| redis-ha.exporter.enabled | bool | `true` | If `true`, the prometheus exporter sidecar is enabled | -| redis-ha.haproxy.enabled | bool | `true` | Enabled HAProxy LoadBalancing/Proxy | -| redis-ha.haproxy.metrics.enabled | bool | `true` | HAProxy enable prometheus metric scraping | -| redis-ha.image.tag | string | `"7.0.4-alpine"` | Redis tag | -| redis-ha.persistentVolume.enabled | bool | `false` | Configures persistency on Redis nodes | -| redis-ha.redis.config | object | See [values.yaml] | Any valid redis config options in this section will be applied to each server (see `redis-ha` chart) | -| redis-ha.redis.config.save | string | `'""'` | Will save the DB if both the given number of seconds and the given number of write operations against the DB occurred. `""` is disabled | -| redis-ha.redis.masterGroupName | string | `"argocd"` | Redis convention for naming the cluster group: must match `^[\\w-\\.]+$` and can be templated | -| redis-ha.topologySpreadConstraints.enabled | bool | `false` | Enable Redis HA topology spread constraints | -| redis-ha.topologySpreadConstraints.maxSkew | string | `""` (defaults to `1`) | Max skew of pods tolerated | -| redis-ha.topologySpreadConstraints.topologyKey | string | `""` (defaults to `topology.kubernetes.io/zone`) | Topology key for spread | -| redis-ha.topologySpreadConstraints.whenUnsatisfiable | string | `""` (defaults to `ScheduleAnyway`) | Enforcement policy, hard or soft | -| redis-ha.exporter.image | string | `nil` (follows subchart default) | Exporter image | -| redis-ha.exporter.tag | string | `nil` (follows subchart default) | Exporter tag | -| redis-ha.haproxy.image.repository | string | `nil` (follows subchart default) | HAProxy Image Repository | -| redis-ha.haproxy.image.tag | string | `nil` (follows subchart default) | HAProxy Image Tag | -| redis-ha.image.repository | string | `nil` (follows subchart default) | Redis image repository | - -### Option 3 - External Redis - -If you want to use an existing Redis (eg. a managed service from a cloud provider), you can use these parameters: - -| Key | Type | Default | Description | -|-----|------|---------|-------------| -| externalRedis.existingSecret | string | `""` | The name of an existing secret with Redis credentials (must contain key `redis-password`). When it's set, the `externalRedis.password` parameter is ignored | -| externalRedis.host | string | `""` | External Redis server host | -| externalRedis.password | string | `""` | External Redis password | -| externalRedis.port | int | `6379` | External Redis server port | -| externalRedis.secretAnnotations | object | `{}` | External Redis Secret annotations | - -## ApplicationSet - -| Key | Type | Default | Description | -|-----|------|---------|-------------| -| applicationSet.affinity | object | `{}` | Assign custom [affinity] rules | -| applicationSet.args.debug | bool | `false` | Print debug logs | -| applicationSet.args.dryRun | bool | `false` | Enable dry run mode | -| applicationSet.args.enableLeaderElection | bool | `false` | The default leader election setting | -| applicationSet.args.metricsAddr | string | `":8080"` | The default metric address | -| applicationSet.args.policy | string | `"sync"` | How application is synced between the generator and the cluster | -| applicationSet.args.probeBindAddr | string | `":8081"` | The default health check port | -| applicationSet.enabled | bool | `true` | Enable Application Set controller | -| applicationSet.extraArgs | list | `[]` | List of extra cli args to add | -| applicationSet.extraContainers | list | `[]` | Additional containers to be added to the applicationset controller pod | -| applicationSet.extraEnv | list | `[]` | Environment variables to pass to the controller | -| applicationSet.extraEnvFrom | list | `[]` (See [values.yaml]) | envFrom to pass to the controller | -| applicationSet.extraVolumeMounts | list | `[]` | List of extra mounts to add (normally used with extraVolumes) | -| applicationSet.extraVolumes | list | `[]` | List of extra volumes to add | -| applicationSet.image.imagePullPolicy | string | `""` (defaults to global.image.imagePullPolicy) | Image pull policy for the application set controller | -| applicationSet.image.repository | string | `""` (defaults to global.image.repository) | Repository to use for the application set controller | -| applicationSet.image.tag | string | `""` (defaults to global.image.tag) | Tag to use for the application set controller | -| applicationSet.imagePullSecrets | list | `[]` | If defined, uses a Secret to pull an image from a private Docker registry or repository. | -| applicationSet.metrics.enabled | bool | `false` | Deploy metrics service | -| applicationSet.metrics.service.annotations | object | `{}` | Metrics service annotations | -| applicationSet.metrics.service.labels | object | `{}` | Metrics service labels | -| applicationSet.metrics.service.portName | string | `"http-metrics"` | Metrics service port name | -| applicationSet.metrics.service.servicePort | int | `8085` | Metrics service port | -| applicationSet.metrics.serviceMonitor.additionalLabels | object | `{}` | Prometheus ServiceMonitor labels | -| applicationSet.metrics.serviceMonitor.enabled | bool | `false` | Enable a prometheus ServiceMonitor | -| applicationSet.metrics.serviceMonitor.interval | string | `"30s"` | Prometheus ServiceMonitor interval | -| applicationSet.metrics.serviceMonitor.metricRelabelings | list | `[]` | Prometheus [MetricRelabelConfigs] to apply to samples before ingestion | -| applicationSet.metrics.serviceMonitor.namespace | string | `""` | Prometheus ServiceMonitor namespace | -| applicationSet.metrics.serviceMonitor.relabelings | list | `[]` | Prometheus [RelabelConfigs] to apply to samples before scraping | -| applicationSet.metrics.serviceMonitor.scheme | string | `""` | Prometheus ServiceMonitor scheme | -| applicationSet.metrics.serviceMonitor.selector | object | `{}` | Prometheus ServiceMonitor selector | -| applicationSet.metrics.serviceMonitor.tlsConfig | object | `{}` | Prometheus ServiceMonitor tlsConfig | -| applicationSet.name | string | `"applicationset-controller"` | Application Set controller name string | -| applicationSet.nodeSelector | object | `{}` | [Node selector] | -| applicationSet.podAnnotations | object | `{}` | Annotations for the controller pods | -| applicationSet.podLabels | object | `{}` | Labels for the controller pods | -| applicationSet.podSecurityContext | object | `{}` | Pod Security Context | -| applicationSet.priorityClassName | string | `""` | If specified, indicates the pod's priority. If not specified, the pod priority will be default or zero if there is no default. | -| applicationSet.replicaCount | int | `1` | The number of controller pods to run | -| applicationSet.resources | object | `{}` | Resource limits and requests for the controller pods. | -| applicationSet.securityContext | object | `{}` | Security Context | -| applicationSet.service.annotations | object | `{}` | Application set service annotations | -| applicationSet.service.labels | object | `{}` | Application set service labels | -| applicationSet.service.port | int | `7000` | Application set service port | -| applicationSet.service.portName | string | `"webhook"` | Application set service port name | -| applicationSet.serviceAccount.annotations | object | `{}` | Annotations to add to the service account | -| applicationSet.serviceAccount.create | bool | `true` | Specifies whether a service account should be created | -| applicationSet.serviceAccount.name | string | `""` | The name of the service account to use. If not set and create is true, a name is generated using the fullname template | -| applicationSet.tolerations | list | `[]` | [Tolerations] for use with node taints | -| applicationSet.webhook.ingress.annotations | object | `{}` | Additional ingress annotations | -| applicationSet.webhook.ingress.enabled | bool | `false` | Enable an ingress resource for Webhooks | -| applicationSet.webhook.ingress.extraPaths | list | `[]` | Additional ingress paths | -| applicationSet.webhook.ingress.hosts | list | `[]` | List of ingress hosts | -| applicationSet.webhook.ingress.ingressClassName | string | `""` | Defines which ingress controller will implement the resource | -| applicationSet.webhook.ingress.labels | object | `{}` | Additional ingress labels | -| applicationSet.webhook.ingress.pathType | string | `"Prefix"` | Ingress path type. One of `Exact`, `Prefix` or `ImplementationSpecific` | -| applicationSet.webhook.ingress.paths | list | `["/api/webhook"]` | List of ingress paths | -| applicationSet.webhook.ingress.tls | list | `[]` | Ingress TLS configuration | - -## Notifications - -| Key | Type | Default | Description | -|-----|------|---------|-------------| -| notifications.affinity | object | `{}` | Assign custom [affinity] rules | -| notifications.argocdUrl | string | `nil` | Argo CD dashboard url; used in place of {{.context.argocdUrl}} in templates | -| notifications.bots.slack.affinity | object | `{}` | Assign custom [affinity] rules | -| notifications.bots.slack.containerSecurityContext | object | `{}` | Container Security Context | -| notifications.bots.slack.enabled | bool | `false` | Enable slack bot | -| notifications.bots.slack.image.imagePullPolicy | string | `""` (defaults to global.image.imagePullPolicy) | Image pull policy for the Slack bot | -| notifications.bots.slack.image.repository | string | `""` (defaults to global.image.repository) | Repository to use for the Slack bot | -| notifications.bots.slack.image.tag | string | `""` (defaults to global.image.tag) | Tag to use for the Slack bot | -| notifications.bots.slack.imagePullSecrets | list | `[]` | Secrets with credentials to pull images from a private registry | -| notifications.bots.slack.nodeSelector | object | `{}` | [Node selector] | -| notifications.bots.slack.resources | object | `{}` | Resource limits and requests for the Slack bot | -| notifications.bots.slack.securityContext | object | `{"runAsNonRoot":true}` | Pod Security Context | -| notifications.bots.slack.service.annotations | object | `{}` | Service annotations for Slack bot | -| notifications.bots.slack.service.port | int | `80` | Service port for Slack bot | -| notifications.bots.slack.service.type | string | `"LoadBalancer"` | Service type for Slack bot | -| notifications.bots.slack.serviceAccount.annotations | object | `{}` | Annotations applied to created service account | -| notifications.bots.slack.serviceAccount.create | bool | `true` | Specifies whether a service account should be created | -| notifications.bots.slack.serviceAccount.name | string | `"argocd-notifications-bot"` | The name of the service account to use. | -| notifications.bots.slack.tolerations | list | `[]` | [Tolerations] for use with node taints | -| notifications.bots.slack.updateStrategy | object | `{"type":"Recreate"}` | The deployment strategy to use to replace existing pods with new ones | -| notifications.cm.create | bool | `true` | Whether helm chart creates controller config map | -| notifications.cm.name | string | `""` | The name of the config map to use. | -| notifications.containerSecurityContext | object | `{}` | Container Security Context | -| notifications.context | object | `{}` | Define user-defined context | -| notifications.enabled | bool | `true` | Enable Notifications controller | -| notifications.extraArgs | list | `[]` | Extra arguments to provide to the controller | -| notifications.extraEnv | list | `[]` | Additional container environment variables | -| notifications.extraVolumeMounts | list | `[]` | List of extra mounts to add (normally used with extraVolumes) | -| notifications.extraVolumes | list | `[]` | List of extra volumes to add | -| notifications.image.imagePullPolicy | string | `""` (defaults to global.image.imagePullPolicy) | Image pull policy for the notifications controller | -| notifications.image.repository | string | `""` (defaults to global.image.repository) | Repository to use for the notifications controller | -| notifications.image.tag | string | `""` (defaults to global.image.tag) | Tag to use for the notifications controller | -| notifications.imagePullSecrets | list | `[]` | Secrets with credentials to pull images from a private registry | -| notifications.logFormat | string | `"text"` | Application controller log format. Either `text` or `json` | -| notifications.logLevel | string | `"info"` | Set the logging level. (One of: `debug`, `info`, `warn`, `error`) | -| notifications.metrics.enabled | bool | `false` | Enables prometheus metrics server | -| notifications.metrics.port | int | `9001` | Metrics port | -| notifications.metrics.service.annotations | object | `{}` | Metrics service annotations | -| notifications.metrics.service.labels | object | `{}` | Metrics service labels | -| notifications.metrics.service.portName | string | `"http-metrics"` | Metrics service port name | -| notifications.metrics.serviceMonitor.additionalLabels | object | `{}` | Prometheus ServiceMonitor labels | -| notifications.metrics.serviceMonitor.enabled | bool | `false` | Enable a prometheus ServiceMonitor | -| notifications.metrics.serviceMonitor.scheme | string | `""` | Prometheus ServiceMonitor scheme | -| notifications.metrics.serviceMonitor.selector | object | `{}` | Prometheus ServiceMonitor selector | -| notifications.metrics.serviceMonitor.tlsConfig | object | `{}` | Prometheus ServiceMonitor tlsConfig | -| notifications.name | string | `"notifications-controller"` | Notifications controller name string | -| notifications.nodeSelector | object | `{}` | [Node selector] | -| notifications.notifiers | object | See [values.yaml] | Configures notification services such as slack, email or custom webhook | -| notifications.podAnnotations | object | `{}` | Annotations to be applied to the controller Pods | -| notifications.podLabels | object | `{}` | Labels to be applied to the controller Pods | -| notifications.resources | object | `{}` | Resource limits and requests for the controller | -| notifications.secret.annotations | object | `{}` | key:value pairs of annotations to be added to the secret | -| notifications.secret.create | bool | `true` | Whether helm chart creates controller secret | -| notifications.secret.items | object | `{}` | Generic key:value pairs to be inserted into the secret | -| notifications.secret.name | string | `""` | The name of the secret to use. | -| notifications.securityContext | object | `{"runAsNonRoot":true}` | Pod Security Context | -| notifications.serviceAccount.annotations | object | `{}` | Annotations applied to created service account | -| notifications.serviceAccount.create | bool | `true` | Specifies whether a service account should be created | -| notifications.serviceAccount.name | string | `"argocd-notifications-controller"` | The name of the service account to use. | -| notifications.subscriptions | list | `[]` | Contains centrally managed global application subscriptions | -| notifications.templates | object | `{}` | The notification template is used to generate the notification content | -| notifications.tolerations | list | `[]` | [Tolerations] for use with node taints | -| notifications.triggers | object | `{}` | The trigger defines the condition when the notification should be sent | -| notifications.updateStrategy | object | `{"type":"Recreate"}` | The deployment strategy to use to replace existing pods with new ones | - -### Using AWS ALB Ingress Controller With GRPC - -If you are using an AWS ALB Ingress controller, you will need to set `server.ingressGrpc.isAWSALB` to `true`. This will create a second service with the annotation `alb.ingress.kubernetes.io/backend-protocol-version: HTTP2` and modify the server ingress to add a condition annotation to route GRPC traffic to the new service. - -Example: - -```yaml -server: - ingress: - enabled: true - annotations: - alb.ingress.kubernetes.io/backend-protocol: HTTPS - alb.ingress.kubernetes.io/listen-ports: '[{"HTTPS":443}]' - alb.ingress.kubernetes.io/scheme: internal - alb.ingress.kubernetes.io/target-type: ip - ingressGrpc: - enabled: true - isAWSALB: true - awsALB: - serviceType: ClusterIP - -``` - ----------------------------------------------- -Autogenerated from chart metadata using [helm-docs](https://github.com/norwoodj/helm-docs) - -[Argo CD RBAC policy]: https://argo-cd.readthedocs.io/en/stable/operator-manual/rbac/ -[affinity]: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/ -[BackendConfigSpec]: https://cloud.google.com/kubernetes-engine/docs/concepts/backendconfig#backendconfigspec_v1beta1_cloudgooglecom -[CSS styles]: https://argo-cd.readthedocs.io/en/stable/operator-manual/custom-styles/ -[external cluster credentials]: https://argo-cd.readthedocs.io/en/stable/operator-manual/declarative-setup/#clusters -[FrontendConfigSpec]: https://cloud.google.com/kubernetes-engine/docs/how-to/ingress-features#configuring_ingress_features_through_frontendconfig_parameters -[Declarative setup]: https://argo-cd.readthedocs.io/en/stable/operator-manual/declarative-setup -[gRPC-ingress]: https://argo-cd.readthedocs.io/en/stable/operator-manual/ingress/ -[HPA]: https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/ -[MetricRelabelConfigs]: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs -[Node selector]: https://kubernetes.io/docs/user-guide/node-selection/ -[probe]: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-probes -[RelabelConfigs]: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config -[Tolerations]: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ -[TopologySpreadConstraints]: https://kubernetes.io/docs/concepts/workloads/pods/pod-topology-spread-constraints/ -[values.yaml]: values.yaml -[v2.2 to 2.3 upgrade instructions]: https://github.com/argoproj/argo-cd/blob/v2.3.0/docs/operator-manual/upgrading/2.2-2.3.md diff --git a/argocd/charts/redis-ha/Chart.yaml b/argocd/charts/redis-ha/Chart.yaml deleted file mode 100644 index 3bc083d1..00000000 --- a/argocd/charts/redis-ha/Chart.yaml +++ /dev/null @@ -1,21 +0,0 @@ -apiVersion: v2 -appVersion: 6.2.5 -description: This Helm chart provides a highly available Redis implementation with - a master/slave configuration and uses Sentinel sidecars for failover management -home: http://redis.io/ -icon: https://upload.wikimedia.org/wikipedia/en/thumb/6/6b/Redis_Logo.svg/1200px-Redis_Logo.svg.png -keywords: -- redis -- keyvalue -- database -maintainers: -- email: salimsalaues@gmail.com - name: ssalaues -- email: aaron.layfield@gmail.com - name: dandydeveloper -name: redis-ha -sources: -- https://redis.io/download -- https://github.com/DandyDeveloper/charts/blob/master/charts/redis-ha -- https://github.com/oliver006/redis_exporter -version: 4.17.1 diff --git a/argocd/charts/redis-ha/README.md b/argocd/charts/redis-ha/README.md deleted file mode 100644 index b4fb1d57..00000000 --- a/argocd/charts/redis-ha/README.md +++ /dev/null @@ -1,382 +0,0 @@ -# Redis - -[Redis](http://redis.io/) is an advanced key-value cache and store. It is often referred to as a data structure server since keys can contain strings, hashes, lists, sets, sorted sets, bitmaps and hyperloglogs. - -## TL;DR - -```bash -helm repo add dandydev https://dandydeveloper.github.io/charts -helm install dandydev/redis-ha -``` - -By default this chart install 3 pods total: - -* one pod containing a redis master and sentinel container (optional prometheus metrics exporter sidecar available) -* two pods each containing a redis slave and sentinel containers (optional prometheus metrics exporter sidecars available) - -## Introduction - -This chart bootstraps a [Redis](https://redis.io) highly available master/slave statefulset in a [Kubernetes](http://kubernetes.io) cluster using the Helm package manager. - -## Prerequisites - -* Kubernetes 1.8+ with Beta APIs enabled -* PV provisioner support in the underlying infrastructure - -## Upgrading the Chart - -Please note that there have been a number of changes simplifying the redis management strategy (for better failover and elections) in the 3.x version of this chart. These changes allow the use of official [redis](https://hub.docker.com/_/redis/) images that do not require special RBAC or ServiceAccount roles. As a result when upgrading from version >=2.0.1 to >=3.0.0 of this chart, `Role`, `RoleBinding`, and `ServiceAccount` resources should be deleted manually. - -### Upgrading the chart from 3.x to 4.x - -Starting from version `4.x` HAProxy sidecar prometheus-exporter removed and replaced by the embedded [HAProxy metrics endpoint](https://github.com/haproxy/haproxy/tree/master/contrib/prometheus-exporter), as a result when upgrading from version 3.x to 4.x section `haproxy.exporter` should be removed and the `haproxy.metrics` need to be configured for fit your needs. - -## Installing the Chart - -To install the chart - -```bash -helm repo add dandydev https://dandydeveloper.github.io/charts -helm install dandydev/redis-ha -``` - -The command deploys Redis on the Kubernetes cluster in the default configuration. By default this chart install one master pod containing redis master container and sentinel container along with 2 redis slave pods each containing their own sentinel sidecars. The [configuration](#configuration) section lists the parameters that can be configured during installation. - -> **Tip**: List all releases using `helm list` - -## Uninstalling the Chart - -To uninstall/delete the deployment: - -```bash -helm delete -``` - -The command removes all the Kubernetes components associated with the chart and deletes the release. - -## Configuration - -The following table lists the configurable parameters of the Redis chart and their default values. - -| Parameter | Description | Default | -|:--------------------------|:---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|:-------------------------------------------------------------------------------------------| -| `image.repository` | Redis image repository | `redis` | -| `image.tag` | Redis image tag | `6.2.5-alpine` | -| `image.pullPolicy` | Redis image pull policy | `IfNotPresent` | -| `imagePullSecrets` | Reference to one or more secrets to be used when pulling redis images | [] | -| `tag` | Redis tag | `6.2.5-alpine` | -| `replicas` | Number of redis master/slave pods | `3` | -| `podManagementPolicy` | The statefulset pod management policy | `OrderedReady` | -| `ro_replicas` | Comma separated list of slaves which never get promoted to be master. Count starts with 0. Allowed values 1-9. i.e. 3,4 - 3th and 4th redis slave never make it to be master, where master is index 0. | ``| -| `serviceAccount.create` | Specifies whether a ServiceAccount should be created | `true` | -| `serviceAccount.name` | The name of the ServiceAccount to create | Generated using the redis-ha.fullname template | -| `serviceAccount.automountToken` | Opt in/out of automounting API credentials into container | `false` | -| `serviceAnnotations` | Annotations to set on Redis HA service | `null` | -| `serviceLabels` | Labels to set on Redis HA service | `{}` | -| `podSecurityPolicy.create` | Specifies whether a PodSecurityPolicy should be created | `false` | -| `rbac.create` | Create and use RBAC resources | `true` | -| `redis.port` | Port to access the redis service | `6379` | -| `redis.tlsPort` | TLS Port to access the redis service |``| -| `redis.tlsReplication` | Configures redis with tls-replication parameter, if true sets "tls-replication yes" in redis.conf |``| -| `redis.authClients` | It is possible to disable client side certificates authentication when "authClients" is set to "no" |``| -| `redis.livenessProbe.initialDelaySeconds` | Initial delay in seconds for liveness probe | `30` | -| `redis.livenessProbe.periodSeconds` | Period in seconds after which liveness probe will be repeated | `15` | -| `redis.livenessProbe.timeoutSeconds` | Timeout seconds for liveness probe | `15` | -| `redis.livenessProbe.successThreshold` | Success threshold for liveness probe | `1` | -| `redis.livenessProbe.failureThreshold` | Failure threshold for liveness probe | `5` | -| `redis.readinessProbe.initialDelaySeconds` | Initial delay in seconds for readiness probe | `30` | -| `redis.readinessProbe.periodSeconds` | Period in seconds after which readiness probe will be repeated | `15` | -| `redis.readinessProbe.timeoutSeconds` | Timeout seconds for readiness probe | `15` | -| `redis.readinessProbe.successThreshold` | Success threshold for readiness probe | `1` | -| `redis.readinessProbe.failureThreshold` | Failure threshold for readiness probe | `5` | -| `redis.masterGroupName` | Redis convention for naming the cluster group: must match `^[\\w-\\.]+$` and can be templated | `mymaster` | -| `redis.config` | Any valid redis config options in this section will be applied to each server (see below) | see values.yaml | -| `redis.customConfig` | Allows for custom redis.conf files to be applied. If this is used then `redis.config` is ignored |``| -| `redis.resources` | CPU/Memory for master/slave nodes resource requests/limits | `{}` | -| `redis.lifecycle` | Container Lifecycle Hooks for redis container | see values.yaml | -| `redis.annotations` | Annotations for the redis statefulset | `{}` | -| `redis.updateStategy.type`| Update strategy for redis statefulSet | `RollingUpdate` | -| `redis.extraVolumeMounts` | Extra volume mounts for Redis container | `[]` | -| `sentinel.port` | Port to access the sentinel service | `26379` | -| `sentinel.bind` | Configure the 'bind' directive to bind to a list of network interfaces | `` | -| `sentinel.tlsPort` | TLS Port to access the sentinel service |``| -| `sentinel.tlsReplication` | Configures sentinel with tls-replication parameter, if true sets "tls-replication yes" in sentinel.conf |``| -| `sentinel.authClients` | It is possible to disable client side certificates authentication when "authClients" is set to "no" |``| -| `sentinel.livenessProbe.initialDelaySeconds` | Initial delay in seconds for liveness probe | `30` | -| `sentinel.livenessProbe.periodSeconds` | Period in seconds after which liveness probe will be repeated | `15` | -| `sentinel.livenessProbe.timeoutSeconds` | Timeout seconds for liveness probe | `15` | -| `sentinel.livenessProbe.successThreshold` | Success threshold for liveness probe | `1` | -| `sentinel.livenessProbe.failureThreshold` | Failure threshold for liveness probe | `5` | -| `sentinel.readinessProbe.initialDelaySeconds` | Initial delay in seconds for readiness probe | `30` | -| `sentinel.readinessProbe.periodSeconds` | Period in seconds after which readiness probe will be repeated | `15` | -| `sentinel.readinessProbe.timeoutSeconds` | Timeout seconds for readiness probe | `15` | -| `sentinel.readinessProbe.successThreshold` | Success threshold for readiness probe | `3` | -| `sentinel.readinessProbe.failureThreshold` | Failure threshold for readiness probe | `5` | -| `sentinel.auth` | Enables or disables sentinel AUTH (Requires `sentinel.password` to be set) | `false` | -| `sentinel.password` | A password that configures a `requirepass` in the conf parameters (Requires `sentinel.auth: enabled`) |``| -| `sentinel.existingSecret` | An existing secret containing a key defined by `sentinel.authKey` that configures `requirepass` in the conf parameters (Requires `sentinel.auth: enabled`, cannot be used in conjunction with `.Values.sentinel.password`) |``| -| `sentinel.authKey` | The key holding the sentinel password in an existing secret. | `sentinel-password` | -| `sentinel.quorum` | Minimum number of servers necessary to maintain quorum | `2` | -| `sentinel.config` | Valid sentinel config options in this section will be applied as config options to each sentinel (see below) | see values.yaml | -| `sentinel.customConfig` | Allows for custom sentinel.conf files to be applied. If this is used then `sentinel.config` is ignored |``| -| `sentinel.resources` | CPU/Memory for sentinel node resource requests/limits | `{}` | -| `sentinel.lifecycle` | Container Lifecycle Hooks for sentinel container | `{}` | -| `sentinel.extraVolumeMounts` | Extra volume mounts for Sentinel container | `[]` | -| `init.resources` | CPU/Memory for init Container node resource requests/limits | `{}` | -| `auth` | Enables or disables redis AUTH (Requires `redisPassword` to be set) | `false` | -| `redisPassword` | A password that configures a `requirepass` and `masterauth` in the conf parameters (Requires `auth: enabled`) |``| -| `authKey` | The key holding the redis password in an existing secret. | `auth` | -| `existingSecret` | An existing secret containing a key defined by `authKey` that configures `requirepass` and `masterauth` in the conf parameters (Requires `auth: enabled`, cannot be used in conjunction with `.Values.redisPassword`) |``| -| `nodeSelector` | Node labels for pod assignment | `{}` | -| `tolerations` | Toleration labels for pod assignment | `[]` | -| `hardAntiAffinity` | Whether the Redis server pods should be forced to run on separate nodes. | `true` | -| `additionalAffinities` | Additional affinities to add to the Redis server pods. | `{}` | -| `securityContext` | Security context to be added to the Redis server pods. | `{runAsUser: 1000, fsGroup: 1000, runAsNonRoot: true}` | -| `affinity` | Override all other affinity settings with a string. | `""` | -| `labels` | Labels for the Redis pod. | `{}` | -| `configmap.labels` | Labels for the Redis configmap. | `{}` | -| `persistentVolume.size` | Size for the volume | 10Gi | -| `persistentVolume.annotations` | Annotations for the volume | `{}` | -| `emptyDir` | Configuration of `emptyDir`, used only if persistentVolume is disabled and no hostPath specified | `{}` | -| `exporter.enabled` | If `true`, the prometheus exporter sidecar is enabled | `false` | -| `exporter.image` | Exporter image | `oliver006/redis_exporter` | -| `exporter.tag` | Exporter tag | `v1.27.0` | -| `exporter.port` | Exporter port | `9121` | -| `exporter.portName` | Exporter port name | `exporter-port` | -| `exporter.address` | Redis instance Hostname/Address Exists to circumvent some issues with issues in IPv6 hostname resolution | `localhost` | -| `exporter.annotations` | Prometheus scrape annotations | `{prometheus.io/path: /metrics, prometheus.io/port: "9121", prometheus.io/scrape: "true"}` | -| `exporter.extraArgs` | Additional args for the exporter | `{}` | -| `exporter.script` | A custom custom Lua script that will be mounted to exporter for collection of custom metrics. Creates a ConfigMap and sets env var `REDIS_EXPORTER_SCRIPT`. | | -| `exporter.serviceMonitor.enabled` | Use servicemonitor from prometheus operator | `false` | -| `exporter.serviceMonitor.namespace` | Namespace the service monitor is created in | `default` | -| `exporter.serviceMonitor.interval` | Scrape interval, If not set, the Prometheus default scrape interval is used | `nil` | -| `exporter.serviceMonitor.telemetryPath` | Path to redis-exporter telemetry-path | `/metrics` | -| `exporter.serviceMonitor.labels` | Labels for the servicemonitor passed to Prometheus Operator | `{}` | -| `exporter.serviceMonitor.timeout` | How long until a scrape request times out. If not set, the Prometheus default scape timeout is used | `nil` | -| `haproxy.enabled` | Enabled HAProxy LoadBalancing/Proxy | `false` | -| `haproxy.replicas` | Number of HAProxy instances | `3` | -| `haproxy.servicePort` | Modify HAProxy service port | `6379` | -| `haproxy.containerPort` | Modify HAProxy deployment container port | `6379` -| `haproxy.image.repository`| HAProxy Image Repository | `haproxy` | -| `haproxy.image.tag` | HAProxy Image Tag | `2.4.2` | -| `haproxy.image.pullPolicy`| HAProxy Image PullPolicy | `IfNotPresent` | -| `haproxy.imagePullSecrets`| Reference to one or more secrets to be used when pulling haproxy images | [] | -| `haproxy.tls.enabled` | If "true" this will enable TLS termination on haproxy | `false` -| `haproxy.tls.secretName` | Secret containing the .pem file | `""` -| `haproxy.tls.certMountPath` | Path to mount the secret that contains the certificates. haproxy | `false` -| `haproxy.tls.secretName` | Secret containing the .pem file | `""` -| `haproxy.annotations` | HAProxy template annotations | `{}` | -| `haproxy.customConfig` | Allows for custom config-haproxy.cfg file to be applied. If this is used then default config will be overwriten |``| -| `haproxy.extraConfig` | Allows to place any additional configuration section to add to the default config-haproxy.cfg |``| -| `haproxy.resources` | HAProxy resources | `{}` | -| `haproxy.emptyDir` | Configuration of `emptyDir` | `{}` | -| `haproxy.labels` | Labels for the HAProxy pod | `{}` | -| `haproxy.podSecurityPolicy.create` | Specifies whether a PodSecurityPolicy should be created | `false` | -| `haproxy.service.type` | HAProxy service type "ClusterIP", "LoadBalancer" or "NodePort" | `ClusterIP` | -| `haproxy.service.nodePort` | HAProxy service nodePort value (haproxy.service.type must be NodePort) | not set | -| `haproxy.image.serviceAccountName`| HAProxy serviceAccountName | `default` -| `haproxy.service.externalTrafficPolicy`| HAProxy service externalTrafficPolicy value (haproxy.service.type must be LoadBalancer) | not set | -| `haproxy.service.annotations` | HAProxy service annotations | `{}` | -| `haproxy.service.labels` | HAProxy service labels | `{}` | -| `haproxy.stickyBalancing` | HAProxy sticky load balancing to Redis nodes. Helps with connections shutdown. | `false` | -| `haproxy.hapreadport.enable` | Enable a read only port for redis slaves | `false` | -| `haproxy.hapreadport.port` | Haproxy port for read only redis slaves | `6380` | -| `haproxy.metrics.enabled` | HAProxy enable prometheus metric scraping | `false` | -| `haproxy.metrics.port` | HAProxy prometheus metrics scraping port | `9101` | -| `haproxy.metrics.portName` | HAProxy metrics scraping port name | `http-exporter-port` | -| `haproxy.metrics.scrapePath` | HAProxy prometheus metrics scraping port | `/metrics` | -| `haproxy.metrics.serviceMonitor.enabled` | Use servicemonitor from prometheus operator for HAProxy metrics | `false` | -| `haproxy.metrics.serviceMonitor.namespace` | Namespace the service monitor for HAProxy metrics is created in | `default` | -| `haproxy.metrics.serviceMonitor.interval` | Scrape interval, If not set, the Prometheus default scrape interval is used | `nil` | -| `haproxy.metrics.serviceMonitor.telemetryPath` | Path to HAProxy metrics telemetry-path | `/metrics` | -| `haproxy.metrics.serviceMonitor.labels` | Labels for the HAProxy metrics servicemonitor passed to Prometheus Operator | `{}` | -| `haproxy.metrics.serviceMonitor.timeout` | How long until a scrape request times out. If not set, the Prometheus default scape timeout is used | `nil` | -| `haproxy.init.resources` | Extra init resources | `{}` | -| `haproxy.timeout.connect` | haproxy.cfg `timeout connect` setting | `4s` | -| `haproxy.timeout.server` | haproxy.cfg `timeout server` setting | `30s` | -| `haproxy.timeout.client` | haproxy.cfg `timeout client` setting | `30s` | -| `haproxy.timeout.check` | haproxy.cfg `timeout check` setting | `2s` | -| `haproxy.checkInterval` | haproxy.cfg `check inter` setting | `1s` | -| `haproxy.checkFall` | haproxy.cfg `check fall` setting | `1` | -| `haproxy.priorityClassName` | priorityClassName for `haproxy` deployment | not set | -| `haproxy.securityContext` | Security context to be added to the HAProxy deployment. | `{runAsUser: 1000, fsGroup: 1000, runAsNonRoot: true}` | -| `haproxy.hardAntiAffinity` | Whether the haproxy pods should be forced to run on separate nodes. | `true` | -| `haproxy.affinity` | Override all other haproxy affinity settings with a string. | `""` | -| `haproxy.additionalAffinities` | Additional affinities to add to the haproxy server pods. | `{}` | -| `podDisruptionBudget` | Pod Disruption Budget rules | `{}` | -| `nameOverride` | Override the chart name | `""` | -| `fullnameOverride` | Fully override the release name and chart name | `""` | -| `priorityClassName` | priorityClassName for `redis-ha-statefulset` | not set | -| `hostPath.path` | Use this path on the host for data storage | not set | -| `hostPath.chown` | Run an init-container as root to set ownership on the hostPath | `true` | -| `sysctlImage.enabled` | Enable an init container to modify Kernel settings | `false` | -| `sysctlImage.command` | sysctlImage command to execute | [] | -| `sysctlImage.registry` | sysctlImage Init container registry | `docker.io` | -| `sysctlImage.repository` | sysctlImage Init container name | `busybox` | -| `sysctlImage.tag` | sysctlImage Init container tag | `1.31.1` | -| `sysctlImage.pullPolicy` | sysctlImage Init container pull policy | `Always` | -| `sysctlImage.mountHostSys`| Mount the host `/sys` folder to `/host-sys` | `false` | -| `sysctlImage.resources` | sysctlImage resources | `{}` | -| `schedulerName` | Alternate scheduler name | `nil` | -| `tls.secretName` | The name of secret if you want to use your own TLS certificates. The secret should contains keys named by "tls.certFile" - the certificate, "tls.keyFile" - the private key, "tls.caCertFile" - the certificate of CA and "tls.dhParamsFile" - the dh parameter file | ``| -| `tls.certFile` | Name of certificate file | `redis.crt` | -| `tls.keyFile` | Name of key file | `redis.key` | -| `tls.dhParamsFile` | Name of Diffie-Hellman (DH) key exchange parameters file |`` | -| `tls.caCertFile` | Name of CA certificate file | `ca.crt` | -| `restore.s3.source` | Restore init container - AWS S3 location of dump - i.e. s3://bucket/dump.rdb | `false` | -| `restore.existingSecret` | Set to true to use existingSecret for the AWS S3 or SSH credentials | `false` | -| `topologySpreadConstraints.enabled` | Enable topology spread constraints |`false`| -| `topologySpreadConstraints.maxSkew` | Max skew of pods tolerated |`1`| -| `topologySpreadConstraints.topologyKey` | Topology key for spread |`topology.kubernetes.io/zone`| -| `topologySpreadConstraints.whenUnsatisfiable` | Enforcement policy, hard or soft |`ScheduleAnyway`| -| `restore.s3.access_key` | Restore init container - AWS AWS_ACCESS_KEY_ID to access restore.s3.source |``| -| `restore.s3.secret_key` | Restore init container - AWS AWS_SECRET_ACCESS_KEY to access restore.s3.source |``| -| `restore.s3.region` | Restore init container - AWS AWS_REGION to access restore.s3.source |``| -| `restore.ssh.source` | Restore init container - SSH scp location of dump - i.e. user@server:/path/dump.rdb | `false` | -| `restore.ssh.key` | Restore init container - SSH private key to scp restore.ssh.source to init container. Key should be in one line separated with \n. i.e. -----BEGIN RSA PRIVATE KEY-----\n...\n...\n-----END RSA PRIVATE KEY----- |`` | -| `extraContainers` | Extra containers to include in StatefulSet |`[]`| -| `extraInitContainers` | Extra init containers to include in StatefulSet |`[]`| -| `extraVolumes` | Extra volumes to include in StatefulSet |`[]`| -| `extraLabels` | Labels that should be applied to all created resources |`{}`| -| `networkPolicy.enabled` | Create NetworkPolicy for Redis StatefulSet pods |`false`| -| `networkPolicy.labels` | Labels for NetworkPolicy |`{}`| -| `networkPolicy.annotations` | Annotations for NetworkPolicy |`{}`| -| `networkPolicy.ingressRules[].selectors` | Label selector query to define resources for this ingress rule |`[]`| -| `networkPolicy.ingressRules[].ports` | The destination ports for the ingress rule |`[{port: redis.port, protocol: TCP}, {port: sentinel.port, protocol: TCP}]`| -| `networkPolicy.egressRules[].selectors` | Label selector query to define resources for this egress rule |`[]`| -| `networkPolicy.egressRules[].ports` | The destination ports for the egress rule |``| -| `splitBrainDetection.interval` | Interval between redis sentinel and server split brain checks (in seconds) |`60`| -| `splitBrainDetection.resources` | splitBrainDetection resources |`{}`| - -Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example, - -```bash -$ helm repo add dandydev https://dandydeveloper.github.io/charts -$ helm install \ - --set image=redis \ - --set tag=5.0.5-alpine \ - dandydev/redis-ha -``` - -The above command sets the Redis server within `default` namespace. - -Alternatively, a YAML file that specifies the values for the parameters can be provided while installing the chart. For example, - -```bash -helm install -f values.yaml dandydev/redis-ha -``` - -> **Tip**: You can use the default [values.yaml](values.yaml) - -## Custom Redis and Sentinel config options - -This chart allows for most redis or sentinel config options to be passed as a key value pair through the `values.yaml` under `redis.config` and `sentinel.config`. See links below for all available options. - -[Example redis.conf](http://download.redis.io/redis-stable/redis.conf) -[Example sentinel.conf](http://download.redis.io/redis-stable/sentinel.conf) - -For example `repl-timeout 60` would be added to the `redis.config` section of the `values.yaml` as: - -```yml - repl-timeout: "60" -``` - -Note: - -1. Some config options should be renamed by redis version，e.g.: - - ```yml - # In redis 5.x，see https://raw.githubusercontent.com/antirez/redis/5.0/redis.conf - min-replicas-to-write: 1 - min-replicas-max-lag: 5 - - # In redis 4.x and redis 3.x，see https://raw.githubusercontent.com/antirez/redis/4.0/redis.conf and https://raw.githubusercontent.com/antirez/redis/3.0/redis.conf - min-slaves-to-write 1 - min-slaves-max-lag 5 - ``` - -Sentinel options supported must be in the the `sentinel

    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 -- bash + +In order to replicate the container startup scripts execute this command: + +For Redis: + + /opt/bitnami/scripts/redis/entrypoint.sh /opt/bitnami/scripts/redis/run.sh + +{{- if .Values.sentinel.enabled }} + +For Redis Sentinel: + + /opt/bitnami/scripts/redis-sentinel/entrypoint.sh /opt/bitnami/scripts/redis-sentinel/run.sh + +{{- end }} +{{- else }} + +{{- if contains .Values.master.service.type "LoadBalancer" }} +{{- if not .Values.auth.enabled }} +{{ if and (not .Values.networkPolicy.enabled) (.Values.networkPolicy.allowExternal) }} + +------------------------------------------------------------------------------- + WARNING + + By specifying "master.service.type=LoadBalancer" and "auth.enabled=false" you have + most likely exposed the Redis® service externally without any authentication + mechanism. + + For security reasons, we strongly suggest that you switch to "ClusterIP" or + "NodePort". As alternative, you can also switch to "auth.enabled=true" + providing a valid password on "password" parameter. + +------------------------------------------------------------------------------- +{{- end }} +{{- end }} +{{- end }} + +{{- if eq .Values.architecture "replication" }} +{{- if .Values.sentinel.enabled }} + +Redis® can be accessed via port {{ .Values.sentinel.service.ports.redis }} on the following DNS name from within your cluster: + + {{ template "common.names.fullname" . }}.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }} for read only operations + +For read/write operations, first access the Redis® Sentinel cluster, which is available in port {{ .Values.sentinel.service.ports.sentinel }} using the same domain name above. + +{{- else }} + +Redis® can be accessed on the following DNS names from within your cluster: + + {{ printf "%s-master.%s.svc.%s" (include "common.names.fullname" .) .Release.Namespace .Values.clusterDomain }} for read/write operations (port {{ .Values.master.service.ports.redis }}) + {{ printf "%s-replicas.%s.svc.%s" (include "common.names.fullname" .) .Release.Namespace .Values.clusterDomain }} for read-only operations (port {{ .Values.replica.service.ports.redis }}) + +{{- end }} +{{- else }} + +Redis® can be accessed via port {{ .Values.master.service.ports.redis }} on the following DNS name from within your cluster: + + {{ template "common.names.fullname" . }}-master.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }} + +{{- end }} + +{{ if .Values.auth.enabled }} + +To get your password run: + + export REDIS_PASSWORD=$(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "redis.secretName" . }} -o jsonpath="{.data.redis-password}" | base64 -d) + +{{- end }} + +To connect to your Redis® server: + +1. Run a Redis® pod that you can use as a client: + + kubectl run --namespace {{ .Release.Namespace }} redis-client --restart='Never' {{ if .Values.auth.enabled }} --env REDIS_PASSWORD=$REDIS_PASSWORD {{ end }} --image {{ template "redis.image" . }} --command -- sleep infinity + +{{- if .Values.tls.enabled }} + + Copy your TLS certificates to the pod: + + kubectl cp --namespace {{ .Release.Namespace }} /path/to/client.cert redis-client:/tmp/client.cert + kubectl cp --namespace {{ .Release.Namespace }} /path/to/client.key redis-client:/tmp/client.key + kubectl cp --namespace {{ .Release.Namespace }} /path/to/CA.cert redis-client:/tmp/CA.cert + +{{- end }} + + Use the following command to attach to the pod: + + kubectl exec --tty -i redis-client \ + {{- if and (.Values.networkPolicy.enabled) (not .Values.networkPolicy.allowExternal) }}--labels="{{ template "common.names.fullname" . }}-client=true" \{{- end }} + --namespace {{ .Release.Namespace }} -- bash + +2. Connect using the Redis® CLI: + +{{- if eq .Values.architecture "replication" }} + {{- if .Values.sentinel.enabled }} + {{ if .Values.auth.enabled }}REDISCLI_AUTH="$REDIS_PASSWORD" {{ end }}redis-cli -h {{ template "common.names.fullname" . }} -p {{ .Values.sentinel.service.ports.redis }}{{ if .Values.tls.enabled }} --tls --cert /tmp/client.cert --key /tmp/client.key --cacert /tmp/CA.cert{{ end }} # Read only operations + {{ if .Values.auth.enabled }}REDISCLI_AUTH="$REDIS_PASSWORD" {{ end }}redis-cli -h {{ template "common.names.fullname" . }} -p {{ .Values.sentinel.service.ports.sentinel }}{{ if .Values.tls.enabled }} --tls --cert /tmp/client.cert --key /tmp/client.key --cacert /tmp/CA.cert{{ end }} # Sentinel access + {{- else }} + {{ if .Values.auth.enabled }}REDISCLI_AUTH="$REDIS_PASSWORD" {{ end }}redis-cli -h {{ printf "%s-master" (include "common.names.fullname" .) }}{{ if .Values.tls.enabled }} --tls --cert /tmp/client.cert --key /tmp/client.key --cacert /tmp/CA.cert{{ end }} + {{ if .Values.auth.enabled }}REDISCLI_AUTH="$REDIS_PASSWORD" {{ end }}redis-cli -h {{ printf "%s-replicas" (include "common.names.fullname" .) }}{{ if .Values.tls.enabled }} --tls --cert /tmp/client.cert --key /tmp/client.key --cacert /tmp/CA.cert{{ end }} + {{- end }} +{{- else }} + {{ if .Values.auth.enabled }}REDISCLI_AUTH="$REDIS_PASSWORD" {{ end }}redis-cli -h {{ template "common.names.fullname" . }}-master{{ if .Values.tls.enabled }} --tls --cert /tmp/client.cert --key /tmp/client.key --cacert /tmp/CA.cert{{ end }} +{{- end }} + +{{- if and (.Values.networkPolicy.enabled) (not .Values.networkPolicy.allowExternal) }} + +Note: Since NetworkPolicy is enabled, only pods with label {{ template "common.names.fullname" . }}-client=true" will be able to connect to redis. + +{{- else }} + +To connect to your database from outside the cluster execute the following commands: + +{{- if and (eq .Values.architecture "replication") .Values.sentinel.enabled }} +{{- if contains "NodePort" .Values.sentinel.service.type }} + + export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}") + export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "common.names.fullname" . }}) + {{ if .Values.auth.enabled }}REDISCLI_AUTH="$REDIS_PASSWORD" {{ end }}redis-cli -h $NODE_IP -p $NODE_PORT {{- if .Values.tls.enabled }} --tls --cert /tmp/client.cert --key /tmp/client.key --cacert /tmp/CA.cert{{ end }} + +{{- else if contains "LoadBalancer" .Values.sentinel.service.type }} + + NOTE: It may take a few minutes for the LoadBalancer IP to be available. + Watch the status with: 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "common.names.fullname" . }}' + + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "common.names.fullname" . }} --template "{{ "{{ range (index .status.loadBalancer.ingress 0) }}{{ . }}{{ end }}" }}") + {{ if .Values.auth.enabled }}REDISCLI_AUTH="$REDIS_PASSWORD" {{ end }}redis-cli -h $SERVICE_IP -p {{ .Values.sentinel.service.ports.redis }} {{- if .Values.tls.enabled }} --tls --cert /tmp/client.cert --key /tmp/client.key --cacert /tmp/CA.cert{{ end }} + +{{- else if contains "ClusterIP" .Values.sentinel.service.type }} + + kubectl port-forward --namespace {{ .Release.Namespace }} svc/{{ template "common.names.fullname" . }} {{ .Values.sentinel.service.ports.redis }}:{{ .Values.sentinel.service.ports.redis }} & + {{ if .Values.auth.enabled }}REDISCLI_AUTH="$REDIS_PASSWORD" {{ end }}redis-cli -h 127.0.0.1 -p {{ .Values.sentinel.service.ports.redis }} {{- if .Values.tls.enabled }} --tls --cert /tmp/client.cert --key /tmp/client.key --cacert /tmp/CA.cert{{ end }} + +{{- end }} +{{- else }} +{{- if contains "NodePort" .Values.master.service.type }} + + export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}") + export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ printf "%s-master" (include "common.names.fullname" .) }}) + {{ if .Values.auth.enabled }}REDISCLI_AUTH="$REDIS_PASSWORD" {{ end }}redis-cli -h $NODE_IP -p $NODE_PORT {{- if .Values.tls.enabled }} --tls --cert /tmp/client.cert --key /tmp/client.key --cacert /tmp/CA.cert{{ end }} + +{{- else if contains "LoadBalancer" .Values.master.service.type }} + + NOTE: It may take a few minutes for the LoadBalancer IP to be available. + Watch the status with: 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "common.names.fullname" . }}' + + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ printf "%s-master" (include "common.names.fullname" .) }} --template "{{ "{{ range (index .status.loadBalancer.ingress 0) }}{{ . }}{{ end }}" }}") + {{ if .Values.auth.enabled }}REDISCLI_AUTH="$REDIS_PASSWORD" {{ end }}redis-cli -h $SERVICE_IP -p {{ .Values.master.service.ports.redis }} {{- if .Values.tls.enabled }} --tls --cert /tmp/client.cert --key /tmp/client.key --cacert /tmp/CA.cert{{ end }} + +{{- else if contains "ClusterIP" .Values.master.service.type }} + + kubectl port-forward --namespace {{ .Release.Namespace }} svc/{{ printf "%s-master" (include "common.names.fullname" .) }} {{ .Values.master.service.ports.redis }}:{{ .Values.master.service.ports.redis }} & + {{ if .Values.auth.enabled }}REDISCLI_AUTH="$REDIS_PASSWORD" {{ end }}redis-cli -h 127.0.0.1 -p {{ .Values.master.service.ports.redis }} {{- if .Values.tls.enabled }} --tls --cert /tmp/client.cert --key /tmp/client.key --cacert /tmp/CA.cert{{ end }} + +{{- end }} +{{- end }} + +{{- end }} +{{- end }} +{{- include "redis.checkRollingTags" . }} +{{- include "common.warnings.rollingTag" .Values.volumePermissions.image }} +{{- include "common.warnings.rollingTag" .Values.sysctl.image }} +{{- include "redis.validateValues" . }} + +{{- if and (eq .Values.architecture "replication") .Values.sentinel.enabled (eq .Values.sentinel.service.type "NodePort") (not .Release.IsUpgrade ) }} +{{- if $.Values.sentinel.service.nodePorts.sentinel }} +No need to upgrade, ports and nodeports have been set from values +{{- else }} +#!#!#!#!#!#!#!# IMPORTANT #!#!#!#!#!#!#!# +YOU NEED TO PERFORM AN UPGRADE FOR THE SERVICES AND WORKLOAD TO BE CREATED +{{- end }} +{{- end }} diff --git a/redis-fetcher/templates/_helpers.tpl b/redis-fetcher/templates/_helpers.tpl new file mode 100644 index 00000000..90064e80 --- /dev/null +++ b/redis-fetcher/templates/_helpers.tpl @@ -0,0 +1,321 @@ +{{/* vim: set filetype=mustache: */}} + +{{/* +Return the proper Redis image name +*/}} +{{- define "redis.image" -}} +{{ include "common.images.image" (dict "imageRoot" .Values.image "global" .Values.global) }} +{{- end -}} + +{{/* +Return the proper Redis Sentinel image name +*/}} +{{- define "redis.sentinel.image" -}} +{{ include "common.images.image" (dict "imageRoot" .Values.sentinel.image "global" .Values.global) }} +{{- end -}} + +{{/* +Return the proper image name (for the metrics image) +*/}} +{{- define "redis.metrics.image" -}} +{{ include "common.images.image" (dict "imageRoot" .Values.metrics.image "global" .Values.global) }} +{{- end -}} + +{{/* +Return the proper image name (for the init container volume-permissions image) +*/}} +{{- define "redis.volumePermissions.image" -}} +{{ include "common.images.image" (dict "imageRoot" .Values.volumePermissions.image "global" .Values.global) }} +{{- end -}} + +{{/* +Return sysctl image +*/}} +{{- define "redis.sysctl.image" -}} +{{ include "common.images.image" (dict "imageRoot" .Values.sysctl.image "global" .Values.global) }} +{{- end -}} + +{{/* +Return the proper Docker Image Registry Secret Names +*/}} +{{- define "redis.imagePullSecrets" -}} +{{- include "common.images.pullSecrets" (dict "images" (list .Values.image .Values.sentinel.image .Values.metrics.image .Values.volumePermissions.image .Values.sysctl.image) "global" .Values.global) -}} +{{- end -}} + +{{/* +Return the appropriate apiVersion for networkpolicy. +*/}} +{{- define "networkPolicy.apiVersion" -}} +{{- if semverCompare ">=1.4-0, <1.7-0" .Capabilities.KubeVersion.GitVersion -}} +{{- print "extensions/v1beta1" -}} +{{- else -}} +{{- print "networking.k8s.io/v1" -}} +{{- end -}} +{{- end -}} + +{{/* +Return the appropriate apiGroup for PodSecurityPolicy. +*/}} +{{- define "podSecurityPolicy.apiGroup" -}} +{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- print "policy" -}} +{{- else -}} +{{- print "extensions" -}} +{{- end -}} +{{- end -}} + +{{/* +Return true if a TLS secret object should be created +*/}} +{{- define "redis.createTlsSecret" -}} +{{- if and .Values.tls.enabled .Values.tls.autoGenerated (and (not .Values.tls.existingSecret) (not .Values.tls.certificatesSecret)) }} + {{- true -}} +{{- end -}} +{{- end -}} + +{{/* +Return the secret containing Redis TLS certificates +*/}} +{{- define "redis.tlsSecretName" -}} +{{- $secretName := coalesce .Values.tls.existingSecret .Values.tls.certificatesSecret -}} +{{- if $secretName -}} + {{- printf "%s" (tpl $secretName $) -}} +{{- else -}} + {{- printf "%s-crt" (include "common.names.fullname" .) -}} +{{- end -}} +{{- end -}} + +{{/* +Return the path to the cert file. +*/}} +{{- define "redis.tlsCert" -}} +{{- if (include "redis.createTlsSecret" . ) -}} + {{- printf "/opt/bitnami/redis/certs/%s" "tls.crt" -}} +{{- else -}} + {{- required "Certificate filename is required when TLS in enabled" .Values.tls.certFilename | printf "/opt/bitnami/redis/certs/%s" -}} +{{- end -}} +{{- end -}} + +{{/* +Return the path to the cert key file. +*/}} +{{- define "redis.tlsCertKey" -}} +{{- if (include "redis.createTlsSecret" . ) -}} + {{- printf "/opt/bitnami/redis/certs/%s" "tls.key" -}} +{{- else -}} + {{- required "Certificate Key filename is required when TLS in enabled" .Values.tls.certKeyFilename | printf "/opt/bitnami/redis/certs/%s" -}} +{{- end -}} +{{- end -}} + +{{/* +Return the path to the CA cert file. +*/}} +{{- define "redis.tlsCACert" -}} +{{- if (include "redis.createTlsSecret" . ) -}} + {{- printf "/opt/bitnami/redis/certs/%s" "ca.crt" -}} +{{- else -}} + {{- required "Certificate CA filename is required when TLS in enabled" .Values.tls.certCAFilename | printf "/opt/bitnami/redis/certs/%s" -}} +{{- end -}} +{{- end -}} + +{{/* +Return the path to the DH params file. +*/}} +{{- define "redis.tlsDHParams" -}} +{{- if .Values.tls.dhParamsFilename -}} +{{- printf "/opt/bitnami/redis/certs/%s" .Values.tls.dhParamsFilename -}} +{{- end -}} +{{- end -}} + +{{/* +Create the name of the shared service account to use +*/}} +{{- define "redis.serviceAccountName" -}} +{{- if .Values.serviceAccount.create -}} + {{ default (include "common.names.fullname" .) .Values.serviceAccount.name }} +{{- else -}} + {{ default "default" .Values.serviceAccount.name }} +{{- end -}} +{{- end -}} + +{{/* +Create the name of the master service account to use +*/}} +{{- define "redis.masterServiceAccountName" -}} +{{- if .Values.master.serviceAccount.create -}} + {{ default (printf "%s-master" (include "common.names.fullname" .)) .Values.master.serviceAccount.name }} +{{- else -}} + {{- if .Values.serviceAccount.create -}} + {{ template "redis.serviceAccountName" . }} + {{- else -}} + {{ default "default" .Values.master.serviceAccount.name }} + {{- end -}} +{{- end -}} +{{- end -}} + +{{/* +Create the name of the replicas service account to use +*/}} +{{- define "redis.replicaServiceAccountName" -}} +{{- if .Values.replica.serviceAccount.create -}} + {{ default (printf "%s-replica" (include "common.names.fullname" .)) .Values.replica.serviceAccount.name }} +{{- else -}} + {{- if .Values.serviceAccount.create -}} + {{ template "redis.serviceAccountName" . }} + {{- else -}} + {{ default "default" .Values.replica.serviceAccount.name }} + {{- end -}} +{{- end -}} +{{- end -}} + +{{/* +Return the configuration configmap name +*/}} +{{- define "redis.configmapName" -}} +{{- if .Values.existingConfigmap -}} + {{- printf "%s" (tpl .Values.existingConfigmap $) -}} +{{- else -}} + {{- printf "%s-configuration" (include "common.names.fullname" .) -}} +{{- end -}} +{{- end -}} + +{{/* +Return true if a configmap object should be created +*/}} +{{- define "redis.createConfigmap" -}} +{{- if empty .Values.existingConfigmap }} + {{- true -}} +{{- end -}} +{{- end -}} + +{{/* +Get the password secret. +*/}} +{{- define "redis.secretName" -}} +{{- if .Values.auth.existingSecret -}} +{{- printf "%s" (tpl .Values.auth.existingSecret $) -}} +{{- else -}} +{{- printf "%s" (include "common.names.fullname" .) -}} +{{- end -}} +{{- end -}} + +{{/* +Get the password key to be retrieved from Redis® secret. +*/}} +{{- define "redis.secretPasswordKey" -}} +{{- if and .Values.auth.existingSecret .Values.auth.existingSecretPasswordKey -}} +{{- printf "%s" .Values.auth.existingSecretPasswordKey -}} +{{- else -}} +{{- printf "redis-password" -}} +{{- end -}} +{{- end -}} + + +{{/* +Returns the available value for certain key in an existing secret (if it exists), +otherwise it generates a random value. +*/}} +{{- define "getValueFromSecret" }} + {{- $len := (default 16 .Length) | int -}} + {{- $obj := (lookup "v1" "Secret" .Namespace .Name).data -}} + {{- if $obj }} + {{- index $obj .Key | b64dec -}} + {{- else -}} + {{- randAlphaNum $len -}} + {{- end -}} +{{- end }} + +{{/* +Return Redis® password +*/}} +{{- define "redis.password" -}} +{{- if not (empty .Values.global.redis.password) }} + {{- .Values.global.redis.password -}} +{{- else if not (empty .Values.auth.password) -}} + {{- .Values.auth.password -}} +{{- else -}} + {{- include "getValueFromSecret" (dict "Namespace" .Release.Namespace "Name" (include "common.names.fullname" .) "Length" 10 "Key" "redis-password") -}} +{{- end -}} +{{- end -}} + +{{/* Check if there are rolling tags in the images */}} +{{- define "redis.checkRollingTags" -}} +{{- include "common.warnings.rollingTag" .Values.image }} +{{- include "common.warnings.rollingTag" .Values.sentinel.image }} +{{- include "common.warnings.rollingTag" .Values.metrics.image }} +{{- end -}} + +{{/* +Compile all warnings into a single message, and call fail. +*/}} +{{- define "redis.validateValues" -}} +{{- $messages := list -}} +{{- $messages := append $messages (include "redis.validateValues.topologySpreadConstraints" .) -}} +{{- $messages := append $messages (include "redis.validateValues.architecture" .) -}} +{{- $messages := append $messages (include "redis.validateValues.podSecurityPolicy.create" .) -}} +{{- $messages := append $messages (include "redis.validateValues.tls" .) -}} +{{- $messages := without $messages "" -}} +{{- $message := join "\n" $messages -}} + +{{- if $message -}} +{{- printf "\nVALUES VALIDATION:\n%s" $message | fail -}} +{{- end -}} +{{- end -}} + +{{/* Validate values of Redis® - spreadConstrainsts K8s version */}} +{{- define "redis.validateValues.topologySpreadConstraints" -}} +{{- if and (semverCompare "<1.16-0" .Capabilities.KubeVersion.GitVersion) .Values.replica.topologySpreadConstraints -}} +redis: topologySpreadConstraints + Pod Topology Spread Constraints are only available on K8s >= 1.16 + Find more information at https://kubernetes.io/docs/concepts/workloads/pods/pod-topology-spread-constraints/ +{{- end -}} +{{- end -}} + +{{/* Validate values of Redis® - must provide a valid architecture */}} +{{- define "redis.validateValues.architecture" -}} +{{- if and (ne .Values.architecture "standalone") (ne .Values.architecture "replication") -}} +redis: architecture + Invalid architecture selected. Valid values are "standalone" and + "replication". Please set a valid architecture (--set architecture="xxxx") +{{- end -}} +{{- if and .Values.sentinel.enabled (not (eq .Values.architecture "replication")) }} +redis: architecture + Using redis sentinel on standalone mode is not supported. + To deploy redis sentinel, please select the "replication" mode + (--set "architecture=replication,sentinel.enabled=true") +{{- end -}} +{{- end -}} + +{{/* Validate values of Redis® - PodSecurityPolicy create */}} +{{- define "redis.validateValues.podSecurityPolicy.create" -}} +{{- if and .Values.podSecurityPolicy.create (not .Values.podSecurityPolicy.enabled) }} +redis: podSecurityPolicy.create + In order to create PodSecurityPolicy, you also need to enable + podSecurityPolicy.enabled field +{{- end -}} +{{- end -}} + +{{/* Validate values of Redis® - TLS enabled */}} +{{- define "redis.validateValues.tls" -}} +{{- if and .Values.tls.enabled (not .Values.tls.autoGenerated) (not .Values.tls.existingSecret) (not .Values.tls.certificatesSecret) }} +redis: tls.enabled + In order to enable TLS, you also need to provide + an existing secret containing the TLS certificates or + enable auto-generated certificates. +{{- end -}} +{{- end -}} + +{{/* Define the suffix utilized for external-dns */}} +{{- define "redis.externalDNS.suffix" -}} +{{ printf "%s.%s" (include "common.names.fullname" .) .Values.useExternalDNS.suffix }} +{{- end -}} + +{{/* Compile all annotations utilized for external-dns */}} +{{- define "redis.externalDNS.annotations" -}} +{{- if and .Values.useExternalDNS.enabled .Values.useExternalDNS.annotationKey }} +{{ .Values.useExternalDNS.annotationKey }}hostname: {{ include "redis.externalDNS.suffix" . }} +{{- range $key, $val := .Values.useExternalDNS.additionalAnnotations }} +{{ $.Values.useExternalDNS.annotationKey }}{{ $key }}: {{ $val | quote }} +{{- end }} +{{- end }} +{{- end }} diff --git a/redis-fetcher/templates/configmap.yaml b/redis-fetcher/templates/configmap.yaml new file mode 100644 index 00000000..9e70a387 --- /dev/null +++ b/redis-fetcher/templates/configmap.yaml @@ -0,0 +1,59 @@ +{{- if (include "redis.createConfigmap" .) }} +apiVersion: v1 +kind: ConfigMap +metadata: + name: {{ printf "%s-configuration" (include "common.names.fullname" .) }} + namespace: {{ .Release.Namespace | quote }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} +data: + redis.conf: |- + # User-supplied common configuration: + {{- if .Values.commonConfiguration }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonConfiguration "context" $ ) | nindent 4 }} + {{- end }} + # End of common configuration + master.conf: |- + dir {{ .Values.master.persistence.path }} + # User-supplied master configuration: + {{- if .Values.master.configuration }} + {{- include "common.tplvalues.render" ( dict "value" .Values.master.configuration "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.master.disableCommands }} + {{- range .Values.master.disableCommands }} + rename-command {{ . }} "" + {{- end }} + {{- end }} + # End of master configuration + replica.conf: |- + dir {{ .Values.replica.persistence.path }} + # User-supplied replica configuration: + {{- if .Values.replica.configuration }} + {{- include "common.tplvalues.render" ( dict "value" .Values.replica.configuration "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.replica.disableCommands }} + {{- range .Values.replica.disableCommands }} + rename-command {{ . }} "" + {{- end }} + {{- end }} + # End of replica configuration + {{- if .Values.sentinel.enabled }} + sentinel.conf: |- + dir "/tmp" + port {{ .Values.sentinel.containerPorts.sentinel }} + sentinel monitor {{ .Values.sentinel.masterSet }} {{ template "common.names.fullname" . }}-node-0.{{ template "common.names.fullname" . }}-headless.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }} {{ .Values.sentinel.service.ports.redis }} {{ .Values.sentinel.quorum }} + sentinel down-after-milliseconds {{ .Values.sentinel.masterSet }} {{ .Values.sentinel.downAfterMilliseconds }} + sentinel failover-timeout {{ .Values.sentinel.masterSet }} {{ .Values.sentinel.failoverTimeout }} + sentinel parallel-syncs {{ .Values.sentinel.masterSet }} {{ .Values.sentinel.parallelSyncs }} + # User-supplied sentinel configuration: + {{- if .Values.sentinel.configuration }} + {{- include "common.tplvalues.render" ( dict "value" .Values.sentinel.configuration "context" $ ) | nindent 4 }} + {{- end }} + # End of sentinel configuration + {{- end }} +{{- end }} diff --git a/redis-fetcher/templates/extra-list.yaml b/redis-fetcher/templates/extra-list.yaml new file mode 100644 index 00000000..9ac65f9e --- /dev/null +++ b/redis-fetcher/templates/extra-list.yaml @@ -0,0 +1,4 @@ +{{- range .Values.extraDeploy }} +--- +{{ include "common.tplvalues.render" (dict "value" . "context" $) }} +{{- end }} diff --git a/redis-fetcher/templates/headless-svc.yaml b/redis-fetcher/templates/headless-svc.yaml new file mode 100644 index 00000000..d798a0b5 --- /dev/null +++ b/redis-fetcher/templates/headless-svc.yaml @@ -0,0 +1,30 @@ +apiVersion: v1 +kind: Service +metadata: + name: {{ printf "%s-headless" (include "common.names.fullname" .) }} + namespace: {{ .Release.Namespace | quote }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + annotations: + {{- if .Values.commonAnnotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} + {{- include "redis.externalDNS.annotations" . | nindent 4 }} +spec: + type: ClusterIP + clusterIP: None + {{- if .Values.sentinel.enabled }} + publishNotReadyAddresses: true + {{- end }} + ports: + - name: tcp-redis + port: {{ if .Values.sentinel.enabled }}{{ .Values.sentinel.service.ports.redis }}{{ else }}{{ .Values.master.service.ports.redis }}{{ end }} + targetPort: redis + {{- if .Values.sentinel.enabled }} + - name: tcp-sentinel + port: {{ .Values.sentinel.service.ports.sentinel }} + targetPort: redis-sentinel + {{- end }} + selector: {{- include "common.labels.matchLabels" . | nindent 4 }} diff --git a/redis-fetcher/templates/health-configmap.yaml b/redis-fetcher/templates/health-configmap.yaml new file mode 100644 index 00000000..41f3145d --- /dev/null +++ b/redis-fetcher/templates/health-configmap.yaml @@ -0,0 +1,192 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: {{ printf "%s-health" (include "common.names.fullname" .) }} + namespace: {{ .Release.Namespace | quote }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} +data: + ping_readiness_local.sh: |- + #!/bin/bash + + [[ -f $REDIS_PASSWORD_FILE ]] && export REDIS_PASSWORD="$(< "${REDIS_PASSWORD_FILE}")" + [[ -n "$REDIS_PASSWORD" ]] && export REDISCLI_AUTH="$REDIS_PASSWORD" + response=$( + timeout -s 3 $1 \ + redis-cli \ + -h localhost \ +{{- if .Values.tls.enabled }} + -p $REDIS_TLS_PORT \ + --tls \ + --cacert {{ template "redis.tlsCACert" . }} \ + {{- if .Values.tls.authClients }} + --cert {{ template "redis.tlsCert" . }} \ + --key {{ template "redis.tlsCertKey" . }} \ + {{- end }} +{{- else }} + -p $REDIS_PORT \ +{{- end }} + ping + ) + if [ "$?" -eq "124" ]; then + echo "Timed out" + exit 1 + fi + if [ "$response" != "PONG" ]; then + echo "$response" + exit 1 + fi + ping_liveness_local.sh: |- + #!/bin/bash + + [[ -f $REDIS_PASSWORD_FILE ]] && export REDIS_PASSWORD="$(< "${REDIS_PASSWORD_FILE}")" + [[ -n "$REDIS_PASSWORD" ]] && export REDISCLI_AUTH="$REDIS_PASSWORD" + response=$( + timeout -s 3 $1 \ + redis-cli \ + -h localhost \ +{{- if .Values.tls.enabled }} + -p $REDIS_TLS_PORT \ + --tls \ + --cacert {{ template "redis.tlsCACert" . }} \ + {{- if .Values.tls.authClients }} + --cert {{ template "redis.tlsCert" . }} \ + --key {{ template "redis.tlsCertKey" . }} \ + {{- end }} +{{- else }} + -p $REDIS_PORT \ +{{- end }} + ping + ) + if [ "$?" -eq "124" ]; then + echo "Timed out" + exit 1 + fi + responseFirstWord=$(echo $response | head -n1 | awk '{print $1;}') + if [ "$response" != "PONG" ] && [ "$responseFirstWord" != "LOADING" ] && [ "$responseFirstWord" != "MASTERDOWN" ]; then + echo "$response" + exit 1 + fi +{{- if .Values.sentinel.enabled }} + ping_sentinel.sh: |- + #!/bin/bash + +{{- if .Values.auth.sentinel }} + [[ -f $REDIS_PASSWORD_FILE ]] && export REDIS_PASSWORD="$(< "${REDIS_PASSWORD_FILE}")" + [[ -n "$REDIS_PASSWORD" ]] && export REDISCLI_AUTH="$REDIS_PASSWORD" +{{- end }} + response=$( + timeout -s 3 $1 \ + redis-cli \ + -h localhost \ +{{- if .Values.tls.enabled }} + -p $REDIS_SENTINEL_TLS_PORT_NUMBER \ + --tls \ + --cacert "$REDIS_SENTINEL_TLS_CA_FILE" \ + {{- if .Values.tls.authClients }} + --cert "$REDIS_SENTINEL_TLS_CERT_FILE" \ + --key "$REDIS_SENTINEL_TLS_KEY_FILE" \ + {{- end }} +{{- else }} + -p $REDIS_SENTINEL_PORT \ +{{- end }} + ping + ) + if [ "$?" -eq "124" ]; then + echo "Timed out" + exit 1 + fi + if [ "$response" != "PONG" ]; then + echo "$response" + exit 1 + fi + parse_sentinels.awk: |- + /ip/ {FOUND_IP=1} + /port/ {FOUND_PORT=1} + /runid/ {FOUND_RUNID=1} + !/ip|port|runid/ { + if (FOUND_IP==1) { + IP=$1; FOUND_IP=0; + } + else if (FOUND_PORT==1) { + PORT=$1; + FOUND_PORT=0; + } else if (FOUND_RUNID==1) { + printf "\nsentinel known-sentinel {{ .Values.sentinel.masterSet }} %s %s %s", IP, PORT, $0; FOUND_RUNID=0; + } + } +{{- end }} + ping_readiness_master.sh: |- + #!/bin/bash + + [[ -f $REDIS_MASTER_PASSWORD_FILE ]] && export REDIS_MASTER_PASSWORD="$(< "${REDIS_MASTER_PASSWORD_FILE}")" + [[ -n "$REDIS_MASTER_PASSWORD" ]] && export REDISCLI_AUTH="$REDIS_MASTER_PASSWORD" + response=$( + timeout -s 3 $1 \ + redis-cli \ + -h $REDIS_MASTER_HOST \ + -p $REDIS_MASTER_PORT_NUMBER \ +{{- if .Values.tls.enabled }} + --tls \ + --cacert {{ template "redis.tlsCACert" . }} \ + {{- if .Values.tls.authClients }} + --cert {{ template "redis.tlsCert" . }} \ + --key {{ template "redis.tlsCertKey" . }} \ + {{- end }} +{{- end }} + ping + ) + if [ "$?" -eq "124" ]; then + echo "Timed out" + exit 1 + fi + if [ "$response" != "PONG" ]; then + echo "$response" + exit 1 + fi + ping_liveness_master.sh: |- + #!/bin/bash + + [[ -f $REDIS_MASTER_PASSWORD_FILE ]] && export REDIS_MASTER_PASSWORD="$(< "${REDIS_MASTER_PASSWORD_FILE}")" + [[ -n "$REDIS_MASTER_PASSWORD" ]] && export REDISCLI_AUTH="$REDIS_MASTER_PASSWORD" + response=$( + timeout -s 3 $1 \ + redis-cli \ + -h $REDIS_MASTER_HOST \ + -p $REDIS_MASTER_PORT_NUMBER \ +{{- if .Values.tls.enabled }} + --tls \ + --cacert {{ template "redis.tlsCACert" . }} \ + {{- if .Values.tls.authClients }} + --cert {{ template "redis.tlsCert" . }} \ + --key {{ template "redis.tlsCertKey" . }} \ + {{- end }} +{{- end }} + ping + ) + if [ "$?" -eq "124" ]; then + echo "Timed out" + exit 1 + fi + responseFirstWord=$(echo $response | head -n1 | awk '{print $1;}') + if [ "$response" != "PONG" ] && [ "$responseFirstWord" != "LOADING" ]; then + echo "$response" + exit 1 + fi + ping_readiness_local_and_master.sh: |- + script_dir="$(dirname "$0")" + exit_status=0 + "$script_dir/ping_readiness_local.sh" $1 || exit_status=$? + "$script_dir/ping_readiness_master.sh" $1 || exit_status=$? + exit $exit_status + ping_liveness_local_and_master.sh: |- + script_dir="$(dirname "$0")" + exit_status=0 + "$script_dir/ping_liveness_local.sh" $1 || exit_status=$? + "$script_dir/ping_liveness_master.sh" $1 || exit_status=$? + exit $exit_status diff --git a/redis-fetcher/templates/master/application.yaml b/redis-fetcher/templates/master/application.yaml new file mode 100644 index 00000000..acff2e25 --- /dev/null +++ b/redis-fetcher/templates/master/application.yaml @@ -0,0 +1,516 @@ +{{- if or (not (eq .Values.architecture "replication")) (not .Values.sentinel.enabled) }} +apiVersion: {{ include "common.capabilities.statefulset.apiVersion" . }} +kind: {{ .Values.master.kind }} +metadata: + name: {{ printf "%s-master" (include "common.names.fullname" .) }} + namespace: {{ .Release.Namespace | quote }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + app.kubernetes.io/component: master + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} +spec: + replicas: {{ .Values.master.count }} + selector: + matchLabels: {{- include "common.labels.matchLabels" . | nindent 6 }} + app.kubernetes.io/component: master + {{- if (eq .Values.master.kind "StatefulSet") }} + serviceName: {{ printf "%s-headless" (include "common.names.fullname" .) }} + {{- end }} + {{- if .Values.master.updateStrategy }} + {{- if (eq .Values.master.kind "Deployment") }} + strategy: {{- toYaml .Values.master.updateStrategy | nindent 4 }} + {{- else }} + updateStrategy: {{- toYaml .Values.master.updateStrategy | nindent 4 }} + {{- end }} + {{- if and .Values.master.minReadySeconds (semverCompare ">= 1.25" (include "common.capabilities.kubeVersion" .)) }} + minReadySeconds: {{ .Values.master.minReadySeconds }} + {{- end }} + {{- end }} + template: + metadata: + labels: {{- include "common.labels.standard" . | nindent 8 }} + app.kubernetes.io/component: master + {{- if .Values.master.podLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.master.podLabels "context" $ ) | nindent 8 }} + {{- end }} + {{- if and .Values.metrics.enabled .Values.metrics.podLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.metrics.podLabels "context" $ ) | nindent 8 }} + {{- end }} + annotations: + {{- if (include "redis.createConfigmap" .) }} + checksum/configmap: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }} + {{- end }} + checksum/health: {{ include (print $.Template.BasePath "/health-configmap.yaml") . | sha256sum }} + checksum/scripts: {{ include (print $.Template.BasePath "/scripts-configmap.yaml") . | sha256sum }} + checksum/secret: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }} + {{- if .Values.master.podAnnotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.master.podAnnotations "context" $ ) | nindent 8 }} + {{- end }} + {{- if and .Values.metrics.enabled .Values.metrics.podAnnotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.metrics.podAnnotations "context" $ ) | nindent 8 }} + {{- end }} + spec: + {{- include "redis.imagePullSecrets" . | nindent 6 }} + {{- if .Values.master.hostAliases }} + hostAliases: {{- include "common.tplvalues.render" (dict "value" .Values.master.hostAliases "context" $) | nindent 8 }} + {{- end }} + {{- if .Values.master.podSecurityContext.enabled }} + securityContext: {{- omit .Values.master.podSecurityContext "enabled" | toYaml | nindent 8 }} + {{- end }} + serviceAccountName: {{ template "redis.masterServiceAccountName" . }} + {{- if .Values.master.priorityClassName }} + priorityClassName: {{ .Values.master.priorityClassName | quote }} + {{- end }} + {{- if .Values.master.affinity }} + affinity: {{- include "common.tplvalues.render" (dict "value" .Values.master.affinity "context" $) | nindent 8 }} + {{- else }} + affinity: + podAffinity: {{- include "common.affinities.pods" (dict "type" .Values.master.podAffinityPreset "component" "master" "context" $) | nindent 10 }} + podAntiAffinity: {{- include "common.affinities.pods" (dict "type" .Values.master.podAntiAffinityPreset "component" "master" "context" $) | nindent 10 }} + nodeAffinity: {{- include "common.affinities.nodes" (dict "type" .Values.master.nodeAffinityPreset.type "key" .Values.master.nodeAffinityPreset.key "values" .Values.master.nodeAffinityPreset.values) | nindent 10 }} + {{- end }} + {{- if .Values.master.nodeSelector }} + nodeSelector: {{- include "common.tplvalues.render" (dict "value" .Values.master.nodeSelector "context" $) | nindent 8 }} + {{- end }} + {{- if .Values.master.tolerations }} + tolerations: {{- include "common.tplvalues.render" (dict "value" .Values.master.tolerations "context" $) | nindent 8 }} + {{- end }} + {{- if .Values.master.topologySpreadConstraints }} + topologySpreadConstraints: {{- include "common.tplvalues.render" (dict "value" .Values.master.topologySpreadConstraints "context" $) | nindent 8 }} + {{- end }} + {{- if .Values.master.shareProcessNamespace }} + shareProcessNamespace: {{ .Values.master.shareProcessNamespace }} + {{- end }} + {{- if .Values.master.schedulerName }} + schedulerName: {{ .Values.master.schedulerName | quote }} + {{- end }} + {{- if .Values.master.dnsPolicy }} + dnsPolicy: {{ .Values.master.dnsPolicy }} + {{- end }} + {{- if .Values.master.dnsConfig }} + dnsConfig: {{- include "common.tplvalues.render" (dict "value" .Values.master.dnsConfig "context" $) | nindent 8 }} + {{- end }} + terminationGracePeriodSeconds: {{ .Values.master.terminationGracePeriodSeconds }} + containers: + - name: redis + image: {{ template "redis.image" . }} + imagePullPolicy: {{ .Values.image.pullPolicy | quote }} + {{- if .Values.master.lifecycleHooks }} + lifecycle: {{- include "common.tplvalues.render" (dict "value" .Values.master.lifecycleHooks "context" $) | nindent 12 }} + {{- end }} + {{- if .Values.master.containerSecurityContext.enabled }} + securityContext: {{- omit .Values.master.containerSecurityContext "enabled" | toYaml | nindent 12 }} + {{- end }} + {{- if .Values.diagnosticMode.enabled }} + command: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.command "context" $) | nindent 12 }} + {{- else if .Values.master.command }} + command: {{- include "common.tplvalues.render" (dict "value" .Values.master.command "context" $) | nindent 12 }} + {{- else }} + command: + - /bin/bash + {{- end }} + {{- if .Values.diagnosticMode.enabled }} + args: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.args "context" $) | nindent 12 }} + {{- else if .Values.master.args }} + args: {{- include "common.tplvalues.render" (dict "value" .Values.master.args "context" $) | nindent 12 }} + {{- else }} + args: + - -c + - /opt/bitnami/scripts/start-scripts/start-master.sh + {{- end }} + env: + - name: BITNAMI_DEBUG + value: {{ ternary "true" "false" (or .Values.image.debug .Values.diagnosticMode.enabled) | quote }} + - name: REDIS_REPLICATION_MODE + value: master + - name: ALLOW_EMPTY_PASSWORD + value: {{ ternary "no" "yes" .Values.auth.enabled | quote }} + {{- if .Values.auth.enabled }} + {{- if .Values.auth.usePasswordFiles }} + - name: REDIS_PASSWORD_FILE + value: "/opt/bitnami/redis/secrets/redis-password" + {{- else }} + - name: REDIS_PASSWORD + valueFrom: + secretKeyRef: + name: {{ template "redis.secretName" . }} + key: {{ template "redis.secretPasswordKey" . }} + {{- end }} + {{- end }} + - name: REDIS_TLS_ENABLED + value: {{ ternary "yes" "no" .Values.tls.enabled | quote }} + {{- if .Values.tls.enabled }} + - name: REDIS_TLS_PORT + value: {{ .Values.master.containerPorts.redis | quote }} + - name: REDIS_TLS_AUTH_CLIENTS + value: {{ ternary "yes" "no" .Values.tls.authClients | quote }} + - name: REDIS_TLS_CERT_FILE + value: {{ template "redis.tlsCert" . }} + - name: REDIS_TLS_KEY_FILE + value: {{ template "redis.tlsCertKey" . }} + - name: REDIS_TLS_CA_FILE + value: {{ template "redis.tlsCACert" . }} + {{- if .Values.tls.dhParamsFilename }} + - name: REDIS_TLS_DH_PARAMS_FILE + value: {{ template "redis.tlsDHParams" . }} + {{- end }} + {{- else }} + - name: REDIS_PORT + value: {{ .Values.master.containerPorts.redis | quote }} + {{- end }} + {{- if .Values.master.extraEnvVars }} + {{- include "common.tplvalues.render" (dict "value" .Values.master.extraEnvVars "context" $) | nindent 12 }} + {{- end }} + {{- if or .Values.master.extraEnvVarsCM .Values.master.extraEnvVarsSecret }} + envFrom: + {{- if .Values.master.extraEnvVarsCM }} + - configMapRef: + name: {{ .Values.master.extraEnvVarsCM }} + {{- end }} + {{- if .Values.master.extraEnvVarsSecret }} + - secretRef: + name: {{ .Values.master.extraEnvVarsSecret }} + {{- end }} + {{- end }} + ports: + - name: redis + containerPort: {{ .Values.master.containerPorts.redis }} + {{- if not .Values.diagnosticMode.enabled }} + {{- if .Values.master.customStartupProbe }} + startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.master.customStartupProbe "context" $) | nindent 12 }} + {{- else if .Values.master.startupProbe.enabled }} + startupProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.master.startupProbe "enabled") "context" $) | nindent 12 }} + tcpSocket: + port: redis + {{- end }} + {{- if .Values.master.customLivenessProbe }} + livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.master.customLivenessProbe "context" $) | nindent 12 }} + {{- else if .Values.master.livenessProbe.enabled }} + livenessProbe: + initialDelaySeconds: {{ .Values.master.livenessProbe.initialDelaySeconds }} + periodSeconds: {{ .Values.master.livenessProbe.periodSeconds }} + # One second longer than command timeout should prevent generation of zombie processes. + timeoutSeconds: {{ add1 .Values.master.livenessProbe.timeoutSeconds }} + successThreshold: {{ .Values.master.livenessProbe.successThreshold }} + failureThreshold: {{ .Values.master.livenessProbe.failureThreshold }} + exec: + command: + - sh + - -c + - /health/ping_liveness_local.sh {{ .Values.master.livenessProbe.timeoutSeconds }} + {{- end }} + {{- if .Values.master.customReadinessProbe }} + readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.master.customReadinessProbe "context" $) | nindent 12 }} + {{- else if .Values.master.readinessProbe.enabled }} + readinessProbe: + initialDelaySeconds: {{ .Values.master.readinessProbe.initialDelaySeconds }} + periodSeconds: {{ .Values.master.readinessProbe.periodSeconds }} + timeoutSeconds: {{ add1 .Values.master.readinessProbe.timeoutSeconds }} + successThreshold: {{ .Values.master.readinessProbe.successThreshold }} + failureThreshold: {{ .Values.master.readinessProbe.failureThreshold }} + exec: + command: + - sh + - -c + - /health/ping_readiness_local.sh {{ .Values.master.readinessProbe.timeoutSeconds }} + {{- end }} + {{- end }} + {{- if .Values.master.resources }} + resources: {{- toYaml .Values.master.resources | nindent 12 }} + {{- end }} + volumeMounts: + - name: start-scripts + mountPath: /opt/bitnami/scripts/start-scripts + - name: health + mountPath: /health + {{- if .Values.auth.usePasswordFiles }} + - name: redis-password + mountPath: /opt/bitnami/redis/secrets/ + {{- end }} + - name: redis-data + mountPath: {{ .Values.master.persistence.path }} + {{- if .Values.master.persistence.subPath }} + subPath: {{ .Values.master.persistence.subPath }} + {{- else if .Values.master.persistence.subPathExpr }} + subPathExpr: {{ .Values.master.persistence.subPathExpr }} + {{- end }} + - name: config + mountPath: /opt/bitnami/redis/mounted-etc + - name: redis-tmp-conf + mountPath: /opt/bitnami/redis/etc/ + - name: tmp + mountPath: /tmp + {{- if .Values.tls.enabled }} + - name: redis-certificates + mountPath: /opt/bitnami/redis/certs + readOnly: true + {{- end }} + {{- if .Values.master.extraVolumeMounts }} + {{- include "common.tplvalues.render" ( dict "value" .Values.master.extraVolumeMounts "context" $ ) | nindent 12 }} + {{- end }} + {{- if .Values.metrics.enabled }} + - name: metrics + image: {{ include "redis.metrics.image" . }} + imagePullPolicy: {{ .Values.metrics.image.pullPolicy | quote }} + {{- if .Values.metrics.containerSecurityContext.enabled }} + securityContext: {{- omit .Values.metrics.containerSecurityContext "enabled" | toYaml | nindent 12 }} + {{- end }} + {{- if .Values.diagnosticMode.enabled }} + command: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.command "context" $) | nindent 12 }} + {{- else }} + command: + - /bin/bash + - -c + - | + if [[ -f '/secrets/redis-password' ]]; then + export REDIS_PASSWORD=$(cat /secrets/redis-password) + fi + redis_exporter{{- range $key, $value := .Values.metrics.extraArgs }} --{{ $key }}={{ $value }}{{- end }} + {{- end }} + {{- if .Values.diagnosticMode.enabled }} + args: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.args "context" $) | nindent 12 }} + {{- end }} + env: + - name: REDIS_ALIAS + value: {{ template "common.names.fullname" . }} + {{- if .Values.auth.enabled }} + - name: REDIS_USER + value: default + {{- if (not .Values.auth.usePasswordFiles) }} + - name: REDIS_PASSWORD + valueFrom: + secretKeyRef: + name: {{ template "redis.secretName" . }} + key: {{ template "redis.secretPasswordKey" . }} + {{- end }} + {{- end }} + {{- if .Values.tls.enabled }} + - name: REDIS_ADDR + value: rediss://{{ .Values.metrics.redisTargetHost }}:{{ .Values.master.containerPorts.redis }} + {{- if .Values.tls.authClients }} + - name: REDIS_EXPORTER_TLS_CLIENT_KEY_FILE + value: {{ template "redis.tlsCertKey" . }} + - name: REDIS_EXPORTER_TLS_CLIENT_CERT_FILE + value: {{ template "redis.tlsCert" . }} + {{- end }} + - name: REDIS_EXPORTER_TLS_CA_CERT_FILE + value: {{ template "redis.tlsCACert" . }} + {{- end }} + {{- if .Values.metrics.extraEnvVars }} + {{- include "common.tplvalues.render" (dict "value" .Values.metrics.extraEnvVars "context" $) | nindent 12 }} + {{- end }} + ports: + - name: metrics + containerPort: 9121 + {{- if not .Values.diagnosticMode.enabled }} + {{- if .Values.metrics.customStartupProbe }} + startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.metrics.customStartupProbe "context" $) | nindent 12 }} + {{- else if .Values.metrics.startupProbe.enabled }} + startupProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.metrics.startupProbe "enabled") "context" $) | nindent 12 }} + tcpSocket: + port: metrics + {{- end }} + {{- if .Values.metrics.customLivenessProbe }} + livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.metrics.customLivenessProbe "context" $) | nindent 12 }} + {{- else if .Values.metrics.livenessProbe.enabled }} + livenessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.metrics.livenessProbe "enabled") "context" $) | nindent 12 }} + tcpSocket: + port: metrics + {{- end }} + {{- if .Values.metrics.customReadinessProbe }} + readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.metrics.customReadinessProbe "context" $) | nindent 12 }} + {{- else if .Values.metrics.readinessProbe.enabled }} + readinessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.metrics.readinessProbe "enabled") "context" $) | nindent 12 }} + httpGet: + path: / + port: metrics + {{- end }} + {{- end }} + {{- if .Values.metrics.resources }} + resources: {{- toYaml .Values.metrics.resources | nindent 12 }} + {{- end }} + volumeMounts: + {{- if .Values.auth.usePasswordFiles }} + - name: redis-password + mountPath: /secrets/ + {{- end }} + {{- if .Values.tls.enabled }} + - name: redis-certificates + mountPath: /opt/bitnami/redis/certs + readOnly: true + {{- end }} + {{- if .Values.metrics.extraVolumeMounts }} + {{- include "common.tplvalues.render" ( dict "value" .Values.metrics.extraVolumeMounts "context" $ ) | nindent 12 }} + {{- end }} + {{- end }} + {{- if .Values.master.sidecars }} + {{- include "common.tplvalues.render" (dict "value" .Values.master.sidecars "context" $) | nindent 8 }} + {{- end }} + {{- $needsVolumePermissions := and .Values.volumePermissions.enabled .Values.master.persistence.enabled .Values.master.podSecurityContext.enabled .Values.master.containerSecurityContext.enabled }} + {{- if or .Values.master.initContainers $needsVolumePermissions .Values.sysctl.enabled }} + initContainers: + {{- if .Values.master.initContainers }} + {{- include "common.tplvalues.render" (dict "value" .Values.master.initContainers "context" $) | nindent 8 }} + {{- end }} + {{- if $needsVolumePermissions }} + - name: volume-permissions + image: {{ include "redis.volumePermissions.image" . }} + imagePullPolicy: {{ .Values.volumePermissions.image.pullPolicy | quote }} + command: + - /bin/bash + - -ec + - | + {{- if eq ( toString ( .Values.volumePermissions.containerSecurityContext.runAsUser )) "auto" }} + chown -R `id -u`:`id -G | cut -d " " -f2` {{ .Values.master.persistence.path }} + {{- else }} + chown -R {{ .Values.master.containerSecurityContext.runAsUser }}:{{ .Values.master.podSecurityContext.fsGroup }} {{ .Values.master.persistence.path }} + {{- end }} + {{- if eq ( toString ( .Values.volumePermissions.containerSecurityContext.runAsUser )) "auto" }} + securityContext: {{- omit .Values.volumePermissions.containerSecurityContext "runAsUser" | toYaml | nindent 12 }} + {{- else }} + securityContext: {{- .Values.volumePermissions.containerSecurityContext | toYaml | nindent 12 }} + {{- end }} + {{- if .Values.volumePermissions.resources }} + resources: {{- toYaml .Values.volumePermissions.resources | nindent 12 }} + {{- end }} + volumeMounts: + - name: redis-data + mountPath: {{ .Values.master.persistence.path }} + {{- if .Values.master.persistence.subPath }} + subPath: {{ .Values.master.persistence.subPath }} + {{- else if .Values.master.persistence.subPathExpr }} + subPathExpr: {{ .Values.master.persistence.subPathExpr }} + {{- end }} + {{- end }} + {{- if .Values.sysctl.enabled }} + - name: init-sysctl + image: {{ include "redis.sysctl.image" . }} + imagePullPolicy: {{ default "" .Values.sysctl.image.pullPolicy | quote }} + securityContext: + privileged: true + runAsUser: 0 + {{- if .Values.sysctl.command }} + command: {{- include "common.tplvalues.render" (dict "value" .Values.sysctl.command "context" $) | nindent 12 }} + {{- end }} + {{- if .Values.sysctl.resources }} + resources: {{- toYaml .Values.sysctl.resources | nindent 12 }} + {{- end }} + {{- if .Values.sysctl.mountHostSys }} + volumeMounts: + - name: host-sys + mountPath: /host-sys + {{- end }} + {{- end }} + {{- end }} + volumes: + - name: start-scripts + configMap: + name: {{ printf "%s-scripts" (include "common.names.fullname" .) }} + defaultMode: 0755 + - name: health + configMap: + name: {{ printf "%s-health" (include "common.names.fullname" .) }} + defaultMode: 0755 + {{- if .Values.auth.usePasswordFiles }} + - name: redis-password + secret: + secretName: {{ template "redis.secretName" . }} + items: + - key: {{ template "redis.secretPasswordKey" . }} + path: redis-password + {{- end }} + - name: config + configMap: + name: {{ include "redis.configmapName" . }} + {{- if .Values.sysctl.mountHostSys }} + - name: host-sys + hostPath: + path: /sys + {{- end }} + - name: redis-tmp-conf + {{- if or .Values.master.persistence.medium .Values.master.persistence.sizeLimit }} + emptyDir: + {{- if .Values.master.persistence.medium }} + medium: {{ .Values.master.persistence.medium | quote }} + {{- end }} + {{- if .Values.master.persistence.sizeLimit }} + sizeLimit: {{ .Values.master.persistence.sizeLimit | quote }} + {{- end }} + {{- else }} + emptyDir: {} + {{- end }} + - name: tmp + {{- if or .Values.master.persistence.medium .Values.master.persistence.sizeLimit }} + emptyDir: + {{- if .Values.master.persistence.medium }} + medium: {{ .Values.master.persistence.medium | quote }} + {{- end }} + {{- if .Values.master.persistence.sizeLimit }} + sizeLimit: {{ .Values.master.persistence.sizeLimit | quote }} + {{- end }} + {{- else }} + emptyDir: {} + {{- end }} + {{- if .Values.tls.enabled }} + - name: redis-certificates + secret: + secretName: {{ include "redis.tlsSecretName" . }} + defaultMode: 256 + {{- end }} + {{- if .Values.master.extraVolumes }} + {{- include "common.tplvalues.render" ( dict "value" .Values.master.extraVolumes "context" $ ) | nindent 8 }} + {{- end }} + {{- if .Values.metrics.extraVolumes }} + {{- include "common.tplvalues.render" ( dict "value" .Values.metrics.extraVolumes "context" $ ) | nindent 8 }} + {{- end }} + {{- if not .Values.master.persistence.enabled }} + - name: redis-data + {{- if or .Values.master.persistence.medium .Values.master.persistence.sizeLimit }} + emptyDir: + {{- if .Values.master.persistence.medium }} + medium: {{ .Values.master.persistence.medium | quote }} + {{- end }} + {{- if .Values.master.persistence.sizeLimit }} + sizeLimit: {{ .Values.master.persistence.sizeLimit | quote }} + {{- end }} + {{- else }} + emptyDir: {} + {{- end }} + {{- else if .Values.master.persistence.existingClaim }} + - name: redis-data + persistentVolumeClaim: + claimName: {{ printf "%s" (tpl .Values.master.persistence.existingClaim .) }} + {{- else if (eq .Values.master.kind "Deployment") }} + - name: redis-data + persistentVolumeClaim: + claimName: {{ printf "redis-data-%s-master" (include "common.names.fullname" .) }} + {{- else }} + volumeClaimTemplates: + - metadata: + name: redis-data + labels: {{- include "common.labels.matchLabels" . | nindent 10 }} + app.kubernetes.io/component: master + {{- if .Values.master.persistence.annotations }} + annotations: {{- toYaml .Values.master.persistence.annotations | nindent 10 }} + {{- end }} + spec: + accessModes: + {{- range .Values.master.persistence.accessModes }} + - {{ . | quote }} + {{- end }} + resources: + requests: + storage: {{ .Values.master.persistence.size | quote }} + {{- if .Values.master.persistence.selector }} + selector: {{- include "common.tplvalues.render" (dict "value" .Values.master.persistence.selector "context" $) | nindent 10 }} + {{- end }} + {{- if .Values.master.persistence.dataSource }} + dataSource: {{- include "common.tplvalues.render" (dict "value" .Values.master.persistence.dataSource "context" $) | nindent 10 }} + {{- end }} + {{- include "common.storage.class" (dict "persistence" .Values.master.persistence "global" .Values.global) | nindent 8 }} + {{- end }} +{{- end }} diff --git a/redis-fetcher/templates/master/psp.yaml b/redis-fetcher/templates/master/psp.yaml new file mode 100644 index 00000000..2ba93b6e --- /dev/null +++ b/redis-fetcher/templates/master/psp.yaml @@ -0,0 +1,46 @@ +{{- $pspAvailable := (semverCompare "<1.25-0" (include "common.capabilities.kubeVersion" .)) -}} +{{- if and $pspAvailable .Values.podSecurityPolicy.create }} +apiVersion: policy/v1beta1 +kind: PodSecurityPolicy +metadata: + name: {{ printf "%s-master" (include "common.names.fullname" .) }} + namespace: {{ .Release.Namespace | quote }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} +spec: + allowPrivilegeEscalation: false + fsGroup: + rule: 'MustRunAs' + ranges: + - min: {{ .Values.master.podSecurityContext.fsGroup }} + max: {{ .Values.master.podSecurityContext.fsGroup }} + hostIPC: false + hostNetwork: false + hostPID: false + privileged: false + readOnlyRootFilesystem: false + requiredDropCapabilities: + - ALL + runAsUser: + rule: 'MustRunAs' + ranges: + - min: {{ .Values.master.containerSecurityContext.runAsUser }} + max: {{ .Values.master.containerSecurityContext.runAsUser }} + seLinux: + rule: 'RunAsAny' + supplementalGroups: + rule: 'MustRunAs' + ranges: + - min: {{ .Values.master.containerSecurityContext.runAsUser }} + max: {{ .Values.master.containerSecurityContext.runAsUser }} + volumes: + - 'configMap' + - 'secret' + - 'emptyDir' + - 'persistentVolumeClaim' +{{- end }} diff --git a/redis-fetcher/templates/master/pvc.yaml b/redis-fetcher/templates/master/pvc.yaml new file mode 100644 index 00000000..e5fddb03 --- /dev/null +++ b/redis-fetcher/templates/master/pvc.yaml @@ -0,0 +1,27 @@ +{{- if and (eq .Values.architecture "standalone") (eq .Values.master.kind "Deployment") (.Values.master.persistence.enabled) (not .Values.master.persistence.existingClaim) }} +kind: PersistentVolumeClaim +apiVersion: v1 +metadata: + name: {{ printf "redis-data-%s-master" (include "common.names.fullname" .) }} + namespace: {{ .Release.Namespace | quote }} + labels: {{- include "common.labels.matchLabels" . | nindent 4 }} + app.kubernetes.io/component: master + {{- if .Values.master.persistence.annotations }} + annotations: {{- toYaml .Values.master.persistence.annotations | nindent 4 }} + {{- end }} +spec: + accessModes: + {{- range .Values.master.persistence.accessModes }} + - {{ . | quote }} + {{- end }} + resources: + requests: + storage: {{ .Values.master.persistence.size | quote }} + {{- if .Values.master.persistence.selector }} + selector: {{- include "common.tplvalues.render" (dict "value" .Values.master.persistence.selector "context" $) | nindent 4 }} + {{- end }} + {{- if .Values.master.persistence.dataSource }} + dataSource: {{- include "common.tplvalues.render" (dict "value" .Values.master.persistence.dataSource "context" $) | nindent 4 }} + {{- end }} + {{- include "common.storage.class" (dict "persistence" .Values.master.persistence "global" .Values.global) | nindent 2 }} +{{- end }} diff --git a/redis-fetcher/templates/master/service.yaml b/redis-fetcher/templates/master/service.yaml new file mode 100644 index 00000000..c03fea70 --- /dev/null +++ b/redis-fetcher/templates/master/service.yaml @@ -0,0 +1,61 @@ +{{- if not .Values.sentinel.enabled }} +apiVersion: v1 +kind: Service +metadata: + name: {{ printf "%s-master" (include "common.names.fullname" .) }} + namespace: {{ .Release.Namespace | quote }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + app.kubernetes.io/component: master + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + {{- if or .Values.master.service.annotations .Values.commonAnnotations }} + annotations: + {{- if .Values.master.service.annotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.master.service.annotations "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.commonAnnotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} + {{- end }} +spec: + type: {{ .Values.master.service.type }} + {{- if or (eq .Values.master.service.type "LoadBalancer") (eq .Values.master.service.type "NodePort") }} + externalTrafficPolicy: {{ .Values.master.service.externalTrafficPolicy | quote }} + {{- end }} + {{- if (semverCompare ">=1.22-0" (include "common.capabilities.kubeVersion" .)) }} + internalTrafficPolicy: {{ .Values.master.service.internalTrafficPolicy }} + {{- end }} + {{- if and (eq .Values.master.service.type "LoadBalancer") (not (empty .Values.master.service.loadBalancerIP)) }} + loadBalancerIP: {{ .Values.master.service.loadBalancerIP }} + {{- end }} + {{- if and (eq .Values.master.service.type "LoadBalancer") (not (empty .Values.master.service.loadBalancerSourceRanges)) }} + loadBalancerSourceRanges: {{ .Values.master.service.loadBalancerSourceRanges }} + {{- end }} + {{- if and .Values.master.service.clusterIP (eq .Values.master.service.type "ClusterIP") }} + clusterIP: {{ .Values.master.service.clusterIP }} + {{- end }} + {{- if .Values.master.service.sessionAffinity }} + sessionAffinity: {{ .Values.master.service.sessionAffinity }} + {{- end }} + {{- if .Values.master.service.sessionAffinityConfig }} + sessionAffinityConfig: {{- include "common.tplvalues.render" (dict "value" .Values.master.service.sessionAffinityConfig "context" $) | nindent 4 }} + {{- end }} + {{- if .Values.master.service.externalIPs }} + externalIPs: {{- include "common.tplvalues.render" (dict "value" .Values.master.service.externalIPs "context" $) | nindent 4 }} + {{- end }} + ports: + - name: tcp-redis + port: {{ .Values.master.service.ports.redis }} + targetPort: redis + {{- if and (or (eq .Values.master.service.type "NodePort") (eq .Values.master.service.type "LoadBalancer")) .Values.master.service.nodePorts.redis}} + nodePort: {{ .Values.master.service.nodePorts.redis}} + {{- else if eq .Values.master.service.type "ClusterIP" }} + nodePort: null + {{- end }} + {{- if .Values.master.service.extraPorts }} + {{- include "common.tplvalues.render" (dict "value" .Values.master.service.extraPorts "context" $) | nindent 4 }} + {{- end }} + selector: {{- include "common.labels.matchLabels" . | nindent 4 }} + app.kubernetes.io/component: master +{{- end }} diff --git a/redis-fetcher/templates/master/serviceaccount.yaml b/redis-fetcher/templates/master/serviceaccount.yaml new file mode 100644 index 00000000..9c62e5f2 --- /dev/null +++ b/redis-fetcher/templates/master/serviceaccount.yaml @@ -0,0 +1,21 @@ +{{- if .Values.master.serviceAccount.create }} +apiVersion: v1 +kind: ServiceAccount +automountServiceAccountToken: {{ .Values.master.serviceAccount.automountServiceAccountToken }} +metadata: + name: {{ template "redis.masterServiceAccountName" . }} + namespace: {{ .Release.Namespace | quote }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + {{- if or .Values.commonAnnotations .Values.master.serviceAccount.annotations }} + annotations: + {{- if or .Values.commonAnnotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.master.serviceAccount.annotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.master.serviceAccount.annotations "context" $ ) | nindent 4 }} + {{- end }} + {{- end }} +{{- end }} diff --git a/redis-fetcher/templates/metrics-svc.yaml b/redis-fetcher/templates/metrics-svc.yaml new file mode 100644 index 00000000..13c552f3 --- /dev/null +++ b/redis-fetcher/templates/metrics-svc.yaml @@ -0,0 +1,41 @@ +{{- if .Values.metrics.enabled }} +apiVersion: v1 +kind: Service +metadata: + name: {{ printf "%s-metrics" (include "common.names.fullname" .) }} + namespace: {{ .Release.Namespace | quote }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + app.kubernetes.io/component: metrics + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + {{- if or .Values.metrics.service.annotations .Values.commonAnnotations }} + annotations: + {{- if .Values.metrics.service.annotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.metrics.service.annotations "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.commonAnnotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} + {{- end }} +spec: + type: {{ .Values.metrics.service.type }} + {{- if eq .Values.metrics.service.type "LoadBalancer" }} + externalTrafficPolicy: {{ .Values.metrics.service.externalTrafficPolicy }} + {{- end }} + {{- if and (eq .Values.metrics.service.type "LoadBalancer") .Values.metrics.service.loadBalancerIP }} + loadBalancerIP: {{ .Values.metrics.service.loadBalancerIP }} + {{- end }} + {{- if and (eq .Values.metrics.service.type "LoadBalancer") .Values.metrics.service.loadBalancerSourceRanges }} + loadBalancerSourceRanges: {{- toYaml .Values.metrics.service.loadBalancerSourceRanges | nindent 4 }} + {{- end }} + ports: + - name: http-metrics + port: {{ .Values.metrics.service.port }} + protocol: TCP + targetPort: metrics + {{- if .Values.metrics.service.extraPorts }} + {{- include "common.tplvalues.render" (dict "value" .Values.metrics.service.extraPorts "context" $) | nindent 4 }} + {{- end }} + selector: {{- include "common.labels.matchLabels" . | nindent 4 }} +{{- end }} diff --git a/redis-fetcher/templates/networkpolicy.yaml b/redis-fetcher/templates/networkpolicy.yaml new file mode 100644 index 00000000..7205cea3 --- /dev/null +++ b/redis-fetcher/templates/networkpolicy.yaml @@ -0,0 +1,82 @@ +{{- if .Values.networkPolicy.enabled }} +kind: NetworkPolicy +apiVersion: {{ template "networkPolicy.apiVersion" . }} +metadata: + name: {{ template "common.names.fullname" . }} + namespace: {{ .Release.Namespace | quote }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} +spec: + podSelector: + matchLabels: {{- include "common.labels.matchLabels" . | nindent 6 }} + policyTypes: + - Ingress + {{- if or (eq .Values.architecture "replication") .Values.networkPolicy.extraEgress }} + - Egress + egress: + {{- if eq .Values.architecture "replication" }} + # Allow dns resolution + - ports: + - port: 53 + protocol: UDP + # Allow outbound connections to other cluster pods + - ports: + - port: {{ .Values.master.containerPorts.redis }} + {{- if .Values.sentinel.enabled }} + - port: {{ .Values.sentinel.containerPorts.sentinel }} + {{- end }} + to: + - podSelector: + matchLabels: {{- include "common.labels.matchLabels" . | nindent 14 }} + {{- end }} + {{- if .Values.networkPolicy.extraEgress }} + {{- include "common.tplvalues.render" ( dict "value" .Values.networkPolicy.extraEgress "context" $ ) | nindent 4 }} + {{- end }} + {{- end }} + ingress: + # Allow inbound connections + - ports: + - port: {{ .Values.master.containerPorts.redis }} + {{- if .Values.sentinel.enabled }} + - port: {{ .Values.sentinel.containerPorts.sentinel }} + {{- end }} + {{- if not .Values.networkPolicy.allowExternal }} + from: + - podSelector: + matchLabels: + {{ template "common.names.fullname" . }}-client: "true" + - podSelector: + matchLabels: {{- include "common.labels.matchLabels" . | nindent 14 }} + {{- if or .Values.networkPolicy.ingressNSMatchLabels .Values.networkPolicy.ingressNSPodMatchLabels }} + - namespaceSelector: + matchLabels: + {{- if .Values.networkPolicy.ingressNSMatchLabels }} + {{- range $key, $value := .Values.networkPolicy.ingressNSMatchLabels }} + {{ $key | quote }}: {{ $value | quote }} + {{- end }} + {{ else }} + {} + {{- end }} + {{- if .Values.networkPolicy.ingressNSPodMatchLabels }} + podSelector: + matchLabels: + {{- range $key, $value := .Values.networkPolicy.ingressNSPodMatchLabels }} + {{ $key | quote }}: {{ $value | quote }} + {{- end }} + {{- end }} + {{- end }} + {{- end }} + {{- if .Values.metrics.enabled }} + # Allow prometheus scrapes for metrics + - ports: + - port: 9121 + {{- end }} + {{- if .Values.networkPolicy.extraIngress }} + {{- include "common.tplvalues.render" ( dict "value" .Values.networkPolicy.extraIngress "context" $ ) | nindent 4 }} + {{- end }} +{{- end }} diff --git a/redis-fetcher/templates/pdb.yaml b/redis-fetcher/templates/pdb.yaml new file mode 100644 index 00000000..f82d278a --- /dev/null +++ b/redis-fetcher/templates/pdb.yaml @@ -0,0 +1,23 @@ +{{- if .Values.pdb.create }} +apiVersion: {{ include "common.capabilities.policy.apiVersion" . }} +kind: PodDisruptionBudget +metadata: + name: {{ template "common.names.fullname" . }} + namespace: {{ .Release.Namespace | quote }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} +spec: + {{- if .Values.pdb.minAvailable }} + minAvailable: {{ .Values.pdb.minAvailable }} + {{- end }} + {{- if .Values.pdb.maxUnavailable }} + maxUnavailable: {{ .Values.pdb.maxUnavailable }} + {{- end }} + selector: + matchLabels: {{- include "common.labels.matchLabels" . | nindent 6 }} +{{- end }} diff --git a/redis-fetcher/templates/prometheusrule.yaml b/redis-fetcher/templates/prometheusrule.yaml new file mode 100644 index 00000000..b89d1163 --- /dev/null +++ b/redis-fetcher/templates/prometheusrule.yaml @@ -0,0 +1,21 @@ +{{- if and .Values.metrics.enabled .Values.metrics.prometheusRule.enabled }} +apiVersion: monitoring.coreos.com/v1 +kind: PrometheusRule +metadata: + name: {{ template "common.names.fullname" . }} + namespace: {{ default .Release.Namespace .Values.metrics.prometheusRule.namespace | quote }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + {{- if .Values.metrics.prometheusRule.additionalLabels }} + {{- include "common.tplvalues.render" (dict "value" .Values.metrics.prometheusRule.additionalLabels "context" $) | nindent 4 }} + {{- end }} + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} +spec: + groups: + - name: {{ include "common.names.fullname" . }} + rules: {{- include "common.tplvalues.render" ( dict "value" .Values.metrics.prometheusRule.rules "context" $ ) | nindent 8 }} +{{- end }} diff --git a/redis-fetcher/templates/replicas/hpa.yaml b/redis-fetcher/templates/replicas/hpa.yaml new file mode 100644 index 00000000..ea069a8e --- /dev/null +++ b/redis-fetcher/templates/replicas/hpa.yaml @@ -0,0 +1,47 @@ +{{- if and .Values.replica.autoscaling.enabled (not .Values.sentinel.enabled) }} +apiVersion: {{ include "common.capabilities.hpa.apiVersion" ( dict "context" $ ) }} +kind: HorizontalPodAutoscaler +metadata: + name: {{ printf "%s-replicas" (include "common.names.fullname" .) }} + namespace: {{ .Release.Namespace | quote }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + app.kubernetes.io/component: replica + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" (dict "value" .Values.commonLabels "context" $) | nindent 4 }} + {{- end }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} +spec: + scaleTargetRef: + apiVersion: {{ include "common.capabilities.deployment.apiVersion" . }} + kind: StatefulSet + name: {{ printf "%s-replicas" (include "common.names.fullname" .) }} + minReplicas: {{ .Values.replica.autoscaling.minReplicas }} + maxReplicas: {{ .Values.replica.autoscaling.maxReplicas }} + metrics: + {{- if .Values.replica.autoscaling.targetMemory }} + - type: Resource + resource: + name: memory + {{- if semverCompare "<1.23-0" (include "common.capabilities.kubeVersion" .) }} + targetAverageUtilization: {{ .Values.replica.autoscaling.targetMemory }} + {{- else }} + target: + type: Utilization + averageUtilization: {{ .Values.replica.autoscaling.targetMemory }} + {{- end }} + {{- end }} + {{- if .Values.replica.autoscaling.targetCPU }} + - type: Resource + resource: + name: cpu + {{- if semverCompare "<1.23-0" (include "common.capabilities.kubeVersion" .) }} + targetAverageUtilization: {{ .Values.replica.autoscaling.targetCPU }} + {{- else }} + target: + type: Utilization + averageUtilization: {{ .Values.replica.autoscaling.targetCPU }} + {{- end }} + {{- end }} +{{- end }} diff --git a/redis-fetcher/templates/replicas/service.yaml b/redis-fetcher/templates/replicas/service.yaml new file mode 100644 index 00000000..f2619266 --- /dev/null +++ b/redis-fetcher/templates/replicas/service.yaml @@ -0,0 +1,58 @@ +{{- if and (eq .Values.architecture "replication") (not .Values.sentinel.enabled) }} +apiVersion: v1 +kind: Service +metadata: + name: {{ printf "%s-replicas" (include "common.names.fullname" .) }} + namespace: {{ .Release.Namespace | quote }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + app.kubernetes.io/component: replica + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + {{- if or .Values.replica.service.annotations .Values.commonAnnotations }} + annotations: + {{- if .Values.replica.service.annotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.replica.service.annotations "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.commonAnnotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} + {{- end }} +spec: + type: {{ .Values.replica.service.type }} + {{- if or (eq .Values.replica.service.type "LoadBalancer") (eq .Values.replica.service.type "NodePort") }} + externalTrafficPolicy: {{ .Values.replica.service.externalTrafficPolicy | quote }} + {{- end }} + {{- if (semverCompare ">=1.22-0" (include "common.capabilities.kubeVersion" .)) }} + internalTrafficPolicy: {{ .Values.replica.service.internalTrafficPolicy }} + {{- end }} + {{- if and (eq .Values.replica.service.type "LoadBalancer") (not (empty .Values.replica.service.loadBalancerIP)) }} + loadBalancerIP: {{ .Values.replica.service.loadBalancerIP }} + {{- end }} + {{- if and (eq .Values.replica.service.type "LoadBalancer") (not (empty .Values.replica.service.loadBalancerSourceRanges)) }} + loadBalancerSourceRanges: {{ .Values.replica.service.loadBalancerSourceRanges }} + {{- end }} + {{- if and .Values.replica.service.clusterIP (eq .Values.replica.service.type "ClusterIP") }} + clusterIP: {{ .Values.replica.service.clusterIP }} + {{- end }} + {{- if .Values.replica.service.sessionAffinity }} + sessionAffinity: {{ .Values.replica.service.sessionAffinity }} + {{- end }} + {{- if .Values.replica.service.sessionAffinityConfig }} + sessionAffinityConfig: {{- include "common.tplvalues.render" (dict "value" .Values.replica.service.sessionAffinityConfig "context" $) | nindent 4 }} + {{- end }} + ports: + - name: tcp-redis + port: {{ .Values.replica.service.ports.redis }} + targetPort: redis + {{- if and (or (eq .Values.replica.service.type "NodePort") (eq .Values.replica.service.type "LoadBalancer")) .Values.replica.service.nodePorts.redis}} + nodePort: {{ .Values.replica.service.nodePorts.redis}} + {{- else if eq .Values.replica.service.type "ClusterIP" }} + nodePort: null + {{- end }} + {{- if .Values.replica.service.extraPorts }} + {{- include "common.tplvalues.render" (dict "value" .Values.replica.service.extraPorts "context" $) | nindent 4 }} + {{- end }} + selector: {{- include "common.labels.matchLabels" . | nindent 4 }} + app.kubernetes.io/component: replica +{{- end }} diff --git a/redis-fetcher/templates/replicas/serviceaccount.yaml b/redis-fetcher/templates/replicas/serviceaccount.yaml new file mode 100644 index 00000000..333ec9f5 --- /dev/null +++ b/redis-fetcher/templates/replicas/serviceaccount.yaml @@ -0,0 +1,21 @@ +{{- if .Values.replica.serviceAccount.create }} +apiVersion: v1 +kind: ServiceAccount +automountServiceAccountToken: {{ .Values.replica.serviceAccount.automountServiceAccountToken }} +metadata: + name: {{ template "redis.replicaServiceAccountName" . }} + namespace: {{ .Release.Namespace | quote }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + {{- if or .Values.commonAnnotations .Values.replica.serviceAccount.annotations }} + annotations: + {{- if or .Values.commonAnnotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.replica.serviceAccount.annotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.replica.serviceAccount.annotations "context" $ ) | nindent 4 }} + {{- end }} + {{- end }} +{{- end }} diff --git a/redis-fetcher/templates/replicas/statefulset.yaml b/redis-fetcher/templates/replicas/statefulset.yaml new file mode 100644 index 00000000..8a8541d7 --- /dev/null +++ b/redis-fetcher/templates/replicas/statefulset.yaml @@ -0,0 +1,515 @@ +{{- if and (eq .Values.architecture "replication") (not .Values.sentinel.enabled) }} +apiVersion: {{ include "common.capabilities.statefulset.apiVersion" . }} +kind: StatefulSet +metadata: + name: {{ printf "%s-replicas" (include "common.names.fullname" .) }} + namespace: {{ .Release.Namespace | quote }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + app.kubernetes.io/component: replica + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} +spec: + {{- if not .Values.replica.autoscaling.enabled }} + replicas: {{ .Values.replica.replicaCount }} + {{- end }} + selector: + matchLabels: {{- include "common.labels.matchLabels" . | nindent 6 }} + app.kubernetes.io/component: replica + serviceName: {{ printf "%s-headless" (include "common.names.fullname" .) }} + {{- if .Values.replica.updateStrategy }} + updateStrategy: {{- toYaml .Values.replica.updateStrategy | nindent 4 }} + {{- end }} + {{- if and .Values.replica.minReadySeconds (semverCompare ">= 1.25" (include "common.capabilities.kubeVersion" .)) }} + minReadySeconds: {{ .Values.replica.minReadySeconds }} + {{- end }} + {{- if .Values.replica.podManagementPolicy }} + podManagementPolicy: {{ .Values.replica.podManagementPolicy | quote }} + {{- end }} + template: + metadata: + labels: {{- include "common.labels.standard" . | nindent 8 }} + app.kubernetes.io/component: replica + {{- if .Values.replica.podLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.replica.podLabels "context" $ ) | nindent 8 }} + {{- end }} + {{- if and .Values.metrics.enabled .Values.metrics.podLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.metrics.podLabels "context" $ ) | nindent 8 }} + {{- end }} + annotations: + {{- if (include "redis.createConfigmap" .) }} + checksum/configmap: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }} + {{- end }} + checksum/health: {{ include (print $.Template.BasePath "/health-configmap.yaml") . | sha256sum }} + checksum/scripts: {{ include (print $.Template.BasePath "/scripts-configmap.yaml") . | sha256sum }} + checksum/secret: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }} + {{- if .Values.replica.podAnnotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.replica.podAnnotations "context" $ ) | nindent 8 }} + {{- end }} + {{- if and .Values.metrics.enabled .Values.metrics.podAnnotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.metrics.podAnnotations "context" $ ) | nindent 8 }} + {{- end }} + spec: + {{- include "redis.imagePullSecrets" . | nindent 6 }} + {{- if .Values.replica.hostAliases }} + hostAliases: {{- include "common.tplvalues.render" (dict "value" .Values.replica.hostAliases "context" $) | nindent 8 }} + {{- end }} + {{- if .Values.replica.podSecurityContext.enabled }} + securityContext: {{- omit .Values.replica.podSecurityContext "enabled" | toYaml | nindent 8 }} + {{- end }} + serviceAccountName: {{ template "redis.replicaServiceAccountName" . }} + {{- if .Values.replica.priorityClassName }} + priorityClassName: {{ .Values.replica.priorityClassName | quote }} + {{- end }} + {{- if .Values.replica.affinity }} + affinity: {{- include "common.tplvalues.render" (dict "value" .Values.replica.affinity "context" $) | nindent 8 }} + {{- else }} + affinity: + podAffinity: {{- include "common.affinities.pods" (dict "type" .Values.replica.podAffinityPreset "component" "replica" "context" $) | nindent 10 }} + podAntiAffinity: {{- include "common.affinities.pods" (dict "type" .Values.replica.podAntiAffinityPreset "component" "replica" "context" $) | nindent 10 }} + nodeAffinity: {{- include "common.affinities.nodes" (dict "type" .Values.replica.nodeAffinityPreset.type "key" .Values.replica.nodeAffinityPreset.key "values" .Values.replica.nodeAffinityPreset.values) | nindent 10 }} + {{- end }} + {{- if .Values.replica.nodeSelector }} + nodeSelector: {{- include "common.tplvalues.render" (dict "value" .Values.replica.nodeSelector "context" $) | nindent 8 }} + {{- end }} + {{- if .Values.replica.tolerations }} + tolerations: {{- include "common.tplvalues.render" (dict "value" .Values.replica.tolerations "context" $) | nindent 8 }} + {{- end }} + {{- if .Values.replica.topologySpreadConstraints }} + topologySpreadConstraints: {{- include "common.tplvalues.render" (dict "value" .Values.replica.topologySpreadConstraints "context" $) | nindent 8 }} + {{- end }} + {{- if .Values.replica.shareProcessNamespace }} + shareProcessNamespace: {{ .Values.replica.shareProcessNamespace }} + {{- end }} + {{- if .Values.replica.schedulerName }} + schedulerName: {{ .Values.replica.schedulerName | quote }} + {{- end }} + {{- if .Values.replica.dnsPolicy }} + dnsPolicy: {{ .Values.replica.dnsPolicy }} + {{- end }} + {{- if .Values.replica.dnsConfig }} + dnsConfig: {{- include "common.tplvalues.render" (dict "value" .Values.replica.dnsConfig "context" $) | nindent 8 }} + {{- end }} + terminationGracePeriodSeconds: {{ .Values.replica.terminationGracePeriodSeconds }} + containers: + - name: redis + image: {{ template "redis.image" . }} + imagePullPolicy: {{ .Values.image.pullPolicy | quote }} + {{- if not .Values.diagnosticMode.enabled }} + {{- if .Values.replica.lifecycleHooks }} + lifecycle: {{- include "common.tplvalues.render" (dict "value" .Values.replica.lifecycleHooks "context" $) | nindent 12 }} + {{- end }} + {{- end }} + {{- if .Values.replica.containerSecurityContext.enabled }} + securityContext: {{- omit .Values.replica.containerSecurityContext "enabled" | toYaml | nindent 12 }} + {{- end }} + {{- if .Values.diagnosticMode.enabled }} + command: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.command "context" $) | nindent 12 }} + {{- else if .Values.replica.command }} + command: {{- include "common.tplvalues.render" (dict "value" .Values.replica.command "context" $) | nindent 12 }} + {{- else }} + command: + - /bin/bash + {{- end }} + {{- if .Values.diagnosticMode.enabled }} + args: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.args "context" $) | nindent 12 }} + {{- else if .Values.replica.args }} + args: {{- include "common.tplvalues.render" (dict "value" .Values.replica.args "context" $) | nindent 12 }} + {{- else }} + args: + - -c + - /opt/bitnami/scripts/start-scripts/start-replica.sh + {{- end }} + env: + - name: BITNAMI_DEBUG + value: {{ ternary "true" "false" (or .Values.image.debug .Values.diagnosticMode.enabled) | quote }} + - name: REDIS_REPLICATION_MODE + value: replica + - name: REDIS_MASTER_HOST + {{- if and (eq (int64 .Values.master.count) 1) (ne .Values.master.kind "Deployment") }} + value: {{ template "common.names.fullname" . }}-master-0.{{ template "common.names.fullname" . }}-headless.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }} + {{- else }} + value: {{ template "common.names.fullname" . }}-master.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }} + {{- end }} + - name: REDIS_MASTER_PORT_NUMBER + value: {{ .Values.master.containerPorts.redis | quote }} + - name: ALLOW_EMPTY_PASSWORD + value: {{ ternary "no" "yes" .Values.auth.enabled | quote }} + {{- if .Values.auth.enabled }} + {{- if .Values.auth.usePasswordFiles }} + - name: REDIS_PASSWORD_FILE + value: "/opt/bitnami/redis/secrets/redis-password" + - name: REDIS_MASTER_PASSWORD_FILE + value: "/opt/bitnami/redis/secrets/redis-password" + {{- else }} + - name: REDIS_PASSWORD + valueFrom: + secretKeyRef: + name: {{ template "redis.secretName" . }} + key: {{ template "redis.secretPasswordKey" . }} + - name: REDIS_MASTER_PASSWORD + valueFrom: + secretKeyRef: + name: {{ template "redis.secretName" . }} + key: {{ template "redis.secretPasswordKey" . }} + {{- end }} + {{- end }} + - name: REDIS_TLS_ENABLED + value: {{ ternary "yes" "no" .Values.tls.enabled | quote }} + {{- if .Values.tls.enabled }} + - name: REDIS_TLS_PORT + value: {{ .Values.replica.containerPorts.redis | quote }} + - name: REDIS_TLS_AUTH_CLIENTS + value: {{ ternary "yes" "no" .Values.tls.authClients | quote }} + - name: REDIS_TLS_CERT_FILE + value: {{ template "redis.tlsCert" . }} + - name: REDIS_TLS_KEY_FILE + value: {{ template "redis.tlsCertKey" . }} + - name: REDIS_TLS_CA_FILE + value: {{ template "redis.tlsCACert" . }} + {{- if .Values.tls.dhParamsFilename }} + - name: REDIS_TLS_DH_PARAMS_FILE + value: {{ template "redis.tlsDHParams" . }} + {{- end }} + {{- else }} + - name: REDIS_PORT + value: {{ .Values.replica.containerPorts.redis | quote }} + {{- end }} + {{- if .Values.replica.extraEnvVars }} + {{- include "common.tplvalues.render" (dict "value" .Values.replica.extraEnvVars "context" $) | nindent 12 }} + {{- end }} + {{- if or .Values.replica.extraEnvVarsCM .Values.replica.extraEnvVarsSecret }} + envFrom: + {{- if .Values.replica.extraEnvVarsCM }} + - configMapRef: + name: {{ .Values.replica.extraEnvVarsCM }} + {{- end }} + {{- if .Values.replica.extraEnvVarsSecret }} + - secretRef: + name: {{ .Values.replica.extraEnvVarsSecret }} + {{- end }} + {{- end }} + ports: + - name: redis + containerPort: {{ .Values.replica.containerPorts.redis }} + {{- if not .Values.diagnosticMode.enabled }} + {{- if .Values.replica.customStartupProbe }} + startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.replica.customStartupProbe "context" $) | nindent 12 }} + {{- else if .Values.replica.startupProbe.enabled }} + startupProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.replica.startupProbe "enabled") "context" $) | nindent 12 }} + tcpSocket: + port: redis + {{- end }} + {{- if .Values.replica.customLivenessProbe }} + livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.replica.customLivenessProbe "context" $) | nindent 12 }} + {{- else if .Values.replica.livenessProbe.enabled }} + livenessProbe: + initialDelaySeconds: {{ .Values.replica.livenessProbe.initialDelaySeconds }} + periodSeconds: {{ .Values.replica.livenessProbe.periodSeconds }} + timeoutSeconds: {{ add1 .Values.replica.livenessProbe.timeoutSeconds }} + successThreshold: {{ .Values.replica.livenessProbe.successThreshold }} + failureThreshold: {{ .Values.replica.livenessProbe.failureThreshold }} + exec: + command: + - sh + - -c + - /health/ping_liveness_local_and_master.sh {{ .Values.replica.livenessProbe.timeoutSeconds }} + {{- end }} + {{- if .Values.replica.customReadinessProbe }} + readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.replica.customReadinessProbe "context" $) | nindent 12 }} + {{- else if .Values.replica.readinessProbe.enabled }} + readinessProbe: + initialDelaySeconds: {{ .Values.replica.readinessProbe.initialDelaySeconds }} + periodSeconds: {{ .Values.replica.readinessProbe.periodSeconds }} + timeoutSeconds: {{ add1 .Values.replica.readinessProbe.timeoutSeconds }} + successThreshold: {{ .Values.replica.readinessProbe.successThreshold }} + failureThreshold: {{ .Values.replica.readinessProbe.failureThreshold }} + exec: + command: + - sh + - -c + - /health/ping_readiness_local_and_master.sh {{ .Values.replica.readinessProbe.timeoutSeconds }} + {{- end }} + {{- end }} + {{- if .Values.replica.resources }} + resources: {{- toYaml .Values.replica.resources | nindent 12 }} + {{- end }} + volumeMounts: + - name: start-scripts + mountPath: /opt/bitnami/scripts/start-scripts + - name: health + mountPath: /health + {{- if .Values.auth.usePasswordFiles }} + - name: redis-password + mountPath: /opt/bitnami/redis/secrets/ + {{- end }} + - name: redis-data + mountPath: /data + {{- if .Values.replica.persistence.subPath }} + subPath: {{ .Values.replica.persistence.subPath }} + {{- else if .Values.replica.persistence.subPathExpr }} + subPathExpr: {{ .Values.replica.persistence.subPathExpr }} + {{- end }} + - name: config + mountPath: /opt/bitnami/redis/mounted-etc + - name: redis-tmp-conf + mountPath: /opt/bitnami/redis/etc + {{- if .Values.tls.enabled }} + - name: redis-certificates + mountPath: /opt/bitnami/redis/certs + readOnly: true + {{- end }} + {{- if .Values.replica.extraVolumeMounts }} + {{- include "common.tplvalues.render" ( dict "value" .Values.replica.extraVolumeMounts "context" $ ) | nindent 12 }} + {{- end }} + {{- if .Values.metrics.enabled }} + - name: metrics + image: {{ include "redis.metrics.image" . }} + imagePullPolicy: {{ .Values.metrics.image.pullPolicy | quote }} + {{- if .Values.metrics.containerSecurityContext.enabled }} + securityContext: {{- omit .Values.metrics.containerSecurityContext "enabled" | toYaml | nindent 12 }} + {{- end }} + {{- if .Values.diagnosticMode.enabled }} + command: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.command "context" $) | nindent 12 }} + {{- else if .Values.metrics.command }} + command: {{- include "common.tplvalues.render" (dict "value" .Values.metrics.command "context" $) | nindent 12 }} + {{- else }} + command: + - /bin/bash + - -c + - | + if [[ -f '/secrets/redis-password' ]]; then + export REDIS_PASSWORD=$(cat /secrets/redis-password) + fi + redis_exporter{{- range $key, $value := .Values.metrics.extraArgs }} --{{ $key }}={{ $value }}{{- end }} + {{- end }} + {{- if .Values.diagnosticMode.enabled }} + args: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.args "context" $) | nindent 12 }} + {{- end }} + env: + - name: REDIS_ALIAS + value: {{ template "common.names.fullname" . }} + {{- if .Values.auth.enabled }} + - name: REDIS_USER + value: default + {{- if (not .Values.auth.usePasswordFiles) }} + - name: REDIS_PASSWORD + valueFrom: + secretKeyRef: + name: {{ template "redis.secretName" . }} + key: {{ template "redis.secretPasswordKey" . }} + {{- end }} + {{- end }} + {{- if .Values.tls.enabled }} + - name: REDIS_ADDR + value: rediss://{{ .Values.metrics.redisTargetHost }}:{{ .Values.replica.containerPorts.redis }} + {{- if .Values.tls.authClients }} + - name: REDIS_EXPORTER_TLS_CLIENT_KEY_FILE + value: {{ template "redis.tlsCertKey" . }} + - name: REDIS_EXPORTER_TLS_CLIENT_CERT_FILE + value: {{ template "redis.tlsCert" . }} + {{- end }} + - name: REDIS_EXPORTER_TLS_CA_CERT_FILE + value: {{ template "redis.tlsCACert" . }} + {{- end }} + {{- if .Values.metrics.extraEnvVars }} + {{- include "common.tplvalues.render" (dict "value" .Values.metrics.extraEnvVars "context" $) | nindent 12 }} + {{- end }} + ports: + - name: metrics + containerPort: 9121 + {{- if not .Values.diagnosticMode.enabled }} + {{- if .Values.metrics.customStartupProbe }} + startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.metrics.customStartupProbe "context" $) | nindent 12 }} + {{- else if .Values.metrics.startupProbe.enabled }} + startupProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.metrics.startupProbe "enabled") "context" $) | nindent 12 }} + tcpSocket: + port: metrics + {{- end }} + {{- if .Values.metrics.customLivenessProbe }} + livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.metrics.customLivenessProbe "context" $) | nindent 12 }} + {{- else if .Values.metrics.livenessProbe.enabled }} + livenessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.metrics.livenessProbe "enabled") "context" $) | nindent 12 }} + tcpSocket: + port: metrics + {{- end }} + {{- if .Values.metrics.customReadinessProbe }} + readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.metrics.customReadinessProbe "context" $) | nindent 12 }} + {{- else if .Values.metrics.readinessProbe.enabled }} + readinessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.metrics.readinessProbe "enabled") "context" $) | nindent 12 }} + httpGet: + path: / + port: metrics + {{- end }} + {{- end }} + {{- if .Values.metrics.resources }} + resources: {{- toYaml .Values.metrics.resources | nindent 12 }} + {{- end }} + volumeMounts: + {{- if .Values.auth.usePasswordFiles }} + - name: redis-password + mountPath: /secrets/ + {{- end }} + {{- if .Values.tls.enabled }} + - name: redis-certificates + mountPath: /opt/bitnami/redis/certs + readOnly: true + {{- end }} + {{- if .Values.metrics.extraVolumeMounts }} + {{- include "common.tplvalues.render" ( dict "value" .Values.metrics.extraVolumeMounts "context" $ ) | nindent 12 }} + {{- end }} + {{- end }} + {{- if .Values.replica.sidecars }} + {{- include "common.tplvalues.render" (dict "value" .Values.replica.sidecars "context" $) | nindent 8 }} + {{- end }} + {{- $needsVolumePermissions := and .Values.volumePermissions.enabled .Values.replica.persistence.enabled .Values.replica.podSecurityContext.enabled .Values.replica.containerSecurityContext.enabled }} + {{- if or .Values.replica.initContainers $needsVolumePermissions .Values.sysctl.enabled }} + initContainers: + {{- if .Values.replica.initContainers }} + {{- include "common.tplvalues.render" (dict "value" .Values.replica.initContainers "context" $) | nindent 8 }} + {{- end }} + {{- if $needsVolumePermissions }} + - name: volume-permissions + image: {{ include "redis.volumePermissions.image" . }} + imagePullPolicy: {{ .Values.volumePermissions.image.pullPolicy | quote }} + command: + - /bin/bash + - -ec + - | + {{- if eq ( toString ( .Values.volumePermissions.containerSecurityContext.runAsUser )) "auto" }} + chown -R `id -u`:`id -G | cut -d " " -f2` {{ .Values.replica.persistence.path }} + {{- else }} + chown -R {{ .Values.replica.containerSecurityContext.runAsUser }}:{{ .Values.replica.podSecurityContext.fsGroup }} {{ .Values.replica.persistence.path }} + {{- end }} + {{- if eq ( toString ( .Values.volumePermissions.containerSecurityContext.runAsUser )) "auto" }} + securityContext: {{- omit .Values.volumePermissions.containerSecurityContext "runAsUser" | toYaml | nindent 12 }} + {{- else }} + securityContext: {{- .Values.volumePermissions.containerSecurityContext | toYaml | nindent 12 }} + {{- end }} + {{- if .Values.volumePermissions.resources }} + resources: {{- toYaml .Values.volumePermissions.resources | nindent 12 }} + {{- end }} + volumeMounts: + - name: redis-data + mountPath: {{ .Values.replica.persistence.path }} + {{- if .Values.replica.persistence.subPath }} + subPath: {{ .Values.replica.persistence.subPath }} + {{- else if .Values.replica.persistence.subPathExpr }} + subPathExpr: {{ .Values.replica.persistence.subPathExpr }} + {{- end }} + {{- end }} + {{- if .Values.sysctl.enabled }} + - name: init-sysctl + image: {{ include "redis.sysctl.image" . }} + imagePullPolicy: {{ default "" .Values.sysctl.image.pullPolicy | quote }} + securityContext: + privileged: true + runAsUser: 0 + {{- if .Values.sysctl.command }} + command: {{- include "common.tplvalues.render" (dict "value" .Values.sysctl.command "context" $) | nindent 12 }} + {{- end }} + {{- if .Values.sysctl.resources }} + resources: {{- toYaml .Values.sysctl.resources | nindent 12 }} + {{- end }} + {{- if .Values.sysctl.mountHostSys }} + volumeMounts: + - name: host-sys + mountPath: /host-sys + {{- end }} + {{- end }} + {{- end }} + volumes: + - name: start-scripts + configMap: + name: {{ printf "%s-scripts" (include "common.names.fullname" .) }} + defaultMode: 0755 + - name: health + configMap: + name: {{ printf "%s-health" (include "common.names.fullname" .) }} + defaultMode: 0755 + {{- if .Values.auth.usePasswordFiles }} + - name: redis-password + secret: + secretName: {{ template "redis.secretName" . }} + items: + - key: {{ template "redis.secretPasswordKey" . }} + path: redis-password + {{- end }} + - name: config + configMap: + name: {{ include "redis.configmapName" . }} + {{- if .Values.sysctl.mountHostSys }} + - name: host-sys + hostPath: + path: /sys + {{- end }} + - name: redis-tmp-conf + {{- if or .Values.replica.persistence.medium .Values.replica.persistence.sizeLimit }} + emptyDir: + {{- if .Values.replica.persistence.medium }} + medium: {{ .Values.replica.persistence.medium | quote }} + {{- end }} + {{- if .Values.replica.persistence.sizeLimit }} + sizeLimit: {{ .Values.replica.persistence.sizeLimit | quote }} + {{- end }} + {{- else }} + emptyDir: {} + {{- end }} + {{- if .Values.tls.enabled }} + - name: redis-certificates + secret: + secretName: {{ include "redis.tlsSecretName" . }} + defaultMode: 256 + {{- end }} + {{- if .Values.replica.extraVolumes }} + {{- include "common.tplvalues.render" ( dict "value" .Values.replica.extraVolumes "context" $ ) | nindent 8 }} + {{- end }} + {{- if .Values.metrics.extraVolumes }} + {{- include "common.tplvalues.render" ( dict "value" .Values.metrics.extraVolumes "context" $ ) | nindent 8 }} + {{- end }} + {{- if not .Values.replica.persistence.enabled }} + - name: redis-data + {{- if or .Values.replica.persistence.medium .Values.replica.persistence.sizeLimit }} + emptyDir: + {{- if .Values.replica.persistence.medium }} + medium: {{ .Values.replica.persistence.medium | quote }} + {{- end }} + {{- if .Values.replica.persistence.sizeLimit }} + sizeLimit: {{ .Values.replica.persistence.sizeLimit | quote }} + {{- end }} + {{- else }} + emptyDir: {} + {{- end }} + {{- else if .Values.replica.persistence.existingClaim }} + - name: redis-data + persistentVolumeClaim: + claimName: {{ printf "%s" (tpl .Values.replica.persistence.existingClaim .) }} + {{- else }} + volumeClaimTemplates: + - metadata: + name: redis-data + labels: {{- include "common.labels.matchLabels" . | nindent 10 }} + app.kubernetes.io/component: replica + {{- if .Values.replica.persistence.annotations }} + annotations: {{- toYaml .Values.replica.persistence.annotations | nindent 10 }} + {{- end }} + spec: + accessModes: + {{- range .Values.replica.persistence.accessModes }} + - {{ . | quote }} + {{- end }} + resources: + requests: + storage: {{ .Values.replica.persistence.size | quote }} + {{- if .Values.replica.persistence.selector }} + selector: {{- include "common.tplvalues.render" (dict "value" .Values.replica.persistence.selector "context" $) | nindent 10 }} + {{- end }} + {{- if .Values.replica.persistence.dataSource }} + dataSource: {{- include "common.tplvalues.render" (dict "value" .Values.replica.persistence.dataSource "context" $) | nindent 10 }} + {{- end }} + {{- include "common.storage.class" (dict "persistence" .Values.replica.persistence "global" .Values.global) | nindent 8 }} + {{- end }} +{{- end }} diff --git a/redis-fetcher/templates/role.yaml b/redis-fetcher/templates/role.yaml new file mode 100644 index 00000000..596466f3 --- /dev/null +++ b/redis-fetcher/templates/role.yaml @@ -0,0 +1,28 @@ +{{- if .Values.rbac.create }} +apiVersion: {{ include "common.capabilities.rbac.apiVersion" . }} +kind: Role +metadata: + name: {{ template "common.names.fullname" . }} + namespace: {{ .Release.Namespace | quote }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} +rules: + {{- $pspAvailable := (semverCompare "<1.25-0" (include "common.capabilities.kubeVersion" .)) -}} + {{- if and $pspAvailable .Values.podSecurityPolicy.enabled }} + - apiGroups: + - '{{ template "podSecurityPolicy.apiGroup" . }}' + resources: + - 'podsecuritypolicies' + verbs: + - 'use' + resourceNames: [{{ printf "%s-master" (include "common.names.fullname" .) }}] + {{- end }} + {{- if .Values.rbac.rules }} + {{- include "common.tplvalues.render" ( dict "value" .Values.rbac.rules "context" $ ) | nindent 2 }} + {{- end }} +{{- end }} diff --git a/redis-fetcher/templates/rolebinding.yaml b/redis-fetcher/templates/rolebinding.yaml new file mode 100644 index 00000000..74968b8f --- /dev/null +++ b/redis-fetcher/templates/rolebinding.yaml @@ -0,0 +1,21 @@ +{{- if .Values.rbac.create }} +apiVersion: {{ include "common.capabilities.rbac.apiVersion" . }} +kind: RoleBinding +metadata: + name: {{ template "common.names.fullname" . }} + namespace: {{ .Release.Namespace | quote }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: Role + name: {{ template "common.names.fullname" . }} +subjects: + - kind: ServiceAccount + name: {{ template "redis.serviceAccountName" . }} +{{- end }} diff --git a/redis-fetcher/templates/scripts-configmap.yaml b/redis-fetcher/templates/scripts-configmap.yaml new file mode 100644 index 00000000..96e2f1a0 --- /dev/null +++ b/redis-fetcher/templates/scripts-configmap.yaml @@ -0,0 +1,713 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: {{ printf "%s-scripts" (include "common.names.fullname" .) }} + namespace: {{ .Release.Namespace | quote }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} +data: +{{- if and (eq .Values.architecture "replication") .Values.sentinel.enabled }} + start-node.sh: | + #!/bin/bash + + . /opt/bitnami/scripts/libos.sh + . /opt/bitnami/scripts/liblog.sh + . /opt/bitnami/scripts/libvalidations.sh + + get_port() { + hostname="$1" + type="$2" + + port_var=$(echo "${hostname^^}_SERVICE_PORT_$type" | sed "s/-/_/g") + port=${!port_var} + + if [ -z "$port" ]; then + case $type in + "SENTINEL") + echo {{ .Values.sentinel.containerPorts.sentinel }} + ;; + "REDIS") + echo {{ .Values.master.containerPorts.redis }} + ;; + esac + else + echo $port + fi + } + + get_full_hostname() { + hostname="$1" + + {{- if .Values.useExternalDNS.enabled }} + full_hostname="${hostname}.{{- include "redis.externalDNS.suffix" . }}" + {{- else if eq .Values.sentinel.service.type "NodePort" }} + full_hostname="${hostname}.{{- .Release.Namespace }}" + {{- else }} + full_hostname="${hostname}.${HEADLESS_SERVICE}" + {{- end }} + + {{- if .Values.useHostnames }} + echo "${full_hostname}" + {{- else }} + getent hosts "${full_hostname}" | awk '{ print $1 ; exit }' + {{- end }} + } + + REDISPORT=$(get_port "$HOSTNAME" "REDIS") + + HEADLESS_SERVICE="{{ template "common.names.fullname" . }}-headless.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}" + + if [ -n "$REDIS_EXTERNAL_MASTER_HOST" ]; then + REDIS_SERVICE="$REDIS_EXTERNAL_MASTER_HOST" + else + REDIS_SERVICE="{{ template "common.names.fullname" . }}.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}" + fi + + SENTINEL_SERVICE_PORT=$(get_port "{{ include "common.names.fullname" . }}" "TCP_SENTINEL") + validate_quorum() { + if is_boolean_yes "$REDIS_TLS_ENABLED"; then + quorum_info_command="{{- if and .Values.auth.enabled .Values.auth.sentinel }}REDISCLI_AUTH="\$REDIS_PASSWORD" {{ end }}redis-cli -h $REDIS_SERVICE -p $SENTINEL_SERVICE_PORT --tls --cert ${REDIS_TLS_CERT_FILE} --key ${REDIS_TLS_KEY_FILE} --cacert ${REDIS_TLS_CA_FILE} sentinel master {{ .Values.sentinel.masterSet }}" + else + quorum_info_command="{{- if and .Values.auth.enabled .Values.auth.sentinel }}REDISCLI_AUTH="\$REDIS_PASSWORD" {{ end }}redis-cli -h $REDIS_SERVICE -p $SENTINEL_SERVICE_PORT sentinel master {{ .Values.sentinel.masterSet }}" + fi + info "about to run the command: $quorum_info_command" + eval $quorum_info_command | grep -Fq "s_down" + } + + trigger_manual_failover() { + if is_boolean_yes "$REDIS_TLS_ENABLED"; then + failover_command="{{- if and .Values.auth.enabled .Values.auth.sentinel }}REDISCLI_AUTH="\$REDIS_PASSWORD" {{ end }}redis-cli -h $REDIS_SERVICE -p $SENTINEL_SERVICE_PORT --tls --cert ${REDIS_TLS_CERT_FILE} --key ${REDIS_TLS_KEY_FILE} --cacert ${REDIS_TLS_CA_FILE} sentinel failover {{ .Values.sentinel.masterSet }}" + else + failover_command="{{- if and .Values.auth.enabled .Values.auth.sentinel }}REDISCLI_AUTH="\$REDIS_PASSWORD" {{ end }}redis-cli -h $REDIS_SERVICE -p $SENTINEL_SERVICE_PORT sentinel failover {{ .Values.sentinel.masterSet }}" + fi + + info "about to run the command: $failover_command" + eval $failover_command + } + + get_sentinel_master_info() { + if is_boolean_yes "$REDIS_TLS_ENABLED"; then + sentinel_info_command="{{- if and .Values.auth.enabled .Values.auth.sentinel }}REDISCLI_AUTH="\$REDIS_PASSWORD" {{ end }}timeout {{ .Values.sentinel.getMasterTimeout }} redis-cli -h $REDIS_SERVICE -p $SENTINEL_SERVICE_PORT --tls --cert ${REDIS_TLS_CERT_FILE} --key ${REDIS_TLS_KEY_FILE} --cacert ${REDIS_TLS_CA_FILE} sentinel get-master-addr-by-name {{ .Values.sentinel.masterSet }}" + else + sentinel_info_command="{{- if and .Values.auth.enabled .Values.auth.sentinel }}REDISCLI_AUTH="\$REDIS_PASSWORD" {{ end }}timeout {{ .Values.sentinel.getMasterTimeout }} redis-cli -h $REDIS_SERVICE -p $SENTINEL_SERVICE_PORT sentinel get-master-addr-by-name {{ .Values.sentinel.masterSet }}" + fi + + info "about to run the command: $sentinel_info_command" + eval $sentinel_info_command + } + + {{- if and .Values.replica.containerSecurityContext.runAsUser (eq (.Values.replica.containerSecurityContext.runAsUser | int) 0) }} + useradd redis + chown -R redis {{ .Values.replica.persistence.path }} + {{- end }} + + [[ -f $REDIS_PASSWORD_FILE ]] && export REDIS_PASSWORD="$(< "${REDIS_PASSWORD_FILE}")" + [[ -f $REDIS_MASTER_PASSWORD_FILE ]] && export REDIS_MASTER_PASSWORD="$(< "${REDIS_MASTER_PASSWORD_FILE}")" + + # check if there is a master + master_in_persisted_conf="$(get_full_hostname "$HOSTNAME")" + master_port_in_persisted_conf="$REDIS_MASTER_PORT_NUMBER" + master_in_sentinel="$(get_sentinel_master_info)" + redisRetVal=$? + + {{- if .Values.sentinel.persistence.enabled }} + if [[ -f /opt/bitnami/redis-sentinel/etc/sentinel.conf ]]; then + master_in_persisted_conf="$(awk '/monitor/ {print $4}' /opt/bitnami/redis-sentinel/etc/sentinel.conf)" + master_port_in_persisted_conf="$(awk '/monitor/ {print $5}' /opt/bitnami/redis-sentinel/etc/sentinel.conf)" + info "Found previous master ${master_in_persisted_conf}:${master_port_in_persisted_conf} in /opt/bitnami/redis-sentinel/etc/sentinel.conf" + debug "$(cat /opt/bitnami/redis-sentinel/etc/sentinel.conf | grep monitor)" + touch /opt/bitnami/redis-sentinel/etc/.node_read + fi + {{- end }} + + if [[ $redisRetVal -ne 0 ]]; then + if [[ "$master_in_persisted_conf" == "$(get_full_hostname "$HOSTNAME")" ]]; then + # Case 1: No active sentinel and in previous sentinel.conf we were the master --> MASTER + info "Configuring the node as master" + export REDIS_REPLICATION_MODE="master" + else + # Case 2: No active sentinel and in previous sentinel.conf we were not master --> REPLICA + info "Configuring the node as replica" + export REDIS_REPLICATION_MODE="replica" + REDIS_MASTER_HOST=${master_in_persisted_conf} + REDIS_MASTER_PORT_NUMBER=${master_port_in_persisted_conf} + fi + else + # Fetches current master's host and port + REDIS_SENTINEL_INFO=($(get_sentinel_master_info)) + info "Current master: REDIS_SENTINEL_INFO=(${REDIS_SENTINEL_INFO[0]},${REDIS_SENTINEL_INFO[1]})" + REDIS_MASTER_HOST=${REDIS_SENTINEL_INFO[0]} + REDIS_MASTER_PORT_NUMBER=${REDIS_SENTINEL_INFO[1]} + + if [[ "$REDIS_MASTER_HOST" == "$(get_full_hostname "$HOSTNAME")" ]]; then + # Case 3: Active sentinel and master it is this node --> MASTER + info "Configuring the node as master" + export REDIS_REPLICATION_MODE="master" + else + # Case 4: Active sentinel and master is not this node --> REPLICA + info "Configuring the node as replica" + export REDIS_REPLICATION_MODE="replica" + + {{- if and .Values.sentinel.automateClusterRecovery (le (int .Values.sentinel.downAfterMilliseconds) 2000) }} + retry_count=1 + while validate_quorum + do + info "sleeping, waiting for Redis master to come up" + sleep 1s + if ! ((retry_count % 11)); then + info "Trying to manually failover" + failover_result=$(trigger_manual_failover) + + debug "Failover result: $failover_result" + fi + + ((retry_count+=1)) + done + info "Redis master is up now" + {{- end }} + fi + fi + + if [[ -n "$REDIS_EXTERNAL_MASTER_HOST" ]]; then + REDIS_MASTER_HOST="$REDIS_EXTERNAL_MASTER_HOST" + REDIS_MASTER_PORT_NUMBER="${REDIS_EXTERNAL_MASTER_PORT}" + fi + + if [[ -f /opt/bitnami/redis/mounted-etc/replica.conf ]];then + cp /opt/bitnami/redis/mounted-etc/replica.conf /opt/bitnami/redis/etc/replica.conf + fi + + if [[ -f /opt/bitnami/redis/mounted-etc/redis.conf ]];then + cp /opt/bitnami/redis/mounted-etc/redis.conf /opt/bitnami/redis/etc/redis.conf + fi + + echo "" >> /opt/bitnami/redis/etc/replica.conf + echo "replica-announce-port $REDISPORT" >> /opt/bitnami/redis/etc/replica.conf + echo "replica-announce-ip $(get_full_hostname "$HOSTNAME")" >> /opt/bitnami/redis/etc/replica.conf + + {{- if .Values.tls.enabled }} + ARGS=("--port" "0") + ARGS+=("--tls-port" "${REDIS_TLS_PORT}") + ARGS+=("--tls-cert-file" "${REDIS_TLS_CERT_FILE}") + ARGS+=("--tls-key-file" "${REDIS_TLS_KEY_FILE}") + ARGS+=("--tls-ca-cert-file" "${REDIS_TLS_CA_FILE}") + ARGS+=("--tls-auth-clients" "${REDIS_TLS_AUTH_CLIENTS}") + ARGS+=("--tls-replication" "yes") + {{- if .Values.tls.dhParamsFilename }} + ARGS+=("--tls-dh-params-file" "${REDIS_TLS_DH_PARAMS_FILE}") + {{- end }} + {{- else }} + ARGS=("--port" "${REDIS_PORT}") + {{- end }} + + if [[ "$REDIS_REPLICATION_MODE" = "slave" ]] || [[ "$REDIS_REPLICATION_MODE" = "replica" ]]; then + ARGS+=("--replicaof" "${REDIS_MASTER_HOST}" "${REDIS_MASTER_PORT_NUMBER}") + fi + + {{- if .Values.auth.enabled }} + ARGS+=("--requirepass" "${REDIS_PASSWORD}") + ARGS+=("--masterauth" "${REDIS_MASTER_PASSWORD}") + {{- else }} + ARGS+=("--protected-mode" "no") + {{- end }} + ARGS+=("--include" "/opt/bitnami/redis/etc/replica.conf") + ARGS+=("--include" "/opt/bitnami/redis/etc/redis.conf") + {{- if .Values.replica.extraFlags }} + {{- range .Values.replica.extraFlags }} + ARGS+=({{ . | quote }}) + {{- end }} + {{- end }} + + {{- if .Values.replica.preExecCmds }} + {{- .Values.replica.preExecCmds | nindent 4 }} + {{- end }} + + {{- if .Values.replica.command }} + exec {{ .Values.replica.command }} "${ARGS[@]}" + {{- else }} + exec redis-server "${ARGS[@]}" + {{- end }} + + start-sentinel.sh: | + #!/bin/bash + + . /opt/bitnami/scripts/libos.sh + . /opt/bitnami/scripts/libvalidations.sh + . /opt/bitnami/scripts/libfile.sh + + HEADLESS_SERVICE="{{ template "common.names.fullname" . }}-headless.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}" + REDIS_SERVICE="{{ template "common.names.fullname" . }}.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}" + + get_port() { + hostname="$1" + type="$2" + + port_var=$(echo "${hostname^^}_SERVICE_PORT_$type" | sed "s/-/_/g") + port=${!port_var} + + if [ -z "$port" ]; then + case $type in + "SENTINEL") + echo {{ .Values.sentinel.containerPorts.sentinel }} + ;; + "REDIS") + echo {{ .Values.master.containerPorts.redis }} + ;; + esac + else + echo $port + fi + } + + get_full_hostname() { + hostname="$1" + + {{- if .Values.useExternalDNS.enabled }} + full_hostname="${hostname}.{{- include "redis.externalDNS.suffix" . }}" + {{- else if eq .Values.sentinel.service.type "NodePort" }} + full_hostname="${hostname}.{{- .Release.Namespace }}" + {{- else }} + full_hostname="${hostname}.${HEADLESS_SERVICE}" + {{- end }} + + {{- if .Values.useHostnames }} + echo "${full_hostname}" + {{- else }} + getent hosts "${full_hostname}" | awk '{ print $1 ; exit }' + {{- end }} + } + + SERVPORT=$(get_port "$HOSTNAME" "SENTINEL") + REDISPORT=$(get_port "$HOSTNAME" "REDIS") + SENTINEL_SERVICE_PORT=$(get_port "{{ include "common.names.fullname" . }}" "TCP_SENTINEL") + + sentinel_conf_set() { + local -r key="${1:?missing key}" + local value="${2:-}" + + # Sanitize inputs + value="${value//\\/\\\\}" + value="${value//&/\\&}" + value="${value//\?/\\?}" + [[ "$value" = "" ]] && value="\"$value\"" + + replace_in_file "/opt/bitnami/redis-sentinel/etc/sentinel.conf" "^#*\s*${key} .*" "${key} ${value}" false + } + sentinel_conf_add() { + echo $'\n'"$@" >> "/opt/bitnami/redis-sentinel/etc/sentinel.conf" + } + host_id() { + echo "$1" | openssl sha1 | awk '{print $2}' + } + get_sentinel_master_info() { + if is_boolean_yes "$REDIS_SENTINEL_TLS_ENABLED"; then + sentinel_info_command="{{- if and .Values.auth.enabled .Values.auth.sentinel }}REDISCLI_AUTH="\$REDIS_PASSWORD" {{ end }}timeout {{ .Values.sentinel.getMasterTimeout }} redis-cli -h $REDIS_SERVICE -p $SENTINEL_SERVICE_PORT --tls --cert ${REDIS_SENTINEL_TLS_CERT_FILE} --key ${REDIS_SENTINEL_TLS_KEY_FILE} --cacert ${REDIS_SENTINEL_TLS_CA_FILE} sentinel get-master-addr-by-name {{ .Values.sentinel.masterSet }}" + else + sentinel_info_command="{{- if and .Values.auth.enabled .Values.auth.sentinel }}REDISCLI_AUTH="\$REDIS_PASSWORD" {{ end }}timeout {{ .Values.sentinel.getMasterTimeout }} redis-cli -h $REDIS_SERVICE -p $SENTINEL_SERVICE_PORT sentinel get-master-addr-by-name {{ .Values.sentinel.masterSet }}" + fi + info "about to run the command: $sentinel_info_command" + eval $sentinel_info_command + } + + [[ -f $REDIS_PASSWORD_FILE ]] && export REDIS_PASSWORD="$(< "${REDIS_PASSWORD_FILE}")" + + master_in_persisted_conf="$(get_full_hostname "$HOSTNAME")" + + {{- if .Values.sentinel.persistence.enabled }} + if [[ -f /opt/bitnami/redis-sentinel/etc/sentinel.conf ]]; then + check_lock_file() { + [[ -f /opt/bitnami/redis-sentinel/etc/.node_read ]] + } + retry_while "check_lock_file" + rm -f /opt/bitnami/redis-sentinel/etc/.node_read + master_in_persisted_conf="$(awk '/monitor/ {print $4}' /opt/bitnami/redis-sentinel/etc/sentinel.conf)" + info "Found previous master $master_in_persisted_conf in /opt/bitnami/redis-sentinel/etc/sentinel.conf" + debug "$(cat /opt/bitnami/redis-sentinel/etc/sentinel.conf | grep monitor)" + fi + {{- end }} + if ! get_sentinel_master_info && [[ "$master_in_persisted_conf" == "$(get_full_hostname "$HOSTNAME")" ]]; then + # No master found, lets create a master node + export REDIS_REPLICATION_MODE="master" + + REDIS_MASTER_HOST=$(get_full_hostname "$HOSTNAME") + REDIS_MASTER_PORT_NUMBER="$REDISPORT" + else + export REDIS_REPLICATION_MODE="replica" + + # Fetches current master's host and port + REDIS_SENTINEL_INFO=($(get_sentinel_master_info)) + info "printing REDIS_SENTINEL_INFO=(${REDIS_SENTINEL_INFO[0]},${REDIS_SENTINEL_INFO[1]})" + REDIS_MASTER_HOST=${REDIS_SENTINEL_INFO[0]} + REDIS_MASTER_PORT_NUMBER=${REDIS_SENTINEL_INFO[1]} + fi + + if [[ -n "$REDIS_EXTERNAL_MASTER_HOST" ]]; then + REDIS_MASTER_HOST="$REDIS_EXTERNAL_MASTER_HOST" + REDIS_MASTER_PORT_NUMBER="${REDIS_EXTERNAL_MASTER_PORT}" + fi + + cp /opt/bitnami/redis-sentinel/mounted-etc/sentinel.conf /opt/bitnami/redis-sentinel/etc/sentinel.conf + {{- if .Values.auth.enabled }} + printf "\nsentinel auth-pass %s %s" "{{ .Values.sentinel.masterSet }}" "$REDIS_PASSWORD" >> /opt/bitnami/redis-sentinel/etc/sentinel.conf + {{- if and .Values.auth.enabled .Values.auth.sentinel }} + printf "\nrequirepass %s" "$REDIS_PASSWORD" >> /opt/bitnami/redis-sentinel/etc/sentinel.conf + {{- end }} + {{- end }} + printf "\nsentinel myid %s" "$(host_id "$HOSTNAME")" >> /opt/bitnami/redis-sentinel/etc/sentinel.conf + + if [[ -z "$REDIS_MASTER_HOST" ]] || [[ -z "$REDIS_MASTER_PORT_NUMBER" ]] + then + # Prevent incorrect configuration to be written to sentinel.conf + error "Redis master host is configured incorrectly (host: $REDIS_MASTER_HOST, port: $REDIS_MASTER_PORT_NUMBER)" + exit 1 + fi + + sentinel_conf_set "sentinel monitor" "{{ .Values.sentinel.masterSet }} "$REDIS_MASTER_HOST" "$REDIS_MASTER_PORT_NUMBER" {{ .Values.sentinel.quorum }}" + + add_known_sentinel() { + hostname="$1" + ip="$2" + + if [[ -n "$hostname" && -n "$ip" && "$hostname" != "$HOSTNAME" ]]; then + sentinel_conf_add "sentinel known-sentinel {{ .Values.sentinel.masterSet }} $(get_full_hostname "$hostname") $(get_port "$hostname" "SENTINEL") $(host_id "$hostname")" + fi + } + add_known_replica() { + hostname="$1" + ip="$2" + + if [[ -n "$ip" && "$(get_full_hostname "$hostname")" != "$REDIS_MASTER_HOST" ]]; then + sentinel_conf_add "sentinel known-replica {{ .Values.sentinel.masterSet }} $(get_full_hostname "$hostname") $(get_port "$hostname" "REDIS")" + fi + } + + # Add available hosts on the network as known replicas & sentinels + for node in $(seq 0 $(({{ .Values.replica.replicaCount }}-1))); do + hostname="{{ template "common.names.fullname" . }}-node-$node" + ip="$(getent hosts "$hostname.$HEADLESS_SERVICE" | awk '{ print $1 }')" + add_known_sentinel "$hostname" "$ip" + add_known_replica "$hostname" "$ip" + done + + echo "" >> /opt/bitnami/redis-sentinel/etc/sentinel.conf + {{- if not (contains "sentinel announce-hostnames" .Values.sentinel.configuration) }} + echo "sentinel announce-hostnames yes" >> /opt/bitnami/redis-sentinel/etc/sentinel.conf + {{- end }} + {{- if not (contains "sentinel resolve-hostnames" .Values.sentinel.configuration) }} + echo "sentinel resolve-hostnames yes" >> /opt/bitnami/redis-sentinel/etc/sentinel.conf + {{- end }} + {{- if not (contains "sentinel announce-port" .Values.sentinel.configuration) }} + echo "sentinel announce-port $SERVPORT" >> /opt/bitnami/redis-sentinel/etc/sentinel.conf + {{- end }} + {{- if not (contains "sentinel announce-ip" .Values.sentinel.configuration) }} + echo "sentinel announce-ip $(get_full_hostname "$HOSTNAME")" >> /opt/bitnami/redis-sentinel/etc/sentinel.conf + {{- end }} + + {{- if .Values.tls.enabled }} + ARGS=("--port" "0") + ARGS+=("--tls-port" "${REDIS_SENTINEL_TLS_PORT_NUMBER}") + ARGS+=("--tls-cert-file" "${REDIS_SENTINEL_TLS_CERT_FILE}") + ARGS+=("--tls-key-file" "${REDIS_SENTINEL_TLS_KEY_FILE}") + ARGS+=("--tls-ca-cert-file" "${REDIS_SENTINEL_TLS_CA_FILE}") + ARGS+=("--tls-replication" "yes") + ARGS+=("--tls-auth-clients" "${REDIS_SENTINEL_TLS_AUTH_CLIENTS}") + {{- if .Values.tls.dhParamsFilename }} + ARGS+=("--tls-dh-params-file" "${REDIS_SENTINEL_TLS_DH_PARAMS_FILE}") + {{- end }} + {{- end }} + {{- if .Values.sentinel.preExecCmds }} + {{ .Values.sentinel.preExecCmds | nindent 4 }} + {{- end }} + exec redis-server /opt/bitnami/redis-sentinel/etc/sentinel.conf {{- if .Values.tls.enabled }} "${ARGS[@]}" {{- end }} --sentinel + prestop-sentinel.sh: | + #!/bin/bash + + . /opt/bitnami/scripts/libvalidations.sh + . /opt/bitnami/scripts/libos.sh + + HEADLESS_SERVICE="{{ template "common.names.fullname" . }}-headless.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}" + SENTINEL_SERVICE_ENV_NAME={{ printf "%s%s" (upper (include "common.names.fullname" .)| replace "-" "_") "_SERVICE_PORT_TCP_SENTINEL" }} + SENTINEL_SERVICE_PORT=${!SENTINEL_SERVICE_ENV_NAME} + + get_full_hostname() { + hostname="$1" + + {{- if .Values.useExternalDNS.enabled }} + full_hostname="${hostname}.{{- include "redis.externalDNS.suffix" . }}" + {{- else if eq .Values.sentinel.service.type "NodePort" }} + full_hostname="${hostname}.{{- .Release.Namespace }}" + {{- else }} + full_hostname="${hostname}.${HEADLESS_SERVICE}" + {{- end }} + + {{- if .Values.useHostnames }} + echo "${full_hostname}" + {{- else }} + getent hosts "${full_hostname}" | awk '{ print $1 ; exit }' + {{- end }} + } + + run_sentinel_command() { + if is_boolean_yes "$REDIS_SENTINEL_TLS_ENABLED"; then + redis-cli -h "$REDIS_SERVICE" -p "$SENTINEL_SERVICE_PORT" --tls --cert "$REDIS_SENTINEL_TLS_CERT_FILE" --key "$REDIS_SENTINEL_TLS_KEY_FILE" --cacert "$REDIS_SENTINEL_TLS_CA_FILE" sentinel "$@" + else + redis-cli -h "$REDIS_SERVICE" -p "$SENTINEL_SERVICE_PORT" sentinel "$@" + fi + } + sentinel_failover_finished() { + REDIS_SENTINEL_INFO=($(run_sentinel_command get-master-addr-by-name "{{ .Values.sentinel.masterSet }}")) + REDIS_MASTER_HOST="${REDIS_SENTINEL_INFO[0]}" + [[ "$REDIS_MASTER_HOST" != "$(get_full_hostname $HOSTNAME)" ]] + } + + REDIS_SERVICE="{{ include "common.names.fullname" . }}.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}" + + {{ if .Values.auth.sentinel -}} + # redis-cli automatically consumes credentials from the REDISCLI_AUTH variable + [[ -n "$REDIS_PASSWORD" ]] && export REDISCLI_AUTH="$REDIS_PASSWORD" + [[ -f "$REDIS_PASSWORD_FILE" ]] && export REDISCLI_AUTH="$(< "${REDIS_PASSWORD_FILE}")" + {{- end }} + + if ! sentinel_failover_finished; then + echo "I am the master pod and you are stopping me. Starting sentinel failover" + if retry_while "sentinel_failover_finished" "{{ sub .Values.sentinel.terminationGracePeriodSeconds 10 }}" 1; then + echo "Master has been successfuly failed over to a different pod." + exit 0 + else + echo "Master failover failed" + exit 1 + fi + else + exit 0 + fi + prestop-redis.sh: | + #!/bin/bash + + . /opt/bitnami/scripts/libvalidations.sh + . /opt/bitnami/scripts/libos.sh + + run_redis_command() { + if is_boolean_yes "$REDIS_TLS_ENABLED"; then + redis-cli -h 127.0.0.1 -p "$REDIS_TLS_PORT" --tls --cert "$REDIS_TLS_CERT_FILE" --key "$REDIS_TLS_KEY_FILE" --cacert "$REDIS_TLS_CA_FILE" "$@" + else + redis-cli -h 127.0.0.1 -p "$REDIS_PORT" "$@" + fi + } + is_master() { + REDIS_ROLE=$(run_redis_command role | head -1) + [[ "$REDIS_ROLE" == "master" ]] + } + + HEADLESS_SERVICE="{{ template "common.names.fullname" . }}-headless.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}" + SENTINEL_SERVICE_ENV_NAME={{ printf "%s%s" (upper (include "common.names.fullname" .)| replace "-" "_") "_SERVICE_PORT_TCP_SENTINEL" }} + SENTINEL_SERVICE_PORT=${!SENTINEL_SERVICE_ENV_NAME} + + get_full_hostname() { + hostname="$1" + + {{- if .Values.useExternalDNS.enabled }} + full_hostname="${hostname}.{{- include "redis.externalDNS.suffix" . }}" + {{- else if eq .Values.sentinel.service.type "NodePort" }} + full_hostname="${hostname}.{{- .Release.Namespace }}" + {{- else }} + full_hostname="${hostname}.${HEADLESS_SERVICE}" + {{- end }} + + {{- if .Values.useHostnames }} + echo "${full_hostname}" + {{- else }} + getent hosts "${full_hostname}" | awk '{ print $1 ; exit }' + {{- end }} + } + + run_sentinel_command() { + if is_boolean_yes "$REDIS_SENTINEL_TLS_ENABLED"; then + {{ .Values.auth.sentinel | ternary "" "env -u REDISCLI_AUTH " -}} redis-cli -h "$REDIS_SERVICE" -p "$SENTINEL_SERVICE_PORT" --tls --cert "$REDIS_SENTINEL_TLS_CERT_FILE" --key "$REDIS_SENTINEL_TLS_KEY_FILE" --cacert "$REDIS_SENTINEL_TLS_CA_FILE" sentinel "$@" + else + {{ .Values.auth.sentinel | ternary "" "env -u REDISCLI_AUTH " -}} redis-cli -h "$REDIS_SERVICE" -p "$SENTINEL_SERVICE_PORT" sentinel "$@" + fi + } + sentinel_failover_finished() { + REDIS_SENTINEL_INFO=($(run_sentinel_command get-master-addr-by-name "{{ .Values.sentinel.masterSet }}")) + REDIS_MASTER_HOST="${REDIS_SENTINEL_INFO[0]}" + [[ "$REDIS_MASTER_HOST" != "$(get_full_hostname $HOSTNAME)" ]] + } + + REDIS_SERVICE="{{ include "common.names.fullname" . }}.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}" + + # redis-cli automatically consumes credentials from the REDISCLI_AUTH variable + [[ -n "$REDIS_PASSWORD" ]] && export REDISCLI_AUTH="$REDIS_PASSWORD" + [[ -f "$REDIS_PASSWORD_FILE" ]] && export REDISCLI_AUTH="$(< "${REDIS_PASSWORD_FILE}")" + + + if is_master && ! sentinel_failover_finished; then + echo "I am the master pod and you are stopping me. Pausing client connections." + # Pausing client write connections to avoid data loss + run_redis_command CLIENT PAUSE "{{ mul (add 2 (sub .Values.sentinel.terminationGracePeriodSeconds 10)) 1000 }}" WRITE + + echo "Issuing failover" + # if I am the master, issue a command to failover once + run_sentinel_command failover "{{ .Values.sentinel.masterSet }}" + + {{- if .Values.sentinel.redisShutdownWaitFailover }} + echo "Waiting for sentinel to complete failover for up to {{ sub .Values.sentinel.terminationGracePeriodSeconds 10 }}s" + retry_while "sentinel_failover_finished" "{{ sub .Values.sentinel.terminationGracePeriodSeconds 10 }}" 1 + {{- end }} + else + exit 0 + fi + +{{- else }} + start-master.sh: | + #!/bin/bash + + [[ -f $REDIS_PASSWORD_FILE ]] && export REDIS_PASSWORD="$(< "${REDIS_PASSWORD_FILE}")" + {{- if and .Values.master.containerSecurityContext.runAsUser (eq (.Values.master.containerSecurityContext.runAsUser | int) 0) }} + useradd redis + chown -R redis {{ .Values.master.persistence.path }} + {{- end }} + if [[ -f /opt/bitnami/redis/mounted-etc/master.conf ]];then + cp /opt/bitnami/redis/mounted-etc/master.conf /opt/bitnami/redis/etc/master.conf + fi + if [[ -f /opt/bitnami/redis/mounted-etc/redis.conf ]];then + cp /opt/bitnami/redis/mounted-etc/redis.conf /opt/bitnami/redis/etc/redis.conf + fi + {{- if .Values.tls.enabled }} + ARGS=("--port" "0") + ARGS+=("--tls-port" "${REDIS_TLS_PORT}") + ARGS+=("--tls-cert-file" "${REDIS_TLS_CERT_FILE}") + ARGS+=("--tls-key-file" "${REDIS_TLS_KEY_FILE}") + ARGS+=("--tls-ca-cert-file" "${REDIS_TLS_CA_FILE}") + ARGS+=("--tls-auth-clients" "${REDIS_TLS_AUTH_CLIENTS}") + {{- if .Values.tls.dhParamsFilename }} + ARGS+=("--tls-dh-params-file" "${REDIS_TLS_DH_PARAMS_FILE}") + {{- end }} + {{- else }} + ARGS=("--port" "${REDIS_PORT}") + {{- end }} + {{- if .Values.auth.enabled }} + ARGS+=("--requirepass" "${REDIS_PASSWORD}") + ARGS+=("--masterauth" "${REDIS_PASSWORD}") + {{- else }} + ARGS+=("--protected-mode" "no") + {{- end }} + ARGS+=("--include" "/opt/bitnami/redis/etc/redis.conf") + ARGS+=("--include" "/opt/bitnami/redis/etc/master.conf") + {{- if .Values.master.extraFlags }} + {{- range .Values.master.extraFlags }} + ARGS+=({{ . | quote }}) + {{- end }} + {{- end }} + {{- if .Values.master.preExecCmds }} + {{ .Values.master.preExecCmds | nindent 4 }} + {{- end }} + {{- if .Values.master.command }} + exec {{ .Values.master.command }} "${ARGS[@]}" + {{- else }} + exec redis-server "${ARGS[@]}" + {{- end }} + {{- if eq .Values.architecture "replication" }} + start-replica.sh: | + #!/bin/bash + + get_port() { + hostname="$1" + type="$2" + + port_var=$(echo "${hostname^^}_SERVICE_PORT_$type" | sed "s/-/_/g") + port=${!port_var} + + if [ -z "$port" ]; then + case $type in + "SENTINEL") + echo {{ .Values.sentinel.containerPorts.sentinel }} + ;; + "REDIS") + echo {{ .Values.master.containerPorts.redis }} + ;; + esac + else + echo $port + fi + } + + get_full_hostname() { + hostname="$1" + + {{- if .Values.useExternalDNS.enabled }} + full_hostname="${hostname}.{{- include "redis.externalDNS.suffix" . }}" + {{- else if eq .Values.sentinel.service.type "NodePort" }} + full_hostname="${hostname}.{{- .Release.Namespace }}" + {{- else }} + full_hostname="${hostname}.${HEADLESS_SERVICE}" + {{- end }} + + {{- if .Values.useHostnames }} + echo "${full_hostname}" + {{- else }} + getent hosts "${full_hostname}" | awk '{ print $1 ; exit }' + {{- end }} + } + + REDISPORT=$(get_port "$HOSTNAME" "REDIS") + + [[ -f $REDIS_PASSWORD_FILE ]] && export REDIS_PASSWORD="$(< "${REDIS_PASSWORD_FILE}")" + [[ -f $REDIS_MASTER_PASSWORD_FILE ]] && export REDIS_MASTER_PASSWORD="$(< "${REDIS_MASTER_PASSWORD_FILE}")" + {{- if and .Values.replica.containerSecurityContext.runAsUser (eq (.Values.replica.containerSecurityContext.runAsUser | int) 0) }} + useradd redis + chown -R redis {{ .Values.replica.persistence.path }} + {{- end }} + if [[ -f /opt/bitnami/redis/mounted-etc/replica.conf ]];then + cp /opt/bitnami/redis/mounted-etc/replica.conf /opt/bitnami/redis/etc/replica.conf + fi + if [[ -f /opt/bitnami/redis/mounted-etc/redis.conf ]];then + cp /opt/bitnami/redis/mounted-etc/redis.conf /opt/bitnami/redis/etc/redis.conf + fi + + echo "" >> /opt/bitnami/redis/etc/replica.conf + echo "replica-announce-port $REDISPORT" >> /opt/bitnami/redis/etc/replica.conf + echo "replica-announce-ip $(get_full_hostname "$HOSTNAME")" >> /opt/bitnami/redis/etc/replica.conf + + {{- if .Values.tls.enabled }} + ARGS=("--port" "0") + ARGS+=("--tls-port" "${REDIS_TLS_PORT}") + ARGS+=("--tls-cert-file" "${REDIS_TLS_CERT_FILE}") + ARGS+=("--tls-key-file" "${REDIS_TLS_KEY_FILE}") + ARGS+=("--tls-ca-cert-file" "${REDIS_TLS_CA_FILE}") + ARGS+=("--tls-auth-clients" "${REDIS_TLS_AUTH_CLIENTS}") + ARGS+=("--tls-replication" "yes") + {{- if .Values.tls.dhParamsFilename }} + ARGS+=("--tls-dh-params-file" "${REDIS_TLS_DH_PARAMS_FILE}") + {{- end }} + {{- else }} + ARGS=("--port" "${REDIS_PORT}") + {{- end }} + ARGS+=("--replicaof" "${REDIS_MASTER_HOST}" "${REDIS_MASTER_PORT_NUMBER}") + {{- if .Values.auth.enabled }} + ARGS+=("--requirepass" "${REDIS_PASSWORD}") + ARGS+=("--masterauth" "${REDIS_MASTER_PASSWORD}") + {{- else }} + ARGS+=("--protected-mode" "no") + {{- end }} + ARGS+=("--include" "/opt/bitnami/redis/etc/redis.conf") + ARGS+=("--include" "/opt/bitnami/redis/etc/replica.conf") + {{- if .Values.replica.extraFlags }} + {{- range .Values.replica.extraFlags }} + ARGS+=({{ . | quote }}) + {{- end }} + {{- end }} + {{- if .Values.replica.preExecCmds }} + {{ .Values.replica.preExecCmds | nindent 4 }} + {{- end }} + {{- if .Values.replica.command }} + exec {{ .Values.replica.command }} "${ARGS[@]}" + {{- else }} + exec redis-server "${ARGS[@]}" + {{- end }} + {{- end }} +{{- end }} diff --git a/redis-fetcher/templates/secret.yaml b/redis-fetcher/templates/secret.yaml new file mode 100644 index 00000000..2edc0d81 --- /dev/null +++ b/redis-fetcher/templates/secret.yaml @@ -0,0 +1,23 @@ +{{- if and .Values.auth.enabled (not .Values.auth.existingSecret) -}} +apiVersion: v1 +kind: Secret +metadata: + name: {{ template "common.names.fullname" . }} + namespace: {{ .Release.Namespace | quote }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + {{- if or .Values.secretAnnotations .Values.commonAnnotations }} + annotations: + {{- if .Values.secretAnnotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.secretAnnotations "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.commonAnnotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} + {{- end }} +type: Opaque +data: + redis-password: {{ include "redis.password" . | b64enc | quote }} +{{- end -}} diff --git a/redis-fetcher/templates/sentinel/hpa.yaml b/redis-fetcher/templates/sentinel/hpa.yaml new file mode 100644 index 00000000..e1b765e6 --- /dev/null +++ b/redis-fetcher/templates/sentinel/hpa.yaml @@ -0,0 +1,47 @@ +{{- if and .Values.replica.autoscaling.enabled .Values.sentinel.enabled }} +apiVersion: {{ include "common.capabilities.hpa.apiVersion" ( dict "context" $ ) }} +kind: HorizontalPodAutoscaler +metadata: + name: {{ printf "%s-node" (include "common.names.fullname" .) }} + namespace: {{ .Release.Namespace | quote }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + app.kubernetes.io/component: replica + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" (dict "value" .Values.commonLabels "context" $) | nindent 4 }} + {{- end }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} +spec: + scaleTargetRef: + apiVersion: {{ include "common.capabilities.deployment.apiVersion" . }} + kind: StatefulSet + name: {{ printf "%s-node" (include "common.names.fullname" .) }} + minReplicas: {{ .Values.replica.autoscaling.minReplicas }} + maxReplicas: {{ .Values.replica.autoscaling.maxReplicas }} + metrics: + {{- if .Values.replica.autoscaling.targetMemory }} + - type: Resource + resource: + name: memory + {{- if semverCompare "<1.23-0" (include "common.capabilities.kubeVersion" .) }} + targetAverageUtilization: {{ .Values.replica.autoscaling.targetMemory }} + {{- else }} + target: + type: Utilization + averageUtilization: {{ .Values.replica.autoscaling.targetMemory }} + {{- end }} + {{- end }} + {{- if .Values.replica.autoscaling.targetCPU }} + - type: Resource + resource: + name: cpu + {{- if semverCompare "<1.23-0" (include "common.capabilities.kubeVersion" .) }} + targetAverageUtilization: {{ .Values.replica.autoscaling.targetCPU }} + {{- else }} + target: + type: Utilization + averageUtilization: {{ .Values.replica.autoscaling.targetCPU }} + {{- end }} + {{- end }} +{{- end }} diff --git a/redis-fetcher/templates/sentinel/node-services.yaml b/redis-fetcher/templates/sentinel/node-services.yaml new file mode 100644 index 00000000..d3e635e9 --- /dev/null +++ b/redis-fetcher/templates/sentinel/node-services.yaml @@ -0,0 +1,70 @@ +{{- if and (eq .Values.architecture "replication") .Values.sentinel.enabled (eq .Values.sentinel.service.type "NodePort") (or .Release.IsUpgrade .Values.sentinel.service.nodePorts.redis ) }} + +{{- range $i := until (int .Values.replica.replicaCount) }} + +{{ $portsmap := (lookup "v1" "ConfigMap" $.Release.Namespace (printf "%s-%s" ( include "common.names.fullname" $ ) "ports-configmap")).data }} + +{{ $sentinelport := 0}} +{{ $redisport := 0}} +{{- if $portsmap }} +{{ $sentinelport = index $portsmap (printf "%s-node-%s-%s" (include "common.names.fullname" $) (toString $i) "sentinel") }} +{{ $redisport = index $portsmap (printf "%s-node-%s-%s" (include "common.names.fullname" $) (toString $i) "redis") }} +{{- else }} +{{- end }} +apiVersion: v1 +kind: Service +metadata: + name: {{ template "common.names.fullname" $ }}-node-{{ $i }} + namespace: {{ $.Release.Namespace | quote }} + labels: {{- include "common.labels.standard" $ | nindent 4 }} + app.kubernetes.io/component: node + {{- if $.Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" $.Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + {{- if or $.Values.sentinel.service.annotations $.Values.commonAnnotations }} + annotations: + {{- if $.Values.sentinel.service.annotations }} + {{- include "common.tplvalues.render" ( dict "value" $.Values.sentinel.service.annotations "context" $ ) | nindent 4 }} + {{- end }} + {{- if $.Values.commonAnnotations }} + {{- include "common.tplvalues.render" ( dict "value" $.Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} + {{- end }} +spec: + type: NodePort + ports: + - name: sentinel + {{- if $.Values.sentinel.service.nodePorts.sentinel }} + nodePort: {{ (add $.Values.sentinel.service.nodePorts.sentinel $i 1) }} + port: {{ (add $.Values.sentinel.service.nodePorts.sentinel $i 1) }} + {{- else }} + nodePort: {{ $sentinelport }} + port: {{ $sentinelport }} + {{- end }} + protocol: TCP + targetPort: {{ $.Values.sentinel.containerPorts.sentinel }} + - name: redis + {{- if $.Values.sentinel.service.nodePorts.redis }} + nodePort: {{ (add $.Values.sentinel.service.nodePorts.redis $i 1) }} + port: {{ (add $.Values.sentinel.service.nodePorts.redis $i 1) }} + {{- else }} + nodePort: {{ $redisport }} + port: {{ $redisport }} + {{- end }} + protocol: TCP + targetPort: {{ $.Values.replica.containerPorts.redis }} + - name: sentinel-internal + nodePort: null + port: {{ $.Values.sentinel.containerPorts.sentinel }} + protocol: TCP + targetPort: {{ $.Values.sentinel.containerPorts.sentinel }} + - name: redis-internal + nodePort: null + port: {{ $.Values.replica.containerPorts.redis }} + protocol: TCP + targetPort: {{ $.Values.replica.containerPorts.redis }} + selector: + statefulset.kubernetes.io/pod-name: {{ template "common.names.fullname" $ }}-node-{{ $i }} +--- +{{- end }} +{{- end }} diff --git a/redis-fetcher/templates/sentinel/ports-configmap.yaml b/redis-fetcher/templates/sentinel/ports-configmap.yaml new file mode 100644 index 00000000..f5e7b2a9 --- /dev/null +++ b/redis-fetcher/templates/sentinel/ports-configmap.yaml @@ -0,0 +1,100 @@ +{{- if and (eq .Values.architecture "replication") .Values.sentinel.enabled (eq .Values.sentinel.service.type "NodePort") (not .Values.sentinel.service.nodePorts.redis ) }} +{{- /* create a list to keep track of ports we choose to use */}} +{{ $chosenports := (list ) }} + +{{- /* Get list of all used nodeports */}} +{{ $usedports := (list ) }} +{{- range $index, $service := (lookup "v1" "Service" "" "").items }} + {{- range.spec.ports }} + {{- if .nodePort }} + {{- $usedports = (append $usedports .nodePort) }} + {{- end }} + {{- end }} +{{- end }} + +{{- /* +comments that start with # are rendered in the output when you debug, so you can less and search for them +Vars in the comment will be rendered out, so you can check their value this way. +https://helm.sh/docs/chart_best_practices/templates/#comments-yaml-comments-vs-template-comments + +remove the template comments and leave the yaml comments to help debug +*/}} + +{{- /* Sort the list */}} +{{ $usedports = $usedports | sortAlpha }} +#usedports {{ $usedports }} + +{{- /* How many nodeports per service do we want to create, except for the main service which is always two */}} +{{ $numberofPortsPerNodeService := 2 }} + +{{- /* for every nodeport we want, loop though the used ports to get an unused port */}} +{{- range $j := until (int (add (mul (int .Values.replica.replicaCount) $numberofPortsPerNodeService) 2)) }} + {{- /* #j={{ $j }} */}} + {{- $nodeport := (add $j 30000) }} + {{- $nodeportfound := false }} + {{- range $i := $usedports }} + {{- /* #i={{ $i }} + #nodeport={{ $nodeport }} + #usedports={{ $usedports }} */}} + {{- if and (has (toString $nodeport) $usedports) (eq $nodeportfound false) }} + {{- /* nodeport conflicts with in use */}} + {{- $nodeport = (add $nodeport 1) }} + {{- else if and ( has $nodeport $chosenports) (eq $nodeportfound false) }} + {{- /* nodeport already chosen, try another */}} + {{- $nodeport = (add $nodeport 1) }} + {{- else if (eq $nodeportfound false) }} + {{- /* nodeport free to use: not already claimed and not in use */}} + {{- /* select nodeport, and place into usedports */}} + {{- $chosenports = (append $chosenports $nodeport) }} + {{- $nodeportfound = true }} + {{- else }} + {{- /* nodeport has already been chosen and locked in, just work through the rest of the list to get to the next nodeport selection */}} + {{- end }} + {{- end }} + {{- if (eq $nodeportfound false) }} + {{- $chosenports = (append $chosenports $nodeport) }} + {{- end }} + +{{- end }} + +{{- /* print the usedports and chosenports for debugging */}} +#usedports {{ $usedports }} +#chosenports {{ $chosenports }}}} + +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: {{ template "common.names.fullname" . }}-ports-configmap + namespace: {{ .Release.Namespace | quote }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.commonAnnotations }} + annotations: + {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} +data: +{{ $portsmap := (lookup "v1" "ConfigMap" $.Release.Namespace (printf "%s-%s" ( include "common.names.fullname" . ) "ports-configmap")).data }} +{{- if $portsmap }} +{{- /* configmap already exists, do not install again */ -}} + {{- range $name, $value := $portsmap }} + "{{ $name }}": "{{ $value }}" + {{- end }} +{{- else }} +{{- /* configmap being set for first time */ -}} + {{- range $index, $port := $chosenports }} + {{- $nodenumber := (floor (div $index 2)) }} + {{- if (eq $index 0) }} + "{{ template "common.names.fullname" $ }}-sentinel": "{{ $port }}" + {{- else if (eq $index 1) }} + "{{ template "common.names.fullname" $ }}-redis": "{{ $port }}" + {{- else if (eq (mod $index 2) 0) }} + "{{ template "common.names.fullname" $ }}-node-{{ (sub $nodenumber 1) }}-sentinel": "{{ $port }}" + {{- else if (eq (mod $index 2) 1) }} + "{{ template "common.names.fullname" $ }}-node-{{ (sub $nodenumber 1) }}-redis": "{{ $port }}" + {{- end }} + {{- end }} +{{- end }} +{{- end }} diff --git a/redis-fetcher/templates/sentinel/service.yaml b/redis-fetcher/templates/sentinel/service.yaml new file mode 100644 index 00000000..362d681d --- /dev/null +++ b/redis-fetcher/templates/sentinel/service.yaml @@ -0,0 +1,103 @@ +{{- if or .Release.IsUpgrade (ne .Values.sentinel.service.type "NodePort") .Values.sentinel.service.nodePorts.redis -}} +{{- if and (eq .Values.architecture "replication") .Values.sentinel.enabled }} +{{ $portsmap := (lookup "v1" "ConfigMap" $.Release.Namespace (printf "%s-%s" ( include "common.names.fullname" . ) "ports-configmap")).data }} + +{{ $sentinelport := 0}} +{{ $redisport := 0}} +{{- if $portsmap }} +{{ $sentinelport = index $portsmap (printf "%s-%s" (include "common.names.fullname" $) "sentinel") }} +{{ $redisport = index $portsmap (printf "%s-%s" (include "common.names.fullname" $) "redis") }} +{{- else }} +{{- end }} + +apiVersion: v1 +kind: Service +metadata: + name: {{ template "common.names.fullname" . }} + namespace: {{ .Release.Namespace | quote }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + app.kubernetes.io/component: node + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + {{- if or .Values.sentinel.service.annotations .Values.commonAnnotations }} + annotations: + {{- if .Values.sentinel.service.annotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.sentinel.service.annotations "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.commonAnnotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} + {{- end }} +spec: + type: {{ .Values.sentinel.service.type }} + {{- if or (eq .Values.sentinel.service.type "LoadBalancer") (eq .Values.sentinel.service.type "NodePort") }} + externalTrafficPolicy: {{ .Values.sentinel.service.externalTrafficPolicy | quote }} + {{- end }} + {{- if and (eq .Values.sentinel.service.type "LoadBalancer") (not (empty .Values.sentinel.service.loadBalancerIP)) }} + loadBalancerIP: {{ .Values.sentinel.service.loadBalancerIP }} + {{- end }} + {{- if and (eq .Values.sentinel.service.type "LoadBalancer") (not (empty .Values.sentinel.service.loadBalancerSourceRanges)) }} + loadBalancerSourceRanges: {{ .Values.sentinel.service.loadBalancerSourceRanges }} + {{- end }} + {{- if and .Values.sentinel.service.clusterIP (eq .Values.sentinel.service.type "ClusterIP") }} + clusterIP: {{ .Values.sentinel.service.clusterIP }} + {{- end }} + {{- if .Values.sentinel.service.sessionAffinity }} + sessionAffinity: {{ .Values.sentinel.service.sessionAffinity }} + {{- end }} + {{- if .Values.sentinel.service.sessionAffinityConfig }} + sessionAffinityConfig: {{- include "common.tplvalues.render" (dict "value" .Values.sentinel.service.sessionAffinityConfig "context" $) | nindent 4 }} + {{- end }} + ports: + - name: tcp-redis + {{- if and (or (eq .Values.sentinel.service.type "NodePort") (eq .Values.sentinel.service.type "LoadBalancer")) .Values.sentinel.service.nodePorts.redis }} + port: {{ .Values.sentinel.service.nodePorts.redis }} + {{- else if eq .Values.sentinel.service.type "NodePort" }} + port: {{ $redisport }} + {{- else}} + port: {{ .Values.sentinel.service.ports.redis }} + {{- end }} + targetPort: {{ .Values.replica.containerPorts.redis }} + {{- if and (or (eq .Values.sentinel.service.type "NodePort") (eq .Values.sentinel.service.type "LoadBalancer")) .Values.sentinel.service.nodePorts.redis }} + nodePort: {{ .Values.sentinel.service.nodePorts.redis }} + {{- else if eq .Values.sentinel.service.type "ClusterIP" }} + nodePort: null + {{- else if eq .Values.sentinel.service.type "NodePort" }} + nodePort: {{ $redisport }} + {{- end }} + - name: tcp-sentinel + {{- if and (or (eq .Values.sentinel.service.type "NodePort") (eq .Values.sentinel.service.type "LoadBalancer")) .Values.sentinel.service.nodePorts.sentinel }} + port: {{ .Values.sentinel.service.nodePorts.sentinel }} + {{- else if eq .Values.sentinel.service.type "NodePort" }} + port: {{ $sentinelport }} + {{- else }} + port: {{ .Values.sentinel.service.ports.sentinel }} + {{- end }} + targetPort: {{ .Values.sentinel.containerPorts.sentinel }} + {{- if and (or (eq .Values.sentinel.service.type "NodePort") (eq .Values.sentinel.service.type "LoadBalancer")) .Values.sentinel.service.nodePorts.sentinel }} + nodePort: {{ .Values.sentinel.service.nodePorts.sentinel }} + {{- else if eq .Values.sentinel.service.type "ClusterIP" }} + nodePort: null + {{- else if eq .Values.sentinel.service.type "NodePort" }} + nodePort: {{ $sentinelport }} + {{- end }} + {{- if eq .Values.sentinel.service.type "NodePort" }} + - name: sentinel-internal + nodePort: null + port: {{ .Values.sentinel.containerPorts.sentinel }} + protocol: TCP + targetPort: {{ .Values.sentinel.containerPorts.sentinel }} + - name: redis-internal + nodePort: null + port: {{ .Values.replica.containerPorts.redis }} + protocol: TCP + targetPort: {{ .Values.replica.containerPorts.redis }} + {{- end }} + {{- if .Values.sentinel.service.extraPorts }} + {{- include "common.tplvalues.render" (dict "value" .Values.sentinel.service.extraPorts "context" $) | nindent 4 }} + {{- end }} + selector: {{- include "common.labels.matchLabels" . | nindent 4 }} + app.kubernetes.io/component: node +{{- end }} +{{- end }} diff --git a/redis-fetcher/templates/sentinel/statefulset.yaml b/redis-fetcher/templates/sentinel/statefulset.yaml new file mode 100644 index 00000000..205d5592 --- /dev/null +++ b/redis-fetcher/templates/sentinel/statefulset.yaml @@ -0,0 +1,774 @@ +{{- if or .Release.IsUpgrade (ne .Values.sentinel.service.type "NodePort") .Values.sentinel.service.nodePorts.redis -}} +{{- if and (eq .Values.architecture "replication") .Values.sentinel.enabled }} +apiVersion: {{ include "common.capabilities.statefulset.apiVersion" . }} +kind: StatefulSet +metadata: + name: {{ printf "%s-node" (include "common.names.fullname" .) }} + namespace: {{ .Release.Namespace | quote }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + app.kubernetes.io/component: node + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + {{- if or .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} +spec: + replicas: {{ .Values.replica.replicaCount }} + selector: + matchLabels: {{- include "common.labels.matchLabels" . | nindent 6 }} + app.kubernetes.io/component: node + serviceName: {{ printf "%s-headless" (include "common.names.fullname" .) }} + {{- if .Values.replica.updateStrategy }} + updateStrategy: {{- toYaml .Values.replica.updateStrategy | nindent 4 }} + {{- end }} + {{- if and .Values.replica.minReadySeconds (semverCompare ">= 1.25" (include "common.capabilities.kubeVersion" .)) }} + minReadySeconds: {{ .Values.replica.minReadySeconds }} + {{- end }} + {{- if .Values.replica.podManagementPolicy }} + podManagementPolicy: {{ .Values.replica.podManagementPolicy | quote }} + {{- end }} + template: + metadata: + labels: {{- include "common.labels.standard" . | nindent 8 }} + app.kubernetes.io/component: node + {{- if .Values.replica.podLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.replica.podLabels "context" $ ) | nindent 8 }} + {{- end }} + {{- if and .Values.metrics.enabled .Values.metrics.podLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.metrics.podLabels "context" $ ) | nindent 8 }} + {{- end }} + annotations: + {{- if (include "redis.createConfigmap" .) }} + checksum/configmap: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }} + {{- end }} + checksum/health: {{ include (print $.Template.BasePath "/health-configmap.yaml") . | sha256sum }} + checksum/scripts: {{ include (print $.Template.BasePath "/scripts-configmap.yaml") . | sha256sum }} + checksum/secret: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }} + {{- if .Values.replica.podAnnotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.replica.podAnnotations "context" $ ) | nindent 8 }} + {{- end }} + {{- if and .Values.metrics.enabled .Values.metrics.podAnnotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.metrics.podAnnotations "context" $ ) | nindent 8 }} + {{- end }} + spec: + {{- include "redis.imagePullSecrets" . | nindent 6 }} + {{- if .Values.replica.hostAliases }} + hostAliases: {{- include "common.tplvalues.render" (dict "value" .Values.replica.hostAliases "context" $) | nindent 8 }} + {{- end }} + {{- if .Values.replica.podSecurityContext.enabled }} + securityContext: {{- omit .Values.replica.podSecurityContext "enabled" | toYaml | nindent 8 }} + {{- end }} + serviceAccountName: {{ template "redis.serviceAccountName" . }} + {{- if .Values.replica.priorityClassName }} + priorityClassName: {{ .Values.replica.priorityClassName | quote }} + {{- end }} + {{- if .Values.replica.affinity }} + affinity: {{- include "common.tplvalues.render" (dict "value" .Values.replica.affinity "context" $) | nindent 8 }} + {{- else }} + affinity: + podAffinity: {{- include "common.affinities.pods" (dict "type" .Values.replica.podAffinityPreset "component" "node" "context" $) | nindent 10 }} + podAntiAffinity: {{- include "common.affinities.pods" (dict "type" .Values.replica.podAntiAffinityPreset "component" "node" "context" $) | nindent 10 }} + nodeAffinity: {{- include "common.affinities.nodes" (dict "type" .Values.replica.nodeAffinityPreset.type "key" .Values.replica.nodeAffinityPreset.key "values" .Values.replica.nodeAffinityPreset.values) | nindent 10 }} + {{- end }} + {{- if .Values.replica.nodeSelector }} + nodeSelector: {{- include "common.tplvalues.render" (dict "value" .Values.replica.nodeSelector "context" $) | nindent 8 }} + {{- end }} + {{- if .Values.replica.tolerations }} + tolerations: {{- include "common.tplvalues.render" (dict "value" .Values.replica.tolerations "context" $) | nindent 8 }} + {{- end }} + {{- if .Values.replica.topologySpreadConstraints }} + topologySpreadConstraints: {{- include "common.tplvalues.render" (dict "value" .Values.replica.topologySpreadConstraints "context" $) | nindent 8 }} + {{- end }} + {{- if .Values.replica.shareProcessNamespace }} + shareProcessNamespace: {{ .Values.replica.shareProcessNamespace }} + {{- end }} + {{- if .Values.replica.schedulerName }} + schedulerName: {{ .Values.replica.schedulerName | quote }} + {{- end }} + {{- if .Values.replica.dnsPolicy }} + dnsPolicy: {{ .Values.replica.dnsPolicy }} + {{- end }} + {{- if .Values.replica.dnsConfig }} + dnsConfig: {{- include "common.tplvalues.render" (dict "value" .Values.replica.dnsConfig "context" $) | nindent 8 }} + {{- end }} + terminationGracePeriodSeconds: {{ .Values.sentinel.terminationGracePeriodSeconds }} + containers: + - name: redis + image: {{ template "redis.image" . }} + imagePullPolicy: {{ .Values.image.pullPolicy | quote }} + {{- if not .Values.diagnosticMode.enabled }} + {{- if .Values.replica.lifecycleHooks }} + lifecycle: {{- include "common.tplvalues.render" (dict "value" .Values.replica.lifecycleHooks "context" $) | nindent 12 }} + {{- else }} + lifecycle: + preStop: + exec: + command: + - /bin/bash + - -c + - /opt/bitnami/scripts/start-scripts/prestop-redis.sh + {{- end }} + {{- end }} + {{- if .Values.replica.containerSecurityContext.enabled }} + securityContext: {{- omit .Values.replica.containerSecurityContext "enabled" | toYaml | nindent 12 }} + {{- end }} + {{- if .Values.diagnosticMode.enabled }} + command: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.command "context" $) | nindent 12 }} + {{- else if .Values.replica.command }} + command: {{- include "common.tplvalues.render" (dict "value" .Values.replica.command "context" $) | nindent 12 }} + {{- else }} + command: + - /bin/bash + {{- end }} + {{- if .Values.diagnosticMode.enabled }} + args: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.args "context" $) | nindent 12 }} + {{- else if .Values.replica.args }} + args: {{- include "common.tplvalues.render" (dict "value" .Values.replica.args "context" $) | nindent 12 }} + {{- else }} + args: + - -c + - /opt/bitnami/scripts/start-scripts/start-node.sh + {{- end }} + env: + - name: BITNAMI_DEBUG + value: {{ ternary "true" "false" (or .Values.image.debug .Values.diagnosticMode.enabled) | quote }} + - name: REDIS_MASTER_PORT_NUMBER + value: {{ .Values.replica.containerPorts.redis | quote }} + - name: ALLOW_EMPTY_PASSWORD + value: {{ ternary "no" "yes" .Values.auth.enabled | quote }} + {{- if .Values.auth.enabled }} + {{- if .Values.auth.usePasswordFiles }} + - name: REDIS_PASSWORD_FILE + value: "/opt/bitnami/redis/secrets/redis-password" + - name: REDIS_MASTER_PASSWORD_FILE + value: "/opt/bitnami/redis/secrets/redis-password" + {{- else }} + - name: REDIS_PASSWORD + valueFrom: + secretKeyRef: + name: {{ template "redis.secretName" . }} + key: {{ template "redis.secretPasswordKey" . }} + - name: REDIS_MASTER_PASSWORD + valueFrom: + secretKeyRef: + name: {{ template "redis.secretName" . }} + key: {{ template "redis.secretPasswordKey" . }} + {{- end }} + {{- end }} + - name: REDIS_TLS_ENABLED + value: {{ ternary "yes" "no" .Values.tls.enabled | quote }} + {{- if .Values.tls.enabled }} + - name: REDIS_TLS_PORT + value: {{ .Values.replica.containerPorts.redis | quote }} + - name: REDIS_TLS_AUTH_CLIENTS + value: {{ ternary "yes" "no" .Values.tls.authClients | quote }} + - name: REDIS_TLS_CERT_FILE + value: {{ template "redis.tlsCert" . }} + - name: REDIS_TLS_KEY_FILE + value: {{ template "redis.tlsCertKey" . }} + - name: REDIS_TLS_CA_FILE + value: {{ template "redis.tlsCACert" . }} + {{- if .Values.tls.dhParamsFilename }} + - name: REDIS_TLS_DH_PARAMS_FILE + value: {{ template "redis.tlsDHParams" . }} + {{- end }} + {{- else }} + - name: REDIS_PORT + value: {{ .Values.replica.containerPorts.redis | quote }} + {{- end }} + - name: REDIS_SENTINEL_TLS_ENABLED + value: {{ ternary "yes" "no" .Values.tls.enabled | quote }} + {{- if .Values.tls.enabled }} + - name: REDIS_SENTINEL_TLS_PORT_NUMBER + value: {{ .Values.sentinel.containerPorts.sentinel | quote }} + - name: REDIS_SENTINEL_TLS_AUTH_CLIENTS + value: {{ ternary "yes" "no" .Values.tls.authClients | quote }} + - name: REDIS_SENTINEL_TLS_CERT_FILE + value: {{ template "redis.tlsCert" . }} + - name: REDIS_SENTINEL_TLS_KEY_FILE + value: {{ template "redis.tlsCertKey" . }} + - name: REDIS_SENTINEL_TLS_CA_FILE + value: {{ template "redis.tlsCACert" . }} + {{- if .Values.tls.dhParamsFilename }} + - name: REDIS_SENTINEL_TLS_DH_PARAMS_FILE + value: {{ template "redis.tlsDHParams" . }} + {{- end }} + {{- else }} + - name: REDIS_SENTINEL_PORT + value: {{ .Values.sentinel.containerPorts.sentinel | quote }} + {{- end }} + - name: REDIS_DATA_DIR + value: {{ .Values.replica.persistence.path }} + {{- if .Values.replica.externalMaster.enabled }} + - name: REDIS_EXTERNAL_MASTER_HOST + value: {{ .Values.replica.externalMaster.host | quote }} + - name: REDIS_EXTERNAL_MASTER_PORT + value: {{ .Values.replica.externalMaster.port | quote }} + {{- end }} + {{- if .Values.replica.extraEnvVars }} + {{- include "common.tplvalues.render" ( dict "value" .Values.replica.extraEnvVars "context" $ ) | nindent 12 }} + {{- end }} + {{- if or .Values.replica.extraEnvVarsCM .Values.replica.extraEnvVarsSecret }} + envFrom: + {{- if .Values.replica.extraEnvVarsCM }} + - configMapRef: + name: {{ .Values.replica.extraEnvVarsCM }} + {{- end }} + {{- if .Values.replica.extraEnvVarsSecret }} + - secretRef: + name: {{ .Values.replica.extraEnvVarsSecret }} + {{- end }} + {{- end }} + ports: + - name: redis + containerPort: {{ .Values.replica.containerPorts.redis }} + {{- if not .Values.diagnosticMode.enabled }} + {{- if .Values.replica.customStartupProbe }} + startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.replica.customStartupProbe "context" $) | nindent 12 }} + {{- else if .Values.replica.startupProbe.enabled }} + startupProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.replica.startupProbe "enabled") "context" $) | nindent 12 }} + exec: + command: + - sh + - -c + - /health/ping_liveness_local.sh {{ .Values.replica.livenessProbe.timeoutSeconds }} + {{- end }} + {{- if .Values.replica.customLivenessProbe }} + livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.replica.customLivenessProbe "context" $) | nindent 12 }} + {{- else if .Values.replica.livenessProbe.enabled }} + livenessProbe: + initialDelaySeconds: {{ .Values.replica.livenessProbe.initialDelaySeconds }} + periodSeconds: {{ .Values.replica.livenessProbe.periodSeconds }} + timeoutSeconds: {{ .Values.replica.livenessProbe.timeoutSeconds }} + successThreshold: {{ .Values.replica.livenessProbe.successThreshold }} + failureThreshold: {{ .Values.replica.livenessProbe.failureThreshold }} + exec: + command: + - sh + - -c + - /health/ping_liveness_local.sh {{ .Values.replica.livenessProbe.timeoutSeconds }} + {{- end }} + {{- if .Values.replica.customReadinessProbe }} + readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.replica.customReadinessProbe "context" $) | nindent 12 }} + {{- else if .Values.replica.readinessProbe.enabled }} + readinessProbe: + initialDelaySeconds: {{ .Values.replica.readinessProbe.initialDelaySeconds }} + periodSeconds: {{ .Values.replica.readinessProbe.periodSeconds }} + timeoutSeconds: {{ .Values.replica.readinessProbe.timeoutSeconds }} + successThreshold: {{ .Values.replica.readinessProbe.successThreshold }} + failureThreshold: {{ .Values.replica.readinessProbe.failureThreshold }} + exec: + command: + - sh + - -c + - /health/ping_readiness_local.sh {{ .Values.replica.readinessProbe.timeoutSeconds }} + {{- end }} + {{- end }} + {{- if .Values.replica.resources }} + resources: {{- toYaml .Values.replica.resources | nindent 12 }} + {{- end }} + volumeMounts: + - name: start-scripts + mountPath: /opt/bitnami/scripts/start-scripts + - name: health + mountPath: /health + {{- if .Values.sentinel.persistence.enabled }} + - name: sentinel-data + mountPath: /opt/bitnami/redis-sentinel/etc + {{- end }} + {{- if .Values.auth.usePasswordFiles }} + - name: redis-password + mountPath: /opt/bitnami/redis/secrets/ + {{- end }} + - name: redis-data + mountPath: {{ .Values.replica.persistence.path }} + {{- if .Values.replica.persistence.subPath }} + subPath: {{ .Values.replica.persistence.subPath }} + {{- else if .Values.replica.persistence.subPathExpr }} + subPathExpr: {{ .Values.replica.persistence.subPathExpr }} + {{- end }} + - name: config + mountPath: /opt/bitnami/redis/mounted-etc + - name: redis-tmp-conf + mountPath: /opt/bitnami/redis/etc + - name: tmp + mountPath: /tmp + {{- if .Values.tls.enabled }} + - name: redis-certificates + mountPath: /opt/bitnami/redis/certs + readOnly: true + {{- end }} + {{- if .Values.replica.extraVolumeMounts }} + {{- include "common.tplvalues.render" ( dict "value" .Values.replica.extraVolumeMounts "context" $ ) | nindent 12 }} + {{- end }} + - name: sentinel + image: {{ template "redis.sentinel.image" . }} + imagePullPolicy: {{ .Values.sentinel.image.pullPolicy | quote }} + {{- if not .Values.diagnosticMode.enabled }} + {{- if .Values.sentinel.lifecycleHooks }} + lifecycle: {{- include "common.tplvalues.render" (dict "value" .Values.sentinel.lifecycleHooks "context" $) | nindent 12 }} + {{- else }} + lifecycle: + preStop: + exec: + command: + - /bin/bash + - -c + - /opt/bitnami/scripts/start-scripts/prestop-sentinel.sh + {{- end }} + {{- end }} + {{- if .Values.sentinel.containerSecurityContext.enabled }} + securityContext: {{- omit .Values.sentinel.containerSecurityContext "enabled" | toYaml | nindent 12 }} + {{- end }} + {{- if .Values.diagnosticMode.enabled }} + command: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.command "context" $) | nindent 12 }} + {{- else if .Values.sentinel.command }} + command: {{- include "common.tplvalues.render" (dict "value" .Values.sentinel.command "context" $) | nindent 12 }} + {{- else }} + command: + - /bin/bash + {{- end }} + {{- if .Values.diagnosticMode.enabled }} + args: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.args "context" $) | nindent 12 }} + {{- else if .Values.sentinel.args }} + args: {{- include "common.tplvalues.render" (dict "value" .Values.sentinel.args "context" $) | nindent 12 }} + {{- else }} + args: + - -c + - /opt/bitnami/scripts/start-scripts/start-sentinel.sh + {{- end }} + env: + - name: BITNAMI_DEBUG + value: {{ ternary "true" "false" (or .Values.sentinel.image.debug .Values.diagnosticMode.enabled) | quote }} + {{- if .Values.auth.enabled }} + {{- if .Values.auth.usePasswordFiles }} + - name: REDIS_PASSWORD_FILE + value: "/opt/bitnami/redis/secrets/redis-password" + {{- else }} + - name: REDIS_PASSWORD + valueFrom: + secretKeyRef: + name: {{ template "redis.secretName" . }} + key: {{ template "redis.secretPasswordKey" . }} + {{- end }} + {{- else }} + - name: ALLOW_EMPTY_PASSWORD + value: "yes" + {{- end }} + - name: REDIS_SENTINEL_TLS_ENABLED + value: {{ ternary "yes" "no" .Values.tls.enabled | quote }} + {{- if .Values.tls.enabled }} + - name: REDIS_SENTINEL_TLS_PORT_NUMBER + value: {{ .Values.sentinel.containerPorts.sentinel | quote }} + - name: REDIS_SENTINEL_TLS_AUTH_CLIENTS + value: {{ ternary "yes" "no" .Values.tls.authClients | quote }} + - name: REDIS_SENTINEL_TLS_CERT_FILE + value: {{ template "redis.tlsCert" . }} + - name: REDIS_SENTINEL_TLS_KEY_FILE + value: {{ template "redis.tlsCertKey" . }} + - name: REDIS_SENTINEL_TLS_CA_FILE + value: {{ template "redis.tlsCACert" . }} + {{- if .Values.tls.dhParamsFilename }} + - name: REDIS_SENTINEL_TLS_DH_PARAMS_FILE + value: {{ template "redis.tlsDHParams" . }} + {{- end }} + {{- else }} + - name: REDIS_SENTINEL_PORT + value: {{ .Values.sentinel.containerPorts.sentinel | quote }} + {{- end }} + {{- if .Values.sentinel.externalMaster.enabled }} + - name: REDIS_EXTERNAL_MASTER_HOST + value: {{ .Values.sentinel.externalMaster.host | quote }} + - name: REDIS_EXTERNAL_MASTER_PORT + value: {{ .Values.sentinel.externalMaster.port | quote }} + {{- end }} + {{- if .Values.sentinel.extraEnvVars }} + {{- include "common.tplvalues.render" ( dict "value" .Values.sentinel.extraEnvVars "context" $ ) | nindent 12 }} + {{- end }} + {{- if or .Values.sentinel.extraEnvVarsCM .Values.sentinel.extraEnvVarsSecret }} + envFrom: + {{- if .Values.sentinel.extraEnvVarsCM }} + - configMapRef: + name: {{ .Values.sentinel.extraEnvVarsCM }} + {{- end }} + {{- if .Values.sentinel.extraEnvVarsSecret }} + - secretRef: + name: {{ .Values.sentinel.extraEnvVarsSecret }} + {{- end }} + {{- end }} + ports: + - name: redis-sentinel + containerPort: {{ .Values.sentinel.containerPorts.sentinel }} + {{- if not .Values.diagnosticMode.enabled }} + {{- if .Values.sentinel.customStartupProbe }} + startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.sentinel.customStartupProbe "context" $) | nindent 12 }} + {{- else if .Values.sentinel.startupProbe.enabled }} + startupProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.sentinel.startupProbe "enabled") "context" $) | nindent 12 }} + exec: + command: + - sh + - -c + - /health/ping_sentinel.sh {{ .Values.sentinel.livenessProbe.timeoutSeconds }} + {{- end }} + {{- if .Values.sentinel.customLivenessProbe }} + livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.sentinel.customLivenessProbe "context" $) | nindent 12 }} + {{- else if .Values.sentinel.livenessProbe.enabled }} + livenessProbe: + initialDelaySeconds: {{ .Values.sentinel.livenessProbe.initialDelaySeconds }} + periodSeconds: {{ .Values.sentinel.livenessProbe.periodSeconds }} + timeoutSeconds: {{ .Values.sentinel.livenessProbe.timeoutSeconds }} + successThreshold: {{ .Values.sentinel.livenessProbe.successThreshold }} + failureThreshold: {{ .Values.sentinel.livenessProbe.failureThreshold }} + exec: + command: + - sh + - -c + - /health/ping_sentinel.sh {{ .Values.sentinel.livenessProbe.timeoutSeconds }} + {{- end }} + {{- end }} + {{- if not .Values.diagnosticMode.enabled }} + {{- if .Values.sentinel.customReadinessProbe }} + readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.sentinel.customReadinessProbe "context" $) | nindent 12 }} + {{- else if .Values.sentinel.readinessProbe.enabled }} + readinessProbe: + initialDelaySeconds: {{ .Values.sentinel.readinessProbe.initialDelaySeconds }} + periodSeconds: {{ .Values.sentinel.readinessProbe.periodSeconds }} + timeoutSeconds: {{ .Values.sentinel.readinessProbe.timeoutSeconds }} + successThreshold: {{ .Values.sentinel.readinessProbe.successThreshold }} + failureThreshold: {{ .Values.sentinel.readinessProbe.failureThreshold }} + exec: + command: + - sh + - -c + - /health/ping_sentinel.sh {{ .Values.sentinel.readinessProbe.timeoutSeconds }} + {{- end }} + {{- end }} + {{- if .Values.sentinel.resources }} + resources: {{- toYaml .Values.sentinel.resources | nindent 12 }} + {{- end }} + volumeMounts: + - name: start-scripts + mountPath: /opt/bitnami/scripts/start-scripts + - name: health + mountPath: /health + - name: sentinel-data + mountPath: /opt/bitnami/redis-sentinel/etc + {{- if .Values.auth.usePasswordFiles }} + - name: redis-password + mountPath: /opt/bitnami/redis/secrets/ + {{- end }} + - name: redis-data + mountPath: {{ .Values.replica.persistence.path }} + {{- if .Values.replica.persistence.subPath }} + subPath: {{ .Values.replica.persistence.subPath }} + {{- else if .Values.replica.persistence.subPathExpr }} + subPathExpr: {{ .Values.replica.persistence.subPathExpr }} + {{- end }} + - name: config + mountPath: /opt/bitnami/redis-sentinel/mounted-etc + {{- if .Values.tls.enabled }} + - name: redis-certificates + mountPath: /opt/bitnami/redis/certs + readOnly: true + {{- end }} + {{- if .Values.sentinel.extraVolumeMounts }} + {{- include "common.tplvalues.render" ( dict "value" .Values.sentinel.extraVolumeMounts "context" $ ) | nindent 12 }} + {{- end }} + {{- if .Values.metrics.enabled }} + - name: metrics + image: {{ template "redis.metrics.image" . }} + imagePullPolicy: {{ .Values.metrics.image.pullPolicy | quote }} + {{- if .Values.metrics.containerSecurityContext.enabled }} + securityContext: {{- omit .Values.metrics.containerSecurityContext "enabled" | toYaml | nindent 12 }} + {{- end }} + {{- if .Values.diagnosticMode.enabled }} + command: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.command "context" $) | nindent 12 }} + {{- else }} + command: + - /bin/bash + - -c + - | + if [[ -f '/secrets/redis-password' ]]; then + export REDIS_PASSWORD=$(cat /secrets/redis-password) + fi + redis_exporter{{- range $key, $value := .Values.metrics.extraArgs }} --{{ $key }}={{ $value }}{{- end }} + {{- end }} + {{- if .Values.diagnosticMode.enabled }} + args: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.args "context" $) | nindent 12 }} + {{- end }} + env: + - name: REDIS_ALIAS + value: {{ template "common.names.fullname" . }} + {{- if .Values.auth.enabled }} + - name: REDIS_USER + value: default + {{- if (not .Values.auth.usePasswordFiles) }} + - name: REDIS_PASSWORD + valueFrom: + secretKeyRef: + name: {{ template "redis.secretName" . }} + key: {{ template "redis.secretPasswordKey" . }} + {{- end }} + {{- end }} + {{- if .Values.tls.enabled }} + - name: REDIS_ADDR + value: rediss://{{ .Values.metrics.redisTargetHost }}:{{ .Values.replica.containerPorts.redis }} + {{- if .Values.tls.authClients }} + - name: REDIS_EXPORTER_TLS_CLIENT_KEY_FILE + value: {{ template "redis.tlsCertKey" . }} + - name: REDIS_EXPORTER_TLS_CLIENT_CERT_FILE + value: {{ template "redis.tlsCert" . }} + {{- end }} + - name: REDIS_EXPORTER_TLS_CA_CERT_FILE + value: {{ template "redis.tlsCACert" . }} + {{- end }} + {{- if .Values.metrics.extraEnvVars }} + {{- include "common.tplvalues.render" (dict "value" .Values.metrics.extraEnvVars "context" $) | nindent 12 }} + {{- end }} + ports: + - name: metrics + containerPort: 9121 + {{- if not .Values.diagnosticMode.enabled }} + {{- if .Values.metrics.customStartupProbe }} + startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.metrics.customStartupProbe "context" $) | nindent 12 }} + {{- else if .Values.metrics.startupProbe.enabled }} + startupProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.metrics.startupProbe "enabled") "context" $) | nindent 12 }} + tcpSocket: + port: metrics + {{- end }} + {{- if .Values.metrics.customLivenessProbe }} + livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.metrics.customLivenessProbe "context" $) | nindent 12 }} + {{- else if .Values.metrics.livenessProbe.enabled }} + livenessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.metrics.livenessProbe "enabled") "context" $) | nindent 12 }} + tcpSocket: + port: metrics + {{- end }} + {{- if .Values.metrics.customReadinessProbe }} + readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.metrics.customReadinessProbe "context" $) | nindent 12 }} + {{- else if .Values.metrics.readinessProbe.enabled }} + readinessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.metrics.readinessProbe "enabled") "context" $) | nindent 12 }} + httpGet: + path: / + port: metrics + {{- end }} + {{- end }} + {{- if .Values.metrics.resources }} + resources: {{- toYaml .Values.metrics.resources | nindent 12 }} + {{- end }} + volumeMounts: + {{- if .Values.auth.usePasswordFiles }} + - name: redis-password + mountPath: /secrets/ + {{- end }} + {{- if .Values.tls.enabled }} + - name: redis-certificates + mountPath: /opt/bitnami/redis/certs + readOnly: true + {{- end }} + {{- if .Values.metrics.extraVolumeMounts }} + {{- include "common.tplvalues.render" ( dict "value" .Values.metrics.extraVolumeMounts "context" $ ) | nindent 12 }} + {{- end }} + {{- end }} + {{- if .Values.replica.sidecars }} + {{- include "common.tplvalues.render" (dict "value" .Values.replica.sidecars "context" $) | nindent 8 }} + {{- end }} + {{- $needsVolumePermissions := and .Values.volumePermissions.enabled .Values.replica.persistence.enabled .Values.replica.podSecurityContext.enabled .Values.replica.containerSecurityContext.enabled }} + {{- if or .Values.replica.initContainers $needsVolumePermissions .Values.sysctl.enabled }} + initContainers: + {{- if .Values.replica.initContainers }} + {{- include "common.tplvalues.render" (dict "value" .Values.replica.initContainers "context" $) | nindent 8 }} + {{- end }} + {{- if $needsVolumePermissions }} + - name: volume-permissions + image: {{ include "redis.volumePermissions.image" . }} + imagePullPolicy: {{ .Values.volumePermissions.image.pullPolicy | quote }} + command: + - /bin/bash + - -ec + - | + {{- if eq ( toString ( .Values.volumePermissions.containerSecurityContext.runAsUser )) "auto" }} + chown -R `id -u`:`id -G | cut -d " " -f2` {{ .Values.replica.persistence.path }} + {{- else }} + chown -R {{ .Values.replica.containerSecurityContext.runAsUser }}:{{ .Values.replica.podSecurityContext.fsGroup }} {{ .Values.replica.persistence.path }} + {{- end }} + {{- if eq ( toString ( .Values.volumePermissions.containerSecurityContext.runAsUser )) "auto" }} + securityContext: {{- omit .Values.volumePermissions.containerSecurityContext "runAsUser" | toYaml | nindent 12 }} + {{- else }} + securityContext: {{- .Values.volumePermissions.containerSecurityContext | toYaml | nindent 12 }} + {{- end }} + {{- if .Values.volumePermissions.resources }} + resources: {{- toYaml .Values.volumePermissions.resources | nindent 12 }} + {{- end }} + volumeMounts: + - name: redis-data + mountPath: {{ .Values.replica.persistence.path }} + {{- if .Values.replica.persistence.subPath }} + subPath: {{ .Values.replica.persistence.subPath }} + {{- else if .Values.replica.persistence.subPathExpr }} + subPathExpr: {{ .Values.replica.persistence.subPathExpr }} + {{- end }} + {{- end }} + {{- if .Values.sysctl.enabled }} + - name: init-sysctl + image: {{ include "redis.sysctl.image" . }} + imagePullPolicy: {{ default "" .Values.sysctl.image.pullPolicy | quote }} + securityContext: + privileged: true + runAsUser: 0 + {{- if .Values.sysctl.command }} + command: {{- include "common.tplvalues.render" (dict "value" .Values.sysctl.command "context" $) | nindent 12 }} + {{- end }} + {{- if .Values.sysctl.resources }} + resources: {{- toYaml .Values.sysctl.resources | nindent 12 }} + {{- end }} + {{- if .Values.sysctl.mountHostSys }} + volumeMounts: + - name: host-sys + mountPath: /host-sys + {{- end }} + {{- end }} + {{- end }} + volumes: + - name: start-scripts + configMap: + name: {{ printf "%s-scripts" (include "common.names.fullname" .) }} + defaultMode: 0755 + - name: health + configMap: + name: {{ printf "%s-health" (include "common.names.fullname" .) }} + defaultMode: 0755 + {{- if .Values.auth.usePasswordFiles }} + - name: redis-password + secret: + secretName: {{ template "redis.secretName" . }} + items: + - key: {{ template "redis.secretPasswordKey" . }} + path: redis-password + {{- end }} + - name: config + configMap: + name: {{ include "redis.configmapName" . }} + {{- if .Values.sysctl.mountHostSys }} + - name: host-sys + hostPath: + path: /sys + {{- end }} + {{- if not .Values.sentinel.persistence.enabled }} + - name: sentinel-data + {{- if or .Values.sentinel.persistence.medium .Values.sentinel.persistence.sizeLimit }} + emptyDir: + {{- if .Values.sentinel.persistence.medium }} + medium: {{ .Values.sentinel.persistence.medium | quote }} + {{- end }} + {{- if .Values.sentinel.persistence.sizeLimit }} + sizeLimit: {{ .Values.sentinel.persistence.sizeLimit | quote }} + {{- end }} + {{- else }} + emptyDir: {} + {{- end }} + {{- end }} + - name: redis-tmp-conf + {{- if or .Values.sentinel.persistence.medium .Values.sentinel.persistence.sizeLimit }} + emptyDir: + {{- if .Values.sentinel.persistence.medium }} + medium: {{ .Values.sentinel.persistence.medium | quote }} + {{- end }} + {{- if .Values.sentinel.persistence.sizeLimit }} + sizeLimit: {{ .Values.sentinel.persistence.sizeLimit | quote }} + {{- end }} + {{- else }} + emptyDir: {} + {{- end }} + - name: tmp + {{- if or .Values.sentinel.persistence.medium .Values.sentinel.persistence.sizeLimit }} + emptyDir: + {{- if .Values.sentinel.persistence.medium }} + medium: {{ .Values.sentinel.persistence.medium | quote }} + {{- end }} + {{- if .Values.sentinel.persistence.sizeLimit }} + sizeLimit: {{ .Values.sentinel.persistence.sizeLimit | quote }} + {{- end }} + {{- else }} + emptyDir: {} + {{- end }} + {{- if .Values.replica.extraVolumes }} + {{- include "common.tplvalues.render" ( dict "value" .Values.replica.extraVolumes "context" $ ) | nindent 8 }} + {{- end }} + {{- if .Values.metrics.extraVolumes }} + {{- include "common.tplvalues.render" ( dict "value" .Values.metrics.extraVolumes "context" $ ) | nindent 8 }} + {{- end }} + {{- if .Values.sentinel.extraVolumes }} + {{- include "common.tplvalues.render" ( dict "value" .Values.sentinel.extraVolumes "context" $ ) | nindent 8 }} + {{- end }} + {{- if .Values.tls.enabled }} + - name: redis-certificates + secret: + secretName: {{ include "redis.tlsSecretName" . }} + defaultMode: 256 + {{- end }} + {{- if not .Values.replica.persistence.enabled }} + - name: redis-data + {{- if or .Values.sentinel.persistence.medium .Values.sentinel.persistence.sizeLimit }} + emptyDir: + {{- if .Values.sentinel.persistence.medium }} + medium: {{ .Values.sentinel.persistence.medium | quote }} + {{- end }} + {{- if .Values.sentinel.persistence.sizeLimit }} + sizeLimit: {{ .Values.sentinel.persistence.sizeLimit | quote }} + {{- end }} + {{- else }} + emptyDir: {} + {{- end }} + {{- else if .Values.replica.persistence.existingClaim }} + - name: redis-data + persistentVolumeClaim: + claimName: {{ printf "%s" (tpl .Values.replica.persistence.existingClaim .) }} + {{- else }} + volumeClaimTemplates: + - metadata: + name: redis-data + labels: {{- include "common.labels.matchLabels" . | nindent 10 }} + app.kubernetes.io/component: node + {{- if .Values.replica.persistence.annotations }} + annotations: {{- toYaml .Values.replica.persistence.annotations | nindent 10 }} + {{- end }} + spec: + accessModes: + {{- range .Values.replica.persistence.accessModes }} + - {{ . | quote }} + {{- end }} + resources: + requests: + storage: {{ .Values.replica.persistence.size | quote }} + {{- if .Values.replica.persistence.selector }} + selector: {{- include "common.tplvalues.render" ( dict "value" .Values.replica.persistence.selector "context" $) | nindent 10 }} + {{- end }} + {{- include "common.storage.class" (dict "persistence" .Values.replica.persistence "global" .Values.global) | nindent 8 }} + {{- if .Values.sentinel.persistence.enabled }} + - metadata: + name: sentinel-data + labels: {{- include "common.labels.matchLabels" . | nindent 10 }} + app.kubernetes.io/component: node + {{- if .Values.sentinel.persistence.annotations }} + annotations: {{- toYaml .Values.sentinel.persistence.annotations | nindent 10 }} + {{- end }} + spec: + accessModes: + {{- range .Values.sentinel.persistence.accessModes }} + - {{ . | quote }} + {{- end }} + resources: + requests: + storage: {{ .Values.sentinel.persistence.size | quote }} + {{- if .Values.sentinel.persistence.selector }} + selector: {{- include "common.tplvalues.render" ( dict "value" .Values.sentinel.persistence.selector "context" $) | nindent 10 }} + {{- end }} + {{- if .Values.sentinel.persistence.dataSource }} + dataSource: {{- include "common.tplvalues.render" (dict "value" .Values.sentinel.persistence.dataSource "context" $) | nindent 10 }} + {{- end }} + {{- include "common.storage.class" (dict "persistence" .Values.sentinel.persistence "global" .Values.global) | nindent 8 }} + {{- end }} + {{- end }} +{{- end }} +{{- end }} diff --git a/redis-fetcher/templates/serviceaccount.yaml b/redis-fetcher/templates/serviceaccount.yaml new file mode 100644 index 00000000..9faa1752 --- /dev/null +++ b/redis-fetcher/templates/serviceaccount.yaml @@ -0,0 +1,21 @@ +{{- if and .Values.serviceAccount.create (and (not .Values.master.serviceAccount.create) (not .Values.replica.serviceAccount.create)) }} +apiVersion: v1 +kind: ServiceAccount +automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }} +metadata: + name: {{ template "redis.serviceAccountName" . }} + namespace: {{ .Release.Namespace | quote }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + {{- if or .Values.commonAnnotations .Values.serviceAccount.annotations }} + annotations: + {{- if or .Values.commonAnnotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.serviceAccount.annotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.serviceAccount.annotations "context" $ ) | nindent 4 }} + {{- end }} + {{- end }} +{{- end }} \ No newline at end of file diff --git a/redis-fetcher/templates/servicemonitor.yaml b/redis-fetcher/templates/servicemonitor.yaml new file mode 100644 index 00000000..9bdad949 --- /dev/null +++ b/redis-fetcher/templates/servicemonitor.yaml @@ -0,0 +1,44 @@ +{{- if and .Values.metrics.enabled .Values.metrics.serviceMonitor.enabled }} +apiVersion: monitoring.coreos.com/v1 +kind: ServiceMonitor +metadata: + name: {{ template "common.names.fullname" . }} + namespace: {{ default .Release.Namespace .Values.metrics.serviceMonitor.namespace | quote }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + {{- if .Values.metrics.serviceMonitor.additionalLabels }} + {{- include "common.tplvalues.render" (dict "value" .Values.metrics.serviceMonitor.additionalLabels "context" $) | nindent 4 }} + {{- end }} + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} +spec: + endpoints: + - port: http-metrics + {{- if .Values.metrics.serviceMonitor.interval }} + interval: {{ .Values.metrics.serviceMonitor.interval }} + {{- end }} + {{- if .Values.metrics.serviceMonitor.scrapeTimeout }} + scrapeTimeout: {{ .Values.metrics.serviceMonitor.scrapeTimeout }} + {{- end }} + {{- if .Values.metrics.serviceMonitor.honorLabels }} + honorLabels: {{ .Values.metrics.serviceMonitor.honorLabels }} + {{- end }} + {{- if .Values.metrics.serviceMonitor.relabellings }} + relabelings: {{- toYaml .Values.metrics.serviceMonitor.relabellings | nindent 6 }} + {{- end }} + {{- if .Values.metrics.serviceMonitor.metricRelabelings }} + metricRelabelings: {{- toYaml .Values.metrics.serviceMonitor.metricRelabelings | nindent 6 }} + {{- end }} + {{- if .Values.metrics.serviceMonitor.podTargetLabels }} + podTargetLabels: {{- toYaml .Values.metrics.serviceMonitor.podTargetLabels | nindent 4 }} + {{- end }} + namespaceSelector: + matchNames: + - {{ .Release.Namespace }} + selector: + matchLabels: {{- include "common.labels.matchLabels" . | nindent 6 }} + app.kubernetes.io/component: metrics +{{- end }} diff --git a/redis-fetcher/templates/tls-secret.yaml b/redis-fetcher/templates/tls-secret.yaml new file mode 100644 index 00000000..4f9c39b8 --- /dev/null +++ b/redis-fetcher/templates/tls-secret.yaml @@ -0,0 +1,30 @@ +{{- if (include "redis.createTlsSecret" .) }} +{{- $secretName := printf "%s-crt" (include "common.names.fullname" .) }} +{{- $existingCerts := (lookup "v1" "Secret" .Release.Namespace $secretName).data | default dict }} +{{- $ca := genCA "redis-ca" 365 }} +{{- $releaseNamespace := .Release.Namespace }} +{{- $clusterDomain := .Values.clusterDomain }} +{{- $fullname := include "common.names.fullname" . }} +{{- $serviceName := include "common.names.fullname" . }} +{{- $headlessServiceName := printf "%s-headless" (include "common.names.fullname" .) }} +{{- $masterServiceName := printf "%s-master" (include "common.names.fullname" .) }} +{{- $altNames := list (printf "*.%s.%s.svc.%s" $serviceName $releaseNamespace $clusterDomain) (printf "%s.%s.svc.%s" $masterServiceName $releaseNamespace $clusterDomain) (printf "*.%s.%s.svc.%s" $masterServiceName $releaseNamespace $clusterDomain) (printf "*.%s.%s.svc.%s" $headlessServiceName $releaseNamespace $clusterDomain) (printf "%s.%s.svc.%s" $headlessServiceName $releaseNamespace $clusterDomain) "127.0.0.1" "localhost" $fullname }} +{{- $crt := genSignedCert $fullname nil $altNames 365 $ca }} +apiVersion: v1 +kind: Secret +metadata: + name: {{ $secretName }} + namespace: {{ .Release.Namespace | quote }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} +type: kubernetes.io/tls +data: + ca.crt: {{ (get $existingCerts "ca.crt") | default ($ca.Cert | b64enc | quote ) }} + tls.crt: {{ (get $existingCerts "tls.crt") | default ($crt.Cert | b64enc | quote) }} + tls.key: {{ (get $existingCerts "tls.key") | default ($crt.Key | b64enc | quote) }} +{{- end }} diff --git a/redis-fetcher/values.schema.json b/redis-fetcher/values.schema.json new file mode 100644 index 00000000..d6e226b8 --- /dev/null +++ b/redis-fetcher/values.schema.json @@ -0,0 +1,156 @@ +{ + "$schema": "http://json-schema.org/schema#", + "type": "object", + "properties": { + "architecture": { + "type": "string", + "title": "Redis architecture", + "form": true, + "description": "Allowed values: `standalone` or `replication`", + "enum": ["standalone", "replication"] + }, + "auth": { + "type": "object", + "title": "Authentication configuration", + "form": true, + "properties": { + "enabled": { + "type": "boolean", + "form": true, + "title": "Use password authentication" + }, + "password": { + "type": "string", + "title": "Redis password", + "form": true, + "description": "Defaults to a random 10-character alphanumeric string if not set", + "hidden": { + "value": false, + "path": "auth/enabled" + } + } + } + }, + "master": { + "type": "object", + "title": "Master replicas settings", + "form": true, + "properties": { + "kind": { + "type": "string", + "title": "Workload Kind", + "form": true, + "description": "Allowed values: `Deployment` or `StatefulSet`", + "enum": ["Deployment", "StatefulSet"] + }, + "persistence": { + "type": "object", + "title": "Persistence for master replicas", + "form": true, + "properties": { + "enabled": { + "type": "boolean", + "form": true, + "title": "Enable persistence", + "description": "Enable persistence using Persistent Volume Claims" + }, + "size": { + "type": "string", + "title": "Persistent Volume Size", + "form": true, + "render": "slider", + "sliderMin": 1, + "sliderMax": 100, + "sliderUnit": "Gi", + "hidden": { + "value": false, + "path": "master/persistence/enabled" + } + } + } + } + } + }, + "replica": { + "type": "object", + "title": "Redis replicas settings", + "form": true, + "hidden": { + "value": "standalone", + "path": "architecture" + }, + "properties": { + "replicaCount": { + "type": "integer", + "form": true, + "title": "Number of Redis replicas" + }, + "persistence": { + "type": "object", + "title": "Persistence for Redis replicas", + "form": true, + "properties": { + "enabled": { + "type": "boolean", + "form": true, + "title": "Enable persistence", + "description": "Enable persistence using Persistent Volume Claims" + }, + "size": { + "type": "string", + "title": "Persistent Volume Size", + "form": true, + "render": "slider", + "sliderMin": 1, + "sliderMax": 100, + "sliderUnit": "Gi", + "hidden": { + "value": false, + "path": "replica/persistence/enabled" + } + } + } + } + } + }, + "volumePermissions": { + "type": "object", + "properties": { + "enabled": { + "type": "boolean", + "form": true, + "title": "Enable Init Containers", + "description": "Use an init container to set required folder permissions on the data volume before mounting it in the final destination" + } + } + }, + "metrics": { + "type": "object", + "form": true, + "title": "Prometheus metrics details", + "properties": { + "enabled": { + "type": "boolean", + "title": "Create Prometheus metrics exporter", + "description": "Create a side-car container to expose Prometheus metrics", + "form": true + }, + "serviceMonitor": { + "type": "object", + "properties": { + "enabled": { + "type": "boolean", + "title": "Create Prometheus Operator ServiceMonitor", + "description": "Create a ServiceMonitor to track metrics using Prometheus Operator", + "form": true, + "hidden": { + "value": false, + "path": "metrics/enabled" + } + } + } + } + } + } + } +} diff --git a/redis-fetcher/values.yaml b/redis-fetcher/values.yaml new file mode 100644 index 00000000..fcf2d919 --- /dev/null +++ b/redis-fetcher/values.yaml @@ -0,0 +1,1746 @@ +## @section Global parameters +## Global Docker image parameters +## Please, note that this will override the image parameters, including dependencies, configured to use the global value +## Current available global Docker image parameters: imageRegistry, imagePullSecrets and storageClass +## + +## @param global.imageRegistry Global Docker image registry +## @param global.imagePullSecrets Global Docker registry secret names as an array +## @param global.storageClass Global StorageClass for Persistent Volume(s) +## @param global.redis.password Global Redis® password (overrides `auth.password`) +## +global: + name: redis-fetcher + namespace: redis + + imageRegistry: "" + ## E.g. + ## imagePullSecrets: + ## - myRegistryKeySecretName + ## + imagePullSecrets: [] + storageClass: "" + redis: + password: "" + +## @section Common parameters +## + +## @param kubeVersion Override Kubernetes version +## +kubeVersion: "" +## @param nameOverride String to partially override common.names.fullname +## +nameOverride: "" +## @param fullnameOverride String to fully override common.names.fullname +## +fullnameOverride: "" +## @param commonLabels Labels to add to all deployed objects +## +commonLabels: {} +## @param commonAnnotations Annotations to add to all deployed objects +## +commonAnnotations: {} +## @param secretAnnotations Annotations to add to secret +## +secretAnnotations: {} +## @param clusterDomain Kubernetes cluster domain name +## +clusterDomain: cluster.local +## @param extraDeploy Array of extra objects to deploy with the release +## +extraDeploy: [] +## @param useHostnames Use hostnames internally when announcing replication +### +useHostnames: true + +## Enable diagnostic mode in the deployment +## +diagnosticMode: + ## @param diagnosticMode.enabled Enable diagnostic mode (all probes will be disabled and the command will be overridden) + ## + enabled: false + ## @param diagnosticMode.command Command to override all containers in the deployment + ## + command: + - sleep + ## @param diagnosticMode.args Args to override all containers in the deployment + ## + args: + - infinity + +## @section Redis® Image parameters +## + +## Bitnami Redis® image +## ref: https://hub.docker.com/r/bitnami/redis/tags/ +## @param image.registry Redis® image registry +## @param image.repository Redis® image repository +## @param image.tag Redis® image tag (immutable tags are recommended) +## @param image.digest Redis® image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag +## @param image.pullPolicy Redis® image pull policy +## @param image.pullSecrets Redis® image pull secrets +## @param image.debug Enable image debug mode +## +image: + registry: docker.io + repository: bitnami/redis + tag: 7.0.8-debian-11-r0 + digest: "" + ## Specify a imagePullPolicy + ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' + ## ref: https://kubernetes.io/docs/user-guide/images/#pre-pulling-images + ## + pullPolicy: IfNotPresent + ## Optionally specify an array of imagePullSecrets. + ## Secrets must be manually created in the namespace. + ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ + ## e.g: + ## pullSecrets: + ## - myRegistryKeySecretName + ## + pullSecrets: [] + ## Enable debug mode + ## + debug: false + +## @section Redis® common configuration parameters +## https://github.com/bitnami/containers/tree/main/bitnami/redis#configuration +## + +## @param architecture Redis® architecture. Allowed values: `standalone` or `replication` +## +architecture: replication +## Redis® Authentication parameters +## ref: https://github.com/bitnami/containers/tree/main/bitnami/redis#setting-the-server-password-on-first-run +## +auth: + ## @param auth.enabled Enable password authentication + ## + enabled: false + ## @param auth.sentinel Enable password authentication on sentinels too + ## + sentinel: true + ## @param auth.password Redis® password + ## Defaults to a random 10-character alphanumeric string if not set + ## + password: "" + ## @param auth.existingSecret The name of an existing secret with Redis® credentials + ## NOTE: When it's set, the previous `auth.password` parameter is ignored + ## + existingSecret: "" + ## @param auth.existingSecretPasswordKey Password key to be retrieved from existing secret + ## NOTE: ignored unless `auth.existingSecret` parameter is set + ## + existingSecretPasswordKey: "" + ## @param auth.usePasswordFiles Mount credentials as files instead of using an environment variable + ## + usePasswordFiles: false + +## @param commonConfiguration [string] Common configuration to be added into the ConfigMap +## ref: https://redis.io/topics/config +## +commonConfiguration: |- + # Enable AOF https://redis.io/topics/persistence#append-only-file + appendonly yes + # Disable RDB persistence, AOF persistence already enabled. + save "" +## @param existingConfigmap The name of an existing ConfigMap with your custom configuration for Redis® nodes +## +existingConfigmap: "" + +## @section Redis® master configuration parameters +## + +master: + ## @param master.count Number of Redis® master instances to deploy (experimental, requires additional configuration) + ## + count: 1 + ## @param master.configuration Configuration for Redis® master nodes + ## ref: https://redis.io/topics/config + ## + configuration: "" + ## @param master.disableCommands Array with Redis® commands to disable on master nodes + ## Commands will be completely disabled by renaming each to an empty string. + ## ref: https://redis.io/topics/security#disabling-of-specific-commands + ## + disableCommands: + + ## @param master.command Override default container command (useful when using custom images) + ## + command: [] + ## @param master.args Override default container args (useful when using custom images) + ## + args: [] + ## @param master.preExecCmds Additional commands to run prior to starting Redis® master + ## + preExecCmds: [] + ## @param master.extraFlags Array with additional command line flags for Redis® master + ## e.g: + ## extraFlags: + ## - "--maxmemory-policy volatile-ttl" + ## - "--repl-backlog-size 1024mb" + ## + extraFlags: [] + ## @param master.extraEnvVars Array with extra environment variables to add to Redis® master nodes + ## e.g: + ## extraEnvVars: + ## - name: FOO + ## value: "bar" + ## + extraEnvVars: [] + ## @param master.extraEnvVarsCM Name of existing ConfigMap containing extra env vars for Redis® master nodes + ## + extraEnvVarsCM: "" + ## @param master.extraEnvVarsSecret Name of existing Secret containing extra env vars for Redis® master nodes + ## + extraEnvVarsSecret: "" + ## @param master.containerPorts.redis Container port to open on Redis® master nodes + ## + containerPorts: + redis: 6379 + ## Configure extra options for Redis® containers' liveness and readiness probes + ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/#configure-probes + ## @param master.startupProbe.enabled Enable startupProbe on Redis® master nodes + ## @param master.startupProbe.initialDelaySeconds Initial delay seconds for startupProbe + ## @param master.startupProbe.periodSeconds Period seconds for startupProbe + ## @param master.startupProbe.timeoutSeconds Timeout seconds for startupProbe + ## @param master.startupProbe.failureThreshold Failure threshold for startupProbe + ## @param master.startupProbe.successThreshold Success threshold for startupProbe + ## + startupProbe: + enabled: false + initialDelaySeconds: 20 + periodSeconds: 5 + timeoutSeconds: 5 + successThreshold: 1 + failureThreshold: 5 + ## @param master.livenessProbe.enabled Enable livenessProbe on Redis® master nodes + ## @param master.livenessProbe.initialDelaySeconds Initial delay seconds for livenessProbe + ## @param master.livenessProbe.periodSeconds Period seconds for livenessProbe + ## @param master.livenessProbe.timeoutSeconds Timeout seconds for livenessProbe + ## @param master.livenessProbe.failureThreshold Failure threshold for livenessProbe + ## @param master.livenessProbe.successThreshold Success threshold for livenessProbe + ## + livenessProbe: + enabled: true + initialDelaySeconds: 20 + periodSeconds: 5 + timeoutSeconds: 5 + successThreshold: 1 + failureThreshold: 5 + ## @param master.readinessProbe.enabled Enable readinessProbe on Redis® master nodes + ## @param master.readinessProbe.initialDelaySeconds Initial delay seconds for readinessProbe + ## @param master.readinessProbe.periodSeconds Period seconds for readinessProbe + ## @param master.readinessProbe.timeoutSeconds Timeout seconds for readinessProbe + ## @param master.readinessProbe.failureThreshold Failure threshold for readinessProbe + ## @param master.readinessProbe.successThreshold Success threshold for readinessProbe + ## + readinessProbe: + enabled: true + initialDelaySeconds: 20 + periodSeconds: 5 + timeoutSeconds: 1 + successThreshold: 1 + failureThreshold: 5 + ## @param master.customStartupProbe Custom startupProbe that overrides the default one + ## + customStartupProbe: {} + ## @param master.customLivenessProbe Custom livenessProbe that overrides the default one + ## + customLivenessProbe: {} + ## @param master.customReadinessProbe Custom readinessProbe that overrides the default one + ## + customReadinessProbe: {} + ## Redis® master resource requests and limits + ## ref: https://kubernetes.io/docs/user-guide/compute-resources/ + ## @param master.resources.limits The resources limits for the Redis® master containers + ## @param master.resources.requests The requested resources for the Redis® master containers + ## + resources: + limits: {} + requests: {} + ## Configure Pods Security Context + ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod + ## @param master.podSecurityContext.enabled Enabled Redis® master pods' Security Context + ## @param master.podSecurityContext.fsGroup Set Redis® master pod's Security Context fsGroup + ## + podSecurityContext: + enabled: true + fsGroup: 1001 + ## Configure Container Security Context + ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod + ## @param master.containerSecurityContext.enabled Enabled Redis® master containers' Security Context + ## @param master.containerSecurityContext.runAsUser Set Redis® master containers' Security Context runAsUser + ## + containerSecurityContext: + enabled: true + runAsUser: 1001 + ## @param master.kind Use either Deployment or StatefulSet (default) + ## ref: https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/ + ## + kind: StatefulSet + ## @param master.schedulerName Alternate scheduler for Redis® master pods + ## ref: https://kubernetes.io/docs/tasks/administer-cluster/configure-multiple-schedulers/ + ## + schedulerName: "" + ## @param master.updateStrategy.type Redis® master statefulset strategy type + ## @skip master.updateStrategy.rollingUpdate + ## ref: https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#update-strategies + ## + updateStrategy: + ## StrategyType + ## Can be set to RollingUpdate, OnDelete (statefulset), Recreate (deployment) + ## + type: RollingUpdate + ## @param master.minReadySeconds How many seconds a pod needs to be ready before killing the next, during update + ## + minReadySeconds: 0 + ## @param master.priorityClassName Redis® master pods' priorityClassName + ## + priorityClassName: "" + ## @param master.hostAliases Redis® master pods host aliases + ## https://kubernetes.io/docs/concepts/services-networking/add-entries-to-pod-etc-hosts-with-host-aliases/ + ## + hostAliases: [] + ## @param master.podLabels Extra labels for Redis® master pods + ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/ + ## + podLabels: {} + ## @param master.podAnnotations Annotations for Redis® master pods + ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/ + ## + podAnnotations: {} + ## @param master.shareProcessNamespace Share a single process namespace between all of the containers in Redis® master pods + ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/share-process-namespace/ + ## + shareProcessNamespace: false + ## @param master.podAffinityPreset Pod affinity preset. Ignored if `master.affinity` is set. Allowed values: `soft` or `hard` + ## ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#inter-pod-affinity-and-anti-affinity + ## + podAffinityPreset: "" + ## @param master.podAntiAffinityPreset Pod anti-affinity preset. Ignored if `master.affinity` is set. Allowed values: `soft` or `hard` + ## ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#inter-pod-affinity-and-anti-affinity + ## + podAntiAffinityPreset: soft + ## Node master.affinity preset + ## ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#node-affinity + ## + nodeAffinityPreset: + ## @param master.nodeAffinityPreset.type Node affinity preset type. Ignored if `master.affinity` is set. Allowed values: `soft` or `hard` + ## + type: "" + ## @param master.nodeAffinityPreset.key Node label key to match. Ignored if `master.affinity` is set + ## + key: "" + ## @param master.nodeAffinityPreset.values Node label values to match. Ignored if `master.affinity` is set + ## E.g. + ## values: + ## - e2e-az1 + ## - e2e-az2 + ## + values: [] + ## @param master.affinity Affinity for Redis® master pods assignment + ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity + ## NOTE: `master.podAffinityPreset`, `master.podAntiAffinityPreset`, and `master.nodeAffinityPreset` will be ignored when it's set + ## + affinity: {} + ## @param master.nodeSelector Node labels for Redis® master pods assignment + ## ref: https://kubernetes.io/docs/user-guide/node-selection/ + ## + nodeSelector: {} + ## @param master.tolerations Tolerations for Redis® master pods assignment + ## ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ + ## + tolerations: [] + ## @param master.topologySpreadConstraints Spread Constraints for Redis® master pod assignment + ## ref: https://kubernetes.io/docs/concepts/workloads/pods/pod-topology-spread-constraints/ + ## E.g. + ## topologySpreadConstraints: + ## - maxSkew: 1 + ## topologyKey: node + ## whenUnsatisfiable: DoNotSchedule + ## + topologySpreadConstraints: [] + ## @param master.dnsPolicy DNS Policy for Redis® master pod + ## ref: https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/ + ## E.g. + ## dnsPolicy: ClusterFirst + dnsPolicy: "" + ## @param master.dnsConfig DNS Configuration for Redis® master pod + ## ref: https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/ + ## E.g. + ## dnsConfig: + ## options: + ## - name: ndots + ## value: "4" + ## - name: single-request-reopen + dnsConfig: {} + ## @param master.lifecycleHooks for the Redis® master container(s) to automate configuration before or after startup + ## + lifecycleHooks: {} + ## @param master.extraVolumes Optionally specify extra list of additional volumes for the Redis® master pod(s) + ## + extraVolumes: [] + ## @param master.extraVolumeMounts Optionally specify extra list of additional volumeMounts for the Redis® master container(s) + ## + extraVolumeMounts: [] + ## @param master.sidecars Add additional sidecar containers to the Redis® master pod(s) + ## e.g: + ## sidecars: + ## - name: your-image-name + ## image: your-image + ## imagePullPolicy: Always + ## ports: + ## - name: portname + ## containerPort: 1234 + ## + sidecars: [] + ## @param master.initContainers Add additional init containers to the Redis® master pod(s) + ## ref: https://kubernetes.io/docs/concepts/workloads/pods/init-containers/ + ## e.g: + ## initContainers: + ## - name: your-image-name + ## image: your-image + ## imagePullPolicy: Always + ## command: ['sh', '-c', 'echo "hello world"'] + ## + initContainers: [] + ## Persistence parameters + ## ref: https://kubernetes.io/docs/user-guide/persistent-volumes/ + ## + persistence: + ## @param master.persistence.enabled Enable persistence on Redis® master nodes using Persistent Volume Claims + ## + enabled: true + ## @param master.persistence.medium Provide a medium for `emptyDir` volumes. + ## + medium: "" + ## @param master.persistence.sizeLimit Set this to enable a size limit for `emptyDir` volumes. + ## + sizeLimit: "" + ## @param master.persistence.path The path the volume will be mounted at on Redis® master containers + ## NOTE: Useful when using different Redis® images + ## + path: /data + ## @param master.persistence.subPath The subdirectory of the volume to mount on Redis® master containers + ## NOTE: Useful in dev environments + ## + subPath: "" + ## @param master.persistence.subPathExpr Used to construct the subPath subdirectory of the volume to mount on Redis® master containers + ## + subPathExpr: "" + ## @param master.persistence.storageClass Persistent Volume storage class + ## If defined, storageClassName: + ## If set to "-", storageClassName: "", which disables dynamic provisioning + ## If undefined (the default) or set to null, no storageClassName spec is set, choosing the default provisioner + ## + storageClass: "" + ## @param master.persistence.accessModes Persistent Volume access modes + ## + accessModes: + - ReadWriteOnce + ## @param master.persistence.size Persistent Volume size + ## + size: 8Gi + ## @param master.persistence.annotations Additional custom annotations for the PVC + ## + annotations: {} + ## @param master.persistence.selector Additional labels to match for the PVC + ## e.g: + ## selector: + ## matchLabels: + ## app: my-app + ## + selector: {} + ## @param master.persistence.dataSource Custom PVC data source + ## + dataSource: {} + ## @param master.persistence.existingClaim Use a existing PVC which must be created manually before bound + ## NOTE: requires master.persistence.enabled: true + ## + existingClaim: "" + ## Redis® master service parameters + ## + service: + ## @param master.service.type Redis® master service type + ## + type: ClusterIP + ## @param master.service.ports.redis Redis® master service port + ## + ports: + redis: 6379 + ## @param master.service.nodePorts.redis Node port for Redis® master + ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-nodeport + ## NOTE: choose port between <30000-32767> + ## + nodePorts: + redis: "" + ## @param master.service.externalTrafficPolicy Redis® master service external traffic policy + ## ref: https://kubernetes.io/docs/tasks/access-application-cluster/create-external-load-balancer/#preserving-the-client-source-ip + ## + externalTrafficPolicy: Cluster + ## @param master.service.extraPorts Extra ports to expose (normally used with the `sidecar` value) + ## + extraPorts: [] + ## @param master.service.internalTrafficPolicy Redis® master service internal traffic policy (requires Kubernetes v1.22 or greater to be usable) + ## ref: https://kubernetes.io/docs/concepts/services-networking/service-traffic-policy/ + ## + internalTrafficPolicy: Cluster + ## @param master.service.clusterIP Redis® master service Cluster IP + ## + clusterIP: "" + ## @param master.service.loadBalancerIP Redis® master service Load Balancer IP + ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#internal-load-balancer + ## + loadBalancerIP: "" + ## @param master.service.loadBalancerSourceRanges Redis® master service Load Balancer sources + ## https://kubernetes.io/docs/tasks/access-application-cluster/configure-cloud-provider-firewall/#restrict-access-for-loadbalancer-service + ## e.g. + ## loadBalancerSourceRanges: + ## - 10.10.10.0/24 + ## + loadBalancerSourceRanges: [] + ## @param master.service.externalIPs Redis® master service External IPs + ## https://kubernetes.io/docs/concepts/services-networking/service/#external-ips + ## e.g. + ## externalIPs: + ## - 10.10.10.1 + ## - 201.22.30.1 + ## + externalIPs: [] + ## @param master.service.annotations Additional custom annotations for Redis® master service + ## + annotations: {} + ## @param master.service.sessionAffinity Session Affinity for Kubernetes service, can be "None" or "ClientIP" + ## If "ClientIP", consecutive client requests will be directed to the same Pod + ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#virtual-ips-and-service-proxies + ## + sessionAffinity: None + ## @param master.service.sessionAffinityConfig Additional settings for the sessionAffinity + ## sessionAffinityConfig: + ## clientIP: + ## timeoutSeconds: 300 + ## + sessionAffinityConfig: {} + ## @param master.terminationGracePeriodSeconds Integer setting the termination grace period for the redis-master pods + ## + terminationGracePeriodSeconds: 30 + ## ServiceAccount configuration + ## + serviceAccount: + ## @param master.serviceAccount.create Specifies whether a ServiceAccount should be created + ## + create: false + ## @param master.serviceAccount.name The name of the ServiceAccount to use. + ## If not set and create is true, a name is generated using the common.names.fullname template + ## + name: "" + ## @param master.serviceAccount.automountServiceAccountToken Whether to auto mount the service account token + ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/#use-the-default-service-account-to-access-the-api-server + ## + automountServiceAccountToken: true + ## @param master.serviceAccount.annotations Additional custom annotations for the ServiceAccount + ## + annotations: {} + +## @section Redis® replicas configuration parameters +## + +replica: + ## @param replica.replicaCount Number of Redis® replicas to deploy + ## + replicaCount: 0 + ## @param replica.configuration Configuration for Redis® replicas nodes + ## ref: https://redis.io/topics/config + ## + configuration: "" + ## @param replica.disableCommands Array with Redis® commands to disable on replicas nodes + ## Commands will be completely disabled by renaming each to an empty string. + ## ref: https://redis.io/topics/security#disabling-of-specific-commands + ## + disableCommands: + ## @param replica.command Override default container command (useful when using custom images) + ## + command: [] + ## @param replica.args Override default container args (useful when using custom images) + ## + args: [] + ## @param replica.preExecCmds Additional commands to run prior to starting Redis® replicas + ## + preExecCmds: [] + ## @param replica.extraFlags Array with additional command line flags for Redis® replicas + ## e.g: + ## extraFlags: + ## - "--maxmemory-policy volatile-ttl" + ## - "--repl-backlog-size 1024mb" + ## + extraFlags: [] + ## @param replica.extraEnvVars Array with extra environment variables to add to Redis® replicas nodes + ## e.g: + ## extraEnvVars: + ## - name: FOO + ## value: "bar" + ## + extraEnvVars: [] + ## @param replica.extraEnvVarsCM Name of existing ConfigMap containing extra env vars for Redis® replicas nodes + ## + extraEnvVarsCM: "" + ## @param replica.extraEnvVarsSecret Name of existing Secret containing extra env vars for Redis® replicas nodes + ## + extraEnvVarsSecret: "" + ## @param replica.externalMaster.enabled Use external master for bootstrapping + ## @param replica.externalMaster.host External master host to bootstrap from + ## @param replica.externalMaster.port Port for Redis service external master host + ## + externalMaster: + enabled: false + host: "" + port: 6379 + ## @param replica.containerPorts.redis Container port to open on Redis® replicas nodes + ## + containerPorts: + redis: 6379 + ## Configure extra options for Redis® containers' liveness and readiness probes + ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/#configure-probes + ## @param replica.startupProbe.enabled Enable startupProbe on Redis® replicas nodes + ## @param replica.startupProbe.initialDelaySeconds Initial delay seconds for startupProbe + ## @param replica.startupProbe.periodSeconds Period seconds for startupProbe + ## @param replica.startupProbe.timeoutSeconds Timeout seconds for startupProbe + ## @param replica.startupProbe.failureThreshold Failure threshold for startupProbe + ## @param replica.startupProbe.successThreshold Success threshold for startupProbe + ## + startupProbe: + enabled: true + initialDelaySeconds: 10 + periodSeconds: 10 + timeoutSeconds: 5 + successThreshold: 1 + failureThreshold: 22 + ## @param replica.livenessProbe.enabled Enable livenessProbe on Redis® replicas nodes + ## @param replica.livenessProbe.initialDelaySeconds Initial delay seconds for livenessProbe + ## @param replica.livenessProbe.periodSeconds Period seconds for livenessProbe + ## @param replica.livenessProbe.timeoutSeconds Timeout seconds for livenessProbe + ## @param replica.livenessProbe.failureThreshold Failure threshold for livenessProbe + ## @param replica.livenessProbe.successThreshold Success threshold for livenessProbe + ## + livenessProbe: + enabled: true + initialDelaySeconds: 20 + periodSeconds: 5 + timeoutSeconds: 5 + successThreshold: 1 + failureThreshold: 5 + ## @param replica.readinessProbe.enabled Enable readinessProbe on Redis® replicas nodes + ## @param replica.readinessProbe.initialDelaySeconds Initial delay seconds for readinessProbe + ## @param replica.readinessProbe.periodSeconds Period seconds for readinessProbe + ## @param replica.readinessProbe.timeoutSeconds Timeout seconds for readinessProbe + ## @param replica.readinessProbe.failureThreshold Failure threshold for readinessProbe + ## @param replica.readinessProbe.successThreshold Success threshold for readinessProbe + ## + readinessProbe: + enabled: true + initialDelaySeconds: 20 + periodSeconds: 5 + timeoutSeconds: 1 + successThreshold: 1 + failureThreshold: 5 + ## @param replica.customStartupProbe Custom startupProbe that overrides the default one + ## + customStartupProbe: {} + ## @param replica.customLivenessProbe Custom livenessProbe that overrides the default one + ## + customLivenessProbe: {} + ## @param replica.customReadinessProbe Custom readinessProbe that overrides the default one + ## + customReadinessProbe: {} + ## Redis® replicas resource requests and limits + ## ref: https://kubernetes.io/docs/user-guide/compute-resources/ + ## @param replica.resources.limits The resources limits for the Redis® replicas containers + ## @param replica.resources.requests The requested resources for the Redis® replicas containers + ## + resources: + # We usually recommend not to specify default resources and to leave this as a conscious + # choice for the user. This also increases chances charts run on environments with little + # resources, such as Minikube. If you do want to specify resources, uncomment the following + # lines, adjust them as necessary, and remove the curly braces after 'resources:'. + limits: {} + # cpu: 250m + # memory: 256Mi + requests: {} + # cpu: 250m + # memory: 256Mi + ## Configure Pods Security Context + ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod + ## @param replica.podSecurityContext.enabled Enabled Redis® replicas pods' Security Context + ## @param replica.podSecurityContext.fsGroup Set Redis® replicas pod's Security Context fsGroup + ## + podSecurityContext: + enabled: true + fsGroup: 1001 + ## Configure Container Security Context + ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod + ## @param replica.containerSecurityContext.enabled Enabled Redis® replicas containers' Security Context + ## @param replica.containerSecurityContext.runAsUser Set Redis® replicas containers' Security Context runAsUser + ## + containerSecurityContext: + enabled: true + runAsUser: 1001 + ## @param replica.schedulerName Alternate scheduler for Redis® replicas pods + ## ref: https://kubernetes.io/docs/tasks/administer-cluster/configure-multiple-schedulers/ + ## + schedulerName: "" + ## @param replica.updateStrategy.type Redis® replicas statefulset strategy type + ## @skip replica.updateStrategy.rollingUpdate + ## ref: https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#update-strategies + ## + updateStrategy: + ## StrategyType + ## Can be set to RollingUpdate, OnDelete (statefulset), Recreate (deployment) + ## + type: RollingUpdate + ## @param replica.minReadySeconds How many seconds a pod needs to be ready before killing the next, during update + ## + minReadySeconds: 0 + ## @param replica.priorityClassName Redis® replicas pods' priorityClassName + ## + priorityClassName: "" + ## @param replica.podManagementPolicy podManagementPolicy to manage scaling operation of %%MAIN_CONTAINER_NAME%% pods + ## ref: https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#pod-management-policies + ## + podManagementPolicy: "" + ## @param replica.hostAliases Redis® replicas pods host aliases + ## https://kubernetes.io/docs/concepts/services-networking/add-entries-to-pod-etc-hosts-with-host-aliases/ + ## + hostAliases: [] + ## @param replica.podLabels Extra labels for Redis® replicas pods + ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/ + ## + podLabels: {} + ## @param replica.podAnnotations Annotations for Redis® replicas pods + ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/ + ## + podAnnotations: {} + ## @param replica.shareProcessNamespace Share a single process namespace between all of the containers in Redis® replicas pods + ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/share-process-namespace/ + ## + shareProcessNamespace: false + ## @param replica.podAffinityPreset Pod affinity preset. Ignored if `replica.affinity` is set. Allowed values: `soft` or `hard` + ## ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#inter-pod-affinity-and-anti-affinity + ## + podAffinityPreset: "" + ## @param replica.podAntiAffinityPreset Pod anti-affinity preset. Ignored if `replica.affinity` is set. Allowed values: `soft` or `hard` + ## ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#inter-pod-affinity-and-anti-affinity + ## + podAntiAffinityPreset: soft + ## Node affinity preset + ## ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#node-affinity + ## + nodeAffinityPreset: + ## @param replica.nodeAffinityPreset.type Node affinity preset type. Ignored if `replica.affinity` is set. Allowed values: `soft` or `hard` + ## + type: "" + ## @param replica.nodeAffinityPreset.key Node label key to match. Ignored if `replica.affinity` is set + ## + key: "" + ## @param replica.nodeAffinityPreset.values Node label values to match. Ignored if `replica.affinity` is set + ## E.g. + ## values: + ## - e2e-az1 + ## - e2e-az2 + ## + values: [] + ## @param replica.affinity Affinity for Redis® replicas pods assignment + ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity + ## NOTE: `replica.podAffinityPreset`, `replica.podAntiAffinityPreset`, and `replica.nodeAffinityPreset` will be ignored when it's set + ## + affinity: {} + ## @param replica.nodeSelector Node labels for Redis® replicas pods assignment + ## ref: https://kubernetes.io/docs/user-guide/node-selection/ + ## + nodeSelector: {} + ## @param replica.tolerations Tolerations for Redis® replicas pods assignment + ## ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ + ## + tolerations: [] + ## @param replica.topologySpreadConstraints Spread Constraints for Redis® replicas pod assignment + ## ref: https://kubernetes.io/docs/concepts/workloads/pods/pod-topology-spread-constraints/ + ## E.g. + ## topologySpreadConstraints: + ## - maxSkew: 1 + ## topologyKey: node + ## whenUnsatisfiable: DoNotSchedule + ## + topologySpreadConstraints: [] + ## @param replica.dnsPolicy DNS Policy for Redis® replica pods + ## ref: https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/ + ## E.g. + ## dnsPolicy: ClusterFirst + dnsPolicy: "" + ## @param replica.dnsConfig DNS Configuration for Redis® replica pods + ## ref: https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/ + ## E.g. + ## dnsConfig: + ## options: + ## - name: ndots + ## value: "4" + ## - name: single-request-reopen + dnsConfig: {} + ## @param replica.lifecycleHooks for the Redis® replica container(s) to automate configuration before or after startup + ## + lifecycleHooks: {} + ## @param replica.extraVolumes Optionally specify extra list of additional volumes for the Redis® replicas pod(s) + ## + extraVolumes: [] + ## @param replica.extraVolumeMounts Optionally specify extra list of additional volumeMounts for the Redis® replicas container(s) + ## + extraVolumeMounts: [] + ## @param replica.sidecars Add additional sidecar containers to the Redis® replicas pod(s) + ## e.g: + ## sidecars: + ## - name: your-image-name + ## image: your-image + ## imagePullPolicy: Always + ## ports: + ## - name: portname + ## containerPort: 1234 + ## + sidecars: [] + ## @param replica.initContainers Add additional init containers to the Redis® replicas pod(s) + ## ref: https://kubernetes.io/docs/concepts/workloads/pods/init-containers/ + ## e.g: + ## initContainers: + ## - name: your-image-name + ## image: your-image + ## imagePullPolicy: Always + ## command: ['sh', '-c', 'echo "hello world"'] + ## + initContainers: [] + ## Persistence Parameters + ## ref: https://kubernetes.io/docs/user-guide/persistent-volumes/ + ## + persistence: + ## @param replica.persistence.enabled Enable persistence on Redis® replicas nodes using Persistent Volume Claims + ## + enabled: true + ## @param replica.persistence.medium Provide a medium for `emptyDir` volumes. + ## + medium: "" + ## @param replica.persistence.sizeLimit Set this to enable a size limit for `emptyDir` volumes. + ## + sizeLimit: "" + ## @param replica.persistence.path The path the volume will be mounted at on Redis® replicas containers + ## NOTE: Useful when using different Redis® images + ## + path: /data + ## @param replica.persistence.subPath The subdirectory of the volume to mount on Redis® replicas containers + ## NOTE: Useful in dev environments + ## + subPath: "" + ## @param replica.persistence.subPathExpr Used to construct the subPath subdirectory of the volume to mount on Redis® replicas containers + ## + subPathExpr: "" + ## @param replica.persistence.storageClass Persistent Volume storage class + ## If defined, storageClassName: + ## If set to "-", storageClassName: "", which disables dynamic provisioning + ## If undefined (the default) or set to null, no storageClassName spec is set, choosing the default provisioner + ## + storageClass: "" + ## @param replica.persistence.accessModes Persistent Volume access modes + ## + accessModes: + - ReadWriteOnce + ## @param replica.persistence.size Persistent Volume size + ## + size: 8Gi + ## @param replica.persistence.annotations Additional custom annotations for the PVC + ## + annotations: {} + ## @param replica.persistence.selector Additional labels to match for the PVC + ## e.g: + ## selector: + ## matchLabels: + ## app: my-app + ## + selector: {} + ## @param replica.persistence.dataSource Custom PVC data source + ## + dataSource: {} + ## @param replica.persistence.existingClaim Use a existing PVC which must be created manually before bound + ## NOTE: requires replica.persistence.enabled: true + ## + existingClaim: "" + ## Redis® replicas service parameters + ## + service: + ## @param replica.service.type Redis® replicas service type + ## + type: ClusterIP + ## @param replica.service.ports.redis Redis® replicas service port + ## + ports: + redis: 6379 + ## @param replica.service.nodePorts.redis Node port for Redis® replicas + ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-nodeport + ## NOTE: choose port between <30000-32767> + ## + nodePorts: + redis: "" + ## @param replica.service.externalTrafficPolicy Redis® replicas service external traffic policy + ## ref: https://kubernetes.io/docs/tasks/access-application-cluster/create-external-load-balancer/#preserving-the-client-source-ip + ## + externalTrafficPolicy: Cluster + ## @param replica.service.internalTrafficPolicy Redis® replicas service internal traffic policy (requires Kubernetes v1.22 or greater to be usable) + ## ref: https://kubernetes.io/docs/concepts/services-networking/service-traffic-policy/ + ## + internalTrafficPolicy: Cluster + ## @param replica.service.extraPorts Extra ports to expose (normally used with the `sidecar` value) + ## + extraPorts: [] + ## @param replica.service.clusterIP Redis® replicas service Cluster IP + ## + clusterIP: "" + ## @param replica.service.loadBalancerIP Redis® replicas service Load Balancer IP + ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#internal-load-balancer + ## + loadBalancerIP: "" + ## @param replica.service.loadBalancerSourceRanges Redis® replicas service Load Balancer sources + ## https://kubernetes.io/docs/tasks/access-application-cluster/configure-cloud-provider-firewall/#restrict-access-for-loadbalancer-service + ## e.g. + ## loadBalancerSourceRanges: + ## - 10.10.10.0/24 + ## + loadBalancerSourceRanges: [] + ## @param replica.service.annotations Additional custom annotations for Redis® replicas service + ## + annotations: {} + ## @param replica.service.sessionAffinity Session Affinity for Kubernetes service, can be "None" or "ClientIP" + ## If "ClientIP", consecutive client requests will be directed to the same Pod + ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#virtual-ips-and-service-proxies + ## + sessionAffinity: None + ## @param replica.service.sessionAffinityConfig Additional settings for the sessionAffinity + ## sessionAffinityConfig: + ## clientIP: + ## timeoutSeconds: 300 + ## + sessionAffinityConfig: {} + ## @param replica.terminationGracePeriodSeconds Integer setting the termination grace period for the redis-replicas pods + ## + terminationGracePeriodSeconds: 30 + ## Autoscaling configuration + ## + autoscaling: + ## @param replica.autoscaling.enabled Enable replica autoscaling settings + ## + enabled: false + ## @param replica.autoscaling.minReplicas Minimum replicas for the pod autoscaling + ## + minReplicas: 1 + ## @param replica.autoscaling.maxReplicas Maximum replicas for the pod autoscaling + ## + maxReplicas: 11 + ## @param replica.autoscaling.targetCPU Percentage of CPU to consider when autoscaling + ## + targetCPU: "" + ## @param replica.autoscaling.targetMemory Percentage of Memory to consider when autoscaling + ## + targetMemory: "" + ## ServiceAccount configuration + ## + serviceAccount: + ## @param replica.serviceAccount.create Specifies whether a ServiceAccount should be created + ## + create: false + ## @param replica.serviceAccount.name The name of the ServiceAccount to use. + ## If not set and create is true, a name is generated using the common.names.fullname template + ## + name: "" + ## @param replica.serviceAccount.automountServiceAccountToken Whether to auto mount the service account token + ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/#use-the-default-service-account-to-access-the-api-server + ## + automountServiceAccountToken: true + ## @param replica.serviceAccount.annotations Additional custom annotations for the ServiceAccount + ## + annotations: {} +## @section Redis® Sentinel configuration parameters +## + +sentinel: + ## @param sentinel.enabled Use Redis® Sentinel on Redis® pods. + ## IMPORTANT: this will disable the master and replicas services and + ## create a single Redis® service exposing both the Redis and Sentinel ports + ## + enabled: false + ## Bitnami Redis® Sentinel image version + ## ref: https://hub.docker.com/r/bitnami/redis-sentinel/tags/ + ## @param sentinel.image.registry Redis® Sentinel image registry + ## @param sentinel.image.repository Redis® Sentinel image repository + ## @param sentinel.image.tag Redis® Sentinel image tag (immutable tags are recommended) + ## @param sentinel.image.digest Redis® Sentinel image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag + ## @param sentinel.image.pullPolicy Redis® Sentinel image pull policy + ## @param sentinel.image.pullSecrets Redis® Sentinel image pull secrets + ## @param sentinel.image.debug Enable image debug mode + ## + image: + registry: docker.io + repository: bitnami/redis-sentinel + tag: 7.0.7-debian-11-r10 + digest: "" + ## Specify a imagePullPolicy + ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' + ## ref: https://kubernetes.io/docs/user-guide/images/#pre-pulling-images + ## + pullPolicy: IfNotPresent + ## Optionally specify an array of imagePullSecrets. + ## Secrets must be manually created in the namespace. + ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ + ## e.g: + ## pullSecrets: + ## - myRegistryKeySecretName + ## + pullSecrets: [] + ## Enable debug mode + ## + debug: false + ## @param sentinel.masterSet Master set name + ## + masterSet: mymaster + ## @param sentinel.quorum Sentinel Quorum + ## + quorum: 2 + ## @param sentinel.getMasterTimeout Amount of time to allow before get_sentinel_master_info() times out. + ## NOTE: This is directly related to the startupProbes which are configured to run every 10 seconds for a total of 22 failures. If adjusting this value, also adjust the startupProbes. + getMasterTimeout: 220 + ## @param sentinel.automateClusterRecovery Automate cluster recovery in cases where the last replica is not considered a good replica and Sentinel won't automatically failover to it. + ## This also prevents any new replica from starting until the last remaining replica is elected as master to guarantee that it is the one to be elected by Sentinel, and not a newly started replica with no data. + ## NOTE: This feature requires a "downAfterMilliseconds" value less or equal to 2000. + ## + automateClusterRecovery: false + ## @param sentinel.redisShutdownWaitFailover Whether the Redis® master container waits for the failover at shutdown (in addition to the Redis® Sentinel container). + redisShutdownWaitFailover: true + ## Sentinel timing restrictions + ## @param sentinel.downAfterMilliseconds Timeout for detecting a Redis® node is down + ## @param sentinel.failoverTimeout Timeout for performing a election failover + ## + downAfterMilliseconds: 60000 + failoverTimeout: 180000 + ## @param sentinel.parallelSyncs Number of replicas that can be reconfigured in parallel to use the new master after a failover + ## + parallelSyncs: 1 + ## @param sentinel.configuration Configuration for Redis® Sentinel nodes + ## ref: https://redis.io/topics/sentinel + ## + configuration: "" + ## @param sentinel.command Override default container command (useful when using custom images) + ## + command: [] + ## @param sentinel.args Override default container args (useful when using custom images) + ## + args: [] + ## @param sentinel.preExecCmds Additional commands to run prior to starting Redis® Sentinel + ## + preExecCmds: [] + ## @param sentinel.extraEnvVars Array with extra environment variables to add to Redis® Sentinel nodes + ## e.g: + ## extraEnvVars: + ## - name: FOO + ## value: "bar" + ## + extraEnvVars: [] + ## @param sentinel.extraEnvVarsCM Name of existing ConfigMap containing extra env vars for Redis® Sentinel nodes + ## + extraEnvVarsCM: "" + ## @param sentinel.extraEnvVarsSecret Name of existing Secret containing extra env vars for Redis® Sentinel nodes + ## + extraEnvVarsSecret: "" + ## @param sentinel.externalMaster.enabled Use external master for bootstrapping + ## @param sentinel.externalMaster.host External master host to bootstrap from + ## @param sentinel.externalMaster.port Port for Redis service external master host + ## + externalMaster: + enabled: false + host: "" + port: 6379 + ## @param sentinel.containerPorts.sentinel Container port to open on Redis® Sentinel nodes + ## + containerPorts: + sentinel: 26379 + ## Configure extra options for Redis® containers' liveness and readiness probes + ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/#configure-probes + ## @param sentinel.startupProbe.enabled Enable startupProbe on Redis® Sentinel nodes + ## @param sentinel.startupProbe.initialDelaySeconds Initial delay seconds for startupProbe + ## @param sentinel.startupProbe.periodSeconds Period seconds for startupProbe + ## @param sentinel.startupProbe.timeoutSeconds Timeout seconds for startupProbe + ## @param sentinel.startupProbe.failureThreshold Failure threshold for startupProbe + ## @param sentinel.startupProbe.successThreshold Success threshold for startupProbe + ## + startupProbe: + enabled: true + initialDelaySeconds: 10 + periodSeconds: 10 + timeoutSeconds: 5 + successThreshold: 1 + failureThreshold: 22 + ## @param sentinel.livenessProbe.enabled Enable livenessProbe on Redis® Sentinel nodes + ## @param sentinel.livenessProbe.initialDelaySeconds Initial delay seconds for livenessProbe + ## @param sentinel.livenessProbe.periodSeconds Period seconds for livenessProbe + ## @param sentinel.livenessProbe.timeoutSeconds Timeout seconds for livenessProbe + ## @param sentinel.livenessProbe.failureThreshold Failure threshold for livenessProbe + ## @param sentinel.livenessProbe.successThreshold Success threshold for livenessProbe + ## + livenessProbe: + enabled: true + initialDelaySeconds: 20 + periodSeconds: 5 + timeoutSeconds: 5 + successThreshold: 1 + failureThreshold: 5 + ## @param sentinel.readinessProbe.enabled Enable readinessProbe on Redis® Sentinel nodes + ## @param sentinel.readinessProbe.initialDelaySeconds Initial delay seconds for readinessProbe + ## @param sentinel.readinessProbe.periodSeconds Period seconds for readinessProbe + ## @param sentinel.readinessProbe.timeoutSeconds Timeout seconds for readinessProbe + ## @param sentinel.readinessProbe.failureThreshold Failure threshold for readinessProbe + ## @param sentinel.readinessProbe.successThreshold Success threshold for readinessProbe + ## + readinessProbe: + enabled: true + initialDelaySeconds: 20 + periodSeconds: 5 + timeoutSeconds: 1 + successThreshold: 1 + failureThreshold: 5 + ## @param sentinel.customStartupProbe Custom startupProbe that overrides the default one + ## + customStartupProbe: {} + ## @param sentinel.customLivenessProbe Custom livenessProbe that overrides the default one + ## + customLivenessProbe: {} + ## @param sentinel.customReadinessProbe Custom readinessProbe that overrides the default one + ## + customReadinessProbe: {} + ## Persistence parameters + ## ref: https://kubernetes.io/docs/user-guide/persistent-volumes/ + ## + persistence: + ## @param sentinel.persistence.enabled Enable persistence on Redis® sentinel nodes using Persistent Volume Claims (Experimental) + ## + enabled: false + ## @param sentinel.persistence.storageClass Persistent Volume storage class + ## If defined, storageClassName: + ## If set to "-", storageClassName: "", which disables dynamic provisioning + ## If undefined (the default) or set to null, no storageClassName spec is set, choosing the default provisioner + ## + storageClass: "" + ## @param sentinel.persistence.accessModes Persistent Volume access modes + ## + accessModes: + - ReadWriteOnce + ## @param sentinel.persistence.size Persistent Volume size + ## + size: 100Mi + ## @param sentinel.persistence.annotations Additional custom annotations for the PVC + ## + annotations: {} + ## @param sentinel.persistence.selector Additional labels to match for the PVC + ## e.g: + ## selector: + ## matchLabels: + ## app: my-app + ## + selector: {} + ## @param sentinel.persistence.dataSource Custom PVC data source + ## + dataSource: {} + ## @param sentinel.persistence.medium Provide a medium for `emptyDir` volumes. + ## + medium: "" + ## @param sentinel.persistence.sizeLimit Set this to enable a size limit for `emptyDir` volumes. + ## + sizeLimit: "" + ## Redis® Sentinel resource requests and limits + ## ref: https://kubernetes.io/docs/user-guide/compute-resources/ + ## @param sentinel.resources.limits The resources limits for the Redis® Sentinel containers + ## @param sentinel.resources.requests The requested resources for the Redis® Sentinel containers + ## + resources: + limits: {} + requests: {} + ## Configure Container Security Context + ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod + ## @param sentinel.containerSecurityContext.enabled Enabled Redis® Sentinel containers' Security Context + ## @param sentinel.containerSecurityContext.runAsUser Set Redis® Sentinel containers' Security Context runAsUser + ## + containerSecurityContext: + enabled: true + runAsUser: 1001 + ## @param sentinel.lifecycleHooks for the Redis® sentinel container(s) to automate configuration before or after startup + ## + lifecycleHooks: {} + ## @param sentinel.extraVolumes Optionally specify extra list of additional volumes for the Redis® Sentinel + ## + extraVolumes: [] + ## @param sentinel.extraVolumeMounts Optionally specify extra list of additional volumeMounts for the Redis® Sentinel container(s) + ## + extraVolumeMounts: [] + ## Redis® Sentinel service parameters + ## + service: + ## @param sentinel.service.type Redis® Sentinel service type + ## + type: ClusterIP + ## @param sentinel.service.ports.redis Redis® service port for Redis® + ## @param sentinel.service.ports.sentinel Redis® service port for Redis® Sentinel + ## + ports: + redis: 6379 + sentinel: 26379 + ## @param sentinel.service.nodePorts.redis Node port for Redis® + ## @param sentinel.service.nodePorts.sentinel Node port for Sentinel + ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-nodeport + ## NOTE: choose port between <30000-32767> + ## NOTE: By leaving these values blank, they will be generated by ports-configmap + ## If setting manually, please leave at least replica.replicaCount + 1 in between sentinel.service.nodePorts.redis and sentinel.service.nodePorts.sentinel to take into account the ports that will be created while incrementing that base port + ## + nodePorts: + redis: "" + sentinel: "" + ## @param sentinel.service.externalTrafficPolicy Redis® Sentinel service external traffic policy + ## ref: https://kubernetes.io/docs/tasks/access-application-cluster/create-external-load-balancer/#preserving-the-client-source-ip + ## + externalTrafficPolicy: Cluster + ## @param sentinel.service.extraPorts Extra ports to expose (normally used with the `sidecar` value) + ## + extraPorts: [] + ## @param sentinel.service.clusterIP Redis® Sentinel service Cluster IP + ## + clusterIP: "" + ## @param sentinel.service.loadBalancerIP Redis® Sentinel service Load Balancer IP + ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#internal-load-balancer + ## + loadBalancerIP: "" + ## @param sentinel.service.loadBalancerSourceRanges Redis® Sentinel service Load Balancer sources + ## https://kubernetes.io/docs/tasks/access-application-cluster/configure-cloud-provider-firewall/#restrict-access-for-loadbalancer-service + ## e.g. + ## loadBalancerSourceRanges: + ## - 10.10.10.0/24 + ## + loadBalancerSourceRanges: [] + ## @param sentinel.service.annotations Additional custom annotations for Redis® Sentinel service + ## + annotations: {} + ## @param sentinel.service.sessionAffinity Session Affinity for Kubernetes service, can be "None" or "ClientIP" + ## If "ClientIP", consecutive client requests will be directed to the same Pod + ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#virtual-ips-and-service-proxies + ## + sessionAffinity: None + ## @param sentinel.service.sessionAffinityConfig Additional settings for the sessionAffinity + ## sessionAffinityConfig: + ## clientIP: + ## timeoutSeconds: 300 + ## + sessionAffinityConfig: {} + ## @param sentinel.terminationGracePeriodSeconds Integer setting the termination grace period for the redis-node pods + ## + terminationGracePeriodSeconds: 30 + +## @section Other Parameters +## + +## Network Policy configuration +## ref: https://kubernetes.io/docs/concepts/services-networking/network-policies/ +## +networkPolicy: + ## @param networkPolicy.enabled Enable creation of NetworkPolicy resources + ## + enabled: false + ## @param networkPolicy.allowExternal Don't require client label for connections + ## When set to false, only pods with the correct client label will have network access to the ports + ## Redis® is listening on. When true, Redis® will accept connections from any source + ## (with the correct destination port). + ## + allowExternal: true + ## @param networkPolicy.extraIngress Add extra ingress rules to the NetworkPolicy + ## e.g: + ## extraIngress: + ## - ports: + ## - port: 1234 + ## from: + ## - podSelector: + ## - matchLabels: + ## - role: frontend + ## - podSelector: + ## - matchExpressions: + ## - key: role + ## operator: In + ## values: + ## - frontend + ## + extraIngress: [] + ## @param networkPolicy.extraEgress Add extra egress rules to the NetworkPolicy + ## e.g: + ## extraEgress: + ## - ports: + ## - port: 1234 + ## to: + ## - podSelector: + ## - matchLabels: + ## - role: frontend + ## - podSelector: + ## - matchExpressions: + ## - key: role + ## operator: In + ## values: + ## - frontend + ## + extraEgress: [] + ## @param networkPolicy.ingressNSMatchLabels Labels to match to allow traffic from other namespaces + ## @param networkPolicy.ingressNSPodMatchLabels Pod labels to match to allow traffic from other namespaces + ## + ingressNSMatchLabels: {} + ingressNSPodMatchLabels: {} +## PodSecurityPolicy configuration +## ref: https://kubernetes.io/docs/concepts/policy/pod-security-policy/ +## +podSecurityPolicy: + ## @param podSecurityPolicy.create Whether to create a PodSecurityPolicy. WARNING: PodSecurityPolicy is deprecated in Kubernetes v1.21 or later, unavailable in v1.25 or later + ## + create: false + ## @param podSecurityPolicy.enabled Enable PodSecurityPolicy's RBAC rules + ## + enabled: false +## RBAC configuration +## +rbac: + ## @param rbac.create Specifies whether RBAC resources should be created + ## + create: false + ## @param rbac.rules Custom RBAC rules to set + ## e.g: + ## rules: + ## - apiGroups: + ## - "" + ## resources: + ## - pods + ## verbs: + ## - get + ## - list + ## + rules: [] +## ServiceAccount configuration +## +serviceAccount: + ## @param serviceAccount.create Specifies whether a ServiceAccount should be created + ## + create: true + ## @param serviceAccount.name The name of the ServiceAccount to use. + ## If not set and create is true, a name is generated using the common.names.fullname template + ## + name: "" + ## @param serviceAccount.automountServiceAccountToken Whether to auto mount the service account token + ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/#use-the-default-service-account-to-access-the-api-server + ## + automountServiceAccountToken: true + ## @param serviceAccount.annotations Additional custom annotations for the ServiceAccount + ## + annotations: {} +## Redis® Pod Disruption Budget configuration +## ref: https://kubernetes.io/docs/tasks/run-application/configure-pdb/ +## +pdb: + ## @param pdb.create Specifies whether a PodDisruptionBudget should be created + ## + create: false + ## @param pdb.minAvailable Min number of pods that must still be available after the eviction + ## + minAvailable: 1 + ## @param pdb.maxUnavailable Max number of pods that can be unavailable after the eviction + ## + maxUnavailable: "" +## TLS configuration +## +tls: + ## @param tls.enabled Enable TLS traffic + ## + enabled: false + ## @param tls.authClients Require clients to authenticate + ## + authClients: true + ## @param tls.autoGenerated Enable autogenerated certificates + ## + autoGenerated: false + ## @param tls.existingSecret The name of the existing secret that contains the TLS certificates + ## + existingSecret: "" + ## @param tls.certificatesSecret DEPRECATED. Use existingSecret instead. + ## + certificatesSecret: "" + ## @param tls.certFilename Certificate filename + ## + certFilename: "" + ## @param tls.certKeyFilename Certificate Key filename + ## + certKeyFilename: "" + ## @param tls.certCAFilename CA Certificate filename + ## + certCAFilename: "" + ## @param tls.dhParamsFilename File containing DH params (in order to support DH based ciphers) + ## + dhParamsFilename: "" + +## @section Metrics Parameters +## + +metrics: + ## @param metrics.enabled Start a sidecar prometheus exporter to expose Redis® metrics + ## + enabled: false + ## Bitnami Redis® Exporter image + ## ref: https://hub.docker.com/r/bitnami/redis-exporter/tags/ + ## @param metrics.image.registry Redis® Exporter image registry + ## @param metrics.image.repository Redis® Exporter image repository + ## @param metrics.image.tag Redis® Exporter image tag (immutable tags are recommended) + ## @param metrics.image.digest Redis® Exporter image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag + ## @param metrics.image.pullPolicy Redis® Exporter image pull policy + ## @param metrics.image.pullSecrets Redis® Exporter image pull secrets + ## + image: + registry: docker.io + repository: bitnami/redis-exporter + tag: 1.45.0-debian-11-r26 + digest: "" + pullPolicy: IfNotPresent + ## Optionally specify an array of imagePullSecrets. + ## Secrets must be manually created in the namespace. + ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ + ## e.g: + ## pullSecrets: + ## - myRegistryKeySecretName + ## + pullSecrets: [] + ## Configure extra options for Redis® containers' liveness, readiness & startup probes + ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/ + ## @param metrics.startupProbe.enabled Enable startupProbe on Redis® replicas nodes + ## @param metrics.startupProbe.initialDelaySeconds Initial delay seconds for startupProbe + ## @param metrics.startupProbe.periodSeconds Period seconds for startupProbe + ## @param metrics.startupProbe.timeoutSeconds Timeout seconds for startupProbe + ## @param metrics.startupProbe.failureThreshold Failure threshold for startupProbe + ## @param metrics.startupProbe.successThreshold Success threshold for startupProbe + ## + startupProbe: + enabled: false + initialDelaySeconds: 10 + periodSeconds: 10 + timeoutSeconds: 5 + successThreshold: 1 + failureThreshold: 5 + ## @param metrics.livenessProbe.enabled Enable livenessProbe on Redis® replicas nodes + ## @param metrics.livenessProbe.initialDelaySeconds Initial delay seconds for livenessProbe + ## @param metrics.livenessProbe.periodSeconds Period seconds for livenessProbe + ## @param metrics.livenessProbe.timeoutSeconds Timeout seconds for livenessProbe + ## @param metrics.livenessProbe.failureThreshold Failure threshold for livenessProbe + ## @param metrics.livenessProbe.successThreshold Success threshold for livenessProbe + ## + livenessProbe: + enabled: true + initialDelaySeconds: 10 + periodSeconds: 10 + timeoutSeconds: 5 + successThreshold: 1 + failureThreshold: 5 + ## @param metrics.readinessProbe.enabled Enable readinessProbe on Redis® replicas nodes + ## @param metrics.readinessProbe.initialDelaySeconds Initial delay seconds for readinessProbe + ## @param metrics.readinessProbe.periodSeconds Period seconds for readinessProbe + ## @param metrics.readinessProbe.timeoutSeconds Timeout seconds for readinessProbe + ## @param metrics.readinessProbe.failureThreshold Failure threshold for readinessProbe + ## @param metrics.readinessProbe.successThreshold Success threshold for readinessProbe + ## + readinessProbe: + enabled: true + initialDelaySeconds: 5 + periodSeconds: 10 + timeoutSeconds: 1 + successThreshold: 1 + failureThreshold: 3 + ## @param metrics.customStartupProbe Custom startupProbe that overrides the default one + ## + customStartupProbe: {} + ## @param metrics.customLivenessProbe Custom livenessProbe that overrides the default one + ## + customLivenessProbe: {} + ## @param metrics.customReadinessProbe Custom readinessProbe that overrides the default one + ## + customReadinessProbe: {} + ## @param metrics.command Override default metrics container init command (useful when using custom images) + ## + command: [] + ## @param metrics.redisTargetHost A way to specify an alternative Redis® hostname + ## Useful for certificate CN/SAN matching + ## + redisTargetHost: "localhost" + ## @param metrics.extraArgs Extra arguments for Redis® exporter, for example: + ## e.g.: + ## extraArgs: + ## check-keys: myKey,myOtherKey + ## + extraArgs: {} + ## @param metrics.extraEnvVars Array with extra environment variables to add to Redis® exporter + ## e.g: + ## extraEnvVars: + ## - name: FOO + ## value: "bar" + ## + extraEnvVars: [] + ## Configure Container Security Context + ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod + ## @param metrics.containerSecurityContext.enabled Enabled Redis® exporter containers' Security Context + ## @param metrics.containerSecurityContext.runAsUser Set Redis® exporter containers' Security Context runAsUser + ## + containerSecurityContext: + enabled: true + runAsUser: 1001 + ## @param metrics.extraVolumes Optionally specify extra list of additional volumes for the Redis® metrics sidecar + ## + extraVolumes: [] + ## @param metrics.extraVolumeMounts Optionally specify extra list of additional volumeMounts for the Redis® metrics sidecar + ## + extraVolumeMounts: [] + ## Redis® exporter resource requests and limits + ## ref: https://kubernetes.io/docs/user-guide/compute-resources/ + ## @param metrics.resources.limits The resources limits for the Redis® exporter container + ## @param metrics.resources.requests The requested resources for the Redis® exporter container + ## + resources: + limits: {} + requests: {} + ## @param metrics.podLabels Extra labels for Redis® exporter pods + ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/ + ## + podLabels: {} + ## @param metrics.podAnnotations [object] Annotations for Redis® exporter pods + ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/ + ## + podAnnotations: + prometheus.io/scrape: "true" + prometheus.io/port: "9121" + ## Redis® exporter service parameters + ## + service: + ## @param metrics.service.type Redis® exporter service type + ## + type: ClusterIP + ## @param metrics.service.port Redis® exporter service port + ## + port: 9121 + ## @param metrics.service.externalTrafficPolicy Redis® exporter service external traffic policy + ## ref: https://kubernetes.io/docs/tasks/access-application-cluster/create-external-load-balancer/#preserving-the-client-source-ip + ## + externalTrafficPolicy: Cluster + ## @param metrics.service.extraPorts Extra ports to expose (normally used with the `sidecar` value) + ## + extraPorts: [] + ## @param metrics.service.loadBalancerIP Redis® exporter service Load Balancer IP + ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#internal-load-balancer + ## + loadBalancerIP: "" + ## @param metrics.service.loadBalancerSourceRanges Redis® exporter service Load Balancer sources + ## https://kubernetes.io/docs/tasks/access-application-cluster/configure-cloud-provider-firewall/#restrict-access-for-loadbalancer-service + ## e.g. + ## loadBalancerSourceRanges: + ## - 10.10.10.0/24 + ## + loadBalancerSourceRanges: [] + ## @param metrics.service.annotations Additional custom annotations for Redis® exporter service + ## + annotations: {} + ## Prometheus Service Monitor + ## ref: https://github.com/coreos/prometheus-operator + ## https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#endpoint + ## + serviceMonitor: + ## @param metrics.serviceMonitor.enabled Create ServiceMonitor resource(s) for scraping metrics using PrometheusOperator + ## + enabled: false + ## @param metrics.serviceMonitor.namespace The namespace in which the ServiceMonitor will be created + ## + namespace: "" + ## @param metrics.serviceMonitor.interval The interval at which metrics should be scraped + ## + interval: 30s + ## @param metrics.serviceMonitor.scrapeTimeout The timeout after which the scrape is ended + ## + scrapeTimeout: "" + ## @param metrics.serviceMonitor.relabellings Metrics RelabelConfigs to apply to samples before scraping. + ## + relabellings: [] + ## @param metrics.serviceMonitor.metricRelabelings Metrics RelabelConfigs to apply to samples before ingestion. + ## + metricRelabelings: [] + ## @param metrics.serviceMonitor.honorLabels Specify honorLabels parameter to add the scrape endpoint + ## + honorLabels: false + ## @param metrics.serviceMonitor.additionalLabels Additional labels that can be used so ServiceMonitor resource(s) can be discovered by Prometheus + ## + additionalLabels: {} + ## @param metrics.serviceMonitor.podTargetLabels Labels from the Kubernetes pod to be transferred to the created metrics + ## + podTargetLabels: [] + ## Custom PrometheusRule to be defined + ## ref: https://github.com/coreos/prometheus-operator#customresourcedefinitions + ## + prometheusRule: + ## @param metrics.prometheusRule.enabled Create a custom prometheusRule Resource for scraping metrics using PrometheusOperator + ## + enabled: false + ## @param metrics.prometheusRule.namespace The namespace in which the prometheusRule will be created + ## + namespace: "" + ## @param metrics.prometheusRule.additionalLabels Additional labels for the prometheusRule + ## + additionalLabels: {} + ## @param metrics.prometheusRule.rules Custom Prometheus rules + ## e.g: + ## rules: + ## - alert: RedisDown + ## expr: redis_up{service="{{ template "common.names.fullname" . }}-metrics"} == 0 + ## for: 2m + ## labels: + ## severity: error + ## annotations: + ## summary: Redis® instance {{ "{{ $labels.instance }}" }} down + ## description: Redis® instance {{ "{{ $labels.instance }}" }} is down + ## - alert: RedisMemoryHigh + ## expr: > + ## redis_memory_used_bytes{service="{{ template "common.names.fullname" . }}-metrics"} * 100 + ## / + ## redis_memory_max_bytes{service="{{ template "common.names.fullname" . }}-metrics"} + ## > 90 + ## for: 2m + ## labels: + ## severity: error + ## annotations: + ## summary: Redis® instance {{ "{{ $labels.instance }}" }} is using too much memory + ## description: | + ## Redis® instance {{ "{{ $labels.instance }}" }} is using {{ "{{ $value }}" }}% of its available memory. + ## - alert: RedisKeyEviction + ## expr: | + ## increase(redis_evicted_keys_total{service="{{ template "common.names.fullname" . }}-metrics"}[5m]) > 0 + ## for: 1s + ## labels: + ## severity: error + ## annotations: + ## summary: Redis® instance {{ "{{ $labels.instance }}" }} has evicted keys + ## description: | + ## Redis® instance {{ "{{ $labels.instance }}" }} has evicted {{ "{{ $value }}" }} keys in the last 5 minutes. + ## + rules: [] + +## @section Init Container Parameters +## + +## 'volumePermissions' init container parameters +## Changes the owner and group of the persistent volume mount point to runAsUser:fsGroup values +## based on the *podSecurityContext/*containerSecurityContext parameters +## +volumePermissions: + ## @param volumePermissions.enabled Enable init container that changes the owner/group of the PV mount point to `runAsUser:fsGroup` + ## + enabled: false + ## Bitnami Shell image + ## ref: https://hub.docker.com/r/bitnami/bitnami-shell/tags/ + ## @param volumePermissions.image.registry Bitnami Shell image registry + ## @param volumePermissions.image.repository Bitnami Shell image repository + ## @param volumePermissions.image.tag Bitnami Shell image tag (immutable tags are recommended) + ## @param volumePermissions.image.digest Bitnami Shell image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag + ## @param volumePermissions.image.pullPolicy Bitnami Shell image pull policy + ## @param volumePermissions.image.pullSecrets Bitnami Shell image pull secrets + ## + image: + registry: docker.io + repository: bitnami/bitnami-shell + tag: 11-debian-11-r72 + digest: "" + pullPolicy: IfNotPresent + ## Optionally specify an array of imagePullSecrets. + ## Secrets must be manually created in the namespace. + ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ + ## e.g: + ## pullSecrets: + ## - myRegistryKeySecretName + ## + pullSecrets: [] + ## Init container's resource requests and limits + ## ref: https://kubernetes.io/docs/user-guide/compute-resources/ + ## @param volumePermissions.resources.limits The resources limits for the init container + ## @param volumePermissions.resources.requests The requested resources for the init container + ## + resources: + limits: {} + requests: {} + ## Init container Container Security Context + ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container + ## @param volumePermissions.containerSecurityContext.runAsUser Set init container's Security Context runAsUser + ## NOTE: when runAsUser is set to special value "auto", init container will try to chown the + ## data folder to auto-determined user&group, using commands: `id -u`:`id -G | cut -d" " -f2` + ## "auto" is especially useful for OpenShift which has scc with dynamic user ids (and 0 is not allowed) + ## + containerSecurityContext: + runAsUser: 0 + +## init-sysctl container parameters +## used to perform sysctl operation to modify Kernel settings (needed sometimes to avoid warnings) +## +sysctl: + ## @param sysctl.enabled Enable init container to modify Kernel settings + ## + enabled: false + ## Bitnami Shell image + ## ref: https://hub.docker.com/r/bitnami/bitnami-shell/tags/ + ## @param sysctl.image.registry Bitnami Shell image registry + ## @param sysctl.image.repository Bitnami Shell image repository + ## @param sysctl.image.tag Bitnami Shell image tag (immutable tags are recommended) + ## @param sysctl.image.digest Bitnami Shell image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag + ## @param sysctl.image.pullPolicy Bitnami Shell image pull policy + ## @param sysctl.image.pullSecrets Bitnami Shell image pull secrets + ## + image: + registry: docker.io + repository: bitnami/bitnami-shell + tag: 11-debian-11-r72 + digest: "" + pullPolicy: IfNotPresent + ## Optionally specify an array of imagePullSecrets. + ## Secrets must be manually created in the namespace. + ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ + ## e.g: + ## pullSecrets: + ## - myRegistryKeySecretName + ## + pullSecrets: [] + ## @param sysctl.command Override default init-sysctl container command (useful when using custom images) + ## + command: [] + ## @param sysctl.mountHostSys Mount the host `/sys` folder to `/host-sys` + ## + mountHostSys: false + ## Init container's resource requests and limits + ## ref: https://kubernetes.io/docs/user-guide/compute-resources/ + ## @param sysctl.resources.limits The resources limits for the init container + ## @param sysctl.resources.requests The requested resources for the init container + ## + resources: + limits: {} + requests: {} + +## @section useExternalDNS Parameters +## +## @param useExternalDNS.enabled Enable various syntax that would enable external-dns to work. Note this requires a working installation of `external-dns` to be usable. +## @param useExternalDNS.additionalAnnotations Extra annotations to be utilized when `external-dns` is enabled. +## @param useExternalDNS.annotationKey The annotation key utilized when `external-dns` is enabled. Setting this to `false` will disable annotations. +## @param useExternalDNS.suffix The DNS suffix utilized when `external-dns` is enabled. Note that we prepend the suffix with the full name of the release. +## +useExternalDNS: + enabled: false + suffix: "" + annotationKey: external-dns.alpha.kubernetes.io/ + additionalAnnotations: {} diff --git a/redis-request-response/.helmignore b/redis-request-response/.helmignore new file mode 100644 index 00000000..f0c13194 --- /dev/null +++ b/redis-request-response/.helmignore @@ -0,0 +1,21 @@ +# Patterns to ignore when building packages. +# This supports shell glob matching, relative path matching, and +# negation (prefixed with !). Only one pattern per line. +.DS_Store +# Common VCS dirs +.git/ +.gitignore +.bzr/ +.bzrignore +.hg/ +.hgignore +.svn/ +# Common backup files +*.swp +*.bak +*.tmp +*~ +# Various IDEs +.project +.idea/ +*.tmproj diff --git a/redis-request-response/Chart.lock b/redis-request-response/Chart.lock new file mode 100644 index 00000000..ba89eccf --- /dev/null +++ b/redis-request-response/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: common + repository: https://charts.bitnami.com/bitnami + version: 2.2.2 +digest: sha256:49ca75cf23ba5eb7df4becef52580f98c8bd8194eb80368b9d7b875f6eefa8e5 +generated: "2022-12-12T19:34:26.826289322Z" diff --git a/redis-request-response/Chart.yaml b/redis-request-response/Chart.yaml new file mode 100644 index 00000000..674b459c --- /dev/null +++ b/redis-request-response/Chart.yaml @@ -0,0 +1,25 @@ +annotations: + category: Database + licenses: Apache-2.0 +apiVersion: v2 +appVersion: 7.0.8 +dependencies: + - name: common + repository: https://charts.bitnami.com/bitnami + tags: + - bitnami-common + version: 2.x.x +description: Redis(R) is an open source, advanced key-value store. It is often referred to as a data structure server since keys can contain strings, hashes, lists, sets and sorted sets. +home: https://github.com/bitnami/charts/tree/main/bitnami/redis +icon: https://bitnami.com/assets/stacks/redis/img/redis-stack-220x234.png +keywords: + - redis + - keyvalue + - database +maintainers: + - name: Bitnami + url: https://github.com/bitnami/charts +name: redis +sources: + - https://github.com/bitnami/containers/tree/main/bitnami/redis +version: 17.7.0 diff --git a/redis-request-response/README.md b/redis-request-response/README.md new file mode 100644 index 00000000..988058f1 --- /dev/null +++ b/redis-request-response/README.md @@ -0,0 +1,950 @@ + + +# Bitnami package for Redis(R) + +Redis(R) is an open source, advanced key-value store. It is often referred to as a data structure server since keys can contain strings, hashes, lists, sets and sorted sets. + +[Overview of Redis®](http://redis.io) + +Disclaimer: Redis is a registered trademark of Redis Ltd. Any rights therein are reserved to Redis Ltd. Any use by Bitnami is for referential purposes only and does not indicate any sponsorship, endorsement, or affiliation between Redis Ltd. + +## TL;DR + +```console +$ helm repo add my-repo https://charts.bitnami.com/bitnami +$ helm install my-release my-repo/redis +``` + +## Introduction + +This chart bootstraps a [Redis®](https://github.com/bitnami/containers/tree/main/bitnami/redis) deployment on a [Kubernetes](https://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. + +Bitnami charts can be used with [Kubeapps](https://kubeapps.dev/) for deployment and management of Helm Charts in clusters. + +### Choose between Redis® Helm Chart and Redis® Cluster Helm Chart + +You can choose any of the two Redis® Helm charts for deploying a Redis® cluster. + +1. [Redis® Helm Chart](https://github.com/bitnami/charts/tree/main/bitnami/redis) will deploy a master-replica cluster, with the [option](https://github.com/bitnami/charts/tree/main/bitnami/redis#redis-sentinel-configuration-parameters) of enabling using Redis® Sentinel. +2. [Redis® Cluster Helm Chart](https://github.com/bitnami/charts/tree/main/bitnami/redis-cluster) will deploy a Redis® Cluster topology with sharding. + +The main features of each chart are the following: + +| Redis® | Redis® Cluster | +|--------------------------------------------------------|------------------------------------------------------------------------| +| Supports multiple databases | Supports only one database. Better if you have a big dataset | +| Single write point (single master) | Multiple write points (multiple masters) | +| ![Redis® Topology](img/redis-topology.png) | ![Redis® Cluster Topology](img/redis-cluster-topology.png) | + +## Prerequisites + +- Kubernetes 1.19+ +- Helm 3.2.0+ +- PV provisioner support in the underlying infrastructure + +## Installing the Chart + +To install the chart with the release name `my-release`: + +```console +$ helm repo add my-repo https://charts.bitnami.com/bitnami +$ helm install my-release my-repo/redis +``` + +The command deploys Redis® on the Kubernetes cluster in the default configuration. The [Parameters](#parameters) section lists the parameters that can be configured during installation. + +> **Tip**: List all releases using `helm list` + +## Uninstalling the Chart + +To uninstall/delete the `my-release` deployment: + +```console +$ helm delete my-release +``` + +The command removes all the Kubernetes components associated with the chart and deletes the release. + +## Parameters + +### Global parameters + +| Name | Description | Value | +| ------------------------- | ------------------------------------------------------ | ----- | +| `global.imageRegistry` | Global Docker image registry | `""` | +| `global.imagePullSecrets` | Global Docker registry secret names as an array | `[]` | +| `global.storageClass` | Global StorageClass for Persistent Volume(s) | `""` | +| `global.redis.password` | Global Redis® password (overrides `auth.password`) | `""` | + + +### Common parameters + +| Name | Description | Value | +| ------------------------ | --------------------------------------------------------------------------------------- | --------------- | +| `kubeVersion` | Override Kubernetes version | `""` | +| `nameOverride` | String to partially override common.names.fullname | `""` | +| `fullnameOverride` | String to fully override common.names.fullname | `""` | +| `commonLabels` | Labels to add to all deployed objects | `{}` | +| `commonAnnotations` | Annotations to add to all deployed objects | `{}` | +| `secretAnnotations` | Annotations to add to secret | `{}` | +| `clusterDomain` | Kubernetes cluster domain name | `cluster.local` | +| `extraDeploy` | Array of extra objects to deploy with the release | `[]` | +| `useHostnames` | Use hostnames internally when announcing replication | `true` | +| `diagnosticMode.enabled` | Enable diagnostic mode (all probes will be disabled and the command will be overridden) | `false` | +| `diagnosticMode.command` | Command to override all containers in the deployment | `["sleep"]` | +| `diagnosticMode.args` | Args to override all containers in the deployment | `["infinity"]` | + + +### Redis® Image parameters + +| Name | Description | Value | +| ------------------- | ---------------------------------------------------------------------------------------------------------- | -------------------- | +| `image.registry` | Redis® image registry | `docker.io` | +| `image.repository` | Redis® image repository | `bitnami/redis` | +| `image.tag` | Redis® image tag (immutable tags are recommended) | `7.0.8-debian-11-r0` | +| `image.digest` | Redis® image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` | +| `image.pullPolicy` | Redis® image pull policy | `IfNotPresent` | +| `image.pullSecrets` | Redis® image pull secrets | `[]` | +| `image.debug` | Enable image debug mode | `false` | + + +### Redis® common configuration parameters + +| Name | Description | Value | +| -------------------------------- | ------------------------------------------------------------------------------------- | ------------- | +| `architecture` | Redis® architecture. Allowed values: `standalone` or `replication` | `replication` | +| `auth.enabled` | Enable password authentication | `true` | +| `auth.sentinel` | Enable password authentication on sentinels too | `true` | +| `auth.password` | Redis® password | `""` | +| `auth.existingSecret` | The name of an existing secret with Redis® credentials | `""` | +| `auth.existingSecretPasswordKey` | Password key to be retrieved from existing secret | `""` | +| `auth.usePasswordFiles` | Mount credentials as files instead of using an environment variable | `false` | +| `commonConfiguration` | Common configuration to be added into the ConfigMap | `""` | +| `existingConfigmap` | The name of an existing ConfigMap with your custom configuration for Redis® nodes | `""` | + + +### Redis® master configuration parameters + +| Name | Description | Value | +| ---------------------------------------------------- | ----------------------------------------------------------------------------------------------------- | ------------------------ | +| `master.count` | Number of Redis® master instances to deploy (experimental, requires additional configuration) | `1` | +| `master.configuration` | Configuration for Redis® master nodes | `""` | +| `master.disableCommands` | Array with Redis® commands to disable on master nodes | `["FLUSHDB","FLUSHALL"]` | +| `master.command` | Override default container command (useful when using custom images) | `[]` | +| `master.args` | Override default container args (useful when using custom images) | `[]` | +| `master.preExecCmds` | Additional commands to run prior to starting Redis® master | `[]` | +| `master.extraFlags` | Array with additional command line flags for Redis® master | `[]` | +| `master.extraEnvVars` | Array with extra environment variables to add to Redis® master nodes | `[]` | +| `master.extraEnvVarsCM` | Name of existing ConfigMap containing extra env vars for Redis® master nodes | `""` | +| `master.extraEnvVarsSecret` | Name of existing Secret containing extra env vars for Redis® master nodes | `""` | +| `master.containerPorts.redis` | Container port to open on Redis® master nodes | `6379` | +| `master.startupProbe.enabled` | Enable startupProbe on Redis® master nodes | `false` | +| `master.startupProbe.initialDelaySeconds` | Initial delay seconds for startupProbe | `20` | +| `master.startupProbe.periodSeconds` | Period seconds for startupProbe | `5` | +| `master.startupProbe.timeoutSeconds` | Timeout seconds for startupProbe | `5` | +| `master.startupProbe.failureThreshold` | Failure threshold for startupProbe | `5` | +| `master.startupProbe.successThreshold` | Success threshold for startupProbe | `1` | +| `master.livenessProbe.enabled` | Enable livenessProbe on Redis® master nodes | `true` | +| `master.livenessProbe.initialDelaySeconds` | Initial delay seconds for livenessProbe | `20` | +| `master.livenessProbe.periodSeconds` | Period seconds for livenessProbe | `5` | +| `master.livenessProbe.timeoutSeconds` | Timeout seconds for livenessProbe | `5` | +| `master.livenessProbe.failureThreshold` | Failure threshold for livenessProbe | `5` | +| `master.livenessProbe.successThreshold` | Success threshold for livenessProbe | `1` | +| `master.readinessProbe.enabled` | Enable readinessProbe on Redis® master nodes | `true` | +| `master.readinessProbe.initialDelaySeconds` | Initial delay seconds for readinessProbe | `20` | +| `master.readinessProbe.periodSeconds` | Period seconds for readinessProbe | `5` | +| `master.readinessProbe.timeoutSeconds` | Timeout seconds for readinessProbe | `1` | +| `master.readinessProbe.failureThreshold` | Failure threshold for readinessProbe | `5` | +| `master.readinessProbe.successThreshold` | Success threshold for readinessProbe | `1` | +| `master.customStartupProbe` | Custom startupProbe that overrides the default one | `{}` | +| `master.customLivenessProbe` | Custom livenessProbe that overrides the default one | `{}` | +| `master.customReadinessProbe` | Custom readinessProbe that overrides the default one | `{}` | +| `master.resources.limits` | The resources limits for the Redis® master containers | `{}` | +| `master.resources.requests` | The requested resources for the Redis® master containers | `{}` | +| `master.podSecurityContext.enabled` | Enabled Redis® master pods' Security Context | `true` | +| `master.podSecurityContext.fsGroup` | Set Redis® master pod's Security Context fsGroup | `1001` | +| `master.containerSecurityContext.enabled` | Enabled Redis® master containers' Security Context | `true` | +| `master.containerSecurityContext.runAsUser` | Set Redis® master containers' Security Context runAsUser | `1001` | +| `master.kind` | Use either Deployment or StatefulSet (default) | `StatefulSet` | +| `master.schedulerName` | Alternate scheduler for Redis® master pods | `""` | +| `master.updateStrategy.type` | Redis® master statefulset strategy type | `RollingUpdate` | +| `master.minReadySeconds` | How many seconds a pod needs to be ready before killing the next, during update | `0` | +| `master.priorityClassName` | Redis® master pods' priorityClassName | `""` | +| `master.hostAliases` | Redis® master pods host aliases | `[]` | +| `master.podLabels` | Extra labels for Redis® master pods | `{}` | +| `master.podAnnotations` | Annotations for Redis® master pods | `{}` | +| `master.shareProcessNamespace` | Share a single process namespace between all of the containers in Redis® master pods | `false` | +| `master.podAffinityPreset` | Pod affinity preset. Ignored if `master.affinity` is set. Allowed values: `soft` or `hard` | `""` | +| `master.podAntiAffinityPreset` | Pod anti-affinity preset. Ignored if `master.affinity` is set. Allowed values: `soft` or `hard` | `soft` | +| `master.nodeAffinityPreset.type` | Node affinity preset type. Ignored if `master.affinity` is set. Allowed values: `soft` or `hard` | `""` | +| `master.nodeAffinityPreset.key` | Node label key to match. Ignored if `master.affinity` is set | `""` | +| `master.nodeAffinityPreset.values` | Node label values to match. Ignored if `master.affinity` is set | `[]` | +| `master.affinity` | Affinity for Redis® master pods assignment | `{}` | +| `master.nodeSelector` | Node labels for Redis® master pods assignment | `{}` | +| `master.tolerations` | Tolerations for Redis® master pods assignment | `[]` | +| `master.topologySpreadConstraints` | Spread Constraints for Redis® master pod assignment | `[]` | +| `master.dnsPolicy` | DNS Policy for Redis® master pod | `""` | +| `master.dnsConfig` | DNS Configuration for Redis® master pod | `{}` | +| `master.lifecycleHooks` | for the Redis® master container(s) to automate configuration before or after startup | `{}` | +| `master.extraVolumes` | Optionally specify extra list of additional volumes for the Redis® master pod(s) | `[]` | +| `master.extraVolumeMounts` | Optionally specify extra list of additional volumeMounts for the Redis® master container(s) | `[]` | +| `master.sidecars` | Add additional sidecar containers to the Redis® master pod(s) | `[]` | +| `master.initContainers` | Add additional init containers to the Redis® master pod(s) | `[]` | +| `master.persistence.enabled` | Enable persistence on Redis® master nodes using Persistent Volume Claims | `true` | +| `master.persistence.medium` | Provide a medium for `emptyDir` volumes. | `""` | +| `master.persistence.sizeLimit` | Set this to enable a size limit for `emptyDir` volumes. | `""` | +| `master.persistence.path` | The path the volume will be mounted at on Redis® master containers | `/data` | +| `master.persistence.subPath` | The subdirectory of the volume to mount on Redis® master containers | `""` | +| `master.persistence.subPathExpr` | Used to construct the subPath subdirectory of the volume to mount on Redis® master containers | `""` | +| `master.persistence.storageClass` | Persistent Volume storage class | `""` | +| `master.persistence.accessModes` | Persistent Volume access modes | `["ReadWriteOnce"]` | +| `master.persistence.size` | Persistent Volume size | `8Gi` | +| `master.persistence.annotations` | Additional custom annotations for the PVC | `{}` | +| `master.persistence.selector` | Additional labels to match for the PVC | `{}` | +| `master.persistence.dataSource` | Custom PVC data source | `{}` | +| `master.persistence.existingClaim` | Use a existing PVC which must be created manually before bound | `""` | +| `master.service.type` | Redis® master service type | `ClusterIP` | +| `master.service.ports.redis` | Redis® master service port | `6379` | +| `master.service.nodePorts.redis` | Node port for Redis® master | `""` | +| `master.service.externalTrafficPolicy` | Redis® master service external traffic policy | `Cluster` | +| `master.service.extraPorts` | Extra ports to expose (normally used with the `sidecar` value) | `[]` | +| `master.service.internalTrafficPolicy` | Redis® master service internal traffic policy (requires Kubernetes v1.22 or greater to be usable) | `Cluster` | +| `master.service.clusterIP` | Redis® master service Cluster IP | `""` | +| `master.service.loadBalancerIP` | Redis® master service Load Balancer IP | `""` | +| `master.service.loadBalancerSourceRanges` | Redis® master service Load Balancer sources | `[]` | +| `master.service.externalIPs` | Redis® master service External IPs | `[]` | +| `master.service.annotations` | Additional custom annotations for Redis® master service | `{}` | +| `master.service.sessionAffinity` | Session Affinity for Kubernetes service, can be "None" or "ClientIP" | `None` | +| `master.service.sessionAffinityConfig` | Additional settings for the sessionAffinity | `{}` | +| `master.terminationGracePeriodSeconds` | Integer setting the termination grace period for the redis-master pods | `30` | +| `master.serviceAccount.create` | Specifies whether a ServiceAccount should be created | `false` | +| `master.serviceAccount.name` | The name of the ServiceAccount to use. | `""` | +| `master.serviceAccount.automountServiceAccountToken` | Whether to auto mount the service account token | `true` | +| `master.serviceAccount.annotations` | Additional custom annotations for the ServiceAccount | `{}` | + + +### Redis® replicas configuration parameters + +| Name | Description | Value | +| ----------------------------------------------------- | ------------------------------------------------------------------------------------------------------- | ------------------------ | +| `replica.replicaCount` | Number of Redis® replicas to deploy | `3` | +| `replica.configuration` | Configuration for Redis® replicas nodes | `""` | +| `replica.disableCommands` | Array with Redis® commands to disable on replicas nodes | `["FLUSHDB","FLUSHALL"]` | +| `replica.command` | Override default container command (useful when using custom images) | `[]` | +| `replica.args` | Override default container args (useful when using custom images) | `[]` | +| `replica.preExecCmds` | Additional commands to run prior to starting Redis® replicas | `[]` | +| `replica.extraFlags` | Array with additional command line flags for Redis® replicas | `[]` | +| `replica.extraEnvVars` | Array with extra environment variables to add to Redis® replicas nodes | `[]` | +| `replica.extraEnvVarsCM` | Name of existing ConfigMap containing extra env vars for Redis® replicas nodes | `""` | +| `replica.extraEnvVarsSecret` | Name of existing Secret containing extra env vars for Redis® replicas nodes | `""` | +| `replica.externalMaster.enabled` | Use external master for bootstrapping | `false` | +| `replica.externalMaster.host` | External master host to bootstrap from | `""` | +| `replica.externalMaster.port` | Port for Redis service external master host | `6379` | +| `replica.containerPorts.redis` | Container port to open on Redis® replicas nodes | `6379` | +| `replica.startupProbe.enabled` | Enable startupProbe on Redis® replicas nodes | `true` | +| `replica.startupProbe.initialDelaySeconds` | Initial delay seconds for startupProbe | `10` | +| `replica.startupProbe.periodSeconds` | Period seconds for startupProbe | `10` | +| `replica.startupProbe.timeoutSeconds` | Timeout seconds for startupProbe | `5` | +| `replica.startupProbe.failureThreshold` | Failure threshold for startupProbe | `22` | +| `replica.startupProbe.successThreshold` | Success threshold for startupProbe | `1` | +| `replica.livenessProbe.enabled` | Enable livenessProbe on Redis® replicas nodes | `true` | +| `replica.livenessProbe.initialDelaySeconds` | Initial delay seconds for livenessProbe | `20` | +| `replica.livenessProbe.periodSeconds` | Period seconds for livenessProbe | `5` | +| `replica.livenessProbe.timeoutSeconds` | Timeout seconds for livenessProbe | `5` | +| `replica.livenessProbe.failureThreshold` | Failure threshold for livenessProbe | `5` | +| `replica.livenessProbe.successThreshold` | Success threshold for livenessProbe | `1` | +| `replica.readinessProbe.enabled` | Enable readinessProbe on Redis® replicas nodes | `true` | +| `replica.readinessProbe.initialDelaySeconds` | Initial delay seconds for readinessProbe | `20` | +| `replica.readinessProbe.periodSeconds` | Period seconds for readinessProbe | `5` | +| `replica.readinessProbe.timeoutSeconds` | Timeout seconds for readinessProbe | `1` | +| `replica.readinessProbe.failureThreshold` | Failure threshold for readinessProbe | `5` | +| `replica.readinessProbe.successThreshold` | Success threshold for readinessProbe | `1` | +| `replica.customStartupProbe` | Custom startupProbe that overrides the default one | `{}` | +| `replica.customLivenessProbe` | Custom livenessProbe that overrides the default one | `{}` | +| `replica.customReadinessProbe` | Custom readinessProbe that overrides the default one | `{}` | +| `replica.resources.limits` | The resources limits for the Redis® replicas containers | `{}` | +| `replica.resources.requests` | The requested resources for the Redis® replicas containers | `{}` | +| `replica.podSecurityContext.enabled` | Enabled Redis® replicas pods' Security Context | `true` | +| `replica.podSecurityContext.fsGroup` | Set Redis® replicas pod's Security Context fsGroup | `1001` | +| `replica.containerSecurityContext.enabled` | Enabled Redis® replicas containers' Security Context | `true` | +| `replica.containerSecurityContext.runAsUser` | Set Redis® replicas containers' Security Context runAsUser | `1001` | +| `replica.schedulerName` | Alternate scheduler for Redis® replicas pods | `""` | +| `replica.updateStrategy.type` | Redis® replicas statefulset strategy type | `RollingUpdate` | +| `replica.minReadySeconds` | How many seconds a pod needs to be ready before killing the next, during update | `0` | +| `replica.priorityClassName` | Redis® replicas pods' priorityClassName | `""` | +| `replica.podManagementPolicy` | podManagementPolicy to manage scaling operation of %%MAIN_CONTAINER_NAME%% pods | `""` | +| `replica.hostAliases` | Redis® replicas pods host aliases | `[]` | +| `replica.podLabels` | Extra labels for Redis® replicas pods | `{}` | +| `replica.podAnnotations` | Annotations for Redis® replicas pods | `{}` | +| `replica.shareProcessNamespace` | Share a single process namespace between all of the containers in Redis® replicas pods | `false` | +| `replica.podAffinityPreset` | Pod affinity preset. Ignored if `replica.affinity` is set. Allowed values: `soft` or `hard` | `""` | +| `replica.podAntiAffinityPreset` | Pod anti-affinity preset. Ignored if `replica.affinity` is set. Allowed values: `soft` or `hard` | `soft` | +| `replica.nodeAffinityPreset.type` | Node affinity preset type. Ignored if `replica.affinity` is set. Allowed values: `soft` or `hard` | `""` | +| `replica.nodeAffinityPreset.key` | Node label key to match. Ignored if `replica.affinity` is set | `""` | +| `replica.nodeAffinityPreset.values` | Node label values to match. Ignored if `replica.affinity` is set | `[]` | +| `replica.affinity` | Affinity for Redis® replicas pods assignment | `{}` | +| `replica.nodeSelector` | Node labels for Redis® replicas pods assignment | `{}` | +| `replica.tolerations` | Tolerations for Redis® replicas pods assignment | `[]` | +| `replica.topologySpreadConstraints` | Spread Constraints for Redis® replicas pod assignment | `[]` | +| `replica.dnsPolicy` | DNS Policy for Redis® replica pods | `""` | +| `replica.dnsConfig` | DNS Configuration for Redis® replica pods | `{}` | +| `replica.lifecycleHooks` | for the Redis® replica container(s) to automate configuration before or after startup | `{}` | +| `replica.extraVolumes` | Optionally specify extra list of additional volumes for the Redis® replicas pod(s) | `[]` | +| `replica.extraVolumeMounts` | Optionally specify extra list of additional volumeMounts for the Redis® replicas container(s) | `[]` | +| `replica.sidecars` | Add additional sidecar containers to the Redis® replicas pod(s) | `[]` | +| `replica.initContainers` | Add additional init containers to the Redis® replicas pod(s) | `[]` | +| `replica.persistence.enabled` | Enable persistence on Redis® replicas nodes using Persistent Volume Claims | `true` | +| `replica.persistence.medium` | Provide a medium for `emptyDir` volumes. | `""` | +| `replica.persistence.sizeLimit` | Set this to enable a size limit for `emptyDir` volumes. | `""` | +| `replica.persistence.path` | The path the volume will be mounted at on Redis® replicas containers | `/data` | +| `replica.persistence.subPath` | The subdirectory of the volume to mount on Redis® replicas containers | `""` | +| `replica.persistence.subPathExpr` | Used to construct the subPath subdirectory of the volume to mount on Redis® replicas containers | `""` | +| `replica.persistence.storageClass` | Persistent Volume storage class | `""` | +| `replica.persistence.accessModes` | Persistent Volume access modes | `["ReadWriteOnce"]` | +| `replica.persistence.size` | Persistent Volume size | `8Gi` | +| `replica.persistence.annotations` | Additional custom annotations for the PVC | `{}` | +| `replica.persistence.selector` | Additional labels to match for the PVC | `{}` | +| `replica.persistence.dataSource` | Custom PVC data source | `{}` | +| `replica.persistence.existingClaim` | Use a existing PVC which must be created manually before bound | `""` | +| `replica.service.type` | Redis® replicas service type | `ClusterIP` | +| `replica.service.ports.redis` | Redis® replicas service port | `6379` | +| `replica.service.nodePorts.redis` | Node port for Redis® replicas | `""` | +| `replica.service.externalTrafficPolicy` | Redis® replicas service external traffic policy | `Cluster` | +| `replica.service.internalTrafficPolicy` | Redis® replicas service internal traffic policy (requires Kubernetes v1.22 or greater to be usable) | `Cluster` | +| `replica.service.extraPorts` | Extra ports to expose (normally used with the `sidecar` value) | `[]` | +| `replica.service.clusterIP` | Redis® replicas service Cluster IP | `""` | +| `replica.service.loadBalancerIP` | Redis® replicas service Load Balancer IP | `""` | +| `replica.service.loadBalancerSourceRanges` | Redis® replicas service Load Balancer sources | `[]` | +| `replica.service.annotations` | Additional custom annotations for Redis® replicas service | `{}` | +| `replica.service.sessionAffinity` | Session Affinity for Kubernetes service, can be "None" or "ClientIP" | `None` | +| `replica.service.sessionAffinityConfig` | Additional settings for the sessionAffinity | `{}` | +| `replica.terminationGracePeriodSeconds` | Integer setting the termination grace period for the redis-replicas pods | `30` | +| `replica.autoscaling.enabled` | Enable replica autoscaling settings | `false` | +| `replica.autoscaling.minReplicas` | Minimum replicas for the pod autoscaling | `1` | +| `replica.autoscaling.maxReplicas` | Maximum replicas for the pod autoscaling | `11` | +| `replica.autoscaling.targetCPU` | Percentage of CPU to consider when autoscaling | `""` | +| `replica.autoscaling.targetMemory` | Percentage of Memory to consider when autoscaling | `""` | +| `replica.serviceAccount.create` | Specifies whether a ServiceAccount should be created | `false` | +| `replica.serviceAccount.name` | The name of the ServiceAccount to use. | `""` | +| `replica.serviceAccount.automountServiceAccountToken` | Whether to auto mount the service account token | `true` | +| `replica.serviceAccount.annotations` | Additional custom annotations for the ServiceAccount | `{}` | + + +### Redis® Sentinel configuration parameters + +| Name | Description | Value | +| --------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------ | +| `sentinel.enabled` | Use Redis® Sentinel on Redis® pods. | `false` | +| `sentinel.image.registry` | Redis® Sentinel image registry | `docker.io` | +| `sentinel.image.repository` | Redis® Sentinel image repository | `bitnami/redis-sentinel` | +| `sentinel.image.tag` | Redis® Sentinel image tag (immutable tags are recommended) | `7.0.7-debian-11-r10` | +| `sentinel.image.digest` | Redis® Sentinel image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` | +| `sentinel.image.pullPolicy` | Redis® Sentinel image pull policy | `IfNotPresent` | +| `sentinel.image.pullSecrets` | Redis® Sentinel image pull secrets | `[]` | +| `sentinel.image.debug` | Enable image debug mode | `false` | +| `sentinel.masterSet` | Master set name | `mymaster` | +| `sentinel.quorum` | Sentinel Quorum | `2` | +| `sentinel.getMasterTimeout` | Amount of time to allow before get_sentinel_master_info() times out. | `220` | +| `sentinel.automateClusterRecovery` | Automate cluster recovery in cases where the last replica is not considered a good replica and Sentinel won't automatically failover to it. | `false` | +| `sentinel.redisShutdownWaitFailover` | Whether the Redis® master container waits for the failover at shutdown (in addition to the Redis® Sentinel container). | `true` | +| `sentinel.downAfterMilliseconds` | Timeout for detecting a Redis® node is down | `60000` | +| `sentinel.failoverTimeout` | Timeout for performing a election failover | `180000` | +| `sentinel.parallelSyncs` | Number of replicas that can be reconfigured in parallel to use the new master after a failover | `1` | +| `sentinel.configuration` | Configuration for Redis® Sentinel nodes | `""` | +| `sentinel.command` | Override default container command (useful when using custom images) | `[]` | +| `sentinel.args` | Override default container args (useful when using custom images) | `[]` | +| `sentinel.preExecCmds` | Additional commands to run prior to starting Redis® Sentinel | `[]` | +| `sentinel.extraEnvVars` | Array with extra environment variables to add to Redis® Sentinel nodes | `[]` | +| `sentinel.extraEnvVarsCM` | Name of existing ConfigMap containing extra env vars for Redis® Sentinel nodes | `""` | +| `sentinel.extraEnvVarsSecret` | Name of existing Secret containing extra env vars for Redis® Sentinel nodes | `""` | +| `sentinel.externalMaster.enabled` | Use external master for bootstrapping | `false` | +| `sentinel.externalMaster.host` | External master host to bootstrap from | `""` | +| `sentinel.externalMaster.port` | Port for Redis service external master host | `6379` | +| `sentinel.containerPorts.sentinel` | Container port to open on Redis® Sentinel nodes | `26379` | +| `sentinel.startupProbe.enabled` | Enable startupProbe on Redis® Sentinel nodes | `true` | +| `sentinel.startupProbe.initialDelaySeconds` | Initial delay seconds for startupProbe | `10` | +| `sentinel.startupProbe.periodSeconds` | Period seconds for startupProbe | `10` | +| `sentinel.startupProbe.timeoutSeconds` | Timeout seconds for startupProbe | `5` | +| `sentinel.startupProbe.failureThreshold` | Failure threshold for startupProbe | `22` | +| `sentinel.startupProbe.successThreshold` | Success threshold for startupProbe | `1` | +| `sentinel.livenessProbe.enabled` | Enable livenessProbe on Redis® Sentinel nodes | `true` | +| `sentinel.livenessProbe.initialDelaySeconds` | Initial delay seconds for livenessProbe | `20` | +| `sentinel.livenessProbe.periodSeconds` | Period seconds for livenessProbe | `5` | +| `sentinel.livenessProbe.timeoutSeconds` | Timeout seconds for livenessProbe | `5` | +| `sentinel.livenessProbe.failureThreshold` | Failure threshold for livenessProbe | `5` | +| `sentinel.livenessProbe.successThreshold` | Success threshold for livenessProbe | `1` | +| `sentinel.readinessProbe.enabled` | Enable readinessProbe on Redis® Sentinel nodes | `true` | +| `sentinel.readinessProbe.initialDelaySeconds` | Initial delay seconds for readinessProbe | `20` | +| `sentinel.readinessProbe.periodSeconds` | Period seconds for readinessProbe | `5` | +| `sentinel.readinessProbe.timeoutSeconds` | Timeout seconds for readinessProbe | `1` | +| `sentinel.readinessProbe.failureThreshold` | Failure threshold for readinessProbe | `5` | +| `sentinel.readinessProbe.successThreshold` | Success threshold for readinessProbe | `1` | +| `sentinel.customStartupProbe` | Custom startupProbe that overrides the default one | `{}` | +| `sentinel.customLivenessProbe` | Custom livenessProbe that overrides the default one | `{}` | +| `sentinel.customReadinessProbe` | Custom readinessProbe that overrides the default one | `{}` | +| `sentinel.persistence.enabled` | Enable persistence on Redis® sentinel nodes using Persistent Volume Claims (Experimental) | `false` | +| `sentinel.persistence.storageClass` | Persistent Volume storage class | `""` | +| `sentinel.persistence.accessModes` | Persistent Volume access modes | `["ReadWriteOnce"]` | +| `sentinel.persistence.size` | Persistent Volume size | `100Mi` | +| `sentinel.persistence.annotations` | Additional custom annotations for the PVC | `{}` | +| `sentinel.persistence.selector` | Additional labels to match for the PVC | `{}` | +| `sentinel.persistence.dataSource` | Custom PVC data source | `{}` | +| `sentinel.persistence.medium` | Provide a medium for `emptyDir` volumes. | `""` | +| `sentinel.persistence.sizeLimit` | Set this to enable a size limit for `emptyDir` volumes. | `""` | +| `sentinel.resources.limits` | The resources limits for the Redis® Sentinel containers | `{}` | +| `sentinel.resources.requests` | The requested resources for the Redis® Sentinel containers | `{}` | +| `sentinel.containerSecurityContext.enabled` | Enabled Redis® Sentinel containers' Security Context | `true` | +| `sentinel.containerSecurityContext.runAsUser` | Set Redis® Sentinel containers' Security Context runAsUser | `1001` | +| `sentinel.lifecycleHooks` | for the Redis® sentinel container(s) to automate configuration before or after startup | `{}` | +| `sentinel.extraVolumes` | Optionally specify extra list of additional volumes for the Redis® Sentinel | `[]` | +| `sentinel.extraVolumeMounts` | Optionally specify extra list of additional volumeMounts for the Redis® Sentinel container(s) | `[]` | +| `sentinel.service.type` | Redis® Sentinel service type | `ClusterIP` | +| `sentinel.service.ports.redis` | Redis® service port for Redis® | `6379` | +| `sentinel.service.ports.sentinel` | Redis® service port for Redis® Sentinel | `26379` | +| `sentinel.service.nodePorts.redis` | Node port for Redis® | `""` | +| `sentinel.service.nodePorts.sentinel` | Node port for Sentinel | `""` | +| `sentinel.service.externalTrafficPolicy` | Redis® Sentinel service external traffic policy | `Cluster` | +| `sentinel.service.extraPorts` | Extra ports to expose (normally used with the `sidecar` value) | `[]` | +| `sentinel.service.clusterIP` | Redis® Sentinel service Cluster IP | `""` | +| `sentinel.service.loadBalancerIP` | Redis® Sentinel service Load Balancer IP | `""` | +| `sentinel.service.loadBalancerSourceRanges` | Redis® Sentinel service Load Balancer sources | `[]` | +| `sentinel.service.annotations` | Additional custom annotations for Redis® Sentinel service | `{}` | +| `sentinel.service.sessionAffinity` | Session Affinity for Kubernetes service, can be "None" or "ClientIP" | `None` | +| `sentinel.service.sessionAffinityConfig` | Additional settings for the sessionAffinity | `{}` | +| `sentinel.terminationGracePeriodSeconds` | Integer setting the termination grace period for the redis-node pods | `30` | + + +### Other Parameters + +| Name | Description | Value | +| --------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------- | ------- | +| `networkPolicy.enabled` | Enable creation of NetworkPolicy resources | `false` | +| `networkPolicy.allowExternal` | Don't require client label for connections | `true` | +| `networkPolicy.extraIngress` | Add extra ingress rules to the NetworkPolicy | `[]` | +| `networkPolicy.extraEgress` | Add extra egress rules to the NetworkPolicy | `[]` | +| `networkPolicy.ingressNSMatchLabels` | Labels to match to allow traffic from other namespaces | `{}` | +| `networkPolicy.ingressNSPodMatchLabels` | Pod labels to match to allow traffic from other namespaces | `{}` | +| `podSecurityPolicy.create` | Whether to create a PodSecurityPolicy. WARNING: PodSecurityPolicy is deprecated in Kubernetes v1.21 or later, unavailable in v1.25 or later | `false` | +| `podSecurityPolicy.enabled` | Enable PodSecurityPolicy's RBAC rules | `false` | +| `rbac.create` | Specifies whether RBAC resources should be created | `false` | +| `rbac.rules` | Custom RBAC rules to set | `[]` | +| `serviceAccount.create` | Specifies whether a ServiceAccount should be created | `true` | +| `serviceAccount.name` | The name of the ServiceAccount to use. | `""` | +| `serviceAccount.automountServiceAccountToken` | Whether to auto mount the service account token | `true` | +| `serviceAccount.annotations` | Additional custom annotations for the ServiceAccount | `{}` | +| `pdb.create` | Specifies whether a PodDisruptionBudget should be created | `false` | +| `pdb.minAvailable` | Min number of pods that must still be available after the eviction | `1` | +| `pdb.maxUnavailable` | Max number of pods that can be unavailable after the eviction | `""` | +| `tls.enabled` | Enable TLS traffic | `false` | +| `tls.authClients` | Require clients to authenticate | `true` | +| `tls.autoGenerated` | Enable autogenerated certificates | `false` | +| `tls.existingSecret` | The name of the existing secret that contains the TLS certificates | `""` | +| `tls.certificatesSecret` | DEPRECATED. Use existingSecret instead. | `""` | +| `tls.certFilename` | Certificate filename | `""` | +| `tls.certKeyFilename` | Certificate Key filename | `""` | +| `tls.certCAFilename` | CA Certificate filename | `""` | +| `tls.dhParamsFilename` | File containing DH params (in order to support DH based ciphers) | `""` | + + +### Metrics Parameters + +| Name | Description | Value | +| -------------------------------------------- | ------------------------------------------------------------------------------------------------------------------- | ------------------------ | +| `metrics.enabled` | Start a sidecar prometheus exporter to expose Redis® metrics | `false` | +| `metrics.image.registry` | Redis® Exporter image registry | `docker.io` | +| `metrics.image.repository` | Redis® Exporter image repository | `bitnami/redis-exporter` | +| `metrics.image.tag` | Redis® Exporter image tag (immutable tags are recommended) | `1.45.0-debian-11-r26` | +| `metrics.image.digest` | Redis® Exporter image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` | +| `metrics.image.pullPolicy` | Redis® Exporter image pull policy | `IfNotPresent` | +| `metrics.image.pullSecrets` | Redis® Exporter image pull secrets | `[]` | +| `metrics.startupProbe.enabled` | Enable startupProbe on Redis® replicas nodes | `false` | +| `metrics.startupProbe.initialDelaySeconds` | Initial delay seconds for startupProbe | `10` | +| `metrics.startupProbe.periodSeconds` | Period seconds for startupProbe | `10` | +| `metrics.startupProbe.timeoutSeconds` | Timeout seconds for startupProbe | `5` | +| `metrics.startupProbe.failureThreshold` | Failure threshold for startupProbe | `5` | +| `metrics.startupProbe.successThreshold` | Success threshold for startupProbe | `1` | +| `metrics.livenessProbe.enabled` | Enable livenessProbe on Redis® replicas nodes | `true` | +| `metrics.livenessProbe.initialDelaySeconds` | Initial delay seconds for livenessProbe | `10` | +| `metrics.livenessProbe.periodSeconds` | Period seconds for livenessProbe | `10` | +| `metrics.livenessProbe.timeoutSeconds` | Timeout seconds for livenessProbe | `5` | +| `metrics.livenessProbe.failureThreshold` | Failure threshold for livenessProbe | `5` | +| `metrics.livenessProbe.successThreshold` | Success threshold for livenessProbe | `1` | +| `metrics.readinessProbe.enabled` | Enable readinessProbe on Redis® replicas nodes | `true` | +| `metrics.readinessProbe.initialDelaySeconds` | Initial delay seconds for readinessProbe | `5` | +| `metrics.readinessProbe.periodSeconds` | Period seconds for readinessProbe | `10` | +| `metrics.readinessProbe.timeoutSeconds` | Timeout seconds for readinessProbe | `1` | +| `metrics.readinessProbe.failureThreshold` | Failure threshold for readinessProbe | `3` | +| `metrics.readinessProbe.successThreshold` | Success threshold for readinessProbe | `1` | +| `metrics.customStartupProbe` | Custom startupProbe that overrides the default one | `{}` | +| `metrics.customLivenessProbe` | Custom livenessProbe that overrides the default one | `{}` | +| `metrics.customReadinessProbe` | Custom readinessProbe that overrides the default one | `{}` | +| `metrics.command` | Override default metrics container init command (useful when using custom images) | `[]` | +| `metrics.redisTargetHost` | A way to specify an alternative Redis® hostname | `localhost` | +| `metrics.extraArgs` | Extra arguments for Redis® exporter, for example: | `{}` | +| `metrics.extraEnvVars` | Array with extra environment variables to add to Redis® exporter | `[]` | +| `metrics.containerSecurityContext.enabled` | Enabled Redis® exporter containers' Security Context | `true` | +| `metrics.containerSecurityContext.runAsUser` | Set Redis® exporter containers' Security Context runAsUser | `1001` | +| `metrics.extraVolumes` | Optionally specify extra list of additional volumes for the Redis® metrics sidecar | `[]` | +| `metrics.extraVolumeMounts` | Optionally specify extra list of additional volumeMounts for the Redis® metrics sidecar | `[]` | +| `metrics.resources.limits` | The resources limits for the Redis® exporter container | `{}` | +| `metrics.resources.requests` | The requested resources for the Redis® exporter container | `{}` | +| `metrics.podLabels` | Extra labels for Redis® exporter pods | `{}` | +| `metrics.podAnnotations` | Annotations for Redis® exporter pods | `{}` | +| `metrics.service.type` | Redis® exporter service type | `ClusterIP` | +| `metrics.service.port` | Redis® exporter service port | `9121` | +| `metrics.service.externalTrafficPolicy` | Redis® exporter service external traffic policy | `Cluster` | +| `metrics.service.extraPorts` | Extra ports to expose (normally used with the `sidecar` value) | `[]` | +| `metrics.service.loadBalancerIP` | Redis® exporter service Load Balancer IP | `""` | +| `metrics.service.loadBalancerSourceRanges` | Redis® exporter service Load Balancer sources | `[]` | +| `metrics.service.annotations` | Additional custom annotations for Redis® exporter service | `{}` | +| `metrics.serviceMonitor.enabled` | Create ServiceMonitor resource(s) for scraping metrics using PrometheusOperator | `false` | +| `metrics.serviceMonitor.namespace` | The namespace in which the ServiceMonitor will be created | `""` | +| `metrics.serviceMonitor.interval` | The interval at which metrics should be scraped | `30s` | +| `metrics.serviceMonitor.scrapeTimeout` | The timeout after which the scrape is ended | `""` | +| `metrics.serviceMonitor.relabellings` | Metrics RelabelConfigs to apply to samples before scraping. | `[]` | +| `metrics.serviceMonitor.metricRelabelings` | Metrics RelabelConfigs to apply to samples before ingestion. | `[]` | +| `metrics.serviceMonitor.honorLabels` | Specify honorLabels parameter to add the scrape endpoint | `false` | +| `metrics.serviceMonitor.additionalLabels` | Additional labels that can be used so ServiceMonitor resource(s) can be discovered by Prometheus | `{}` | +| `metrics.serviceMonitor.podTargetLabels` | Labels from the Kubernetes pod to be transferred to the created metrics | `[]` | +| `metrics.prometheusRule.enabled` | Create a custom prometheusRule Resource for scraping metrics using PrometheusOperator | `false` | +| `metrics.prometheusRule.namespace` | The namespace in which the prometheusRule will be created | `""` | +| `metrics.prometheusRule.additionalLabels` | Additional labels for the prometheusRule | `{}` | +| `metrics.prometheusRule.rules` | Custom Prometheus rules | `[]` | + + +### Init Container Parameters + +| Name | Description | Value | +| ------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------- | ----------------------- | +| `volumePermissions.enabled` | Enable init container that changes the owner/group of the PV mount point to `runAsUser:fsGroup` | `false` | +| `volumePermissions.image.registry` | Bitnami Shell image registry | `docker.io` | +| `volumePermissions.image.repository` | Bitnami Shell image repository | `bitnami/bitnami-shell` | +| `volumePermissions.image.tag` | Bitnami Shell image tag (immutable tags are recommended) | `11-debian-11-r72` | +| `volumePermissions.image.digest` | Bitnami Shell image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` | +| `volumePermissions.image.pullPolicy` | Bitnami Shell image pull policy | `IfNotPresent` | +| `volumePermissions.image.pullSecrets` | Bitnami Shell image pull secrets | `[]` | +| `volumePermissions.resources.limits` | The resources limits for the init container | `{}` | +| `volumePermissions.resources.requests` | The requested resources for the init container | `{}` | +| `volumePermissions.containerSecurityContext.runAsUser` | Set init container's Security Context runAsUser | `0` | +| `sysctl.enabled` | Enable init container to modify Kernel settings | `false` | +| `sysctl.image.registry` | Bitnami Shell image registry | `docker.io` | +| `sysctl.image.repository` | Bitnami Shell image repository | `bitnami/bitnami-shell` | +| `sysctl.image.tag` | Bitnami Shell image tag (immutable tags are recommended) | `11-debian-11-r72` | +| `sysctl.image.digest` | Bitnami Shell image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` | +| `sysctl.image.pullPolicy` | Bitnami Shell image pull policy | `IfNotPresent` | +| `sysctl.image.pullSecrets` | Bitnami Shell image pull secrets | `[]` | +| `sysctl.command` | Override default init-sysctl container command (useful when using custom images) | `[]` | +| `sysctl.mountHostSys` | Mount the host `/sys` folder to `/host-sys` | `false` | +| `sysctl.resources.limits` | The resources limits for the init container | `{}` | +| `sysctl.resources.requests` | The requested resources for the init container | `{}` | + + +### useExternalDNS Parameters + +| Name | Description | Value | +| -------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------- | +| `useExternalDNS.enabled` | Enable various syntax that would enable external-dns to work. Note this requires a working installation of `external-dns` to be usable. | `false` | +| `useExternalDNS.additionalAnnotations` | Extra annotations to be utilized when `external-dns` is enabled. | `{}` | +| `useExternalDNS.annotationKey` | The annotation key utilized when `external-dns` is enabled. Setting this to `false` will disable annotations. | `external-dns.alpha.kubernetes.io/` | +| `useExternalDNS.suffix` | The DNS suffix utilized when `external-dns` is enabled. Note that we prepend the suffix with the full name of the release. | `""` | + + +Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example, + +```console +$ helm install my-release \ + --set auth.password=secretpassword \ + my-repo/redis +``` + +The above command sets the Redis® server password to `secretpassword`. + +> NOTE: Once this chart is deployed, it is not possible to change the application's access credentials, such as usernames or passwords, using Helm. To change these application credentials after deployment, delete any persistent volumes (PVs) used by the chart and re-deploy it, or use the application's built-in administrative tools if available. + +Alternatively, a YAML file that specifies the values for the parameters can be provided while installing the chart. For example, + +```console +$ helm install my-release -f values.yaml my-repo/redis +``` + +> **Tip**: You can use the default [values.yaml](values.yaml) + +## Configuration and installation details + +### [Rolling VS Immutable tags](https://docs.bitnami.com/containers/how-to/understand-rolling-tags-containers/) + +It is strongly recommended to use immutable tags in a production environment. This ensures your deployment does not change automatically if the same tag is updated with a different image. + +Bitnami will release a new chart updating its containers if a new version of the main container, significant changes, or critical vulnerabilities exist. + +### Use a different Redis® version + +To modify the application version used in this chart, specify a different version of the image using the `image.tag` parameter and/or a different repository using the `image.repository` parameter. Refer to the [chart documentation for more information on these parameters and how to use them with images from a private registry](https://docs.bitnami.com/kubernetes/infrastructure/redis/configuration/change-image-version/). + +### Bootstrapping with an External Cluster + +This chart is equipped with the ability to bring online a set of Pods that connect to an existing Redis deployment that lies outside of Kubernetes. This effectively creates a hybrid Redis Deployment where both Pods in Kubernetes and Instances such as Virtual Machines can partake in a single Redis Deployment. This is helpful in situations where one may be migrating Redis from Virtual Machines into Kubernetes, for example. To take advantage of this, use the following as an example configuration: + +```yaml +replica: + externalMaster: + enabled: true + host: external-redis-0.internal +sentinel: + externalMaster: + enabled: true + host: external-redis-0.internal +``` + +:warning: This is currently limited to clusters in which Sentinel and Redis run on the same node! :warning: + +Please also note that the external sentinel must be listening on port `26379`, and this is currently not configurable. + +Once the Kubernetes Redis Deployment is online and confirmed to be working with the existing cluster, the configuration can then be removed and the cluster will remain connected. + +### External DNS + +This chart is equipped to allow leveraging the ExternalDNS project. Doing so will enable ExternalDNS to publish the FQDN for each instance, in the format of `..`. +Example, when using the following configuration: + +```yaml +useExternalDNS: + enabled: true + suffix: prod.example.org + additionalAnnotations: + ttl: 10 +``` + +On a cluster where the name of the Helm release is `a`, the hostname of a Pod is generated as: `a-redis-node-0.a-redis.prod.example.org`. The IP of that FQDN will match that of the associated Pod. This modifies the following parameters of the Redis/Sentinel configuration using this new FQDN: + +* `replica-announce-ip` +* `known-sentinel` +* `known-replica` +* `announce-ip` + +:warning: This requires a working installation of `external-dns` to be fully functional. :warning: + +See the [official ExternalDNS documentation](https://github.com/kubernetes-sigs/external-dns) for additional configuration options. + +### Cluster topologies + +#### Default: Master-Replicas + +When installing the chart with `architecture=replication`, it will deploy a Redis® master StatefulSet and a Redis® replicas StatefulSet. The replicas will be read-replicas of the master. Two services will be exposed: + +- Redis® Master service: Points to the master, where read-write operations can be performed +- Redis® Replicas service: Points to the replicas, where only read operations are allowed by default. + +In case the master crashes, the replicas will wait until the master node is respawned again by the Kubernetes Controller Manager. + +#### Standalone + +When installing the chart with `architecture=standalone`, it will deploy a standalone Redis® StatefulSet. A single service will be exposed: + +- Redis® Master service: Points to the master, where read-write operations can be performed + +#### Master-Replicas with Sentinel + +When installing the chart with `architecture=replication` and `sentinel.enabled=true`, it will deploy a Redis® master StatefulSet (only one master allowed) and a Redis® replicas StatefulSet. In this case, the pods will contain an extra container with Redis® Sentinel. This container will form a cluster of Redis® Sentinel nodes, which will promote a new master in case the actual one fails. + +On graceful termination of the Redis® master pod, a failover of the master is initiated to promote a new master. The Redis® Sentinel container in this pod will wait for the failover to occur before terminating. If `sentinel.redisShutdownWaitFailover=true` is set (the default), the Redis® container will wait for the failover as well before terminating. This increases availability for reads during failover, but may cause stale reads until all clients have switched to the new master. + +In addition to this, only one service is exposed: + +- Redis® service: Exposes port 6379 for Redis® read-only operations and port 26379 for accessing Redis® Sentinel. + +For read-only operations, access the service using port 6379. For write operations, it's necessary to access the Redis® Sentinel cluster and query the current master using the command below (using redis-cli or similar): + +``` +SENTINEL get-master-addr-by-name +``` + +This command will return the address of the current master, which can be accessed from inside the cluster. + +In case the current master crashes, the Sentinel containers will elect a new master node. + +`master.count` greater than `1` is not designed for use when `sentinel.enabled=true`. + +### Multiple masters (experimental) + +When `master.count` is greater than `1`, special care must be taken to create a consistent setup. + +An example of use case is the creation of a redundant set of standalone masters or master-replicas per Kubernetes node where you must ensure: +- No more than `1` master can be deployed per Kubernetes node +- Replicas and writers can only see the single master of their own Kubernetes node + +One way of achieving this is by setting `master.service.internalTrafficPolicy=Local` in combination with a `master.affinity.podAntiAffinity` spec to never schedule more than one master per Kubernetes node. + +It's recommended to only change `master.count` if you know what you are doing. +`master.count` greater than `1` is not designed for use when `sentinel.enabled=true`. + +### Using a password file + +To use a password file for Redis® you need to create a secret containing the password and then deploy the chart using that secret. + +Refer to the chart documentation for more information on [using a password file for Redis®](https://docs.bitnami.com/kubernetes/infrastructure/redis/administration/use-password-file/). + +### Securing traffic using TLS + +TLS support can be enabled in the chart by specifying the `tls.` parameters while creating a release. The following parameters should be configured to properly enable the TLS support in the chart: + +- `tls.enabled`: Enable TLS support. Defaults to `false` +- `tls.existingSecret`: Name of the secret that contains the certificates. No defaults. +- `tls.certFilename`: Certificate filename. No defaults. +- `tls.certKeyFilename`: Certificate key filename. No defaults. +- `tls.certCAFilename`: CA Certificate filename. No defaults. + +Refer to the chart documentation for more information on [creating the secret and a TLS deployment example](https://docs.bitnami.com/kubernetes/infrastructure/redis/administration/enable-tls/). + +### Metrics + +The chart optionally can start a metrics exporter for [prometheus](https://prometheus.io). The metrics endpoint (port 9121) is exposed in the service. Metrics can be scraped from within the cluster using something similar as the described in the [example Prometheus scrape configuration](https://github.com/prometheus/prometheus/blob/master/documentation/examples/prometheus-kubernetes.yml). If metrics are to be scraped from outside the cluster, the Kubernetes API proxy can be utilized to access the endpoint. + +If you have enabled TLS by specifying `tls.enabled=true` you also need to specify TLS option to the metrics exporter. You can do that via `metrics.extraArgs`. You can find the metrics exporter CLI flags for TLS [here](https://github.com/oliver006/redis_exporter#command-line-flags). For example: + +You can either specify `metrics.extraArgs.skip-tls-verification=true` to skip TLS verification or providing the following values under `metrics.extraArgs` for TLS client authentication: + +```console +tls-client-key-file +tls-client-cert-file +tls-ca-cert-file +``` + +### Host Kernel Settings + +Redis® may require some changes in the kernel of the host machine to work as expected, in particular increasing the `somaxconn` value and disabling transparent huge pages. + +Refer to the chart documentation for more information on [configuring host kernel settings with an example](https://docs.bitnami.com/kubernetes/infrastructure/redis/administration/configure-kernel-settings/). + +## Persistence + +By default, the chart mounts a [Persistent Volume](https://kubernetes.io/docs/concepts/storage/persistent-volumes/) at the `/data` path. The volume is created using dynamic volume provisioning. If a Persistent Volume Claim already exists, specify it during installation. + +### Existing PersistentVolumeClaim + +1. Create the PersistentVolume +2. Create the PersistentVolumeClaim +3. Install the chart + +```console +$ helm install my-release --set master.persistence.existingClaim=PVC_NAME my-repo/redis +``` + +## Backup and restore + +Refer to the chart documentation for more information on [backing up and restoring Redis® deployments](https://docs.bitnami.com/kubernetes/infrastructure/redis/administration/backup-restore/). + +## NetworkPolicy + +To enable network policy for Redis®, install [a networking plugin that implements the Kubernetes NetworkPolicy spec](https://kubernetes.io/docs/tasks/administer-cluster/declare-network-policy#before-you-begin), and set `networkPolicy.enabled` to `true`. + +Refer to the chart documenation for more information on [enabling the network policy in Redis® deployments](https://docs.bitnami.com/kubernetes/infrastructure/redis/administration/enable-network-policy/). + +### Setting Pod's affinity + +This chart allows you to set your custom affinity using the `XXX.affinity` parameter(s). Find more information about Pod's affinity in the [Kubernetes documentation](https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity). + +As an alternative, you can use of the preset configurations for pod affinity, pod anti-affinity, and node affinity available at the [bitnami/common](https://github.com/bitnami/charts/tree/main/bitnami/common#affinities) chart. To do so, set the `XXX.podAffinityPreset`, `XXX.podAntiAffinityPreset`, or `XXX.nodeAffinityPreset` parameters. + +## Troubleshooting + +Find more information about how to deal with common errors related to Bitnami's Helm charts in [this troubleshooting guide](https://docs.bitnami.com/general/how-to/troubleshoot-helm-chart-issues). + +## Upgrading + +A major chart version change (like v1.2.3 -> v2.0.0) indicates that there is an incompatible breaking change needing manual actions. + +### To 17.0.0 + +This major version updates the Redis® docker image version used from `6.2` to `7.0`, the new stable version. There are no major changes in the chart, but we recommend checking the [Redis® 7.0 release notes](https://raw.githubusercontent.com/redis/redis/7.0/00-RELEASENOTES) before upgrading. + +### To 16.0.0 + +This major release renames several values in this chart and adds missing features, in order to be inline with the rest of assets in the Bitnami charts repository. + +Affected values: +- `master.service.port` renamed as `master.service.ports.redis`. +- `master.service.nodePort` renamed as `master.service.nodePorts.redis`. +- `replica.service.port` renamed as `replica.service.ports.redis`. +- `replica.service.nodePort` renamed as `replica.service.nodePorts.redis`. +- `sentinel.service.port` renamed as `sentinel.service.ports.redis`. +- `sentinel.service.sentinelPort` renamed as `sentinel.service.ports.sentinel`. +- `master.containerPort` renamed as `master.containerPorts.redis`. +- `replica.containerPort` renamed as `replica.containerPorts.redis`. +- `sentinel.containerPort` renamed as `sentinel.containerPorts.sentinel`. +- `master.spreadConstraints` renamed as `master.topologySpreadConstraints` +- `replica.spreadConstraints` renamed as `replica.topologySpreadConstraints` + +### To 15.0.0 + +The parameter to enable the usage of StaticIDs was removed. The behavior is to [always use StaticIDs](https://github.com/bitnami/charts/pull/7278). + +### To 14.8.0 + +The Redis® sentinel exporter was removed in this version because the upstream project was deprecated. The regular Redis® exporter is included in the sentinel scenario as usual. + +### To 14.0.0 + +- Several parameters were renamed or disappeared in favor of new ones on this major version: + - The term *slave* has been replaced by the term *replica*. Therefore, parameters prefixed with `slave` are now prefixed with `replicas`. + - Credentials parameter are reorganized under the `auth` parameter. + - `cluster.enabled` parameter is deprecated in favor of `architecture` parameter that accepts two values: `standalone` and `replication`. + - `securityContext.*` is deprecated in favor of `XXX.podSecurityContext` and `XXX.containerSecurityContext`. + - `sentinel.metrics.*` parameters are deprecated in favor of `metrics.sentinel.*` ones. +- New parameters to add custom command, environment variables, sidecars, init containers, etc. were added. +- Chart labels were adapted to follow the [Helm charts standard labels](https://helm.sh/docs/chart_best_practices/labels/#standard-labels). +- values.yaml metadata was adapted to follow the format supported by [Readme Generator for Helm](https://github.com/bitnami-labs/readme-generator-for-helm). + +Consequences: + +Backwards compatibility is not guaranteed. To upgrade to `14.0.0`, install a new release of the Redis® chart, and migrate the data from your previous release. You have 2 alternatives to do so: + +- Create a backup of the database, and restore it on the new release as explained in the [Backup and restore](#backup-and-restore) section. +- Reuse the PVC used to hold the master data on your previous release. To do so, use the `master.persistence.existingClaim` parameter. The following example assumes that the release name is `redis`: + +```console +$ helm install redis my-repo/redis --set auth.password=[PASSWORD] --set master.persistence.existingClaim=[EXISTING_PVC] +``` + +| Note: you need to substitute the placeholder _[EXISTING_PVC]_ with the name of the PVC used on your previous release, and _[PASSWORD]_ with the password used in your previous release. + +### To 13.0.0 + +This major version updates the Redis® docker image version used from `6.0` to `6.2`, the new stable version. There are no major changes in the chart and there shouldn't be any breaking changes in it as `6.2` is basically a stricter superset of `6.0`. For more information, please refer to [Redis® 6.2 release notes](https://raw.githubusercontent.com/redis/redis/6.2/00-RELEASENOTES). + +### To 12.3.0 + +This version also introduces `bitnami/common`, a [library chart](https://helm.sh/docs/topics/library_charts/#helm) as a dependency. More documentation about this new utility could be found [here](https://github.com/bitnami/charts/tree/main/bitnami/common#bitnami-common-library-chart). Please, make sure that you have updated the chart dependencies before executing any upgrade. + +### To 12.0.0 + +[On November 13, 2020, Helm v2 support was formally finished](https://github.com/helm/charts#status-of-the-project), this major version is the result of the required changes applied to the Helm Chart to be able to incorporate the different features added in Helm v3 and to be consistent with the Helm project itself regarding the Helm v2 EOL. + +**What changes were introduced in this major version?** + +- Previous versions of this Helm Chart use `apiVersion: v1` (installable by both Helm 2 and 3), this Helm Chart was updated to `apiVersion: v2` (installable by Helm 3 only). [Here](https://helm.sh/docs/topics/charts/#the-apiversion-field) you can find more information about the `apiVersion` field. +- The different fields present in the *Chart.yaml* file has been ordered alphabetically in a homogeneous way for all the Bitnami Helm Charts + +**Considerations when upgrading to this version** + +- If you want to upgrade to this version from a previous one installed with Helm v3, you shouldn't face any issues +- If you want to upgrade to this version using Helm v2, this scenario is not supported as this version doesn't support Helm v2 anymore +- If you installed the previous version with Helm v2 and wants to upgrade to this version with Helm v3, please refer to the [official Helm documentation](https://helm.sh/docs/topics/v2_v3_migration/#migration-use-cases) about migrating from Helm v2 to v3 + +**Useful links** + +- https://docs.bitnami.com/tutorials/resolve-helm2-helm3-post-migration-issues/ +- https://helm.sh/docs/topics/v2_v3_migration/ +- https://helm.sh/blog/migrate-from-helm-v2-to-helm-v3/ + +### To 11.0.0 + +When deployed with sentinel enabled, only a group of nodes is deployed and the master/slave role is handled in the group. To avoid breaking the compatibility, the settings for this nodes are given through the `slave.xxxx` parameters in `values.yaml` + +### To 9.0.0 + +The metrics exporter has been changed from a separate deployment to a sidecar container, due to the latest changes in the Redis® exporter code. Check the [official page](https://github.com/oliver006/redis_exporter/) for more information. The metrics container image was changed from oliver006/redis_exporter to bitnami/redis-exporter (Bitnami's maintained package of oliver006/redis_exporter). + +### To 7.0.0 + +In order to improve the performance in case of slave failure, we added persistence to the read-only slaves. That means that we moved from Deployment to StatefulSets. This should not affect upgrades from previous versions of the chart, as the deployments did not contain any persistence at all. + +This version also allows enabling Redis® Sentinel containers inside of the Redis® Pods (feature disabled by default). In case the master crashes, a new Redis® node will be elected as master. In order to query the current master (no redis master service is exposed), you need to query first the Sentinel cluster. + +### To 11.0.0 + +When using sentinel, a new statefulset called `-node` was introduced. This will break upgrading from a previous version where the statefulsets are called master and slave. Hence the PVC will not match the new naming and won't be reused. If you want to keep your data, you will need to perform a backup and then a restore the data in this new version. + +### To 10.0.0 + +For releases with `usePassword: true`, the value `sentinel.usePassword` controls whether the password authentication also applies to the sentinel port. This defaults to `true` for a secure configuration, however it is possible to disable to account for the following cases: + +- Using a version of redis-sentinel prior to `5.0.1` where the authentication feature was introduced. +- Where redis clients need to be updated to support sentinel authentication. + +If using a master/slave topology, or with `usePassword: false`, no action is required. + +### To 8.0.18 + +For releases with `metrics.enabled: true` the default tag for the exporter image is now `v1.x.x`. This introduces many changes including metrics names. You'll want to use [this dashboard](https://github.com/oliver006/redis_exporter/blob/master/contrib/grafana_prometheus_redis_dashboard.json) now. Please see the [redis_exporter github page](https://github.com/oliver006/redis_exporter#upgrading-from-0x-to-1x) for more details. + +### To 7.0.0 + +This version causes a change in the Redis® Master StatefulSet definition, so the command helm upgrade would not work out of the box. As an alternative, one of the following could be done: + +- Recommended: Create a clone of the Redis® Master PVC (for example, using projects like [this one](https://github.com/edseymour/pvc-transfer)). Then launch a fresh release reusing this cloned PVC. + + ``` + $ helm install my-release my-repo/redis --set persistence.existingClaim= + ``` + +- Alternative (not recommended, do at your own risk): `helm delete --purge` does not remove the PVC assigned to the Redis® Master StatefulSet. As a consequence, the following commands can be done to upgrade the release + + ``` + $ helm delete --purge + $ helm install my-repo/redis + ``` + +Previous versions of the chart were not using persistence in the slaves, so this upgrade would add it to them. Another important change is that no values are inherited from master to slaves. For example, in 6.0.0 `slaves.readinessProbe.periodSeconds`, if empty, would be set to `master.readinessProbe.periodSeconds`. This approach lacked transparency and was difficult to maintain. From now on, all the slave parameters must be configured just as it is done with the masters. + +Some values have changed as well: + +- `master.port` and `slave.port` have been changed to `redisPort` (same value for both master and slaves) +- `master.securityContext` and `slave.securityContext` have been changed to `securityContext`(same values for both master and slaves) + +By default, the upgrade will not change the cluster topology. In case you want to use Redis® Sentinel, you must explicitly set `sentinel.enabled` to `true`. + +### To 6.0.0 + +Previous versions of the chart were using an init-container to change the permissions of the volumes. This was done in case the `securityContext` directive in the template was not enough for that (for example, with cephFS). In this new version of the chart, this container is disabled by default (which should not affect most of the deployments). If your installation still requires that init container, execute `helm upgrade` with the `--set volumePermissions.enabled=true`. + +### To 5.0.0 + +The default image in this release may be switched out for any image containing the `redis-server` +and `redis-cli` binaries. If `redis-server` is not the default image ENTRYPOINT, `master.command` +must be specified. + +#### Breaking changes + +- `master.args` and `slave.args` are removed. Use `master.command` or `slave.command` instead in order to override the image entrypoint, or `master.extraFlags` to pass additional flags to `redis-server`. +- `disableCommands` is now interpreted as an array of strings instead of a string of comma separated values. +- `master.persistence.path` now defaults to `/data`. + +### To 4.0.0 + +This version removes the `chart` label from the `spec.selector.matchLabels` +which is immutable since `StatefulSet apps/v1beta2`. It has been inadvertently +added, causing any subsequent upgrade to fail. See https://github.com/helm/charts/issues/7726. + +It also fixes https://github.com/helm/charts/issues/7726 where a deployment `extensions/v1beta1` can not be upgraded if `spec.selector` is not explicitly set. + +Finally, it fixes https://github.com/helm/charts/issues/7803 by removing mutable labels in `spec.VolumeClaimTemplate.metadata.labels` so that it is upgradable. + +In order to upgrade, delete the Redis® StatefulSet before upgrading: + +```console +$ kubectl delete statefulsets.apps --cascade=false my-release-redis-master +``` + +And edit the Redis® slave (and metrics if enabled) deployment: + +```console +$ kubectl patch deployments my-release-redis-slave --type=json -p='[{"op": "remove", "path": "/spec/selector/matchLabels/chart"}]' +$ kubectl patch deployments my-release-redis-metrics --type=json -p='[{"op": "remove", "path": "/spec/selector/matchLabels/chart"}]' +``` + +## License + +Copyright © 2023 Bitnami + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. \ No newline at end of file diff --git a/redis-request-response/charts/common-2.2.2.tgz b/redis-request-response/charts/common-2.2.2.tgz new file mode 100644 index 0000000000000000000000000000000000000000..5b86fd8a123ce596b57737a613b735517dc00437 GIT binary patch literal 14851 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 -- bash + +In order to replicate the container startup scripts execute this command: + +For Redis: + + /opt/bitnami/scripts/redis/entrypoint.sh /opt/bitnami/scripts/redis/run.sh + +{{- if .Values.sentinel.enabled }} + +For Redis Sentinel: + + /opt/bitnami/scripts/redis-sentinel/entrypoint.sh /opt/bitnami/scripts/redis-sentinel/run.sh + +{{- end }} +{{- else }} + +{{- if contains .Values.master.service.type "LoadBalancer" }} +{{- if not .Values.auth.enabled }} +{{ if and (not .Values.networkPolicy.enabled) (.Values.networkPolicy.allowExternal) }} + +------------------------------------------------------------------------------- + WARNING + + By specifying "master.service.type=LoadBalancer" and "auth.enabled=false" you have + most likely exposed the Redis® service externally without any authentication + mechanism. + + For security reasons, we strongly suggest that you switch to "ClusterIP" or + "NodePort". As alternative, you can also switch to "auth.enabled=true" + providing a valid password on "password" parameter. + +------------------------------------------------------------------------------- +{{- end }} +{{- end }} +{{- end }} + +{{- if eq .Values.architecture "replication" }} +{{- if .Values.sentinel.enabled }} + +Redis® can be accessed via port {{ .Values.sentinel.service.ports.redis }} on the following DNS name from within your cluster: + + {{ template "common.names.fullname" . }}.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }} for read only operations + +For read/write operations, first access the Redis® Sentinel cluster, which is available in port {{ .Values.sentinel.service.ports.sentinel }} using the same domain name above. + +{{- else }} + +Redis® can be accessed on the following DNS names from within your cluster: + + {{ printf "%s-master.%s.svc.%s" (include "common.names.fullname" .) .Release.Namespace .Values.clusterDomain }} for read/write operations (port {{ .Values.master.service.ports.redis }}) + {{ printf "%s-replicas.%s.svc.%s" (include "common.names.fullname" .) .Release.Namespace .Values.clusterDomain }} for read-only operations (port {{ .Values.replica.service.ports.redis }}) + +{{- end }} +{{- else }} + +Redis® can be accessed via port {{ .Values.master.service.ports.redis }} on the following DNS name from within your cluster: + + {{ template "common.names.fullname" . }}-master.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }} + +{{- end }} + +{{ if .Values.auth.enabled }} + +To get your password run: + + export REDIS_PASSWORD=$(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "redis.secretName" . }} -o jsonpath="{.data.redis-password}" | base64 -d) + +{{- end }} + +To connect to your Redis® server: + +1. Run a Redis® pod that you can use as a client: + + kubectl run --namespace {{ .Release.Namespace }} redis-client --restart='Never' {{ if .Values.auth.enabled }} --env REDIS_PASSWORD=$REDIS_PASSWORD {{ end }} --image {{ template "redis.image" . }} --command -- sleep infinity + +{{- if .Values.tls.enabled }} + + Copy your TLS certificates to the pod: + + kubectl cp --namespace {{ .Release.Namespace }} /path/to/client.cert redis-client:/tmp/client.cert + kubectl cp --namespace {{ .Release.Namespace }} /path/to/client.key redis-client:/tmp/client.key + kubectl cp --namespace {{ .Release.Namespace }} /path/to/CA.cert redis-client:/tmp/CA.cert + +{{- end }} + + Use the following command to attach to the pod: + + kubectl exec --tty -i redis-client \ + {{- if and (.Values.networkPolicy.enabled) (not .Values.networkPolicy.allowExternal) }}--labels="{{ template "common.names.fullname" . }}-client=true" \{{- end }} + --namespace {{ .Release.Namespace }} -- bash + +2. Connect using the Redis® CLI: + +{{- if eq .Values.architecture "replication" }} + {{- if .Values.sentinel.enabled }} + {{ if .Values.auth.enabled }}REDISCLI_AUTH="$REDIS_PASSWORD" {{ end }}redis-cli -h {{ template "common.names.fullname" . }} -p {{ .Values.sentinel.service.ports.redis }}{{ if .Values.tls.enabled }} --tls --cert /tmp/client.cert --key /tmp/client.key --cacert /tmp/CA.cert{{ end }} # Read only operations + {{ if .Values.auth.enabled }}REDISCLI_AUTH="$REDIS_PASSWORD" {{ end }}redis-cli -h {{ template "common.names.fullname" . }} -p {{ .Values.sentinel.service.ports.sentinel }}{{ if .Values.tls.enabled }} --tls --cert /tmp/client.cert --key /tmp/client.key --cacert /tmp/CA.cert{{ end }} # Sentinel access + {{- else }} + {{ if .Values.auth.enabled }}REDISCLI_AUTH="$REDIS_PASSWORD" {{ end }}redis-cli -h {{ printf "%s-master" (include "common.names.fullname" .) }}{{ if .Values.tls.enabled }} --tls --cert /tmp/client.cert --key /tmp/client.key --cacert /tmp/CA.cert{{ end }} + {{ if .Values.auth.enabled }}REDISCLI_AUTH="$REDIS_PASSWORD" {{ end }}redis-cli -h {{ printf "%s-replicas" (include "common.names.fullname" .) }}{{ if .Values.tls.enabled }} --tls --cert /tmp/client.cert --key /tmp/client.key --cacert /tmp/CA.cert{{ end }} + {{- end }} +{{- else }} + {{ if .Values.auth.enabled }}REDISCLI_AUTH="$REDIS_PASSWORD" {{ end }}redis-cli -h {{ template "common.names.fullname" . }}-master{{ if .Values.tls.enabled }} --tls --cert /tmp/client.cert --key /tmp/client.key --cacert /tmp/CA.cert{{ end }} +{{- end }} + +{{- if and (.Values.networkPolicy.enabled) (not .Values.networkPolicy.allowExternal) }} + +Note: Since NetworkPolicy is enabled, only pods with label {{ template "common.names.fullname" . }}-client=true" will be able to connect to redis. + +{{- else }} + +To connect to your database from outside the cluster execute the following commands: + +{{- if and (eq .Values.architecture "replication") .Values.sentinel.enabled }} +{{- if contains "NodePort" .Values.sentinel.service.type }} + + export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}") + export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "common.names.fullname" . }}) + {{ if .Values.auth.enabled }}REDISCLI_AUTH="$REDIS_PASSWORD" {{ end }}redis-cli -h $NODE_IP -p $NODE_PORT {{- if .Values.tls.enabled }} --tls --cert /tmp/client.cert --key /tmp/client.key --cacert /tmp/CA.cert{{ end }} + +{{- else if contains "LoadBalancer" .Values.sentinel.service.type }} + + NOTE: It may take a few minutes for the LoadBalancer IP to be available. + Watch the status with: 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "common.names.fullname" . }}' + + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "common.names.fullname" . }} --template "{{ "{{ range (index .status.loadBalancer.ingress 0) }}{{ . }}{{ end }}" }}") + {{ if .Values.auth.enabled }}REDISCLI_AUTH="$REDIS_PASSWORD" {{ end }}redis-cli -h $SERVICE_IP -p {{ .Values.sentinel.service.ports.redis }} {{- if .Values.tls.enabled }} --tls --cert /tmp/client.cert --key /tmp/client.key --cacert /tmp/CA.cert{{ end }} + +{{- else if contains "ClusterIP" .Values.sentinel.service.type }} + + kubectl port-forward --namespace {{ .Release.Namespace }} svc/{{ template "common.names.fullname" . }} {{ .Values.sentinel.service.ports.redis }}:{{ .Values.sentinel.service.ports.redis }} & + {{ if .Values.auth.enabled }}REDISCLI_AUTH="$REDIS_PASSWORD" {{ end }}redis-cli -h 127.0.0.1 -p {{ .Values.sentinel.service.ports.redis }} {{- if .Values.tls.enabled }} --tls --cert /tmp/client.cert --key /tmp/client.key --cacert /tmp/CA.cert{{ end }} + +{{- end }} +{{- else }} +{{- if contains "NodePort" .Values.master.service.type }} + + export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}") + export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ printf "%s-master" (include "common.names.fullname" .) }}) + {{ if .Values.auth.enabled }}REDISCLI_AUTH="$REDIS_PASSWORD" {{ end }}redis-cli -h $NODE_IP -p $NODE_PORT {{- if .Values.tls.enabled }} --tls --cert /tmp/client.cert --key /tmp/client.key --cacert /tmp/CA.cert{{ end }} + +{{- else if contains "LoadBalancer" .Values.master.service.type }} + + NOTE: It may take a few minutes for the LoadBalancer IP to be available. + Watch the status with: 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "common.names.fullname" . }}' + + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ printf "%s-master" (include "common.names.fullname" .) }} --template "{{ "{{ range (index .status.loadBalancer.ingress 0) }}{{ . }}{{ end }}" }}") + {{ if .Values.auth.enabled }}REDISCLI_AUTH="$REDIS_PASSWORD" {{ end }}redis-cli -h $SERVICE_IP -p {{ .Values.master.service.ports.redis }} {{- if .Values.tls.enabled }} --tls --cert /tmp/client.cert --key /tmp/client.key --cacert /tmp/CA.cert{{ end }} + +{{- else if contains "ClusterIP" .Values.master.service.type }} + + kubectl port-forward --namespace {{ .Release.Namespace }} svc/{{ printf "%s-master" (include "common.names.fullname" .) }} {{ .Values.master.service.ports.redis }}:{{ .Values.master.service.ports.redis }} & + {{ if .Values.auth.enabled }}REDISCLI_AUTH="$REDIS_PASSWORD" {{ end }}redis-cli -h 127.0.0.1 -p {{ .Values.master.service.ports.redis }} {{- if .Values.tls.enabled }} --tls --cert /tmp/client.cert --key /tmp/client.key --cacert /tmp/CA.cert{{ end }} + +{{- end }} +{{- end }} + +{{- end }} +{{- end }} +{{- include "redis.checkRollingTags" . }} +{{- include "common.warnings.rollingTag" .Values.volumePermissions.image }} +{{- include "common.warnings.rollingTag" .Values.sysctl.image }} +{{- include "redis.validateValues" . }} + +{{- if and (eq .Values.architecture "replication") .Values.sentinel.enabled (eq .Values.sentinel.service.type "NodePort") (not .Release.IsUpgrade ) }} +{{- if $.Values.sentinel.service.nodePorts.sentinel }} +No need to upgrade, ports and nodeports have been set from values +{{- else }} +#!#!#!#!#!#!#!# IMPORTANT #!#!#!#!#!#!#!# +YOU NEED TO PERFORM AN UPGRADE FOR THE SERVICES AND WORKLOAD TO BE CREATED +{{- end }} +{{- end }} diff --git a/redis-request-response/templates/_helpers.tpl b/redis-request-response/templates/_helpers.tpl new file mode 100644 index 00000000..90064e80 --- /dev/null +++ b/redis-request-response/templates/_helpers.tpl @@ -0,0 +1,321 @@ +{{/* vim: set filetype=mustache: */}} + +{{/* +Return the proper Redis image name +*/}} +{{- define "redis.image" -}} +{{ include "common.images.image" (dict "imageRoot" .Values.image "global" .Values.global) }} +{{- end -}} + +{{/* +Return the proper Redis Sentinel image name +*/}} +{{- define "redis.sentinel.image" -}} +{{ include "common.images.image" (dict "imageRoot" .Values.sentinel.image "global" .Values.global) }} +{{- end -}} + +{{/* +Return the proper image name (for the metrics image) +*/}} +{{- define "redis.metrics.image" -}} +{{ include "common.images.image" (dict "imageRoot" .Values.metrics.image "global" .Values.global) }} +{{- end -}} + +{{/* +Return the proper image name (for the init container volume-permissions image) +*/}} +{{- define "redis.volumePermissions.image" -}} +{{ include "common.images.image" (dict "imageRoot" .Values.volumePermissions.image "global" .Values.global) }} +{{- end -}} + +{{/* +Return sysctl image +*/}} +{{- define "redis.sysctl.image" -}} +{{ include "common.images.image" (dict "imageRoot" .Values.sysctl.image "global" .Values.global) }} +{{- end -}} + +{{/* +Return the proper Docker Image Registry Secret Names +*/}} +{{- define "redis.imagePullSecrets" -}} +{{- include "common.images.pullSecrets" (dict "images" (list .Values.image .Values.sentinel.image .Values.metrics.image .Values.volumePermissions.image .Values.sysctl.image) "global" .Values.global) -}} +{{- end -}} + +{{/* +Return the appropriate apiVersion for networkpolicy. +*/}} +{{- define "networkPolicy.apiVersion" -}} +{{- if semverCompare ">=1.4-0, <1.7-0" .Capabilities.KubeVersion.GitVersion -}} +{{- print "extensions/v1beta1" -}} +{{- else -}} +{{- print "networking.k8s.io/v1" -}} +{{- end -}} +{{- end -}} + +{{/* +Return the appropriate apiGroup for PodSecurityPolicy. +*/}} +{{- define "podSecurityPolicy.apiGroup" -}} +{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- print "policy" -}} +{{- else -}} +{{- print "extensions" -}} +{{- end -}} +{{- end -}} + +{{/* +Return true if a TLS secret object should be created +*/}} +{{- define "redis.createTlsSecret" -}} +{{- if and .Values.tls.enabled .Values.tls.autoGenerated (and (not .Values.tls.existingSecret) (not .Values.tls.certificatesSecret)) }} + {{- true -}} +{{- end -}} +{{- end -}} + +{{/* +Return the secret containing Redis TLS certificates +*/}} +{{- define "redis.tlsSecretName" -}} +{{- $secretName := coalesce .Values.tls.existingSecret .Values.tls.certificatesSecret -}} +{{- if $secretName -}} + {{- printf "%s" (tpl $secretName $) -}} +{{- else -}} + {{- printf "%s-crt" (include "common.names.fullname" .) -}} +{{- end -}} +{{- end -}} + +{{/* +Return the path to the cert file. +*/}} +{{- define "redis.tlsCert" -}} +{{- if (include "redis.createTlsSecret" . ) -}} + {{- printf "/opt/bitnami/redis/certs/%s" "tls.crt" -}} +{{- else -}} + {{- required "Certificate filename is required when TLS in enabled" .Values.tls.certFilename | printf "/opt/bitnami/redis/certs/%s" -}} +{{- end -}} +{{- end -}} + +{{/* +Return the path to the cert key file. +*/}} +{{- define "redis.tlsCertKey" -}} +{{- if (include "redis.createTlsSecret" . ) -}} + {{- printf "/opt/bitnami/redis/certs/%s" "tls.key" -}} +{{- else -}} + {{- required "Certificate Key filename is required when TLS in enabled" .Values.tls.certKeyFilename | printf "/opt/bitnami/redis/certs/%s" -}} +{{- end -}} +{{- end -}} + +{{/* +Return the path to the CA cert file. +*/}} +{{- define "redis.tlsCACert" -}} +{{- if (include "redis.createTlsSecret" . ) -}} + {{- printf "/opt/bitnami/redis/certs/%s" "ca.crt" -}} +{{- else -}} + {{- required "Certificate CA filename is required when TLS in enabled" .Values.tls.certCAFilename | printf "/opt/bitnami/redis/certs/%s" -}} +{{- end -}} +{{- end -}} + +{{/* +Return the path to the DH params file. +*/}} +{{- define "redis.tlsDHParams" -}} +{{- if .Values.tls.dhParamsFilename -}} +{{- printf "/opt/bitnami/redis/certs/%s" .Values.tls.dhParamsFilename -}} +{{- end -}} +{{- end -}} + +{{/* +Create the name of the shared service account to use +*/}} +{{- define "redis.serviceAccountName" -}} +{{- if .Values.serviceAccount.create -}} + {{ default (include "common.names.fullname" .) .Values.serviceAccount.name }} +{{- else -}} + {{ default "default" .Values.serviceAccount.name }} +{{- end -}} +{{- end -}} + +{{/* +Create the name of the master service account to use +*/}} +{{- define "redis.masterServiceAccountName" -}} +{{- if .Values.master.serviceAccount.create -}} + {{ default (printf "%s-master" (include "common.names.fullname" .)) .Values.master.serviceAccount.name }} +{{- else -}} + {{- if .Values.serviceAccount.create -}} + {{ template "redis.serviceAccountName" . }} + {{- else -}} + {{ default "default" .Values.master.serviceAccount.name }} + {{- end -}} +{{- end -}} +{{- end -}} + +{{/* +Create the name of the replicas service account to use +*/}} +{{- define "redis.replicaServiceAccountName" -}} +{{- if .Values.replica.serviceAccount.create -}} + {{ default (printf "%s-replica" (include "common.names.fullname" .)) .Values.replica.serviceAccount.name }} +{{- else -}} + {{- if .Values.serviceAccount.create -}} + {{ template "redis.serviceAccountName" . }} + {{- else -}} + {{ default "default" .Values.replica.serviceAccount.name }} + {{- end -}} +{{- end -}} +{{- end -}} + +{{/* +Return the configuration configmap name +*/}} +{{- define "redis.configmapName" -}} +{{- if .Values.existingConfigmap -}} + {{- printf "%s" (tpl .Values.existingConfigmap $) -}} +{{- else -}} + {{- printf "%s-configuration" (include "common.names.fullname" .) -}} +{{- end -}} +{{- end -}} + +{{/* +Return true if a configmap object should be created +*/}} +{{- define "redis.createConfigmap" -}} +{{- if empty .Values.existingConfigmap }} + {{- true -}} +{{- end -}} +{{- end -}} + +{{/* +Get the password secret. +*/}} +{{- define "redis.secretName" -}} +{{- if .Values.auth.existingSecret -}} +{{- printf "%s" (tpl .Values.auth.existingSecret $) -}} +{{- else -}} +{{- printf "%s" (include "common.names.fullname" .) -}} +{{- end -}} +{{- end -}} + +{{/* +Get the password key to be retrieved from Redis® secret. +*/}} +{{- define "redis.secretPasswordKey" -}} +{{- if and .Values.auth.existingSecret .Values.auth.existingSecretPasswordKey -}} +{{- printf "%s" .Values.auth.existingSecretPasswordKey -}} +{{- else -}} +{{- printf "redis-password" -}} +{{- end -}} +{{- end -}} + + +{{/* +Returns the available value for certain key in an existing secret (if it exists), +otherwise it generates a random value. +*/}} +{{- define "getValueFromSecret" }} + {{- $len := (default 16 .Length) | int -}} + {{- $obj := (lookup "v1" "Secret" .Namespace .Name).data -}} + {{- if $obj }} + {{- index $obj .Key | b64dec -}} + {{- else -}} + {{- randAlphaNum $len -}} + {{- end -}} +{{- end }} + +{{/* +Return Redis® password +*/}} +{{- define "redis.password" -}} +{{- if not (empty .Values.global.redis.password) }} + {{- .Values.global.redis.password -}} +{{- else if not (empty .Values.auth.password) -}} + {{- .Values.auth.password -}} +{{- else -}} + {{- include "getValueFromSecret" (dict "Namespace" .Release.Namespace "Name" (include "common.names.fullname" .) "Length" 10 "Key" "redis-password") -}} +{{- end -}} +{{- end -}} + +{{/* Check if there are rolling tags in the images */}} +{{- define "redis.checkRollingTags" -}} +{{- include "common.warnings.rollingTag" .Values.image }} +{{- include "common.warnings.rollingTag" .Values.sentinel.image }} +{{- include "common.warnings.rollingTag" .Values.metrics.image }} +{{- end -}} + +{{/* +Compile all warnings into a single message, and call fail. +*/}} +{{- define "redis.validateValues" -}} +{{- $messages := list -}} +{{- $messages := append $messages (include "redis.validateValues.topologySpreadConstraints" .) -}} +{{- $messages := append $messages (include "redis.validateValues.architecture" .) -}} +{{- $messages := append $messages (include "redis.validateValues.podSecurityPolicy.create" .) -}} +{{- $messages := append $messages (include "redis.validateValues.tls" .) -}} +{{- $messages := without $messages "" -}} +{{- $message := join "\n" $messages -}} + +{{- if $message -}} +{{- printf "\nVALUES VALIDATION:\n%s" $message | fail -}} +{{- end -}} +{{- end -}} + +{{/* Validate values of Redis® - spreadConstrainsts K8s version */}} +{{- define "redis.validateValues.topologySpreadConstraints" -}} +{{- if and (semverCompare "<1.16-0" .Capabilities.KubeVersion.GitVersion) .Values.replica.topologySpreadConstraints -}} +redis: topologySpreadConstraints + Pod Topology Spread Constraints are only available on K8s >= 1.16 + Find more information at https://kubernetes.io/docs/concepts/workloads/pods/pod-topology-spread-constraints/ +{{- end -}} +{{- end -}} + +{{/* Validate values of Redis® - must provide a valid architecture */}} +{{- define "redis.validateValues.architecture" -}} +{{- if and (ne .Values.architecture "standalone") (ne .Values.architecture "replication") -}} +redis: architecture + Invalid architecture selected. Valid values are "standalone" and + "replication". Please set a valid architecture (--set architecture="xxxx") +{{- end -}} +{{- if and .Values.sentinel.enabled (not (eq .Values.architecture "replication")) }} +redis: architecture + Using redis sentinel on standalone mode is not supported. + To deploy redis sentinel, please select the "replication" mode + (--set "architecture=replication,sentinel.enabled=true") +{{- end -}} +{{- end -}} + +{{/* Validate values of Redis® - PodSecurityPolicy create */}} +{{- define "redis.validateValues.podSecurityPolicy.create" -}} +{{- if and .Values.podSecurityPolicy.create (not .Values.podSecurityPolicy.enabled) }} +redis: podSecurityPolicy.create + In order to create PodSecurityPolicy, you also need to enable + podSecurityPolicy.enabled field +{{- end -}} +{{- end -}} + +{{/* Validate values of Redis® - TLS enabled */}} +{{- define "redis.validateValues.tls" -}} +{{- if and .Values.tls.enabled (not .Values.tls.autoGenerated) (not .Values.tls.existingSecret) (not .Values.tls.certificatesSecret) }} +redis: tls.enabled + In order to enable TLS, you also need to provide + an existing secret containing the TLS certificates or + enable auto-generated certificates. +{{- end -}} +{{- end -}} + +{{/* Define the suffix utilized for external-dns */}} +{{- define "redis.externalDNS.suffix" -}} +{{ printf "%s.%s" (include "common.names.fullname" .) .Values.useExternalDNS.suffix }} +{{- end -}} + +{{/* Compile all annotations utilized for external-dns */}} +{{- define "redis.externalDNS.annotations" -}} +{{- if and .Values.useExternalDNS.enabled .Values.useExternalDNS.annotationKey }} +{{ .Values.useExternalDNS.annotationKey }}hostname: {{ include "redis.externalDNS.suffix" . }} +{{- range $key, $val := .Values.useExternalDNS.additionalAnnotations }} +{{ $.Values.useExternalDNS.annotationKey }}{{ $key }}: {{ $val | quote }} +{{- end }} +{{- end }} +{{- end }} diff --git a/redis-request-response/templates/configmap.yaml b/redis-request-response/templates/configmap.yaml new file mode 100644 index 00000000..9e70a387 --- /dev/null +++ b/redis-request-response/templates/configmap.yaml @@ -0,0 +1,59 @@ +{{- if (include "redis.createConfigmap" .) }} +apiVersion: v1 +kind: ConfigMap +metadata: + name: {{ printf "%s-configuration" (include "common.names.fullname" .) }} + namespace: {{ .Release.Namespace | quote }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} +data: + redis.conf: |- + # User-supplied common configuration: + {{- if .Values.commonConfiguration }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonConfiguration "context" $ ) | nindent 4 }} + {{- end }} + # End of common configuration + master.conf: |- + dir {{ .Values.master.persistence.path }} + # User-supplied master configuration: + {{- if .Values.master.configuration }} + {{- include "common.tplvalues.render" ( dict "value" .Values.master.configuration "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.master.disableCommands }} + {{- range .Values.master.disableCommands }} + rename-command {{ . }} "" + {{- end }} + {{- end }} + # End of master configuration + replica.conf: |- + dir {{ .Values.replica.persistence.path }} + # User-supplied replica configuration: + {{- if .Values.replica.configuration }} + {{- include "common.tplvalues.render" ( dict "value" .Values.replica.configuration "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.replica.disableCommands }} + {{- range .Values.replica.disableCommands }} + rename-command {{ . }} "" + {{- end }} + {{- end }} + # End of replica configuration + {{- if .Values.sentinel.enabled }} + sentinel.conf: |- + dir "/tmp" + port {{ .Values.sentinel.containerPorts.sentinel }} + sentinel monitor {{ .Values.sentinel.masterSet }} {{ template "common.names.fullname" . }}-node-0.{{ template "common.names.fullname" . }}-headless.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }} {{ .Values.sentinel.service.ports.redis }} {{ .Values.sentinel.quorum }} + sentinel down-after-milliseconds {{ .Values.sentinel.masterSet }} {{ .Values.sentinel.downAfterMilliseconds }} + sentinel failover-timeout {{ .Values.sentinel.masterSet }} {{ .Values.sentinel.failoverTimeout }} + sentinel parallel-syncs {{ .Values.sentinel.masterSet }} {{ .Values.sentinel.parallelSyncs }} + # User-supplied sentinel configuration: + {{- if .Values.sentinel.configuration }} + {{- include "common.tplvalues.render" ( dict "value" .Values.sentinel.configuration "context" $ ) | nindent 4 }} + {{- end }} + # End of sentinel configuration + {{- end }} +{{- end }} diff --git a/redis-request-response/templates/extra-list.yaml b/redis-request-response/templates/extra-list.yaml new file mode 100644 index 00000000..9ac65f9e --- /dev/null +++ b/redis-request-response/templates/extra-list.yaml @@ -0,0 +1,4 @@ +{{- range .Values.extraDeploy }} +--- +{{ include "common.tplvalues.render" (dict "value" . "context" $) }} +{{- end }} diff --git a/redis-request-response/templates/headless-svc.yaml b/redis-request-response/templates/headless-svc.yaml new file mode 100644 index 00000000..d798a0b5 --- /dev/null +++ b/redis-request-response/templates/headless-svc.yaml @@ -0,0 +1,30 @@ +apiVersion: v1 +kind: Service +metadata: + name: {{ printf "%s-headless" (include "common.names.fullname" .) }} + namespace: {{ .Release.Namespace | quote }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + annotations: + {{- if .Values.commonAnnotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} + {{- include "redis.externalDNS.annotations" . | nindent 4 }} +spec: + type: ClusterIP + clusterIP: None + {{- if .Values.sentinel.enabled }} + publishNotReadyAddresses: true + {{- end }} + ports: + - name: tcp-redis + port: {{ if .Values.sentinel.enabled }}{{ .Values.sentinel.service.ports.redis }}{{ else }}{{ .Values.master.service.ports.redis }}{{ end }} + targetPort: redis + {{- if .Values.sentinel.enabled }} + - name: tcp-sentinel + port: {{ .Values.sentinel.service.ports.sentinel }} + targetPort: redis-sentinel + {{- end }} + selector: {{- include "common.labels.matchLabels" . | nindent 4 }} diff --git a/redis-request-response/templates/health-configmap.yaml b/redis-request-response/templates/health-configmap.yaml new file mode 100644 index 00000000..41f3145d --- /dev/null +++ b/redis-request-response/templates/health-configmap.yaml @@ -0,0 +1,192 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: {{ printf "%s-health" (include "common.names.fullname" .) }} + namespace: {{ .Release.Namespace | quote }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} +data: + ping_readiness_local.sh: |- + #!/bin/bash + + [[ -f $REDIS_PASSWORD_FILE ]] && export REDIS_PASSWORD="$(< "${REDIS_PASSWORD_FILE}")" + [[ -n "$REDIS_PASSWORD" ]] && export REDISCLI_AUTH="$REDIS_PASSWORD" + response=$( + timeout -s 3 $1 \ + redis-cli \ + -h localhost \ +{{- if .Values.tls.enabled }} + -p $REDIS_TLS_PORT \ + --tls \ + --cacert {{ template "redis.tlsCACert" . }} \ + {{- if .Values.tls.authClients }} + --cert {{ template "redis.tlsCert" . }} \ + --key {{ template "redis.tlsCertKey" . }} \ + {{- end }} +{{- else }} + -p $REDIS_PORT \ +{{- end }} + ping + ) + if [ "$?" -eq "124" ]; then + echo "Timed out" + exit 1 + fi + if [ "$response" != "PONG" ]; then + echo "$response" + exit 1 + fi + ping_liveness_local.sh: |- + #!/bin/bash + + [[ -f $REDIS_PASSWORD_FILE ]] && export REDIS_PASSWORD="$(< "${REDIS_PASSWORD_FILE}")" + [[ -n "$REDIS_PASSWORD" ]] && export REDISCLI_AUTH="$REDIS_PASSWORD" + response=$( + timeout -s 3 $1 \ + redis-cli \ + -h localhost \ +{{- if .Values.tls.enabled }} + -p $REDIS_TLS_PORT \ + --tls \ + --cacert {{ template "redis.tlsCACert" . }} \ + {{- if .Values.tls.authClients }} + --cert {{ template "redis.tlsCert" . }} \ + --key {{ template "redis.tlsCertKey" . }} \ + {{- end }} +{{- else }} + -p $REDIS_PORT \ +{{- end }} + ping + ) + if [ "$?" -eq "124" ]; then + echo "Timed out" + exit 1 + fi + responseFirstWord=$(echo $response | head -n1 | awk '{print $1;}') + if [ "$response" != "PONG" ] && [ "$responseFirstWord" != "LOADING" ] && [ "$responseFirstWord" != "MASTERDOWN" ]; then + echo "$response" + exit 1 + fi +{{- if .Values.sentinel.enabled }} + ping_sentinel.sh: |- + #!/bin/bash + +{{- if .Values.auth.sentinel }} + [[ -f $REDIS_PASSWORD_FILE ]] && export REDIS_PASSWORD="$(< "${REDIS_PASSWORD_FILE}")" + [[ -n "$REDIS_PASSWORD" ]] && export REDISCLI_AUTH="$REDIS_PASSWORD" +{{- end }} + response=$( + timeout -s 3 $1 \ + redis-cli \ + -h localhost \ +{{- if .Values.tls.enabled }} + -p $REDIS_SENTINEL_TLS_PORT_NUMBER \ + --tls \ + --cacert "$REDIS_SENTINEL_TLS_CA_FILE" \ + {{- if .Values.tls.authClients }} + --cert "$REDIS_SENTINEL_TLS_CERT_FILE" \ + --key "$REDIS_SENTINEL_TLS_KEY_FILE" \ + {{- end }} +{{- else }} + -p $REDIS_SENTINEL_PORT \ +{{- end }} + ping + ) + if [ "$?" -eq "124" ]; then + echo "Timed out" + exit 1 + fi + if [ "$response" != "PONG" ]; then + echo "$response" + exit 1 + fi + parse_sentinels.awk: |- + /ip/ {FOUND_IP=1} + /port/ {FOUND_PORT=1} + /runid/ {FOUND_RUNID=1} + !/ip|port|runid/ { + if (FOUND_IP==1) { + IP=$1; FOUND_IP=0; + } + else if (FOUND_PORT==1) { + PORT=$1; + FOUND_PORT=0; + } else if (FOUND_RUNID==1) { + printf "\nsentinel known-sentinel {{ .Values.sentinel.masterSet }} %s %s %s", IP, PORT, $0; FOUND_RUNID=0; + } + } +{{- end }} + ping_readiness_master.sh: |- + #!/bin/bash + + [[ -f $REDIS_MASTER_PASSWORD_FILE ]] && export REDIS_MASTER_PASSWORD="$(< "${REDIS_MASTER_PASSWORD_FILE}")" + [[ -n "$REDIS_MASTER_PASSWORD" ]] && export REDISCLI_AUTH="$REDIS_MASTER_PASSWORD" + response=$( + timeout -s 3 $1 \ + redis-cli \ + -h $REDIS_MASTER_HOST \ + -p $REDIS_MASTER_PORT_NUMBER \ +{{- if .Values.tls.enabled }} + --tls \ + --cacert {{ template "redis.tlsCACert" . }} \ + {{- if .Values.tls.authClients }} + --cert {{ template "redis.tlsCert" . }} \ + --key {{ template "redis.tlsCertKey" . }} \ + {{- end }} +{{- end }} + ping + ) + if [ "$?" -eq "124" ]; then + echo "Timed out" + exit 1 + fi + if [ "$response" != "PONG" ]; then + echo "$response" + exit 1 + fi + ping_liveness_master.sh: |- + #!/bin/bash + + [[ -f $REDIS_MASTER_PASSWORD_FILE ]] && export REDIS_MASTER_PASSWORD="$(< "${REDIS_MASTER_PASSWORD_FILE}")" + [[ -n "$REDIS_MASTER_PASSWORD" ]] && export REDISCLI_AUTH="$REDIS_MASTER_PASSWORD" + response=$( + timeout -s 3 $1 \ + redis-cli \ + -h $REDIS_MASTER_HOST \ + -p $REDIS_MASTER_PORT_NUMBER \ +{{- if .Values.tls.enabled }} + --tls \ + --cacert {{ template "redis.tlsCACert" . }} \ + {{- if .Values.tls.authClients }} + --cert {{ template "redis.tlsCert" . }} \ + --key {{ template "redis.tlsCertKey" . }} \ + {{- end }} +{{- end }} + ping + ) + if [ "$?" -eq "124" ]; then + echo "Timed out" + exit 1 + fi + responseFirstWord=$(echo $response | head -n1 | awk '{print $1;}') + if [ "$response" != "PONG" ] && [ "$responseFirstWord" != "LOADING" ]; then + echo "$response" + exit 1 + fi + ping_readiness_local_and_master.sh: |- + script_dir="$(dirname "$0")" + exit_status=0 + "$script_dir/ping_readiness_local.sh" $1 || exit_status=$? + "$script_dir/ping_readiness_master.sh" $1 || exit_status=$? + exit $exit_status + ping_liveness_local_and_master.sh: |- + script_dir="$(dirname "$0")" + exit_status=0 + "$script_dir/ping_liveness_local.sh" $1 || exit_status=$? + "$script_dir/ping_liveness_master.sh" $1 || exit_status=$? + exit $exit_status diff --git a/redis-request-response/templates/master/application.yaml b/redis-request-response/templates/master/application.yaml new file mode 100644 index 00000000..acff2e25 --- /dev/null +++ b/redis-request-response/templates/master/application.yaml @@ -0,0 +1,516 @@ +{{- if or (not (eq .Values.architecture "replication")) (not .Values.sentinel.enabled) }} +apiVersion: {{ include "common.capabilities.statefulset.apiVersion" . }} +kind: {{ .Values.master.kind }} +metadata: + name: {{ printf "%s-master" (include "common.names.fullname" .) }} + namespace: {{ .Release.Namespace | quote }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + app.kubernetes.io/component: master + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} +spec: + replicas: {{ .Values.master.count }} + selector: + matchLabels: {{- include "common.labels.matchLabels" . | nindent 6 }} + app.kubernetes.io/component: master + {{- if (eq .Values.master.kind "StatefulSet") }} + serviceName: {{ printf "%s-headless" (include "common.names.fullname" .) }} + {{- end }} + {{- if .Values.master.updateStrategy }} + {{- if (eq .Values.master.kind "Deployment") }} + strategy: {{- toYaml .Values.master.updateStrategy | nindent 4 }} + {{- else }} + updateStrategy: {{- toYaml .Values.master.updateStrategy | nindent 4 }} + {{- end }} + {{- if and .Values.master.minReadySeconds (semverCompare ">= 1.25" (include "common.capabilities.kubeVersion" .)) }} + minReadySeconds: {{ .Values.master.minReadySeconds }} + {{- end }} + {{- end }} + template: + metadata: + labels: {{- include "common.labels.standard" . | nindent 8 }} + app.kubernetes.io/component: master + {{- if .Values.master.podLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.master.podLabels "context" $ ) | nindent 8 }} + {{- end }} + {{- if and .Values.metrics.enabled .Values.metrics.podLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.metrics.podLabels "context" $ ) | nindent 8 }} + {{- end }} + annotations: + {{- if (include "redis.createConfigmap" .) }} + checksum/configmap: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }} + {{- end }} + checksum/health: {{ include (print $.Template.BasePath "/health-configmap.yaml") . | sha256sum }} + checksum/scripts: {{ include (print $.Template.BasePath "/scripts-configmap.yaml") . | sha256sum }} + checksum/secret: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }} + {{- if .Values.master.podAnnotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.master.podAnnotations "context" $ ) | nindent 8 }} + {{- end }} + {{- if and .Values.metrics.enabled .Values.metrics.podAnnotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.metrics.podAnnotations "context" $ ) | nindent 8 }} + {{- end }} + spec: + {{- include "redis.imagePullSecrets" . | nindent 6 }} + {{- if .Values.master.hostAliases }} + hostAliases: {{- include "common.tplvalues.render" (dict "value" .Values.master.hostAliases "context" $) | nindent 8 }} + {{- end }} + {{- if .Values.master.podSecurityContext.enabled }} + securityContext: {{- omit .Values.master.podSecurityContext "enabled" | toYaml | nindent 8 }} + {{- end }} + serviceAccountName: {{ template "redis.masterServiceAccountName" . }} + {{- if .Values.master.priorityClassName }} + priorityClassName: {{ .Values.master.priorityClassName | quote }} + {{- end }} + {{- if .Values.master.affinity }} + affinity: {{- include "common.tplvalues.render" (dict "value" .Values.master.affinity "context" $) | nindent 8 }} + {{- else }} + affinity: + podAffinity: {{- include "common.affinities.pods" (dict "type" .Values.master.podAffinityPreset "component" "master" "context" $) | nindent 10 }} + podAntiAffinity: {{- include "common.affinities.pods" (dict "type" .Values.master.podAntiAffinityPreset "component" "master" "context" $) | nindent 10 }} + nodeAffinity: {{- include "common.affinities.nodes" (dict "type" .Values.master.nodeAffinityPreset.type "key" .Values.master.nodeAffinityPreset.key "values" .Values.master.nodeAffinityPreset.values) | nindent 10 }} + {{- end }} + {{- if .Values.master.nodeSelector }} + nodeSelector: {{- include "common.tplvalues.render" (dict "value" .Values.master.nodeSelector "context" $) | nindent 8 }} + {{- end }} + {{- if .Values.master.tolerations }} + tolerations: {{- include "common.tplvalues.render" (dict "value" .Values.master.tolerations "context" $) | nindent 8 }} + {{- end }} + {{- if .Values.master.topologySpreadConstraints }} + topologySpreadConstraints: {{- include "common.tplvalues.render" (dict "value" .Values.master.topologySpreadConstraints "context" $) | nindent 8 }} + {{- end }} + {{- if .Values.master.shareProcessNamespace }} + shareProcessNamespace: {{ .Values.master.shareProcessNamespace }} + {{- end }} + {{- if .Values.master.schedulerName }} + schedulerName: {{ .Values.master.schedulerName | quote }} + {{- end }} + {{- if .Values.master.dnsPolicy }} + dnsPolicy: {{ .Values.master.dnsPolicy }} + {{- end }} + {{- if .Values.master.dnsConfig }} + dnsConfig: {{- include "common.tplvalues.render" (dict "value" .Values.master.dnsConfig "context" $) | nindent 8 }} + {{- end }} + terminationGracePeriodSeconds: {{ .Values.master.terminationGracePeriodSeconds }} + containers: + - name: redis + image: {{ template "redis.image" . }} + imagePullPolicy: {{ .Values.image.pullPolicy | quote }} + {{- if .Values.master.lifecycleHooks }} + lifecycle: {{- include "common.tplvalues.render" (dict "value" .Values.master.lifecycleHooks "context" $) | nindent 12 }} + {{- end }} + {{- if .Values.master.containerSecurityContext.enabled }} + securityContext: {{- omit .Values.master.containerSecurityContext "enabled" | toYaml | nindent 12 }} + {{- end }} + {{- if .Values.diagnosticMode.enabled }} + command: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.command "context" $) | nindent 12 }} + {{- else if .Values.master.command }} + command: {{- include "common.tplvalues.render" (dict "value" .Values.master.command "context" $) | nindent 12 }} + {{- else }} + command: + - /bin/bash + {{- end }} + {{- if .Values.diagnosticMode.enabled }} + args: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.args "context" $) | nindent 12 }} + {{- else if .Values.master.args }} + args: {{- include "common.tplvalues.render" (dict "value" .Values.master.args "context" $) | nindent 12 }} + {{- else }} + args: + - -c + - /opt/bitnami/scripts/start-scripts/start-master.sh + {{- end }} + env: + - name: BITNAMI_DEBUG + value: {{ ternary "true" "false" (or .Values.image.debug .Values.diagnosticMode.enabled) | quote }} + - name: REDIS_REPLICATION_MODE + value: master + - name: ALLOW_EMPTY_PASSWORD + value: {{ ternary "no" "yes" .Values.auth.enabled | quote }} + {{- if .Values.auth.enabled }} + {{- if .Values.auth.usePasswordFiles }} + - name: REDIS_PASSWORD_FILE + value: "/opt/bitnami/redis/secrets/redis-password" + {{- else }} + - name: REDIS_PASSWORD + valueFrom: + secretKeyRef: + name: {{ template "redis.secretName" . }} + key: {{ template "redis.secretPasswordKey" . }} + {{- end }} + {{- end }} + - name: REDIS_TLS_ENABLED + value: {{ ternary "yes" "no" .Values.tls.enabled | quote }} + {{- if .Values.tls.enabled }} + - name: REDIS_TLS_PORT + value: {{ .Values.master.containerPorts.redis | quote }} + - name: REDIS_TLS_AUTH_CLIENTS + value: {{ ternary "yes" "no" .Values.tls.authClients | quote }} + - name: REDIS_TLS_CERT_FILE + value: {{ template "redis.tlsCert" . }} + - name: REDIS_TLS_KEY_FILE + value: {{ template "redis.tlsCertKey" . }} + - name: REDIS_TLS_CA_FILE + value: {{ template "redis.tlsCACert" . }} + {{- if .Values.tls.dhParamsFilename }} + - name: REDIS_TLS_DH_PARAMS_FILE + value: {{ template "redis.tlsDHParams" . }} + {{- end }} + {{- else }} + - name: REDIS_PORT + value: {{ .Values.master.containerPorts.redis | quote }} + {{- end }} + {{- if .Values.master.extraEnvVars }} + {{- include "common.tplvalues.render" (dict "value" .Values.master.extraEnvVars "context" $) | nindent 12 }} + {{- end }} + {{- if or .Values.master.extraEnvVarsCM .Values.master.extraEnvVarsSecret }} + envFrom: + {{- if .Values.master.extraEnvVarsCM }} + - configMapRef: + name: {{ .Values.master.extraEnvVarsCM }} + {{- end }} + {{- if .Values.master.extraEnvVarsSecret }} + - secretRef: + name: {{ .Values.master.extraEnvVarsSecret }} + {{- end }} + {{- end }} + ports: + - name: redis + containerPort: {{ .Values.master.containerPorts.redis }} + {{- if not .Values.diagnosticMode.enabled }} + {{- if .Values.master.customStartupProbe }} + startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.master.customStartupProbe "context" $) | nindent 12 }} + {{- else if .Values.master.startupProbe.enabled }} + startupProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.master.startupProbe "enabled") "context" $) | nindent 12 }} + tcpSocket: + port: redis + {{- end }} + {{- if .Values.master.customLivenessProbe }} + livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.master.customLivenessProbe "context" $) | nindent 12 }} + {{- else if .Values.master.livenessProbe.enabled }} + livenessProbe: + initialDelaySeconds: {{ .Values.master.livenessProbe.initialDelaySeconds }} + periodSeconds: {{ .Values.master.livenessProbe.periodSeconds }} + # One second longer than command timeout should prevent generation of zombie processes. + timeoutSeconds: {{ add1 .Values.master.livenessProbe.timeoutSeconds }} + successThreshold: {{ .Values.master.livenessProbe.successThreshold }} + failureThreshold: {{ .Values.master.livenessProbe.failureThreshold }} + exec: + command: + - sh + - -c + - /health/ping_liveness_local.sh {{ .Values.master.livenessProbe.timeoutSeconds }} + {{- end }} + {{- if .Values.master.customReadinessProbe }} + readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.master.customReadinessProbe "context" $) | nindent 12 }} + {{- else if .Values.master.readinessProbe.enabled }} + readinessProbe: + initialDelaySeconds: {{ .Values.master.readinessProbe.initialDelaySeconds }} + periodSeconds: {{ .Values.master.readinessProbe.periodSeconds }} + timeoutSeconds: {{ add1 .Values.master.readinessProbe.timeoutSeconds }} + successThreshold: {{ .Values.master.readinessProbe.successThreshold }} + failureThreshold: {{ .Values.master.readinessProbe.failureThreshold }} + exec: + command: + - sh + - -c + - /health/ping_readiness_local.sh {{ .Values.master.readinessProbe.timeoutSeconds }} + {{- end }} + {{- end }} + {{- if .Values.master.resources }} + resources: {{- toYaml .Values.master.resources | nindent 12 }} + {{- end }} + volumeMounts: + - name: start-scripts + mountPath: /opt/bitnami/scripts/start-scripts + - name: health + mountPath: /health + {{- if .Values.auth.usePasswordFiles }} + - name: redis-password + mountPath: /opt/bitnami/redis/secrets/ + {{- end }} + - name: redis-data + mountPath: {{ .Values.master.persistence.path }} + {{- if .Values.master.persistence.subPath }} + subPath: {{ .Values.master.persistence.subPath }} + {{- else if .Values.master.persistence.subPathExpr }} + subPathExpr: {{ .Values.master.persistence.subPathExpr }} + {{- end }} + - name: config + mountPath: /opt/bitnami/redis/mounted-etc + - name: redis-tmp-conf + mountPath: /opt/bitnami/redis/etc/ + - name: tmp + mountPath: /tmp + {{- if .Values.tls.enabled }} + - name: redis-certificates + mountPath: /opt/bitnami/redis/certs + readOnly: true + {{- end }} + {{- if .Values.master.extraVolumeMounts }} + {{- include "common.tplvalues.render" ( dict "value" .Values.master.extraVolumeMounts "context" $ ) | nindent 12 }} + {{- end }} + {{- if .Values.metrics.enabled }} + - name: metrics + image: {{ include "redis.metrics.image" . }} + imagePullPolicy: {{ .Values.metrics.image.pullPolicy | quote }} + {{- if .Values.metrics.containerSecurityContext.enabled }} + securityContext: {{- omit .Values.metrics.containerSecurityContext "enabled" | toYaml | nindent 12 }} + {{- end }} + {{- if .Values.diagnosticMode.enabled }} + command: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.command "context" $) | nindent 12 }} + {{- else }} + command: + - /bin/bash + - -c + - | + if [[ -f '/secrets/redis-password' ]]; then + export REDIS_PASSWORD=$(cat /secrets/redis-password) + fi + redis_exporter{{- range $key, $value := .Values.metrics.extraArgs }} --{{ $key }}={{ $value }}{{- end }} + {{- end }} + {{- if .Values.diagnosticMode.enabled }} + args: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.args "context" $) | nindent 12 }} + {{- end }} + env: + - name: REDIS_ALIAS + value: {{ template "common.names.fullname" . }} + {{- if .Values.auth.enabled }} + - name: REDIS_USER + value: default + {{- if (not .Values.auth.usePasswordFiles) }} + - name: REDIS_PASSWORD + valueFrom: + secretKeyRef: + name: {{ template "redis.secretName" . }} + key: {{ template "redis.secretPasswordKey" . }} + {{- end }} + {{- end }} + {{- if .Values.tls.enabled }} + - name: REDIS_ADDR + value: rediss://{{ .Values.metrics.redisTargetHost }}:{{ .Values.master.containerPorts.redis }} + {{- if .Values.tls.authClients }} + - name: REDIS_EXPORTER_TLS_CLIENT_KEY_FILE + value: {{ template "redis.tlsCertKey" . }} + - name: REDIS_EXPORTER_TLS_CLIENT_CERT_FILE + value: {{ template "redis.tlsCert" . }} + {{- end }} + - name: REDIS_EXPORTER_TLS_CA_CERT_FILE + value: {{ template "redis.tlsCACert" . }} + {{- end }} + {{- if .Values.metrics.extraEnvVars }} + {{- include "common.tplvalues.render" (dict "value" .Values.metrics.extraEnvVars "context" $) | nindent 12 }} + {{- end }} + ports: + - name: metrics + containerPort: 9121 + {{- if not .Values.diagnosticMode.enabled }} + {{- if .Values.metrics.customStartupProbe }} + startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.metrics.customStartupProbe "context" $) | nindent 12 }} + {{- else if .Values.metrics.startupProbe.enabled }} + startupProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.metrics.startupProbe "enabled") "context" $) | nindent 12 }} + tcpSocket: + port: metrics + {{- end }} + {{- if .Values.metrics.customLivenessProbe }} + livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.metrics.customLivenessProbe "context" $) | nindent 12 }} + {{- else if .Values.metrics.livenessProbe.enabled }} + livenessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.metrics.livenessProbe "enabled") "context" $) | nindent 12 }} + tcpSocket: + port: metrics + {{- end }} + {{- if .Values.metrics.customReadinessProbe }} + readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.metrics.customReadinessProbe "context" $) | nindent 12 }} + {{- else if .Values.metrics.readinessProbe.enabled }} + readinessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.metrics.readinessProbe "enabled") "context" $) | nindent 12 }} + httpGet: + path: / + port: metrics + {{- end }} + {{- end }} + {{- if .Values.metrics.resources }} + resources: {{- toYaml .Values.metrics.resources | nindent 12 }} + {{- end }} + volumeMounts: + {{- if .Values.auth.usePasswordFiles }} + - name: redis-password + mountPath: /secrets/ + {{- end }} + {{- if .Values.tls.enabled }} + - name: redis-certificates + mountPath: /opt/bitnami/redis/certs + readOnly: true + {{- end }} + {{- if .Values.metrics.extraVolumeMounts }} + {{- include "common.tplvalues.render" ( dict "value" .Values.metrics.extraVolumeMounts "context" $ ) | nindent 12 }} + {{- end }} + {{- end }} + {{- if .Values.master.sidecars }} + {{- include "common.tplvalues.render" (dict "value" .Values.master.sidecars "context" $) | nindent 8 }} + {{- end }} + {{- $needsVolumePermissions := and .Values.volumePermissions.enabled .Values.master.persistence.enabled .Values.master.podSecurityContext.enabled .Values.master.containerSecurityContext.enabled }} + {{- if or .Values.master.initContainers $needsVolumePermissions .Values.sysctl.enabled }} + initContainers: + {{- if .Values.master.initContainers }} + {{- include "common.tplvalues.render" (dict "value" .Values.master.initContainers "context" $) | nindent 8 }} + {{- end }} + {{- if $needsVolumePermissions }} + - name: volume-permissions + image: {{ include "redis.volumePermissions.image" . }} + imagePullPolicy: {{ .Values.volumePermissions.image.pullPolicy | quote }} + command: + - /bin/bash + - -ec + - | + {{- if eq ( toString ( .Values.volumePermissions.containerSecurityContext.runAsUser )) "auto" }} + chown -R `id -u`:`id -G | cut -d " " -f2` {{ .Values.master.persistence.path }} + {{- else }} + chown -R {{ .Values.master.containerSecurityContext.runAsUser }}:{{ .Values.master.podSecurityContext.fsGroup }} {{ .Values.master.persistence.path }} + {{- end }} + {{- if eq ( toString ( .Values.volumePermissions.containerSecurityContext.runAsUser )) "auto" }} + securityContext: {{- omit .Values.volumePermissions.containerSecurityContext "runAsUser" | toYaml | nindent 12 }} + {{- else }} + securityContext: {{- .Values.volumePermissions.containerSecurityContext | toYaml | nindent 12 }} + {{- end }} + {{- if .Values.volumePermissions.resources }} + resources: {{- toYaml .Values.volumePermissions.resources | nindent 12 }} + {{- end }} + volumeMounts: + - name: redis-data + mountPath: {{ .Values.master.persistence.path }} + {{- if .Values.master.persistence.subPath }} + subPath: {{ .Values.master.persistence.subPath }} + {{- else if .Values.master.persistence.subPathExpr }} + subPathExpr: {{ .Values.master.persistence.subPathExpr }} + {{- end }} + {{- end }} + {{- if .Values.sysctl.enabled }} + - name: init-sysctl + image: {{ include "redis.sysctl.image" . }} + imagePullPolicy: {{ default "" .Values.sysctl.image.pullPolicy | quote }} + securityContext: + privileged: true + runAsUser: 0 + {{- if .Values.sysctl.command }} + command: {{- include "common.tplvalues.render" (dict "value" .Values.sysctl.command "context" $) | nindent 12 }} + {{- end }} + {{- if .Values.sysctl.resources }} + resources: {{- toYaml .Values.sysctl.resources | nindent 12 }} + {{- end }} + {{- if .Values.sysctl.mountHostSys }} + volumeMounts: + - name: host-sys + mountPath: /host-sys + {{- end }} + {{- end }} + {{- end }} + volumes: + - name: start-scripts + configMap: + name: {{ printf "%s-scripts" (include "common.names.fullname" .) }} + defaultMode: 0755 + - name: health + configMap: + name: {{ printf "%s-health" (include "common.names.fullname" .) }} + defaultMode: 0755 + {{- if .Values.auth.usePasswordFiles }} + - name: redis-password + secret: + secretName: {{ template "redis.secretName" . }} + items: + - key: {{ template "redis.secretPasswordKey" . }} + path: redis-password + {{- end }} + - name: config + configMap: + name: {{ include "redis.configmapName" . }} + {{- if .Values.sysctl.mountHostSys }} + - name: host-sys + hostPath: + path: /sys + {{- end }} + - name: redis-tmp-conf + {{- if or .Values.master.persistence.medium .Values.master.persistence.sizeLimit }} + emptyDir: + {{- if .Values.master.persistence.medium }} + medium: {{ .Values.master.persistence.medium | quote }} + {{- end }} + {{- if .Values.master.persistence.sizeLimit }} + sizeLimit: {{ .Values.master.persistence.sizeLimit | quote }} + {{- end }} + {{- else }} + emptyDir: {} + {{- end }} + - name: tmp + {{- if or .Values.master.persistence.medium .Values.master.persistence.sizeLimit }} + emptyDir: + {{- if .Values.master.persistence.medium }} + medium: {{ .Values.master.persistence.medium | quote }} + {{- end }} + {{- if .Values.master.persistence.sizeLimit }} + sizeLimit: {{ .Values.master.persistence.sizeLimit | quote }} + {{- end }} + {{- else }} + emptyDir: {} + {{- end }} + {{- if .Values.tls.enabled }} + - name: redis-certificates + secret: + secretName: {{ include "redis.tlsSecretName" . }} + defaultMode: 256 + {{- end }} + {{- if .Values.master.extraVolumes }} + {{- include "common.tplvalues.render" ( dict "value" .Values.master.extraVolumes "context" $ ) | nindent 8 }} + {{- end }} + {{- if .Values.metrics.extraVolumes }} + {{- include "common.tplvalues.render" ( dict "value" .Values.metrics.extraVolumes "context" $ ) | nindent 8 }} + {{- end }} + {{- if not .Values.master.persistence.enabled }} + - name: redis-data + {{- if or .Values.master.persistence.medium .Values.master.persistence.sizeLimit }} + emptyDir: + {{- if .Values.master.persistence.medium }} + medium: {{ .Values.master.persistence.medium | quote }} + {{- end }} + {{- if .Values.master.persistence.sizeLimit }} + sizeLimit: {{ .Values.master.persistence.sizeLimit | quote }} + {{- end }} + {{- else }} + emptyDir: {} + {{- end }} + {{- else if .Values.master.persistence.existingClaim }} + - name: redis-data + persistentVolumeClaim: + claimName: {{ printf "%s" (tpl .Values.master.persistence.existingClaim .) }} + {{- else if (eq .Values.master.kind "Deployment") }} + - name: redis-data + persistentVolumeClaim: + claimName: {{ printf "redis-data-%s-master" (include "common.names.fullname" .) }} + {{- else }} + volumeClaimTemplates: + - metadata: + name: redis-data + labels: {{- include "common.labels.matchLabels" . | nindent 10 }} + app.kubernetes.io/component: master + {{- if .Values.master.persistence.annotations }} + annotations: {{- toYaml .Values.master.persistence.annotations | nindent 10 }} + {{- end }} + spec: + accessModes: + {{- range .Values.master.persistence.accessModes }} + - {{ . | quote }} + {{- end }} + resources: + requests: + storage: {{ .Values.master.persistence.size | quote }} + {{- if .Values.master.persistence.selector }} + selector: {{- include "common.tplvalues.render" (dict "value" .Values.master.persistence.selector "context" $) | nindent 10 }} + {{- end }} + {{- if .Values.master.persistence.dataSource }} + dataSource: {{- include "common.tplvalues.render" (dict "value" .Values.master.persistence.dataSource "context" $) | nindent 10 }} + {{- end }} + {{- include "common.storage.class" (dict "persistence" .Values.master.persistence "global" .Values.global) | nindent 8 }} + {{- end }} +{{- end }} diff --git a/redis-request-response/templates/master/psp.yaml b/redis-request-response/templates/master/psp.yaml new file mode 100644 index 00000000..2ba93b6e --- /dev/null +++ b/redis-request-response/templates/master/psp.yaml @@ -0,0 +1,46 @@ +{{- $pspAvailable := (semverCompare "<1.25-0" (include "common.capabilities.kubeVersion" .)) -}} +{{- if and $pspAvailable .Values.podSecurityPolicy.create }} +apiVersion: policy/v1beta1 +kind: PodSecurityPolicy +metadata: + name: {{ printf "%s-master" (include "common.names.fullname" .) }} + namespace: {{ .Release.Namespace | quote }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} +spec: + allowPrivilegeEscalation: false + fsGroup: + rule: 'MustRunAs' + ranges: + - min: {{ .Values.master.podSecurityContext.fsGroup }} + max: {{ .Values.master.podSecurityContext.fsGroup }} + hostIPC: false + hostNetwork: false + hostPID: false + privileged: false + readOnlyRootFilesystem: false + requiredDropCapabilities: + - ALL + runAsUser: + rule: 'MustRunAs' + ranges: + - min: {{ .Values.master.containerSecurityContext.runAsUser }} + max: {{ .Values.master.containerSecurityContext.runAsUser }} + seLinux: + rule: 'RunAsAny' + supplementalGroups: + rule: 'MustRunAs' + ranges: + - min: {{ .Values.master.containerSecurityContext.runAsUser }} + max: {{ .Values.master.containerSecurityContext.runAsUser }} + volumes: + - 'configMap' + - 'secret' + - 'emptyDir' + - 'persistentVolumeClaim' +{{- end }} diff --git a/redis-request-response/templates/master/pvc.yaml b/redis-request-response/templates/master/pvc.yaml new file mode 100644 index 00000000..e5fddb03 --- /dev/null +++ b/redis-request-response/templates/master/pvc.yaml @@ -0,0 +1,27 @@ +{{- if and (eq .Values.architecture "standalone") (eq .Values.master.kind "Deployment") (.Values.master.persistence.enabled) (not .Values.master.persistence.existingClaim) }} +kind: PersistentVolumeClaim +apiVersion: v1 +metadata: + name: {{ printf "redis-data-%s-master" (include "common.names.fullname" .) }} + namespace: {{ .Release.Namespace | quote }} + labels: {{- include "common.labels.matchLabels" . | nindent 4 }} + app.kubernetes.io/component: master + {{- if .Values.master.persistence.annotations }} + annotations: {{- toYaml .Values.master.persistence.annotations | nindent 4 }} + {{- end }} +spec: + accessModes: + {{- range .Values.master.persistence.accessModes }} + - {{ . | quote }} + {{- end }} + resources: + requests: + storage: {{ .Values.master.persistence.size | quote }} + {{- if .Values.master.persistence.selector }} + selector: {{- include "common.tplvalues.render" (dict "value" .Values.master.persistence.selector "context" $) | nindent 4 }} + {{- end }} + {{- if .Values.master.persistence.dataSource }} + dataSource: {{- include "common.tplvalues.render" (dict "value" .Values.master.persistence.dataSource "context" $) | nindent 4 }} + {{- end }} + {{- include "common.storage.class" (dict "persistence" .Values.master.persistence "global" .Values.global) | nindent 2 }} +{{- end }} diff --git a/redis-request-response/templates/master/service.yaml b/redis-request-response/templates/master/service.yaml new file mode 100644 index 00000000..c03fea70 --- /dev/null +++ b/redis-request-response/templates/master/service.yaml @@ -0,0 +1,61 @@ +{{- if not .Values.sentinel.enabled }} +apiVersion: v1 +kind: Service +metadata: + name: {{ printf "%s-master" (include "common.names.fullname" .) }} + namespace: {{ .Release.Namespace | quote }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + app.kubernetes.io/component: master + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + {{- if or .Values.master.service.annotations .Values.commonAnnotations }} + annotations: + {{- if .Values.master.service.annotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.master.service.annotations "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.commonAnnotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} + {{- end }} +spec: + type: {{ .Values.master.service.type }} + {{- if or (eq .Values.master.service.type "LoadBalancer") (eq .Values.master.service.type "NodePort") }} + externalTrafficPolicy: {{ .Values.master.service.externalTrafficPolicy | quote }} + {{- end }} + {{- if (semverCompare ">=1.22-0" (include "common.capabilities.kubeVersion" .)) }} + internalTrafficPolicy: {{ .Values.master.service.internalTrafficPolicy }} + {{- end }} + {{- if and (eq .Values.master.service.type "LoadBalancer") (not (empty .Values.master.service.loadBalancerIP)) }} + loadBalancerIP: {{ .Values.master.service.loadBalancerIP }} + {{- end }} + {{- if and (eq .Values.master.service.type "LoadBalancer") (not (empty .Values.master.service.loadBalancerSourceRanges)) }} + loadBalancerSourceRanges: {{ .Values.master.service.loadBalancerSourceRanges }} + {{- end }} + {{- if and .Values.master.service.clusterIP (eq .Values.master.service.type "ClusterIP") }} + clusterIP: {{ .Values.master.service.clusterIP }} + {{- end }} + {{- if .Values.master.service.sessionAffinity }} + sessionAffinity: {{ .Values.master.service.sessionAffinity }} + {{- end }} + {{- if .Values.master.service.sessionAffinityConfig }} + sessionAffinityConfig: {{- include "common.tplvalues.render" (dict "value" .Values.master.service.sessionAffinityConfig "context" $) | nindent 4 }} + {{- end }} + {{- if .Values.master.service.externalIPs }} + externalIPs: {{- include "common.tplvalues.render" (dict "value" .Values.master.service.externalIPs "context" $) | nindent 4 }} + {{- end }} + ports: + - name: tcp-redis + port: {{ .Values.master.service.ports.redis }} + targetPort: redis + {{- if and (or (eq .Values.master.service.type "NodePort") (eq .Values.master.service.type "LoadBalancer")) .Values.master.service.nodePorts.redis}} + nodePort: {{ .Values.master.service.nodePorts.redis}} + {{- else if eq .Values.master.service.type "ClusterIP" }} + nodePort: null + {{- end }} + {{- if .Values.master.service.extraPorts }} + {{- include "common.tplvalues.render" (dict "value" .Values.master.service.extraPorts "context" $) | nindent 4 }} + {{- end }} + selector: {{- include "common.labels.matchLabels" . | nindent 4 }} + app.kubernetes.io/component: master +{{- end }} diff --git a/redis-request-response/templates/master/serviceaccount.yaml b/redis-request-response/templates/master/serviceaccount.yaml new file mode 100644 index 00000000..9c62e5f2 --- /dev/null +++ b/redis-request-response/templates/master/serviceaccount.yaml @@ -0,0 +1,21 @@ +{{- if .Values.master.serviceAccount.create }} +apiVersion: v1 +kind: ServiceAccount +automountServiceAccountToken: {{ .Values.master.serviceAccount.automountServiceAccountToken }} +metadata: + name: {{ template "redis.masterServiceAccountName" . }} + namespace: {{ .Release.Namespace | quote }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + {{- if or .Values.commonAnnotations .Values.master.serviceAccount.annotations }} + annotations: + {{- if or .Values.commonAnnotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.master.serviceAccount.annotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.master.serviceAccount.annotations "context" $ ) | nindent 4 }} + {{- end }} + {{- end }} +{{- end }} diff --git a/redis-request-response/templates/metrics-svc.yaml b/redis-request-response/templates/metrics-svc.yaml new file mode 100644 index 00000000..13c552f3 --- /dev/null +++ b/redis-request-response/templates/metrics-svc.yaml @@ -0,0 +1,41 @@ +{{- if .Values.metrics.enabled }} +apiVersion: v1 +kind: Service +metadata: + name: {{ printf "%s-metrics" (include "common.names.fullname" .) }} + namespace: {{ .Release.Namespace | quote }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + app.kubernetes.io/component: metrics + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + {{- if or .Values.metrics.service.annotations .Values.commonAnnotations }} + annotations: + {{- if .Values.metrics.service.annotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.metrics.service.annotations "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.commonAnnotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} + {{- end }} +spec: + type: {{ .Values.metrics.service.type }} + {{- if eq .Values.metrics.service.type "LoadBalancer" }} + externalTrafficPolicy: {{ .Values.metrics.service.externalTrafficPolicy }} + {{- end }} + {{- if and (eq .Values.metrics.service.type "LoadBalancer") .Values.metrics.service.loadBalancerIP }} + loadBalancerIP: {{ .Values.metrics.service.loadBalancerIP }} + {{- end }} + {{- if and (eq .Values.metrics.service.type "LoadBalancer") .Values.metrics.service.loadBalancerSourceRanges }} + loadBalancerSourceRanges: {{- toYaml .Values.metrics.service.loadBalancerSourceRanges | nindent 4 }} + {{- end }} + ports: + - name: http-metrics + port: {{ .Values.metrics.service.port }} + protocol: TCP + targetPort: metrics + {{- if .Values.metrics.service.extraPorts }} + {{- include "common.tplvalues.render" (dict "value" .Values.metrics.service.extraPorts "context" $) | nindent 4 }} + {{- end }} + selector: {{- include "common.labels.matchLabels" . | nindent 4 }} +{{- end }} diff --git a/redis-request-response/templates/networkpolicy.yaml b/redis-request-response/templates/networkpolicy.yaml new file mode 100644 index 00000000..7205cea3 --- /dev/null +++ b/redis-request-response/templates/networkpolicy.yaml @@ -0,0 +1,82 @@ +{{- if .Values.networkPolicy.enabled }} +kind: NetworkPolicy +apiVersion: {{ template "networkPolicy.apiVersion" . }} +metadata: + name: {{ template "common.names.fullname" . }} + namespace: {{ .Release.Namespace | quote }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} +spec: + podSelector: + matchLabels: {{- include "common.labels.matchLabels" . | nindent 6 }} + policyTypes: + - Ingress + {{- if or (eq .Values.architecture "replication") .Values.networkPolicy.extraEgress }} + - Egress + egress: + {{- if eq .Values.architecture "replication" }} + # Allow dns resolution + - ports: + - port: 53 + protocol: UDP + # Allow outbound connections to other cluster pods + - ports: + - port: {{ .Values.master.containerPorts.redis }} + {{- if .Values.sentinel.enabled }} + - port: {{ .Values.sentinel.containerPorts.sentinel }} + {{- end }} + to: + - podSelector: + matchLabels: {{- include "common.labels.matchLabels" . | nindent 14 }} + {{- end }} + {{- if .Values.networkPolicy.extraEgress }} + {{- include "common.tplvalues.render" ( dict "value" .Values.networkPolicy.extraEgress "context" $ ) | nindent 4 }} + {{- end }} + {{- end }} + ingress: + # Allow inbound connections + - ports: + - port: {{ .Values.master.containerPorts.redis }} + {{- if .Values.sentinel.enabled }} + - port: {{ .Values.sentinel.containerPorts.sentinel }} + {{- end }} + {{- if not .Values.networkPolicy.allowExternal }} + from: + - podSelector: + matchLabels: + {{ template "common.names.fullname" . }}-client: "true" + - podSelector: + matchLabels: {{- include "common.labels.matchLabels" . | nindent 14 }} + {{- if or .Values.networkPolicy.ingressNSMatchLabels .Values.networkPolicy.ingressNSPodMatchLabels }} + - namespaceSelector: + matchLabels: + {{- if .Values.networkPolicy.ingressNSMatchLabels }} + {{- range $key, $value := .Values.networkPolicy.ingressNSMatchLabels }} + {{ $key | quote }}: {{ $value | quote }} + {{- end }} + {{ else }} + {} + {{- end }} + {{- if .Values.networkPolicy.ingressNSPodMatchLabels }} + podSelector: + matchLabels: + {{- range $key, $value := .Values.networkPolicy.ingressNSPodMatchLabels }} + {{ $key | quote }}: {{ $value | quote }} + {{- end }} + {{- end }} + {{- end }} + {{- end }} + {{- if .Values.metrics.enabled }} + # Allow prometheus scrapes for metrics + - ports: + - port: 9121 + {{- end }} + {{- if .Values.networkPolicy.extraIngress }} + {{- include "common.tplvalues.render" ( dict "value" .Values.networkPolicy.extraIngress "context" $ ) | nindent 4 }} + {{- end }} +{{- end }} diff --git a/redis-request-response/templates/pdb.yaml b/redis-request-response/templates/pdb.yaml new file mode 100644 index 00000000..f82d278a --- /dev/null +++ b/redis-request-response/templates/pdb.yaml @@ -0,0 +1,23 @@ +{{- if .Values.pdb.create }} +apiVersion: {{ include "common.capabilities.policy.apiVersion" . }} +kind: PodDisruptionBudget +metadata: + name: {{ template "common.names.fullname" . }} + namespace: {{ .Release.Namespace | quote }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} +spec: + {{- if .Values.pdb.minAvailable }} + minAvailable: {{ .Values.pdb.minAvailable }} + {{- end }} + {{- if .Values.pdb.maxUnavailable }} + maxUnavailable: {{ .Values.pdb.maxUnavailable }} + {{- end }} + selector: + matchLabels: {{- include "common.labels.matchLabels" . | nindent 6 }} +{{- end }} diff --git a/redis-request-response/templates/prometheusrule.yaml b/redis-request-response/templates/prometheusrule.yaml new file mode 100644 index 00000000..b89d1163 --- /dev/null +++ b/redis-request-response/templates/prometheusrule.yaml @@ -0,0 +1,21 @@ +{{- if and .Values.metrics.enabled .Values.metrics.prometheusRule.enabled }} +apiVersion: monitoring.coreos.com/v1 +kind: PrometheusRule +metadata: + name: {{ template "common.names.fullname" . }} + namespace: {{ default .Release.Namespace .Values.metrics.prometheusRule.namespace | quote }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + {{- if .Values.metrics.prometheusRule.additionalLabels }} + {{- include "common.tplvalues.render" (dict "value" .Values.metrics.prometheusRule.additionalLabels "context" $) | nindent 4 }} + {{- end }} + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} +spec: + groups: + - name: {{ include "common.names.fullname" . }} + rules: {{- include "common.tplvalues.render" ( dict "value" .Values.metrics.prometheusRule.rules "context" $ ) | nindent 8 }} +{{- end }} diff --git a/redis-request-response/templates/replicas/hpa.yaml b/redis-request-response/templates/replicas/hpa.yaml new file mode 100644 index 00000000..ea069a8e --- /dev/null +++ b/redis-request-response/templates/replicas/hpa.yaml @@ -0,0 +1,47 @@ +{{- if and .Values.replica.autoscaling.enabled (not .Values.sentinel.enabled) }} +apiVersion: {{ include "common.capabilities.hpa.apiVersion" ( dict "context" $ ) }} +kind: HorizontalPodAutoscaler +metadata: + name: {{ printf "%s-replicas" (include "common.names.fullname" .) }} + namespace: {{ .Release.Namespace | quote }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + app.kubernetes.io/component: replica + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" (dict "value" .Values.commonLabels "context" $) | nindent 4 }} + {{- end }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} +spec: + scaleTargetRef: + apiVersion: {{ include "common.capabilities.deployment.apiVersion" . }} + kind: StatefulSet + name: {{ printf "%s-replicas" (include "common.names.fullname" .) }} + minReplicas: {{ .Values.replica.autoscaling.minReplicas }} + maxReplicas: {{ .Values.replica.autoscaling.maxReplicas }} + metrics: + {{- if .Values.replica.autoscaling.targetMemory }} + - type: Resource + resource: + name: memory + {{- if semverCompare "<1.23-0" (include "common.capabilities.kubeVersion" .) }} + targetAverageUtilization: {{ .Values.replica.autoscaling.targetMemory }} + {{- else }} + target: + type: Utilization + averageUtilization: {{ .Values.replica.autoscaling.targetMemory }} + {{- end }} + {{- end }} + {{- if .Values.replica.autoscaling.targetCPU }} + - type: Resource + resource: + name: cpu + {{- if semverCompare "<1.23-0" (include "common.capabilities.kubeVersion" .) }} + targetAverageUtilization: {{ .Values.replica.autoscaling.targetCPU }} + {{- else }} + target: + type: Utilization + averageUtilization: {{ .Values.replica.autoscaling.targetCPU }} + {{- end }} + {{- end }} +{{- end }} diff --git a/redis-request-response/templates/replicas/service.yaml b/redis-request-response/templates/replicas/service.yaml new file mode 100644 index 00000000..f2619266 --- /dev/null +++ b/redis-request-response/templates/replicas/service.yaml @@ -0,0 +1,58 @@ +{{- if and (eq .Values.architecture "replication") (not .Values.sentinel.enabled) }} +apiVersion: v1 +kind: Service +metadata: + name: {{ printf "%s-replicas" (include "common.names.fullname" .) }} + namespace: {{ .Release.Namespace | quote }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + app.kubernetes.io/component: replica + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + {{- if or .Values.replica.service.annotations .Values.commonAnnotations }} + annotations: + {{- if .Values.replica.service.annotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.replica.service.annotations "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.commonAnnotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} + {{- end }} +spec: + type: {{ .Values.replica.service.type }} + {{- if or (eq .Values.replica.service.type "LoadBalancer") (eq .Values.replica.service.type "NodePort") }} + externalTrafficPolicy: {{ .Values.replica.service.externalTrafficPolicy | quote }} + {{- end }} + {{- if (semverCompare ">=1.22-0" (include "common.capabilities.kubeVersion" .)) }} + internalTrafficPolicy: {{ .Values.replica.service.internalTrafficPolicy }} + {{- end }} + {{- if and (eq .Values.replica.service.type "LoadBalancer") (not (empty .Values.replica.service.loadBalancerIP)) }} + loadBalancerIP: {{ .Values.replica.service.loadBalancerIP }} + {{- end }} + {{- if and (eq .Values.replica.service.type "LoadBalancer") (not (empty .Values.replica.service.loadBalancerSourceRanges)) }} + loadBalancerSourceRanges: {{ .Values.replica.service.loadBalancerSourceRanges }} + {{- end }} + {{- if and .Values.replica.service.clusterIP (eq .Values.replica.service.type "ClusterIP") }} + clusterIP: {{ .Values.replica.service.clusterIP }} + {{- end }} + {{- if .Values.replica.service.sessionAffinity }} + sessionAffinity: {{ .Values.replica.service.sessionAffinity }} + {{- end }} + {{- if .Values.replica.service.sessionAffinityConfig }} + sessionAffinityConfig: {{- include "common.tplvalues.render" (dict "value" .Values.replica.service.sessionAffinityConfig "context" $) | nindent 4 }} + {{- end }} + ports: + - name: tcp-redis + port: {{ .Values.replica.service.ports.redis }} + targetPort: redis + {{- if and (or (eq .Values.replica.service.type "NodePort") (eq .Values.replica.service.type "LoadBalancer")) .Values.replica.service.nodePorts.redis}} + nodePort: {{ .Values.replica.service.nodePorts.redis}} + {{- else if eq .Values.replica.service.type "ClusterIP" }} + nodePort: null + {{- end }} + {{- if .Values.replica.service.extraPorts }} + {{- include "common.tplvalues.render" (dict "value" .Values.replica.service.extraPorts "context" $) | nindent 4 }} + {{- end }} + selector: {{- include "common.labels.matchLabels" . | nindent 4 }} + app.kubernetes.io/component: replica +{{- end }} diff --git a/redis-request-response/templates/replicas/serviceaccount.yaml b/redis-request-response/templates/replicas/serviceaccount.yaml new file mode 100644 index 00000000..333ec9f5 --- /dev/null +++ b/redis-request-response/templates/replicas/serviceaccount.yaml @@ -0,0 +1,21 @@ +{{- if .Values.replica.serviceAccount.create }} +apiVersion: v1 +kind: ServiceAccount +automountServiceAccountToken: {{ .Values.replica.serviceAccount.automountServiceAccountToken }} +metadata: + name: {{ template "redis.replicaServiceAccountName" . }} + namespace: {{ .Release.Namespace | quote }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + {{- if or .Values.commonAnnotations .Values.replica.serviceAccount.annotations }} + annotations: + {{- if or .Values.commonAnnotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.replica.serviceAccount.annotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.replica.serviceAccount.annotations "context" $ ) | nindent 4 }} + {{- end }} + {{- end }} +{{- end }} diff --git a/redis-request-response/templates/replicas/statefulset.yaml b/redis-request-response/templates/replicas/statefulset.yaml new file mode 100644 index 00000000..8a8541d7 --- /dev/null +++ b/redis-request-response/templates/replicas/statefulset.yaml @@ -0,0 +1,515 @@ +{{- if and (eq .Values.architecture "replication") (not .Values.sentinel.enabled) }} +apiVersion: {{ include "common.capabilities.statefulset.apiVersion" . }} +kind: StatefulSet +metadata: + name: {{ printf "%s-replicas" (include "common.names.fullname" .) }} + namespace: {{ .Release.Namespace | quote }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + app.kubernetes.io/component: replica + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} +spec: + {{- if not .Values.replica.autoscaling.enabled }} + replicas: {{ .Values.replica.replicaCount }} + {{- end }} + selector: + matchLabels: {{- include "common.labels.matchLabels" . | nindent 6 }} + app.kubernetes.io/component: replica + serviceName: {{ printf "%s-headless" (include "common.names.fullname" .) }} + {{- if .Values.replica.updateStrategy }} + updateStrategy: {{- toYaml .Values.replica.updateStrategy | nindent 4 }} + {{- end }} + {{- if and .Values.replica.minReadySeconds (semverCompare ">= 1.25" (include "common.capabilities.kubeVersion" .)) }} + minReadySeconds: {{ .Values.replica.minReadySeconds }} + {{- end }} + {{- if .Values.replica.podManagementPolicy }} + podManagementPolicy: {{ .Values.replica.podManagementPolicy | quote }} + {{- end }} + template: + metadata: + labels: {{- include "common.labels.standard" . | nindent 8 }} + app.kubernetes.io/component: replica + {{- if .Values.replica.podLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.replica.podLabels "context" $ ) | nindent 8 }} + {{- end }} + {{- if and .Values.metrics.enabled .Values.metrics.podLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.metrics.podLabels "context" $ ) | nindent 8 }} + {{- end }} + annotations: + {{- if (include "redis.createConfigmap" .) }} + checksum/configmap: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }} + {{- end }} + checksum/health: {{ include (print $.Template.BasePath "/health-configmap.yaml") . | sha256sum }} + checksum/scripts: {{ include (print $.Template.BasePath "/scripts-configmap.yaml") . | sha256sum }} + checksum/secret: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }} + {{- if .Values.replica.podAnnotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.replica.podAnnotations "context" $ ) | nindent 8 }} + {{- end }} + {{- if and .Values.metrics.enabled .Values.metrics.podAnnotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.metrics.podAnnotations "context" $ ) | nindent 8 }} + {{- end }} + spec: + {{- include "redis.imagePullSecrets" . | nindent 6 }} + {{- if .Values.replica.hostAliases }} + hostAliases: {{- include "common.tplvalues.render" (dict "value" .Values.replica.hostAliases "context" $) | nindent 8 }} + {{- end }} + {{- if .Values.replica.podSecurityContext.enabled }} + securityContext: {{- omit .Values.replica.podSecurityContext "enabled" | toYaml | nindent 8 }} + {{- end }} + serviceAccountName: {{ template "redis.replicaServiceAccountName" . }} + {{- if .Values.replica.priorityClassName }} + priorityClassName: {{ .Values.replica.priorityClassName | quote }} + {{- end }} + {{- if .Values.replica.affinity }} + affinity: {{- include "common.tplvalues.render" (dict "value" .Values.replica.affinity "context" $) | nindent 8 }} + {{- else }} + affinity: + podAffinity: {{- include "common.affinities.pods" (dict "type" .Values.replica.podAffinityPreset "component" "replica" "context" $) | nindent 10 }} + podAntiAffinity: {{- include "common.affinities.pods" (dict "type" .Values.replica.podAntiAffinityPreset "component" "replica" "context" $) | nindent 10 }} + nodeAffinity: {{- include "common.affinities.nodes" (dict "type" .Values.replica.nodeAffinityPreset.type "key" .Values.replica.nodeAffinityPreset.key "values" .Values.replica.nodeAffinityPreset.values) | nindent 10 }} + {{- end }} + {{- if .Values.replica.nodeSelector }} + nodeSelector: {{- include "common.tplvalues.render" (dict "value" .Values.replica.nodeSelector "context" $) | nindent 8 }} + {{- end }} + {{- if .Values.replica.tolerations }} + tolerations: {{- include "common.tplvalues.render" (dict "value" .Values.replica.tolerations "context" $) | nindent 8 }} + {{- end }} + {{- if .Values.replica.topologySpreadConstraints }} + topologySpreadConstraints: {{- include "common.tplvalues.render" (dict "value" .Values.replica.topologySpreadConstraints "context" $) | nindent 8 }} + {{- end }} + {{- if .Values.replica.shareProcessNamespace }} + shareProcessNamespace: {{ .Values.replica.shareProcessNamespace }} + {{- end }} + {{- if .Values.replica.schedulerName }} + schedulerName: {{ .Values.replica.schedulerName | quote }} + {{- end }} + {{- if .Values.replica.dnsPolicy }} + dnsPolicy: {{ .Values.replica.dnsPolicy }} + {{- end }} + {{- if .Values.replica.dnsConfig }} + dnsConfig: {{- include "common.tplvalues.render" (dict "value" .Values.replica.dnsConfig "context" $) | nindent 8 }} + {{- end }} + terminationGracePeriodSeconds: {{ .Values.replica.terminationGracePeriodSeconds }} + containers: + - name: redis + image: {{ template "redis.image" . }} + imagePullPolicy: {{ .Values.image.pullPolicy | quote }} + {{- if not .Values.diagnosticMode.enabled }} + {{- if .Values.replica.lifecycleHooks }} + lifecycle: {{- include "common.tplvalues.render" (dict "value" .Values.replica.lifecycleHooks "context" $) | nindent 12 }} + {{- end }} + {{- end }} + {{- if .Values.replica.containerSecurityContext.enabled }} + securityContext: {{- omit .Values.replica.containerSecurityContext "enabled" | toYaml | nindent 12 }} + {{- end }} + {{- if .Values.diagnosticMode.enabled }} + command: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.command "context" $) | nindent 12 }} + {{- else if .Values.replica.command }} + command: {{- include "common.tplvalues.render" (dict "value" .Values.replica.command "context" $) | nindent 12 }} + {{- else }} + command: + - /bin/bash + {{- end }} + {{- if .Values.diagnosticMode.enabled }} + args: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.args "context" $) | nindent 12 }} + {{- else if .Values.replica.args }} + args: {{- include "common.tplvalues.render" (dict "value" .Values.replica.args "context" $) | nindent 12 }} + {{- else }} + args: + - -c + - /opt/bitnami/scripts/start-scripts/start-replica.sh + {{- end }} + env: + - name: BITNAMI_DEBUG + value: {{ ternary "true" "false" (or .Values.image.debug .Values.diagnosticMode.enabled) | quote }} + - name: REDIS_REPLICATION_MODE + value: replica + - name: REDIS_MASTER_HOST + {{- if and (eq (int64 .Values.master.count) 1) (ne .Values.master.kind "Deployment") }} + value: {{ template "common.names.fullname" . }}-master-0.{{ template "common.names.fullname" . }}-headless.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }} + {{- else }} + value: {{ template "common.names.fullname" . }}-master.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }} + {{- end }} + - name: REDIS_MASTER_PORT_NUMBER + value: {{ .Values.master.containerPorts.redis | quote }} + - name: ALLOW_EMPTY_PASSWORD + value: {{ ternary "no" "yes" .Values.auth.enabled | quote }} + {{- if .Values.auth.enabled }} + {{- if .Values.auth.usePasswordFiles }} + - name: REDIS_PASSWORD_FILE + value: "/opt/bitnami/redis/secrets/redis-password" + - name: REDIS_MASTER_PASSWORD_FILE + value: "/opt/bitnami/redis/secrets/redis-password" + {{- else }} + - name: REDIS_PASSWORD + valueFrom: + secretKeyRef: + name: {{ template "redis.secretName" . }} + key: {{ template "redis.secretPasswordKey" . }} + - name: REDIS_MASTER_PASSWORD + valueFrom: + secretKeyRef: + name: {{ template "redis.secretName" . }} + key: {{ template "redis.secretPasswordKey" . }} + {{- end }} + {{- end }} + - name: REDIS_TLS_ENABLED + value: {{ ternary "yes" "no" .Values.tls.enabled | quote }} + {{- if .Values.tls.enabled }} + - name: REDIS_TLS_PORT + value: {{ .Values.replica.containerPorts.redis | quote }} + - name: REDIS_TLS_AUTH_CLIENTS + value: {{ ternary "yes" "no" .Values.tls.authClients | quote }} + - name: REDIS_TLS_CERT_FILE + value: {{ template "redis.tlsCert" . }} + - name: REDIS_TLS_KEY_FILE + value: {{ template "redis.tlsCertKey" . }} + - name: REDIS_TLS_CA_FILE + value: {{ template "redis.tlsCACert" . }} + {{- if .Values.tls.dhParamsFilename }} + - name: REDIS_TLS_DH_PARAMS_FILE + value: {{ template "redis.tlsDHParams" . }} + {{- end }} + {{- else }} + - name: REDIS_PORT + value: {{ .Values.replica.containerPorts.redis | quote }} + {{- end }} + {{- if .Values.replica.extraEnvVars }} + {{- include "common.tplvalues.render" (dict "value" .Values.replica.extraEnvVars "context" $) | nindent 12 }} + {{- end }} + {{- if or .Values.replica.extraEnvVarsCM .Values.replica.extraEnvVarsSecret }} + envFrom: + {{- if .Values.replica.extraEnvVarsCM }} + - configMapRef: + name: {{ .Values.replica.extraEnvVarsCM }} + {{- end }} + {{- if .Values.replica.extraEnvVarsSecret }} + - secretRef: + name: {{ .Values.replica.extraEnvVarsSecret }} + {{- end }} + {{- end }} + ports: + - name: redis + containerPort: {{ .Values.replica.containerPorts.redis }} + {{- if not .Values.diagnosticMode.enabled }} + {{- if .Values.replica.customStartupProbe }} + startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.replica.customStartupProbe "context" $) | nindent 12 }} + {{- else if .Values.replica.startupProbe.enabled }} + startupProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.replica.startupProbe "enabled") "context" $) | nindent 12 }} + tcpSocket: + port: redis + {{- end }} + {{- if .Values.replica.customLivenessProbe }} + livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.replica.customLivenessProbe "context" $) | nindent 12 }} + {{- else if .Values.replica.livenessProbe.enabled }} + livenessProbe: + initialDelaySeconds: {{ .Values.replica.livenessProbe.initialDelaySeconds }} + periodSeconds: {{ .Values.replica.livenessProbe.periodSeconds }} + timeoutSeconds: {{ add1 .Values.replica.livenessProbe.timeoutSeconds }} + successThreshold: {{ .Values.replica.livenessProbe.successThreshold }} + failureThreshold: {{ .Values.replica.livenessProbe.failureThreshold }} + exec: + command: + - sh + - -c + - /health/ping_liveness_local_and_master.sh {{ .Values.replica.livenessProbe.timeoutSeconds }} + {{- end }} + {{- if .Values.replica.customReadinessProbe }} + readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.replica.customReadinessProbe "context" $) | nindent 12 }} + {{- else if .Values.replica.readinessProbe.enabled }} + readinessProbe: + initialDelaySeconds: {{ .Values.replica.readinessProbe.initialDelaySeconds }} + periodSeconds: {{ .Values.replica.readinessProbe.periodSeconds }} + timeoutSeconds: {{ add1 .Values.replica.readinessProbe.timeoutSeconds }} + successThreshold: {{ .Values.replica.readinessProbe.successThreshold }} + failureThreshold: {{ .Values.replica.readinessProbe.failureThreshold }} + exec: + command: + - sh + - -c + - /health/ping_readiness_local_and_master.sh {{ .Values.replica.readinessProbe.timeoutSeconds }} + {{- end }} + {{- end }} + {{- if .Values.replica.resources }} + resources: {{- toYaml .Values.replica.resources | nindent 12 }} + {{- end }} + volumeMounts: + - name: start-scripts + mountPath: /opt/bitnami/scripts/start-scripts + - name: health + mountPath: /health + {{- if .Values.auth.usePasswordFiles }} + - name: redis-password + mountPath: /opt/bitnami/redis/secrets/ + {{- end }} + - name: redis-data + mountPath: /data + {{- if .Values.replica.persistence.subPath }} + subPath: {{ .Values.replica.persistence.subPath }} + {{- else if .Values.replica.persistence.subPathExpr }} + subPathExpr: {{ .Values.replica.persistence.subPathExpr }} + {{- end }} + - name: config + mountPath: /opt/bitnami/redis/mounted-etc + - name: redis-tmp-conf + mountPath: /opt/bitnami/redis/etc + {{- if .Values.tls.enabled }} + - name: redis-certificates + mountPath: /opt/bitnami/redis/certs + readOnly: true + {{- end }} + {{- if .Values.replica.extraVolumeMounts }} + {{- include "common.tplvalues.render" ( dict "value" .Values.replica.extraVolumeMounts "context" $ ) | nindent 12 }} + {{- end }} + {{- if .Values.metrics.enabled }} + - name: metrics + image: {{ include "redis.metrics.image" . }} + imagePullPolicy: {{ .Values.metrics.image.pullPolicy | quote }} + {{- if .Values.metrics.containerSecurityContext.enabled }} + securityContext: {{- omit .Values.metrics.containerSecurityContext "enabled" | toYaml | nindent 12 }} + {{- end }} + {{- if .Values.diagnosticMode.enabled }} + command: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.command "context" $) | nindent 12 }} + {{- else if .Values.metrics.command }} + command: {{- include "common.tplvalues.render" (dict "value" .Values.metrics.command "context" $) | nindent 12 }} + {{- else }} + command: + - /bin/bash + - -c + - | + if [[ -f '/secrets/redis-password' ]]; then + export REDIS_PASSWORD=$(cat /secrets/redis-password) + fi + redis_exporter{{- range $key, $value := .Values.metrics.extraArgs }} --{{ $key }}={{ $value }}{{- end }} + {{- end }} + {{- if .Values.diagnosticMode.enabled }} + args: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.args "context" $) | nindent 12 }} + {{- end }} + env: + - name: REDIS_ALIAS + value: {{ template "common.names.fullname" . }} + {{- if .Values.auth.enabled }} + - name: REDIS_USER + value: default + {{- if (not .Values.auth.usePasswordFiles) }} + - name: REDIS_PASSWORD + valueFrom: + secretKeyRef: + name: {{ template "redis.secretName" . }} + key: {{ template "redis.secretPasswordKey" . }} + {{- end }} + {{- end }} + {{- if .Values.tls.enabled }} + - name: REDIS_ADDR + value: rediss://{{ .Values.metrics.redisTargetHost }}:{{ .Values.replica.containerPorts.redis }} + {{- if .Values.tls.authClients }} + - name: REDIS_EXPORTER_TLS_CLIENT_KEY_FILE + value: {{ template "redis.tlsCertKey" . }} + - name: REDIS_EXPORTER_TLS_CLIENT_CERT_FILE + value: {{ template "redis.tlsCert" . }} + {{- end }} + - name: REDIS_EXPORTER_TLS_CA_CERT_FILE + value: {{ template "redis.tlsCACert" . }} + {{- end }} + {{- if .Values.metrics.extraEnvVars }} + {{- include "common.tplvalues.render" (dict "value" .Values.metrics.extraEnvVars "context" $) | nindent 12 }} + {{- end }} + ports: + - name: metrics + containerPort: 9121 + {{- if not .Values.diagnosticMode.enabled }} + {{- if .Values.metrics.customStartupProbe }} + startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.metrics.customStartupProbe "context" $) | nindent 12 }} + {{- else if .Values.metrics.startupProbe.enabled }} + startupProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.metrics.startupProbe "enabled") "context" $) | nindent 12 }} + tcpSocket: + port: metrics + {{- end }} + {{- if .Values.metrics.customLivenessProbe }} + livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.metrics.customLivenessProbe "context" $) | nindent 12 }} + {{- else if .Values.metrics.livenessProbe.enabled }} + livenessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.metrics.livenessProbe "enabled") "context" $) | nindent 12 }} + tcpSocket: + port: metrics + {{- end }} + {{- if .Values.metrics.customReadinessProbe }} + readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.metrics.customReadinessProbe "context" $) | nindent 12 }} + {{- else if .Values.metrics.readinessProbe.enabled }} + readinessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.metrics.readinessProbe "enabled") "context" $) | nindent 12 }} + httpGet: + path: / + port: metrics + {{- end }} + {{- end }} + {{- if .Values.metrics.resources }} + resources: {{- toYaml .Values.metrics.resources | nindent 12 }} + {{- end }} + volumeMounts: + {{- if .Values.auth.usePasswordFiles }} + - name: redis-password + mountPath: /secrets/ + {{- end }} + {{- if .Values.tls.enabled }} + - name: redis-certificates + mountPath: /opt/bitnami/redis/certs + readOnly: true + {{- end }} + {{- if .Values.metrics.extraVolumeMounts }} + {{- include "common.tplvalues.render" ( dict "value" .Values.metrics.extraVolumeMounts "context" $ ) | nindent 12 }} + {{- end }} + {{- end }} + {{- if .Values.replica.sidecars }} + {{- include "common.tplvalues.render" (dict "value" .Values.replica.sidecars "context" $) | nindent 8 }} + {{- end }} + {{- $needsVolumePermissions := and .Values.volumePermissions.enabled .Values.replica.persistence.enabled .Values.replica.podSecurityContext.enabled .Values.replica.containerSecurityContext.enabled }} + {{- if or .Values.replica.initContainers $needsVolumePermissions .Values.sysctl.enabled }} + initContainers: + {{- if .Values.replica.initContainers }} + {{- include "common.tplvalues.render" (dict "value" .Values.replica.initContainers "context" $) | nindent 8 }} + {{- end }} + {{- if $needsVolumePermissions }} + - name: volume-permissions + image: {{ include "redis.volumePermissions.image" . }} + imagePullPolicy: {{ .Values.volumePermissions.image.pullPolicy | quote }} + command: + - /bin/bash + - -ec + - | + {{- if eq ( toString ( .Values.volumePermissions.containerSecurityContext.runAsUser )) "auto" }} + chown -R `id -u`:`id -G | cut -d " " -f2` {{ .Values.replica.persistence.path }} + {{- else }} + chown -R {{ .Values.replica.containerSecurityContext.runAsUser }}:{{ .Values.replica.podSecurityContext.fsGroup }} {{ .Values.replica.persistence.path }} + {{- end }} + {{- if eq ( toString ( .Values.volumePermissions.containerSecurityContext.runAsUser )) "auto" }} + securityContext: {{- omit .Values.volumePermissions.containerSecurityContext "runAsUser" | toYaml | nindent 12 }} + {{- else }} + securityContext: {{- .Values.volumePermissions.containerSecurityContext | toYaml | nindent 12 }} + {{- end }} + {{- if .Values.volumePermissions.resources }} + resources: {{- toYaml .Values.volumePermissions.resources | nindent 12 }} + {{- end }} + volumeMounts: + - name: redis-data + mountPath: {{ .Values.replica.persistence.path }} + {{- if .Values.replica.persistence.subPath }} + subPath: {{ .Values.replica.persistence.subPath }} + {{- else if .Values.replica.persistence.subPathExpr }} + subPathExpr: {{ .Values.replica.persistence.subPathExpr }} + {{- end }} + {{- end }} + {{- if .Values.sysctl.enabled }} + - name: init-sysctl + image: {{ include "redis.sysctl.image" . }} + imagePullPolicy: {{ default "" .Values.sysctl.image.pullPolicy | quote }} + securityContext: + privileged: true + runAsUser: 0 + {{- if .Values.sysctl.command }} + command: {{- include "common.tplvalues.render" (dict "value" .Values.sysctl.command "context" $) | nindent 12 }} + {{- end }} + {{- if .Values.sysctl.resources }} + resources: {{- toYaml .Values.sysctl.resources | nindent 12 }} + {{- end }} + {{- if .Values.sysctl.mountHostSys }} + volumeMounts: + - name: host-sys + mountPath: /host-sys + {{- end }} + {{- end }} + {{- end }} + volumes: + - name: start-scripts + configMap: + name: {{ printf "%s-scripts" (include "common.names.fullname" .) }} + defaultMode: 0755 + - name: health + configMap: + name: {{ printf "%s-health" (include "common.names.fullname" .) }} + defaultMode: 0755 + {{- if .Values.auth.usePasswordFiles }} + - name: redis-password + secret: + secretName: {{ template "redis.secretName" . }} + items: + - key: {{ template "redis.secretPasswordKey" . }} + path: redis-password + {{- end }} + - name: config + configMap: + name: {{ include "redis.configmapName" . }} + {{- if .Values.sysctl.mountHostSys }} + - name: host-sys + hostPath: + path: /sys + {{- end }} + - name: redis-tmp-conf + {{- if or .Values.replica.persistence.medium .Values.replica.persistence.sizeLimit }} + emptyDir: + {{- if .Values.replica.persistence.medium }} + medium: {{ .Values.replica.persistence.medium | quote }} + {{- end }} + {{- if .Values.replica.persistence.sizeLimit }} + sizeLimit: {{ .Values.replica.persistence.sizeLimit | quote }} + {{- end }} + {{- else }} + emptyDir: {} + {{- end }} + {{- if .Values.tls.enabled }} + - name: redis-certificates + secret: + secretName: {{ include "redis.tlsSecretName" . }} + defaultMode: 256 + {{- end }} + {{- if .Values.replica.extraVolumes }} + {{- include "common.tplvalues.render" ( dict "value" .Values.replica.extraVolumes "context" $ ) | nindent 8 }} + {{- end }} + {{- if .Values.metrics.extraVolumes }} + {{- include "common.tplvalues.render" ( dict "value" .Values.metrics.extraVolumes "context" $ ) | nindent 8 }} + {{- end }} + {{- if not .Values.replica.persistence.enabled }} + - name: redis-data + {{- if or .Values.replica.persistence.medium .Values.replica.persistence.sizeLimit }} + emptyDir: + {{- if .Values.replica.persistence.medium }} + medium: {{ .Values.replica.persistence.medium | quote }} + {{- end }} + {{- if .Values.replica.persistence.sizeLimit }} + sizeLimit: {{ .Values.replica.persistence.sizeLimit | quote }} + {{- end }} + {{- else }} + emptyDir: {} + {{- end }} + {{- else if .Values.replica.persistence.existingClaim }} + - name: redis-data + persistentVolumeClaim: + claimName: {{ printf "%s" (tpl .Values.replica.persistence.existingClaim .) }} + {{- else }} + volumeClaimTemplates: + - metadata: + name: redis-data + labels: {{- include "common.labels.matchLabels" . | nindent 10 }} + app.kubernetes.io/component: replica + {{- if .Values.replica.persistence.annotations }} + annotations: {{- toYaml .Values.replica.persistence.annotations | nindent 10 }} + {{- end }} + spec: + accessModes: + {{- range .Values.replica.persistence.accessModes }} + - {{ . | quote }} + {{- end }} + resources: + requests: + storage: {{ .Values.replica.persistence.size | quote }} + {{- if .Values.replica.persistence.selector }} + selector: {{- include "common.tplvalues.render" (dict "value" .Values.replica.persistence.selector "context" $) | nindent 10 }} + {{- end }} + {{- if .Values.replica.persistence.dataSource }} + dataSource: {{- include "common.tplvalues.render" (dict "value" .Values.replica.persistence.dataSource "context" $) | nindent 10 }} + {{- end }} + {{- include "common.storage.class" (dict "persistence" .Values.replica.persistence "global" .Values.global) | nindent 8 }} + {{- end }} +{{- end }} diff --git a/redis-request-response/templates/role.yaml b/redis-request-response/templates/role.yaml new file mode 100644 index 00000000..596466f3 --- /dev/null +++ b/redis-request-response/templates/role.yaml @@ -0,0 +1,28 @@ +{{- if .Values.rbac.create }} +apiVersion: {{ include "common.capabilities.rbac.apiVersion" . }} +kind: Role +metadata: + name: {{ template "common.names.fullname" . }} + namespace: {{ .Release.Namespace | quote }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} +rules: + {{- $pspAvailable := (semverCompare "<1.25-0" (include "common.capabilities.kubeVersion" .)) -}} + {{- if and $pspAvailable .Values.podSecurityPolicy.enabled }} + - apiGroups: + - '{{ template "podSecurityPolicy.apiGroup" . }}' + resources: + - 'podsecuritypolicies' + verbs: + - 'use' + resourceNames: [{{ printf "%s-master" (include "common.names.fullname" .) }}] + {{- end }} + {{- if .Values.rbac.rules }} + {{- include "common.tplvalues.render" ( dict "value" .Values.rbac.rules "context" $ ) | nindent 2 }} + {{- end }} +{{- end }} diff --git a/redis-request-response/templates/rolebinding.yaml b/redis-request-response/templates/rolebinding.yaml new file mode 100644 index 00000000..74968b8f --- /dev/null +++ b/redis-request-response/templates/rolebinding.yaml @@ -0,0 +1,21 @@ +{{- if .Values.rbac.create }} +apiVersion: {{ include "common.capabilities.rbac.apiVersion" . }} +kind: RoleBinding +metadata: + name: {{ template "common.names.fullname" . }} + namespace: {{ .Release.Namespace | quote }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: Role + name: {{ template "common.names.fullname" . }} +subjects: + - kind: ServiceAccount + name: {{ template "redis.serviceAccountName" . }} +{{- end }} diff --git a/redis-request-response/templates/scripts-configmap.yaml b/redis-request-response/templates/scripts-configmap.yaml new file mode 100644 index 00000000..96e2f1a0 --- /dev/null +++ b/redis-request-response/templates/scripts-configmap.yaml @@ -0,0 +1,713 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: {{ printf "%s-scripts" (include "common.names.fullname" .) }} + namespace: {{ .Release.Namespace | quote }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} +data: +{{- if and (eq .Values.architecture "replication") .Values.sentinel.enabled }} + start-node.sh: | + #!/bin/bash + + . /opt/bitnami/scripts/libos.sh + . /opt/bitnami/scripts/liblog.sh + . /opt/bitnami/scripts/libvalidations.sh + + get_port() { + hostname="$1" + type="$2" + + port_var=$(echo "${hostname^^}_SERVICE_PORT_$type" | sed "s/-/_/g") + port=${!port_var} + + if [ -z "$port" ]; then + case $type in + "SENTINEL") + echo {{ .Values.sentinel.containerPorts.sentinel }} + ;; + "REDIS") + echo {{ .Values.master.containerPorts.redis }} + ;; + esac + else + echo $port + fi + } + + get_full_hostname() { + hostname="$1" + + {{- if .Values.useExternalDNS.enabled }} + full_hostname="${hostname}.{{- include "redis.externalDNS.suffix" . }}" + {{- else if eq .Values.sentinel.service.type "NodePort" }} + full_hostname="${hostname}.{{- .Release.Namespace }}" + {{- else }} + full_hostname="${hostname}.${HEADLESS_SERVICE}" + {{- end }} + + {{- if .Values.useHostnames }} + echo "${full_hostname}" + {{- else }} + getent hosts "${full_hostname}" | awk '{ print $1 ; exit }' + {{- end }} + } + + REDISPORT=$(get_port "$HOSTNAME" "REDIS") + + HEADLESS_SERVICE="{{ template "common.names.fullname" . }}-headless.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}" + + if [ -n "$REDIS_EXTERNAL_MASTER_HOST" ]; then + REDIS_SERVICE="$REDIS_EXTERNAL_MASTER_HOST" + else + REDIS_SERVICE="{{ template "common.names.fullname" . }}.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}" + fi + + SENTINEL_SERVICE_PORT=$(get_port "{{ include "common.names.fullname" . }}" "TCP_SENTINEL") + validate_quorum() { + if is_boolean_yes "$REDIS_TLS_ENABLED"; then + quorum_info_command="{{- if and .Values.auth.enabled .Values.auth.sentinel }}REDISCLI_AUTH="\$REDIS_PASSWORD" {{ end }}redis-cli -h $REDIS_SERVICE -p $SENTINEL_SERVICE_PORT --tls --cert ${REDIS_TLS_CERT_FILE} --key ${REDIS_TLS_KEY_FILE} --cacert ${REDIS_TLS_CA_FILE} sentinel master {{ .Values.sentinel.masterSet }}" + else + quorum_info_command="{{- if and .Values.auth.enabled .Values.auth.sentinel }}REDISCLI_AUTH="\$REDIS_PASSWORD" {{ end }}redis-cli -h $REDIS_SERVICE -p $SENTINEL_SERVICE_PORT sentinel master {{ .Values.sentinel.masterSet }}" + fi + info "about to run the command: $quorum_info_command" + eval $quorum_info_command | grep -Fq "s_down" + } + + trigger_manual_failover() { + if is_boolean_yes "$REDIS_TLS_ENABLED"; then + failover_command="{{- if and .Values.auth.enabled .Values.auth.sentinel }}REDISCLI_AUTH="\$REDIS_PASSWORD" {{ end }}redis-cli -h $REDIS_SERVICE -p $SENTINEL_SERVICE_PORT --tls --cert ${REDIS_TLS_CERT_FILE} --key ${REDIS_TLS_KEY_FILE} --cacert ${REDIS_TLS_CA_FILE} sentinel failover {{ .Values.sentinel.masterSet }}" + else + failover_command="{{- if and .Values.auth.enabled .Values.auth.sentinel }}REDISCLI_AUTH="\$REDIS_PASSWORD" {{ end }}redis-cli -h $REDIS_SERVICE -p $SENTINEL_SERVICE_PORT sentinel failover {{ .Values.sentinel.masterSet }}" + fi + + info "about to run the command: $failover_command" + eval $failover_command + } + + get_sentinel_master_info() { + if is_boolean_yes "$REDIS_TLS_ENABLED"; then + sentinel_info_command="{{- if and .Values.auth.enabled .Values.auth.sentinel }}REDISCLI_AUTH="\$REDIS_PASSWORD" {{ end }}timeout {{ .Values.sentinel.getMasterTimeout }} redis-cli -h $REDIS_SERVICE -p $SENTINEL_SERVICE_PORT --tls --cert ${REDIS_TLS_CERT_FILE} --key ${REDIS_TLS_KEY_FILE} --cacert ${REDIS_TLS_CA_FILE} sentinel get-master-addr-by-name {{ .Values.sentinel.masterSet }}" + else + sentinel_info_command="{{- if and .Values.auth.enabled .Values.auth.sentinel }}REDISCLI_AUTH="\$REDIS_PASSWORD" {{ end }}timeout {{ .Values.sentinel.getMasterTimeout }} redis-cli -h $REDIS_SERVICE -p $SENTINEL_SERVICE_PORT sentinel get-master-addr-by-name {{ .Values.sentinel.masterSet }}" + fi + + info "about to run the command: $sentinel_info_command" + eval $sentinel_info_command + } + + {{- if and .Values.replica.containerSecurityContext.runAsUser (eq (.Values.replica.containerSecurityContext.runAsUser | int) 0) }} + useradd redis + chown -R redis {{ .Values.replica.persistence.path }} + {{- end }} + + [[ -f $REDIS_PASSWORD_FILE ]] && export REDIS_PASSWORD="$(< "${REDIS_PASSWORD_FILE}")" + [[ -f $REDIS_MASTER_PASSWORD_FILE ]] && export REDIS_MASTER_PASSWORD="$(< "${REDIS_MASTER_PASSWORD_FILE}")" + + # check if there is a master + master_in_persisted_conf="$(get_full_hostname "$HOSTNAME")" + master_port_in_persisted_conf="$REDIS_MASTER_PORT_NUMBER" + master_in_sentinel="$(get_sentinel_master_info)" + redisRetVal=$? + + {{- if .Values.sentinel.persistence.enabled }} + if [[ -f /opt/bitnami/redis-sentinel/etc/sentinel.conf ]]; then + master_in_persisted_conf="$(awk '/monitor/ {print $4}' /opt/bitnami/redis-sentinel/etc/sentinel.conf)" + master_port_in_persisted_conf="$(awk '/monitor/ {print $5}' /opt/bitnami/redis-sentinel/etc/sentinel.conf)" + info "Found previous master ${master_in_persisted_conf}:${master_port_in_persisted_conf} in /opt/bitnami/redis-sentinel/etc/sentinel.conf" + debug "$(cat /opt/bitnami/redis-sentinel/etc/sentinel.conf | grep monitor)" + touch /opt/bitnami/redis-sentinel/etc/.node_read + fi + {{- end }} + + if [[ $redisRetVal -ne 0 ]]; then + if [[ "$master_in_persisted_conf" == "$(get_full_hostname "$HOSTNAME")" ]]; then + # Case 1: No active sentinel and in previous sentinel.conf we were the master --> MASTER + info "Configuring the node as master" + export REDIS_REPLICATION_MODE="master" + else + # Case 2: No active sentinel and in previous sentinel.conf we were not master --> REPLICA + info "Configuring the node as replica" + export REDIS_REPLICATION_MODE="replica" + REDIS_MASTER_HOST=${master_in_persisted_conf} + REDIS_MASTER_PORT_NUMBER=${master_port_in_persisted_conf} + fi + else + # Fetches current master's host and port + REDIS_SENTINEL_INFO=($(get_sentinel_master_info)) + info "Current master: REDIS_SENTINEL_INFO=(${REDIS_SENTINEL_INFO[0]},${REDIS_SENTINEL_INFO[1]})" + REDIS_MASTER_HOST=${REDIS_SENTINEL_INFO[0]} + REDIS_MASTER_PORT_NUMBER=${REDIS_SENTINEL_INFO[1]} + + if [[ "$REDIS_MASTER_HOST" == "$(get_full_hostname "$HOSTNAME")" ]]; then + # Case 3: Active sentinel and master it is this node --> MASTER + info "Configuring the node as master" + export REDIS_REPLICATION_MODE="master" + else + # Case 4: Active sentinel and master is not this node --> REPLICA + info "Configuring the node as replica" + export REDIS_REPLICATION_MODE="replica" + + {{- if and .Values.sentinel.automateClusterRecovery (le (int .Values.sentinel.downAfterMilliseconds) 2000) }} + retry_count=1 + while validate_quorum + do + info "sleeping, waiting for Redis master to come up" + sleep 1s + if ! ((retry_count % 11)); then + info "Trying to manually failover" + failover_result=$(trigger_manual_failover) + + debug "Failover result: $failover_result" + fi + + ((retry_count+=1)) + done + info "Redis master is up now" + {{- end }} + fi + fi + + if [[ -n "$REDIS_EXTERNAL_MASTER_HOST" ]]; then + REDIS_MASTER_HOST="$REDIS_EXTERNAL_MASTER_HOST" + REDIS_MASTER_PORT_NUMBER="${REDIS_EXTERNAL_MASTER_PORT}" + fi + + if [[ -f /opt/bitnami/redis/mounted-etc/replica.conf ]];then + cp /opt/bitnami/redis/mounted-etc/replica.conf /opt/bitnami/redis/etc/replica.conf + fi + + if [[ -f /opt/bitnami/redis/mounted-etc/redis.conf ]];then + cp /opt/bitnami/redis/mounted-etc/redis.conf /opt/bitnami/redis/etc/redis.conf + fi + + echo "" >> /opt/bitnami/redis/etc/replica.conf + echo "replica-announce-port $REDISPORT" >> /opt/bitnami/redis/etc/replica.conf + echo "replica-announce-ip $(get_full_hostname "$HOSTNAME")" >> /opt/bitnami/redis/etc/replica.conf + + {{- if .Values.tls.enabled }} + ARGS=("--port" "0") + ARGS+=("--tls-port" "${REDIS_TLS_PORT}") + ARGS+=("--tls-cert-file" "${REDIS_TLS_CERT_FILE}") + ARGS+=("--tls-key-file" "${REDIS_TLS_KEY_FILE}") + ARGS+=("--tls-ca-cert-file" "${REDIS_TLS_CA_FILE}") + ARGS+=("--tls-auth-clients" "${REDIS_TLS_AUTH_CLIENTS}") + ARGS+=("--tls-replication" "yes") + {{- if .Values.tls.dhParamsFilename }} + ARGS+=("--tls-dh-params-file" "${REDIS_TLS_DH_PARAMS_FILE}") + {{- end }} + {{- else }} + ARGS=("--port" "${REDIS_PORT}") + {{- end }} + + if [[ "$REDIS_REPLICATION_MODE" = "slave" ]] || [[ "$REDIS_REPLICATION_MODE" = "replica" ]]; then + ARGS+=("--replicaof" "${REDIS_MASTER_HOST}" "${REDIS_MASTER_PORT_NUMBER}") + fi + + {{- if .Values.auth.enabled }} + ARGS+=("--requirepass" "${REDIS_PASSWORD}") + ARGS+=("--masterauth" "${REDIS_MASTER_PASSWORD}") + {{- else }} + ARGS+=("--protected-mode" "no") + {{- end }} + ARGS+=("--include" "/opt/bitnami/redis/etc/replica.conf") + ARGS+=("--include" "/opt/bitnami/redis/etc/redis.conf") + {{- if .Values.replica.extraFlags }} + {{- range .Values.replica.extraFlags }} + ARGS+=({{ . | quote }}) + {{- end }} + {{- end }} + + {{- if .Values.replica.preExecCmds }} + {{- .Values.replica.preExecCmds | nindent 4 }} + {{- end }} + + {{- if .Values.replica.command }} + exec {{ .Values.replica.command }} "${ARGS[@]}" + {{- else }} + exec redis-server "${ARGS[@]}" + {{- end }} + + start-sentinel.sh: | + #!/bin/bash + + . /opt/bitnami/scripts/libos.sh + . /opt/bitnami/scripts/libvalidations.sh + . /opt/bitnami/scripts/libfile.sh + + HEADLESS_SERVICE="{{ template "common.names.fullname" . }}-headless.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}" + REDIS_SERVICE="{{ template "common.names.fullname" . }}.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}" + + get_port() { + hostname="$1" + type="$2" + + port_var=$(echo "${hostname^^}_SERVICE_PORT_$type" | sed "s/-/_/g") + port=${!port_var} + + if [ -z "$port" ]; then + case $type in + "SENTINEL") + echo {{ .Values.sentinel.containerPorts.sentinel }} + ;; + "REDIS") + echo {{ .Values.master.containerPorts.redis }} + ;; + esac + else + echo $port + fi + } + + get_full_hostname() { + hostname="$1" + + {{- if .Values.useExternalDNS.enabled }} + full_hostname="${hostname}.{{- include "redis.externalDNS.suffix" . }}" + {{- else if eq .Values.sentinel.service.type "NodePort" }} + full_hostname="${hostname}.{{- .Release.Namespace }}" + {{- else }} + full_hostname="${hostname}.${HEADLESS_SERVICE}" + {{- end }} + + {{- if .Values.useHostnames }} + echo "${full_hostname}" + {{- else }} + getent hosts "${full_hostname}" | awk '{ print $1 ; exit }' + {{- end }} + } + + SERVPORT=$(get_port "$HOSTNAME" "SENTINEL") + REDISPORT=$(get_port "$HOSTNAME" "REDIS") + SENTINEL_SERVICE_PORT=$(get_port "{{ include "common.names.fullname" . }}" "TCP_SENTINEL") + + sentinel_conf_set() { + local -r key="${1:?missing key}" + local value="${2:-}" + + # Sanitize inputs + value="${value//\\/\\\\}" + value="${value//&/\\&}" + value="${value//\?/\\?}" + [[ "$value" = "" ]] && value="\"$value\"" + + replace_in_file "/opt/bitnami/redis-sentinel/etc/sentinel.conf" "^#*\s*${key} .*" "${key} ${value}" false + } + sentinel_conf_add() { + echo $'\n'"$@" >> "/opt/bitnami/redis-sentinel/etc/sentinel.conf" + } + host_id() { + echo "$1" | openssl sha1 | awk '{print $2}' + } + get_sentinel_master_info() { + if is_boolean_yes "$REDIS_SENTINEL_TLS_ENABLED"; then + sentinel_info_command="{{- if and .Values.auth.enabled .Values.auth.sentinel }}REDISCLI_AUTH="\$REDIS_PASSWORD" {{ end }}timeout {{ .Values.sentinel.getMasterTimeout }} redis-cli -h $REDIS_SERVICE -p $SENTINEL_SERVICE_PORT --tls --cert ${REDIS_SENTINEL_TLS_CERT_FILE} --key ${REDIS_SENTINEL_TLS_KEY_FILE} --cacert ${REDIS_SENTINEL_TLS_CA_FILE} sentinel get-master-addr-by-name {{ .Values.sentinel.masterSet }}" + else + sentinel_info_command="{{- if and .Values.auth.enabled .Values.auth.sentinel }}REDISCLI_AUTH="\$REDIS_PASSWORD" {{ end }}timeout {{ .Values.sentinel.getMasterTimeout }} redis-cli -h $REDIS_SERVICE -p $SENTINEL_SERVICE_PORT sentinel get-master-addr-by-name {{ .Values.sentinel.masterSet }}" + fi + info "about to run the command: $sentinel_info_command" + eval $sentinel_info_command + } + + [[ -f $REDIS_PASSWORD_FILE ]] && export REDIS_PASSWORD="$(< "${REDIS_PASSWORD_FILE}")" + + master_in_persisted_conf="$(get_full_hostname "$HOSTNAME")" + + {{- if .Values.sentinel.persistence.enabled }} + if [[ -f /opt/bitnami/redis-sentinel/etc/sentinel.conf ]]; then + check_lock_file() { + [[ -f /opt/bitnami/redis-sentinel/etc/.node_read ]] + } + retry_while "check_lock_file" + rm -f /opt/bitnami/redis-sentinel/etc/.node_read + master_in_persisted_conf="$(awk '/monitor/ {print $4}' /opt/bitnami/redis-sentinel/etc/sentinel.conf)" + info "Found previous master $master_in_persisted_conf in /opt/bitnami/redis-sentinel/etc/sentinel.conf" + debug "$(cat /opt/bitnami/redis-sentinel/etc/sentinel.conf | grep monitor)" + fi + {{- end }} + if ! get_sentinel_master_info && [[ "$master_in_persisted_conf" == "$(get_full_hostname "$HOSTNAME")" ]]; then + # No master found, lets create a master node + export REDIS_REPLICATION_MODE="master" + + REDIS_MASTER_HOST=$(get_full_hostname "$HOSTNAME") + REDIS_MASTER_PORT_NUMBER="$REDISPORT" + else + export REDIS_REPLICATION_MODE="replica" + + # Fetches current master's host and port + REDIS_SENTINEL_INFO=($(get_sentinel_master_info)) + info "printing REDIS_SENTINEL_INFO=(${REDIS_SENTINEL_INFO[0]},${REDIS_SENTINEL_INFO[1]})" + REDIS_MASTER_HOST=${REDIS_SENTINEL_INFO[0]} + REDIS_MASTER_PORT_NUMBER=${REDIS_SENTINEL_INFO[1]} + fi + + if [[ -n "$REDIS_EXTERNAL_MASTER_HOST" ]]; then + REDIS_MASTER_HOST="$REDIS_EXTERNAL_MASTER_HOST" + REDIS_MASTER_PORT_NUMBER="${REDIS_EXTERNAL_MASTER_PORT}" + fi + + cp /opt/bitnami/redis-sentinel/mounted-etc/sentinel.conf /opt/bitnami/redis-sentinel/etc/sentinel.conf + {{- if .Values.auth.enabled }} + printf "\nsentinel auth-pass %s %s" "{{ .Values.sentinel.masterSet }}" "$REDIS_PASSWORD" >> /opt/bitnami/redis-sentinel/etc/sentinel.conf + {{- if and .Values.auth.enabled .Values.auth.sentinel }} + printf "\nrequirepass %s" "$REDIS_PASSWORD" >> /opt/bitnami/redis-sentinel/etc/sentinel.conf + {{- end }} + {{- end }} + printf "\nsentinel myid %s" "$(host_id "$HOSTNAME")" >> /opt/bitnami/redis-sentinel/etc/sentinel.conf + + if [[ -z "$REDIS_MASTER_HOST" ]] || [[ -z "$REDIS_MASTER_PORT_NUMBER" ]] + then + # Prevent incorrect configuration to be written to sentinel.conf + error "Redis master host is configured incorrectly (host: $REDIS_MASTER_HOST, port: $REDIS_MASTER_PORT_NUMBER)" + exit 1 + fi + + sentinel_conf_set "sentinel monitor" "{{ .Values.sentinel.masterSet }} "$REDIS_MASTER_HOST" "$REDIS_MASTER_PORT_NUMBER" {{ .Values.sentinel.quorum }}" + + add_known_sentinel() { + hostname="$1" + ip="$2" + + if [[ -n "$hostname" && -n "$ip" && "$hostname" != "$HOSTNAME" ]]; then + sentinel_conf_add "sentinel known-sentinel {{ .Values.sentinel.masterSet }} $(get_full_hostname "$hostname") $(get_port "$hostname" "SENTINEL") $(host_id "$hostname")" + fi + } + add_known_replica() { + hostname="$1" + ip="$2" + + if [[ -n "$ip" && "$(get_full_hostname "$hostname")" != "$REDIS_MASTER_HOST" ]]; then + sentinel_conf_add "sentinel known-replica {{ .Values.sentinel.masterSet }} $(get_full_hostname "$hostname") $(get_port "$hostname" "REDIS")" + fi + } + + # Add available hosts on the network as known replicas & sentinels + for node in $(seq 0 $(({{ .Values.replica.replicaCount }}-1))); do + hostname="{{ template "common.names.fullname" . }}-node-$node" + ip="$(getent hosts "$hostname.$HEADLESS_SERVICE" | awk '{ print $1 }')" + add_known_sentinel "$hostname" "$ip" + add_known_replica "$hostname" "$ip" + done + + echo "" >> /opt/bitnami/redis-sentinel/etc/sentinel.conf + {{- if not (contains "sentinel announce-hostnames" .Values.sentinel.configuration) }} + echo "sentinel announce-hostnames yes" >> /opt/bitnami/redis-sentinel/etc/sentinel.conf + {{- end }} + {{- if not (contains "sentinel resolve-hostnames" .Values.sentinel.configuration) }} + echo "sentinel resolve-hostnames yes" >> /opt/bitnami/redis-sentinel/etc/sentinel.conf + {{- end }} + {{- if not (contains "sentinel announce-port" .Values.sentinel.configuration) }} + echo "sentinel announce-port $SERVPORT" >> /opt/bitnami/redis-sentinel/etc/sentinel.conf + {{- end }} + {{- if not (contains "sentinel announce-ip" .Values.sentinel.configuration) }} + echo "sentinel announce-ip $(get_full_hostname "$HOSTNAME")" >> /opt/bitnami/redis-sentinel/etc/sentinel.conf + {{- end }} + + {{- if .Values.tls.enabled }} + ARGS=("--port" "0") + ARGS+=("--tls-port" "${REDIS_SENTINEL_TLS_PORT_NUMBER}") + ARGS+=("--tls-cert-file" "${REDIS_SENTINEL_TLS_CERT_FILE}") + ARGS+=("--tls-key-file" "${REDIS_SENTINEL_TLS_KEY_FILE}") + ARGS+=("--tls-ca-cert-file" "${REDIS_SENTINEL_TLS_CA_FILE}") + ARGS+=("--tls-replication" "yes") + ARGS+=("--tls-auth-clients" "${REDIS_SENTINEL_TLS_AUTH_CLIENTS}") + {{- if .Values.tls.dhParamsFilename }} + ARGS+=("--tls-dh-params-file" "${REDIS_SENTINEL_TLS_DH_PARAMS_FILE}") + {{- end }} + {{- end }} + {{- if .Values.sentinel.preExecCmds }} + {{ .Values.sentinel.preExecCmds | nindent 4 }} + {{- end }} + exec redis-server /opt/bitnami/redis-sentinel/etc/sentinel.conf {{- if .Values.tls.enabled }} "${ARGS[@]}" {{- end }} --sentinel + prestop-sentinel.sh: | + #!/bin/bash + + . /opt/bitnami/scripts/libvalidations.sh + . /opt/bitnami/scripts/libos.sh + + HEADLESS_SERVICE="{{ template "common.names.fullname" . }}-headless.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}" + SENTINEL_SERVICE_ENV_NAME={{ printf "%s%s" (upper (include "common.names.fullname" .)| replace "-" "_") "_SERVICE_PORT_TCP_SENTINEL" }} + SENTINEL_SERVICE_PORT=${!SENTINEL_SERVICE_ENV_NAME} + + get_full_hostname() { + hostname="$1" + + {{- if .Values.useExternalDNS.enabled }} + full_hostname="${hostname}.{{- include "redis.externalDNS.suffix" . }}" + {{- else if eq .Values.sentinel.service.type "NodePort" }} + full_hostname="${hostname}.{{- .Release.Namespace }}" + {{- else }} + full_hostname="${hostname}.${HEADLESS_SERVICE}" + {{- end }} + + {{- if .Values.useHostnames }} + echo "${full_hostname}" + {{- else }} + getent hosts "${full_hostname}" | awk '{ print $1 ; exit }' + {{- end }} + } + + run_sentinel_command() { + if is_boolean_yes "$REDIS_SENTINEL_TLS_ENABLED"; then + redis-cli -h "$REDIS_SERVICE" -p "$SENTINEL_SERVICE_PORT" --tls --cert "$REDIS_SENTINEL_TLS_CERT_FILE" --key "$REDIS_SENTINEL_TLS_KEY_FILE" --cacert "$REDIS_SENTINEL_TLS_CA_FILE" sentinel "$@" + else + redis-cli -h "$REDIS_SERVICE" -p "$SENTINEL_SERVICE_PORT" sentinel "$@" + fi + } + sentinel_failover_finished() { + REDIS_SENTINEL_INFO=($(run_sentinel_command get-master-addr-by-name "{{ .Values.sentinel.masterSet }}")) + REDIS_MASTER_HOST="${REDIS_SENTINEL_INFO[0]}" + [[ "$REDIS_MASTER_HOST" != "$(get_full_hostname $HOSTNAME)" ]] + } + + REDIS_SERVICE="{{ include "common.names.fullname" . }}.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}" + + {{ if .Values.auth.sentinel -}} + # redis-cli automatically consumes credentials from the REDISCLI_AUTH variable + [[ -n "$REDIS_PASSWORD" ]] && export REDISCLI_AUTH="$REDIS_PASSWORD" + [[ -f "$REDIS_PASSWORD_FILE" ]] && export REDISCLI_AUTH="$(< "${REDIS_PASSWORD_FILE}")" + {{- end }} + + if ! sentinel_failover_finished; then + echo "I am the master pod and you are stopping me. Starting sentinel failover" + if retry_while "sentinel_failover_finished" "{{ sub .Values.sentinel.terminationGracePeriodSeconds 10 }}" 1; then + echo "Master has been successfuly failed over to a different pod." + exit 0 + else + echo "Master failover failed" + exit 1 + fi + else + exit 0 + fi + prestop-redis.sh: | + #!/bin/bash + + . /opt/bitnami/scripts/libvalidations.sh + . /opt/bitnami/scripts/libos.sh + + run_redis_command() { + if is_boolean_yes "$REDIS_TLS_ENABLED"; then + redis-cli -h 127.0.0.1 -p "$REDIS_TLS_PORT" --tls --cert "$REDIS_TLS_CERT_FILE" --key "$REDIS_TLS_KEY_FILE" --cacert "$REDIS_TLS_CA_FILE" "$@" + else + redis-cli -h 127.0.0.1 -p "$REDIS_PORT" "$@" + fi + } + is_master() { + REDIS_ROLE=$(run_redis_command role | head -1) + [[ "$REDIS_ROLE" == "master" ]] + } + + HEADLESS_SERVICE="{{ template "common.names.fullname" . }}-headless.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}" + SENTINEL_SERVICE_ENV_NAME={{ printf "%s%s" (upper (include "common.names.fullname" .)| replace "-" "_") "_SERVICE_PORT_TCP_SENTINEL" }} + SENTINEL_SERVICE_PORT=${!SENTINEL_SERVICE_ENV_NAME} + + get_full_hostname() { + hostname="$1" + + {{- if .Values.useExternalDNS.enabled }} + full_hostname="${hostname}.{{- include "redis.externalDNS.suffix" . }}" + {{- else if eq .Values.sentinel.service.type "NodePort" }} + full_hostname="${hostname}.{{- .Release.Namespace }}" + {{- else }} + full_hostname="${hostname}.${HEADLESS_SERVICE}" + {{- end }} + + {{- if .Values.useHostnames }} + echo "${full_hostname}" + {{- else }} + getent hosts "${full_hostname}" | awk '{ print $1 ; exit }' + {{- end }} + } + + run_sentinel_command() { + if is_boolean_yes "$REDIS_SENTINEL_TLS_ENABLED"; then + {{ .Values.auth.sentinel | ternary "" "env -u REDISCLI_AUTH " -}} redis-cli -h "$REDIS_SERVICE" -p "$SENTINEL_SERVICE_PORT" --tls --cert "$REDIS_SENTINEL_TLS_CERT_FILE" --key "$REDIS_SENTINEL_TLS_KEY_FILE" --cacert "$REDIS_SENTINEL_TLS_CA_FILE" sentinel "$@" + else + {{ .Values.auth.sentinel | ternary "" "env -u REDISCLI_AUTH " -}} redis-cli -h "$REDIS_SERVICE" -p "$SENTINEL_SERVICE_PORT" sentinel "$@" + fi + } + sentinel_failover_finished() { + REDIS_SENTINEL_INFO=($(run_sentinel_command get-master-addr-by-name "{{ .Values.sentinel.masterSet }}")) + REDIS_MASTER_HOST="${REDIS_SENTINEL_INFO[0]}" + [[ "$REDIS_MASTER_HOST" != "$(get_full_hostname $HOSTNAME)" ]] + } + + REDIS_SERVICE="{{ include "common.names.fullname" . }}.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}" + + # redis-cli automatically consumes credentials from the REDISCLI_AUTH variable + [[ -n "$REDIS_PASSWORD" ]] && export REDISCLI_AUTH="$REDIS_PASSWORD" + [[ -f "$REDIS_PASSWORD_FILE" ]] && export REDISCLI_AUTH="$(< "${REDIS_PASSWORD_FILE}")" + + + if is_master && ! sentinel_failover_finished; then + echo "I am the master pod and you are stopping me. Pausing client connections." + # Pausing client write connections to avoid data loss + run_redis_command CLIENT PAUSE "{{ mul (add 2 (sub .Values.sentinel.terminationGracePeriodSeconds 10)) 1000 }}" WRITE + + echo "Issuing failover" + # if I am the master, issue a command to failover once + run_sentinel_command failover "{{ .Values.sentinel.masterSet }}" + + {{- if .Values.sentinel.redisShutdownWaitFailover }} + echo "Waiting for sentinel to complete failover for up to {{ sub .Values.sentinel.terminationGracePeriodSeconds 10 }}s" + retry_while "sentinel_failover_finished" "{{ sub .Values.sentinel.terminationGracePeriodSeconds 10 }}" 1 + {{- end }} + else + exit 0 + fi + +{{- else }} + start-master.sh: | + #!/bin/bash + + [[ -f $REDIS_PASSWORD_FILE ]] && export REDIS_PASSWORD="$(< "${REDIS_PASSWORD_FILE}")" + {{- if and .Values.master.containerSecurityContext.runAsUser (eq (.Values.master.containerSecurityContext.runAsUser | int) 0) }} + useradd redis + chown -R redis {{ .Values.master.persistence.path }} + {{- end }} + if [[ -f /opt/bitnami/redis/mounted-etc/master.conf ]];then + cp /opt/bitnami/redis/mounted-etc/master.conf /opt/bitnami/redis/etc/master.conf + fi + if [[ -f /opt/bitnami/redis/mounted-etc/redis.conf ]];then + cp /opt/bitnami/redis/mounted-etc/redis.conf /opt/bitnami/redis/etc/redis.conf + fi + {{- if .Values.tls.enabled }} + ARGS=("--port" "0") + ARGS+=("--tls-port" "${REDIS_TLS_PORT}") + ARGS+=("--tls-cert-file" "${REDIS_TLS_CERT_FILE}") + ARGS+=("--tls-key-file" "${REDIS_TLS_KEY_FILE}") + ARGS+=("--tls-ca-cert-file" "${REDIS_TLS_CA_FILE}") + ARGS+=("--tls-auth-clients" "${REDIS_TLS_AUTH_CLIENTS}") + {{- if .Values.tls.dhParamsFilename }} + ARGS+=("--tls-dh-params-file" "${REDIS_TLS_DH_PARAMS_FILE}") + {{- end }} + {{- else }} + ARGS=("--port" "${REDIS_PORT}") + {{- end }} + {{- if .Values.auth.enabled }} + ARGS+=("--requirepass" "${REDIS_PASSWORD}") + ARGS+=("--masterauth" "${REDIS_PASSWORD}") + {{- else }} + ARGS+=("--protected-mode" "no") + {{- end }} + ARGS+=("--include" "/opt/bitnami/redis/etc/redis.conf") + ARGS+=("--include" "/opt/bitnami/redis/etc/master.conf") + {{- if .Values.master.extraFlags }} + {{- range .Values.master.extraFlags }} + ARGS+=({{ . | quote }}) + {{- end }} + {{- end }} + {{- if .Values.master.preExecCmds }} + {{ .Values.master.preExecCmds | nindent 4 }} + {{- end }} + {{- if .Values.master.command }} + exec {{ .Values.master.command }} "${ARGS[@]}" + {{- else }} + exec redis-server "${ARGS[@]}" + {{- end }} + {{- if eq .Values.architecture "replication" }} + start-replica.sh: | + #!/bin/bash + + get_port() { + hostname="$1" + type="$2" + + port_var=$(echo "${hostname^^}_SERVICE_PORT_$type" | sed "s/-/_/g") + port=${!port_var} + + if [ -z "$port" ]; then + case $type in + "SENTINEL") + echo {{ .Values.sentinel.containerPorts.sentinel }} + ;; + "REDIS") + echo {{ .Values.master.containerPorts.redis }} + ;; + esac + else + echo $port + fi + } + + get_full_hostname() { + hostname="$1" + + {{- if .Values.useExternalDNS.enabled }} + full_hostname="${hostname}.{{- include "redis.externalDNS.suffix" . }}" + {{- else if eq .Values.sentinel.service.type "NodePort" }} + full_hostname="${hostname}.{{- .Release.Namespace }}" + {{- else }} + full_hostname="${hostname}.${HEADLESS_SERVICE}" + {{- end }} + + {{- if .Values.useHostnames }} + echo "${full_hostname}" + {{- else }} + getent hosts "${full_hostname}" | awk '{ print $1 ; exit }' + {{- end }} + } + + REDISPORT=$(get_port "$HOSTNAME" "REDIS") + + [[ -f $REDIS_PASSWORD_FILE ]] && export REDIS_PASSWORD="$(< "${REDIS_PASSWORD_FILE}")" + [[ -f $REDIS_MASTER_PASSWORD_FILE ]] && export REDIS_MASTER_PASSWORD="$(< "${REDIS_MASTER_PASSWORD_FILE}")" + {{- if and .Values.replica.containerSecurityContext.runAsUser (eq (.Values.replica.containerSecurityContext.runAsUser | int) 0) }} + useradd redis + chown -R redis {{ .Values.replica.persistence.path }} + {{- end }} + if [[ -f /opt/bitnami/redis/mounted-etc/replica.conf ]];then + cp /opt/bitnami/redis/mounted-etc/replica.conf /opt/bitnami/redis/etc/replica.conf + fi + if [[ -f /opt/bitnami/redis/mounted-etc/redis.conf ]];then + cp /opt/bitnami/redis/mounted-etc/redis.conf /opt/bitnami/redis/etc/redis.conf + fi + + echo "" >> /opt/bitnami/redis/etc/replica.conf + echo "replica-announce-port $REDISPORT" >> /opt/bitnami/redis/etc/replica.conf + echo "replica-announce-ip $(get_full_hostname "$HOSTNAME")" >> /opt/bitnami/redis/etc/replica.conf + + {{- if .Values.tls.enabled }} + ARGS=("--port" "0") + ARGS+=("--tls-port" "${REDIS_TLS_PORT}") + ARGS+=("--tls-cert-file" "${REDIS_TLS_CERT_FILE}") + ARGS+=("--tls-key-file" "${REDIS_TLS_KEY_FILE}") + ARGS+=("--tls-ca-cert-file" "${REDIS_TLS_CA_FILE}") + ARGS+=("--tls-auth-clients" "${REDIS_TLS_AUTH_CLIENTS}") + ARGS+=("--tls-replication" "yes") + {{- if .Values.tls.dhParamsFilename }} + ARGS+=("--tls-dh-params-file" "${REDIS_TLS_DH_PARAMS_FILE}") + {{- end }} + {{- else }} + ARGS=("--port" "${REDIS_PORT}") + {{- end }} + ARGS+=("--replicaof" "${REDIS_MASTER_HOST}" "${REDIS_MASTER_PORT_NUMBER}") + {{- if .Values.auth.enabled }} + ARGS+=("--requirepass" "${REDIS_PASSWORD}") + ARGS+=("--masterauth" "${REDIS_MASTER_PASSWORD}") + {{- else }} + ARGS+=("--protected-mode" "no") + {{- end }} + ARGS+=("--include" "/opt/bitnami/redis/etc/redis.conf") + ARGS+=("--include" "/opt/bitnami/redis/etc/replica.conf") + {{- if .Values.replica.extraFlags }} + {{- range .Values.replica.extraFlags }} + ARGS+=({{ . | quote }}) + {{- end }} + {{- end }} + {{- if .Values.replica.preExecCmds }} + {{ .Values.replica.preExecCmds | nindent 4 }} + {{- end }} + {{- if .Values.replica.command }} + exec {{ .Values.replica.command }} "${ARGS[@]}" + {{- else }} + exec redis-server "${ARGS[@]}" + {{- end }} + {{- end }} +{{- end }} diff --git a/redis-request-response/templates/secret.yaml b/redis-request-response/templates/secret.yaml new file mode 100644 index 00000000..2edc0d81 --- /dev/null +++ b/redis-request-response/templates/secret.yaml @@ -0,0 +1,23 @@ +{{- if and .Values.auth.enabled (not .Values.auth.existingSecret) -}} +apiVersion: v1 +kind: Secret +metadata: + name: {{ template "common.names.fullname" . }} + namespace: {{ .Release.Namespace | quote }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + {{- if or .Values.secretAnnotations .Values.commonAnnotations }} + annotations: + {{- if .Values.secretAnnotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.secretAnnotations "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.commonAnnotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} + {{- end }} +type: Opaque +data: + redis-password: {{ include "redis.password" . | b64enc | quote }} +{{- end -}} diff --git a/redis-request-response/templates/sentinel/hpa.yaml b/redis-request-response/templates/sentinel/hpa.yaml new file mode 100644 index 00000000..e1b765e6 --- /dev/null +++ b/redis-request-response/templates/sentinel/hpa.yaml @@ -0,0 +1,47 @@ +{{- if and .Values.replica.autoscaling.enabled .Values.sentinel.enabled }} +apiVersion: {{ include "common.capabilities.hpa.apiVersion" ( dict "context" $ ) }} +kind: HorizontalPodAutoscaler +metadata: + name: {{ printf "%s-node" (include "common.names.fullname" .) }} + namespace: {{ .Release.Namespace | quote }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + app.kubernetes.io/component: replica + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" (dict "value" .Values.commonLabels "context" $) | nindent 4 }} + {{- end }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} +spec: + scaleTargetRef: + apiVersion: {{ include "common.capabilities.deployment.apiVersion" . }} + kind: StatefulSet + name: {{ printf "%s-node" (include "common.names.fullname" .) }} + minReplicas: {{ .Values.replica.autoscaling.minReplicas }} + maxReplicas: {{ .Values.replica.autoscaling.maxReplicas }} + metrics: + {{- if .Values.replica.autoscaling.targetMemory }} + - type: Resource + resource: + name: memory + {{- if semverCompare "<1.23-0" (include "common.capabilities.kubeVersion" .) }} + targetAverageUtilization: {{ .Values.replica.autoscaling.targetMemory }} + {{- else }} + target: + type: Utilization + averageUtilization: {{ .Values.replica.autoscaling.targetMemory }} + {{- end }} + {{- end }} + {{- if .Values.replica.autoscaling.targetCPU }} + - type: Resource + resource: + name: cpu + {{- if semverCompare "<1.23-0" (include "common.capabilities.kubeVersion" .) }} + targetAverageUtilization: {{ .Values.replica.autoscaling.targetCPU }} + {{- else }} + target: + type: Utilization + averageUtilization: {{ .Values.replica.autoscaling.targetCPU }} + {{- end }} + {{- end }} +{{- end }} diff --git a/redis-request-response/templates/sentinel/node-services.yaml b/redis-request-response/templates/sentinel/node-services.yaml new file mode 100644 index 00000000..d3e635e9 --- /dev/null +++ b/redis-request-response/templates/sentinel/node-services.yaml @@ -0,0 +1,70 @@ +{{- if and (eq .Values.architecture "replication") .Values.sentinel.enabled (eq .Values.sentinel.service.type "NodePort") (or .Release.IsUpgrade .Values.sentinel.service.nodePorts.redis ) }} + +{{- range $i := until (int .Values.replica.replicaCount) }} + +{{ $portsmap := (lookup "v1" "ConfigMap" $.Release.Namespace (printf "%s-%s" ( include "common.names.fullname" $ ) "ports-configmap")).data }} + +{{ $sentinelport := 0}} +{{ $redisport := 0}} +{{- if $portsmap }} +{{ $sentinelport = index $portsmap (printf "%s-node-%s-%s" (include "common.names.fullname" $) (toString $i) "sentinel") }} +{{ $redisport = index $portsmap (printf "%s-node-%s-%s" (include "common.names.fullname" $) (toString $i) "redis") }} +{{- else }} +{{- end }} +apiVersion: v1 +kind: Service +metadata: + name: {{ template "common.names.fullname" $ }}-node-{{ $i }} + namespace: {{ $.Release.Namespace | quote }} + labels: {{- include "common.labels.standard" $ | nindent 4 }} + app.kubernetes.io/component: node + {{- if $.Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" $.Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + {{- if or $.Values.sentinel.service.annotations $.Values.commonAnnotations }} + annotations: + {{- if $.Values.sentinel.service.annotations }} + {{- include "common.tplvalues.render" ( dict "value" $.Values.sentinel.service.annotations "context" $ ) | nindent 4 }} + {{- end }} + {{- if $.Values.commonAnnotations }} + {{- include "common.tplvalues.render" ( dict "value" $.Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} + {{- end }} +spec: + type: NodePort + ports: + - name: sentinel + {{- if $.Values.sentinel.service.nodePorts.sentinel }} + nodePort: {{ (add $.Values.sentinel.service.nodePorts.sentinel $i 1) }} + port: {{ (add $.Values.sentinel.service.nodePorts.sentinel $i 1) }} + {{- else }} + nodePort: {{ $sentinelport }} + port: {{ $sentinelport }} + {{- end }} + protocol: TCP + targetPort: {{ $.Values.sentinel.containerPorts.sentinel }} + - name: redis + {{- if $.Values.sentinel.service.nodePorts.redis }} + nodePort: {{ (add $.Values.sentinel.service.nodePorts.redis $i 1) }} + port: {{ (add $.Values.sentinel.service.nodePorts.redis $i 1) }} + {{- else }} + nodePort: {{ $redisport }} + port: {{ $redisport }} + {{- end }} + protocol: TCP + targetPort: {{ $.Values.replica.containerPorts.redis }} + - name: sentinel-internal + nodePort: null + port: {{ $.Values.sentinel.containerPorts.sentinel }} + protocol: TCP + targetPort: {{ $.Values.sentinel.containerPorts.sentinel }} + - name: redis-internal + nodePort: null + port: {{ $.Values.replica.containerPorts.redis }} + protocol: TCP + targetPort: {{ $.Values.replica.containerPorts.redis }} + selector: + statefulset.kubernetes.io/pod-name: {{ template "common.names.fullname" $ }}-node-{{ $i }} +--- +{{- end }} +{{- end }} diff --git a/redis-request-response/templates/sentinel/ports-configmap.yaml b/redis-request-response/templates/sentinel/ports-configmap.yaml new file mode 100644 index 00000000..f5e7b2a9 --- /dev/null +++ b/redis-request-response/templates/sentinel/ports-configmap.yaml @@ -0,0 +1,100 @@ +{{- if and (eq .Values.architecture "replication") .Values.sentinel.enabled (eq .Values.sentinel.service.type "NodePort") (not .Values.sentinel.service.nodePorts.redis ) }} +{{- /* create a list to keep track of ports we choose to use */}} +{{ $chosenports := (list ) }} + +{{- /* Get list of all used nodeports */}} +{{ $usedports := (list ) }} +{{- range $index, $service := (lookup "v1" "Service" "" "").items }} + {{- range.spec.ports }} + {{- if .nodePort }} + {{- $usedports = (append $usedports .nodePort) }} + {{- end }} + {{- end }} +{{- end }} + +{{- /* +comments that start with # are rendered in the output when you debug, so you can less and search for them +Vars in the comment will be rendered out, so you can check their value this way. +https://helm.sh/docs/chart_best_practices/templates/#comments-yaml-comments-vs-template-comments + +remove the template comments and leave the yaml comments to help debug +*/}} + +{{- /* Sort the list */}} +{{ $usedports = $usedports | sortAlpha }} +#usedports {{ $usedports }} + +{{- /* How many nodeports per service do we want to create, except for the main service which is always two */}} +{{ $numberofPortsPerNodeService := 2 }} + +{{- /* for every nodeport we want, loop though the used ports to get an unused port */}} +{{- range $j := until (int (add (mul (int .Values.replica.replicaCount) $numberofPortsPerNodeService) 2)) }} + {{- /* #j={{ $j }} */}} + {{- $nodeport := (add $j 30000) }} + {{- $nodeportfound := false }} + {{- range $i := $usedports }} + {{- /* #i={{ $i }} + #nodeport={{ $nodeport }} + #usedports={{ $usedports }} */}} + {{- if and (has (toString $nodeport) $usedports) (eq $nodeportfound false) }} + {{- /* nodeport conflicts with in use */}} + {{- $nodeport = (add $nodeport 1) }} + {{- else if and ( has $nodeport $chosenports) (eq $nodeportfound false) }} + {{- /* nodeport already chosen, try another */}} + {{- $nodeport = (add $nodeport 1) }} + {{- else if (eq $nodeportfound false) }} + {{- /* nodeport free to use: not already claimed and not in use */}} + {{- /* select nodeport, and place into usedports */}} + {{- $chosenports = (append $chosenports $nodeport) }} + {{- $nodeportfound = true }} + {{- else }} + {{- /* nodeport has already been chosen and locked in, just work through the rest of the list to get to the next nodeport selection */}} + {{- end }} + {{- end }} + {{- if (eq $nodeportfound false) }} + {{- $chosenports = (append $chosenports $nodeport) }} + {{- end }} + +{{- end }} + +{{- /* print the usedports and chosenports for debugging */}} +#usedports {{ $usedports }} +#chosenports {{ $chosenports }}}} + +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: {{ template "common.names.fullname" . }}-ports-configmap + namespace: {{ .Release.Namespace | quote }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.commonAnnotations }} + annotations: + {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} +data: +{{ $portsmap := (lookup "v1" "ConfigMap" $.Release.Namespace (printf "%s-%s" ( include "common.names.fullname" . ) "ports-configmap")).data }} +{{- if $portsmap }} +{{- /* configmap already exists, do not install again */ -}} + {{- range $name, $value := $portsmap }} + "{{ $name }}": "{{ $value }}" + {{- end }} +{{- else }} +{{- /* configmap being set for first time */ -}} + {{- range $index, $port := $chosenports }} + {{- $nodenumber := (floor (div $index 2)) }} + {{- if (eq $index 0) }} + "{{ template "common.names.fullname" $ }}-sentinel": "{{ $port }}" + {{- else if (eq $index 1) }} + "{{ template "common.names.fullname" $ }}-redis": "{{ $port }}" + {{- else if (eq (mod $index 2) 0) }} + "{{ template "common.names.fullname" $ }}-node-{{ (sub $nodenumber 1) }}-sentinel": "{{ $port }}" + {{- else if (eq (mod $index 2) 1) }} + "{{ template "common.names.fullname" $ }}-node-{{ (sub $nodenumber 1) }}-redis": "{{ $port }}" + {{- end }} + {{- end }} +{{- end }} +{{- end }} diff --git a/redis-request-response/templates/sentinel/service.yaml b/redis-request-response/templates/sentinel/service.yaml new file mode 100644 index 00000000..362d681d --- /dev/null +++ b/redis-request-response/templates/sentinel/service.yaml @@ -0,0 +1,103 @@ +{{- if or .Release.IsUpgrade (ne .Values.sentinel.service.type "NodePort") .Values.sentinel.service.nodePorts.redis -}} +{{- if and (eq .Values.architecture "replication") .Values.sentinel.enabled }} +{{ $portsmap := (lookup "v1" "ConfigMap" $.Release.Namespace (printf "%s-%s" ( include "common.names.fullname" . ) "ports-configmap")).data }} + +{{ $sentinelport := 0}} +{{ $redisport := 0}} +{{- if $portsmap }} +{{ $sentinelport = index $portsmap (printf "%s-%s" (include "common.names.fullname" $) "sentinel") }} +{{ $redisport = index $portsmap (printf "%s-%s" (include "common.names.fullname" $) "redis") }} +{{- else }} +{{- end }} + +apiVersion: v1 +kind: Service +metadata: + name: {{ template "common.names.fullname" . }} + namespace: {{ .Release.Namespace | quote }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + app.kubernetes.io/component: node + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + {{- if or .Values.sentinel.service.annotations .Values.commonAnnotations }} + annotations: + {{- if .Values.sentinel.service.annotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.sentinel.service.annotations "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.commonAnnotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} + {{- end }} +spec: + type: {{ .Values.sentinel.service.type }} + {{- if or (eq .Values.sentinel.service.type "LoadBalancer") (eq .Values.sentinel.service.type "NodePort") }} + externalTrafficPolicy: {{ .Values.sentinel.service.externalTrafficPolicy | quote }} + {{- end }} + {{- if and (eq .Values.sentinel.service.type "LoadBalancer") (not (empty .Values.sentinel.service.loadBalancerIP)) }} + loadBalancerIP: {{ .Values.sentinel.service.loadBalancerIP }} + {{- end }} + {{- if and (eq .Values.sentinel.service.type "LoadBalancer") (not (empty .Values.sentinel.service.loadBalancerSourceRanges)) }} + loadBalancerSourceRanges: {{ .Values.sentinel.service.loadBalancerSourceRanges }} + {{- end }} + {{- if and .Values.sentinel.service.clusterIP (eq .Values.sentinel.service.type "ClusterIP") }} + clusterIP: {{ .Values.sentinel.service.clusterIP }} + {{- end }} + {{- if .Values.sentinel.service.sessionAffinity }} + sessionAffinity: {{ .Values.sentinel.service.sessionAffinity }} + {{- end }} + {{- if .Values.sentinel.service.sessionAffinityConfig }} + sessionAffinityConfig: {{- include "common.tplvalues.render" (dict "value" .Values.sentinel.service.sessionAffinityConfig "context" $) | nindent 4 }} + {{- end }} + ports: + - name: tcp-redis + {{- if and (or (eq .Values.sentinel.service.type "NodePort") (eq .Values.sentinel.service.type "LoadBalancer")) .Values.sentinel.service.nodePorts.redis }} + port: {{ .Values.sentinel.service.nodePorts.redis }} + {{- else if eq .Values.sentinel.service.type "NodePort" }} + port: {{ $redisport }} + {{- else}} + port: {{ .Values.sentinel.service.ports.redis }} + {{- end }} + targetPort: {{ .Values.replica.containerPorts.redis }} + {{- if and (or (eq .Values.sentinel.service.type "NodePort") (eq .Values.sentinel.service.type "LoadBalancer")) .Values.sentinel.service.nodePorts.redis }} + nodePort: {{ .Values.sentinel.service.nodePorts.redis }} + {{- else if eq .Values.sentinel.service.type "ClusterIP" }} + nodePort: null + {{- else if eq .Values.sentinel.service.type "NodePort" }} + nodePort: {{ $redisport }} + {{- end }} + - name: tcp-sentinel + {{- if and (or (eq .Values.sentinel.service.type "NodePort") (eq .Values.sentinel.service.type "LoadBalancer")) .Values.sentinel.service.nodePorts.sentinel }} + port: {{ .Values.sentinel.service.nodePorts.sentinel }} + {{- else if eq .Values.sentinel.service.type "NodePort" }} + port: {{ $sentinelport }} + {{- else }} + port: {{ .Values.sentinel.service.ports.sentinel }} + {{- end }} + targetPort: {{ .Values.sentinel.containerPorts.sentinel }} + {{- if and (or (eq .Values.sentinel.service.type "NodePort") (eq .Values.sentinel.service.type "LoadBalancer")) .Values.sentinel.service.nodePorts.sentinel }} + nodePort: {{ .Values.sentinel.service.nodePorts.sentinel }} + {{- else if eq .Values.sentinel.service.type "ClusterIP" }} + nodePort: null + {{- else if eq .Values.sentinel.service.type "NodePort" }} + nodePort: {{ $sentinelport }} + {{- end }} + {{- if eq .Values.sentinel.service.type "NodePort" }} + - name: sentinel-internal + nodePort: null + port: {{ .Values.sentinel.containerPorts.sentinel }} + protocol: TCP + targetPort: {{ .Values.sentinel.containerPorts.sentinel }} + - name: redis-internal + nodePort: null + port: {{ .Values.replica.containerPorts.redis }} + protocol: TCP + targetPort: {{ .Values.replica.containerPorts.redis }} + {{- end }} + {{- if .Values.sentinel.service.extraPorts }} + {{- include "common.tplvalues.render" (dict "value" .Values.sentinel.service.extraPorts "context" $) | nindent 4 }} + {{- end }} + selector: {{- include "common.labels.matchLabels" . | nindent 4 }} + app.kubernetes.io/component: node +{{- end }} +{{- end }} diff --git a/redis-request-response/templates/sentinel/statefulset.yaml b/redis-request-response/templates/sentinel/statefulset.yaml new file mode 100644 index 00000000..205d5592 --- /dev/null +++ b/redis-request-response/templates/sentinel/statefulset.yaml @@ -0,0 +1,774 @@ +{{- if or .Release.IsUpgrade (ne .Values.sentinel.service.type "NodePort") .Values.sentinel.service.nodePorts.redis -}} +{{- if and (eq .Values.architecture "replication") .Values.sentinel.enabled }} +apiVersion: {{ include "common.capabilities.statefulset.apiVersion" . }} +kind: StatefulSet +metadata: + name: {{ printf "%s-node" (include "common.names.fullname" .) }} + namespace: {{ .Release.Namespace | quote }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + app.kubernetes.io/component: node + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + {{- if or .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} +spec: + replicas: {{ .Values.replica.replicaCount }} + selector: + matchLabels: {{- include "common.labels.matchLabels" . | nindent 6 }} + app.kubernetes.io/component: node + serviceName: {{ printf "%s-headless" (include "common.names.fullname" .) }} + {{- if .Values.replica.updateStrategy }} + updateStrategy: {{- toYaml .Values.replica.updateStrategy | nindent 4 }} + {{- end }} + {{- if and .Values.replica.minReadySeconds (semverCompare ">= 1.25" (include "common.capabilities.kubeVersion" .)) }} + minReadySeconds: {{ .Values.replica.minReadySeconds }} + {{- end }} + {{- if .Values.replica.podManagementPolicy }} + podManagementPolicy: {{ .Values.replica.podManagementPolicy | quote }} + {{- end }} + template: + metadata: + labels: {{- include "common.labels.standard" . | nindent 8 }} + app.kubernetes.io/component: node + {{- if .Values.replica.podLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.replica.podLabels "context" $ ) | nindent 8 }} + {{- end }} + {{- if and .Values.metrics.enabled .Values.metrics.podLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.metrics.podLabels "context" $ ) | nindent 8 }} + {{- end }} + annotations: + {{- if (include "redis.createConfigmap" .) }} + checksum/configmap: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }} + {{- end }} + checksum/health: {{ include (print $.Template.BasePath "/health-configmap.yaml") . | sha256sum }} + checksum/scripts: {{ include (print $.Template.BasePath "/scripts-configmap.yaml") . | sha256sum }} + checksum/secret: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }} + {{- if .Values.replica.podAnnotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.replica.podAnnotations "context" $ ) | nindent 8 }} + {{- end }} + {{- if and .Values.metrics.enabled .Values.metrics.podAnnotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.metrics.podAnnotations "context" $ ) | nindent 8 }} + {{- end }} + spec: + {{- include "redis.imagePullSecrets" . | nindent 6 }} + {{- if .Values.replica.hostAliases }} + hostAliases: {{- include "common.tplvalues.render" (dict "value" .Values.replica.hostAliases "context" $) | nindent 8 }} + {{- end }} + {{- if .Values.replica.podSecurityContext.enabled }} + securityContext: {{- omit .Values.replica.podSecurityContext "enabled" | toYaml | nindent 8 }} + {{- end }} + serviceAccountName: {{ template "redis.serviceAccountName" . }} + {{- if .Values.replica.priorityClassName }} + priorityClassName: {{ .Values.replica.priorityClassName | quote }} + {{- end }} + {{- if .Values.replica.affinity }} + affinity: {{- include "common.tplvalues.render" (dict "value" .Values.replica.affinity "context" $) | nindent 8 }} + {{- else }} + affinity: + podAffinity: {{- include "common.affinities.pods" (dict "type" .Values.replica.podAffinityPreset "component" "node" "context" $) | nindent 10 }} + podAntiAffinity: {{- include "common.affinities.pods" (dict "type" .Values.replica.podAntiAffinityPreset "component" "node" "context" $) | nindent 10 }} + nodeAffinity: {{- include "common.affinities.nodes" (dict "type" .Values.replica.nodeAffinityPreset.type "key" .Values.replica.nodeAffinityPreset.key "values" .Values.replica.nodeAffinityPreset.values) | nindent 10 }} + {{- end }} + {{- if .Values.replica.nodeSelector }} + nodeSelector: {{- include "common.tplvalues.render" (dict "value" .Values.replica.nodeSelector "context" $) | nindent 8 }} + {{- end }} + {{- if .Values.replica.tolerations }} + tolerations: {{- include "common.tplvalues.render" (dict "value" .Values.replica.tolerations "context" $) | nindent 8 }} + {{- end }} + {{- if .Values.replica.topologySpreadConstraints }} + topologySpreadConstraints: {{- include "common.tplvalues.render" (dict "value" .Values.replica.topologySpreadConstraints "context" $) | nindent 8 }} + {{- end }} + {{- if .Values.replica.shareProcessNamespace }} + shareProcessNamespace: {{ .Values.replica.shareProcessNamespace }} + {{- end }} + {{- if .Values.replica.schedulerName }} + schedulerName: {{ .Values.replica.schedulerName | quote }} + {{- end }} + {{- if .Values.replica.dnsPolicy }} + dnsPolicy: {{ .Values.replica.dnsPolicy }} + {{- end }} + {{- if .Values.replica.dnsConfig }} + dnsConfig: {{- include "common.tplvalues.render" (dict "value" .Values.replica.dnsConfig "context" $) | nindent 8 }} + {{- end }} + terminationGracePeriodSeconds: {{ .Values.sentinel.terminationGracePeriodSeconds }} + containers: + - name: redis + image: {{ template "redis.image" . }} + imagePullPolicy: {{ .Values.image.pullPolicy | quote }} + {{- if not .Values.diagnosticMode.enabled }} + {{- if .Values.replica.lifecycleHooks }} + lifecycle: {{- include "common.tplvalues.render" (dict "value" .Values.replica.lifecycleHooks "context" $) | nindent 12 }} + {{- else }} + lifecycle: + preStop: + exec: + command: + - /bin/bash + - -c + - /opt/bitnami/scripts/start-scripts/prestop-redis.sh + {{- end }} + {{- end }} + {{- if .Values.replica.containerSecurityContext.enabled }} + securityContext: {{- omit .Values.replica.containerSecurityContext "enabled" | toYaml | nindent 12 }} + {{- end }} + {{- if .Values.diagnosticMode.enabled }} + command: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.command "context" $) | nindent 12 }} + {{- else if .Values.replica.command }} + command: {{- include "common.tplvalues.render" (dict "value" .Values.replica.command "context" $) | nindent 12 }} + {{- else }} + command: + - /bin/bash + {{- end }} + {{- if .Values.diagnosticMode.enabled }} + args: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.args "context" $) | nindent 12 }} + {{- else if .Values.replica.args }} + args: {{- include "common.tplvalues.render" (dict "value" .Values.replica.args "context" $) | nindent 12 }} + {{- else }} + args: + - -c + - /opt/bitnami/scripts/start-scripts/start-node.sh + {{- end }} + env: + - name: BITNAMI_DEBUG + value: {{ ternary "true" "false" (or .Values.image.debug .Values.diagnosticMode.enabled) | quote }} + - name: REDIS_MASTER_PORT_NUMBER + value: {{ .Values.replica.containerPorts.redis | quote }} + - name: ALLOW_EMPTY_PASSWORD + value: {{ ternary "no" "yes" .Values.auth.enabled | quote }} + {{- if .Values.auth.enabled }} + {{- if .Values.auth.usePasswordFiles }} + - name: REDIS_PASSWORD_FILE + value: "/opt/bitnami/redis/secrets/redis-password" + - name: REDIS_MASTER_PASSWORD_FILE + value: "/opt/bitnami/redis/secrets/redis-password" + {{- else }} + - name: REDIS_PASSWORD + valueFrom: + secretKeyRef: + name: {{ template "redis.secretName" . }} + key: {{ template "redis.secretPasswordKey" . }} + - name: REDIS_MASTER_PASSWORD + valueFrom: + secretKeyRef: + name: {{ template "redis.secretName" . }} + key: {{ template "redis.secretPasswordKey" . }} + {{- end }} + {{- end }} + - name: REDIS_TLS_ENABLED + value: {{ ternary "yes" "no" .Values.tls.enabled | quote }} + {{- if .Values.tls.enabled }} + - name: REDIS_TLS_PORT + value: {{ .Values.replica.containerPorts.redis | quote }} + - name: REDIS_TLS_AUTH_CLIENTS + value: {{ ternary "yes" "no" .Values.tls.authClients | quote }} + - name: REDIS_TLS_CERT_FILE + value: {{ template "redis.tlsCert" . }} + - name: REDIS_TLS_KEY_FILE + value: {{ template "redis.tlsCertKey" . }} + - name: REDIS_TLS_CA_FILE + value: {{ template "redis.tlsCACert" . }} + {{- if .Values.tls.dhParamsFilename }} + - name: REDIS_TLS_DH_PARAMS_FILE + value: {{ template "redis.tlsDHParams" . }} + {{- end }} + {{- else }} + - name: REDIS_PORT + value: {{ .Values.replica.containerPorts.redis | quote }} + {{- end }} + - name: REDIS_SENTINEL_TLS_ENABLED + value: {{ ternary "yes" "no" .Values.tls.enabled | quote }} + {{- if .Values.tls.enabled }} + - name: REDIS_SENTINEL_TLS_PORT_NUMBER + value: {{ .Values.sentinel.containerPorts.sentinel | quote }} + - name: REDIS_SENTINEL_TLS_AUTH_CLIENTS + value: {{ ternary "yes" "no" .Values.tls.authClients | quote }} + - name: REDIS_SENTINEL_TLS_CERT_FILE + value: {{ template "redis.tlsCert" . }} + - name: REDIS_SENTINEL_TLS_KEY_FILE + value: {{ template "redis.tlsCertKey" . }} + - name: REDIS_SENTINEL_TLS_CA_FILE + value: {{ template "redis.tlsCACert" . }} + {{- if .Values.tls.dhParamsFilename }} + - name: REDIS_SENTINEL_TLS_DH_PARAMS_FILE + value: {{ template "redis.tlsDHParams" . }} + {{- end }} + {{- else }} + - name: REDIS_SENTINEL_PORT + value: {{ .Values.sentinel.containerPorts.sentinel | quote }} + {{- end }} + - name: REDIS_DATA_DIR + value: {{ .Values.replica.persistence.path }} + {{- if .Values.replica.externalMaster.enabled }} + - name: REDIS_EXTERNAL_MASTER_HOST + value: {{ .Values.replica.externalMaster.host | quote }} + - name: REDIS_EXTERNAL_MASTER_PORT + value: {{ .Values.replica.externalMaster.port | quote }} + {{- end }} + {{- if .Values.replica.extraEnvVars }} + {{- include "common.tplvalues.render" ( dict "value" .Values.replica.extraEnvVars "context" $ ) | nindent 12 }} + {{- end }} + {{- if or .Values.replica.extraEnvVarsCM .Values.replica.extraEnvVarsSecret }} + envFrom: + {{- if .Values.replica.extraEnvVarsCM }} + - configMapRef: + name: {{ .Values.replica.extraEnvVarsCM }} + {{- end }} + {{- if .Values.replica.extraEnvVarsSecret }} + - secretRef: + name: {{ .Values.replica.extraEnvVarsSecret }} + {{- end }} + {{- end }} + ports: + - name: redis + containerPort: {{ .Values.replica.containerPorts.redis }} + {{- if not .Values.diagnosticMode.enabled }} + {{- if .Values.replica.customStartupProbe }} + startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.replica.customStartupProbe "context" $) | nindent 12 }} + {{- else if .Values.replica.startupProbe.enabled }} + startupProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.replica.startupProbe "enabled") "context" $) | nindent 12 }} + exec: + command: + - sh + - -c + - /health/ping_liveness_local.sh {{ .Values.replica.livenessProbe.timeoutSeconds }} + {{- end }} + {{- if .Values.replica.customLivenessProbe }} + livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.replica.customLivenessProbe "context" $) | nindent 12 }} + {{- else if .Values.replica.livenessProbe.enabled }} + livenessProbe: + initialDelaySeconds: {{ .Values.replica.livenessProbe.initialDelaySeconds }} + periodSeconds: {{ .Values.replica.livenessProbe.periodSeconds }} + timeoutSeconds: {{ .Values.replica.livenessProbe.timeoutSeconds }} + successThreshold: {{ .Values.replica.livenessProbe.successThreshold }} + failureThreshold: {{ .Values.replica.livenessProbe.failureThreshold }} + exec: + command: + - sh + - -c + - /health/ping_liveness_local.sh {{ .Values.replica.livenessProbe.timeoutSeconds }} + {{- end }} + {{- if .Values.replica.customReadinessProbe }} + readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.replica.customReadinessProbe "context" $) | nindent 12 }} + {{- else if .Values.replica.readinessProbe.enabled }} + readinessProbe: + initialDelaySeconds: {{ .Values.replica.readinessProbe.initialDelaySeconds }} + periodSeconds: {{ .Values.replica.readinessProbe.periodSeconds }} + timeoutSeconds: {{ .Values.replica.readinessProbe.timeoutSeconds }} + successThreshold: {{ .Values.replica.readinessProbe.successThreshold }} + failureThreshold: {{ .Values.replica.readinessProbe.failureThreshold }} + exec: + command: + - sh + - -c + - /health/ping_readiness_local.sh {{ .Values.replica.readinessProbe.timeoutSeconds }} + {{- end }} + {{- end }} + {{- if .Values.replica.resources }} + resources: {{- toYaml .Values.replica.resources | nindent 12 }} + {{- end }} + volumeMounts: + - name: start-scripts + mountPath: /opt/bitnami/scripts/start-scripts + - name: health + mountPath: /health + {{- if .Values.sentinel.persistence.enabled }} + - name: sentinel-data + mountPath: /opt/bitnami/redis-sentinel/etc + {{- end }} + {{- if .Values.auth.usePasswordFiles }} + - name: redis-password + mountPath: /opt/bitnami/redis/secrets/ + {{- end }} + - name: redis-data + mountPath: {{ .Values.replica.persistence.path }} + {{- if .Values.replica.persistence.subPath }} + subPath: {{ .Values.replica.persistence.subPath }} + {{- else if .Values.replica.persistence.subPathExpr }} + subPathExpr: {{ .Values.replica.persistence.subPathExpr }} + {{- end }} + - name: config + mountPath: /opt/bitnami/redis/mounted-etc + - name: redis-tmp-conf + mountPath: /opt/bitnami/redis/etc + - name: tmp + mountPath: /tmp + {{- if .Values.tls.enabled }} + - name: redis-certificates + mountPath: /opt/bitnami/redis/certs + readOnly: true + {{- end }} + {{- if .Values.replica.extraVolumeMounts }} + {{- include "common.tplvalues.render" ( dict "value" .Values.replica.extraVolumeMounts "context" $ ) | nindent 12 }} + {{- end }} + - name: sentinel + image: {{ template "redis.sentinel.image" . }} + imagePullPolicy: {{ .Values.sentinel.image.pullPolicy | quote }} + {{- if not .Values.diagnosticMode.enabled }} + {{- if .Values.sentinel.lifecycleHooks }} + lifecycle: {{- include "common.tplvalues.render" (dict "value" .Values.sentinel.lifecycleHooks "context" $) | nindent 12 }} + {{- else }} + lifecycle: + preStop: + exec: + command: + - /bin/bash + - -c + - /opt/bitnami/scripts/start-scripts/prestop-sentinel.sh + {{- end }} + {{- end }} + {{- if .Values.sentinel.containerSecurityContext.enabled }} + securityContext: {{- omit .Values.sentinel.containerSecurityContext "enabled" | toYaml | nindent 12 }} + {{- end }} + {{- if .Values.diagnosticMode.enabled }} + command: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.command "context" $) | nindent 12 }} + {{- else if .Values.sentinel.command }} + command: {{- include "common.tplvalues.render" (dict "value" .Values.sentinel.command "context" $) | nindent 12 }} + {{- else }} + command: + - /bin/bash + {{- end }} + {{- if .Values.diagnosticMode.enabled }} + args: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.args "context" $) | nindent 12 }} + {{- else if .Values.sentinel.args }} + args: {{- include "common.tplvalues.render" (dict "value" .Values.sentinel.args "context" $) | nindent 12 }} + {{- else }} + args: + - -c + - /opt/bitnami/scripts/start-scripts/start-sentinel.sh + {{- end }} + env: + - name: BITNAMI_DEBUG + value: {{ ternary "true" "false" (or .Values.sentinel.image.debug .Values.diagnosticMode.enabled) | quote }} + {{- if .Values.auth.enabled }} + {{- if .Values.auth.usePasswordFiles }} + - name: REDIS_PASSWORD_FILE + value: "/opt/bitnami/redis/secrets/redis-password" + {{- else }} + - name: REDIS_PASSWORD + valueFrom: + secretKeyRef: + name: {{ template "redis.secretName" . }} + key: {{ template "redis.secretPasswordKey" . }} + {{- end }} + {{- else }} + - name: ALLOW_EMPTY_PASSWORD + value: "yes" + {{- end }} + - name: REDIS_SENTINEL_TLS_ENABLED + value: {{ ternary "yes" "no" .Values.tls.enabled | quote }} + {{- if .Values.tls.enabled }} + - name: REDIS_SENTINEL_TLS_PORT_NUMBER + value: {{ .Values.sentinel.containerPorts.sentinel | quote }} + - name: REDIS_SENTINEL_TLS_AUTH_CLIENTS + value: {{ ternary "yes" "no" .Values.tls.authClients | quote }} + - name: REDIS_SENTINEL_TLS_CERT_FILE + value: {{ template "redis.tlsCert" . }} + - name: REDIS_SENTINEL_TLS_KEY_FILE + value: {{ template "redis.tlsCertKey" . }} + - name: REDIS_SENTINEL_TLS_CA_FILE + value: {{ template "redis.tlsCACert" . }} + {{- if .Values.tls.dhParamsFilename }} + - name: REDIS_SENTINEL_TLS_DH_PARAMS_FILE + value: {{ template "redis.tlsDHParams" . }} + {{- end }} + {{- else }} + - name: REDIS_SENTINEL_PORT + value: {{ .Values.sentinel.containerPorts.sentinel | quote }} + {{- end }} + {{- if .Values.sentinel.externalMaster.enabled }} + - name: REDIS_EXTERNAL_MASTER_HOST + value: {{ .Values.sentinel.externalMaster.host | quote }} + - name: REDIS_EXTERNAL_MASTER_PORT + value: {{ .Values.sentinel.externalMaster.port | quote }} + {{- end }} + {{- if .Values.sentinel.extraEnvVars }} + {{- include "common.tplvalues.render" ( dict "value" .Values.sentinel.extraEnvVars "context" $ ) | nindent 12 }} + {{- end }} + {{- if or .Values.sentinel.extraEnvVarsCM .Values.sentinel.extraEnvVarsSecret }} + envFrom: + {{- if .Values.sentinel.extraEnvVarsCM }} + - configMapRef: + name: {{ .Values.sentinel.extraEnvVarsCM }} + {{- end }} + {{- if .Values.sentinel.extraEnvVarsSecret }} + - secretRef: + name: {{ .Values.sentinel.extraEnvVarsSecret }} + {{- end }} + {{- end }} + ports: + - name: redis-sentinel + containerPort: {{ .Values.sentinel.containerPorts.sentinel }} + {{- if not .Values.diagnosticMode.enabled }} + {{- if .Values.sentinel.customStartupProbe }} + startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.sentinel.customStartupProbe "context" $) | nindent 12 }} + {{- else if .Values.sentinel.startupProbe.enabled }} + startupProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.sentinel.startupProbe "enabled") "context" $) | nindent 12 }} + exec: + command: + - sh + - -c + - /health/ping_sentinel.sh {{ .Values.sentinel.livenessProbe.timeoutSeconds }} + {{- end }} + {{- if .Values.sentinel.customLivenessProbe }} + livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.sentinel.customLivenessProbe "context" $) | nindent 12 }} + {{- else if .Values.sentinel.livenessProbe.enabled }} + livenessProbe: + initialDelaySeconds: {{ .Values.sentinel.livenessProbe.initialDelaySeconds }} + periodSeconds: {{ .Values.sentinel.livenessProbe.periodSeconds }} + timeoutSeconds: {{ .Values.sentinel.livenessProbe.timeoutSeconds }} + successThreshold: {{ .Values.sentinel.livenessProbe.successThreshold }} + failureThreshold: {{ .Values.sentinel.livenessProbe.failureThreshold }} + exec: + command: + - sh + - -c + - /health/ping_sentinel.sh {{ .Values.sentinel.livenessProbe.timeoutSeconds }} + {{- end }} + {{- end }} + {{- if not .Values.diagnosticMode.enabled }} + {{- if .Values.sentinel.customReadinessProbe }} + readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.sentinel.customReadinessProbe "context" $) | nindent 12 }} + {{- else if .Values.sentinel.readinessProbe.enabled }} + readinessProbe: + initialDelaySeconds: {{ .Values.sentinel.readinessProbe.initialDelaySeconds }} + periodSeconds: {{ .Values.sentinel.readinessProbe.periodSeconds }} + timeoutSeconds: {{ .Values.sentinel.readinessProbe.timeoutSeconds }} + successThreshold: {{ .Values.sentinel.readinessProbe.successThreshold }} + failureThreshold: {{ .Values.sentinel.readinessProbe.failureThreshold }} + exec: + command: + - sh + - -c + - /health/ping_sentinel.sh {{ .Values.sentinel.readinessProbe.timeoutSeconds }} + {{- end }} + {{- end }} + {{- if .Values.sentinel.resources }} + resources: {{- toYaml .Values.sentinel.resources | nindent 12 }} + {{- end }} + volumeMounts: + - name: start-scripts + mountPath: /opt/bitnami/scripts/start-scripts + - name: health + mountPath: /health + - name: sentinel-data + mountPath: /opt/bitnami/redis-sentinel/etc + {{- if .Values.auth.usePasswordFiles }} + - name: redis-password + mountPath: /opt/bitnami/redis/secrets/ + {{- end }} + - name: redis-data + mountPath: {{ .Values.replica.persistence.path }} + {{- if .Values.replica.persistence.subPath }} + subPath: {{ .Values.replica.persistence.subPath }} + {{- else if .Values.replica.persistence.subPathExpr }} + subPathExpr: {{ .Values.replica.persistence.subPathExpr }} + {{- end }} + - name: config + mountPath: /opt/bitnami/redis-sentinel/mounted-etc + {{- if .Values.tls.enabled }} + - name: redis-certificates + mountPath: /opt/bitnami/redis/certs + readOnly: true + {{- end }} + {{- if .Values.sentinel.extraVolumeMounts }} + {{- include "common.tplvalues.render" ( dict "value" .Values.sentinel.extraVolumeMounts "context" $ ) | nindent 12 }} + {{- end }} + {{- if .Values.metrics.enabled }} + - name: metrics + image: {{ template "redis.metrics.image" . }} + imagePullPolicy: {{ .Values.metrics.image.pullPolicy | quote }} + {{- if .Values.metrics.containerSecurityContext.enabled }} + securityContext: {{- omit .Values.metrics.containerSecurityContext "enabled" | toYaml | nindent 12 }} + {{- end }} + {{- if .Values.diagnosticMode.enabled }} + command: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.command "context" $) | nindent 12 }} + {{- else }} + command: + - /bin/bash + - -c + - | + if [[ -f '/secrets/redis-password' ]]; then + export REDIS_PASSWORD=$(cat /secrets/redis-password) + fi + redis_exporter{{- range $key, $value := .Values.metrics.extraArgs }} --{{ $key }}={{ $value }}{{- end }} + {{- end }} + {{- if .Values.diagnosticMode.enabled }} + args: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.args "context" $) | nindent 12 }} + {{- end }} + env: + - name: REDIS_ALIAS + value: {{ template "common.names.fullname" . }} + {{- if .Values.auth.enabled }} + - name: REDIS_USER + value: default + {{- if (not .Values.auth.usePasswordFiles) }} + - name: REDIS_PASSWORD + valueFrom: + secretKeyRef: + name: {{ template "redis.secretName" . }} + key: {{ template "redis.secretPasswordKey" . }} + {{- end }} + {{- end }} + {{- if .Values.tls.enabled }} + - name: REDIS_ADDR + value: rediss://{{ .Values.metrics.redisTargetHost }}:{{ .Values.replica.containerPorts.redis }} + {{- if .Values.tls.authClients }} + - name: REDIS_EXPORTER_TLS_CLIENT_KEY_FILE + value: {{ template "redis.tlsCertKey" . }} + - name: REDIS_EXPORTER_TLS_CLIENT_CERT_FILE + value: {{ template "redis.tlsCert" . }} + {{- end }} + - name: REDIS_EXPORTER_TLS_CA_CERT_FILE + value: {{ template "redis.tlsCACert" . }} + {{- end }} + {{- if .Values.metrics.extraEnvVars }} + {{- include "common.tplvalues.render" (dict "value" .Values.metrics.extraEnvVars "context" $) | nindent 12 }} + {{- end }} + ports: + - name: metrics + containerPort: 9121 + {{- if not .Values.diagnosticMode.enabled }} + {{- if .Values.metrics.customStartupProbe }} + startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.metrics.customStartupProbe "context" $) | nindent 12 }} + {{- else if .Values.metrics.startupProbe.enabled }} + startupProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.metrics.startupProbe "enabled") "context" $) | nindent 12 }} + tcpSocket: + port: metrics + {{- end }} + {{- if .Values.metrics.customLivenessProbe }} + livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.metrics.customLivenessProbe "context" $) | nindent 12 }} + {{- else if .Values.metrics.livenessProbe.enabled }} + livenessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.metrics.livenessProbe "enabled") "context" $) | nindent 12 }} + tcpSocket: + port: metrics + {{- end }} + {{- if .Values.metrics.customReadinessProbe }} + readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.metrics.customReadinessProbe "context" $) | nindent 12 }} + {{- else if .Values.metrics.readinessProbe.enabled }} + readinessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.metrics.readinessProbe "enabled") "context" $) | nindent 12 }} + httpGet: + path: / + port: metrics + {{- end }} + {{- end }} + {{- if .Values.metrics.resources }} + resources: {{- toYaml .Values.metrics.resources | nindent 12 }} + {{- end }} + volumeMounts: + {{- if .Values.auth.usePasswordFiles }} + - name: redis-password + mountPath: /secrets/ + {{- end }} + {{- if .Values.tls.enabled }} + - name: redis-certificates + mountPath: /opt/bitnami/redis/certs + readOnly: true + {{- end }} + {{- if .Values.metrics.extraVolumeMounts }} + {{- include "common.tplvalues.render" ( dict "value" .Values.metrics.extraVolumeMounts "context" $ ) | nindent 12 }} + {{- end }} + {{- end }} + {{- if .Values.replica.sidecars }} + {{- include "common.tplvalues.render" (dict "value" .Values.replica.sidecars "context" $) | nindent 8 }} + {{- end }} + {{- $needsVolumePermissions := and .Values.volumePermissions.enabled .Values.replica.persistence.enabled .Values.replica.podSecurityContext.enabled .Values.replica.containerSecurityContext.enabled }} + {{- if or .Values.replica.initContainers $needsVolumePermissions .Values.sysctl.enabled }} + initContainers: + {{- if .Values.replica.initContainers }} + {{- include "common.tplvalues.render" (dict "value" .Values.replica.initContainers "context" $) | nindent 8 }} + {{- end }} + {{- if $needsVolumePermissions }} + - name: volume-permissions + image: {{ include "redis.volumePermissions.image" . }} + imagePullPolicy: {{ .Values.volumePermissions.image.pullPolicy | quote }} + command: + - /bin/bash + - -ec + - | + {{- if eq ( toString ( .Values.volumePermissions.containerSecurityContext.runAsUser )) "auto" }} + chown -R `id -u`:`id -G | cut -d " " -f2` {{ .Values.replica.persistence.path }} + {{- else }} + chown -R {{ .Values.replica.containerSecurityContext.runAsUser }}:{{ .Values.replica.podSecurityContext.fsGroup }} {{ .Values.replica.persistence.path }} + {{- end }} + {{- if eq ( toString ( .Values.volumePermissions.containerSecurityContext.runAsUser )) "auto" }} + securityContext: {{- omit .Values.volumePermissions.containerSecurityContext "runAsUser" | toYaml | nindent 12 }} + {{- else }} + securityContext: {{- .Values.volumePermissions.containerSecurityContext | toYaml | nindent 12 }} + {{- end }} + {{- if .Values.volumePermissions.resources }} + resources: {{- toYaml .Values.volumePermissions.resources | nindent 12 }} + {{- end }} + volumeMounts: + - name: redis-data + mountPath: {{ .Values.replica.persistence.path }} + {{- if .Values.replica.persistence.subPath }} + subPath: {{ .Values.replica.persistence.subPath }} + {{- else if .Values.replica.persistence.subPathExpr }} + subPathExpr: {{ .Values.replica.persistence.subPathExpr }} + {{- end }} + {{- end }} + {{- if .Values.sysctl.enabled }} + - name: init-sysctl + image: {{ include "redis.sysctl.image" . }} + imagePullPolicy: {{ default "" .Values.sysctl.image.pullPolicy | quote }} + securityContext: + privileged: true + runAsUser: 0 + {{- if .Values.sysctl.command }} + command: {{- include "common.tplvalues.render" (dict "value" .Values.sysctl.command "context" $) | nindent 12 }} + {{- end }} + {{- if .Values.sysctl.resources }} + resources: {{- toYaml .Values.sysctl.resources | nindent 12 }} + {{- end }} + {{- if .Values.sysctl.mountHostSys }} + volumeMounts: + - name: host-sys + mountPath: /host-sys + {{- end }} + {{- end }} + {{- end }} + volumes: + - name: start-scripts + configMap: + name: {{ printf "%s-scripts" (include "common.names.fullname" .) }} + defaultMode: 0755 + - name: health + configMap: + name: {{ printf "%s-health" (include "common.names.fullname" .) }} + defaultMode: 0755 + {{- if .Values.auth.usePasswordFiles }} + - name: redis-password + secret: + secretName: {{ template "redis.secretName" . }} + items: + - key: {{ template "redis.secretPasswordKey" . }} + path: redis-password + {{- end }} + - name: config + configMap: + name: {{ include "redis.configmapName" . }} + {{- if .Values.sysctl.mountHostSys }} + - name: host-sys + hostPath: + path: /sys + {{- end }} + {{- if not .Values.sentinel.persistence.enabled }} + - name: sentinel-data + {{- if or .Values.sentinel.persistence.medium .Values.sentinel.persistence.sizeLimit }} + emptyDir: + {{- if .Values.sentinel.persistence.medium }} + medium: {{ .Values.sentinel.persistence.medium | quote }} + {{- end }} + {{- if .Values.sentinel.persistence.sizeLimit }} + sizeLimit: {{ .Values.sentinel.persistence.sizeLimit | quote }} + {{- end }} + {{- else }} + emptyDir: {} + {{- end }} + {{- end }} + - name: redis-tmp-conf + {{- if or .Values.sentinel.persistence.medium .Values.sentinel.persistence.sizeLimit }} + emptyDir: + {{- if .Values.sentinel.persistence.medium }} + medium: {{ .Values.sentinel.persistence.medium | quote }} + {{- end }} + {{- if .Values.sentinel.persistence.sizeLimit }} + sizeLimit: {{ .Values.sentinel.persistence.sizeLimit | quote }} + {{- end }} + {{- else }} + emptyDir: {} + {{- end }} + - name: tmp + {{- if or .Values.sentinel.persistence.medium .Values.sentinel.persistence.sizeLimit }} + emptyDir: + {{- if .Values.sentinel.persistence.medium }} + medium: {{ .Values.sentinel.persistence.medium | quote }} + {{- end }} + {{- if .Values.sentinel.persistence.sizeLimit }} + sizeLimit: {{ .Values.sentinel.persistence.sizeLimit | quote }} + {{- end }} + {{- else }} + emptyDir: {} + {{- end }} + {{- if .Values.replica.extraVolumes }} + {{- include "common.tplvalues.render" ( dict "value" .Values.replica.extraVolumes "context" $ ) | nindent 8 }} + {{- end }} + {{- if .Values.metrics.extraVolumes }} + {{- include "common.tplvalues.render" ( dict "value" .Values.metrics.extraVolumes "context" $ ) | nindent 8 }} + {{- end }} + {{- if .Values.sentinel.extraVolumes }} + {{- include "common.tplvalues.render" ( dict "value" .Values.sentinel.extraVolumes "context" $ ) | nindent 8 }} + {{- end }} + {{- if .Values.tls.enabled }} + - name: redis-certificates + secret: + secretName: {{ include "redis.tlsSecretName" . }} + defaultMode: 256 + {{- end }} + {{- if not .Values.replica.persistence.enabled }} + - name: redis-data + {{- if or .Values.sentinel.persistence.medium .Values.sentinel.persistence.sizeLimit }} + emptyDir: + {{- if .Values.sentinel.persistence.medium }} + medium: {{ .Values.sentinel.persistence.medium | quote }} + {{- end }} + {{- if .Values.sentinel.persistence.sizeLimit }} + sizeLimit: {{ .Values.sentinel.persistence.sizeLimit | quote }} + {{- end }} + {{- else }} + emptyDir: {} + {{- end }} + {{- else if .Values.replica.persistence.existingClaim }} + - name: redis-data + persistentVolumeClaim: + claimName: {{ printf "%s" (tpl .Values.replica.persistence.existingClaim .) }} + {{- else }} + volumeClaimTemplates: + - metadata: + name: redis-data + labels: {{- include "common.labels.matchLabels" . | nindent 10 }} + app.kubernetes.io/component: node + {{- if .Values.replica.persistence.annotations }} + annotations: {{- toYaml .Values.replica.persistence.annotations | nindent 10 }} + {{- end }} + spec: + accessModes: + {{- range .Values.replica.persistence.accessModes }} + - {{ . | quote }} + {{- end }} + resources: + requests: + storage: {{ .Values.replica.persistence.size | quote }} + {{- if .Values.replica.persistence.selector }} + selector: {{- include "common.tplvalues.render" ( dict "value" .Values.replica.persistence.selector "context" $) | nindent 10 }} + {{- end }} + {{- include "common.storage.class" (dict "persistence" .Values.replica.persistence "global" .Values.global) | nindent 8 }} + {{- if .Values.sentinel.persistence.enabled }} + - metadata: + name: sentinel-data + labels: {{- include "common.labels.matchLabels" . | nindent 10 }} + app.kubernetes.io/component: node + {{- if .Values.sentinel.persistence.annotations }} + annotations: {{- toYaml .Values.sentinel.persistence.annotations | nindent 10 }} + {{- end }} + spec: + accessModes: + {{- range .Values.sentinel.persistence.accessModes }} + - {{ . | quote }} + {{- end }} + resources: + requests: + storage: {{ .Values.sentinel.persistence.size | quote }} + {{- if .Values.sentinel.persistence.selector }} + selector: {{- include "common.tplvalues.render" ( dict "value" .Values.sentinel.persistence.selector "context" $) | nindent 10 }} + {{- end }} + {{- if .Values.sentinel.persistence.dataSource }} + dataSource: {{- include "common.tplvalues.render" (dict "value" .Values.sentinel.persistence.dataSource "context" $) | nindent 10 }} + {{- end }} + {{- include "common.storage.class" (dict "persistence" .Values.sentinel.persistence "global" .Values.global) | nindent 8 }} + {{- end }} + {{- end }} +{{- end }} +{{- end }} diff --git a/redis-request-response/templates/serviceaccount.yaml b/redis-request-response/templates/serviceaccount.yaml new file mode 100644 index 00000000..9faa1752 --- /dev/null +++ b/redis-request-response/templates/serviceaccount.yaml @@ -0,0 +1,21 @@ +{{- if and .Values.serviceAccount.create (and (not .Values.master.serviceAccount.create) (not .Values.replica.serviceAccount.create)) }} +apiVersion: v1 +kind: ServiceAccount +automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }} +metadata: + name: {{ template "redis.serviceAccountName" . }} + namespace: {{ .Release.Namespace | quote }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + {{- if or .Values.commonAnnotations .Values.serviceAccount.annotations }} + annotations: + {{- if or .Values.commonAnnotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.serviceAccount.annotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.serviceAccount.annotations "context" $ ) | nindent 4 }} + {{- end }} + {{- end }} +{{- end }} \ No newline at end of file diff --git a/redis-request-response/templates/servicemonitor.yaml b/redis-request-response/templates/servicemonitor.yaml new file mode 100644 index 00000000..9bdad949 --- /dev/null +++ b/redis-request-response/templates/servicemonitor.yaml @@ -0,0 +1,44 @@ +{{- if and .Values.metrics.enabled .Values.metrics.serviceMonitor.enabled }} +apiVersion: monitoring.coreos.com/v1 +kind: ServiceMonitor +metadata: + name: {{ template "common.names.fullname" . }} + namespace: {{ default .Release.Namespace .Values.metrics.serviceMonitor.namespace | quote }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + {{- if .Values.metrics.serviceMonitor.additionalLabels }} + {{- include "common.tplvalues.render" (dict "value" .Values.metrics.serviceMonitor.additionalLabels "context" $) | nindent 4 }} + {{- end }} + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} +spec: + endpoints: + - port: http-metrics + {{- if .Values.metrics.serviceMonitor.interval }} + interval: {{ .Values.metrics.serviceMonitor.interval }} + {{- end }} + {{- if .Values.metrics.serviceMonitor.scrapeTimeout }} + scrapeTimeout: {{ .Values.metrics.serviceMonitor.scrapeTimeout }} + {{- end }} + {{- if .Values.metrics.serviceMonitor.honorLabels }} + honorLabels: {{ .Values.metrics.serviceMonitor.honorLabels }} + {{- end }} + {{- if .Values.metrics.serviceMonitor.relabellings }} + relabelings: {{- toYaml .Values.metrics.serviceMonitor.relabellings | nindent 6 }} + {{- end }} + {{- if .Values.metrics.serviceMonitor.metricRelabelings }} + metricRelabelings: {{- toYaml .Values.metrics.serviceMonitor.metricRelabelings | nindent 6 }} + {{- end }} + {{- if .Values.metrics.serviceMonitor.podTargetLabels }} + podTargetLabels: {{- toYaml .Values.metrics.serviceMonitor.podTargetLabels | nindent 4 }} + {{- end }} + namespaceSelector: + matchNames: + - {{ .Release.Namespace }} + selector: + matchLabels: {{- include "common.labels.matchLabels" . | nindent 6 }} + app.kubernetes.io/component: metrics +{{- end }} diff --git a/redis-request-response/templates/tls-secret.yaml b/redis-request-response/templates/tls-secret.yaml new file mode 100644 index 00000000..4f9c39b8 --- /dev/null +++ b/redis-request-response/templates/tls-secret.yaml @@ -0,0 +1,30 @@ +{{- if (include "redis.createTlsSecret" .) }} +{{- $secretName := printf "%s-crt" (include "common.names.fullname" .) }} +{{- $existingCerts := (lookup "v1" "Secret" .Release.Namespace $secretName).data | default dict }} +{{- $ca := genCA "redis-ca" 365 }} +{{- $releaseNamespace := .Release.Namespace }} +{{- $clusterDomain := .Values.clusterDomain }} +{{- $fullname := include "common.names.fullname" . }} +{{- $serviceName := include "common.names.fullname" . }} +{{- $headlessServiceName := printf "%s-headless" (include "common.names.fullname" .) }} +{{- $masterServiceName := printf "%s-master" (include "common.names.fullname" .) }} +{{- $altNames := list (printf "*.%s.%s.svc.%s" $serviceName $releaseNamespace $clusterDomain) (printf "%s.%s.svc.%s" $masterServiceName $releaseNamespace $clusterDomain) (printf "*.%s.%s.svc.%s" $masterServiceName $releaseNamespace $clusterDomain) (printf "*.%s.%s.svc.%s" $headlessServiceName $releaseNamespace $clusterDomain) (printf "%s.%s.svc.%s" $headlessServiceName $releaseNamespace $clusterDomain) "127.0.0.1" "localhost" $fullname }} +{{- $crt := genSignedCert $fullname nil $altNames 365 $ca }} +apiVersion: v1 +kind: Secret +metadata: + name: {{ $secretName }} + namespace: {{ .Release.Namespace | quote }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} +type: kubernetes.io/tls +data: + ca.crt: {{ (get $existingCerts "ca.crt") | default ($ca.Cert | b64enc | quote ) }} + tls.crt: {{ (get $existingCerts "tls.crt") | default ($crt.Cert | b64enc | quote) }} + tls.key: {{ (get $existingCerts "tls.key") | default ($crt.Key | b64enc | quote) }} +{{- end }} diff --git a/redis-request-response/values.schema.json b/redis-request-response/values.schema.json new file mode 100644 index 00000000..d6e226b8 --- /dev/null +++ b/redis-request-response/values.schema.json @@ -0,0 +1,156 @@ +{ + "$schema": "http://json-schema.org/schema#", + "type": "object", + "properties": { + "architecture": { + "type": "string", + "title": "Redis architecture", + "form": true, + "description": "Allowed values: `standalone` or `replication`", + "enum": ["standalone", "replication"] + }, + "auth": { + "type": "object", + "title": "Authentication configuration", + "form": true, + "properties": { + "enabled": { + "type": "boolean", + "form": true, + "title": "Use password authentication" + }, + "password": { + "type": "string", + "title": "Redis password", + "form": true, + "description": "Defaults to a random 10-character alphanumeric string if not set", + "hidden": { + "value": false, + "path": "auth/enabled" + } + } + } + }, + "master": { + "type": "object", + "title": "Master replicas settings", + "form": true, + "properties": { + "kind": { + "type": "string", + "title": "Workload Kind", + "form": true, + "description": "Allowed values: `Deployment` or `StatefulSet`", + "enum": ["Deployment", "StatefulSet"] + }, + "persistence": { + "type": "object", + "title": "Persistence for master replicas", + "form": true, + "properties": { + "enabled": { + "type": "boolean", + "form": true, + "title": "Enable persistence", + "description": "Enable persistence using Persistent Volume Claims" + }, + "size": { + "type": "string", + "title": "Persistent Volume Size", + "form": true, + "render": "slider", + "sliderMin": 1, + "sliderMax": 100, + "sliderUnit": "Gi", + "hidden": { + "value": false, + "path": "master/persistence/enabled" + } + } + } + } + } + }, + "replica": { + "type": "object", + "title": "Redis replicas settings", + "form": true, + "hidden": { + "value": "standalone", + "path": "architecture" + }, + "properties": { + "replicaCount": { + "type": "integer", + "form": true, + "title": "Number of Redis replicas" + }, + "persistence": { + "type": "object", + "title": "Persistence for Redis replicas", + "form": true, + "properties": { + "enabled": { + "type": "boolean", + "form": true, + "title": "Enable persistence", + "description": "Enable persistence using Persistent Volume Claims" + }, + "size": { + "type": "string", + "title": "Persistent Volume Size", + "form": true, + "render": "slider", + "sliderMin": 1, + "sliderMax": 100, + "sliderUnit": "Gi", + "hidden": { + "value": false, + "path": "replica/persistence/enabled" + } + } + } + } + } + }, + "volumePermissions": { + "type": "object", + "properties": { + "enabled": { + "type": "boolean", + "form": true, + "title": "Enable Init Containers", + "description": "Use an init container to set required folder permissions on the data volume before mounting it in the final destination" + } + } + }, + "metrics": { + "type": "object", + "form": true, + "title": "Prometheus metrics details", + "properties": { + "enabled": { + "type": "boolean", + "title": "Create Prometheus metrics exporter", + "description": "Create a side-car container to expose Prometheus metrics", + "form": true + }, + "serviceMonitor": { + "type": "object", + "properties": { + "enabled": { + "type": "boolean", + "title": "Create Prometheus Operator ServiceMonitor", + "description": "Create a ServiceMonitor to track metrics using Prometheus Operator", + "form": true, + "hidden": { + "value": false, + "path": "metrics/enabled" + } + } + } + } + } + } + } +} diff --git a/redis-request-response/values.yaml b/redis-request-response/values.yaml new file mode 100644 index 00000000..1e35d564 --- /dev/null +++ b/redis-request-response/values.yaml @@ -0,0 +1,1746 @@ +## @section Global parameters +## Global Docker image parameters +## Please, note that this will override the image parameters, including dependencies, configured to use the global value +## Current available global Docker image parameters: imageRegistry, imagePullSecrets and storageClass +## + +## @param global.imageRegistry Global Docker image registry +## @param global.imagePullSecrets Global Docker registry secret names as an array +## @param global.storageClass Global StorageClass for Persistent Volume(s) +## @param global.redis.password Global Redis® password (overrides `auth.password`) +## +global: + name: redis-request-response + namespace: redis + + imageRegistry: "" + ## E.g. + ## imagePullSecrets: + ## - myRegistryKeySecretName + ## + imagePullSecrets: [] + storageClass: "" + redis: + password: "" + +## @section Common parameters +## + +## @param kubeVersion Override Kubernetes version +## +kubeVersion: "" +## @param nameOverride String to partially override common.names.fullname +## +nameOverride: "" +## @param fullnameOverride String to fully override common.names.fullname +## +fullnameOverride: "" +## @param commonLabels Labels to add to all deployed objects +## +commonLabels: {} +## @param commonAnnotations Annotations to add to all deployed objects +## +commonAnnotations: {} +## @param secretAnnotations Annotations to add to secret +## +secretAnnotations: {} +## @param clusterDomain Kubernetes cluster domain name +## +clusterDomain: cluster.local +## @param extraDeploy Array of extra objects to deploy with the release +## +extraDeploy: [] +## @param useHostnames Use hostnames internally when announcing replication +### +useHostnames: true + +## Enable diagnostic mode in the deployment +## +diagnosticMode: + ## @param diagnosticMode.enabled Enable diagnostic mode (all probes will be disabled and the command will be overridden) + ## + enabled: false + ## @param diagnosticMode.command Command to override all containers in the deployment + ## + command: + - sleep + ## @param diagnosticMode.args Args to override all containers in the deployment + ## + args: + - infinity + +## @section Redis® Image parameters +## + +## Bitnami Redis® image +## ref: https://hub.docker.com/r/bitnami/redis/tags/ +## @param image.registry Redis® image registry +## @param image.repository Redis® image repository +## @param image.tag Redis® image tag (immutable tags are recommended) +## @param image.digest Redis® image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag +## @param image.pullPolicy Redis® image pull policy +## @param image.pullSecrets Redis® image pull secrets +## @param image.debug Enable image debug mode +## +image: + registry: docker.io + repository: bitnami/redis + tag: 7.0.8-debian-11-r0 + digest: "" + ## Specify a imagePullPolicy + ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' + ## ref: https://kubernetes.io/docs/user-guide/images/#pre-pulling-images + ## + pullPolicy: IfNotPresent + ## Optionally specify an array of imagePullSecrets. + ## Secrets must be manually created in the namespace. + ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ + ## e.g: + ## pullSecrets: + ## - myRegistryKeySecretName + ## + pullSecrets: [] + ## Enable debug mode + ## + debug: false + +## @section Redis® common configuration parameters +## https://github.com/bitnami/containers/tree/main/bitnami/redis#configuration +## + +## @param architecture Redis® architecture. Allowed values: `standalone` or `replication` +## +architecture: replication +## Redis® Authentication parameters +## ref: https://github.com/bitnami/containers/tree/main/bitnami/redis#setting-the-server-password-on-first-run +## +auth: + ## @param auth.enabled Enable password authentication + ## + enabled: false + ## @param auth.sentinel Enable password authentication on sentinels too + ## + sentinel: true + ## @param auth.password Redis® password + ## Defaults to a random 10-character alphanumeric string if not set + ## + password: "" + ## @param auth.existingSecret The name of an existing secret with Redis® credentials + ## NOTE: When it's set, the previous `auth.password` parameter is ignored + ## + existingSecret: "" + ## @param auth.existingSecretPasswordKey Password key to be retrieved from existing secret + ## NOTE: ignored unless `auth.existingSecret` parameter is set + ## + existingSecretPasswordKey: "" + ## @param auth.usePasswordFiles Mount credentials as files instead of using an environment variable + ## + usePasswordFiles: false + +## @param commonConfiguration [string] Common configuration to be added into the ConfigMap +## ref: https://redis.io/topics/config +## +commonConfiguration: |- + # Enable AOF https://redis.io/topics/persistence#append-only-file + appendonly yes + # Disable RDB persistence, AOF persistence already enabled. + save "" +## @param existingConfigmap The name of an existing ConfigMap with your custom configuration for Redis® nodes +## +existingConfigmap: "" + +## @section Redis® master configuration parameters +## + +master: + ## @param master.count Number of Redis® master instances to deploy (experimental, requires additional configuration) + ## + count: 1 + ## @param master.configuration Configuration for Redis® master nodes + ## ref: https://redis.io/topics/config + ## + configuration: "" + ## @param master.disableCommands Array with Redis® commands to disable on master nodes + ## Commands will be completely disabled by renaming each to an empty string. + ## ref: https://redis.io/topics/security#disabling-of-specific-commands + ## + disableCommands: + + ## @param master.command Override default container command (useful when using custom images) + ## + command: [] + ## @param master.args Override default container args (useful when using custom images) + ## + args: [] + ## @param master.preExecCmds Additional commands to run prior to starting Redis® master + ## + preExecCmds: [] + ## @param master.extraFlags Array with additional command line flags for Redis® master + ## e.g: + ## extraFlags: + ## - "--maxmemory-policy volatile-ttl" + ## - "--repl-backlog-size 1024mb" + ## + extraFlags: [] + ## @param master.extraEnvVars Array with extra environment variables to add to Redis® master nodes + ## e.g: + ## extraEnvVars: + ## - name: FOO + ## value: "bar" + ## + extraEnvVars: [] + ## @param master.extraEnvVarsCM Name of existing ConfigMap containing extra env vars for Redis® master nodes + ## + extraEnvVarsCM: "" + ## @param master.extraEnvVarsSecret Name of existing Secret containing extra env vars for Redis® master nodes + ## + extraEnvVarsSecret: "" + ## @param master.containerPorts.redis Container port to open on Redis® master nodes + ## + containerPorts: + redis: 6379 + ## Configure extra options for Redis® containers' liveness and readiness probes + ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/#configure-probes + ## @param master.startupProbe.enabled Enable startupProbe on Redis® master nodes + ## @param master.startupProbe.initialDelaySeconds Initial delay seconds for startupProbe + ## @param master.startupProbe.periodSeconds Period seconds for startupProbe + ## @param master.startupProbe.timeoutSeconds Timeout seconds for startupProbe + ## @param master.startupProbe.failureThreshold Failure threshold for startupProbe + ## @param master.startupProbe.successThreshold Success threshold for startupProbe + ## + startupProbe: + enabled: false + initialDelaySeconds: 20 + periodSeconds: 5 + timeoutSeconds: 5 + successThreshold: 1 + failureThreshold: 5 + ## @param master.livenessProbe.enabled Enable livenessProbe on Redis® master nodes + ## @param master.livenessProbe.initialDelaySeconds Initial delay seconds for livenessProbe + ## @param master.livenessProbe.periodSeconds Period seconds for livenessProbe + ## @param master.livenessProbe.timeoutSeconds Timeout seconds for livenessProbe + ## @param master.livenessProbe.failureThreshold Failure threshold for livenessProbe + ## @param master.livenessProbe.successThreshold Success threshold for livenessProbe + ## + livenessProbe: + enabled: true + initialDelaySeconds: 20 + periodSeconds: 5 + timeoutSeconds: 5 + successThreshold: 1 + failureThreshold: 5 + ## @param master.readinessProbe.enabled Enable readinessProbe on Redis® master nodes + ## @param master.readinessProbe.initialDelaySeconds Initial delay seconds for readinessProbe + ## @param master.readinessProbe.periodSeconds Period seconds for readinessProbe + ## @param master.readinessProbe.timeoutSeconds Timeout seconds for readinessProbe + ## @param master.readinessProbe.failureThreshold Failure threshold for readinessProbe + ## @param master.readinessProbe.successThreshold Success threshold for readinessProbe + ## + readinessProbe: + enabled: true + initialDelaySeconds: 20 + periodSeconds: 5 + timeoutSeconds: 1 + successThreshold: 1 + failureThreshold: 5 + ## @param master.customStartupProbe Custom startupProbe that overrides the default one + ## + customStartupProbe: {} + ## @param master.customLivenessProbe Custom livenessProbe that overrides the default one + ## + customLivenessProbe: {} + ## @param master.customReadinessProbe Custom readinessProbe that overrides the default one + ## + customReadinessProbe: {} + ## Redis® master resource requests and limits + ## ref: https://kubernetes.io/docs/user-guide/compute-resources/ + ## @param master.resources.limits The resources limits for the Redis® master containers + ## @param master.resources.requests The requested resources for the Redis® master containers + ## + resources: + limits: {} + requests: {} + ## Configure Pods Security Context + ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod + ## @param master.podSecurityContext.enabled Enabled Redis® master pods' Security Context + ## @param master.podSecurityContext.fsGroup Set Redis® master pod's Security Context fsGroup + ## + podSecurityContext: + enabled: true + fsGroup: 1001 + ## Configure Container Security Context + ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod + ## @param master.containerSecurityContext.enabled Enabled Redis® master containers' Security Context + ## @param master.containerSecurityContext.runAsUser Set Redis® master containers' Security Context runAsUser + ## + containerSecurityContext: + enabled: true + runAsUser: 1001 + ## @param master.kind Use either Deployment or StatefulSet (default) + ## ref: https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/ + ## + kind: StatefulSet + ## @param master.schedulerName Alternate scheduler for Redis® master pods + ## ref: https://kubernetes.io/docs/tasks/administer-cluster/configure-multiple-schedulers/ + ## + schedulerName: "" + ## @param master.updateStrategy.type Redis® master statefulset strategy type + ## @skip master.updateStrategy.rollingUpdate + ## ref: https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#update-strategies + ## + updateStrategy: + ## StrategyType + ## Can be set to RollingUpdate, OnDelete (statefulset), Recreate (deployment) + ## + type: RollingUpdate + ## @param master.minReadySeconds How many seconds a pod needs to be ready before killing the next, during update + ## + minReadySeconds: 0 + ## @param master.priorityClassName Redis® master pods' priorityClassName + ## + priorityClassName: "" + ## @param master.hostAliases Redis® master pods host aliases + ## https://kubernetes.io/docs/concepts/services-networking/add-entries-to-pod-etc-hosts-with-host-aliases/ + ## + hostAliases: [] + ## @param master.podLabels Extra labels for Redis® master pods + ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/ + ## + podLabels: {} + ## @param master.podAnnotations Annotations for Redis® master pods + ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/ + ## + podAnnotations: {} + ## @param master.shareProcessNamespace Share a single process namespace between all of the containers in Redis® master pods + ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/share-process-namespace/ + ## + shareProcessNamespace: false + ## @param master.podAffinityPreset Pod affinity preset. Ignored if `master.affinity` is set. Allowed values: `soft` or `hard` + ## ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#inter-pod-affinity-and-anti-affinity + ## + podAffinityPreset: "" + ## @param master.podAntiAffinityPreset Pod anti-affinity preset. Ignored if `master.affinity` is set. Allowed values: `soft` or `hard` + ## ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#inter-pod-affinity-and-anti-affinity + ## + podAntiAffinityPreset: soft + ## Node master.affinity preset + ## ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#node-affinity + ## + nodeAffinityPreset: + ## @param master.nodeAffinityPreset.type Node affinity preset type. Ignored if `master.affinity` is set. Allowed values: `soft` or `hard` + ## + type: "" + ## @param master.nodeAffinityPreset.key Node label key to match. Ignored if `master.affinity` is set + ## + key: "" + ## @param master.nodeAffinityPreset.values Node label values to match. Ignored if `master.affinity` is set + ## E.g. + ## values: + ## - e2e-az1 + ## - e2e-az2 + ## + values: [] + ## @param master.affinity Affinity for Redis® master pods assignment + ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity + ## NOTE: `master.podAffinityPreset`, `master.podAntiAffinityPreset`, and `master.nodeAffinityPreset` will be ignored when it's set + ## + affinity: {} + ## @param master.nodeSelector Node labels for Redis® master pods assignment + ## ref: https://kubernetes.io/docs/user-guide/node-selection/ + ## + nodeSelector: {} + ## @param master.tolerations Tolerations for Redis® master pods assignment + ## ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ + ## + tolerations: [] + ## @param master.topologySpreadConstraints Spread Constraints for Redis® master pod assignment + ## ref: https://kubernetes.io/docs/concepts/workloads/pods/pod-topology-spread-constraints/ + ## E.g. + ## topologySpreadConstraints: + ## - maxSkew: 1 + ## topologyKey: node + ## whenUnsatisfiable: DoNotSchedule + ## + topologySpreadConstraints: [] + ## @param master.dnsPolicy DNS Policy for Redis® master pod + ## ref: https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/ + ## E.g. + ## dnsPolicy: ClusterFirst + dnsPolicy: "" + ## @param master.dnsConfig DNS Configuration for Redis® master pod + ## ref: https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/ + ## E.g. + ## dnsConfig: + ## options: + ## - name: ndots + ## value: "4" + ## - name: single-request-reopen + dnsConfig: {} + ## @param master.lifecycleHooks for the Redis® master container(s) to automate configuration before or after startup + ## + lifecycleHooks: {} + ## @param master.extraVolumes Optionally specify extra list of additional volumes for the Redis® master pod(s) + ## + extraVolumes: [] + ## @param master.extraVolumeMounts Optionally specify extra list of additional volumeMounts for the Redis® master container(s) + ## + extraVolumeMounts: [] + ## @param master.sidecars Add additional sidecar containers to the Redis® master pod(s) + ## e.g: + ## sidecars: + ## - name: your-image-name + ## image: your-image + ## imagePullPolicy: Always + ## ports: + ## - name: portname + ## containerPort: 1234 + ## + sidecars: [] + ## @param master.initContainers Add additional init containers to the Redis® master pod(s) + ## ref: https://kubernetes.io/docs/concepts/workloads/pods/init-containers/ + ## e.g: + ## initContainers: + ## - name: your-image-name + ## image: your-image + ## imagePullPolicy: Always + ## command: ['sh', '-c', 'echo "hello world"'] + ## + initContainers: [] + ## Persistence parameters + ## ref: https://kubernetes.io/docs/user-guide/persistent-volumes/ + ## + persistence: + ## @param master.persistence.enabled Enable persistence on Redis® master nodes using Persistent Volume Claims + ## + enabled: true + ## @param master.persistence.medium Provide a medium for `emptyDir` volumes. + ## + medium: "" + ## @param master.persistence.sizeLimit Set this to enable a size limit for `emptyDir` volumes. + ## + sizeLimit: "" + ## @param master.persistence.path The path the volume will be mounted at on Redis® master containers + ## NOTE: Useful when using different Redis® images + ## + path: /data + ## @param master.persistence.subPath The subdirectory of the volume to mount on Redis® master containers + ## NOTE: Useful in dev environments + ## + subPath: "" + ## @param master.persistence.subPathExpr Used to construct the subPath subdirectory of the volume to mount on Redis® master containers + ## + subPathExpr: "" + ## @param master.persistence.storageClass Persistent Volume storage class + ## If defined, storageClassName: + ## If set to "-", storageClassName: "", which disables dynamic provisioning + ## If undefined (the default) or set to null, no storageClassName spec is set, choosing the default provisioner + ## + storageClass: "" + ## @param master.persistence.accessModes Persistent Volume access modes + ## + accessModes: + - ReadWriteOnce + ## @param master.persistence.size Persistent Volume size + ## + size: 8Gi + ## @param master.persistence.annotations Additional custom annotations for the PVC + ## + annotations: {} + ## @param master.persistence.selector Additional labels to match for the PVC + ## e.g: + ## selector: + ## matchLabels: + ## app: my-app + ## + selector: {} + ## @param master.persistence.dataSource Custom PVC data source + ## + dataSource: {} + ## @param master.persistence.existingClaim Use a existing PVC which must be created manually before bound + ## NOTE: requires master.persistence.enabled: true + ## + existingClaim: "" + ## Redis® master service parameters + ## + service: + ## @param master.service.type Redis® master service type + ## + type: ClusterIP + ## @param master.service.ports.redis Redis® master service port + ## + ports: + redis: 6379 + ## @param master.service.nodePorts.redis Node port for Redis® master + ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-nodeport + ## NOTE: choose port between <30000-32767> + ## + nodePorts: + redis: "" + ## @param master.service.externalTrafficPolicy Redis® master service external traffic policy + ## ref: https://kubernetes.io/docs/tasks/access-application-cluster/create-external-load-balancer/#preserving-the-client-source-ip + ## + externalTrafficPolicy: Cluster + ## @param master.service.extraPorts Extra ports to expose (normally used with the `sidecar` value) + ## + extraPorts: [] + ## @param master.service.internalTrafficPolicy Redis® master service internal traffic policy (requires Kubernetes v1.22 or greater to be usable) + ## ref: https://kubernetes.io/docs/concepts/services-networking/service-traffic-policy/ + ## + internalTrafficPolicy: Cluster + ## @param master.service.clusterIP Redis® master service Cluster IP + ## + clusterIP: "" + ## @param master.service.loadBalancerIP Redis® master service Load Balancer IP + ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#internal-load-balancer + ## + loadBalancerIP: "" + ## @param master.service.loadBalancerSourceRanges Redis® master service Load Balancer sources + ## https://kubernetes.io/docs/tasks/access-application-cluster/configure-cloud-provider-firewall/#restrict-access-for-loadbalancer-service + ## e.g. + ## loadBalancerSourceRanges: + ## - 10.10.10.0/24 + ## + loadBalancerSourceRanges: [] + ## @param master.service.externalIPs Redis® master service External IPs + ## https://kubernetes.io/docs/concepts/services-networking/service/#external-ips + ## e.g. + ## externalIPs: + ## - 10.10.10.1 + ## - 201.22.30.1 + ## + externalIPs: [] + ## @param master.service.annotations Additional custom annotations for Redis® master service + ## + annotations: {} + ## @param master.service.sessionAffinity Session Affinity for Kubernetes service, can be "None" or "ClientIP" + ## If "ClientIP", consecutive client requests will be directed to the same Pod + ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#virtual-ips-and-service-proxies + ## + sessionAffinity: None + ## @param master.service.sessionAffinityConfig Additional settings for the sessionAffinity + ## sessionAffinityConfig: + ## clientIP: + ## timeoutSeconds: 300 + ## + sessionAffinityConfig: {} + ## @param master.terminationGracePeriodSeconds Integer setting the termination grace period for the redis-master pods + ## + terminationGracePeriodSeconds: 30 + ## ServiceAccount configuration + ## + serviceAccount: + ## @param master.serviceAccount.create Specifies whether a ServiceAccount should be created + ## + create: false + ## @param master.serviceAccount.name The name of the ServiceAccount to use. + ## If not set and create is true, a name is generated using the common.names.fullname template + ## + name: "" + ## @param master.serviceAccount.automountServiceAccountToken Whether to auto mount the service account token + ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/#use-the-default-service-account-to-access-the-api-server + ## + automountServiceAccountToken: true + ## @param master.serviceAccount.annotations Additional custom annotations for the ServiceAccount + ## + annotations: {} + +## @section Redis® replicas configuration parameters +## + +replica: + ## @param replica.replicaCount Number of Redis® replicas to deploy + ## + replicaCount: 0 + ## @param replica.configuration Configuration for Redis® replicas nodes + ## ref: https://redis.io/topics/config + ## + configuration: "" + ## @param replica.disableCommands Array with Redis® commands to disable on replicas nodes + ## Commands will be completely disabled by renaming each to an empty string. + ## ref: https://redis.io/topics/security#disabling-of-specific-commands + ## + disableCommands: + ## @param replica.command Override default container command (useful when using custom images) + ## + command: [] + ## @param replica.args Override default container args (useful when using custom images) + ## + args: [] + ## @param replica.preExecCmds Additional commands to run prior to starting Redis® replicas + ## + preExecCmds: [] + ## @param replica.extraFlags Array with additional command line flags for Redis® replicas + ## e.g: + ## extraFlags: + ## - "--maxmemory-policy volatile-ttl" + ## - "--repl-backlog-size 1024mb" + ## + extraFlags: [] + ## @param replica.extraEnvVars Array with extra environment variables to add to Redis® replicas nodes + ## e.g: + ## extraEnvVars: + ## - name: FOO + ## value: "bar" + ## + extraEnvVars: [] + ## @param replica.extraEnvVarsCM Name of existing ConfigMap containing extra env vars for Redis® replicas nodes + ## + extraEnvVarsCM: "" + ## @param replica.extraEnvVarsSecret Name of existing Secret containing extra env vars for Redis® replicas nodes + ## + extraEnvVarsSecret: "" + ## @param replica.externalMaster.enabled Use external master for bootstrapping + ## @param replica.externalMaster.host External master host to bootstrap from + ## @param replica.externalMaster.port Port for Redis service external master host + ## + externalMaster: + enabled: false + host: "" + port: 6379 + ## @param replica.containerPorts.redis Container port to open on Redis® replicas nodes + ## + containerPorts: + redis: 6379 + ## Configure extra options for Redis® containers' liveness and readiness probes + ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/#configure-probes + ## @param replica.startupProbe.enabled Enable startupProbe on Redis® replicas nodes + ## @param replica.startupProbe.initialDelaySeconds Initial delay seconds for startupProbe + ## @param replica.startupProbe.periodSeconds Period seconds for startupProbe + ## @param replica.startupProbe.timeoutSeconds Timeout seconds for startupProbe + ## @param replica.startupProbe.failureThreshold Failure threshold for startupProbe + ## @param replica.startupProbe.successThreshold Success threshold for startupProbe + ## + startupProbe: + enabled: true + initialDelaySeconds: 10 + periodSeconds: 10 + timeoutSeconds: 5 + successThreshold: 1 + failureThreshold: 22 + ## @param replica.livenessProbe.enabled Enable livenessProbe on Redis® replicas nodes + ## @param replica.livenessProbe.initialDelaySeconds Initial delay seconds for livenessProbe + ## @param replica.livenessProbe.periodSeconds Period seconds for livenessProbe + ## @param replica.livenessProbe.timeoutSeconds Timeout seconds for livenessProbe + ## @param replica.livenessProbe.failureThreshold Failure threshold for livenessProbe + ## @param replica.livenessProbe.successThreshold Success threshold for livenessProbe + ## + livenessProbe: + enabled: true + initialDelaySeconds: 20 + periodSeconds: 5 + timeoutSeconds: 5 + successThreshold: 1 + failureThreshold: 5 + ## @param replica.readinessProbe.enabled Enable readinessProbe on Redis® replicas nodes + ## @param replica.readinessProbe.initialDelaySeconds Initial delay seconds for readinessProbe + ## @param replica.readinessProbe.periodSeconds Period seconds for readinessProbe + ## @param replica.readinessProbe.timeoutSeconds Timeout seconds for readinessProbe + ## @param replica.readinessProbe.failureThreshold Failure threshold for readinessProbe + ## @param replica.readinessProbe.successThreshold Success threshold for readinessProbe + ## + readinessProbe: + enabled: true + initialDelaySeconds: 20 + periodSeconds: 5 + timeoutSeconds: 1 + successThreshold: 1 + failureThreshold: 5 + ## @param replica.customStartupProbe Custom startupProbe that overrides the default one + ## + customStartupProbe: {} + ## @param replica.customLivenessProbe Custom livenessProbe that overrides the default one + ## + customLivenessProbe: {} + ## @param replica.customReadinessProbe Custom readinessProbe that overrides the default one + ## + customReadinessProbe: {} + ## Redis® replicas resource requests and limits + ## ref: https://kubernetes.io/docs/user-guide/compute-resources/ + ## @param replica.resources.limits The resources limits for the Redis® replicas containers + ## @param replica.resources.requests The requested resources for the Redis® replicas containers + ## + resources: + # We usually recommend not to specify default resources and to leave this as a conscious + # choice for the user. This also increases chances charts run on environments with little + # resources, such as Minikube. If you do want to specify resources, uncomment the following + # lines, adjust them as necessary, and remove the curly braces after 'resources:'. + limits: {} + # cpu: 250m + # memory: 256Mi + requests: {} + # cpu: 250m + # memory: 256Mi + ## Configure Pods Security Context + ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod + ## @param replica.podSecurityContext.enabled Enabled Redis® replicas pods' Security Context + ## @param replica.podSecurityContext.fsGroup Set Redis® replicas pod's Security Context fsGroup + ## + podSecurityContext: + enabled: true + fsGroup: 1001 + ## Configure Container Security Context + ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod + ## @param replica.containerSecurityContext.enabled Enabled Redis® replicas containers' Security Context + ## @param replica.containerSecurityContext.runAsUser Set Redis® replicas containers' Security Context runAsUser + ## + containerSecurityContext: + enabled: true + runAsUser: 1001 + ## @param replica.schedulerName Alternate scheduler for Redis® replicas pods + ## ref: https://kubernetes.io/docs/tasks/administer-cluster/configure-multiple-schedulers/ + ## + schedulerName: "" + ## @param replica.updateStrategy.type Redis® replicas statefulset strategy type + ## @skip replica.updateStrategy.rollingUpdate + ## ref: https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#update-strategies + ## + updateStrategy: + ## StrategyType + ## Can be set to RollingUpdate, OnDelete (statefulset), Recreate (deployment) + ## + type: RollingUpdate + ## @param replica.minReadySeconds How many seconds a pod needs to be ready before killing the next, during update + ## + minReadySeconds: 0 + ## @param replica.priorityClassName Redis® replicas pods' priorityClassName + ## + priorityClassName: "" + ## @param replica.podManagementPolicy podManagementPolicy to manage scaling operation of %%MAIN_CONTAINER_NAME%% pods + ## ref: https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#pod-management-policies + ## + podManagementPolicy: "" + ## @param replica.hostAliases Redis® replicas pods host aliases + ## https://kubernetes.io/docs/concepts/services-networking/add-entries-to-pod-etc-hosts-with-host-aliases/ + ## + hostAliases: [] + ## @param replica.podLabels Extra labels for Redis® replicas pods + ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/ + ## + podLabels: {} + ## @param replica.podAnnotations Annotations for Redis® replicas pods + ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/ + ## + podAnnotations: {} + ## @param replica.shareProcessNamespace Share a single process namespace between all of the containers in Redis® replicas pods + ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/share-process-namespace/ + ## + shareProcessNamespace: false + ## @param replica.podAffinityPreset Pod affinity preset. Ignored if `replica.affinity` is set. Allowed values: `soft` or `hard` + ## ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#inter-pod-affinity-and-anti-affinity + ## + podAffinityPreset: "" + ## @param replica.podAntiAffinityPreset Pod anti-affinity preset. Ignored if `replica.affinity` is set. Allowed values: `soft` or `hard` + ## ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#inter-pod-affinity-and-anti-affinity + ## + podAntiAffinityPreset: soft + ## Node affinity preset + ## ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#node-affinity + ## + nodeAffinityPreset: + ## @param replica.nodeAffinityPreset.type Node affinity preset type. Ignored if `replica.affinity` is set. Allowed values: `soft` or `hard` + ## + type: "" + ## @param replica.nodeAffinityPreset.key Node label key to match. Ignored if `replica.affinity` is set + ## + key: "" + ## @param replica.nodeAffinityPreset.values Node label values to match. Ignored if `replica.affinity` is set + ## E.g. + ## values: + ## - e2e-az1 + ## - e2e-az2 + ## + values: [] + ## @param replica.affinity Affinity for Redis® replicas pods assignment + ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity + ## NOTE: `replica.podAffinityPreset`, `replica.podAntiAffinityPreset`, and `replica.nodeAffinityPreset` will be ignored when it's set + ## + affinity: {} + ## @param replica.nodeSelector Node labels for Redis® replicas pods assignment + ## ref: https://kubernetes.io/docs/user-guide/node-selection/ + ## + nodeSelector: {} + ## @param replica.tolerations Tolerations for Redis® replicas pods assignment + ## ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ + ## + tolerations: [] + ## @param replica.topologySpreadConstraints Spread Constraints for Redis® replicas pod assignment + ## ref: https://kubernetes.io/docs/concepts/workloads/pods/pod-topology-spread-constraints/ + ## E.g. + ## topologySpreadConstraints: + ## - maxSkew: 1 + ## topologyKey: node + ## whenUnsatisfiable: DoNotSchedule + ## + topologySpreadConstraints: [] + ## @param replica.dnsPolicy DNS Policy for Redis® replica pods + ## ref: https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/ + ## E.g. + ## dnsPolicy: ClusterFirst + dnsPolicy: "" + ## @param replica.dnsConfig DNS Configuration for Redis® replica pods + ## ref: https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/ + ## E.g. + ## dnsConfig: + ## options: + ## - name: ndots + ## value: "4" + ## - name: single-request-reopen + dnsConfig: {} + ## @param replica.lifecycleHooks for the Redis® replica container(s) to automate configuration before or after startup + ## + lifecycleHooks: {} + ## @param replica.extraVolumes Optionally specify extra list of additional volumes for the Redis® replicas pod(s) + ## + extraVolumes: [] + ## @param replica.extraVolumeMounts Optionally specify extra list of additional volumeMounts for the Redis® replicas container(s) + ## + extraVolumeMounts: [] + ## @param replica.sidecars Add additional sidecar containers to the Redis® replicas pod(s) + ## e.g: + ## sidecars: + ## - name: your-image-name + ## image: your-image + ## imagePullPolicy: Always + ## ports: + ## - name: portname + ## containerPort: 1234 + ## + sidecars: [] + ## @param replica.initContainers Add additional init containers to the Redis® replicas pod(s) + ## ref: https://kubernetes.io/docs/concepts/workloads/pods/init-containers/ + ## e.g: + ## initContainers: + ## - name: your-image-name + ## image: your-image + ## imagePullPolicy: Always + ## command: ['sh', '-c', 'echo "hello world"'] + ## + initContainers: [] + ## Persistence Parameters + ## ref: https://kubernetes.io/docs/user-guide/persistent-volumes/ + ## + persistence: + ## @param replica.persistence.enabled Enable persistence on Redis® replicas nodes using Persistent Volume Claims + ## + enabled: true + ## @param replica.persistence.medium Provide a medium for `emptyDir` volumes. + ## + medium: "" + ## @param replica.persistence.sizeLimit Set this to enable a size limit for `emptyDir` volumes. + ## + sizeLimit: "" + ## @param replica.persistence.path The path the volume will be mounted at on Redis® replicas containers + ## NOTE: Useful when using different Redis® images + ## + path: /data + ## @param replica.persistence.subPath The subdirectory of the volume to mount on Redis® replicas containers + ## NOTE: Useful in dev environments + ## + subPath: "" + ## @param replica.persistence.subPathExpr Used to construct the subPath subdirectory of the volume to mount on Redis® replicas containers + ## + subPathExpr: "" + ## @param replica.persistence.storageClass Persistent Volume storage class + ## If defined, storageClassName: + ## If set to "-", storageClassName: "", which disables dynamic provisioning + ## If undefined (the default) or set to null, no storageClassName spec is set, choosing the default provisioner + ## + storageClass: "" + ## @param replica.persistence.accessModes Persistent Volume access modes + ## + accessModes: + - ReadWriteOnce + ## @param replica.persistence.size Persistent Volume size + ## + size: 8Gi + ## @param replica.persistence.annotations Additional custom annotations for the PVC + ## + annotations: {} + ## @param replica.persistence.selector Additional labels to match for the PVC + ## e.g: + ## selector: + ## matchLabels: + ## app: my-app + ## + selector: {} + ## @param replica.persistence.dataSource Custom PVC data source + ## + dataSource: {} + ## @param replica.persistence.existingClaim Use a existing PVC which must be created manually before bound + ## NOTE: requires replica.persistence.enabled: true + ## + existingClaim: "" + ## Redis® replicas service parameters + ## + service: + ## @param replica.service.type Redis® replicas service type + ## + type: ClusterIP + ## @param replica.service.ports.redis Redis® replicas service port + ## + ports: + redis: 6379 + ## @param replica.service.nodePorts.redis Node port for Redis® replicas + ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-nodeport + ## NOTE: choose port between <30000-32767> + ## + nodePorts: + redis: "" + ## @param replica.service.externalTrafficPolicy Redis® replicas service external traffic policy + ## ref: https://kubernetes.io/docs/tasks/access-application-cluster/create-external-load-balancer/#preserving-the-client-source-ip + ## + externalTrafficPolicy: Cluster + ## @param replica.service.internalTrafficPolicy Redis® replicas service internal traffic policy (requires Kubernetes v1.22 or greater to be usable) + ## ref: https://kubernetes.io/docs/concepts/services-networking/service-traffic-policy/ + ## + internalTrafficPolicy: Cluster + ## @param replica.service.extraPorts Extra ports to expose (normally used with the `sidecar` value) + ## + extraPorts: [] + ## @param replica.service.clusterIP Redis® replicas service Cluster IP + ## + clusterIP: "" + ## @param replica.service.loadBalancerIP Redis® replicas service Load Balancer IP + ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#internal-load-balancer + ## + loadBalancerIP: "" + ## @param replica.service.loadBalancerSourceRanges Redis® replicas service Load Balancer sources + ## https://kubernetes.io/docs/tasks/access-application-cluster/configure-cloud-provider-firewall/#restrict-access-for-loadbalancer-service + ## e.g. + ## loadBalancerSourceRanges: + ## - 10.10.10.0/24 + ## + loadBalancerSourceRanges: [] + ## @param replica.service.annotations Additional custom annotations for Redis® replicas service + ## + annotations: {} + ## @param replica.service.sessionAffinity Session Affinity for Kubernetes service, can be "None" or "ClientIP" + ## If "ClientIP", consecutive client requests will be directed to the same Pod + ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#virtual-ips-and-service-proxies + ## + sessionAffinity: None + ## @param replica.service.sessionAffinityConfig Additional settings for the sessionAffinity + ## sessionAffinityConfig: + ## clientIP: + ## timeoutSeconds: 300 + ## + sessionAffinityConfig: {} + ## @param replica.terminationGracePeriodSeconds Integer setting the termination grace period for the redis-replicas pods + ## + terminationGracePeriodSeconds: 30 + ## Autoscaling configuration + ## + autoscaling: + ## @param replica.autoscaling.enabled Enable replica autoscaling settings + ## + enabled: false + ## @param replica.autoscaling.minReplicas Minimum replicas for the pod autoscaling + ## + minReplicas: 1 + ## @param replica.autoscaling.maxReplicas Maximum replicas for the pod autoscaling + ## + maxReplicas: 11 + ## @param replica.autoscaling.targetCPU Percentage of CPU to consider when autoscaling + ## + targetCPU: "" + ## @param replica.autoscaling.targetMemory Percentage of Memory to consider when autoscaling + ## + targetMemory: "" + ## ServiceAccount configuration + ## + serviceAccount: + ## @param replica.serviceAccount.create Specifies whether a ServiceAccount should be created + ## + create: false + ## @param replica.serviceAccount.name The name of the ServiceAccount to use. + ## If not set and create is true, a name is generated using the common.names.fullname template + ## + name: "" + ## @param replica.serviceAccount.automountServiceAccountToken Whether to auto mount the service account token + ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/#use-the-default-service-account-to-access-the-api-server + ## + automountServiceAccountToken: true + ## @param replica.serviceAccount.annotations Additional custom annotations for the ServiceAccount + ## + annotations: {} +## @section Redis® Sentinel configuration parameters +## + +sentinel: + ## @param sentinel.enabled Use Redis® Sentinel on Redis® pods. + ## IMPORTANT: this will disable the master and replicas services and + ## create a single Redis® service exposing both the Redis and Sentinel ports + ## + enabled: false + ## Bitnami Redis® Sentinel image version + ## ref: https://hub.docker.com/r/bitnami/redis-sentinel/tags/ + ## @param sentinel.image.registry Redis® Sentinel image registry + ## @param sentinel.image.repository Redis® Sentinel image repository + ## @param sentinel.image.tag Redis® Sentinel image tag (immutable tags are recommended) + ## @param sentinel.image.digest Redis® Sentinel image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag + ## @param sentinel.image.pullPolicy Redis® Sentinel image pull policy + ## @param sentinel.image.pullSecrets Redis® Sentinel image pull secrets + ## @param sentinel.image.debug Enable image debug mode + ## + image: + registry: docker.io + repository: bitnami/redis-sentinel + tag: 7.0.7-debian-11-r10 + digest: "" + ## Specify a imagePullPolicy + ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' + ## ref: https://kubernetes.io/docs/user-guide/images/#pre-pulling-images + ## + pullPolicy: IfNotPresent + ## Optionally specify an array of imagePullSecrets. + ## Secrets must be manually created in the namespace. + ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ + ## e.g: + ## pullSecrets: + ## - myRegistryKeySecretName + ## + pullSecrets: [] + ## Enable debug mode + ## + debug: false + ## @param sentinel.masterSet Master set name + ## + masterSet: mymaster + ## @param sentinel.quorum Sentinel Quorum + ## + quorum: 2 + ## @param sentinel.getMasterTimeout Amount of time to allow before get_sentinel_master_info() times out. + ## NOTE: This is directly related to the startupProbes which are configured to run every 10 seconds for a total of 22 failures. If adjusting this value, also adjust the startupProbes. + getMasterTimeout: 220 + ## @param sentinel.automateClusterRecovery Automate cluster recovery in cases where the last replica is not considered a good replica and Sentinel won't automatically failover to it. + ## This also prevents any new replica from starting until the last remaining replica is elected as master to guarantee that it is the one to be elected by Sentinel, and not a newly started replica with no data. + ## NOTE: This feature requires a "downAfterMilliseconds" value less or equal to 2000. + ## + automateClusterRecovery: false + ## @param sentinel.redisShutdownWaitFailover Whether the Redis® master container waits for the failover at shutdown (in addition to the Redis® Sentinel container). + redisShutdownWaitFailover: true + ## Sentinel timing restrictions + ## @param sentinel.downAfterMilliseconds Timeout for detecting a Redis® node is down + ## @param sentinel.failoverTimeout Timeout for performing a election failover + ## + downAfterMilliseconds: 60000 + failoverTimeout: 180000 + ## @param sentinel.parallelSyncs Number of replicas that can be reconfigured in parallel to use the new master after a failover + ## + parallelSyncs: 1 + ## @param sentinel.configuration Configuration for Redis® Sentinel nodes + ## ref: https://redis.io/topics/sentinel + ## + configuration: "" + ## @param sentinel.command Override default container command (useful when using custom images) + ## + command: [] + ## @param sentinel.args Override default container args (useful when using custom images) + ## + args: [] + ## @param sentinel.preExecCmds Additional commands to run prior to starting Redis® Sentinel + ## + preExecCmds: [] + ## @param sentinel.extraEnvVars Array with extra environment variables to add to Redis® Sentinel nodes + ## e.g: + ## extraEnvVars: + ## - name: FOO + ## value: "bar" + ## + extraEnvVars: [] + ## @param sentinel.extraEnvVarsCM Name of existing ConfigMap containing extra env vars for Redis® Sentinel nodes + ## + extraEnvVarsCM: "" + ## @param sentinel.extraEnvVarsSecret Name of existing Secret containing extra env vars for Redis® Sentinel nodes + ## + extraEnvVarsSecret: "" + ## @param sentinel.externalMaster.enabled Use external master for bootstrapping + ## @param sentinel.externalMaster.host External master host to bootstrap from + ## @param sentinel.externalMaster.port Port for Redis service external master host + ## + externalMaster: + enabled: false + host: "" + port: 6379 + ## @param sentinel.containerPorts.sentinel Container port to open on Redis® Sentinel nodes + ## + containerPorts: + sentinel: 26379 + ## Configure extra options for Redis® containers' liveness and readiness probes + ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/#configure-probes + ## @param sentinel.startupProbe.enabled Enable startupProbe on Redis® Sentinel nodes + ## @param sentinel.startupProbe.initialDelaySeconds Initial delay seconds for startupProbe + ## @param sentinel.startupProbe.periodSeconds Period seconds for startupProbe + ## @param sentinel.startupProbe.timeoutSeconds Timeout seconds for startupProbe + ## @param sentinel.startupProbe.failureThreshold Failure threshold for startupProbe + ## @param sentinel.startupProbe.successThreshold Success threshold for startupProbe + ## + startupProbe: + enabled: true + initialDelaySeconds: 10 + periodSeconds: 10 + timeoutSeconds: 5 + successThreshold: 1 + failureThreshold: 22 + ## @param sentinel.livenessProbe.enabled Enable livenessProbe on Redis® Sentinel nodes + ## @param sentinel.livenessProbe.initialDelaySeconds Initial delay seconds for livenessProbe + ## @param sentinel.livenessProbe.periodSeconds Period seconds for livenessProbe + ## @param sentinel.livenessProbe.timeoutSeconds Timeout seconds for livenessProbe + ## @param sentinel.livenessProbe.failureThreshold Failure threshold for livenessProbe + ## @param sentinel.livenessProbe.successThreshold Success threshold for livenessProbe + ## + livenessProbe: + enabled: true + initialDelaySeconds: 20 + periodSeconds: 5 + timeoutSeconds: 5 + successThreshold: 1 + failureThreshold: 5 + ## @param sentinel.readinessProbe.enabled Enable readinessProbe on Redis® Sentinel nodes + ## @param sentinel.readinessProbe.initialDelaySeconds Initial delay seconds for readinessProbe + ## @param sentinel.readinessProbe.periodSeconds Period seconds for readinessProbe + ## @param sentinel.readinessProbe.timeoutSeconds Timeout seconds for readinessProbe + ## @param sentinel.readinessProbe.failureThreshold Failure threshold for readinessProbe + ## @param sentinel.readinessProbe.successThreshold Success threshold for readinessProbe + ## + readinessProbe: + enabled: true + initialDelaySeconds: 20 + periodSeconds: 5 + timeoutSeconds: 1 + successThreshold: 1 + failureThreshold: 5 + ## @param sentinel.customStartupProbe Custom startupProbe that overrides the default one + ## + customStartupProbe: {} + ## @param sentinel.customLivenessProbe Custom livenessProbe that overrides the default one + ## + customLivenessProbe: {} + ## @param sentinel.customReadinessProbe Custom readinessProbe that overrides the default one + ## + customReadinessProbe: {} + ## Persistence parameters + ## ref: https://kubernetes.io/docs/user-guide/persistent-volumes/ + ## + persistence: + ## @param sentinel.persistence.enabled Enable persistence on Redis® sentinel nodes using Persistent Volume Claims (Experimental) + ## + enabled: false + ## @param sentinel.persistence.storageClass Persistent Volume storage class + ## If defined, storageClassName: + ## If set to "-", storageClassName: "", which disables dynamic provisioning + ## If undefined (the default) or set to null, no storageClassName spec is set, choosing the default provisioner + ## + storageClass: "" + ## @param sentinel.persistence.accessModes Persistent Volume access modes + ## + accessModes: + - ReadWriteOnce + ## @param sentinel.persistence.size Persistent Volume size + ## + size: 100Mi + ## @param sentinel.persistence.annotations Additional custom annotations for the PVC + ## + annotations: {} + ## @param sentinel.persistence.selector Additional labels to match for the PVC + ## e.g: + ## selector: + ## matchLabels: + ## app: my-app + ## + selector: {} + ## @param sentinel.persistence.dataSource Custom PVC data source + ## + dataSource: {} + ## @param sentinel.persistence.medium Provide a medium for `emptyDir` volumes. + ## + medium: "" + ## @param sentinel.persistence.sizeLimit Set this to enable a size limit for `emptyDir` volumes. + ## + sizeLimit: "" + ## Redis® Sentinel resource requests and limits + ## ref: https://kubernetes.io/docs/user-guide/compute-resources/ + ## @param sentinel.resources.limits The resources limits for the Redis® Sentinel containers + ## @param sentinel.resources.requests The requested resources for the Redis® Sentinel containers + ## + resources: + limits: {} + requests: {} + ## Configure Container Security Context + ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod + ## @param sentinel.containerSecurityContext.enabled Enabled Redis® Sentinel containers' Security Context + ## @param sentinel.containerSecurityContext.runAsUser Set Redis® Sentinel containers' Security Context runAsUser + ## + containerSecurityContext: + enabled: true + runAsUser: 1001 + ## @param sentinel.lifecycleHooks for the Redis® sentinel container(s) to automate configuration before or after startup + ## + lifecycleHooks: {} + ## @param sentinel.extraVolumes Optionally specify extra list of additional volumes for the Redis® Sentinel + ## + extraVolumes: [] + ## @param sentinel.extraVolumeMounts Optionally specify extra list of additional volumeMounts for the Redis® Sentinel container(s) + ## + extraVolumeMounts: [] + ## Redis® Sentinel service parameters + ## + service: + ## @param sentinel.service.type Redis® Sentinel service type + ## + type: ClusterIP + ## @param sentinel.service.ports.redis Redis® service port for Redis® + ## @param sentinel.service.ports.sentinel Redis® service port for Redis® Sentinel + ## + ports: + redis: 6379 + sentinel: 26379 + ## @param sentinel.service.nodePorts.redis Node port for Redis® + ## @param sentinel.service.nodePorts.sentinel Node port for Sentinel + ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-nodeport + ## NOTE: choose port between <30000-32767> + ## NOTE: By leaving these values blank, they will be generated by ports-configmap + ## If setting manually, please leave at least replica.replicaCount + 1 in between sentinel.service.nodePorts.redis and sentinel.service.nodePorts.sentinel to take into account the ports that will be created while incrementing that base port + ## + nodePorts: + redis: "" + sentinel: "" + ## @param sentinel.service.externalTrafficPolicy Redis® Sentinel service external traffic policy + ## ref: https://kubernetes.io/docs/tasks/access-application-cluster/create-external-load-balancer/#preserving-the-client-source-ip + ## + externalTrafficPolicy: Cluster + ## @param sentinel.service.extraPorts Extra ports to expose (normally used with the `sidecar` value) + ## + extraPorts: [] + ## @param sentinel.service.clusterIP Redis® Sentinel service Cluster IP + ## + clusterIP: "" + ## @param sentinel.service.loadBalancerIP Redis® Sentinel service Load Balancer IP + ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#internal-load-balancer + ## + loadBalancerIP: "" + ## @param sentinel.service.loadBalancerSourceRanges Redis® Sentinel service Load Balancer sources + ## https://kubernetes.io/docs/tasks/access-application-cluster/configure-cloud-provider-firewall/#restrict-access-for-loadbalancer-service + ## e.g. + ## loadBalancerSourceRanges: + ## - 10.10.10.0/24 + ## + loadBalancerSourceRanges: [] + ## @param sentinel.service.annotations Additional custom annotations for Redis® Sentinel service + ## + annotations: {} + ## @param sentinel.service.sessionAffinity Session Affinity for Kubernetes service, can be "None" or "ClientIP" + ## If "ClientIP", consecutive client requests will be directed to the same Pod + ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#virtual-ips-and-service-proxies + ## + sessionAffinity: None + ## @param sentinel.service.sessionAffinityConfig Additional settings for the sessionAffinity + ## sessionAffinityConfig: + ## clientIP: + ## timeoutSeconds: 300 + ## + sessionAffinityConfig: {} + ## @param sentinel.terminationGracePeriodSeconds Integer setting the termination grace period for the redis-node pods + ## + terminationGracePeriodSeconds: 30 + +## @section Other Parameters +## + +## Network Policy configuration +## ref: https://kubernetes.io/docs/concepts/services-networking/network-policies/ +## +networkPolicy: + ## @param networkPolicy.enabled Enable creation of NetworkPolicy resources + ## + enabled: false + ## @param networkPolicy.allowExternal Don't require client label for connections + ## When set to false, only pods with the correct client label will have network access to the ports + ## Redis® is listening on. When true, Redis® will accept connections from any source + ## (with the correct destination port). + ## + allowExternal: true + ## @param networkPolicy.extraIngress Add extra ingress rules to the NetworkPolicy + ## e.g: + ## extraIngress: + ## - ports: + ## - port: 1234 + ## from: + ## - podSelector: + ## - matchLabels: + ## - role: frontend + ## - podSelector: + ## - matchExpressions: + ## - key: role + ## operator: In + ## values: + ## - frontend + ## + extraIngress: [] + ## @param networkPolicy.extraEgress Add extra egress rules to the NetworkPolicy + ## e.g: + ## extraEgress: + ## - ports: + ## - port: 1234 + ## to: + ## - podSelector: + ## - matchLabels: + ## - role: frontend + ## - podSelector: + ## - matchExpressions: + ## - key: role + ## operator: In + ## values: + ## - frontend + ## + extraEgress: [] + ## @param networkPolicy.ingressNSMatchLabels Labels to match to allow traffic from other namespaces + ## @param networkPolicy.ingressNSPodMatchLabels Pod labels to match to allow traffic from other namespaces + ## + ingressNSMatchLabels: {} + ingressNSPodMatchLabels: {} +## PodSecurityPolicy configuration +## ref: https://kubernetes.io/docs/concepts/policy/pod-security-policy/ +## +podSecurityPolicy: + ## @param podSecurityPolicy.create Whether to create a PodSecurityPolicy. WARNING: PodSecurityPolicy is deprecated in Kubernetes v1.21 or later, unavailable in v1.25 or later + ## + create: false + ## @param podSecurityPolicy.enabled Enable PodSecurityPolicy's RBAC rules + ## + enabled: false +## RBAC configuration +## +rbac: + ## @param rbac.create Specifies whether RBAC resources should be created + ## + create: false + ## @param rbac.rules Custom RBAC rules to set + ## e.g: + ## rules: + ## - apiGroups: + ## - "" + ## resources: + ## - pods + ## verbs: + ## - get + ## - list + ## + rules: [] +## ServiceAccount configuration +## +serviceAccount: + ## @param serviceAccount.create Specifies whether a ServiceAccount should be created + ## + create: true + ## @param serviceAccount.name The name of the ServiceAccount to use. + ## If not set and create is true, a name is generated using the common.names.fullname template + ## + name: "" + ## @param serviceAccount.automountServiceAccountToken Whether to auto mount the service account token + ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/#use-the-default-service-account-to-access-the-api-server + ## + automountServiceAccountToken: true + ## @param serviceAccount.annotations Additional custom annotations for the ServiceAccount + ## + annotations: {} +## Redis® Pod Disruption Budget configuration +## ref: https://kubernetes.io/docs/tasks/run-application/configure-pdb/ +## +pdb: + ## @param pdb.create Specifies whether a PodDisruptionBudget should be created + ## + create: false + ## @param pdb.minAvailable Min number of pods that must still be available after the eviction + ## + minAvailable: 1 + ## @param pdb.maxUnavailable Max number of pods that can be unavailable after the eviction + ## + maxUnavailable: "" +## TLS configuration +## +tls: + ## @param tls.enabled Enable TLS traffic + ## + enabled: false + ## @param tls.authClients Require clients to authenticate + ## + authClients: true + ## @param tls.autoGenerated Enable autogenerated certificates + ## + autoGenerated: false + ## @param tls.existingSecret The name of the existing secret that contains the TLS certificates + ## + existingSecret: "" + ## @param tls.certificatesSecret DEPRECATED. Use existingSecret instead. + ## + certificatesSecret: "" + ## @param tls.certFilename Certificate filename + ## + certFilename: "" + ## @param tls.certKeyFilename Certificate Key filename + ## + certKeyFilename: "" + ## @param tls.certCAFilename CA Certificate filename + ## + certCAFilename: "" + ## @param tls.dhParamsFilename File containing DH params (in order to support DH based ciphers) + ## + dhParamsFilename: "" + +## @section Metrics Parameters +## + +metrics: + ## @param metrics.enabled Start a sidecar prometheus exporter to expose Redis® metrics + ## + enabled: false + ## Bitnami Redis® Exporter image + ## ref: https://hub.docker.com/r/bitnami/redis-exporter/tags/ + ## @param metrics.image.registry Redis® Exporter image registry + ## @param metrics.image.repository Redis® Exporter image repository + ## @param metrics.image.tag Redis® Exporter image tag (immutable tags are recommended) + ## @param metrics.image.digest Redis® Exporter image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag + ## @param metrics.image.pullPolicy Redis® Exporter image pull policy + ## @param metrics.image.pullSecrets Redis® Exporter image pull secrets + ## + image: + registry: docker.io + repository: bitnami/redis-exporter + tag: 1.45.0-debian-11-r26 + digest: "" + pullPolicy: IfNotPresent + ## Optionally specify an array of imagePullSecrets. + ## Secrets must be manually created in the namespace. + ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ + ## e.g: + ## pullSecrets: + ## - myRegistryKeySecretName + ## + pullSecrets: [] + ## Configure extra options for Redis® containers' liveness, readiness & startup probes + ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/ + ## @param metrics.startupProbe.enabled Enable startupProbe on Redis® replicas nodes + ## @param metrics.startupProbe.initialDelaySeconds Initial delay seconds for startupProbe + ## @param metrics.startupProbe.periodSeconds Period seconds for startupProbe + ## @param metrics.startupProbe.timeoutSeconds Timeout seconds for startupProbe + ## @param metrics.startupProbe.failureThreshold Failure threshold for startupProbe + ## @param metrics.startupProbe.successThreshold Success threshold for startupProbe + ## + startupProbe: + enabled: false + initialDelaySeconds: 10 + periodSeconds: 10 + timeoutSeconds: 5 + successThreshold: 1 + failureThreshold: 5 + ## @param metrics.livenessProbe.enabled Enable livenessProbe on Redis® replicas nodes + ## @param metrics.livenessProbe.initialDelaySeconds Initial delay seconds for livenessProbe + ## @param metrics.livenessProbe.periodSeconds Period seconds for livenessProbe + ## @param metrics.livenessProbe.timeoutSeconds Timeout seconds for livenessProbe + ## @param metrics.livenessProbe.failureThreshold Failure threshold for livenessProbe + ## @param metrics.livenessProbe.successThreshold Success threshold for livenessProbe + ## + livenessProbe: + enabled: true + initialDelaySeconds: 10 + periodSeconds: 10 + timeoutSeconds: 5 + successThreshold: 1 + failureThreshold: 5 + ## @param metrics.readinessProbe.enabled Enable readinessProbe on Redis® replicas nodes + ## @param metrics.readinessProbe.initialDelaySeconds Initial delay seconds for readinessProbe + ## @param metrics.readinessProbe.periodSeconds Period seconds for readinessProbe + ## @param metrics.readinessProbe.timeoutSeconds Timeout seconds for readinessProbe + ## @param metrics.readinessProbe.failureThreshold Failure threshold for readinessProbe + ## @param metrics.readinessProbe.successThreshold Success threshold for readinessProbe + ## + readinessProbe: + enabled: true + initialDelaySeconds: 5 + periodSeconds: 10 + timeoutSeconds: 1 + successThreshold: 1 + failureThreshold: 3 + ## @param metrics.customStartupProbe Custom startupProbe that overrides the default one + ## + customStartupProbe: {} + ## @param metrics.customLivenessProbe Custom livenessProbe that overrides the default one + ## + customLivenessProbe: {} + ## @param metrics.customReadinessProbe Custom readinessProbe that overrides the default one + ## + customReadinessProbe: {} + ## @param metrics.command Override default metrics container init command (useful when using custom images) + ## + command: [] + ## @param metrics.redisTargetHost A way to specify an alternative Redis® hostname + ## Useful for certificate CN/SAN matching + ## + redisTargetHost: "localhost" + ## @param metrics.extraArgs Extra arguments for Redis® exporter, for example: + ## e.g.: + ## extraArgs: + ## check-keys: myKey,myOtherKey + ## + extraArgs: {} + ## @param metrics.extraEnvVars Array with extra environment variables to add to Redis® exporter + ## e.g: + ## extraEnvVars: + ## - name: FOO + ## value: "bar" + ## + extraEnvVars: [] + ## Configure Container Security Context + ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod + ## @param metrics.containerSecurityContext.enabled Enabled Redis® exporter containers' Security Context + ## @param metrics.containerSecurityContext.runAsUser Set Redis® exporter containers' Security Context runAsUser + ## + containerSecurityContext: + enabled: true + runAsUser: 1001 + ## @param metrics.extraVolumes Optionally specify extra list of additional volumes for the Redis® metrics sidecar + ## + extraVolumes: [] + ## @param metrics.extraVolumeMounts Optionally specify extra list of additional volumeMounts for the Redis® metrics sidecar + ## + extraVolumeMounts: [] + ## Redis® exporter resource requests and limits + ## ref: https://kubernetes.io/docs/user-guide/compute-resources/ + ## @param metrics.resources.limits The resources limits for the Redis® exporter container + ## @param metrics.resources.requests The requested resources for the Redis® exporter container + ## + resources: + limits: {} + requests: {} + ## @param metrics.podLabels Extra labels for Redis® exporter pods + ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/ + ## + podLabels: {} + ## @param metrics.podAnnotations [object] Annotations for Redis® exporter pods + ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/ + ## + podAnnotations: + prometheus.io/scrape: "true" + prometheus.io/port: "9121" + ## Redis® exporter service parameters + ## + service: + ## @param metrics.service.type Redis® exporter service type + ## + type: ClusterIP + ## @param metrics.service.port Redis® exporter service port + ## + port: 9121 + ## @param metrics.service.externalTrafficPolicy Redis® exporter service external traffic policy + ## ref: https://kubernetes.io/docs/tasks/access-application-cluster/create-external-load-balancer/#preserving-the-client-source-ip + ## + externalTrafficPolicy: Cluster + ## @param metrics.service.extraPorts Extra ports to expose (normally used with the `sidecar` value) + ## + extraPorts: [] + ## @param metrics.service.loadBalancerIP Redis® exporter service Load Balancer IP + ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#internal-load-balancer + ## + loadBalancerIP: "" + ## @param metrics.service.loadBalancerSourceRanges Redis® exporter service Load Balancer sources + ## https://kubernetes.io/docs/tasks/access-application-cluster/configure-cloud-provider-firewall/#restrict-access-for-loadbalancer-service + ## e.g. + ## loadBalancerSourceRanges: + ## - 10.10.10.0/24 + ## + loadBalancerSourceRanges: [] + ## @param metrics.service.annotations Additional custom annotations for Redis® exporter service + ## + annotations: {} + ## Prometheus Service Monitor + ## ref: https://github.com/coreos/prometheus-operator + ## https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#endpoint + ## + serviceMonitor: + ## @param metrics.serviceMonitor.enabled Create ServiceMonitor resource(s) for scraping metrics using PrometheusOperator + ## + enabled: false + ## @param metrics.serviceMonitor.namespace The namespace in which the ServiceMonitor will be created + ## + namespace: "" + ## @param metrics.serviceMonitor.interval The interval at which metrics should be scraped + ## + interval: 30s + ## @param metrics.serviceMonitor.scrapeTimeout The timeout after which the scrape is ended + ## + scrapeTimeout: "" + ## @param metrics.serviceMonitor.relabellings Metrics RelabelConfigs to apply to samples before scraping. + ## + relabellings: [] + ## @param metrics.serviceMonitor.metricRelabelings Metrics RelabelConfigs to apply to samples before ingestion. + ## + metricRelabelings: [] + ## @param metrics.serviceMonitor.honorLabels Specify honorLabels parameter to add the scrape endpoint + ## + honorLabels: false + ## @param metrics.serviceMonitor.additionalLabels Additional labels that can be used so ServiceMonitor resource(s) can be discovered by Prometheus + ## + additionalLabels: {} + ## @param metrics.serviceMonitor.podTargetLabels Labels from the Kubernetes pod to be transferred to the created metrics + ## + podTargetLabels: [] + ## Custom PrometheusRule to be defined + ## ref: https://github.com/coreos/prometheus-operator#customresourcedefinitions + ## + prometheusRule: + ## @param metrics.prometheusRule.enabled Create a custom prometheusRule Resource for scraping metrics using PrometheusOperator + ## + enabled: false + ## @param metrics.prometheusRule.namespace The namespace in which the prometheusRule will be created + ## + namespace: "" + ## @param metrics.prometheusRule.additionalLabels Additional labels for the prometheusRule + ## + additionalLabels: {} + ## @param metrics.prometheusRule.rules Custom Prometheus rules + ## e.g: + ## rules: + ## - alert: RedisDown + ## expr: redis_up{service="{{ template "common.names.fullname" . }}-metrics"} == 0 + ## for: 2m + ## labels: + ## severity: error + ## annotations: + ## summary: Redis® instance {{ "{{ $labels.instance }}" }} down + ## description: Redis® instance {{ "{{ $labels.instance }}" }} is down + ## - alert: RedisMemoryHigh + ## expr: > + ## redis_memory_used_bytes{service="{{ template "common.names.fullname" . }}-metrics"} * 100 + ## / + ## redis_memory_max_bytes{service="{{ template "common.names.fullname" . }}-metrics"} + ## > 90 + ## for: 2m + ## labels: + ## severity: error + ## annotations: + ## summary: Redis® instance {{ "{{ $labels.instance }}" }} is using too much memory + ## description: | + ## Redis® instance {{ "{{ $labels.instance }}" }} is using {{ "{{ $value }}" }}% of its available memory. + ## - alert: RedisKeyEviction + ## expr: | + ## increase(redis_evicted_keys_total{service="{{ template "common.names.fullname" . }}-metrics"}[5m]) > 0 + ## for: 1s + ## labels: + ## severity: error + ## annotations: + ## summary: Redis® instance {{ "{{ $labels.instance }}" }} has evicted keys + ## description: | + ## Redis® instance {{ "{{ $labels.instance }}" }} has evicted {{ "{{ $value }}" }} keys in the last 5 minutes. + ## + rules: [] + +## @section Init Container Parameters +## + +## 'volumePermissions' init container parameters +## Changes the owner and group of the persistent volume mount point to runAsUser:fsGroup values +## based on the *podSecurityContext/*containerSecurityContext parameters +## +volumePermissions: + ## @param volumePermissions.enabled Enable init container that changes the owner/group of the PV mount point to `runAsUser:fsGroup` + ## + enabled: false + ## Bitnami Shell image + ## ref: https://hub.docker.com/r/bitnami/bitnami-shell/tags/ + ## @param volumePermissions.image.registry Bitnami Shell image registry + ## @param volumePermissions.image.repository Bitnami Shell image repository + ## @param volumePermissions.image.tag Bitnami Shell image tag (immutable tags are recommended) + ## @param volumePermissions.image.digest Bitnami Shell image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag + ## @param volumePermissions.image.pullPolicy Bitnami Shell image pull policy + ## @param volumePermissions.image.pullSecrets Bitnami Shell image pull secrets + ## + image: + registry: docker.io + repository: bitnami/bitnami-shell + tag: 11-debian-11-r72 + digest: "" + pullPolicy: IfNotPresent + ## Optionally specify an array of imagePullSecrets. + ## Secrets must be manually created in the namespace. + ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ + ## e.g: + ## pullSecrets: + ## - myRegistryKeySecretName + ## + pullSecrets: [] + ## Init container's resource requests and limits + ## ref: https://kubernetes.io/docs/user-guide/compute-resources/ + ## @param volumePermissions.resources.limits The resources limits for the init container + ## @param volumePermissions.resources.requests The requested resources for the init container + ## + resources: + limits: {} + requests: {} + ## Init container Container Security Context + ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container + ## @param volumePermissions.containerSecurityContext.runAsUser Set init container's Security Context runAsUser + ## NOTE: when runAsUser is set to special value "auto", init container will try to chown the + ## data folder to auto-determined user&group, using commands: `id -u`:`id -G | cut -d" " -f2` + ## "auto" is especially useful for OpenShift which has scc with dynamic user ids (and 0 is not allowed) + ## + containerSecurityContext: + runAsUser: 0 + +## init-sysctl container parameters +## used to perform sysctl operation to modify Kernel settings (needed sometimes to avoid warnings) +## +sysctl: + ## @param sysctl.enabled Enable init container to modify Kernel settings + ## + enabled: false + ## Bitnami Shell image + ## ref: https://hub.docker.com/r/bitnami/bitnami-shell/tags/ + ## @param sysctl.image.registry Bitnami Shell image registry + ## @param sysctl.image.repository Bitnami Shell image repository + ## @param sysctl.image.tag Bitnami Shell image tag (immutable tags are recommended) + ## @param sysctl.image.digest Bitnami Shell image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag + ## @param sysctl.image.pullPolicy Bitnami Shell image pull policy + ## @param sysctl.image.pullSecrets Bitnami Shell image pull secrets + ## + image: + registry: docker.io + repository: bitnami/bitnami-shell + tag: 11-debian-11-r72 + digest: "" + pullPolicy: IfNotPresent + ## Optionally specify an array of imagePullSecrets. + ## Secrets must be manually created in the namespace. + ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ + ## e.g: + ## pullSecrets: + ## - myRegistryKeySecretName + ## + pullSecrets: [] + ## @param sysctl.command Override default init-sysctl container command (useful when using custom images) + ## + command: [] + ## @param sysctl.mountHostSys Mount the host `/sys` folder to `/host-sys` + ## + mountHostSys: false + ## Init container's resource requests and limits + ## ref: https://kubernetes.io/docs/user-guide/compute-resources/ + ## @param sysctl.resources.limits The resources limits for the init container + ## @param sysctl.resources.requests The requested resources for the init container + ## + resources: + limits: {} + requests: {} + +## @section useExternalDNS Parameters +## +## @param useExternalDNS.enabled Enable various syntax that would enable external-dns to work. Note this requires a working installation of `external-dns` to be usable. +## @param useExternalDNS.additionalAnnotations Extra annotations to be utilized when `external-dns` is enabled. +## @param useExternalDNS.annotationKey The annotation key utilized when `external-dns` is enabled. Setting this to `false` will disable annotations. +## @param useExternalDNS.suffix The DNS suffix utilized when `external-dns` is enabled. Note that we prepend the suffix with the full name of the release. +## +useExternalDNS: + enabled: false + suffix: "" + annotationKey: external-dns.alpha.kubernetes.io/ + additionalAnnotations: {} diff --git a/redis-vrf/.helmignore b/redis-vrf/.helmignore new file mode 100644 index 00000000..f0c13194 --- /dev/null +++ b/redis-vrf/.helmignore @@ -0,0 +1,21 @@ +# Patterns to ignore when building packages. +# This supports shell glob matching, relative path matching, and +# negation (prefixed with !). Only one pattern per line. +.DS_Store +# Common VCS dirs +.git/ +.gitignore +.bzr/ +.bzrignore +.hg/ +.hgignore +.svn/ +# Common backup files +*.swp +*.bak +*.tmp +*~ +# Various IDEs +.project +.idea/ +*.tmproj diff --git a/redis-vrf/Chart.lock b/redis-vrf/Chart.lock new file mode 100644 index 00000000..ba89eccf --- /dev/null +++ b/redis-vrf/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: common + repository: https://charts.bitnami.com/bitnami + version: 2.2.2 +digest: sha256:49ca75cf23ba5eb7df4becef52580f98c8bd8194eb80368b9d7b875f6eefa8e5 +generated: "2022-12-12T19:34:26.826289322Z" diff --git a/redis-vrf/Chart.yaml b/redis-vrf/Chart.yaml new file mode 100644 index 00000000..674b459c --- /dev/null +++ b/redis-vrf/Chart.yaml @@ -0,0 +1,25 @@ +annotations: + category: Database + licenses: Apache-2.0 +apiVersion: v2 +appVersion: 7.0.8 +dependencies: + - name: common + repository: https://charts.bitnami.com/bitnami + tags: + - bitnami-common + version: 2.x.x +description: Redis(R) is an open source, advanced key-value store. It is often referred to as a data structure server since keys can contain strings, hashes, lists, sets and sorted sets. +home: https://github.com/bitnami/charts/tree/main/bitnami/redis +icon: https://bitnami.com/assets/stacks/redis/img/redis-stack-220x234.png +keywords: + - redis + - keyvalue + - database +maintainers: + - name: Bitnami + url: https://github.com/bitnami/charts +name: redis +sources: + - https://github.com/bitnami/containers/tree/main/bitnami/redis +version: 17.7.0 diff --git a/redis-vrf/README.md b/redis-vrf/README.md new file mode 100644 index 00000000..988058f1 --- /dev/null +++ b/redis-vrf/README.md @@ -0,0 +1,950 @@ + + +# Bitnami package for Redis(R) + +Redis(R) is an open source, advanced key-value store. It is often referred to as a data structure server since keys can contain strings, hashes, lists, sets and sorted sets. + +[Overview of Redis®](http://redis.io) + +Disclaimer: Redis is a registered trademark of Redis Ltd. Any rights therein are reserved to Redis Ltd. Any use by Bitnami is for referential purposes only and does not indicate any sponsorship, endorsement, or affiliation between Redis Ltd. + +## TL;DR + +```console +$ helm repo add my-repo https://charts.bitnami.com/bitnami +$ helm install my-release my-repo/redis +``` + +## Introduction + +This chart bootstraps a [Redis®](https://github.com/bitnami/containers/tree/main/bitnami/redis) deployment on a [Kubernetes](https://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. + +Bitnami charts can be used with [Kubeapps](https://kubeapps.dev/) for deployment and management of Helm Charts in clusters. + +### Choose between Redis® Helm Chart and Redis® Cluster Helm Chart + +You can choose any of the two Redis® Helm charts for deploying a Redis® cluster. + +1. [Redis® Helm Chart](https://github.com/bitnami/charts/tree/main/bitnami/redis) will deploy a master-replica cluster, with the [option](https://github.com/bitnami/charts/tree/main/bitnami/redis#redis-sentinel-configuration-parameters) of enabling using Redis® Sentinel. +2. [Redis® Cluster Helm Chart](https://github.com/bitnami/charts/tree/main/bitnami/redis-cluster) will deploy a Redis® Cluster topology with sharding. + +The main features of each chart are the following: + +| Redis® | Redis® Cluster | +|--------------------------------------------------------|------------------------------------------------------------------------| +| Supports multiple databases | Supports only one database. Better if you have a big dataset | +| Single write point (single master) | Multiple write points (multiple masters) | +| ![Redis® Topology](img/redis-topology.png) | ![Redis® Cluster Topology](img/redis-cluster-topology.png) | + +## Prerequisites + +- Kubernetes 1.19+ +- Helm 3.2.0+ +- PV provisioner support in the underlying infrastructure + +## Installing the Chart + +To install the chart with the release name `my-release`: + +```console +$ helm repo add my-repo https://charts.bitnami.com/bitnami +$ helm install my-release my-repo/redis +``` + +The command deploys Redis® on the Kubernetes cluster in the default configuration. The [Parameters](#parameters) section lists the parameters that can be configured during installation. + +> **Tip**: List all releases using `helm list` + +## Uninstalling the Chart + +To uninstall/delete the `my-release` deployment: + +```console +$ helm delete my-release +``` + +The command removes all the Kubernetes components associated with the chart and deletes the release. + +## Parameters + +### Global parameters + +| Name | Description | Value | +| ------------------------- | ------------------------------------------------------ | ----- | +| `global.imageRegistry` | Global Docker image registry | `""` | +| `global.imagePullSecrets` | Global Docker registry secret names as an array | `[]` | +| `global.storageClass` | Global StorageClass for Persistent Volume(s) | `""` | +| `global.redis.password` | Global Redis® password (overrides `auth.password`) | `""` | + + +### Common parameters + +| Name | Description | Value | +| ------------------------ | --------------------------------------------------------------------------------------- | --------------- | +| `kubeVersion` | Override Kubernetes version | `""` | +| `nameOverride` | String to partially override common.names.fullname | `""` | +| `fullnameOverride` | String to fully override common.names.fullname | `""` | +| `commonLabels` | Labels to add to all deployed objects | `{}` | +| `commonAnnotations` | Annotations to add to all deployed objects | `{}` | +| `secretAnnotations` | Annotations to add to secret | `{}` | +| `clusterDomain` | Kubernetes cluster domain name | `cluster.local` | +| `extraDeploy` | Array of extra objects to deploy with the release | `[]` | +| `useHostnames` | Use hostnames internally when announcing replication | `true` | +| `diagnosticMode.enabled` | Enable diagnostic mode (all probes will be disabled and the command will be overridden) | `false` | +| `diagnosticMode.command` | Command to override all containers in the deployment | `["sleep"]` | +| `diagnosticMode.args` | Args to override all containers in the deployment | `["infinity"]` | + + +### Redis® Image parameters + +| Name | Description | Value | +| ------------------- | ---------------------------------------------------------------------------------------------------------- | -------------------- | +| `image.registry` | Redis® image registry | `docker.io` | +| `image.repository` | Redis® image repository | `bitnami/redis` | +| `image.tag` | Redis® image tag (immutable tags are recommended) | `7.0.8-debian-11-r0` | +| `image.digest` | Redis® image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` | +| `image.pullPolicy` | Redis® image pull policy | `IfNotPresent` | +| `image.pullSecrets` | Redis® image pull secrets | `[]` | +| `image.debug` | Enable image debug mode | `false` | + + +### Redis® common configuration parameters + +| Name | Description | Value | +| -------------------------------- | ------------------------------------------------------------------------------------- | ------------- | +| `architecture` | Redis® architecture. Allowed values: `standalone` or `replication` | `replication` | +| `auth.enabled` | Enable password authentication | `true` | +| `auth.sentinel` | Enable password authentication on sentinels too | `true` | +| `auth.password` | Redis® password | `""` | +| `auth.existingSecret` | The name of an existing secret with Redis® credentials | `""` | +| `auth.existingSecretPasswordKey` | Password key to be retrieved from existing secret | `""` | +| `auth.usePasswordFiles` | Mount credentials as files instead of using an environment variable | `false` | +| `commonConfiguration` | Common configuration to be added into the ConfigMap | `""` | +| `existingConfigmap` | The name of an existing ConfigMap with your custom configuration for Redis® nodes | `""` | + + +### Redis® master configuration parameters + +| Name | Description | Value | +| ---------------------------------------------------- | ----------------------------------------------------------------------------------------------------- | ------------------------ | +| `master.count` | Number of Redis® master instances to deploy (experimental, requires additional configuration) | `1` | +| `master.configuration` | Configuration for Redis® master nodes | `""` | +| `master.disableCommands` | Array with Redis® commands to disable on master nodes | `["FLUSHDB","FLUSHALL"]` | +| `master.command` | Override default container command (useful when using custom images) | `[]` | +| `master.args` | Override default container args (useful when using custom images) | `[]` | +| `master.preExecCmds` | Additional commands to run prior to starting Redis® master | `[]` | +| `master.extraFlags` | Array with additional command line flags for Redis® master | `[]` | +| `master.extraEnvVars` | Array with extra environment variables to add to Redis® master nodes | `[]` | +| `master.extraEnvVarsCM` | Name of existing ConfigMap containing extra env vars for Redis® master nodes | `""` | +| `master.extraEnvVarsSecret` | Name of existing Secret containing extra env vars for Redis® master nodes | `""` | +| `master.containerPorts.redis` | Container port to open on Redis® master nodes | `6379` | +| `master.startupProbe.enabled` | Enable startupProbe on Redis® master nodes | `false` | +| `master.startupProbe.initialDelaySeconds` | Initial delay seconds for startupProbe | `20` | +| `master.startupProbe.periodSeconds` | Period seconds for startupProbe | `5` | +| `master.startupProbe.timeoutSeconds` | Timeout seconds for startupProbe | `5` | +| `master.startupProbe.failureThreshold` | Failure threshold for startupProbe | `5` | +| `master.startupProbe.successThreshold` | Success threshold for startupProbe | `1` | +| `master.livenessProbe.enabled` | Enable livenessProbe on Redis® master nodes | `true` | +| `master.livenessProbe.initialDelaySeconds` | Initial delay seconds for livenessProbe | `20` | +| `master.livenessProbe.periodSeconds` | Period seconds for livenessProbe | `5` | +| `master.livenessProbe.timeoutSeconds` | Timeout seconds for livenessProbe | `5` | +| `master.livenessProbe.failureThreshold` | Failure threshold for livenessProbe | `5` | +| `master.livenessProbe.successThreshold` | Success threshold for livenessProbe | `1` | +| `master.readinessProbe.enabled` | Enable readinessProbe on Redis® master nodes | `true` | +| `master.readinessProbe.initialDelaySeconds` | Initial delay seconds for readinessProbe | `20` | +| `master.readinessProbe.periodSeconds` | Period seconds for readinessProbe | `5` | +| `master.readinessProbe.timeoutSeconds` | Timeout seconds for readinessProbe | `1` | +| `master.readinessProbe.failureThreshold` | Failure threshold for readinessProbe | `5` | +| `master.readinessProbe.successThreshold` | Success threshold for readinessProbe | `1` | +| `master.customStartupProbe` | Custom startupProbe that overrides the default one | `{}` | +| `master.customLivenessProbe` | Custom livenessProbe that overrides the default one | `{}` | +| `master.customReadinessProbe` | Custom readinessProbe that overrides the default one | `{}` | +| `master.resources.limits` | The resources limits for the Redis® master containers | `{}` | +| `master.resources.requests` | The requested resources for the Redis® master containers | `{}` | +| `master.podSecurityContext.enabled` | Enabled Redis® master pods' Security Context | `true` | +| `master.podSecurityContext.fsGroup` | Set Redis® master pod's Security Context fsGroup | `1001` | +| `master.containerSecurityContext.enabled` | Enabled Redis® master containers' Security Context | `true` | +| `master.containerSecurityContext.runAsUser` | Set Redis® master containers' Security Context runAsUser | `1001` | +| `master.kind` | Use either Deployment or StatefulSet (default) | `StatefulSet` | +| `master.schedulerName` | Alternate scheduler for Redis® master pods | `""` | +| `master.updateStrategy.type` | Redis® master statefulset strategy type | `RollingUpdate` | +| `master.minReadySeconds` | How many seconds a pod needs to be ready before killing the next, during update | `0` | +| `master.priorityClassName` | Redis® master pods' priorityClassName | `""` | +| `master.hostAliases` | Redis® master pods host aliases | `[]` | +| `master.podLabels` | Extra labels for Redis® master pods | `{}` | +| `master.podAnnotations` | Annotations for Redis® master pods | `{}` | +| `master.shareProcessNamespace` | Share a single process namespace between all of the containers in Redis® master pods | `false` | +| `master.podAffinityPreset` | Pod affinity preset. Ignored if `master.affinity` is set. Allowed values: `soft` or `hard` | `""` | +| `master.podAntiAffinityPreset` | Pod anti-affinity preset. Ignored if `master.affinity` is set. Allowed values: `soft` or `hard` | `soft` | +| `master.nodeAffinityPreset.type` | Node affinity preset type. Ignored if `master.affinity` is set. Allowed values: `soft` or `hard` | `""` | +| `master.nodeAffinityPreset.key` | Node label key to match. Ignored if `master.affinity` is set | `""` | +| `master.nodeAffinityPreset.values` | Node label values to match. Ignored if `master.affinity` is set | `[]` | +| `master.affinity` | Affinity for Redis® master pods assignment | `{}` | +| `master.nodeSelector` | Node labels for Redis® master pods assignment | `{}` | +| `master.tolerations` | Tolerations for Redis® master pods assignment | `[]` | +| `master.topologySpreadConstraints` | Spread Constraints for Redis® master pod assignment | `[]` | +| `master.dnsPolicy` | DNS Policy for Redis® master pod | `""` | +| `master.dnsConfig` | DNS Configuration for Redis® master pod | `{}` | +| `master.lifecycleHooks` | for the Redis® master container(s) to automate configuration before or after startup | `{}` | +| `master.extraVolumes` | Optionally specify extra list of additional volumes for the Redis® master pod(s) | `[]` | +| `master.extraVolumeMounts` | Optionally specify extra list of additional volumeMounts for the Redis® master container(s) | `[]` | +| `master.sidecars` | Add additional sidecar containers to the Redis® master pod(s) | `[]` | +| `master.initContainers` | Add additional init containers to the Redis® master pod(s) | `[]` | +| `master.persistence.enabled` | Enable persistence on Redis® master nodes using Persistent Volume Claims | `true` | +| `master.persistence.medium` | Provide a medium for `emptyDir` volumes. | `""` | +| `master.persistence.sizeLimit` | Set this to enable a size limit for `emptyDir` volumes. | `""` | +| `master.persistence.path` | The path the volume will be mounted at on Redis® master containers | `/data` | +| `master.persistence.subPath` | The subdirectory of the volume to mount on Redis® master containers | `""` | +| `master.persistence.subPathExpr` | Used to construct the subPath subdirectory of the volume to mount on Redis® master containers | `""` | +| `master.persistence.storageClass` | Persistent Volume storage class | `""` | +| `master.persistence.accessModes` | Persistent Volume access modes | `["ReadWriteOnce"]` | +| `master.persistence.size` | Persistent Volume size | `8Gi` | +| `master.persistence.annotations` | Additional custom annotations for the PVC | `{}` | +| `master.persistence.selector` | Additional labels to match for the PVC | `{}` | +| `master.persistence.dataSource` | Custom PVC data source | `{}` | +| `master.persistence.existingClaim` | Use a existing PVC which must be created manually before bound | `""` | +| `master.service.type` | Redis® master service type | `ClusterIP` | +| `master.service.ports.redis` | Redis® master service port | `6379` | +| `master.service.nodePorts.redis` | Node port for Redis® master | `""` | +| `master.service.externalTrafficPolicy` | Redis® master service external traffic policy | `Cluster` | +| `master.service.extraPorts` | Extra ports to expose (normally used with the `sidecar` value) | `[]` | +| `master.service.internalTrafficPolicy` | Redis® master service internal traffic policy (requires Kubernetes v1.22 or greater to be usable) | `Cluster` | +| `master.service.clusterIP` | Redis® master service Cluster IP | `""` | +| `master.service.loadBalancerIP` | Redis® master service Load Balancer IP | `""` | +| `master.service.loadBalancerSourceRanges` | Redis® master service Load Balancer sources | `[]` | +| `master.service.externalIPs` | Redis® master service External IPs | `[]` | +| `master.service.annotations` | Additional custom annotations for Redis® master service | `{}` | +| `master.service.sessionAffinity` | Session Affinity for Kubernetes service, can be "None" or "ClientIP" | `None` | +| `master.service.sessionAffinityConfig` | Additional settings for the sessionAffinity | `{}` | +| `master.terminationGracePeriodSeconds` | Integer setting the termination grace period for the redis-master pods | `30` | +| `master.serviceAccount.create` | Specifies whether a ServiceAccount should be created | `false` | +| `master.serviceAccount.name` | The name of the ServiceAccount to use. | `""` | +| `master.serviceAccount.automountServiceAccountToken` | Whether to auto mount the service account token | `true` | +| `master.serviceAccount.annotations` | Additional custom annotations for the ServiceAccount | `{}` | + + +### Redis® replicas configuration parameters + +| Name | Description | Value | +| ----------------------------------------------------- | ------------------------------------------------------------------------------------------------------- | ------------------------ | +| `replica.replicaCount` | Number of Redis® replicas to deploy | `3` | +| `replica.configuration` | Configuration for Redis® replicas nodes | `""` | +| `replica.disableCommands` | Array with Redis® commands to disable on replicas nodes | `["FLUSHDB","FLUSHALL"]` | +| `replica.command` | Override default container command (useful when using custom images) | `[]` | +| `replica.args` | Override default container args (useful when using custom images) | `[]` | +| `replica.preExecCmds` | Additional commands to run prior to starting Redis® replicas | `[]` | +| `replica.extraFlags` | Array with additional command line flags for Redis® replicas | `[]` | +| `replica.extraEnvVars` | Array with extra environment variables to add to Redis® replicas nodes | `[]` | +| `replica.extraEnvVarsCM` | Name of existing ConfigMap containing extra env vars for Redis® replicas nodes | `""` | +| `replica.extraEnvVarsSecret` | Name of existing Secret containing extra env vars for Redis® replicas nodes | `""` | +| `replica.externalMaster.enabled` | Use external master for bootstrapping | `false` | +| `replica.externalMaster.host` | External master host to bootstrap from | `""` | +| `replica.externalMaster.port` | Port for Redis service external master host | `6379` | +| `replica.containerPorts.redis` | Container port to open on Redis® replicas nodes | `6379` | +| `replica.startupProbe.enabled` | Enable startupProbe on Redis® replicas nodes | `true` | +| `replica.startupProbe.initialDelaySeconds` | Initial delay seconds for startupProbe | `10` | +| `replica.startupProbe.periodSeconds` | Period seconds for startupProbe | `10` | +| `replica.startupProbe.timeoutSeconds` | Timeout seconds for startupProbe | `5` | +| `replica.startupProbe.failureThreshold` | Failure threshold for startupProbe | `22` | +| `replica.startupProbe.successThreshold` | Success threshold for startupProbe | `1` | +| `replica.livenessProbe.enabled` | Enable livenessProbe on Redis® replicas nodes | `true` | +| `replica.livenessProbe.initialDelaySeconds` | Initial delay seconds for livenessProbe | `20` | +| `replica.livenessProbe.periodSeconds` | Period seconds for livenessProbe | `5` | +| `replica.livenessProbe.timeoutSeconds` | Timeout seconds for livenessProbe | `5` | +| `replica.livenessProbe.failureThreshold` | Failure threshold for livenessProbe | `5` | +| `replica.livenessProbe.successThreshold` | Success threshold for livenessProbe | `1` | +| `replica.readinessProbe.enabled` | Enable readinessProbe on Redis® replicas nodes | `true` | +| `replica.readinessProbe.initialDelaySeconds` | Initial delay seconds for readinessProbe | `20` | +| `replica.readinessProbe.periodSeconds` | Period seconds for readinessProbe | `5` | +| `replica.readinessProbe.timeoutSeconds` | Timeout seconds for readinessProbe | `1` | +| `replica.readinessProbe.failureThreshold` | Failure threshold for readinessProbe | `5` | +| `replica.readinessProbe.successThreshold` | Success threshold for readinessProbe | `1` | +| `replica.customStartupProbe` | Custom startupProbe that overrides the default one | `{}` | +| `replica.customLivenessProbe` | Custom livenessProbe that overrides the default one | `{}` | +| `replica.customReadinessProbe` | Custom readinessProbe that overrides the default one | `{}` | +| `replica.resources.limits` | The resources limits for the Redis® replicas containers | `{}` | +| `replica.resources.requests` | The requested resources for the Redis® replicas containers | `{}` | +| `replica.podSecurityContext.enabled` | Enabled Redis® replicas pods' Security Context | `true` | +| `replica.podSecurityContext.fsGroup` | Set Redis® replicas pod's Security Context fsGroup | `1001` | +| `replica.containerSecurityContext.enabled` | Enabled Redis® replicas containers' Security Context | `true` | +| `replica.containerSecurityContext.runAsUser` | Set Redis® replicas containers' Security Context runAsUser | `1001` | +| `replica.schedulerName` | Alternate scheduler for Redis® replicas pods | `""` | +| `replica.updateStrategy.type` | Redis® replicas statefulset strategy type | `RollingUpdate` | +| `replica.minReadySeconds` | How many seconds a pod needs to be ready before killing the next, during update | `0` | +| `replica.priorityClassName` | Redis® replicas pods' priorityClassName | `""` | +| `replica.podManagementPolicy` | podManagementPolicy to manage scaling operation of %%MAIN_CONTAINER_NAME%% pods | `""` | +| `replica.hostAliases` | Redis® replicas pods host aliases | `[]` | +| `replica.podLabels` | Extra labels for Redis® replicas pods | `{}` | +| `replica.podAnnotations` | Annotations for Redis® replicas pods | `{}` | +| `replica.shareProcessNamespace` | Share a single process namespace between all of the containers in Redis® replicas pods | `false` | +| `replica.podAffinityPreset` | Pod affinity preset. Ignored if `replica.affinity` is set. Allowed values: `soft` or `hard` | `""` | +| `replica.podAntiAffinityPreset` | Pod anti-affinity preset. Ignored if `replica.affinity` is set. Allowed values: `soft` or `hard` | `soft` | +| `replica.nodeAffinityPreset.type` | Node affinity preset type. Ignored if `replica.affinity` is set. Allowed values: `soft` or `hard` | `""` | +| `replica.nodeAffinityPreset.key` | Node label key to match. Ignored if `replica.affinity` is set | `""` | +| `replica.nodeAffinityPreset.values` | Node label values to match. Ignored if `replica.affinity` is set | `[]` | +| `replica.affinity` | Affinity for Redis® replicas pods assignment | `{}` | +| `replica.nodeSelector` | Node labels for Redis® replicas pods assignment | `{}` | +| `replica.tolerations` | Tolerations for Redis® replicas pods assignment | `[]` | +| `replica.topologySpreadConstraints` | Spread Constraints for Redis® replicas pod assignment | `[]` | +| `replica.dnsPolicy` | DNS Policy for Redis® replica pods | `""` | +| `replica.dnsConfig` | DNS Configuration for Redis® replica pods | `{}` | +| `replica.lifecycleHooks` | for the Redis® replica container(s) to automate configuration before or after startup | `{}` | +| `replica.extraVolumes` | Optionally specify extra list of additional volumes for the Redis® replicas pod(s) | `[]` | +| `replica.extraVolumeMounts` | Optionally specify extra list of additional volumeMounts for the Redis® replicas container(s) | `[]` | +| `replica.sidecars` | Add additional sidecar containers to the Redis® replicas pod(s) | `[]` | +| `replica.initContainers` | Add additional init containers to the Redis® replicas pod(s) | `[]` | +| `replica.persistence.enabled` | Enable persistence on Redis® replicas nodes using Persistent Volume Claims | `true` | +| `replica.persistence.medium` | Provide a medium for `emptyDir` volumes. | `""` | +| `replica.persistence.sizeLimit` | Set this to enable a size limit for `emptyDir` volumes. | `""` | +| `replica.persistence.path` | The path the volume will be mounted at on Redis® replicas containers | `/data` | +| `replica.persistence.subPath` | The subdirectory of the volume to mount on Redis® replicas containers | `""` | +| `replica.persistence.subPathExpr` | Used to construct the subPath subdirectory of the volume to mount on Redis® replicas containers | `""` | +| `replica.persistence.storageClass` | Persistent Volume storage class | `""` | +| `replica.persistence.accessModes` | Persistent Volume access modes | `["ReadWriteOnce"]` | +| `replica.persistence.size` | Persistent Volume size | `8Gi` | +| `replica.persistence.annotations` | Additional custom annotations for the PVC | `{}` | +| `replica.persistence.selector` | Additional labels to match for the PVC | `{}` | +| `replica.persistence.dataSource` | Custom PVC data source | `{}` | +| `replica.persistence.existingClaim` | Use a existing PVC which must be created manually before bound | `""` | +| `replica.service.type` | Redis® replicas service type | `ClusterIP` | +| `replica.service.ports.redis` | Redis® replicas service port | `6379` | +| `replica.service.nodePorts.redis` | Node port for Redis® replicas | `""` | +| `replica.service.externalTrafficPolicy` | Redis® replicas service external traffic policy | `Cluster` | +| `replica.service.internalTrafficPolicy` | Redis® replicas service internal traffic policy (requires Kubernetes v1.22 or greater to be usable) | `Cluster` | +| `replica.service.extraPorts` | Extra ports to expose (normally used with the `sidecar` value) | `[]` | +| `replica.service.clusterIP` | Redis® replicas service Cluster IP | `""` | +| `replica.service.loadBalancerIP` | Redis® replicas service Load Balancer IP | `""` | +| `replica.service.loadBalancerSourceRanges` | Redis® replicas service Load Balancer sources | `[]` | +| `replica.service.annotations` | Additional custom annotations for Redis® replicas service | `{}` | +| `replica.service.sessionAffinity` | Session Affinity for Kubernetes service, can be "None" or "ClientIP" | `None` | +| `replica.service.sessionAffinityConfig` | Additional settings for the sessionAffinity | `{}` | +| `replica.terminationGracePeriodSeconds` | Integer setting the termination grace period for the redis-replicas pods | `30` | +| `replica.autoscaling.enabled` | Enable replica autoscaling settings | `false` | +| `replica.autoscaling.minReplicas` | Minimum replicas for the pod autoscaling | `1` | +| `replica.autoscaling.maxReplicas` | Maximum replicas for the pod autoscaling | `11` | +| `replica.autoscaling.targetCPU` | Percentage of CPU to consider when autoscaling | `""` | +| `replica.autoscaling.targetMemory` | Percentage of Memory to consider when autoscaling | `""` | +| `replica.serviceAccount.create` | Specifies whether a ServiceAccount should be created | `false` | +| `replica.serviceAccount.name` | The name of the ServiceAccount to use. | `""` | +| `replica.serviceAccount.automountServiceAccountToken` | Whether to auto mount the service account token | `true` | +| `replica.serviceAccount.annotations` | Additional custom annotations for the ServiceAccount | `{}` | + + +### Redis® Sentinel configuration parameters + +| Name | Description | Value | +| --------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------ | +| `sentinel.enabled` | Use Redis® Sentinel on Redis® pods. | `false` | +| `sentinel.image.registry` | Redis® Sentinel image registry | `docker.io` | +| `sentinel.image.repository` | Redis® Sentinel image repository | `bitnami/redis-sentinel` | +| `sentinel.image.tag` | Redis® Sentinel image tag (immutable tags are recommended) | `7.0.7-debian-11-r10` | +| `sentinel.image.digest` | Redis® Sentinel image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` | +| `sentinel.image.pullPolicy` | Redis® Sentinel image pull policy | `IfNotPresent` | +| `sentinel.image.pullSecrets` | Redis® Sentinel image pull secrets | `[]` | +| `sentinel.image.debug` | Enable image debug mode | `false` | +| `sentinel.masterSet` | Master set name | `mymaster` | +| `sentinel.quorum` | Sentinel Quorum | `2` | +| `sentinel.getMasterTimeout` | Amount of time to allow before get_sentinel_master_info() times out. | `220` | +| `sentinel.automateClusterRecovery` | Automate cluster recovery in cases where the last replica is not considered a good replica and Sentinel won't automatically failover to it. | `false` | +| `sentinel.redisShutdownWaitFailover` | Whether the Redis® master container waits for the failover at shutdown (in addition to the Redis® Sentinel container). | `true` | +| `sentinel.downAfterMilliseconds` | Timeout for detecting a Redis® node is down | `60000` | +| `sentinel.failoverTimeout` | Timeout for performing a election failover | `180000` | +| `sentinel.parallelSyncs` | Number of replicas that can be reconfigured in parallel to use the new master after a failover | `1` | +| `sentinel.configuration` | Configuration for Redis® Sentinel nodes | `""` | +| `sentinel.command` | Override default container command (useful when using custom images) | `[]` | +| `sentinel.args` | Override default container args (useful when using custom images) | `[]` | +| `sentinel.preExecCmds` | Additional commands to run prior to starting Redis® Sentinel | `[]` | +| `sentinel.extraEnvVars` | Array with extra environment variables to add to Redis® Sentinel nodes | `[]` | +| `sentinel.extraEnvVarsCM` | Name of existing ConfigMap containing extra env vars for Redis® Sentinel nodes | `""` | +| `sentinel.extraEnvVarsSecret` | Name of existing Secret containing extra env vars for Redis® Sentinel nodes | `""` | +| `sentinel.externalMaster.enabled` | Use external master for bootstrapping | `false` | +| `sentinel.externalMaster.host` | External master host to bootstrap from | `""` | +| `sentinel.externalMaster.port` | Port for Redis service external master host | `6379` | +| `sentinel.containerPorts.sentinel` | Container port to open on Redis® Sentinel nodes | `26379` | +| `sentinel.startupProbe.enabled` | Enable startupProbe on Redis® Sentinel nodes | `true` | +| `sentinel.startupProbe.initialDelaySeconds` | Initial delay seconds for startupProbe | `10` | +| `sentinel.startupProbe.periodSeconds` | Period seconds for startupProbe | `10` | +| `sentinel.startupProbe.timeoutSeconds` | Timeout seconds for startupProbe | `5` | +| `sentinel.startupProbe.failureThreshold` | Failure threshold for startupProbe | `22` | +| `sentinel.startupProbe.successThreshold` | Success threshold for startupProbe | `1` | +| `sentinel.livenessProbe.enabled` | Enable livenessProbe on Redis® Sentinel nodes | `true` | +| `sentinel.livenessProbe.initialDelaySeconds` | Initial delay seconds for livenessProbe | `20` | +| `sentinel.livenessProbe.periodSeconds` | Period seconds for livenessProbe | `5` | +| `sentinel.livenessProbe.timeoutSeconds` | Timeout seconds for livenessProbe | `5` | +| `sentinel.livenessProbe.failureThreshold` | Failure threshold for livenessProbe | `5` | +| `sentinel.livenessProbe.successThreshold` | Success threshold for livenessProbe | `1` | +| `sentinel.readinessProbe.enabled` | Enable readinessProbe on Redis® Sentinel nodes | `true` | +| `sentinel.readinessProbe.initialDelaySeconds` | Initial delay seconds for readinessProbe | `20` | +| `sentinel.readinessProbe.periodSeconds` | Period seconds for readinessProbe | `5` | +| `sentinel.readinessProbe.timeoutSeconds` | Timeout seconds for readinessProbe | `1` | +| `sentinel.readinessProbe.failureThreshold` | Failure threshold for readinessProbe | `5` | +| `sentinel.readinessProbe.successThreshold` | Success threshold for readinessProbe | `1` | +| `sentinel.customStartupProbe` | Custom startupProbe that overrides the default one | `{}` | +| `sentinel.customLivenessProbe` | Custom livenessProbe that overrides the default one | `{}` | +| `sentinel.customReadinessProbe` | Custom readinessProbe that overrides the default one | `{}` | +| `sentinel.persistence.enabled` | Enable persistence on Redis® sentinel nodes using Persistent Volume Claims (Experimental) | `false` | +| `sentinel.persistence.storageClass` | Persistent Volume storage class | `""` | +| `sentinel.persistence.accessModes` | Persistent Volume access modes | `["ReadWriteOnce"]` | +| `sentinel.persistence.size` | Persistent Volume size | `100Mi` | +| `sentinel.persistence.annotations` | Additional custom annotations for the PVC | `{}` | +| `sentinel.persistence.selector` | Additional labels to match for the PVC | `{}` | +| `sentinel.persistence.dataSource` | Custom PVC data source | `{}` | +| `sentinel.persistence.medium` | Provide a medium for `emptyDir` volumes. | `""` | +| `sentinel.persistence.sizeLimit` | Set this to enable a size limit for `emptyDir` volumes. | `""` | +| `sentinel.resources.limits` | The resources limits for the Redis® Sentinel containers | `{}` | +| `sentinel.resources.requests` | The requested resources for the Redis® Sentinel containers | `{}` | +| `sentinel.containerSecurityContext.enabled` | Enabled Redis® Sentinel containers' Security Context | `true` | +| `sentinel.containerSecurityContext.runAsUser` | Set Redis® Sentinel containers' Security Context runAsUser | `1001` | +| `sentinel.lifecycleHooks` | for the Redis® sentinel container(s) to automate configuration before or after startup | `{}` | +| `sentinel.extraVolumes` | Optionally specify extra list of additional volumes for the Redis® Sentinel | `[]` | +| `sentinel.extraVolumeMounts` | Optionally specify extra list of additional volumeMounts for the Redis® Sentinel container(s) | `[]` | +| `sentinel.service.type` | Redis® Sentinel service type | `ClusterIP` | +| `sentinel.service.ports.redis` | Redis® service port for Redis® | `6379` | +| `sentinel.service.ports.sentinel` | Redis® service port for Redis® Sentinel | `26379` | +| `sentinel.service.nodePorts.redis` | Node port for Redis® | `""` | +| `sentinel.service.nodePorts.sentinel` | Node port for Sentinel | `""` | +| `sentinel.service.externalTrafficPolicy` | Redis® Sentinel service external traffic policy | `Cluster` | +| `sentinel.service.extraPorts` | Extra ports to expose (normally used with the `sidecar` value) | `[]` | +| `sentinel.service.clusterIP` | Redis® Sentinel service Cluster IP | `""` | +| `sentinel.service.loadBalancerIP` | Redis® Sentinel service Load Balancer IP | `""` | +| `sentinel.service.loadBalancerSourceRanges` | Redis® Sentinel service Load Balancer sources | `[]` | +| `sentinel.service.annotations` | Additional custom annotations for Redis® Sentinel service | `{}` | +| `sentinel.service.sessionAffinity` | Session Affinity for Kubernetes service, can be "None" or "ClientIP" | `None` | +| `sentinel.service.sessionAffinityConfig` | Additional settings for the sessionAffinity | `{}` | +| `sentinel.terminationGracePeriodSeconds` | Integer setting the termination grace period for the redis-node pods | `30` | + + +### Other Parameters + +| Name | Description | Value | +| --------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------- | ------- | +| `networkPolicy.enabled` | Enable creation of NetworkPolicy resources | `false` | +| `networkPolicy.allowExternal` | Don't require client label for connections | `true` | +| `networkPolicy.extraIngress` | Add extra ingress rules to the NetworkPolicy | `[]` | +| `networkPolicy.extraEgress` | Add extra egress rules to the NetworkPolicy | `[]` | +| `networkPolicy.ingressNSMatchLabels` | Labels to match to allow traffic from other namespaces | `{}` | +| `networkPolicy.ingressNSPodMatchLabels` | Pod labels to match to allow traffic from other namespaces | `{}` | +| `podSecurityPolicy.create` | Whether to create a PodSecurityPolicy. WARNING: PodSecurityPolicy is deprecated in Kubernetes v1.21 or later, unavailable in v1.25 or later | `false` | +| `podSecurityPolicy.enabled` | Enable PodSecurityPolicy's RBAC rules | `false` | +| `rbac.create` | Specifies whether RBAC resources should be created | `false` | +| `rbac.rules` | Custom RBAC rules to set | `[]` | +| `serviceAccount.create` | Specifies whether a ServiceAccount should be created | `true` | +| `serviceAccount.name` | The name of the ServiceAccount to use. | `""` | +| `serviceAccount.automountServiceAccountToken` | Whether to auto mount the service account token | `true` | +| `serviceAccount.annotations` | Additional custom annotations for the ServiceAccount | `{}` | +| `pdb.create` | Specifies whether a PodDisruptionBudget should be created | `false` | +| `pdb.minAvailable` | Min number of pods that must still be available after the eviction | `1` | +| `pdb.maxUnavailable` | Max number of pods that can be unavailable after the eviction | `""` | +| `tls.enabled` | Enable TLS traffic | `false` | +| `tls.authClients` | Require clients to authenticate | `true` | +| `tls.autoGenerated` | Enable autogenerated certificates | `false` | +| `tls.existingSecret` | The name of the existing secret that contains the TLS certificates | `""` | +| `tls.certificatesSecret` | DEPRECATED. Use existingSecret instead. | `""` | +| `tls.certFilename` | Certificate filename | `""` | +| `tls.certKeyFilename` | Certificate Key filename | `""` | +| `tls.certCAFilename` | CA Certificate filename | `""` | +| `tls.dhParamsFilename` | File containing DH params (in order to support DH based ciphers) | `""` | + + +### Metrics Parameters + +| Name | Description | Value | +| -------------------------------------------- | ------------------------------------------------------------------------------------------------------------------- | ------------------------ | +| `metrics.enabled` | Start a sidecar prometheus exporter to expose Redis® metrics | `false` | +| `metrics.image.registry` | Redis® Exporter image registry | `docker.io` | +| `metrics.image.repository` | Redis® Exporter image repository | `bitnami/redis-exporter` | +| `metrics.image.tag` | Redis® Exporter image tag (immutable tags are recommended) | `1.45.0-debian-11-r26` | +| `metrics.image.digest` | Redis® Exporter image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` | +| `metrics.image.pullPolicy` | Redis® Exporter image pull policy | `IfNotPresent` | +| `metrics.image.pullSecrets` | Redis® Exporter image pull secrets | `[]` | +| `metrics.startupProbe.enabled` | Enable startupProbe on Redis® replicas nodes | `false` | +| `metrics.startupProbe.initialDelaySeconds` | Initial delay seconds for startupProbe | `10` | +| `metrics.startupProbe.periodSeconds` | Period seconds for startupProbe | `10` | +| `metrics.startupProbe.timeoutSeconds` | Timeout seconds for startupProbe | `5` | +| `metrics.startupProbe.failureThreshold` | Failure threshold for startupProbe | `5` | +| `metrics.startupProbe.successThreshold` | Success threshold for startupProbe | `1` | +| `metrics.livenessProbe.enabled` | Enable livenessProbe on Redis® replicas nodes | `true` | +| `metrics.livenessProbe.initialDelaySeconds` | Initial delay seconds for livenessProbe | `10` | +| `metrics.livenessProbe.periodSeconds` | Period seconds for livenessProbe | `10` | +| `metrics.livenessProbe.timeoutSeconds` | Timeout seconds for livenessProbe | `5` | +| `metrics.livenessProbe.failureThreshold` | Failure threshold for livenessProbe | `5` | +| `metrics.livenessProbe.successThreshold` | Success threshold for livenessProbe | `1` | +| `metrics.readinessProbe.enabled` | Enable readinessProbe on Redis® replicas nodes | `true` | +| `metrics.readinessProbe.initialDelaySeconds` | Initial delay seconds for readinessProbe | `5` | +| `metrics.readinessProbe.periodSeconds` | Period seconds for readinessProbe | `10` | +| `metrics.readinessProbe.timeoutSeconds` | Timeout seconds for readinessProbe | `1` | +| `metrics.readinessProbe.failureThreshold` | Failure threshold for readinessProbe | `3` | +| `metrics.readinessProbe.successThreshold` | Success threshold for readinessProbe | `1` | +| `metrics.customStartupProbe` | Custom startupProbe that overrides the default one | `{}` | +| `metrics.customLivenessProbe` | Custom livenessProbe that overrides the default one | `{}` | +| `metrics.customReadinessProbe` | Custom readinessProbe that overrides the default one | `{}` | +| `metrics.command` | Override default metrics container init command (useful when using custom images) | `[]` | +| `metrics.redisTargetHost` | A way to specify an alternative Redis® hostname | `localhost` | +| `metrics.extraArgs` | Extra arguments for Redis® exporter, for example: | `{}` | +| `metrics.extraEnvVars` | Array with extra environment variables to add to Redis® exporter | `[]` | +| `metrics.containerSecurityContext.enabled` | Enabled Redis® exporter containers' Security Context | `true` | +| `metrics.containerSecurityContext.runAsUser` | Set Redis® exporter containers' Security Context runAsUser | `1001` | +| `metrics.extraVolumes` | Optionally specify extra list of additional volumes for the Redis® metrics sidecar | `[]` | +| `metrics.extraVolumeMounts` | Optionally specify extra list of additional volumeMounts for the Redis® metrics sidecar | `[]` | +| `metrics.resources.limits` | The resources limits for the Redis® exporter container | `{}` | +| `metrics.resources.requests` | The requested resources for the Redis® exporter container | `{}` | +| `metrics.podLabels` | Extra labels for Redis® exporter pods | `{}` | +| `metrics.podAnnotations` | Annotations for Redis® exporter pods | `{}` | +| `metrics.service.type` | Redis® exporter service type | `ClusterIP` | +| `metrics.service.port` | Redis® exporter service port | `9121` | +| `metrics.service.externalTrafficPolicy` | Redis® exporter service external traffic policy | `Cluster` | +| `metrics.service.extraPorts` | Extra ports to expose (normally used with the `sidecar` value) | `[]` | +| `metrics.service.loadBalancerIP` | Redis® exporter service Load Balancer IP | `""` | +| `metrics.service.loadBalancerSourceRanges` | Redis® exporter service Load Balancer sources | `[]` | +| `metrics.service.annotations` | Additional custom annotations for Redis® exporter service | `{}` | +| `metrics.serviceMonitor.enabled` | Create ServiceMonitor resource(s) for scraping metrics using PrometheusOperator | `false` | +| `metrics.serviceMonitor.namespace` | The namespace in which the ServiceMonitor will be created | `""` | +| `metrics.serviceMonitor.interval` | The interval at which metrics should be scraped | `30s` | +| `metrics.serviceMonitor.scrapeTimeout` | The timeout after which the scrape is ended | `""` | +| `metrics.serviceMonitor.relabellings` | Metrics RelabelConfigs to apply to samples before scraping. | `[]` | +| `metrics.serviceMonitor.metricRelabelings` | Metrics RelabelConfigs to apply to samples before ingestion. | `[]` | +| `metrics.serviceMonitor.honorLabels` | Specify honorLabels parameter to add the scrape endpoint | `false` | +| `metrics.serviceMonitor.additionalLabels` | Additional labels that can be used so ServiceMonitor resource(s) can be discovered by Prometheus | `{}` | +| `metrics.serviceMonitor.podTargetLabels` | Labels from the Kubernetes pod to be transferred to the created metrics | `[]` | +| `metrics.prometheusRule.enabled` | Create a custom prometheusRule Resource for scraping metrics using PrometheusOperator | `false` | +| `metrics.prometheusRule.namespace` | The namespace in which the prometheusRule will be created | `""` | +| `metrics.prometheusRule.additionalLabels` | Additional labels for the prometheusRule | `{}` | +| `metrics.prometheusRule.rules` | Custom Prometheus rules | `[]` | + + +### Init Container Parameters + +| Name | Description | Value | +| ------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------- | ----------------------- | +| `volumePermissions.enabled` | Enable init container that changes the owner/group of the PV mount point to `runAsUser:fsGroup` | `false` | +| `volumePermissions.image.registry` | Bitnami Shell image registry | `docker.io` | +| `volumePermissions.image.repository` | Bitnami Shell image repository | `bitnami/bitnami-shell` | +| `volumePermissions.image.tag` | Bitnami Shell image tag (immutable tags are recommended) | `11-debian-11-r72` | +| `volumePermissions.image.digest` | Bitnami Shell image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` | +| `volumePermissions.image.pullPolicy` | Bitnami Shell image pull policy | `IfNotPresent` | +| `volumePermissions.image.pullSecrets` | Bitnami Shell image pull secrets | `[]` | +| `volumePermissions.resources.limits` | The resources limits for the init container | `{}` | +| `volumePermissions.resources.requests` | The requested resources for the init container | `{}` | +| `volumePermissions.containerSecurityContext.runAsUser` | Set init container's Security Context runAsUser | `0` | +| `sysctl.enabled` | Enable init container to modify Kernel settings | `false` | +| `sysctl.image.registry` | Bitnami Shell image registry | `docker.io` | +| `sysctl.image.repository` | Bitnami Shell image repository | `bitnami/bitnami-shell` | +| `sysctl.image.tag` | Bitnami Shell image tag (immutable tags are recommended) | `11-debian-11-r72` | +| `sysctl.image.digest` | Bitnami Shell image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` | +| `sysctl.image.pullPolicy` | Bitnami Shell image pull policy | `IfNotPresent` | +| `sysctl.image.pullSecrets` | Bitnami Shell image pull secrets | `[]` | +| `sysctl.command` | Override default init-sysctl container command (useful when using custom images) | `[]` | +| `sysctl.mountHostSys` | Mount the host `/sys` folder to `/host-sys` | `false` | +| `sysctl.resources.limits` | The resources limits for the init container | `{}` | +| `sysctl.resources.requests` | The requested resources for the init container | `{}` | + + +### useExternalDNS Parameters + +| Name | Description | Value | +| -------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------- | +| `useExternalDNS.enabled` | Enable various syntax that would enable external-dns to work. Note this requires a working installation of `external-dns` to be usable. | `false` | +| `useExternalDNS.additionalAnnotations` | Extra annotations to be utilized when `external-dns` is enabled. | `{}` | +| `useExternalDNS.annotationKey` | The annotation key utilized when `external-dns` is enabled. Setting this to `false` will disable annotations. | `external-dns.alpha.kubernetes.io/` | +| `useExternalDNS.suffix` | The DNS suffix utilized when `external-dns` is enabled. Note that we prepend the suffix with the full name of the release. | `""` | + + +Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example, + +```console +$ helm install my-release \ + --set auth.password=secretpassword \ + my-repo/redis +``` + +The above command sets the Redis® server password to `secretpassword`. + +> NOTE: Once this chart is deployed, it is not possible to change the application's access credentials, such as usernames or passwords, using Helm. To change these application credentials after deployment, delete any persistent volumes (PVs) used by the chart and re-deploy it, or use the application's built-in administrative tools if available. + +Alternatively, a YAML file that specifies the values for the parameters can be provided while installing the chart. For example, + +```console +$ helm install my-release -f values.yaml my-repo/redis +``` + +> **Tip**: You can use the default [values.yaml](values.yaml) + +## Configuration and installation details + +### [Rolling VS Immutable tags](https://docs.bitnami.com/containers/how-to/understand-rolling-tags-containers/) + +It is strongly recommended to use immutable tags in a production environment. This ensures your deployment does not change automatically if the same tag is updated with a different image. + +Bitnami will release a new chart updating its containers if a new version of the main container, significant changes, or critical vulnerabilities exist. + +### Use a different Redis® version + +To modify the application version used in this chart, specify a different version of the image using the `image.tag` parameter and/or a different repository using the `image.repository` parameter. Refer to the [chart documentation for more information on these parameters and how to use them with images from a private registry](https://docs.bitnami.com/kubernetes/infrastructure/redis/configuration/change-image-version/). + +### Bootstrapping with an External Cluster + +This chart is equipped with the ability to bring online a set of Pods that connect to an existing Redis deployment that lies outside of Kubernetes. This effectively creates a hybrid Redis Deployment where both Pods in Kubernetes and Instances such as Virtual Machines can partake in a single Redis Deployment. This is helpful in situations where one may be migrating Redis from Virtual Machines into Kubernetes, for example. To take advantage of this, use the following as an example configuration: + +```yaml +replica: + externalMaster: + enabled: true + host: external-redis-0.internal +sentinel: + externalMaster: + enabled: true + host: external-redis-0.internal +``` + +:warning: This is currently limited to clusters in which Sentinel and Redis run on the same node! :warning: + +Please also note that the external sentinel must be listening on port `26379`, and this is currently not configurable. + +Once the Kubernetes Redis Deployment is online and confirmed to be working with the existing cluster, the configuration can then be removed and the cluster will remain connected. + +### External DNS + +This chart is equipped to allow leveraging the ExternalDNS project. Doing so will enable ExternalDNS to publish the FQDN for each instance, in the format of `..`. +Example, when using the following configuration: + +```yaml +useExternalDNS: + enabled: true + suffix: prod.example.org + additionalAnnotations: + ttl: 10 +``` + +On a cluster where the name of the Helm release is `a`, the hostname of a Pod is generated as: `a-redis-node-0.a-redis.prod.example.org`. The IP of that FQDN will match that of the associated Pod. This modifies the following parameters of the Redis/Sentinel configuration using this new FQDN: + +* `replica-announce-ip` +* `known-sentinel` +* `known-replica` +* `announce-ip` + +:warning: This requires a working installation of `external-dns` to be fully functional. :warning: + +See the [official ExternalDNS documentation](https://github.com/kubernetes-sigs/external-dns) for additional configuration options. + +### Cluster topologies + +#### Default: Master-Replicas + +When installing the chart with `architecture=replication`, it will deploy a Redis® master StatefulSet and a Redis® replicas StatefulSet. The replicas will be read-replicas of the master. Two services will be exposed: + +- Redis® Master service: Points to the master, where read-write operations can be performed +- Redis® Replicas service: Points to the replicas, where only read operations are allowed by default. + +In case the master crashes, the replicas will wait until the master node is respawned again by the Kubernetes Controller Manager. + +#### Standalone + +When installing the chart with `architecture=standalone`, it will deploy a standalone Redis® StatefulSet. A single service will be exposed: + +- Redis® Master service: Points to the master, where read-write operations can be performed + +#### Master-Replicas with Sentinel + +When installing the chart with `architecture=replication` and `sentinel.enabled=true`, it will deploy a Redis® master StatefulSet (only one master allowed) and a Redis® replicas StatefulSet. In this case, the pods will contain an extra container with Redis® Sentinel. This container will form a cluster of Redis® Sentinel nodes, which will promote a new master in case the actual one fails. + +On graceful termination of the Redis® master pod, a failover of the master is initiated to promote a new master. The Redis® Sentinel container in this pod will wait for the failover to occur before terminating. If `sentinel.redisShutdownWaitFailover=true` is set (the default), the Redis® container will wait for the failover as well before terminating. This increases availability for reads during failover, but may cause stale reads until all clients have switched to the new master. + +In addition to this, only one service is exposed: + +- Redis® service: Exposes port 6379 for Redis® read-only operations and port 26379 for accessing Redis® Sentinel. + +For read-only operations, access the service using port 6379. For write operations, it's necessary to access the Redis® Sentinel cluster and query the current master using the command below (using redis-cli or similar): + +``` +SENTINEL get-master-addr-by-name +``` + +This command will return the address of the current master, which can be accessed from inside the cluster. + +In case the current master crashes, the Sentinel containers will elect a new master node. + +`master.count` greater than `1` is not designed for use when `sentinel.enabled=true`. + +### Multiple masters (experimental) + +When `master.count` is greater than `1`, special care must be taken to create a consistent setup. + +An example of use case is the creation of a redundant set of standalone masters or master-replicas per Kubernetes node where you must ensure: +- No more than `1` master can be deployed per Kubernetes node +- Replicas and writers can only see the single master of their own Kubernetes node + +One way of achieving this is by setting `master.service.internalTrafficPolicy=Local` in combination with a `master.affinity.podAntiAffinity` spec to never schedule more than one master per Kubernetes node. + +It's recommended to only change `master.count` if you know what you are doing. +`master.count` greater than `1` is not designed for use when `sentinel.enabled=true`. + +### Using a password file + +To use a password file for Redis® you need to create a secret containing the password and then deploy the chart using that secret. + +Refer to the chart documentation for more information on [using a password file for Redis®](https://docs.bitnami.com/kubernetes/infrastructure/redis/administration/use-password-file/). + +### Securing traffic using TLS + +TLS support can be enabled in the chart by specifying the `tls.` parameters while creating a release. The following parameters should be configured to properly enable the TLS support in the chart: + +- `tls.enabled`: Enable TLS support. Defaults to `false` +- `tls.existingSecret`: Name of the secret that contains the certificates. No defaults. +- `tls.certFilename`: Certificate filename. No defaults. +- `tls.certKeyFilename`: Certificate key filename. No defaults. +- `tls.certCAFilename`: CA Certificate filename. No defaults. + +Refer to the chart documentation for more information on [creating the secret and a TLS deployment example](https://docs.bitnami.com/kubernetes/infrastructure/redis/administration/enable-tls/). + +### Metrics + +The chart optionally can start a metrics exporter for [prometheus](https://prometheus.io). The metrics endpoint (port 9121) is exposed in the service. Metrics can be scraped from within the cluster using something similar as the described in the [example Prometheus scrape configuration](https://github.com/prometheus/prometheus/blob/master/documentation/examples/prometheus-kubernetes.yml). If metrics are to be scraped from outside the cluster, the Kubernetes API proxy can be utilized to access the endpoint. + +If you have enabled TLS by specifying `tls.enabled=true` you also need to specify TLS option to the metrics exporter. You can do that via `metrics.extraArgs`. You can find the metrics exporter CLI flags for TLS [here](https://github.com/oliver006/redis_exporter#command-line-flags). For example: + +You can either specify `metrics.extraArgs.skip-tls-verification=true` to skip TLS verification or providing the following values under `metrics.extraArgs` for TLS client authentication: + +```console +tls-client-key-file +tls-client-cert-file +tls-ca-cert-file +``` + +### Host Kernel Settings + +Redis® may require some changes in the kernel of the host machine to work as expected, in particular increasing the `somaxconn` value and disabling transparent huge pages. + +Refer to the chart documentation for more information on [configuring host kernel settings with an example](https://docs.bitnami.com/kubernetes/infrastructure/redis/administration/configure-kernel-settings/). + +## Persistence + +By default, the chart mounts a [Persistent Volume](https://kubernetes.io/docs/concepts/storage/persistent-volumes/) at the `/data` path. The volume is created using dynamic volume provisioning. If a Persistent Volume Claim already exists, specify it during installation. + +### Existing PersistentVolumeClaim + +1. Create the PersistentVolume +2. Create the PersistentVolumeClaim +3. Install the chart + +```console +$ helm install my-release --set master.persistence.existingClaim=PVC_NAME my-repo/redis +``` + +## Backup and restore + +Refer to the chart documentation for more information on [backing up and restoring Redis® deployments](https://docs.bitnami.com/kubernetes/infrastructure/redis/administration/backup-restore/). + +## NetworkPolicy + +To enable network policy for Redis®, install [a networking plugin that implements the Kubernetes NetworkPolicy spec](https://kubernetes.io/docs/tasks/administer-cluster/declare-network-policy#before-you-begin), and set `networkPolicy.enabled` to `true`. + +Refer to the chart documenation for more information on [enabling the network policy in Redis® deployments](https://docs.bitnami.com/kubernetes/infrastructure/redis/administration/enable-network-policy/). + +### Setting Pod's affinity + +This chart allows you to set your custom affinity using the `XXX.affinity` parameter(s). Find more information about Pod's affinity in the [Kubernetes documentation](https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity). + +As an alternative, you can use of the preset configurations for pod affinity, pod anti-affinity, and node affinity available at the [bitnami/common](https://github.com/bitnami/charts/tree/main/bitnami/common#affinities) chart. To do so, set the `XXX.podAffinityPreset`, `XXX.podAntiAffinityPreset`, or `XXX.nodeAffinityPreset` parameters. + +## Troubleshooting + +Find more information about how to deal with common errors related to Bitnami's Helm charts in [this troubleshooting guide](https://docs.bitnami.com/general/how-to/troubleshoot-helm-chart-issues). + +## Upgrading + +A major chart version change (like v1.2.3 -> v2.0.0) indicates that there is an incompatible breaking change needing manual actions. + +### To 17.0.0 + +This major version updates the Redis® docker image version used from `6.2` to `7.0`, the new stable version. There are no major changes in the chart, but we recommend checking the [Redis® 7.0 release notes](https://raw.githubusercontent.com/redis/redis/7.0/00-RELEASENOTES) before upgrading. + +### To 16.0.0 + +This major release renames several values in this chart and adds missing features, in order to be inline with the rest of assets in the Bitnami charts repository. + +Affected values: +- `master.service.port` renamed as `master.service.ports.redis`. +- `master.service.nodePort` renamed as `master.service.nodePorts.redis`. +- `replica.service.port` renamed as `replica.service.ports.redis`. +- `replica.service.nodePort` renamed as `replica.service.nodePorts.redis`. +- `sentinel.service.port` renamed as `sentinel.service.ports.redis`. +- `sentinel.service.sentinelPort` renamed as `sentinel.service.ports.sentinel`. +- `master.containerPort` renamed as `master.containerPorts.redis`. +- `replica.containerPort` renamed as `replica.containerPorts.redis`. +- `sentinel.containerPort` renamed as `sentinel.containerPorts.sentinel`. +- `master.spreadConstraints` renamed as `master.topologySpreadConstraints` +- `replica.spreadConstraints` renamed as `replica.topologySpreadConstraints` + +### To 15.0.0 + +The parameter to enable the usage of StaticIDs was removed. The behavior is to [always use StaticIDs](https://github.com/bitnami/charts/pull/7278). + +### To 14.8.0 + +The Redis® sentinel exporter was removed in this version because the upstream project was deprecated. The regular Redis® exporter is included in the sentinel scenario as usual. + +### To 14.0.0 + +- Several parameters were renamed or disappeared in favor of new ones on this major version: + - The term *slave* has been replaced by the term *replica*. Therefore, parameters prefixed with `slave` are now prefixed with `replicas`. + - Credentials parameter are reorganized under the `auth` parameter. + - `cluster.enabled` parameter is deprecated in favor of `architecture` parameter that accepts two values: `standalone` and `replication`. + - `securityContext.*` is deprecated in favor of `XXX.podSecurityContext` and `XXX.containerSecurityContext`. + - `sentinel.metrics.*` parameters are deprecated in favor of `metrics.sentinel.*` ones. +- New parameters to add custom command, environment variables, sidecars, init containers, etc. were added. +- Chart labels were adapted to follow the [Helm charts standard labels](https://helm.sh/docs/chart_best_practices/labels/#standard-labels). +- values.yaml metadata was adapted to follow the format supported by [Readme Generator for Helm](https://github.com/bitnami-labs/readme-generator-for-helm). + +Consequences: + +Backwards compatibility is not guaranteed. To upgrade to `14.0.0`, install a new release of the Redis® chart, and migrate the data from your previous release. You have 2 alternatives to do so: + +- Create a backup of the database, and restore it on the new release as explained in the [Backup and restore](#backup-and-restore) section. +- Reuse the PVC used to hold the master data on your previous release. To do so, use the `master.persistence.existingClaim` parameter. The following example assumes that the release name is `redis`: + +```console +$ helm install redis my-repo/redis --set auth.password=[PASSWORD] --set master.persistence.existingClaim=[EXISTING_PVC] +``` + +| Note: you need to substitute the placeholder _[EXISTING_PVC]_ with the name of the PVC used on your previous release, and _[PASSWORD]_ with the password used in your previous release. + +### To 13.0.0 + +This major version updates the Redis® docker image version used from `6.0` to `6.2`, the new stable version. There are no major changes in the chart and there shouldn't be any breaking changes in it as `6.2` is basically a stricter superset of `6.0`. For more information, please refer to [Redis® 6.2 release notes](https://raw.githubusercontent.com/redis/redis/6.2/00-RELEASENOTES). + +### To 12.3.0 + +This version also introduces `bitnami/common`, a [library chart](https://helm.sh/docs/topics/library_charts/#helm) as a dependency. More documentation about this new utility could be found [here](https://github.com/bitnami/charts/tree/main/bitnami/common#bitnami-common-library-chart). Please, make sure that you have updated the chart dependencies before executing any upgrade. + +### To 12.0.0 + +[On November 13, 2020, Helm v2 support was formally finished](https://github.com/helm/charts#status-of-the-project), this major version is the result of the required changes applied to the Helm Chart to be able to incorporate the different features added in Helm v3 and to be consistent with the Helm project itself regarding the Helm v2 EOL. + +**What changes were introduced in this major version?** + +- Previous versions of this Helm Chart use `apiVersion: v1` (installable by both Helm 2 and 3), this Helm Chart was updated to `apiVersion: v2` (installable by Helm 3 only). [Here](https://helm.sh/docs/topics/charts/#the-apiversion-field) you can find more information about the `apiVersion` field. +- The different fields present in the *Chart.yaml* file has been ordered alphabetically in a homogeneous way for all the Bitnami Helm Charts + +**Considerations when upgrading to this version** + +- If you want to upgrade to this version from a previous one installed with Helm v3, you shouldn't face any issues +- If you want to upgrade to this version using Helm v2, this scenario is not supported as this version doesn't support Helm v2 anymore +- If you installed the previous version with Helm v2 and wants to upgrade to this version with Helm v3, please refer to the [official Helm documentation](https://helm.sh/docs/topics/v2_v3_migration/#migration-use-cases) about migrating from Helm v2 to v3 + +**Useful links** + +- https://docs.bitnami.com/tutorials/resolve-helm2-helm3-post-migration-issues/ +- https://helm.sh/docs/topics/v2_v3_migration/ +- https://helm.sh/blog/migrate-from-helm-v2-to-helm-v3/ + +### To 11.0.0 + +When deployed with sentinel enabled, only a group of nodes is deployed and the master/slave role is handled in the group. To avoid breaking the compatibility, the settings for this nodes are given through the `slave.xxxx` parameters in `values.yaml` + +### To 9.0.0 + +The metrics exporter has been changed from a separate deployment to a sidecar container, due to the latest changes in the Redis® exporter code. Check the [official page](https://github.com/oliver006/redis_exporter/) for more information. The metrics container image was changed from oliver006/redis_exporter to bitnami/redis-exporter (Bitnami's maintained package of oliver006/redis_exporter). + +### To 7.0.0 + +In order to improve the performance in case of slave failure, we added persistence to the read-only slaves. That means that we moved from Deployment to StatefulSets. This should not affect upgrades from previous versions of the chart, as the deployments did not contain any persistence at all. + +This version also allows enabling Redis® Sentinel containers inside of the Redis® Pods (feature disabled by default). In case the master crashes, a new Redis® node will be elected as master. In order to query the current master (no redis master service is exposed), you need to query first the Sentinel cluster. + +### To 11.0.0 + +When using sentinel, a new statefulset called `-node` was introduced. This will break upgrading from a previous version where the statefulsets are called master and slave. Hence the PVC will not match the new naming and won't be reused. If you want to keep your data, you will need to perform a backup and then a restore the data in this new version. + +### To 10.0.0 + +For releases with `usePassword: true`, the value `sentinel.usePassword` controls whether the password authentication also applies to the sentinel port. This defaults to `true` for a secure configuration, however it is possible to disable to account for the following cases: + +- Using a version of redis-sentinel prior to `5.0.1` where the authentication feature was introduced. +- Where redis clients need to be updated to support sentinel authentication. + +If using a master/slave topology, or with `usePassword: false`, no action is required. + +### To 8.0.18 + +For releases with `metrics.enabled: true` the default tag for the exporter image is now `v1.x.x`. This introduces many changes including metrics names. You'll want to use [this dashboard](https://github.com/oliver006/redis_exporter/blob/master/contrib/grafana_prometheus_redis_dashboard.json) now. Please see the [redis_exporter github page](https://github.com/oliver006/redis_exporter#upgrading-from-0x-to-1x) for more details. + +### To 7.0.0 + +This version causes a change in the Redis® Master StatefulSet definition, so the command helm upgrade would not work out of the box. As an alternative, one of the following could be done: + +- Recommended: Create a clone of the Redis® Master PVC (for example, using projects like [this one](https://github.com/edseymour/pvc-transfer)). Then launch a fresh release reusing this cloned PVC. + + ``` + $ helm install my-release my-repo/redis --set persistence.existingClaim= + ``` + +- Alternative (not recommended, do at your own risk): `helm delete --purge` does not remove the PVC assigned to the Redis® Master StatefulSet. As a consequence, the following commands can be done to upgrade the release + + ``` + $ helm delete --purge + $ helm install my-repo/redis + ``` + +Previous versions of the chart were not using persistence in the slaves, so this upgrade would add it to them. Another important change is that no values are inherited from master to slaves. For example, in 6.0.0 `slaves.readinessProbe.periodSeconds`, if empty, would be set to `master.readinessProbe.periodSeconds`. This approach lacked transparency and was difficult to maintain. From now on, all the slave parameters must be configured just as it is done with the masters. + +Some values have changed as well: + +- `master.port` and `slave.port` have been changed to `redisPort` (same value for both master and slaves) +- `master.securityContext` and `slave.securityContext` have been changed to `securityContext`(same values for both master and slaves) + +By default, the upgrade will not change the cluster topology. In case you want to use Redis® Sentinel, you must explicitly set `sentinel.enabled` to `true`. + +### To 6.0.0 + +Previous versions of the chart were using an init-container to change the permissions of the volumes. This was done in case the `securityContext` directive in the template was not enough for that (for example, with cephFS). In this new version of the chart, this container is disabled by default (which should not affect most of the deployments). If your installation still requires that init container, execute `helm upgrade` with the `--set volumePermissions.enabled=true`. + +### To 5.0.0 + +The default image in this release may be switched out for any image containing the `redis-server` +and `redis-cli` binaries. If `redis-server` is not the default image ENTRYPOINT, `master.command` +must be specified. + +#### Breaking changes + +- `master.args` and `slave.args` are removed. Use `master.command` or `slave.command` instead in order to override the image entrypoint, or `master.extraFlags` to pass additional flags to `redis-server`. +- `disableCommands` is now interpreted as an array of strings instead of a string of comma separated values. +- `master.persistence.path` now defaults to `/data`. + +### To 4.0.0 + +This version removes the `chart` label from the `spec.selector.matchLabels` +which is immutable since `StatefulSet apps/v1beta2`. It has been inadvertently +added, causing any subsequent upgrade to fail. See https://github.com/helm/charts/issues/7726. + +It also fixes https://github.com/helm/charts/issues/7726 where a deployment `extensions/v1beta1` can not be upgraded if `spec.selector` is not explicitly set. + +Finally, it fixes https://github.com/helm/charts/issues/7803 by removing mutable labels in `spec.VolumeClaimTemplate.metadata.labels` so that it is upgradable. + +In order to upgrade, delete the Redis® StatefulSet before upgrading: + +```console +$ kubectl delete statefulsets.apps --cascade=false my-release-redis-master +``` + +And edit the Redis® slave (and metrics if enabled) deployment: + +```console +$ kubectl patch deployments my-release-redis-slave --type=json -p='[{"op": "remove", "path": "/spec/selector/matchLabels/chart"}]' +$ kubectl patch deployments my-release-redis-metrics --type=json -p='[{"op": "remove", "path": "/spec/selector/matchLabels/chart"}]' +``` + +## License + +Copyright © 2023 Bitnami + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. \ No newline at end of file diff --git a/redis-vrf/charts/common-2.2.2.tgz b/redis-vrf/charts/common-2.2.2.tgz new file mode 100644 index 0000000000000000000000000000000000000000..5b86fd8a123ce596b57737a613b735517dc00437 GIT binary patch literal 14851 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 -- bash + +In order to replicate the container startup scripts execute this command: + +For Redis: + + /opt/bitnami/scripts/redis/entrypoint.sh /opt/bitnami/scripts/redis/run.sh + +{{- if .Values.sentinel.enabled }} + +For Redis Sentinel: + + /opt/bitnami/scripts/redis-sentinel/entrypoint.sh /opt/bitnami/scripts/redis-sentinel/run.sh + +{{- end }} +{{- else }} + +{{- if contains .Values.master.service.type "LoadBalancer" }} +{{- if not .Values.auth.enabled }} +{{ if and (not .Values.networkPolicy.enabled) (.Values.networkPolicy.allowExternal) }} + +------------------------------------------------------------------------------- + WARNING + + By specifying "master.service.type=LoadBalancer" and "auth.enabled=false" you have + most likely exposed the Redis® service externally without any authentication + mechanism. + + For security reasons, we strongly suggest that you switch to "ClusterIP" or + "NodePort". As alternative, you can also switch to "auth.enabled=true" + providing a valid password on "password" parameter. + +------------------------------------------------------------------------------- +{{- end }} +{{- end }} +{{- end }} + +{{- if eq .Values.architecture "replication" }} +{{- if .Values.sentinel.enabled }} + +Redis® can be accessed via port {{ .Values.sentinel.service.ports.redis }} on the following DNS name from within your cluster: + + {{ template "common.names.fullname" . }}.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }} for read only operations + +For read/write operations, first access the Redis® Sentinel cluster, which is available in port {{ .Values.sentinel.service.ports.sentinel }} using the same domain name above. + +{{- else }} + +Redis® can be accessed on the following DNS names from within your cluster: + + {{ printf "%s-master.%s.svc.%s" (include "common.names.fullname" .) .Release.Namespace .Values.clusterDomain }} for read/write operations (port {{ .Values.master.service.ports.redis }}) + {{ printf "%s-replicas.%s.svc.%s" (include "common.names.fullname" .) .Release.Namespace .Values.clusterDomain }} for read-only operations (port {{ .Values.replica.service.ports.redis }}) + +{{- end }} +{{- else }} + +Redis® can be accessed via port {{ .Values.master.service.ports.redis }} on the following DNS name from within your cluster: + + {{ template "common.names.fullname" . }}-master.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }} + +{{- end }} + +{{ if .Values.auth.enabled }} + +To get your password run: + + export REDIS_PASSWORD=$(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "redis.secretName" . }} -o jsonpath="{.data.redis-password}" | base64 -d) + +{{- end }} + +To connect to your Redis® server: + +1. Run a Redis® pod that you can use as a client: + + kubectl run --namespace {{ .Release.Namespace }} redis-client --restart='Never' {{ if .Values.auth.enabled }} --env REDIS_PASSWORD=$REDIS_PASSWORD {{ end }} --image {{ template "redis.image" . }} --command -- sleep infinity + +{{- if .Values.tls.enabled }} + + Copy your TLS certificates to the pod: + + kubectl cp --namespace {{ .Release.Namespace }} /path/to/client.cert redis-client:/tmp/client.cert + kubectl cp --namespace {{ .Release.Namespace }} /path/to/client.key redis-client:/tmp/client.key + kubectl cp --namespace {{ .Release.Namespace }} /path/to/CA.cert redis-client:/tmp/CA.cert + +{{- end }} + + Use the following command to attach to the pod: + + kubectl exec --tty -i redis-client \ + {{- if and (.Values.networkPolicy.enabled) (not .Values.networkPolicy.allowExternal) }}--labels="{{ template "common.names.fullname" . }}-client=true" \{{- end }} + --namespace {{ .Release.Namespace }} -- bash + +2. Connect using the Redis® CLI: + +{{- if eq .Values.architecture "replication" }} + {{- if .Values.sentinel.enabled }} + {{ if .Values.auth.enabled }}REDISCLI_AUTH="$REDIS_PASSWORD" {{ end }}redis-cli -h {{ template "common.names.fullname" . }} -p {{ .Values.sentinel.service.ports.redis }}{{ if .Values.tls.enabled }} --tls --cert /tmp/client.cert --key /tmp/client.key --cacert /tmp/CA.cert{{ end }} # Read only operations + {{ if .Values.auth.enabled }}REDISCLI_AUTH="$REDIS_PASSWORD" {{ end }}redis-cli -h {{ template "common.names.fullname" . }} -p {{ .Values.sentinel.service.ports.sentinel }}{{ if .Values.tls.enabled }} --tls --cert /tmp/client.cert --key /tmp/client.key --cacert /tmp/CA.cert{{ end }} # Sentinel access + {{- else }} + {{ if .Values.auth.enabled }}REDISCLI_AUTH="$REDIS_PASSWORD" {{ end }}redis-cli -h {{ printf "%s-master" (include "common.names.fullname" .) }}{{ if .Values.tls.enabled }} --tls --cert /tmp/client.cert --key /tmp/client.key --cacert /tmp/CA.cert{{ end }} + {{ if .Values.auth.enabled }}REDISCLI_AUTH="$REDIS_PASSWORD" {{ end }}redis-cli -h {{ printf "%s-replicas" (include "common.names.fullname" .) }}{{ if .Values.tls.enabled }} --tls --cert /tmp/client.cert --key /tmp/client.key --cacert /tmp/CA.cert{{ end }} + {{- end }} +{{- else }} + {{ if .Values.auth.enabled }}REDISCLI_AUTH="$REDIS_PASSWORD" {{ end }}redis-cli -h {{ template "common.names.fullname" . }}-master{{ if .Values.tls.enabled }} --tls --cert /tmp/client.cert --key /tmp/client.key --cacert /tmp/CA.cert{{ end }} +{{- end }} + +{{- if and (.Values.networkPolicy.enabled) (not .Values.networkPolicy.allowExternal) }} + +Note: Since NetworkPolicy is enabled, only pods with label {{ template "common.names.fullname" . }}-client=true" will be able to connect to redis. + +{{- else }} + +To connect to your database from outside the cluster execute the following commands: + +{{- if and (eq .Values.architecture "replication") .Values.sentinel.enabled }} +{{- if contains "NodePort" .Values.sentinel.service.type }} + + export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}") + export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "common.names.fullname" . }}) + {{ if .Values.auth.enabled }}REDISCLI_AUTH="$REDIS_PASSWORD" {{ end }}redis-cli -h $NODE_IP -p $NODE_PORT {{- if .Values.tls.enabled }} --tls --cert /tmp/client.cert --key /tmp/client.key --cacert /tmp/CA.cert{{ end }} + +{{- else if contains "LoadBalancer" .Values.sentinel.service.type }} + + NOTE: It may take a few minutes for the LoadBalancer IP to be available. + Watch the status with: 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "common.names.fullname" . }}' + + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "common.names.fullname" . }} --template "{{ "{{ range (index .status.loadBalancer.ingress 0) }}{{ . }}{{ end }}" }}") + {{ if .Values.auth.enabled }}REDISCLI_AUTH="$REDIS_PASSWORD" {{ end }}redis-cli -h $SERVICE_IP -p {{ .Values.sentinel.service.ports.redis }} {{- if .Values.tls.enabled }} --tls --cert /tmp/client.cert --key /tmp/client.key --cacert /tmp/CA.cert{{ end }} + +{{- else if contains "ClusterIP" .Values.sentinel.service.type }} + + kubectl port-forward --namespace {{ .Release.Namespace }} svc/{{ template "common.names.fullname" . }} {{ .Values.sentinel.service.ports.redis }}:{{ .Values.sentinel.service.ports.redis }} & + {{ if .Values.auth.enabled }}REDISCLI_AUTH="$REDIS_PASSWORD" {{ end }}redis-cli -h 127.0.0.1 -p {{ .Values.sentinel.service.ports.redis }} {{- if .Values.tls.enabled }} --tls --cert /tmp/client.cert --key /tmp/client.key --cacert /tmp/CA.cert{{ end }} + +{{- end }} +{{- else }} +{{- if contains "NodePort" .Values.master.service.type }} + + export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}") + export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ printf "%s-master" (include "common.names.fullname" .) }}) + {{ if .Values.auth.enabled }}REDISCLI_AUTH="$REDIS_PASSWORD" {{ end }}redis-cli -h $NODE_IP -p $NODE_PORT {{- if .Values.tls.enabled }} --tls --cert /tmp/client.cert --key /tmp/client.key --cacert /tmp/CA.cert{{ end }} + +{{- else if contains "LoadBalancer" .Values.master.service.type }} + + NOTE: It may take a few minutes for the LoadBalancer IP to be available. + Watch the status with: 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "common.names.fullname" . }}' + + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ printf "%s-master" (include "common.names.fullname" .) }} --template "{{ "{{ range (index .status.loadBalancer.ingress 0) }}{{ . }}{{ end }}" }}") + {{ if .Values.auth.enabled }}REDISCLI_AUTH="$REDIS_PASSWORD" {{ end }}redis-cli -h $SERVICE_IP -p {{ .Values.master.service.ports.redis }} {{- if .Values.tls.enabled }} --tls --cert /tmp/client.cert --key /tmp/client.key --cacert /tmp/CA.cert{{ end }} + +{{- else if contains "ClusterIP" .Values.master.service.type }} + + kubectl port-forward --namespace {{ .Release.Namespace }} svc/{{ printf "%s-master" (include "common.names.fullname" .) }} {{ .Values.master.service.ports.redis }}:{{ .Values.master.service.ports.redis }} & + {{ if .Values.auth.enabled }}REDISCLI_AUTH="$REDIS_PASSWORD" {{ end }}redis-cli -h 127.0.0.1 -p {{ .Values.master.service.ports.redis }} {{- if .Values.tls.enabled }} --tls --cert /tmp/client.cert --key /tmp/client.key --cacert /tmp/CA.cert{{ end }} + +{{- end }} +{{- end }} + +{{- end }} +{{- end }} +{{- include "redis.checkRollingTags" . }} +{{- include "common.warnings.rollingTag" .Values.volumePermissions.image }} +{{- include "common.warnings.rollingTag" .Values.sysctl.image }} +{{- include "redis.validateValues" . }} + +{{- if and (eq .Values.architecture "replication") .Values.sentinel.enabled (eq .Values.sentinel.service.type "NodePort") (not .Release.IsUpgrade ) }} +{{- if $.Values.sentinel.service.nodePorts.sentinel }} +No need to upgrade, ports and nodeports have been set from values +{{- else }} +#!#!#!#!#!#!#!# IMPORTANT #!#!#!#!#!#!#!# +YOU NEED TO PERFORM AN UPGRADE FOR THE SERVICES AND WORKLOAD TO BE CREATED +{{- end }} +{{- end }} diff --git a/redis-vrf/templates/_helpers.tpl b/redis-vrf/templates/_helpers.tpl new file mode 100644 index 00000000..90064e80 --- /dev/null +++ b/redis-vrf/templates/_helpers.tpl @@ -0,0 +1,321 @@ +{{/* vim: set filetype=mustache: */}} + +{{/* +Return the proper Redis image name +*/}} +{{- define "redis.image" -}} +{{ include "common.images.image" (dict "imageRoot" .Values.image "global" .Values.global) }} +{{- end -}} + +{{/* +Return the proper Redis Sentinel image name +*/}} +{{- define "redis.sentinel.image" -}} +{{ include "common.images.image" (dict "imageRoot" .Values.sentinel.image "global" .Values.global) }} +{{- end -}} + +{{/* +Return the proper image name (for the metrics image) +*/}} +{{- define "redis.metrics.image" -}} +{{ include "common.images.image" (dict "imageRoot" .Values.metrics.image "global" .Values.global) }} +{{- end -}} + +{{/* +Return the proper image name (for the init container volume-permissions image) +*/}} +{{- define "redis.volumePermissions.image" -}} +{{ include "common.images.image" (dict "imageRoot" .Values.volumePermissions.image "global" .Values.global) }} +{{- end -}} + +{{/* +Return sysctl image +*/}} +{{- define "redis.sysctl.image" -}} +{{ include "common.images.image" (dict "imageRoot" .Values.sysctl.image "global" .Values.global) }} +{{- end -}} + +{{/* +Return the proper Docker Image Registry Secret Names +*/}} +{{- define "redis.imagePullSecrets" -}} +{{- include "common.images.pullSecrets" (dict "images" (list .Values.image .Values.sentinel.image .Values.metrics.image .Values.volumePermissions.image .Values.sysctl.image) "global" .Values.global) -}} +{{- end -}} + +{{/* +Return the appropriate apiVersion for networkpolicy. +*/}} +{{- define "networkPolicy.apiVersion" -}} +{{- if semverCompare ">=1.4-0, <1.7-0" .Capabilities.KubeVersion.GitVersion -}} +{{- print "extensions/v1beta1" -}} +{{- else -}} +{{- print "networking.k8s.io/v1" -}} +{{- end -}} +{{- end -}} + +{{/* +Return the appropriate apiGroup for PodSecurityPolicy. +*/}} +{{- define "podSecurityPolicy.apiGroup" -}} +{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- print "policy" -}} +{{- else -}} +{{- print "extensions" -}} +{{- end -}} +{{- end -}} + +{{/* +Return true if a TLS secret object should be created +*/}} +{{- define "redis.createTlsSecret" -}} +{{- if and .Values.tls.enabled .Values.tls.autoGenerated (and (not .Values.tls.existingSecret) (not .Values.tls.certificatesSecret)) }} + {{- true -}} +{{- end -}} +{{- end -}} + +{{/* +Return the secret containing Redis TLS certificates +*/}} +{{- define "redis.tlsSecretName" -}} +{{- $secretName := coalesce .Values.tls.existingSecret .Values.tls.certificatesSecret -}} +{{- if $secretName -}} + {{- printf "%s" (tpl $secretName $) -}} +{{- else -}} + {{- printf "%s-crt" (include "common.names.fullname" .) -}} +{{- end -}} +{{- end -}} + +{{/* +Return the path to the cert file. +*/}} +{{- define "redis.tlsCert" -}} +{{- if (include "redis.createTlsSecret" . ) -}} + {{- printf "/opt/bitnami/redis/certs/%s" "tls.crt" -}} +{{- else -}} + {{- required "Certificate filename is required when TLS in enabled" .Values.tls.certFilename | printf "/opt/bitnami/redis/certs/%s" -}} +{{- end -}} +{{- end -}} + +{{/* +Return the path to the cert key file. +*/}} +{{- define "redis.tlsCertKey" -}} +{{- if (include "redis.createTlsSecret" . ) -}} + {{- printf "/opt/bitnami/redis/certs/%s" "tls.key" -}} +{{- else -}} + {{- required "Certificate Key filename is required when TLS in enabled" .Values.tls.certKeyFilename | printf "/opt/bitnami/redis/certs/%s" -}} +{{- end -}} +{{- end -}} + +{{/* +Return the path to the CA cert file. +*/}} +{{- define "redis.tlsCACert" -}} +{{- if (include "redis.createTlsSecret" . ) -}} + {{- printf "/opt/bitnami/redis/certs/%s" "ca.crt" -}} +{{- else -}} + {{- required "Certificate CA filename is required when TLS in enabled" .Values.tls.certCAFilename | printf "/opt/bitnami/redis/certs/%s" -}} +{{- end -}} +{{- end -}} + +{{/* +Return the path to the DH params file. +*/}} +{{- define "redis.tlsDHParams" -}} +{{- if .Values.tls.dhParamsFilename -}} +{{- printf "/opt/bitnami/redis/certs/%s" .Values.tls.dhParamsFilename -}} +{{- end -}} +{{- end -}} + +{{/* +Create the name of the shared service account to use +*/}} +{{- define "redis.serviceAccountName" -}} +{{- if .Values.serviceAccount.create -}} + {{ default (include "common.names.fullname" .) .Values.serviceAccount.name }} +{{- else -}} + {{ default "default" .Values.serviceAccount.name }} +{{- end -}} +{{- end -}} + +{{/* +Create the name of the master service account to use +*/}} +{{- define "redis.masterServiceAccountName" -}} +{{- if .Values.master.serviceAccount.create -}} + {{ default (printf "%s-master" (include "common.names.fullname" .)) .Values.master.serviceAccount.name }} +{{- else -}} + {{- if .Values.serviceAccount.create -}} + {{ template "redis.serviceAccountName" . }} + {{- else -}} + {{ default "default" .Values.master.serviceAccount.name }} + {{- end -}} +{{- end -}} +{{- end -}} + +{{/* +Create the name of the replicas service account to use +*/}} +{{- define "redis.replicaServiceAccountName" -}} +{{- if .Values.replica.serviceAccount.create -}} + {{ default (printf "%s-replica" (include "common.names.fullname" .)) .Values.replica.serviceAccount.name }} +{{- else -}} + {{- if .Values.serviceAccount.create -}} + {{ template "redis.serviceAccountName" . }} + {{- else -}} + {{ default "default" .Values.replica.serviceAccount.name }} + {{- end -}} +{{- end -}} +{{- end -}} + +{{/* +Return the configuration configmap name +*/}} +{{- define "redis.configmapName" -}} +{{- if .Values.existingConfigmap -}} + {{- printf "%s" (tpl .Values.existingConfigmap $) -}} +{{- else -}} + {{- printf "%s-configuration" (include "common.names.fullname" .) -}} +{{- end -}} +{{- end -}} + +{{/* +Return true if a configmap object should be created +*/}} +{{- define "redis.createConfigmap" -}} +{{- if empty .Values.existingConfigmap }} + {{- true -}} +{{- end -}} +{{- end -}} + +{{/* +Get the password secret. +*/}} +{{- define "redis.secretName" -}} +{{- if .Values.auth.existingSecret -}} +{{- printf "%s" (tpl .Values.auth.existingSecret $) -}} +{{- else -}} +{{- printf "%s" (include "common.names.fullname" .) -}} +{{- end -}} +{{- end -}} + +{{/* +Get the password key to be retrieved from Redis® secret. +*/}} +{{- define "redis.secretPasswordKey" -}} +{{- if and .Values.auth.existingSecret .Values.auth.existingSecretPasswordKey -}} +{{- printf "%s" .Values.auth.existingSecretPasswordKey -}} +{{- else -}} +{{- printf "redis-password" -}} +{{- end -}} +{{- end -}} + + +{{/* +Returns the available value for certain key in an existing secret (if it exists), +otherwise it generates a random value. +*/}} +{{- define "getValueFromSecret" }} + {{- $len := (default 16 .Length) | int -}} + {{- $obj := (lookup "v1" "Secret" .Namespace .Name).data -}} + {{- if $obj }} + {{- index $obj .Key | b64dec -}} + {{- else -}} + {{- randAlphaNum $len -}} + {{- end -}} +{{- end }} + +{{/* +Return Redis® password +*/}} +{{- define "redis.password" -}} +{{- if not (empty .Values.global.redis.password) }} + {{- .Values.global.redis.password -}} +{{- else if not (empty .Values.auth.password) -}} + {{- .Values.auth.password -}} +{{- else -}} + {{- include "getValueFromSecret" (dict "Namespace" .Release.Namespace "Name" (include "common.names.fullname" .) "Length" 10 "Key" "redis-password") -}} +{{- end -}} +{{- end -}} + +{{/* Check if there are rolling tags in the images */}} +{{- define "redis.checkRollingTags" -}} +{{- include "common.warnings.rollingTag" .Values.image }} +{{- include "common.warnings.rollingTag" .Values.sentinel.image }} +{{- include "common.warnings.rollingTag" .Values.metrics.image }} +{{- end -}} + +{{/* +Compile all warnings into a single message, and call fail. +*/}} +{{- define "redis.validateValues" -}} +{{- $messages := list -}} +{{- $messages := append $messages (include "redis.validateValues.topologySpreadConstraints" .) -}} +{{- $messages := append $messages (include "redis.validateValues.architecture" .) -}} +{{- $messages := append $messages (include "redis.validateValues.podSecurityPolicy.create" .) -}} +{{- $messages := append $messages (include "redis.validateValues.tls" .) -}} +{{- $messages := without $messages "" -}} +{{- $message := join "\n" $messages -}} + +{{- if $message -}} +{{- printf "\nVALUES VALIDATION:\n%s" $message | fail -}} +{{- end -}} +{{- end -}} + +{{/* Validate values of Redis® - spreadConstrainsts K8s version */}} +{{- define "redis.validateValues.topologySpreadConstraints" -}} +{{- if and (semverCompare "<1.16-0" .Capabilities.KubeVersion.GitVersion) .Values.replica.topologySpreadConstraints -}} +redis: topologySpreadConstraints + Pod Topology Spread Constraints are only available on K8s >= 1.16 + Find more information at https://kubernetes.io/docs/concepts/workloads/pods/pod-topology-spread-constraints/ +{{- end -}} +{{- end -}} + +{{/* Validate values of Redis® - must provide a valid architecture */}} +{{- define "redis.validateValues.architecture" -}} +{{- if and (ne .Values.architecture "standalone") (ne .Values.architecture "replication") -}} +redis: architecture + Invalid architecture selected. Valid values are "standalone" and + "replication". Please set a valid architecture (--set architecture="xxxx") +{{- end -}} +{{- if and .Values.sentinel.enabled (not (eq .Values.architecture "replication")) }} +redis: architecture + Using redis sentinel on standalone mode is not supported. + To deploy redis sentinel, please select the "replication" mode + (--set "architecture=replication,sentinel.enabled=true") +{{- end -}} +{{- end -}} + +{{/* Validate values of Redis® - PodSecurityPolicy create */}} +{{- define "redis.validateValues.podSecurityPolicy.create" -}} +{{- if and .Values.podSecurityPolicy.create (not .Values.podSecurityPolicy.enabled) }} +redis: podSecurityPolicy.create + In order to create PodSecurityPolicy, you also need to enable + podSecurityPolicy.enabled field +{{- end -}} +{{- end -}} + +{{/* Validate values of Redis® - TLS enabled */}} +{{- define "redis.validateValues.tls" -}} +{{- if and .Values.tls.enabled (not .Values.tls.autoGenerated) (not .Values.tls.existingSecret) (not .Values.tls.certificatesSecret) }} +redis: tls.enabled + In order to enable TLS, you also need to provide + an existing secret containing the TLS certificates or + enable auto-generated certificates. +{{- end -}} +{{- end -}} + +{{/* Define the suffix utilized for external-dns */}} +{{- define "redis.externalDNS.suffix" -}} +{{ printf "%s.%s" (include "common.names.fullname" .) .Values.useExternalDNS.suffix }} +{{- end -}} + +{{/* Compile all annotations utilized for external-dns */}} +{{- define "redis.externalDNS.annotations" -}} +{{- if and .Values.useExternalDNS.enabled .Values.useExternalDNS.annotationKey }} +{{ .Values.useExternalDNS.annotationKey }}hostname: {{ include "redis.externalDNS.suffix" . }} +{{- range $key, $val := .Values.useExternalDNS.additionalAnnotations }} +{{ $.Values.useExternalDNS.annotationKey }}{{ $key }}: {{ $val | quote }} +{{- end }} +{{- end }} +{{- end }} diff --git a/redis-vrf/templates/configmap.yaml b/redis-vrf/templates/configmap.yaml new file mode 100644 index 00000000..9e70a387 --- /dev/null +++ b/redis-vrf/templates/configmap.yaml @@ -0,0 +1,59 @@ +{{- if (include "redis.createConfigmap" .) }} +apiVersion: v1 +kind: ConfigMap +metadata: + name: {{ printf "%s-configuration" (include "common.names.fullname" .) }} + namespace: {{ .Release.Namespace | quote }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} +data: + redis.conf: |- + # User-supplied common configuration: + {{- if .Values.commonConfiguration }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonConfiguration "context" $ ) | nindent 4 }} + {{- end }} + # End of common configuration + master.conf: |- + dir {{ .Values.master.persistence.path }} + # User-supplied master configuration: + {{- if .Values.master.configuration }} + {{- include "common.tplvalues.render" ( dict "value" .Values.master.configuration "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.master.disableCommands }} + {{- range .Values.master.disableCommands }} + rename-command {{ . }} "" + {{- end }} + {{- end }} + # End of master configuration + replica.conf: |- + dir {{ .Values.replica.persistence.path }} + # User-supplied replica configuration: + {{- if .Values.replica.configuration }} + {{- include "common.tplvalues.render" ( dict "value" .Values.replica.configuration "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.replica.disableCommands }} + {{- range .Values.replica.disableCommands }} + rename-command {{ . }} "" + {{- end }} + {{- end }} + # End of replica configuration + {{- if .Values.sentinel.enabled }} + sentinel.conf: |- + dir "/tmp" + port {{ .Values.sentinel.containerPorts.sentinel }} + sentinel monitor {{ .Values.sentinel.masterSet }} {{ template "common.names.fullname" . }}-node-0.{{ template "common.names.fullname" . }}-headless.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }} {{ .Values.sentinel.service.ports.redis }} {{ .Values.sentinel.quorum }} + sentinel down-after-milliseconds {{ .Values.sentinel.masterSet }} {{ .Values.sentinel.downAfterMilliseconds }} + sentinel failover-timeout {{ .Values.sentinel.masterSet }} {{ .Values.sentinel.failoverTimeout }} + sentinel parallel-syncs {{ .Values.sentinel.masterSet }} {{ .Values.sentinel.parallelSyncs }} + # User-supplied sentinel configuration: + {{- if .Values.sentinel.configuration }} + {{- include "common.tplvalues.render" ( dict "value" .Values.sentinel.configuration "context" $ ) | nindent 4 }} + {{- end }} + # End of sentinel configuration + {{- end }} +{{- end }} diff --git a/redis-vrf/templates/extra-list.yaml b/redis-vrf/templates/extra-list.yaml new file mode 100644 index 00000000..9ac65f9e --- /dev/null +++ b/redis-vrf/templates/extra-list.yaml @@ -0,0 +1,4 @@ +{{- range .Values.extraDeploy }} +--- +{{ include "common.tplvalues.render" (dict "value" . "context" $) }} +{{- end }} diff --git a/redis-vrf/templates/headless-svc.yaml b/redis-vrf/templates/headless-svc.yaml new file mode 100644 index 00000000..d798a0b5 --- /dev/null +++ b/redis-vrf/templates/headless-svc.yaml @@ -0,0 +1,30 @@ +apiVersion: v1 +kind: Service +metadata: + name: {{ printf "%s-headless" (include "common.names.fullname" .) }} + namespace: {{ .Release.Namespace | quote }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + annotations: + {{- if .Values.commonAnnotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} + {{- include "redis.externalDNS.annotations" . | nindent 4 }} +spec: + type: ClusterIP + clusterIP: None + {{- if .Values.sentinel.enabled }} + publishNotReadyAddresses: true + {{- end }} + ports: + - name: tcp-redis + port: {{ if .Values.sentinel.enabled }}{{ .Values.sentinel.service.ports.redis }}{{ else }}{{ .Values.master.service.ports.redis }}{{ end }} + targetPort: redis + {{- if .Values.sentinel.enabled }} + - name: tcp-sentinel + port: {{ .Values.sentinel.service.ports.sentinel }} + targetPort: redis-sentinel + {{- end }} + selector: {{- include "common.labels.matchLabels" . | nindent 4 }} diff --git a/redis-vrf/templates/health-configmap.yaml b/redis-vrf/templates/health-configmap.yaml new file mode 100644 index 00000000..41f3145d --- /dev/null +++ b/redis-vrf/templates/health-configmap.yaml @@ -0,0 +1,192 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: {{ printf "%s-health" (include "common.names.fullname" .) }} + namespace: {{ .Release.Namespace | quote }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} +data: + ping_readiness_local.sh: |- + #!/bin/bash + + [[ -f $REDIS_PASSWORD_FILE ]] && export REDIS_PASSWORD="$(< "${REDIS_PASSWORD_FILE}")" + [[ -n "$REDIS_PASSWORD" ]] && export REDISCLI_AUTH="$REDIS_PASSWORD" + response=$( + timeout -s 3 $1 \ + redis-cli \ + -h localhost \ +{{- if .Values.tls.enabled }} + -p $REDIS_TLS_PORT \ + --tls \ + --cacert {{ template "redis.tlsCACert" . }} \ + {{- if .Values.tls.authClients }} + --cert {{ template "redis.tlsCert" . }} \ + --key {{ template "redis.tlsCertKey" . }} \ + {{- end }} +{{- else }} + -p $REDIS_PORT \ +{{- end }} + ping + ) + if [ "$?" -eq "124" ]; then + echo "Timed out" + exit 1 + fi + if [ "$response" != "PONG" ]; then + echo "$response" + exit 1 + fi + ping_liveness_local.sh: |- + #!/bin/bash + + [[ -f $REDIS_PASSWORD_FILE ]] && export REDIS_PASSWORD="$(< "${REDIS_PASSWORD_FILE}")" + [[ -n "$REDIS_PASSWORD" ]] && export REDISCLI_AUTH="$REDIS_PASSWORD" + response=$( + timeout -s 3 $1 \ + redis-cli \ + -h localhost \ +{{- if .Values.tls.enabled }} + -p $REDIS_TLS_PORT \ + --tls \ + --cacert {{ template "redis.tlsCACert" . }} \ + {{- if .Values.tls.authClients }} + --cert {{ template "redis.tlsCert" . }} \ + --key {{ template "redis.tlsCertKey" . }} \ + {{- end }} +{{- else }} + -p $REDIS_PORT \ +{{- end }} + ping + ) + if [ "$?" -eq "124" ]; then + echo "Timed out" + exit 1 + fi + responseFirstWord=$(echo $response | head -n1 | awk '{print $1;}') + if [ "$response" != "PONG" ] && [ "$responseFirstWord" != "LOADING" ] && [ "$responseFirstWord" != "MASTERDOWN" ]; then + echo "$response" + exit 1 + fi +{{- if .Values.sentinel.enabled }} + ping_sentinel.sh: |- + #!/bin/bash + +{{- if .Values.auth.sentinel }} + [[ -f $REDIS_PASSWORD_FILE ]] && export REDIS_PASSWORD="$(< "${REDIS_PASSWORD_FILE}")" + [[ -n "$REDIS_PASSWORD" ]] && export REDISCLI_AUTH="$REDIS_PASSWORD" +{{- end }} + response=$( + timeout -s 3 $1 \ + redis-cli \ + -h localhost \ +{{- if .Values.tls.enabled }} + -p $REDIS_SENTINEL_TLS_PORT_NUMBER \ + --tls \ + --cacert "$REDIS_SENTINEL_TLS_CA_FILE" \ + {{- if .Values.tls.authClients }} + --cert "$REDIS_SENTINEL_TLS_CERT_FILE" \ + --key "$REDIS_SENTINEL_TLS_KEY_FILE" \ + {{- end }} +{{- else }} + -p $REDIS_SENTINEL_PORT \ +{{- end }} + ping + ) + if [ "$?" -eq "124" ]; then + echo "Timed out" + exit 1 + fi + if [ "$response" != "PONG" ]; then + echo "$response" + exit 1 + fi + parse_sentinels.awk: |- + /ip/ {FOUND_IP=1} + /port/ {FOUND_PORT=1} + /runid/ {FOUND_RUNID=1} + !/ip|port|runid/ { + if (FOUND_IP==1) { + IP=$1; FOUND_IP=0; + } + else if (FOUND_PORT==1) { + PORT=$1; + FOUND_PORT=0; + } else if (FOUND_RUNID==1) { + printf "\nsentinel known-sentinel {{ .Values.sentinel.masterSet }} %s %s %s", IP, PORT, $0; FOUND_RUNID=0; + } + } +{{- end }} + ping_readiness_master.sh: |- + #!/bin/bash + + [[ -f $REDIS_MASTER_PASSWORD_FILE ]] && export REDIS_MASTER_PASSWORD="$(< "${REDIS_MASTER_PASSWORD_FILE}")" + [[ -n "$REDIS_MASTER_PASSWORD" ]] && export REDISCLI_AUTH="$REDIS_MASTER_PASSWORD" + response=$( + timeout -s 3 $1 \ + redis-cli \ + -h $REDIS_MASTER_HOST \ + -p $REDIS_MASTER_PORT_NUMBER \ +{{- if .Values.tls.enabled }} + --tls \ + --cacert {{ template "redis.tlsCACert" . }} \ + {{- if .Values.tls.authClients }} + --cert {{ template "redis.tlsCert" . }} \ + --key {{ template "redis.tlsCertKey" . }} \ + {{- end }} +{{- end }} + ping + ) + if [ "$?" -eq "124" ]; then + echo "Timed out" + exit 1 + fi + if [ "$response" != "PONG" ]; then + echo "$response" + exit 1 + fi + ping_liveness_master.sh: |- + #!/bin/bash + + [[ -f $REDIS_MASTER_PASSWORD_FILE ]] && export REDIS_MASTER_PASSWORD="$(< "${REDIS_MASTER_PASSWORD_FILE}")" + [[ -n "$REDIS_MASTER_PASSWORD" ]] && export REDISCLI_AUTH="$REDIS_MASTER_PASSWORD" + response=$( + timeout -s 3 $1 \ + redis-cli \ + -h $REDIS_MASTER_HOST \ + -p $REDIS_MASTER_PORT_NUMBER \ +{{- if .Values.tls.enabled }} + --tls \ + --cacert {{ template "redis.tlsCACert" . }} \ + {{- if .Values.tls.authClients }} + --cert {{ template "redis.tlsCert" . }} \ + --key {{ template "redis.tlsCertKey" . }} \ + {{- end }} +{{- end }} + ping + ) + if [ "$?" -eq "124" ]; then + echo "Timed out" + exit 1 + fi + responseFirstWord=$(echo $response | head -n1 | awk '{print $1;}') + if [ "$response" != "PONG" ] && [ "$responseFirstWord" != "LOADING" ]; then + echo "$response" + exit 1 + fi + ping_readiness_local_and_master.sh: |- + script_dir="$(dirname "$0")" + exit_status=0 + "$script_dir/ping_readiness_local.sh" $1 || exit_status=$? + "$script_dir/ping_readiness_master.sh" $1 || exit_status=$? + exit $exit_status + ping_liveness_local_and_master.sh: |- + script_dir="$(dirname "$0")" + exit_status=0 + "$script_dir/ping_liveness_local.sh" $1 || exit_status=$? + "$script_dir/ping_liveness_master.sh" $1 || exit_status=$? + exit $exit_status diff --git a/redis-vrf/templates/master/application.yaml b/redis-vrf/templates/master/application.yaml new file mode 100644 index 00000000..acff2e25 --- /dev/null +++ b/redis-vrf/templates/master/application.yaml @@ -0,0 +1,516 @@ +{{- if or (not (eq .Values.architecture "replication")) (not .Values.sentinel.enabled) }} +apiVersion: {{ include "common.capabilities.statefulset.apiVersion" . }} +kind: {{ .Values.master.kind }} +metadata: + name: {{ printf "%s-master" (include "common.names.fullname" .) }} + namespace: {{ .Release.Namespace | quote }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + app.kubernetes.io/component: master + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} +spec: + replicas: {{ .Values.master.count }} + selector: + matchLabels: {{- include "common.labels.matchLabels" . | nindent 6 }} + app.kubernetes.io/component: master + {{- if (eq .Values.master.kind "StatefulSet") }} + serviceName: {{ printf "%s-headless" (include "common.names.fullname" .) }} + {{- end }} + {{- if .Values.master.updateStrategy }} + {{- if (eq .Values.master.kind "Deployment") }} + strategy: {{- toYaml .Values.master.updateStrategy | nindent 4 }} + {{- else }} + updateStrategy: {{- toYaml .Values.master.updateStrategy | nindent 4 }} + {{- end }} + {{- if and .Values.master.minReadySeconds (semverCompare ">= 1.25" (include "common.capabilities.kubeVersion" .)) }} + minReadySeconds: {{ .Values.master.minReadySeconds }} + {{- end }} + {{- end }} + template: + metadata: + labels: {{- include "common.labels.standard" . | nindent 8 }} + app.kubernetes.io/component: master + {{- if .Values.master.podLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.master.podLabels "context" $ ) | nindent 8 }} + {{- end }} + {{- if and .Values.metrics.enabled .Values.metrics.podLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.metrics.podLabels "context" $ ) | nindent 8 }} + {{- end }} + annotations: + {{- if (include "redis.createConfigmap" .) }} + checksum/configmap: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }} + {{- end }} + checksum/health: {{ include (print $.Template.BasePath "/health-configmap.yaml") . | sha256sum }} + checksum/scripts: {{ include (print $.Template.BasePath "/scripts-configmap.yaml") . | sha256sum }} + checksum/secret: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }} + {{- if .Values.master.podAnnotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.master.podAnnotations "context" $ ) | nindent 8 }} + {{- end }} + {{- if and .Values.metrics.enabled .Values.metrics.podAnnotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.metrics.podAnnotations "context" $ ) | nindent 8 }} + {{- end }} + spec: + {{- include "redis.imagePullSecrets" . | nindent 6 }} + {{- if .Values.master.hostAliases }} + hostAliases: {{- include "common.tplvalues.render" (dict "value" .Values.master.hostAliases "context" $) | nindent 8 }} + {{- end }} + {{- if .Values.master.podSecurityContext.enabled }} + securityContext: {{- omit .Values.master.podSecurityContext "enabled" | toYaml | nindent 8 }} + {{- end }} + serviceAccountName: {{ template "redis.masterServiceAccountName" . }} + {{- if .Values.master.priorityClassName }} + priorityClassName: {{ .Values.master.priorityClassName | quote }} + {{- end }} + {{- if .Values.master.affinity }} + affinity: {{- include "common.tplvalues.render" (dict "value" .Values.master.affinity "context" $) | nindent 8 }} + {{- else }} + affinity: + podAffinity: {{- include "common.affinities.pods" (dict "type" .Values.master.podAffinityPreset "component" "master" "context" $) | nindent 10 }} + podAntiAffinity: {{- include "common.affinities.pods" (dict "type" .Values.master.podAntiAffinityPreset "component" "master" "context" $) | nindent 10 }} + nodeAffinity: {{- include "common.affinities.nodes" (dict "type" .Values.master.nodeAffinityPreset.type "key" .Values.master.nodeAffinityPreset.key "values" .Values.master.nodeAffinityPreset.values) | nindent 10 }} + {{- end }} + {{- if .Values.master.nodeSelector }} + nodeSelector: {{- include "common.tplvalues.render" (dict "value" .Values.master.nodeSelector "context" $) | nindent 8 }} + {{- end }} + {{- if .Values.master.tolerations }} + tolerations: {{- include "common.tplvalues.render" (dict "value" .Values.master.tolerations "context" $) | nindent 8 }} + {{- end }} + {{- if .Values.master.topologySpreadConstraints }} + topologySpreadConstraints: {{- include "common.tplvalues.render" (dict "value" .Values.master.topologySpreadConstraints "context" $) | nindent 8 }} + {{- end }} + {{- if .Values.master.shareProcessNamespace }} + shareProcessNamespace: {{ .Values.master.shareProcessNamespace }} + {{- end }} + {{- if .Values.master.schedulerName }} + schedulerName: {{ .Values.master.schedulerName | quote }} + {{- end }} + {{- if .Values.master.dnsPolicy }} + dnsPolicy: {{ .Values.master.dnsPolicy }} + {{- end }} + {{- if .Values.master.dnsConfig }} + dnsConfig: {{- include "common.tplvalues.render" (dict "value" .Values.master.dnsConfig "context" $) | nindent 8 }} + {{- end }} + terminationGracePeriodSeconds: {{ .Values.master.terminationGracePeriodSeconds }} + containers: + - name: redis + image: {{ template "redis.image" . }} + imagePullPolicy: {{ .Values.image.pullPolicy | quote }} + {{- if .Values.master.lifecycleHooks }} + lifecycle: {{- include "common.tplvalues.render" (dict "value" .Values.master.lifecycleHooks "context" $) | nindent 12 }} + {{- end }} + {{- if .Values.master.containerSecurityContext.enabled }} + securityContext: {{- omit .Values.master.containerSecurityContext "enabled" | toYaml | nindent 12 }} + {{- end }} + {{- if .Values.diagnosticMode.enabled }} + command: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.command "context" $) | nindent 12 }} + {{- else if .Values.master.command }} + command: {{- include "common.tplvalues.render" (dict "value" .Values.master.command "context" $) | nindent 12 }} + {{- else }} + command: + - /bin/bash + {{- end }} + {{- if .Values.diagnosticMode.enabled }} + args: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.args "context" $) | nindent 12 }} + {{- else if .Values.master.args }} + args: {{- include "common.tplvalues.render" (dict "value" .Values.master.args "context" $) | nindent 12 }} + {{- else }} + args: + - -c + - /opt/bitnami/scripts/start-scripts/start-master.sh + {{- end }} + env: + - name: BITNAMI_DEBUG + value: {{ ternary "true" "false" (or .Values.image.debug .Values.diagnosticMode.enabled) | quote }} + - name: REDIS_REPLICATION_MODE + value: master + - name: ALLOW_EMPTY_PASSWORD + value: {{ ternary "no" "yes" .Values.auth.enabled | quote }} + {{- if .Values.auth.enabled }} + {{- if .Values.auth.usePasswordFiles }} + - name: REDIS_PASSWORD_FILE + value: "/opt/bitnami/redis/secrets/redis-password" + {{- else }} + - name: REDIS_PASSWORD + valueFrom: + secretKeyRef: + name: {{ template "redis.secretName" . }} + key: {{ template "redis.secretPasswordKey" . }} + {{- end }} + {{- end }} + - name: REDIS_TLS_ENABLED + value: {{ ternary "yes" "no" .Values.tls.enabled | quote }} + {{- if .Values.tls.enabled }} + - name: REDIS_TLS_PORT + value: {{ .Values.master.containerPorts.redis | quote }} + - name: REDIS_TLS_AUTH_CLIENTS + value: {{ ternary "yes" "no" .Values.tls.authClients | quote }} + - name: REDIS_TLS_CERT_FILE + value: {{ template "redis.tlsCert" . }} + - name: REDIS_TLS_KEY_FILE + value: {{ template "redis.tlsCertKey" . }} + - name: REDIS_TLS_CA_FILE + value: {{ template "redis.tlsCACert" . }} + {{- if .Values.tls.dhParamsFilename }} + - name: REDIS_TLS_DH_PARAMS_FILE + value: {{ template "redis.tlsDHParams" . }} + {{- end }} + {{- else }} + - name: REDIS_PORT + value: {{ .Values.master.containerPorts.redis | quote }} + {{- end }} + {{- if .Values.master.extraEnvVars }} + {{- include "common.tplvalues.render" (dict "value" .Values.master.extraEnvVars "context" $) | nindent 12 }} + {{- end }} + {{- if or .Values.master.extraEnvVarsCM .Values.master.extraEnvVarsSecret }} + envFrom: + {{- if .Values.master.extraEnvVarsCM }} + - configMapRef: + name: {{ .Values.master.extraEnvVarsCM }} + {{- end }} + {{- if .Values.master.extraEnvVarsSecret }} + - secretRef: + name: {{ .Values.master.extraEnvVarsSecret }} + {{- end }} + {{- end }} + ports: + - name: redis + containerPort: {{ .Values.master.containerPorts.redis }} + {{- if not .Values.diagnosticMode.enabled }} + {{- if .Values.master.customStartupProbe }} + startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.master.customStartupProbe "context" $) | nindent 12 }} + {{- else if .Values.master.startupProbe.enabled }} + startupProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.master.startupProbe "enabled") "context" $) | nindent 12 }} + tcpSocket: + port: redis + {{- end }} + {{- if .Values.master.customLivenessProbe }} + livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.master.customLivenessProbe "context" $) | nindent 12 }} + {{- else if .Values.master.livenessProbe.enabled }} + livenessProbe: + initialDelaySeconds: {{ .Values.master.livenessProbe.initialDelaySeconds }} + periodSeconds: {{ .Values.master.livenessProbe.periodSeconds }} + # One second longer than command timeout should prevent generation of zombie processes. + timeoutSeconds: {{ add1 .Values.master.livenessProbe.timeoutSeconds }} + successThreshold: {{ .Values.master.livenessProbe.successThreshold }} + failureThreshold: {{ .Values.master.livenessProbe.failureThreshold }} + exec: + command: + - sh + - -c + - /health/ping_liveness_local.sh {{ .Values.master.livenessProbe.timeoutSeconds }} + {{- end }} + {{- if .Values.master.customReadinessProbe }} + readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.master.customReadinessProbe "context" $) | nindent 12 }} + {{- else if .Values.master.readinessProbe.enabled }} + readinessProbe: + initialDelaySeconds: {{ .Values.master.readinessProbe.initialDelaySeconds }} + periodSeconds: {{ .Values.master.readinessProbe.periodSeconds }} + timeoutSeconds: {{ add1 .Values.master.readinessProbe.timeoutSeconds }} + successThreshold: {{ .Values.master.readinessProbe.successThreshold }} + failureThreshold: {{ .Values.master.readinessProbe.failureThreshold }} + exec: + command: + - sh + - -c + - /health/ping_readiness_local.sh {{ .Values.master.readinessProbe.timeoutSeconds }} + {{- end }} + {{- end }} + {{- if .Values.master.resources }} + resources: {{- toYaml .Values.master.resources | nindent 12 }} + {{- end }} + volumeMounts: + - name: start-scripts + mountPath: /opt/bitnami/scripts/start-scripts + - name: health + mountPath: /health + {{- if .Values.auth.usePasswordFiles }} + - name: redis-password + mountPath: /opt/bitnami/redis/secrets/ + {{- end }} + - name: redis-data + mountPath: {{ .Values.master.persistence.path }} + {{- if .Values.master.persistence.subPath }} + subPath: {{ .Values.master.persistence.subPath }} + {{- else if .Values.master.persistence.subPathExpr }} + subPathExpr: {{ .Values.master.persistence.subPathExpr }} + {{- end }} + - name: config + mountPath: /opt/bitnami/redis/mounted-etc + - name: redis-tmp-conf + mountPath: /opt/bitnami/redis/etc/ + - name: tmp + mountPath: /tmp + {{- if .Values.tls.enabled }} + - name: redis-certificates + mountPath: /opt/bitnami/redis/certs + readOnly: true + {{- end }} + {{- if .Values.master.extraVolumeMounts }} + {{- include "common.tplvalues.render" ( dict "value" .Values.master.extraVolumeMounts "context" $ ) | nindent 12 }} + {{- end }} + {{- if .Values.metrics.enabled }} + - name: metrics + image: {{ include "redis.metrics.image" . }} + imagePullPolicy: {{ .Values.metrics.image.pullPolicy | quote }} + {{- if .Values.metrics.containerSecurityContext.enabled }} + securityContext: {{- omit .Values.metrics.containerSecurityContext "enabled" | toYaml | nindent 12 }} + {{- end }} + {{- if .Values.diagnosticMode.enabled }} + command: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.command "context" $) | nindent 12 }} + {{- else }} + command: + - /bin/bash + - -c + - | + if [[ -f '/secrets/redis-password' ]]; then + export REDIS_PASSWORD=$(cat /secrets/redis-password) + fi + redis_exporter{{- range $key, $value := .Values.metrics.extraArgs }} --{{ $key }}={{ $value }}{{- end }} + {{- end }} + {{- if .Values.diagnosticMode.enabled }} + args: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.args "context" $) | nindent 12 }} + {{- end }} + env: + - name: REDIS_ALIAS + value: {{ template "common.names.fullname" . }} + {{- if .Values.auth.enabled }} + - name: REDIS_USER + value: default + {{- if (not .Values.auth.usePasswordFiles) }} + - name: REDIS_PASSWORD + valueFrom: + secretKeyRef: + name: {{ template "redis.secretName" . }} + key: {{ template "redis.secretPasswordKey" . }} + {{- end }} + {{- end }} + {{- if .Values.tls.enabled }} + - name: REDIS_ADDR + value: rediss://{{ .Values.metrics.redisTargetHost }}:{{ .Values.master.containerPorts.redis }} + {{- if .Values.tls.authClients }} + - name: REDIS_EXPORTER_TLS_CLIENT_KEY_FILE + value: {{ template "redis.tlsCertKey" . }} + - name: REDIS_EXPORTER_TLS_CLIENT_CERT_FILE + value: {{ template "redis.tlsCert" . }} + {{- end }} + - name: REDIS_EXPORTER_TLS_CA_CERT_FILE + value: {{ template "redis.tlsCACert" . }} + {{- end }} + {{- if .Values.metrics.extraEnvVars }} + {{- include "common.tplvalues.render" (dict "value" .Values.metrics.extraEnvVars "context" $) | nindent 12 }} + {{- end }} + ports: + - name: metrics + containerPort: 9121 + {{- if not .Values.diagnosticMode.enabled }} + {{- if .Values.metrics.customStartupProbe }} + startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.metrics.customStartupProbe "context" $) | nindent 12 }} + {{- else if .Values.metrics.startupProbe.enabled }} + startupProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.metrics.startupProbe "enabled") "context" $) | nindent 12 }} + tcpSocket: + port: metrics + {{- end }} + {{- if .Values.metrics.customLivenessProbe }} + livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.metrics.customLivenessProbe "context" $) | nindent 12 }} + {{- else if .Values.metrics.livenessProbe.enabled }} + livenessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.metrics.livenessProbe "enabled") "context" $) | nindent 12 }} + tcpSocket: + port: metrics + {{- end }} + {{- if .Values.metrics.customReadinessProbe }} + readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.metrics.customReadinessProbe "context" $) | nindent 12 }} + {{- else if .Values.metrics.readinessProbe.enabled }} + readinessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.metrics.readinessProbe "enabled") "context" $) | nindent 12 }} + httpGet: + path: / + port: metrics + {{- end }} + {{- end }} + {{- if .Values.metrics.resources }} + resources: {{- toYaml .Values.metrics.resources | nindent 12 }} + {{- end }} + volumeMounts: + {{- if .Values.auth.usePasswordFiles }} + - name: redis-password + mountPath: /secrets/ + {{- end }} + {{- if .Values.tls.enabled }} + - name: redis-certificates + mountPath: /opt/bitnami/redis/certs + readOnly: true + {{- end }} + {{- if .Values.metrics.extraVolumeMounts }} + {{- include "common.tplvalues.render" ( dict "value" .Values.metrics.extraVolumeMounts "context" $ ) | nindent 12 }} + {{- end }} + {{- end }} + {{- if .Values.master.sidecars }} + {{- include "common.tplvalues.render" (dict "value" .Values.master.sidecars "context" $) | nindent 8 }} + {{- end }} + {{- $needsVolumePermissions := and .Values.volumePermissions.enabled .Values.master.persistence.enabled .Values.master.podSecurityContext.enabled .Values.master.containerSecurityContext.enabled }} + {{- if or .Values.master.initContainers $needsVolumePermissions .Values.sysctl.enabled }} + initContainers: + {{- if .Values.master.initContainers }} + {{- include "common.tplvalues.render" (dict "value" .Values.master.initContainers "context" $) | nindent 8 }} + {{- end }} + {{- if $needsVolumePermissions }} + - name: volume-permissions + image: {{ include "redis.volumePermissions.image" . }} + imagePullPolicy: {{ .Values.volumePermissions.image.pullPolicy | quote }} + command: + - /bin/bash + - -ec + - | + {{- if eq ( toString ( .Values.volumePermissions.containerSecurityContext.runAsUser )) "auto" }} + chown -R `id -u`:`id -G | cut -d " " -f2` {{ .Values.master.persistence.path }} + {{- else }} + chown -R {{ .Values.master.containerSecurityContext.runAsUser }}:{{ .Values.master.podSecurityContext.fsGroup }} {{ .Values.master.persistence.path }} + {{- end }} + {{- if eq ( toString ( .Values.volumePermissions.containerSecurityContext.runAsUser )) "auto" }} + securityContext: {{- omit .Values.volumePermissions.containerSecurityContext "runAsUser" | toYaml | nindent 12 }} + {{- else }} + securityContext: {{- .Values.volumePermissions.containerSecurityContext | toYaml | nindent 12 }} + {{- end }} + {{- if .Values.volumePermissions.resources }} + resources: {{- toYaml .Values.volumePermissions.resources | nindent 12 }} + {{- end }} + volumeMounts: + - name: redis-data + mountPath: {{ .Values.master.persistence.path }} + {{- if .Values.master.persistence.subPath }} + subPath: {{ .Values.master.persistence.subPath }} + {{- else if .Values.master.persistence.subPathExpr }} + subPathExpr: {{ .Values.master.persistence.subPathExpr }} + {{- end }} + {{- end }} + {{- if .Values.sysctl.enabled }} + - name: init-sysctl + image: {{ include "redis.sysctl.image" . }} + imagePullPolicy: {{ default "" .Values.sysctl.image.pullPolicy | quote }} + securityContext: + privileged: true + runAsUser: 0 + {{- if .Values.sysctl.command }} + command: {{- include "common.tplvalues.render" (dict "value" .Values.sysctl.command "context" $) | nindent 12 }} + {{- end }} + {{- if .Values.sysctl.resources }} + resources: {{- toYaml .Values.sysctl.resources | nindent 12 }} + {{- end }} + {{- if .Values.sysctl.mountHostSys }} + volumeMounts: + - name: host-sys + mountPath: /host-sys + {{- end }} + {{- end }} + {{- end }} + volumes: + - name: start-scripts + configMap: + name: {{ printf "%s-scripts" (include "common.names.fullname" .) }} + defaultMode: 0755 + - name: health + configMap: + name: {{ printf "%s-health" (include "common.names.fullname" .) }} + defaultMode: 0755 + {{- if .Values.auth.usePasswordFiles }} + - name: redis-password + secret: + secretName: {{ template "redis.secretName" . }} + items: + - key: {{ template "redis.secretPasswordKey" . }} + path: redis-password + {{- end }} + - name: config + configMap: + name: {{ include "redis.configmapName" . }} + {{- if .Values.sysctl.mountHostSys }} + - name: host-sys + hostPath: + path: /sys + {{- end }} + - name: redis-tmp-conf + {{- if or .Values.master.persistence.medium .Values.master.persistence.sizeLimit }} + emptyDir: + {{- if .Values.master.persistence.medium }} + medium: {{ .Values.master.persistence.medium | quote }} + {{- end }} + {{- if .Values.master.persistence.sizeLimit }} + sizeLimit: {{ .Values.master.persistence.sizeLimit | quote }} + {{- end }} + {{- else }} + emptyDir: {} + {{- end }} + - name: tmp + {{- if or .Values.master.persistence.medium .Values.master.persistence.sizeLimit }} + emptyDir: + {{- if .Values.master.persistence.medium }} + medium: {{ .Values.master.persistence.medium | quote }} + {{- end }} + {{- if .Values.master.persistence.sizeLimit }} + sizeLimit: {{ .Values.master.persistence.sizeLimit | quote }} + {{- end }} + {{- else }} + emptyDir: {} + {{- end }} + {{- if .Values.tls.enabled }} + - name: redis-certificates + secret: + secretName: {{ include "redis.tlsSecretName" . }} + defaultMode: 256 + {{- end }} + {{- if .Values.master.extraVolumes }} + {{- include "common.tplvalues.render" ( dict "value" .Values.master.extraVolumes "context" $ ) | nindent 8 }} + {{- end }} + {{- if .Values.metrics.extraVolumes }} + {{- include "common.tplvalues.render" ( dict "value" .Values.metrics.extraVolumes "context" $ ) | nindent 8 }} + {{- end }} + {{- if not .Values.master.persistence.enabled }} + - name: redis-data + {{- if or .Values.master.persistence.medium .Values.master.persistence.sizeLimit }} + emptyDir: + {{- if .Values.master.persistence.medium }} + medium: {{ .Values.master.persistence.medium | quote }} + {{- end }} + {{- if .Values.master.persistence.sizeLimit }} + sizeLimit: {{ .Values.master.persistence.sizeLimit | quote }} + {{- end }} + {{- else }} + emptyDir: {} + {{- end }} + {{- else if .Values.master.persistence.existingClaim }} + - name: redis-data + persistentVolumeClaim: + claimName: {{ printf "%s" (tpl .Values.master.persistence.existingClaim .) }} + {{- else if (eq .Values.master.kind "Deployment") }} + - name: redis-data + persistentVolumeClaim: + claimName: {{ printf "redis-data-%s-master" (include "common.names.fullname" .) }} + {{- else }} + volumeClaimTemplates: + - metadata: + name: redis-data + labels: {{- include "common.labels.matchLabels" . | nindent 10 }} + app.kubernetes.io/component: master + {{- if .Values.master.persistence.annotations }} + annotations: {{- toYaml .Values.master.persistence.annotations | nindent 10 }} + {{- end }} + spec: + accessModes: + {{- range .Values.master.persistence.accessModes }} + - {{ . | quote }} + {{- end }} + resources: + requests: + storage: {{ .Values.master.persistence.size | quote }} + {{- if .Values.master.persistence.selector }} + selector: {{- include "common.tplvalues.render" (dict "value" .Values.master.persistence.selector "context" $) | nindent 10 }} + {{- end }} + {{- if .Values.master.persistence.dataSource }} + dataSource: {{- include "common.tplvalues.render" (dict "value" .Values.master.persistence.dataSource "context" $) | nindent 10 }} + {{- end }} + {{- include "common.storage.class" (dict "persistence" .Values.master.persistence "global" .Values.global) | nindent 8 }} + {{- end }} +{{- end }} diff --git a/redis-vrf/templates/master/psp.yaml b/redis-vrf/templates/master/psp.yaml new file mode 100644 index 00000000..2ba93b6e --- /dev/null +++ b/redis-vrf/templates/master/psp.yaml @@ -0,0 +1,46 @@ +{{- $pspAvailable := (semverCompare "<1.25-0" (include "common.capabilities.kubeVersion" .)) -}} +{{- if and $pspAvailable .Values.podSecurityPolicy.create }} +apiVersion: policy/v1beta1 +kind: PodSecurityPolicy +metadata: + name: {{ printf "%s-master" (include "common.names.fullname" .) }} + namespace: {{ .Release.Namespace | quote }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} +spec: + allowPrivilegeEscalation: false + fsGroup: + rule: 'MustRunAs' + ranges: + - min: {{ .Values.master.podSecurityContext.fsGroup }} + max: {{ .Values.master.podSecurityContext.fsGroup }} + hostIPC: false + hostNetwork: false + hostPID: false + privileged: false + readOnlyRootFilesystem: false + requiredDropCapabilities: + - ALL + runAsUser: + rule: 'MustRunAs' + ranges: + - min: {{ .Values.master.containerSecurityContext.runAsUser }} + max: {{ .Values.master.containerSecurityContext.runAsUser }} + seLinux: + rule: 'RunAsAny' + supplementalGroups: + rule: 'MustRunAs' + ranges: + - min: {{ .Values.master.containerSecurityContext.runAsUser }} + max: {{ .Values.master.containerSecurityContext.runAsUser }} + volumes: + - 'configMap' + - 'secret' + - 'emptyDir' + - 'persistentVolumeClaim' +{{- end }} diff --git a/redis-vrf/templates/master/pvc.yaml b/redis-vrf/templates/master/pvc.yaml new file mode 100644 index 00000000..e5fddb03 --- /dev/null +++ b/redis-vrf/templates/master/pvc.yaml @@ -0,0 +1,27 @@ +{{- if and (eq .Values.architecture "standalone") (eq .Values.master.kind "Deployment") (.Values.master.persistence.enabled) (not .Values.master.persistence.existingClaim) }} +kind: PersistentVolumeClaim +apiVersion: v1 +metadata: + name: {{ printf "redis-data-%s-master" (include "common.names.fullname" .) }} + namespace: {{ .Release.Namespace | quote }} + labels: {{- include "common.labels.matchLabels" . | nindent 4 }} + app.kubernetes.io/component: master + {{- if .Values.master.persistence.annotations }} + annotations: {{- toYaml .Values.master.persistence.annotations | nindent 4 }} + {{- end }} +spec: + accessModes: + {{- range .Values.master.persistence.accessModes }} + - {{ . | quote }} + {{- end }} + resources: + requests: + storage: {{ .Values.master.persistence.size | quote }} + {{- if .Values.master.persistence.selector }} + selector: {{- include "common.tplvalues.render" (dict "value" .Values.master.persistence.selector "context" $) | nindent 4 }} + {{- end }} + {{- if .Values.master.persistence.dataSource }} + dataSource: {{- include "common.tplvalues.render" (dict "value" .Values.master.persistence.dataSource "context" $) | nindent 4 }} + {{- end }} + {{- include "common.storage.class" (dict "persistence" .Values.master.persistence "global" .Values.global) | nindent 2 }} +{{- end }} diff --git a/redis-vrf/templates/master/service.yaml b/redis-vrf/templates/master/service.yaml new file mode 100644 index 00000000..c03fea70 --- /dev/null +++ b/redis-vrf/templates/master/service.yaml @@ -0,0 +1,61 @@ +{{- if not .Values.sentinel.enabled }} +apiVersion: v1 +kind: Service +metadata: + name: {{ printf "%s-master" (include "common.names.fullname" .) }} + namespace: {{ .Release.Namespace | quote }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + app.kubernetes.io/component: master + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + {{- if or .Values.master.service.annotations .Values.commonAnnotations }} + annotations: + {{- if .Values.master.service.annotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.master.service.annotations "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.commonAnnotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} + {{- end }} +spec: + type: {{ .Values.master.service.type }} + {{- if or (eq .Values.master.service.type "LoadBalancer") (eq .Values.master.service.type "NodePort") }} + externalTrafficPolicy: {{ .Values.master.service.externalTrafficPolicy | quote }} + {{- end }} + {{- if (semverCompare ">=1.22-0" (include "common.capabilities.kubeVersion" .)) }} + internalTrafficPolicy: {{ .Values.master.service.internalTrafficPolicy }} + {{- end }} + {{- if and (eq .Values.master.service.type "LoadBalancer") (not (empty .Values.master.service.loadBalancerIP)) }} + loadBalancerIP: {{ .Values.master.service.loadBalancerIP }} + {{- end }} + {{- if and (eq .Values.master.service.type "LoadBalancer") (not (empty .Values.master.service.loadBalancerSourceRanges)) }} + loadBalancerSourceRanges: {{ .Values.master.service.loadBalancerSourceRanges }} + {{- end }} + {{- if and .Values.master.service.clusterIP (eq .Values.master.service.type "ClusterIP") }} + clusterIP: {{ .Values.master.service.clusterIP }} + {{- end }} + {{- if .Values.master.service.sessionAffinity }} + sessionAffinity: {{ .Values.master.service.sessionAffinity }} + {{- end }} + {{- if .Values.master.service.sessionAffinityConfig }} + sessionAffinityConfig: {{- include "common.tplvalues.render" (dict "value" .Values.master.service.sessionAffinityConfig "context" $) | nindent 4 }} + {{- end }} + {{- if .Values.master.service.externalIPs }} + externalIPs: {{- include "common.tplvalues.render" (dict "value" .Values.master.service.externalIPs "context" $) | nindent 4 }} + {{- end }} + ports: + - name: tcp-redis + port: {{ .Values.master.service.ports.redis }} + targetPort: redis + {{- if and (or (eq .Values.master.service.type "NodePort") (eq .Values.master.service.type "LoadBalancer")) .Values.master.service.nodePorts.redis}} + nodePort: {{ .Values.master.service.nodePorts.redis}} + {{- else if eq .Values.master.service.type "ClusterIP" }} + nodePort: null + {{- end }} + {{- if .Values.master.service.extraPorts }} + {{- include "common.tplvalues.render" (dict "value" .Values.master.service.extraPorts "context" $) | nindent 4 }} + {{- end }} + selector: {{- include "common.labels.matchLabels" . | nindent 4 }} + app.kubernetes.io/component: master +{{- end }} diff --git a/redis-vrf/templates/master/serviceaccount.yaml b/redis-vrf/templates/master/serviceaccount.yaml new file mode 100644 index 00000000..9c62e5f2 --- /dev/null +++ b/redis-vrf/templates/master/serviceaccount.yaml @@ -0,0 +1,21 @@ +{{- if .Values.master.serviceAccount.create }} +apiVersion: v1 +kind: ServiceAccount +automountServiceAccountToken: {{ .Values.master.serviceAccount.automountServiceAccountToken }} +metadata: + name: {{ template "redis.masterServiceAccountName" . }} + namespace: {{ .Release.Namespace | quote }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + {{- if or .Values.commonAnnotations .Values.master.serviceAccount.annotations }} + annotations: + {{- if or .Values.commonAnnotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.master.serviceAccount.annotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.master.serviceAccount.annotations "context" $ ) | nindent 4 }} + {{- end }} + {{- end }} +{{- end }} diff --git a/redis-vrf/templates/metrics-svc.yaml b/redis-vrf/templates/metrics-svc.yaml new file mode 100644 index 00000000..13c552f3 --- /dev/null +++ b/redis-vrf/templates/metrics-svc.yaml @@ -0,0 +1,41 @@ +{{- if .Values.metrics.enabled }} +apiVersion: v1 +kind: Service +metadata: + name: {{ printf "%s-metrics" (include "common.names.fullname" .) }} + namespace: {{ .Release.Namespace | quote }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + app.kubernetes.io/component: metrics + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + {{- if or .Values.metrics.service.annotations .Values.commonAnnotations }} + annotations: + {{- if .Values.metrics.service.annotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.metrics.service.annotations "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.commonAnnotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} + {{- end }} +spec: + type: {{ .Values.metrics.service.type }} + {{- if eq .Values.metrics.service.type "LoadBalancer" }} + externalTrafficPolicy: {{ .Values.metrics.service.externalTrafficPolicy }} + {{- end }} + {{- if and (eq .Values.metrics.service.type "LoadBalancer") .Values.metrics.service.loadBalancerIP }} + loadBalancerIP: {{ .Values.metrics.service.loadBalancerIP }} + {{- end }} + {{- if and (eq .Values.metrics.service.type "LoadBalancer") .Values.metrics.service.loadBalancerSourceRanges }} + loadBalancerSourceRanges: {{- toYaml .Values.metrics.service.loadBalancerSourceRanges | nindent 4 }} + {{- end }} + ports: + - name: http-metrics + port: {{ .Values.metrics.service.port }} + protocol: TCP + targetPort: metrics + {{- if .Values.metrics.service.extraPorts }} + {{- include "common.tplvalues.render" (dict "value" .Values.metrics.service.extraPorts "context" $) | nindent 4 }} + {{- end }} + selector: {{- include "common.labels.matchLabels" . | nindent 4 }} +{{- end }} diff --git a/redis-vrf/templates/networkpolicy.yaml b/redis-vrf/templates/networkpolicy.yaml new file mode 100644 index 00000000..7205cea3 --- /dev/null +++ b/redis-vrf/templates/networkpolicy.yaml @@ -0,0 +1,82 @@ +{{- if .Values.networkPolicy.enabled }} +kind: NetworkPolicy +apiVersion: {{ template "networkPolicy.apiVersion" . }} +metadata: + name: {{ template "common.names.fullname" . }} + namespace: {{ .Release.Namespace | quote }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} +spec: + podSelector: + matchLabels: {{- include "common.labels.matchLabels" . | nindent 6 }} + policyTypes: + - Ingress + {{- if or (eq .Values.architecture "replication") .Values.networkPolicy.extraEgress }} + - Egress + egress: + {{- if eq .Values.architecture "replication" }} + # Allow dns resolution + - ports: + - port: 53 + protocol: UDP + # Allow outbound connections to other cluster pods + - ports: + - port: {{ .Values.master.containerPorts.redis }} + {{- if .Values.sentinel.enabled }} + - port: {{ .Values.sentinel.containerPorts.sentinel }} + {{- end }} + to: + - podSelector: + matchLabels: {{- include "common.labels.matchLabels" . | nindent 14 }} + {{- end }} + {{- if .Values.networkPolicy.extraEgress }} + {{- include "common.tplvalues.render" ( dict "value" .Values.networkPolicy.extraEgress "context" $ ) | nindent 4 }} + {{- end }} + {{- end }} + ingress: + # Allow inbound connections + - ports: + - port: {{ .Values.master.containerPorts.redis }} + {{- if .Values.sentinel.enabled }} + - port: {{ .Values.sentinel.containerPorts.sentinel }} + {{- end }} + {{- if not .Values.networkPolicy.allowExternal }} + from: + - podSelector: + matchLabels: + {{ template "common.names.fullname" . }}-client: "true" + - podSelector: + matchLabels: {{- include "common.labels.matchLabels" . | nindent 14 }} + {{- if or .Values.networkPolicy.ingressNSMatchLabels .Values.networkPolicy.ingressNSPodMatchLabels }} + - namespaceSelector: + matchLabels: + {{- if .Values.networkPolicy.ingressNSMatchLabels }} + {{- range $key, $value := .Values.networkPolicy.ingressNSMatchLabels }} + {{ $key | quote }}: {{ $value | quote }} + {{- end }} + {{ else }} + {} + {{- end }} + {{- if .Values.networkPolicy.ingressNSPodMatchLabels }} + podSelector: + matchLabels: + {{- range $key, $value := .Values.networkPolicy.ingressNSPodMatchLabels }} + {{ $key | quote }}: {{ $value | quote }} + {{- end }} + {{- end }} + {{- end }} + {{- end }} + {{- if .Values.metrics.enabled }} + # Allow prometheus scrapes for metrics + - ports: + - port: 9121 + {{- end }} + {{- if .Values.networkPolicy.extraIngress }} + {{- include "common.tplvalues.render" ( dict "value" .Values.networkPolicy.extraIngress "context" $ ) | nindent 4 }} + {{- end }} +{{- end }} diff --git a/redis-vrf/templates/pdb.yaml b/redis-vrf/templates/pdb.yaml new file mode 100644 index 00000000..f82d278a --- /dev/null +++ b/redis-vrf/templates/pdb.yaml @@ -0,0 +1,23 @@ +{{- if .Values.pdb.create }} +apiVersion: {{ include "common.capabilities.policy.apiVersion" . }} +kind: PodDisruptionBudget +metadata: + name: {{ template "common.names.fullname" . }} + namespace: {{ .Release.Namespace | quote }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} +spec: + {{- if .Values.pdb.minAvailable }} + minAvailable: {{ .Values.pdb.minAvailable }} + {{- end }} + {{- if .Values.pdb.maxUnavailable }} + maxUnavailable: {{ .Values.pdb.maxUnavailable }} + {{- end }} + selector: + matchLabels: {{- include "common.labels.matchLabels" . | nindent 6 }} +{{- end }} diff --git a/redis-vrf/templates/prometheusrule.yaml b/redis-vrf/templates/prometheusrule.yaml new file mode 100644 index 00000000..b89d1163 --- /dev/null +++ b/redis-vrf/templates/prometheusrule.yaml @@ -0,0 +1,21 @@ +{{- if and .Values.metrics.enabled .Values.metrics.prometheusRule.enabled }} +apiVersion: monitoring.coreos.com/v1 +kind: PrometheusRule +metadata: + name: {{ template "common.names.fullname" . }} + namespace: {{ default .Release.Namespace .Values.metrics.prometheusRule.namespace | quote }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + {{- if .Values.metrics.prometheusRule.additionalLabels }} + {{- include "common.tplvalues.render" (dict "value" .Values.metrics.prometheusRule.additionalLabels "context" $) | nindent 4 }} + {{- end }} + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} +spec: + groups: + - name: {{ include "common.names.fullname" . }} + rules: {{- include "common.tplvalues.render" ( dict "value" .Values.metrics.prometheusRule.rules "context" $ ) | nindent 8 }} +{{- end }} diff --git a/redis-vrf/templates/replicas/hpa.yaml b/redis-vrf/templates/replicas/hpa.yaml new file mode 100644 index 00000000..ea069a8e --- /dev/null +++ b/redis-vrf/templates/replicas/hpa.yaml @@ -0,0 +1,47 @@ +{{- if and .Values.replica.autoscaling.enabled (not .Values.sentinel.enabled) }} +apiVersion: {{ include "common.capabilities.hpa.apiVersion" ( dict "context" $ ) }} +kind: HorizontalPodAutoscaler +metadata: + name: {{ printf "%s-replicas" (include "common.names.fullname" .) }} + namespace: {{ .Release.Namespace | quote }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + app.kubernetes.io/component: replica + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" (dict "value" .Values.commonLabels "context" $) | nindent 4 }} + {{- end }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} +spec: + scaleTargetRef: + apiVersion: {{ include "common.capabilities.deployment.apiVersion" . }} + kind: StatefulSet + name: {{ printf "%s-replicas" (include "common.names.fullname" .) }} + minReplicas: {{ .Values.replica.autoscaling.minReplicas }} + maxReplicas: {{ .Values.replica.autoscaling.maxReplicas }} + metrics: + {{- if .Values.replica.autoscaling.targetMemory }} + - type: Resource + resource: + name: memory + {{- if semverCompare "<1.23-0" (include "common.capabilities.kubeVersion" .) }} + targetAverageUtilization: {{ .Values.replica.autoscaling.targetMemory }} + {{- else }} + target: + type: Utilization + averageUtilization: {{ .Values.replica.autoscaling.targetMemory }} + {{- end }} + {{- end }} + {{- if .Values.replica.autoscaling.targetCPU }} + - type: Resource + resource: + name: cpu + {{- if semverCompare "<1.23-0" (include "common.capabilities.kubeVersion" .) }} + targetAverageUtilization: {{ .Values.replica.autoscaling.targetCPU }} + {{- else }} + target: + type: Utilization + averageUtilization: {{ .Values.replica.autoscaling.targetCPU }} + {{- end }} + {{- end }} +{{- end }} diff --git a/redis-vrf/templates/replicas/service.yaml b/redis-vrf/templates/replicas/service.yaml new file mode 100644 index 00000000..f2619266 --- /dev/null +++ b/redis-vrf/templates/replicas/service.yaml @@ -0,0 +1,58 @@ +{{- if and (eq .Values.architecture "replication") (not .Values.sentinel.enabled) }} +apiVersion: v1 +kind: Service +metadata: + name: {{ printf "%s-replicas" (include "common.names.fullname" .) }} + namespace: {{ .Release.Namespace | quote }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + app.kubernetes.io/component: replica + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + {{- if or .Values.replica.service.annotations .Values.commonAnnotations }} + annotations: + {{- if .Values.replica.service.annotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.replica.service.annotations "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.commonAnnotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} + {{- end }} +spec: + type: {{ .Values.replica.service.type }} + {{- if or (eq .Values.replica.service.type "LoadBalancer") (eq .Values.replica.service.type "NodePort") }} + externalTrafficPolicy: {{ .Values.replica.service.externalTrafficPolicy | quote }} + {{- end }} + {{- if (semverCompare ">=1.22-0" (include "common.capabilities.kubeVersion" .)) }} + internalTrafficPolicy: {{ .Values.replica.service.internalTrafficPolicy }} + {{- end }} + {{- if and (eq .Values.replica.service.type "LoadBalancer") (not (empty .Values.replica.service.loadBalancerIP)) }} + loadBalancerIP: {{ .Values.replica.service.loadBalancerIP }} + {{- end }} + {{- if and (eq .Values.replica.service.type "LoadBalancer") (not (empty .Values.replica.service.loadBalancerSourceRanges)) }} + loadBalancerSourceRanges: {{ .Values.replica.service.loadBalancerSourceRanges }} + {{- end }} + {{- if and .Values.replica.service.clusterIP (eq .Values.replica.service.type "ClusterIP") }} + clusterIP: {{ .Values.replica.service.clusterIP }} + {{- end }} + {{- if .Values.replica.service.sessionAffinity }} + sessionAffinity: {{ .Values.replica.service.sessionAffinity }} + {{- end }} + {{- if .Values.replica.service.sessionAffinityConfig }} + sessionAffinityConfig: {{- include "common.tplvalues.render" (dict "value" .Values.replica.service.sessionAffinityConfig "context" $) | nindent 4 }} + {{- end }} + ports: + - name: tcp-redis + port: {{ .Values.replica.service.ports.redis }} + targetPort: redis + {{- if and (or (eq .Values.replica.service.type "NodePort") (eq .Values.replica.service.type "LoadBalancer")) .Values.replica.service.nodePorts.redis}} + nodePort: {{ .Values.replica.service.nodePorts.redis}} + {{- else if eq .Values.replica.service.type "ClusterIP" }} + nodePort: null + {{- end }} + {{- if .Values.replica.service.extraPorts }} + {{- include "common.tplvalues.render" (dict "value" .Values.replica.service.extraPorts "context" $) | nindent 4 }} + {{- end }} + selector: {{- include "common.labels.matchLabels" . | nindent 4 }} + app.kubernetes.io/component: replica +{{- end }} diff --git a/redis-vrf/templates/replicas/serviceaccount.yaml b/redis-vrf/templates/replicas/serviceaccount.yaml new file mode 100644 index 00000000..333ec9f5 --- /dev/null +++ b/redis-vrf/templates/replicas/serviceaccount.yaml @@ -0,0 +1,21 @@ +{{- if .Values.replica.serviceAccount.create }} +apiVersion: v1 +kind: ServiceAccount +automountServiceAccountToken: {{ .Values.replica.serviceAccount.automountServiceAccountToken }} +metadata: + name: {{ template "redis.replicaServiceAccountName" . }} + namespace: {{ .Release.Namespace | quote }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + {{- if or .Values.commonAnnotations .Values.replica.serviceAccount.annotations }} + annotations: + {{- if or .Values.commonAnnotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.replica.serviceAccount.annotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.replica.serviceAccount.annotations "context" $ ) | nindent 4 }} + {{- end }} + {{- end }} +{{- end }} diff --git a/redis-vrf/templates/replicas/statefulset.yaml b/redis-vrf/templates/replicas/statefulset.yaml new file mode 100644 index 00000000..8a8541d7 --- /dev/null +++ b/redis-vrf/templates/replicas/statefulset.yaml @@ -0,0 +1,515 @@ +{{- if and (eq .Values.architecture "replication") (not .Values.sentinel.enabled) }} +apiVersion: {{ include "common.capabilities.statefulset.apiVersion" . }} +kind: StatefulSet +metadata: + name: {{ printf "%s-replicas" (include "common.names.fullname" .) }} + namespace: {{ .Release.Namespace | quote }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + app.kubernetes.io/component: replica + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} +spec: + {{- if not .Values.replica.autoscaling.enabled }} + replicas: {{ .Values.replica.replicaCount }} + {{- end }} + selector: + matchLabels: {{- include "common.labels.matchLabels" . | nindent 6 }} + app.kubernetes.io/component: replica + serviceName: {{ printf "%s-headless" (include "common.names.fullname" .) }} + {{- if .Values.replica.updateStrategy }} + updateStrategy: {{- toYaml .Values.replica.updateStrategy | nindent 4 }} + {{- end }} + {{- if and .Values.replica.minReadySeconds (semverCompare ">= 1.25" (include "common.capabilities.kubeVersion" .)) }} + minReadySeconds: {{ .Values.replica.minReadySeconds }} + {{- end }} + {{- if .Values.replica.podManagementPolicy }} + podManagementPolicy: {{ .Values.replica.podManagementPolicy | quote }} + {{- end }} + template: + metadata: + labels: {{- include "common.labels.standard" . | nindent 8 }} + app.kubernetes.io/component: replica + {{- if .Values.replica.podLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.replica.podLabels "context" $ ) | nindent 8 }} + {{- end }} + {{- if and .Values.metrics.enabled .Values.metrics.podLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.metrics.podLabels "context" $ ) | nindent 8 }} + {{- end }} + annotations: + {{- if (include "redis.createConfigmap" .) }} + checksum/configmap: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }} + {{- end }} + checksum/health: {{ include (print $.Template.BasePath "/health-configmap.yaml") . | sha256sum }} + checksum/scripts: {{ include (print $.Template.BasePath "/scripts-configmap.yaml") . | sha256sum }} + checksum/secret: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }} + {{- if .Values.replica.podAnnotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.replica.podAnnotations "context" $ ) | nindent 8 }} + {{- end }} + {{- if and .Values.metrics.enabled .Values.metrics.podAnnotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.metrics.podAnnotations "context" $ ) | nindent 8 }} + {{- end }} + spec: + {{- include "redis.imagePullSecrets" . | nindent 6 }} + {{- if .Values.replica.hostAliases }} + hostAliases: {{- include "common.tplvalues.render" (dict "value" .Values.replica.hostAliases "context" $) | nindent 8 }} + {{- end }} + {{- if .Values.replica.podSecurityContext.enabled }} + securityContext: {{- omit .Values.replica.podSecurityContext "enabled" | toYaml | nindent 8 }} + {{- end }} + serviceAccountName: {{ template "redis.replicaServiceAccountName" . }} + {{- if .Values.replica.priorityClassName }} + priorityClassName: {{ .Values.replica.priorityClassName | quote }} + {{- end }} + {{- if .Values.replica.affinity }} + affinity: {{- include "common.tplvalues.render" (dict "value" .Values.replica.affinity "context" $) | nindent 8 }} + {{- else }} + affinity: + podAffinity: {{- include "common.affinities.pods" (dict "type" .Values.replica.podAffinityPreset "component" "replica" "context" $) | nindent 10 }} + podAntiAffinity: {{- include "common.affinities.pods" (dict "type" .Values.replica.podAntiAffinityPreset "component" "replica" "context" $) | nindent 10 }} + nodeAffinity: {{- include "common.affinities.nodes" (dict "type" .Values.replica.nodeAffinityPreset.type "key" .Values.replica.nodeAffinityPreset.key "values" .Values.replica.nodeAffinityPreset.values) | nindent 10 }} + {{- end }} + {{- if .Values.replica.nodeSelector }} + nodeSelector: {{- include "common.tplvalues.render" (dict "value" .Values.replica.nodeSelector "context" $) | nindent 8 }} + {{- end }} + {{- if .Values.replica.tolerations }} + tolerations: {{- include "common.tplvalues.render" (dict "value" .Values.replica.tolerations "context" $) | nindent 8 }} + {{- end }} + {{- if .Values.replica.topologySpreadConstraints }} + topologySpreadConstraints: {{- include "common.tplvalues.render" (dict "value" .Values.replica.topologySpreadConstraints "context" $) | nindent 8 }} + {{- end }} + {{- if .Values.replica.shareProcessNamespace }} + shareProcessNamespace: {{ .Values.replica.shareProcessNamespace }} + {{- end }} + {{- if .Values.replica.schedulerName }} + schedulerName: {{ .Values.replica.schedulerName | quote }} + {{- end }} + {{- if .Values.replica.dnsPolicy }} + dnsPolicy: {{ .Values.replica.dnsPolicy }} + {{- end }} + {{- if .Values.replica.dnsConfig }} + dnsConfig: {{- include "common.tplvalues.render" (dict "value" .Values.replica.dnsConfig "context" $) | nindent 8 }} + {{- end }} + terminationGracePeriodSeconds: {{ .Values.replica.terminationGracePeriodSeconds }} + containers: + - name: redis + image: {{ template "redis.image" . }} + imagePullPolicy: {{ .Values.image.pullPolicy | quote }} + {{- if not .Values.diagnosticMode.enabled }} + {{- if .Values.replica.lifecycleHooks }} + lifecycle: {{- include "common.tplvalues.render" (dict "value" .Values.replica.lifecycleHooks "context" $) | nindent 12 }} + {{- end }} + {{- end }} + {{- if .Values.replica.containerSecurityContext.enabled }} + securityContext: {{- omit .Values.replica.containerSecurityContext "enabled" | toYaml | nindent 12 }} + {{- end }} + {{- if .Values.diagnosticMode.enabled }} + command: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.command "context" $) | nindent 12 }} + {{- else if .Values.replica.command }} + command: {{- include "common.tplvalues.render" (dict "value" .Values.replica.command "context" $) | nindent 12 }} + {{- else }} + command: + - /bin/bash + {{- end }} + {{- if .Values.diagnosticMode.enabled }} + args: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.args "context" $) | nindent 12 }} + {{- else if .Values.replica.args }} + args: {{- include "common.tplvalues.render" (dict "value" .Values.replica.args "context" $) | nindent 12 }} + {{- else }} + args: + - -c + - /opt/bitnami/scripts/start-scripts/start-replica.sh + {{- end }} + env: + - name: BITNAMI_DEBUG + value: {{ ternary "true" "false" (or .Values.image.debug .Values.diagnosticMode.enabled) | quote }} + - name: REDIS_REPLICATION_MODE + value: replica + - name: REDIS_MASTER_HOST + {{- if and (eq (int64 .Values.master.count) 1) (ne .Values.master.kind "Deployment") }} + value: {{ template "common.names.fullname" . }}-master-0.{{ template "common.names.fullname" . }}-headless.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }} + {{- else }} + value: {{ template "common.names.fullname" . }}-master.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }} + {{- end }} + - name: REDIS_MASTER_PORT_NUMBER + value: {{ .Values.master.containerPorts.redis | quote }} + - name: ALLOW_EMPTY_PASSWORD + value: {{ ternary "no" "yes" .Values.auth.enabled | quote }} + {{- if .Values.auth.enabled }} + {{- if .Values.auth.usePasswordFiles }} + - name: REDIS_PASSWORD_FILE + value: "/opt/bitnami/redis/secrets/redis-password" + - name: REDIS_MASTER_PASSWORD_FILE + value: "/opt/bitnami/redis/secrets/redis-password" + {{- else }} + - name: REDIS_PASSWORD + valueFrom: + secretKeyRef: + name: {{ template "redis.secretName" . }} + key: {{ template "redis.secretPasswordKey" . }} + - name: REDIS_MASTER_PASSWORD + valueFrom: + secretKeyRef: + name: {{ template "redis.secretName" . }} + key: {{ template "redis.secretPasswordKey" . }} + {{- end }} + {{- end }} + - name: REDIS_TLS_ENABLED + value: {{ ternary "yes" "no" .Values.tls.enabled | quote }} + {{- if .Values.tls.enabled }} + - name: REDIS_TLS_PORT + value: {{ .Values.replica.containerPorts.redis | quote }} + - name: REDIS_TLS_AUTH_CLIENTS + value: {{ ternary "yes" "no" .Values.tls.authClients | quote }} + - name: REDIS_TLS_CERT_FILE + value: {{ template "redis.tlsCert" . }} + - name: REDIS_TLS_KEY_FILE + value: {{ template "redis.tlsCertKey" . }} + - name: REDIS_TLS_CA_FILE + value: {{ template "redis.tlsCACert" . }} + {{- if .Values.tls.dhParamsFilename }} + - name: REDIS_TLS_DH_PARAMS_FILE + value: {{ template "redis.tlsDHParams" . }} + {{- end }} + {{- else }} + - name: REDIS_PORT + value: {{ .Values.replica.containerPorts.redis | quote }} + {{- end }} + {{- if .Values.replica.extraEnvVars }} + {{- include "common.tplvalues.render" (dict "value" .Values.replica.extraEnvVars "context" $) | nindent 12 }} + {{- end }} + {{- if or .Values.replica.extraEnvVarsCM .Values.replica.extraEnvVarsSecret }} + envFrom: + {{- if .Values.replica.extraEnvVarsCM }} + - configMapRef: + name: {{ .Values.replica.extraEnvVarsCM }} + {{- end }} + {{- if .Values.replica.extraEnvVarsSecret }} + - secretRef: + name: {{ .Values.replica.extraEnvVarsSecret }} + {{- end }} + {{- end }} + ports: + - name: redis + containerPort: {{ .Values.replica.containerPorts.redis }} + {{- if not .Values.diagnosticMode.enabled }} + {{- if .Values.replica.customStartupProbe }} + startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.replica.customStartupProbe "context" $) | nindent 12 }} + {{- else if .Values.replica.startupProbe.enabled }} + startupProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.replica.startupProbe "enabled") "context" $) | nindent 12 }} + tcpSocket: + port: redis + {{- end }} + {{- if .Values.replica.customLivenessProbe }} + livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.replica.customLivenessProbe "context" $) | nindent 12 }} + {{- else if .Values.replica.livenessProbe.enabled }} + livenessProbe: + initialDelaySeconds: {{ .Values.replica.livenessProbe.initialDelaySeconds }} + periodSeconds: {{ .Values.replica.livenessProbe.periodSeconds }} + timeoutSeconds: {{ add1 .Values.replica.livenessProbe.timeoutSeconds }} + successThreshold: {{ .Values.replica.livenessProbe.successThreshold }} + failureThreshold: {{ .Values.replica.livenessProbe.failureThreshold }} + exec: + command: + - sh + - -c + - /health/ping_liveness_local_and_master.sh {{ .Values.replica.livenessProbe.timeoutSeconds }} + {{- end }} + {{- if .Values.replica.customReadinessProbe }} + readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.replica.customReadinessProbe "context" $) | nindent 12 }} + {{- else if .Values.replica.readinessProbe.enabled }} + readinessProbe: + initialDelaySeconds: {{ .Values.replica.readinessProbe.initialDelaySeconds }} + periodSeconds: {{ .Values.replica.readinessProbe.periodSeconds }} + timeoutSeconds: {{ add1 .Values.replica.readinessProbe.timeoutSeconds }} + successThreshold: {{ .Values.replica.readinessProbe.successThreshold }} + failureThreshold: {{ .Values.replica.readinessProbe.failureThreshold }} + exec: + command: + - sh + - -c + - /health/ping_readiness_local_and_master.sh {{ .Values.replica.readinessProbe.timeoutSeconds }} + {{- end }} + {{- end }} + {{- if .Values.replica.resources }} + resources: {{- toYaml .Values.replica.resources | nindent 12 }} + {{- end }} + volumeMounts: + - name: start-scripts + mountPath: /opt/bitnami/scripts/start-scripts + - name: health + mountPath: /health + {{- if .Values.auth.usePasswordFiles }} + - name: redis-password + mountPath: /opt/bitnami/redis/secrets/ + {{- end }} + - name: redis-data + mountPath: /data + {{- if .Values.replica.persistence.subPath }} + subPath: {{ .Values.replica.persistence.subPath }} + {{- else if .Values.replica.persistence.subPathExpr }} + subPathExpr: {{ .Values.replica.persistence.subPathExpr }} + {{- end }} + - name: config + mountPath: /opt/bitnami/redis/mounted-etc + - name: redis-tmp-conf + mountPath: /opt/bitnami/redis/etc + {{- if .Values.tls.enabled }} + - name: redis-certificates + mountPath: /opt/bitnami/redis/certs + readOnly: true + {{- end }} + {{- if .Values.replica.extraVolumeMounts }} + {{- include "common.tplvalues.render" ( dict "value" .Values.replica.extraVolumeMounts "context" $ ) | nindent 12 }} + {{- end }} + {{- if .Values.metrics.enabled }} + - name: metrics + image: {{ include "redis.metrics.image" . }} + imagePullPolicy: {{ .Values.metrics.image.pullPolicy | quote }} + {{- if .Values.metrics.containerSecurityContext.enabled }} + securityContext: {{- omit .Values.metrics.containerSecurityContext "enabled" | toYaml | nindent 12 }} + {{- end }} + {{- if .Values.diagnosticMode.enabled }} + command: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.command "context" $) | nindent 12 }} + {{- else if .Values.metrics.command }} + command: {{- include "common.tplvalues.render" (dict "value" .Values.metrics.command "context" $) | nindent 12 }} + {{- else }} + command: + - /bin/bash + - -c + - | + if [[ -f '/secrets/redis-password' ]]; then + export REDIS_PASSWORD=$(cat /secrets/redis-password) + fi + redis_exporter{{- range $key, $value := .Values.metrics.extraArgs }} --{{ $key }}={{ $value }}{{- end }} + {{- end }} + {{- if .Values.diagnosticMode.enabled }} + args: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.args "context" $) | nindent 12 }} + {{- end }} + env: + - name: REDIS_ALIAS + value: {{ template "common.names.fullname" . }} + {{- if .Values.auth.enabled }} + - name: REDIS_USER + value: default + {{- if (not .Values.auth.usePasswordFiles) }} + - name: REDIS_PASSWORD + valueFrom: + secretKeyRef: + name: {{ template "redis.secretName" . }} + key: {{ template "redis.secretPasswordKey" . }} + {{- end }} + {{- end }} + {{- if .Values.tls.enabled }} + - name: REDIS_ADDR + value: rediss://{{ .Values.metrics.redisTargetHost }}:{{ .Values.replica.containerPorts.redis }} + {{- if .Values.tls.authClients }} + - name: REDIS_EXPORTER_TLS_CLIENT_KEY_FILE + value: {{ template "redis.tlsCertKey" . }} + - name: REDIS_EXPORTER_TLS_CLIENT_CERT_FILE + value: {{ template "redis.tlsCert" . }} + {{- end }} + - name: REDIS_EXPORTER_TLS_CA_CERT_FILE + value: {{ template "redis.tlsCACert" . }} + {{- end }} + {{- if .Values.metrics.extraEnvVars }} + {{- include "common.tplvalues.render" (dict "value" .Values.metrics.extraEnvVars "context" $) | nindent 12 }} + {{- end }} + ports: + - name: metrics + containerPort: 9121 + {{- if not .Values.diagnosticMode.enabled }} + {{- if .Values.metrics.customStartupProbe }} + startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.metrics.customStartupProbe "context" $) | nindent 12 }} + {{- else if .Values.metrics.startupProbe.enabled }} + startupProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.metrics.startupProbe "enabled") "context" $) | nindent 12 }} + tcpSocket: + port: metrics + {{- end }} + {{- if .Values.metrics.customLivenessProbe }} + livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.metrics.customLivenessProbe "context" $) | nindent 12 }} + {{- else if .Values.metrics.livenessProbe.enabled }} + livenessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.metrics.livenessProbe "enabled") "context" $) | nindent 12 }} + tcpSocket: + port: metrics + {{- end }} + {{- if .Values.metrics.customReadinessProbe }} + readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.metrics.customReadinessProbe "context" $) | nindent 12 }} + {{- else if .Values.metrics.readinessProbe.enabled }} + readinessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.metrics.readinessProbe "enabled") "context" $) | nindent 12 }} + httpGet: + path: / + port: metrics + {{- end }} + {{- end }} + {{- if .Values.metrics.resources }} + resources: {{- toYaml .Values.metrics.resources | nindent 12 }} + {{- end }} + volumeMounts: + {{- if .Values.auth.usePasswordFiles }} + - name: redis-password + mountPath: /secrets/ + {{- end }} + {{- if .Values.tls.enabled }} + - name: redis-certificates + mountPath: /opt/bitnami/redis/certs + readOnly: true + {{- end }} + {{- if .Values.metrics.extraVolumeMounts }} + {{- include "common.tplvalues.render" ( dict "value" .Values.metrics.extraVolumeMounts "context" $ ) | nindent 12 }} + {{- end }} + {{- end }} + {{- if .Values.replica.sidecars }} + {{- include "common.tplvalues.render" (dict "value" .Values.replica.sidecars "context" $) | nindent 8 }} + {{- end }} + {{- $needsVolumePermissions := and .Values.volumePermissions.enabled .Values.replica.persistence.enabled .Values.replica.podSecurityContext.enabled .Values.replica.containerSecurityContext.enabled }} + {{- if or .Values.replica.initContainers $needsVolumePermissions .Values.sysctl.enabled }} + initContainers: + {{- if .Values.replica.initContainers }} + {{- include "common.tplvalues.render" (dict "value" .Values.replica.initContainers "context" $) | nindent 8 }} + {{- end }} + {{- if $needsVolumePermissions }} + - name: volume-permissions + image: {{ include "redis.volumePermissions.image" . }} + imagePullPolicy: {{ .Values.volumePermissions.image.pullPolicy | quote }} + command: + - /bin/bash + - -ec + - | + {{- if eq ( toString ( .Values.volumePermissions.containerSecurityContext.runAsUser )) "auto" }} + chown -R `id -u`:`id -G | cut -d " " -f2` {{ .Values.replica.persistence.path }} + {{- else }} + chown -R {{ .Values.replica.containerSecurityContext.runAsUser }}:{{ .Values.replica.podSecurityContext.fsGroup }} {{ .Values.replica.persistence.path }} + {{- end }} + {{- if eq ( toString ( .Values.volumePermissions.containerSecurityContext.runAsUser )) "auto" }} + securityContext: {{- omit .Values.volumePermissions.containerSecurityContext "runAsUser" | toYaml | nindent 12 }} + {{- else }} + securityContext: {{- .Values.volumePermissions.containerSecurityContext | toYaml | nindent 12 }} + {{- end }} + {{- if .Values.volumePermissions.resources }} + resources: {{- toYaml .Values.volumePermissions.resources | nindent 12 }} + {{- end }} + volumeMounts: + - name: redis-data + mountPath: {{ .Values.replica.persistence.path }} + {{- if .Values.replica.persistence.subPath }} + subPath: {{ .Values.replica.persistence.subPath }} + {{- else if .Values.replica.persistence.subPathExpr }} + subPathExpr: {{ .Values.replica.persistence.subPathExpr }} + {{- end }} + {{- end }} + {{- if .Values.sysctl.enabled }} + - name: init-sysctl + image: {{ include "redis.sysctl.image" . }} + imagePullPolicy: {{ default "" .Values.sysctl.image.pullPolicy | quote }} + securityContext: + privileged: true + runAsUser: 0 + {{- if .Values.sysctl.command }} + command: {{- include "common.tplvalues.render" (dict "value" .Values.sysctl.command "context" $) | nindent 12 }} + {{- end }} + {{- if .Values.sysctl.resources }} + resources: {{- toYaml .Values.sysctl.resources | nindent 12 }} + {{- end }} + {{- if .Values.sysctl.mountHostSys }} + volumeMounts: + - name: host-sys + mountPath: /host-sys + {{- end }} + {{- end }} + {{- end }} + volumes: + - name: start-scripts + configMap: + name: {{ printf "%s-scripts" (include "common.names.fullname" .) }} + defaultMode: 0755 + - name: health + configMap: + name: {{ printf "%s-health" (include "common.names.fullname" .) }} + defaultMode: 0755 + {{- if .Values.auth.usePasswordFiles }} + - name: redis-password + secret: + secretName: {{ template "redis.secretName" . }} + items: + - key: {{ template "redis.secretPasswordKey" . }} + path: redis-password + {{- end }} + - name: config + configMap: + name: {{ include "redis.configmapName" . }} + {{- if .Values.sysctl.mountHostSys }} + - name: host-sys + hostPath: + path: /sys + {{- end }} + - name: redis-tmp-conf + {{- if or .Values.replica.persistence.medium .Values.replica.persistence.sizeLimit }} + emptyDir: + {{- if .Values.replica.persistence.medium }} + medium: {{ .Values.replica.persistence.medium | quote }} + {{- end }} + {{- if .Values.replica.persistence.sizeLimit }} + sizeLimit: {{ .Values.replica.persistence.sizeLimit | quote }} + {{- end }} + {{- else }} + emptyDir: {} + {{- end }} + {{- if .Values.tls.enabled }} + - name: redis-certificates + secret: + secretName: {{ include "redis.tlsSecretName" . }} + defaultMode: 256 + {{- end }} + {{- if .Values.replica.extraVolumes }} + {{- include "common.tplvalues.render" ( dict "value" .Values.replica.extraVolumes "context" $ ) | nindent 8 }} + {{- end }} + {{- if .Values.metrics.extraVolumes }} + {{- include "common.tplvalues.render" ( dict "value" .Values.metrics.extraVolumes "context" $ ) | nindent 8 }} + {{- end }} + {{- if not .Values.replica.persistence.enabled }} + - name: redis-data + {{- if or .Values.replica.persistence.medium .Values.replica.persistence.sizeLimit }} + emptyDir: + {{- if .Values.replica.persistence.medium }} + medium: {{ .Values.replica.persistence.medium | quote }} + {{- end }} + {{- if .Values.replica.persistence.sizeLimit }} + sizeLimit: {{ .Values.replica.persistence.sizeLimit | quote }} + {{- end }} + {{- else }} + emptyDir: {} + {{- end }} + {{- else if .Values.replica.persistence.existingClaim }} + - name: redis-data + persistentVolumeClaim: + claimName: {{ printf "%s" (tpl .Values.replica.persistence.existingClaim .) }} + {{- else }} + volumeClaimTemplates: + - metadata: + name: redis-data + labels: {{- include "common.labels.matchLabels" . | nindent 10 }} + app.kubernetes.io/component: replica + {{- if .Values.replica.persistence.annotations }} + annotations: {{- toYaml .Values.replica.persistence.annotations | nindent 10 }} + {{- end }} + spec: + accessModes: + {{- range .Values.replica.persistence.accessModes }} + - {{ . | quote }} + {{- end }} + resources: + requests: + storage: {{ .Values.replica.persistence.size | quote }} + {{- if .Values.replica.persistence.selector }} + selector: {{- include "common.tplvalues.render" (dict "value" .Values.replica.persistence.selector "context" $) | nindent 10 }} + {{- end }} + {{- if .Values.replica.persistence.dataSource }} + dataSource: {{- include "common.tplvalues.render" (dict "value" .Values.replica.persistence.dataSource "context" $) | nindent 10 }} + {{- end }} + {{- include "common.storage.class" (dict "persistence" .Values.replica.persistence "global" .Values.global) | nindent 8 }} + {{- end }} +{{- end }} diff --git a/redis-vrf/templates/role.yaml b/redis-vrf/templates/role.yaml new file mode 100644 index 00000000..596466f3 --- /dev/null +++ b/redis-vrf/templates/role.yaml @@ -0,0 +1,28 @@ +{{- if .Values.rbac.create }} +apiVersion: {{ include "common.capabilities.rbac.apiVersion" . }} +kind: Role +metadata: + name: {{ template "common.names.fullname" . }} + namespace: {{ .Release.Namespace | quote }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} +rules: + {{- $pspAvailable := (semverCompare "<1.25-0" (include "common.capabilities.kubeVersion" .)) -}} + {{- if and $pspAvailable .Values.podSecurityPolicy.enabled }} + - apiGroups: + - '{{ template "podSecurityPolicy.apiGroup" . }}' + resources: + - 'podsecuritypolicies' + verbs: + - 'use' + resourceNames: [{{ printf "%s-master" (include "common.names.fullname" .) }}] + {{- end }} + {{- if .Values.rbac.rules }} + {{- include "common.tplvalues.render" ( dict "value" .Values.rbac.rules "context" $ ) | nindent 2 }} + {{- end }} +{{- end }} diff --git a/redis-vrf/templates/rolebinding.yaml b/redis-vrf/templates/rolebinding.yaml new file mode 100644 index 00000000..74968b8f --- /dev/null +++ b/redis-vrf/templates/rolebinding.yaml @@ -0,0 +1,21 @@ +{{- if .Values.rbac.create }} +apiVersion: {{ include "common.capabilities.rbac.apiVersion" . }} +kind: RoleBinding +metadata: + name: {{ template "common.names.fullname" . }} + namespace: {{ .Release.Namespace | quote }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: Role + name: {{ template "common.names.fullname" . }} +subjects: + - kind: ServiceAccount + name: {{ template "redis.serviceAccountName" . }} +{{- end }} diff --git a/redis-vrf/templates/scripts-configmap.yaml b/redis-vrf/templates/scripts-configmap.yaml new file mode 100644 index 00000000..96e2f1a0 --- /dev/null +++ b/redis-vrf/templates/scripts-configmap.yaml @@ -0,0 +1,713 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: {{ printf "%s-scripts" (include "common.names.fullname" .) }} + namespace: {{ .Release.Namespace | quote }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} +data: +{{- if and (eq .Values.architecture "replication") .Values.sentinel.enabled }} + start-node.sh: | + #!/bin/bash + + . /opt/bitnami/scripts/libos.sh + . /opt/bitnami/scripts/liblog.sh + . /opt/bitnami/scripts/libvalidations.sh + + get_port() { + hostname="$1" + type="$2" + + port_var=$(echo "${hostname^^}_SERVICE_PORT_$type" | sed "s/-/_/g") + port=${!port_var} + + if [ -z "$port" ]; then + case $type in + "SENTINEL") + echo {{ .Values.sentinel.containerPorts.sentinel }} + ;; + "REDIS") + echo {{ .Values.master.containerPorts.redis }} + ;; + esac + else + echo $port + fi + } + + get_full_hostname() { + hostname="$1" + + {{- if .Values.useExternalDNS.enabled }} + full_hostname="${hostname}.{{- include "redis.externalDNS.suffix" . }}" + {{- else if eq .Values.sentinel.service.type "NodePort" }} + full_hostname="${hostname}.{{- .Release.Namespace }}" + {{- else }} + full_hostname="${hostname}.${HEADLESS_SERVICE}" + {{- end }} + + {{- if .Values.useHostnames }} + echo "${full_hostname}" + {{- else }} + getent hosts "${full_hostname}" | awk '{ print $1 ; exit }' + {{- end }} + } + + REDISPORT=$(get_port "$HOSTNAME" "REDIS") + + HEADLESS_SERVICE="{{ template "common.names.fullname" . }}-headless.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}" + + if [ -n "$REDIS_EXTERNAL_MASTER_HOST" ]; then + REDIS_SERVICE="$REDIS_EXTERNAL_MASTER_HOST" + else + REDIS_SERVICE="{{ template "common.names.fullname" . }}.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}" + fi + + SENTINEL_SERVICE_PORT=$(get_port "{{ include "common.names.fullname" . }}" "TCP_SENTINEL") + validate_quorum() { + if is_boolean_yes "$REDIS_TLS_ENABLED"; then + quorum_info_command="{{- if and .Values.auth.enabled .Values.auth.sentinel }}REDISCLI_AUTH="\$REDIS_PASSWORD" {{ end }}redis-cli -h $REDIS_SERVICE -p $SENTINEL_SERVICE_PORT --tls --cert ${REDIS_TLS_CERT_FILE} --key ${REDIS_TLS_KEY_FILE} --cacert ${REDIS_TLS_CA_FILE} sentinel master {{ .Values.sentinel.masterSet }}" + else + quorum_info_command="{{- if and .Values.auth.enabled .Values.auth.sentinel }}REDISCLI_AUTH="\$REDIS_PASSWORD" {{ end }}redis-cli -h $REDIS_SERVICE -p $SENTINEL_SERVICE_PORT sentinel master {{ .Values.sentinel.masterSet }}" + fi + info "about to run the command: $quorum_info_command" + eval $quorum_info_command | grep -Fq "s_down" + } + + trigger_manual_failover() { + if is_boolean_yes "$REDIS_TLS_ENABLED"; then + failover_command="{{- if and .Values.auth.enabled .Values.auth.sentinel }}REDISCLI_AUTH="\$REDIS_PASSWORD" {{ end }}redis-cli -h $REDIS_SERVICE -p $SENTINEL_SERVICE_PORT --tls --cert ${REDIS_TLS_CERT_FILE} --key ${REDIS_TLS_KEY_FILE} --cacert ${REDIS_TLS_CA_FILE} sentinel failover {{ .Values.sentinel.masterSet }}" + else + failover_command="{{- if and .Values.auth.enabled .Values.auth.sentinel }}REDISCLI_AUTH="\$REDIS_PASSWORD" {{ end }}redis-cli -h $REDIS_SERVICE -p $SENTINEL_SERVICE_PORT sentinel failover {{ .Values.sentinel.masterSet }}" + fi + + info "about to run the command: $failover_command" + eval $failover_command + } + + get_sentinel_master_info() { + if is_boolean_yes "$REDIS_TLS_ENABLED"; then + sentinel_info_command="{{- if and .Values.auth.enabled .Values.auth.sentinel }}REDISCLI_AUTH="\$REDIS_PASSWORD" {{ end }}timeout {{ .Values.sentinel.getMasterTimeout }} redis-cli -h $REDIS_SERVICE -p $SENTINEL_SERVICE_PORT --tls --cert ${REDIS_TLS_CERT_FILE} --key ${REDIS_TLS_KEY_FILE} --cacert ${REDIS_TLS_CA_FILE} sentinel get-master-addr-by-name {{ .Values.sentinel.masterSet }}" + else + sentinel_info_command="{{- if and .Values.auth.enabled .Values.auth.sentinel }}REDISCLI_AUTH="\$REDIS_PASSWORD" {{ end }}timeout {{ .Values.sentinel.getMasterTimeout }} redis-cli -h $REDIS_SERVICE -p $SENTINEL_SERVICE_PORT sentinel get-master-addr-by-name {{ .Values.sentinel.masterSet }}" + fi + + info "about to run the command: $sentinel_info_command" + eval $sentinel_info_command + } + + {{- if and .Values.replica.containerSecurityContext.runAsUser (eq (.Values.replica.containerSecurityContext.runAsUser | int) 0) }} + useradd redis + chown -R redis {{ .Values.replica.persistence.path }} + {{- end }} + + [[ -f $REDIS_PASSWORD_FILE ]] && export REDIS_PASSWORD="$(< "${REDIS_PASSWORD_FILE}")" + [[ -f $REDIS_MASTER_PASSWORD_FILE ]] && export REDIS_MASTER_PASSWORD="$(< "${REDIS_MASTER_PASSWORD_FILE}")" + + # check if there is a master + master_in_persisted_conf="$(get_full_hostname "$HOSTNAME")" + master_port_in_persisted_conf="$REDIS_MASTER_PORT_NUMBER" + master_in_sentinel="$(get_sentinel_master_info)" + redisRetVal=$? + + {{- if .Values.sentinel.persistence.enabled }} + if [[ -f /opt/bitnami/redis-sentinel/etc/sentinel.conf ]]; then + master_in_persisted_conf="$(awk '/monitor/ {print $4}' /opt/bitnami/redis-sentinel/etc/sentinel.conf)" + master_port_in_persisted_conf="$(awk '/monitor/ {print $5}' /opt/bitnami/redis-sentinel/etc/sentinel.conf)" + info "Found previous master ${master_in_persisted_conf}:${master_port_in_persisted_conf} in /opt/bitnami/redis-sentinel/etc/sentinel.conf" + debug "$(cat /opt/bitnami/redis-sentinel/etc/sentinel.conf | grep monitor)" + touch /opt/bitnami/redis-sentinel/etc/.node_read + fi + {{- end }} + + if [[ $redisRetVal -ne 0 ]]; then + if [[ "$master_in_persisted_conf" == "$(get_full_hostname "$HOSTNAME")" ]]; then + # Case 1: No active sentinel and in previous sentinel.conf we were the master --> MASTER + info "Configuring the node as master" + export REDIS_REPLICATION_MODE="master" + else + # Case 2: No active sentinel and in previous sentinel.conf we were not master --> REPLICA + info "Configuring the node as replica" + export REDIS_REPLICATION_MODE="replica" + REDIS_MASTER_HOST=${master_in_persisted_conf} + REDIS_MASTER_PORT_NUMBER=${master_port_in_persisted_conf} + fi + else + # Fetches current master's host and port + REDIS_SENTINEL_INFO=($(get_sentinel_master_info)) + info "Current master: REDIS_SENTINEL_INFO=(${REDIS_SENTINEL_INFO[0]},${REDIS_SENTINEL_INFO[1]})" + REDIS_MASTER_HOST=${REDIS_SENTINEL_INFO[0]} + REDIS_MASTER_PORT_NUMBER=${REDIS_SENTINEL_INFO[1]} + + if [[ "$REDIS_MASTER_HOST" == "$(get_full_hostname "$HOSTNAME")" ]]; then + # Case 3: Active sentinel and master it is this node --> MASTER + info "Configuring the node as master" + export REDIS_REPLICATION_MODE="master" + else + # Case 4: Active sentinel and master is not this node --> REPLICA + info "Configuring the node as replica" + export REDIS_REPLICATION_MODE="replica" + + {{- if and .Values.sentinel.automateClusterRecovery (le (int .Values.sentinel.downAfterMilliseconds) 2000) }} + retry_count=1 + while validate_quorum + do + info "sleeping, waiting for Redis master to come up" + sleep 1s + if ! ((retry_count % 11)); then + info "Trying to manually failover" + failover_result=$(trigger_manual_failover) + + debug "Failover result: $failover_result" + fi + + ((retry_count+=1)) + done + info "Redis master is up now" + {{- end }} + fi + fi + + if [[ -n "$REDIS_EXTERNAL_MASTER_HOST" ]]; then + REDIS_MASTER_HOST="$REDIS_EXTERNAL_MASTER_HOST" + REDIS_MASTER_PORT_NUMBER="${REDIS_EXTERNAL_MASTER_PORT}" + fi + + if [[ -f /opt/bitnami/redis/mounted-etc/replica.conf ]];then + cp /opt/bitnami/redis/mounted-etc/replica.conf /opt/bitnami/redis/etc/replica.conf + fi + + if [[ -f /opt/bitnami/redis/mounted-etc/redis.conf ]];then + cp /opt/bitnami/redis/mounted-etc/redis.conf /opt/bitnami/redis/etc/redis.conf + fi + + echo "" >> /opt/bitnami/redis/etc/replica.conf + echo "replica-announce-port $REDISPORT" >> /opt/bitnami/redis/etc/replica.conf + echo "replica-announce-ip $(get_full_hostname "$HOSTNAME")" >> /opt/bitnami/redis/etc/replica.conf + + {{- if .Values.tls.enabled }} + ARGS=("--port" "0") + ARGS+=("--tls-port" "${REDIS_TLS_PORT}") + ARGS+=("--tls-cert-file" "${REDIS_TLS_CERT_FILE}") + ARGS+=("--tls-key-file" "${REDIS_TLS_KEY_FILE}") + ARGS+=("--tls-ca-cert-file" "${REDIS_TLS_CA_FILE}") + ARGS+=("--tls-auth-clients" "${REDIS_TLS_AUTH_CLIENTS}") + ARGS+=("--tls-replication" "yes") + {{- if .Values.tls.dhParamsFilename }} + ARGS+=("--tls-dh-params-file" "${REDIS_TLS_DH_PARAMS_FILE}") + {{- end }} + {{- else }} + ARGS=("--port" "${REDIS_PORT}") + {{- end }} + + if [[ "$REDIS_REPLICATION_MODE" = "slave" ]] || [[ "$REDIS_REPLICATION_MODE" = "replica" ]]; then + ARGS+=("--replicaof" "${REDIS_MASTER_HOST}" "${REDIS_MASTER_PORT_NUMBER}") + fi + + {{- if .Values.auth.enabled }} + ARGS+=("--requirepass" "${REDIS_PASSWORD}") + ARGS+=("--masterauth" "${REDIS_MASTER_PASSWORD}") + {{- else }} + ARGS+=("--protected-mode" "no") + {{- end }} + ARGS+=("--include" "/opt/bitnami/redis/etc/replica.conf") + ARGS+=("--include" "/opt/bitnami/redis/etc/redis.conf") + {{- if .Values.replica.extraFlags }} + {{- range .Values.replica.extraFlags }} + ARGS+=({{ . | quote }}) + {{- end }} + {{- end }} + + {{- if .Values.replica.preExecCmds }} + {{- .Values.replica.preExecCmds | nindent 4 }} + {{- end }} + + {{- if .Values.replica.command }} + exec {{ .Values.replica.command }} "${ARGS[@]}" + {{- else }} + exec redis-server "${ARGS[@]}" + {{- end }} + + start-sentinel.sh: | + #!/bin/bash + + . /opt/bitnami/scripts/libos.sh + . /opt/bitnami/scripts/libvalidations.sh + . /opt/bitnami/scripts/libfile.sh + + HEADLESS_SERVICE="{{ template "common.names.fullname" . }}-headless.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}" + REDIS_SERVICE="{{ template "common.names.fullname" . }}.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}" + + get_port() { + hostname="$1" + type="$2" + + port_var=$(echo "${hostname^^}_SERVICE_PORT_$type" | sed "s/-/_/g") + port=${!port_var} + + if [ -z "$port" ]; then + case $type in + "SENTINEL") + echo {{ .Values.sentinel.containerPorts.sentinel }} + ;; + "REDIS") + echo {{ .Values.master.containerPorts.redis }} + ;; + esac + else + echo $port + fi + } + + get_full_hostname() { + hostname="$1" + + {{- if .Values.useExternalDNS.enabled }} + full_hostname="${hostname}.{{- include "redis.externalDNS.suffix" . }}" + {{- else if eq .Values.sentinel.service.type "NodePort" }} + full_hostname="${hostname}.{{- .Release.Namespace }}" + {{- else }} + full_hostname="${hostname}.${HEADLESS_SERVICE}" + {{- end }} + + {{- if .Values.useHostnames }} + echo "${full_hostname}" + {{- else }} + getent hosts "${full_hostname}" | awk '{ print $1 ; exit }' + {{- end }} + } + + SERVPORT=$(get_port "$HOSTNAME" "SENTINEL") + REDISPORT=$(get_port "$HOSTNAME" "REDIS") + SENTINEL_SERVICE_PORT=$(get_port "{{ include "common.names.fullname" . }}" "TCP_SENTINEL") + + sentinel_conf_set() { + local -r key="${1:?missing key}" + local value="${2:-}" + + # Sanitize inputs + value="${value//\\/\\\\}" + value="${value//&/\\&}" + value="${value//\?/\\?}" + [[ "$value" = "" ]] && value="\"$value\"" + + replace_in_file "/opt/bitnami/redis-sentinel/etc/sentinel.conf" "^#*\s*${key} .*" "${key} ${value}" false + } + sentinel_conf_add() { + echo $'\n'"$@" >> "/opt/bitnami/redis-sentinel/etc/sentinel.conf" + } + host_id() { + echo "$1" | openssl sha1 | awk '{print $2}' + } + get_sentinel_master_info() { + if is_boolean_yes "$REDIS_SENTINEL_TLS_ENABLED"; then + sentinel_info_command="{{- if and .Values.auth.enabled .Values.auth.sentinel }}REDISCLI_AUTH="\$REDIS_PASSWORD" {{ end }}timeout {{ .Values.sentinel.getMasterTimeout }} redis-cli -h $REDIS_SERVICE -p $SENTINEL_SERVICE_PORT --tls --cert ${REDIS_SENTINEL_TLS_CERT_FILE} --key ${REDIS_SENTINEL_TLS_KEY_FILE} --cacert ${REDIS_SENTINEL_TLS_CA_FILE} sentinel get-master-addr-by-name {{ .Values.sentinel.masterSet }}" + else + sentinel_info_command="{{- if and .Values.auth.enabled .Values.auth.sentinel }}REDISCLI_AUTH="\$REDIS_PASSWORD" {{ end }}timeout {{ .Values.sentinel.getMasterTimeout }} redis-cli -h $REDIS_SERVICE -p $SENTINEL_SERVICE_PORT sentinel get-master-addr-by-name {{ .Values.sentinel.masterSet }}" + fi + info "about to run the command: $sentinel_info_command" + eval $sentinel_info_command + } + + [[ -f $REDIS_PASSWORD_FILE ]] && export REDIS_PASSWORD="$(< "${REDIS_PASSWORD_FILE}")" + + master_in_persisted_conf="$(get_full_hostname "$HOSTNAME")" + + {{- if .Values.sentinel.persistence.enabled }} + if [[ -f /opt/bitnami/redis-sentinel/etc/sentinel.conf ]]; then + check_lock_file() { + [[ -f /opt/bitnami/redis-sentinel/etc/.node_read ]] + } + retry_while "check_lock_file" + rm -f /opt/bitnami/redis-sentinel/etc/.node_read + master_in_persisted_conf="$(awk '/monitor/ {print $4}' /opt/bitnami/redis-sentinel/etc/sentinel.conf)" + info "Found previous master $master_in_persisted_conf in /opt/bitnami/redis-sentinel/etc/sentinel.conf" + debug "$(cat /opt/bitnami/redis-sentinel/etc/sentinel.conf | grep monitor)" + fi + {{- end }} + if ! get_sentinel_master_info && [[ "$master_in_persisted_conf" == "$(get_full_hostname "$HOSTNAME")" ]]; then + # No master found, lets create a master node + export REDIS_REPLICATION_MODE="master" + + REDIS_MASTER_HOST=$(get_full_hostname "$HOSTNAME") + REDIS_MASTER_PORT_NUMBER="$REDISPORT" + else + export REDIS_REPLICATION_MODE="replica" + + # Fetches current master's host and port + REDIS_SENTINEL_INFO=($(get_sentinel_master_info)) + info "printing REDIS_SENTINEL_INFO=(${REDIS_SENTINEL_INFO[0]},${REDIS_SENTINEL_INFO[1]})" + REDIS_MASTER_HOST=${REDIS_SENTINEL_INFO[0]} + REDIS_MASTER_PORT_NUMBER=${REDIS_SENTINEL_INFO[1]} + fi + + if [[ -n "$REDIS_EXTERNAL_MASTER_HOST" ]]; then + REDIS_MASTER_HOST="$REDIS_EXTERNAL_MASTER_HOST" + REDIS_MASTER_PORT_NUMBER="${REDIS_EXTERNAL_MASTER_PORT}" + fi + + cp /opt/bitnami/redis-sentinel/mounted-etc/sentinel.conf /opt/bitnami/redis-sentinel/etc/sentinel.conf + {{- if .Values.auth.enabled }} + printf "\nsentinel auth-pass %s %s" "{{ .Values.sentinel.masterSet }}" "$REDIS_PASSWORD" >> /opt/bitnami/redis-sentinel/etc/sentinel.conf + {{- if and .Values.auth.enabled .Values.auth.sentinel }} + printf "\nrequirepass %s" "$REDIS_PASSWORD" >> /opt/bitnami/redis-sentinel/etc/sentinel.conf + {{- end }} + {{- end }} + printf "\nsentinel myid %s" "$(host_id "$HOSTNAME")" >> /opt/bitnami/redis-sentinel/etc/sentinel.conf + + if [[ -z "$REDIS_MASTER_HOST" ]] || [[ -z "$REDIS_MASTER_PORT_NUMBER" ]] + then + # Prevent incorrect configuration to be written to sentinel.conf + error "Redis master host is configured incorrectly (host: $REDIS_MASTER_HOST, port: $REDIS_MASTER_PORT_NUMBER)" + exit 1 + fi + + sentinel_conf_set "sentinel monitor" "{{ .Values.sentinel.masterSet }} "$REDIS_MASTER_HOST" "$REDIS_MASTER_PORT_NUMBER" {{ .Values.sentinel.quorum }}" + + add_known_sentinel() { + hostname="$1" + ip="$2" + + if [[ -n "$hostname" && -n "$ip" && "$hostname" != "$HOSTNAME" ]]; then + sentinel_conf_add "sentinel known-sentinel {{ .Values.sentinel.masterSet }} $(get_full_hostname "$hostname") $(get_port "$hostname" "SENTINEL") $(host_id "$hostname")" + fi + } + add_known_replica() { + hostname="$1" + ip="$2" + + if [[ -n "$ip" && "$(get_full_hostname "$hostname")" != "$REDIS_MASTER_HOST" ]]; then + sentinel_conf_add "sentinel known-replica {{ .Values.sentinel.masterSet }} $(get_full_hostname "$hostname") $(get_port "$hostname" "REDIS")" + fi + } + + # Add available hosts on the network as known replicas & sentinels + for node in $(seq 0 $(({{ .Values.replica.replicaCount }}-1))); do + hostname="{{ template "common.names.fullname" . }}-node-$node" + ip="$(getent hosts "$hostname.$HEADLESS_SERVICE" | awk '{ print $1 }')" + add_known_sentinel "$hostname" "$ip" + add_known_replica "$hostname" "$ip" + done + + echo "" >> /opt/bitnami/redis-sentinel/etc/sentinel.conf + {{- if not (contains "sentinel announce-hostnames" .Values.sentinel.configuration) }} + echo "sentinel announce-hostnames yes" >> /opt/bitnami/redis-sentinel/etc/sentinel.conf + {{- end }} + {{- if not (contains "sentinel resolve-hostnames" .Values.sentinel.configuration) }} + echo "sentinel resolve-hostnames yes" >> /opt/bitnami/redis-sentinel/etc/sentinel.conf + {{- end }} + {{- if not (contains "sentinel announce-port" .Values.sentinel.configuration) }} + echo "sentinel announce-port $SERVPORT" >> /opt/bitnami/redis-sentinel/etc/sentinel.conf + {{- end }} + {{- if not (contains "sentinel announce-ip" .Values.sentinel.configuration) }} + echo "sentinel announce-ip $(get_full_hostname "$HOSTNAME")" >> /opt/bitnami/redis-sentinel/etc/sentinel.conf + {{- end }} + + {{- if .Values.tls.enabled }} + ARGS=("--port" "0") + ARGS+=("--tls-port" "${REDIS_SENTINEL_TLS_PORT_NUMBER}") + ARGS+=("--tls-cert-file" "${REDIS_SENTINEL_TLS_CERT_FILE}") + ARGS+=("--tls-key-file" "${REDIS_SENTINEL_TLS_KEY_FILE}") + ARGS+=("--tls-ca-cert-file" "${REDIS_SENTINEL_TLS_CA_FILE}") + ARGS+=("--tls-replication" "yes") + ARGS+=("--tls-auth-clients" "${REDIS_SENTINEL_TLS_AUTH_CLIENTS}") + {{- if .Values.tls.dhParamsFilename }} + ARGS+=("--tls-dh-params-file" "${REDIS_SENTINEL_TLS_DH_PARAMS_FILE}") + {{- end }} + {{- end }} + {{- if .Values.sentinel.preExecCmds }} + {{ .Values.sentinel.preExecCmds | nindent 4 }} + {{- end }} + exec redis-server /opt/bitnami/redis-sentinel/etc/sentinel.conf {{- if .Values.tls.enabled }} "${ARGS[@]}" {{- end }} --sentinel + prestop-sentinel.sh: | + #!/bin/bash + + . /opt/bitnami/scripts/libvalidations.sh + . /opt/bitnami/scripts/libos.sh + + HEADLESS_SERVICE="{{ template "common.names.fullname" . }}-headless.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}" + SENTINEL_SERVICE_ENV_NAME={{ printf "%s%s" (upper (include "common.names.fullname" .)| replace "-" "_") "_SERVICE_PORT_TCP_SENTINEL" }} + SENTINEL_SERVICE_PORT=${!SENTINEL_SERVICE_ENV_NAME} + + get_full_hostname() { + hostname="$1" + + {{- if .Values.useExternalDNS.enabled }} + full_hostname="${hostname}.{{- include "redis.externalDNS.suffix" . }}" + {{- else if eq .Values.sentinel.service.type "NodePort" }} + full_hostname="${hostname}.{{- .Release.Namespace }}" + {{- else }} + full_hostname="${hostname}.${HEADLESS_SERVICE}" + {{- end }} + + {{- if .Values.useHostnames }} + echo "${full_hostname}" + {{- else }} + getent hosts "${full_hostname}" | awk '{ print $1 ; exit }' + {{- end }} + } + + run_sentinel_command() { + if is_boolean_yes "$REDIS_SENTINEL_TLS_ENABLED"; then + redis-cli -h "$REDIS_SERVICE" -p "$SENTINEL_SERVICE_PORT" --tls --cert "$REDIS_SENTINEL_TLS_CERT_FILE" --key "$REDIS_SENTINEL_TLS_KEY_FILE" --cacert "$REDIS_SENTINEL_TLS_CA_FILE" sentinel "$@" + else + redis-cli -h "$REDIS_SERVICE" -p "$SENTINEL_SERVICE_PORT" sentinel "$@" + fi + } + sentinel_failover_finished() { + REDIS_SENTINEL_INFO=($(run_sentinel_command get-master-addr-by-name "{{ .Values.sentinel.masterSet }}")) + REDIS_MASTER_HOST="${REDIS_SENTINEL_INFO[0]}" + [[ "$REDIS_MASTER_HOST" != "$(get_full_hostname $HOSTNAME)" ]] + } + + REDIS_SERVICE="{{ include "common.names.fullname" . }}.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}" + + {{ if .Values.auth.sentinel -}} + # redis-cli automatically consumes credentials from the REDISCLI_AUTH variable + [[ -n "$REDIS_PASSWORD" ]] && export REDISCLI_AUTH="$REDIS_PASSWORD" + [[ -f "$REDIS_PASSWORD_FILE" ]] && export REDISCLI_AUTH="$(< "${REDIS_PASSWORD_FILE}")" + {{- end }} + + if ! sentinel_failover_finished; then + echo "I am the master pod and you are stopping me. Starting sentinel failover" + if retry_while "sentinel_failover_finished" "{{ sub .Values.sentinel.terminationGracePeriodSeconds 10 }}" 1; then + echo "Master has been successfuly failed over to a different pod." + exit 0 + else + echo "Master failover failed" + exit 1 + fi + else + exit 0 + fi + prestop-redis.sh: | + #!/bin/bash + + . /opt/bitnami/scripts/libvalidations.sh + . /opt/bitnami/scripts/libos.sh + + run_redis_command() { + if is_boolean_yes "$REDIS_TLS_ENABLED"; then + redis-cli -h 127.0.0.1 -p "$REDIS_TLS_PORT" --tls --cert "$REDIS_TLS_CERT_FILE" --key "$REDIS_TLS_KEY_FILE" --cacert "$REDIS_TLS_CA_FILE" "$@" + else + redis-cli -h 127.0.0.1 -p "$REDIS_PORT" "$@" + fi + } + is_master() { + REDIS_ROLE=$(run_redis_command role | head -1) + [[ "$REDIS_ROLE" == "master" ]] + } + + HEADLESS_SERVICE="{{ template "common.names.fullname" . }}-headless.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}" + SENTINEL_SERVICE_ENV_NAME={{ printf "%s%s" (upper (include "common.names.fullname" .)| replace "-" "_") "_SERVICE_PORT_TCP_SENTINEL" }} + SENTINEL_SERVICE_PORT=${!SENTINEL_SERVICE_ENV_NAME} + + get_full_hostname() { + hostname="$1" + + {{- if .Values.useExternalDNS.enabled }} + full_hostname="${hostname}.{{- include "redis.externalDNS.suffix" . }}" + {{- else if eq .Values.sentinel.service.type "NodePort" }} + full_hostname="${hostname}.{{- .Release.Namespace }}" + {{- else }} + full_hostname="${hostname}.${HEADLESS_SERVICE}" + {{- end }} + + {{- if .Values.useHostnames }} + echo "${full_hostname}" + {{- else }} + getent hosts "${full_hostname}" | awk '{ print $1 ; exit }' + {{- end }} + } + + run_sentinel_command() { + if is_boolean_yes "$REDIS_SENTINEL_TLS_ENABLED"; then + {{ .Values.auth.sentinel | ternary "" "env -u REDISCLI_AUTH " -}} redis-cli -h "$REDIS_SERVICE" -p "$SENTINEL_SERVICE_PORT" --tls --cert "$REDIS_SENTINEL_TLS_CERT_FILE" --key "$REDIS_SENTINEL_TLS_KEY_FILE" --cacert "$REDIS_SENTINEL_TLS_CA_FILE" sentinel "$@" + else + {{ .Values.auth.sentinel | ternary "" "env -u REDISCLI_AUTH " -}} redis-cli -h "$REDIS_SERVICE" -p "$SENTINEL_SERVICE_PORT" sentinel "$@" + fi + } + sentinel_failover_finished() { + REDIS_SENTINEL_INFO=($(run_sentinel_command get-master-addr-by-name "{{ .Values.sentinel.masterSet }}")) + REDIS_MASTER_HOST="${REDIS_SENTINEL_INFO[0]}" + [[ "$REDIS_MASTER_HOST" != "$(get_full_hostname $HOSTNAME)" ]] + } + + REDIS_SERVICE="{{ include "common.names.fullname" . }}.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}" + + # redis-cli automatically consumes credentials from the REDISCLI_AUTH variable + [[ -n "$REDIS_PASSWORD" ]] && export REDISCLI_AUTH="$REDIS_PASSWORD" + [[ -f "$REDIS_PASSWORD_FILE" ]] && export REDISCLI_AUTH="$(< "${REDIS_PASSWORD_FILE}")" + + + if is_master && ! sentinel_failover_finished; then + echo "I am the master pod and you are stopping me. Pausing client connections." + # Pausing client write connections to avoid data loss + run_redis_command CLIENT PAUSE "{{ mul (add 2 (sub .Values.sentinel.terminationGracePeriodSeconds 10)) 1000 }}" WRITE + + echo "Issuing failover" + # if I am the master, issue a command to failover once + run_sentinel_command failover "{{ .Values.sentinel.masterSet }}" + + {{- if .Values.sentinel.redisShutdownWaitFailover }} + echo "Waiting for sentinel to complete failover for up to {{ sub .Values.sentinel.terminationGracePeriodSeconds 10 }}s" + retry_while "sentinel_failover_finished" "{{ sub .Values.sentinel.terminationGracePeriodSeconds 10 }}" 1 + {{- end }} + else + exit 0 + fi + +{{- else }} + start-master.sh: | + #!/bin/bash + + [[ -f $REDIS_PASSWORD_FILE ]] && export REDIS_PASSWORD="$(< "${REDIS_PASSWORD_FILE}")" + {{- if and .Values.master.containerSecurityContext.runAsUser (eq (.Values.master.containerSecurityContext.runAsUser | int) 0) }} + useradd redis + chown -R redis {{ .Values.master.persistence.path }} + {{- end }} + if [[ -f /opt/bitnami/redis/mounted-etc/master.conf ]];then + cp /opt/bitnami/redis/mounted-etc/master.conf /opt/bitnami/redis/etc/master.conf + fi + if [[ -f /opt/bitnami/redis/mounted-etc/redis.conf ]];then + cp /opt/bitnami/redis/mounted-etc/redis.conf /opt/bitnami/redis/etc/redis.conf + fi + {{- if .Values.tls.enabled }} + ARGS=("--port" "0") + ARGS+=("--tls-port" "${REDIS_TLS_PORT}") + ARGS+=("--tls-cert-file" "${REDIS_TLS_CERT_FILE}") + ARGS+=("--tls-key-file" "${REDIS_TLS_KEY_FILE}") + ARGS+=("--tls-ca-cert-file" "${REDIS_TLS_CA_FILE}") + ARGS+=("--tls-auth-clients" "${REDIS_TLS_AUTH_CLIENTS}") + {{- if .Values.tls.dhParamsFilename }} + ARGS+=("--tls-dh-params-file" "${REDIS_TLS_DH_PARAMS_FILE}") + {{- end }} + {{- else }} + ARGS=("--port" "${REDIS_PORT}") + {{- end }} + {{- if .Values.auth.enabled }} + ARGS+=("--requirepass" "${REDIS_PASSWORD}") + ARGS+=("--masterauth" "${REDIS_PASSWORD}") + {{- else }} + ARGS+=("--protected-mode" "no") + {{- end }} + ARGS+=("--include" "/opt/bitnami/redis/etc/redis.conf") + ARGS+=("--include" "/opt/bitnami/redis/etc/master.conf") + {{- if .Values.master.extraFlags }} + {{- range .Values.master.extraFlags }} + ARGS+=({{ . | quote }}) + {{- end }} + {{- end }} + {{- if .Values.master.preExecCmds }} + {{ .Values.master.preExecCmds | nindent 4 }} + {{- end }} + {{- if .Values.master.command }} + exec {{ .Values.master.command }} "${ARGS[@]}" + {{- else }} + exec redis-server "${ARGS[@]}" + {{- end }} + {{- if eq .Values.architecture "replication" }} + start-replica.sh: | + #!/bin/bash + + get_port() { + hostname="$1" + type="$2" + + port_var=$(echo "${hostname^^}_SERVICE_PORT_$type" | sed "s/-/_/g") + port=${!port_var} + + if [ -z "$port" ]; then + case $type in + "SENTINEL") + echo {{ .Values.sentinel.containerPorts.sentinel }} + ;; + "REDIS") + echo {{ .Values.master.containerPorts.redis }} + ;; + esac + else + echo $port + fi + } + + get_full_hostname() { + hostname="$1" + + {{- if .Values.useExternalDNS.enabled }} + full_hostname="${hostname}.{{- include "redis.externalDNS.suffix" . }}" + {{- else if eq .Values.sentinel.service.type "NodePort" }} + full_hostname="${hostname}.{{- .Release.Namespace }}" + {{- else }} + full_hostname="${hostname}.${HEADLESS_SERVICE}" + {{- end }} + + {{- if .Values.useHostnames }} + echo "${full_hostname}" + {{- else }} + getent hosts "${full_hostname}" | awk '{ print $1 ; exit }' + {{- end }} + } + + REDISPORT=$(get_port "$HOSTNAME" "REDIS") + + [[ -f $REDIS_PASSWORD_FILE ]] && export REDIS_PASSWORD="$(< "${REDIS_PASSWORD_FILE}")" + [[ -f $REDIS_MASTER_PASSWORD_FILE ]] && export REDIS_MASTER_PASSWORD="$(< "${REDIS_MASTER_PASSWORD_FILE}")" + {{- if and .Values.replica.containerSecurityContext.runAsUser (eq (.Values.replica.containerSecurityContext.runAsUser | int) 0) }} + useradd redis + chown -R redis {{ .Values.replica.persistence.path }} + {{- end }} + if [[ -f /opt/bitnami/redis/mounted-etc/replica.conf ]];then + cp /opt/bitnami/redis/mounted-etc/replica.conf /opt/bitnami/redis/etc/replica.conf + fi + if [[ -f /opt/bitnami/redis/mounted-etc/redis.conf ]];then + cp /opt/bitnami/redis/mounted-etc/redis.conf /opt/bitnami/redis/etc/redis.conf + fi + + echo "" >> /opt/bitnami/redis/etc/replica.conf + echo "replica-announce-port $REDISPORT" >> /opt/bitnami/redis/etc/replica.conf + echo "replica-announce-ip $(get_full_hostname "$HOSTNAME")" >> /opt/bitnami/redis/etc/replica.conf + + {{- if .Values.tls.enabled }} + ARGS=("--port" "0") + ARGS+=("--tls-port" "${REDIS_TLS_PORT}") + ARGS+=("--tls-cert-file" "${REDIS_TLS_CERT_FILE}") + ARGS+=("--tls-key-file" "${REDIS_TLS_KEY_FILE}") + ARGS+=("--tls-ca-cert-file" "${REDIS_TLS_CA_FILE}") + ARGS+=("--tls-auth-clients" "${REDIS_TLS_AUTH_CLIENTS}") + ARGS+=("--tls-replication" "yes") + {{- if .Values.tls.dhParamsFilename }} + ARGS+=("--tls-dh-params-file" "${REDIS_TLS_DH_PARAMS_FILE}") + {{- end }} + {{- else }} + ARGS=("--port" "${REDIS_PORT}") + {{- end }} + ARGS+=("--replicaof" "${REDIS_MASTER_HOST}" "${REDIS_MASTER_PORT_NUMBER}") + {{- if .Values.auth.enabled }} + ARGS+=("--requirepass" "${REDIS_PASSWORD}") + ARGS+=("--masterauth" "${REDIS_MASTER_PASSWORD}") + {{- else }} + ARGS+=("--protected-mode" "no") + {{- end }} + ARGS+=("--include" "/opt/bitnami/redis/etc/redis.conf") + ARGS+=("--include" "/opt/bitnami/redis/etc/replica.conf") + {{- if .Values.replica.extraFlags }} + {{- range .Values.replica.extraFlags }} + ARGS+=({{ . | quote }}) + {{- end }} + {{- end }} + {{- if .Values.replica.preExecCmds }} + {{ .Values.replica.preExecCmds | nindent 4 }} + {{- end }} + {{- if .Values.replica.command }} + exec {{ .Values.replica.command }} "${ARGS[@]}" + {{- else }} + exec redis-server "${ARGS[@]}" + {{- end }} + {{- end }} +{{- end }} diff --git a/redis-vrf/templates/secret.yaml b/redis-vrf/templates/secret.yaml new file mode 100644 index 00000000..2edc0d81 --- /dev/null +++ b/redis-vrf/templates/secret.yaml @@ -0,0 +1,23 @@ +{{- if and .Values.auth.enabled (not .Values.auth.existingSecret) -}} +apiVersion: v1 +kind: Secret +metadata: + name: {{ template "common.names.fullname" . }} + namespace: {{ .Release.Namespace | quote }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + {{- if or .Values.secretAnnotations .Values.commonAnnotations }} + annotations: + {{- if .Values.secretAnnotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.secretAnnotations "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.commonAnnotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} + {{- end }} +type: Opaque +data: + redis-password: {{ include "redis.password" . | b64enc | quote }} +{{- end -}} diff --git a/redis-vrf/templates/sentinel/hpa.yaml b/redis-vrf/templates/sentinel/hpa.yaml new file mode 100644 index 00000000..e1b765e6 --- /dev/null +++ b/redis-vrf/templates/sentinel/hpa.yaml @@ -0,0 +1,47 @@ +{{- if and .Values.replica.autoscaling.enabled .Values.sentinel.enabled }} +apiVersion: {{ include "common.capabilities.hpa.apiVersion" ( dict "context" $ ) }} +kind: HorizontalPodAutoscaler +metadata: + name: {{ printf "%s-node" (include "common.names.fullname" .) }} + namespace: {{ .Release.Namespace | quote }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + app.kubernetes.io/component: replica + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" (dict "value" .Values.commonLabels "context" $) | nindent 4 }} + {{- end }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} +spec: + scaleTargetRef: + apiVersion: {{ include "common.capabilities.deployment.apiVersion" . }} + kind: StatefulSet + name: {{ printf "%s-node" (include "common.names.fullname" .) }} + minReplicas: {{ .Values.replica.autoscaling.minReplicas }} + maxReplicas: {{ .Values.replica.autoscaling.maxReplicas }} + metrics: + {{- if .Values.replica.autoscaling.targetMemory }} + - type: Resource + resource: + name: memory + {{- if semverCompare "<1.23-0" (include "common.capabilities.kubeVersion" .) }} + targetAverageUtilization: {{ .Values.replica.autoscaling.targetMemory }} + {{- else }} + target: + type: Utilization + averageUtilization: {{ .Values.replica.autoscaling.targetMemory }} + {{- end }} + {{- end }} + {{- if .Values.replica.autoscaling.targetCPU }} + - type: Resource + resource: + name: cpu + {{- if semverCompare "<1.23-0" (include "common.capabilities.kubeVersion" .) }} + targetAverageUtilization: {{ .Values.replica.autoscaling.targetCPU }} + {{- else }} + target: + type: Utilization + averageUtilization: {{ .Values.replica.autoscaling.targetCPU }} + {{- end }} + {{- end }} +{{- end }} diff --git a/redis-vrf/templates/sentinel/node-services.yaml b/redis-vrf/templates/sentinel/node-services.yaml new file mode 100644 index 00000000..d3e635e9 --- /dev/null +++ b/redis-vrf/templates/sentinel/node-services.yaml @@ -0,0 +1,70 @@ +{{- if and (eq .Values.architecture "replication") .Values.sentinel.enabled (eq .Values.sentinel.service.type "NodePort") (or .Release.IsUpgrade .Values.sentinel.service.nodePorts.redis ) }} + +{{- range $i := until (int .Values.replica.replicaCount) }} + +{{ $portsmap := (lookup "v1" "ConfigMap" $.Release.Namespace (printf "%s-%s" ( include "common.names.fullname" $ ) "ports-configmap")).data }} + +{{ $sentinelport := 0}} +{{ $redisport := 0}} +{{- if $portsmap }} +{{ $sentinelport = index $portsmap (printf "%s-node-%s-%s" (include "common.names.fullname" $) (toString $i) "sentinel") }} +{{ $redisport = index $portsmap (printf "%s-node-%s-%s" (include "common.names.fullname" $) (toString $i) "redis") }} +{{- else }} +{{- end }} +apiVersion: v1 +kind: Service +metadata: + name: {{ template "common.names.fullname" $ }}-node-{{ $i }} + namespace: {{ $.Release.Namespace | quote }} + labels: {{- include "common.labels.standard" $ | nindent 4 }} + app.kubernetes.io/component: node + {{- if $.Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" $.Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + {{- if or $.Values.sentinel.service.annotations $.Values.commonAnnotations }} + annotations: + {{- if $.Values.sentinel.service.annotations }} + {{- include "common.tplvalues.render" ( dict "value" $.Values.sentinel.service.annotations "context" $ ) | nindent 4 }} + {{- end }} + {{- if $.Values.commonAnnotations }} + {{- include "common.tplvalues.render" ( dict "value" $.Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} + {{- end }} +spec: + type: NodePort + ports: + - name: sentinel + {{- if $.Values.sentinel.service.nodePorts.sentinel }} + nodePort: {{ (add $.Values.sentinel.service.nodePorts.sentinel $i 1) }} + port: {{ (add $.Values.sentinel.service.nodePorts.sentinel $i 1) }} + {{- else }} + nodePort: {{ $sentinelport }} + port: {{ $sentinelport }} + {{- end }} + protocol: TCP + targetPort: {{ $.Values.sentinel.containerPorts.sentinel }} + - name: redis + {{- if $.Values.sentinel.service.nodePorts.redis }} + nodePort: {{ (add $.Values.sentinel.service.nodePorts.redis $i 1) }} + port: {{ (add $.Values.sentinel.service.nodePorts.redis $i 1) }} + {{- else }} + nodePort: {{ $redisport }} + port: {{ $redisport }} + {{- end }} + protocol: TCP + targetPort: {{ $.Values.replica.containerPorts.redis }} + - name: sentinel-internal + nodePort: null + port: {{ $.Values.sentinel.containerPorts.sentinel }} + protocol: TCP + targetPort: {{ $.Values.sentinel.containerPorts.sentinel }} + - name: redis-internal + nodePort: null + port: {{ $.Values.replica.containerPorts.redis }} + protocol: TCP + targetPort: {{ $.Values.replica.containerPorts.redis }} + selector: + statefulset.kubernetes.io/pod-name: {{ template "common.names.fullname" $ }}-node-{{ $i }} +--- +{{- end }} +{{- end }} diff --git a/redis-vrf/templates/sentinel/ports-configmap.yaml b/redis-vrf/templates/sentinel/ports-configmap.yaml new file mode 100644 index 00000000..f5e7b2a9 --- /dev/null +++ b/redis-vrf/templates/sentinel/ports-configmap.yaml @@ -0,0 +1,100 @@ +{{- if and (eq .Values.architecture "replication") .Values.sentinel.enabled (eq .Values.sentinel.service.type "NodePort") (not .Values.sentinel.service.nodePorts.redis ) }} +{{- /* create a list to keep track of ports we choose to use */}} +{{ $chosenports := (list ) }} + +{{- /* Get list of all used nodeports */}} +{{ $usedports := (list ) }} +{{- range $index, $service := (lookup "v1" "Service" "" "").items }} + {{- range.spec.ports }} + {{- if .nodePort }} + {{- $usedports = (append $usedports .nodePort) }} + {{- end }} + {{- end }} +{{- end }} + +{{- /* +comments that start with # are rendered in the output when you debug, so you can less and search for them +Vars in the comment will be rendered out, so you can check their value this way. +https://helm.sh/docs/chart_best_practices/templates/#comments-yaml-comments-vs-template-comments + +remove the template comments and leave the yaml comments to help debug +*/}} + +{{- /* Sort the list */}} +{{ $usedports = $usedports | sortAlpha }} +#usedports {{ $usedports }} + +{{- /* How many nodeports per service do we want to create, except for the main service which is always two */}} +{{ $numberofPortsPerNodeService := 2 }} + +{{- /* for every nodeport we want, loop though the used ports to get an unused port */}} +{{- range $j := until (int (add (mul (int .Values.replica.replicaCount) $numberofPortsPerNodeService) 2)) }} + {{- /* #j={{ $j }} */}} + {{- $nodeport := (add $j 30000) }} + {{- $nodeportfound := false }} + {{- range $i := $usedports }} + {{- /* #i={{ $i }} + #nodeport={{ $nodeport }} + #usedports={{ $usedports }} */}} + {{- if and (has (toString $nodeport) $usedports) (eq $nodeportfound false) }} + {{- /* nodeport conflicts with in use */}} + {{- $nodeport = (add $nodeport 1) }} + {{- else if and ( has $nodeport $chosenports) (eq $nodeportfound false) }} + {{- /* nodeport already chosen, try another */}} + {{- $nodeport = (add $nodeport 1) }} + {{- else if (eq $nodeportfound false) }} + {{- /* nodeport free to use: not already claimed and not in use */}} + {{- /* select nodeport, and place into usedports */}} + {{- $chosenports = (append $chosenports $nodeport) }} + {{- $nodeportfound = true }} + {{- else }} + {{- /* nodeport has already been chosen and locked in, just work through the rest of the list to get to the next nodeport selection */}} + {{- end }} + {{- end }} + {{- if (eq $nodeportfound false) }} + {{- $chosenports = (append $chosenports $nodeport) }} + {{- end }} + +{{- end }} + +{{- /* print the usedports and chosenports for debugging */}} +#usedports {{ $usedports }} +#chosenports {{ $chosenports }}}} + +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: {{ template "common.names.fullname" . }}-ports-configmap + namespace: {{ .Release.Namespace | quote }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.commonAnnotations }} + annotations: + {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} +data: +{{ $portsmap := (lookup "v1" "ConfigMap" $.Release.Namespace (printf "%s-%s" ( include "common.names.fullname" . ) "ports-configmap")).data }} +{{- if $portsmap }} +{{- /* configmap already exists, do not install again */ -}} + {{- range $name, $value := $portsmap }} + "{{ $name }}": "{{ $value }}" + {{- end }} +{{- else }} +{{- /* configmap being set for first time */ -}} + {{- range $index, $port := $chosenports }} + {{- $nodenumber := (floor (div $index 2)) }} + {{- if (eq $index 0) }} + "{{ template "common.names.fullname" $ }}-sentinel": "{{ $port }}" + {{- else if (eq $index 1) }} + "{{ template "common.names.fullname" $ }}-redis": "{{ $port }}" + {{- else if (eq (mod $index 2) 0) }} + "{{ template "common.names.fullname" $ }}-node-{{ (sub $nodenumber 1) }}-sentinel": "{{ $port }}" + {{- else if (eq (mod $index 2) 1) }} + "{{ template "common.names.fullname" $ }}-node-{{ (sub $nodenumber 1) }}-redis": "{{ $port }}" + {{- end }} + {{- end }} +{{- end }} +{{- end }} diff --git a/redis-vrf/templates/sentinel/service.yaml b/redis-vrf/templates/sentinel/service.yaml new file mode 100644 index 00000000..362d681d --- /dev/null +++ b/redis-vrf/templates/sentinel/service.yaml @@ -0,0 +1,103 @@ +{{- if or .Release.IsUpgrade (ne .Values.sentinel.service.type "NodePort") .Values.sentinel.service.nodePorts.redis -}} +{{- if and (eq .Values.architecture "replication") .Values.sentinel.enabled }} +{{ $portsmap := (lookup "v1" "ConfigMap" $.Release.Namespace (printf "%s-%s" ( include "common.names.fullname" . ) "ports-configmap")).data }} + +{{ $sentinelport := 0}} +{{ $redisport := 0}} +{{- if $portsmap }} +{{ $sentinelport = index $portsmap (printf "%s-%s" (include "common.names.fullname" $) "sentinel") }} +{{ $redisport = index $portsmap (printf "%s-%s" (include "common.names.fullname" $) "redis") }} +{{- else }} +{{- end }} + +apiVersion: v1 +kind: Service +metadata: + name: {{ template "common.names.fullname" . }} + namespace: {{ .Release.Namespace | quote }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + app.kubernetes.io/component: node + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + {{- if or .Values.sentinel.service.annotations .Values.commonAnnotations }} + annotations: + {{- if .Values.sentinel.service.annotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.sentinel.service.annotations "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.commonAnnotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} + {{- end }} +spec: + type: {{ .Values.sentinel.service.type }} + {{- if or (eq .Values.sentinel.service.type "LoadBalancer") (eq .Values.sentinel.service.type "NodePort") }} + externalTrafficPolicy: {{ .Values.sentinel.service.externalTrafficPolicy | quote }} + {{- end }} + {{- if and (eq .Values.sentinel.service.type "LoadBalancer") (not (empty .Values.sentinel.service.loadBalancerIP)) }} + loadBalancerIP: {{ .Values.sentinel.service.loadBalancerIP }} + {{- end }} + {{- if and (eq .Values.sentinel.service.type "LoadBalancer") (not (empty .Values.sentinel.service.loadBalancerSourceRanges)) }} + loadBalancerSourceRanges: {{ .Values.sentinel.service.loadBalancerSourceRanges }} + {{- end }} + {{- if and .Values.sentinel.service.clusterIP (eq .Values.sentinel.service.type "ClusterIP") }} + clusterIP: {{ .Values.sentinel.service.clusterIP }} + {{- end }} + {{- if .Values.sentinel.service.sessionAffinity }} + sessionAffinity: {{ .Values.sentinel.service.sessionAffinity }} + {{- end }} + {{- if .Values.sentinel.service.sessionAffinityConfig }} + sessionAffinityConfig: {{- include "common.tplvalues.render" (dict "value" .Values.sentinel.service.sessionAffinityConfig "context" $) | nindent 4 }} + {{- end }} + ports: + - name: tcp-redis + {{- if and (or (eq .Values.sentinel.service.type "NodePort") (eq .Values.sentinel.service.type "LoadBalancer")) .Values.sentinel.service.nodePorts.redis }} + port: {{ .Values.sentinel.service.nodePorts.redis }} + {{- else if eq .Values.sentinel.service.type "NodePort" }} + port: {{ $redisport }} + {{- else}} + port: {{ .Values.sentinel.service.ports.redis }} + {{- end }} + targetPort: {{ .Values.replica.containerPorts.redis }} + {{- if and (or (eq .Values.sentinel.service.type "NodePort") (eq .Values.sentinel.service.type "LoadBalancer")) .Values.sentinel.service.nodePorts.redis }} + nodePort: {{ .Values.sentinel.service.nodePorts.redis }} + {{- else if eq .Values.sentinel.service.type "ClusterIP" }} + nodePort: null + {{- else if eq .Values.sentinel.service.type "NodePort" }} + nodePort: {{ $redisport }} + {{- end }} + - name: tcp-sentinel + {{- if and (or (eq .Values.sentinel.service.type "NodePort") (eq .Values.sentinel.service.type "LoadBalancer")) .Values.sentinel.service.nodePorts.sentinel }} + port: {{ .Values.sentinel.service.nodePorts.sentinel }} + {{- else if eq .Values.sentinel.service.type "NodePort" }} + port: {{ $sentinelport }} + {{- else }} + port: {{ .Values.sentinel.service.ports.sentinel }} + {{- end }} + targetPort: {{ .Values.sentinel.containerPorts.sentinel }} + {{- if and (or (eq .Values.sentinel.service.type "NodePort") (eq .Values.sentinel.service.type "LoadBalancer")) .Values.sentinel.service.nodePorts.sentinel }} + nodePort: {{ .Values.sentinel.service.nodePorts.sentinel }} + {{- else if eq .Values.sentinel.service.type "ClusterIP" }} + nodePort: null + {{- else if eq .Values.sentinel.service.type "NodePort" }} + nodePort: {{ $sentinelport }} + {{- end }} + {{- if eq .Values.sentinel.service.type "NodePort" }} + - name: sentinel-internal + nodePort: null + port: {{ .Values.sentinel.containerPorts.sentinel }} + protocol: TCP + targetPort: {{ .Values.sentinel.containerPorts.sentinel }} + - name: redis-internal + nodePort: null + port: {{ .Values.replica.containerPorts.redis }} + protocol: TCP + targetPort: {{ .Values.replica.containerPorts.redis }} + {{- end }} + {{- if .Values.sentinel.service.extraPorts }} + {{- include "common.tplvalues.render" (dict "value" .Values.sentinel.service.extraPorts "context" $) | nindent 4 }} + {{- end }} + selector: {{- include "common.labels.matchLabels" . | nindent 4 }} + app.kubernetes.io/component: node +{{- end }} +{{- end }} diff --git a/redis-vrf/templates/sentinel/statefulset.yaml b/redis-vrf/templates/sentinel/statefulset.yaml new file mode 100644 index 00000000..205d5592 --- /dev/null +++ b/redis-vrf/templates/sentinel/statefulset.yaml @@ -0,0 +1,774 @@ +{{- if or .Release.IsUpgrade (ne .Values.sentinel.service.type "NodePort") .Values.sentinel.service.nodePorts.redis -}} +{{- if and (eq .Values.architecture "replication") .Values.sentinel.enabled }} +apiVersion: {{ include "common.capabilities.statefulset.apiVersion" . }} +kind: StatefulSet +metadata: + name: {{ printf "%s-node" (include "common.names.fullname" .) }} + namespace: {{ .Release.Namespace | quote }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + app.kubernetes.io/component: node + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + {{- if or .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} +spec: + replicas: {{ .Values.replica.replicaCount }} + selector: + matchLabels: {{- include "common.labels.matchLabels" . | nindent 6 }} + app.kubernetes.io/component: node + serviceName: {{ printf "%s-headless" (include "common.names.fullname" .) }} + {{- if .Values.replica.updateStrategy }} + updateStrategy: {{- toYaml .Values.replica.updateStrategy | nindent 4 }} + {{- end }} + {{- if and .Values.replica.minReadySeconds (semverCompare ">= 1.25" (include "common.capabilities.kubeVersion" .)) }} + minReadySeconds: {{ .Values.replica.minReadySeconds }} + {{- end }} + {{- if .Values.replica.podManagementPolicy }} + podManagementPolicy: {{ .Values.replica.podManagementPolicy | quote }} + {{- end }} + template: + metadata: + labels: {{- include "common.labels.standard" . | nindent 8 }} + app.kubernetes.io/component: node + {{- if .Values.replica.podLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.replica.podLabels "context" $ ) | nindent 8 }} + {{- end }} + {{- if and .Values.metrics.enabled .Values.metrics.podLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.metrics.podLabels "context" $ ) | nindent 8 }} + {{- end }} + annotations: + {{- if (include "redis.createConfigmap" .) }} + checksum/configmap: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }} + {{- end }} + checksum/health: {{ include (print $.Template.BasePath "/health-configmap.yaml") . | sha256sum }} + checksum/scripts: {{ include (print $.Template.BasePath "/scripts-configmap.yaml") . | sha256sum }} + checksum/secret: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }} + {{- if .Values.replica.podAnnotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.replica.podAnnotations "context" $ ) | nindent 8 }} + {{- end }} + {{- if and .Values.metrics.enabled .Values.metrics.podAnnotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.metrics.podAnnotations "context" $ ) | nindent 8 }} + {{- end }} + spec: + {{- include "redis.imagePullSecrets" . | nindent 6 }} + {{- if .Values.replica.hostAliases }} + hostAliases: {{- include "common.tplvalues.render" (dict "value" .Values.replica.hostAliases "context" $) | nindent 8 }} + {{- end }} + {{- if .Values.replica.podSecurityContext.enabled }} + securityContext: {{- omit .Values.replica.podSecurityContext "enabled" | toYaml | nindent 8 }} + {{- end }} + serviceAccountName: {{ template "redis.serviceAccountName" . }} + {{- if .Values.replica.priorityClassName }} + priorityClassName: {{ .Values.replica.priorityClassName | quote }} + {{- end }} + {{- if .Values.replica.affinity }} + affinity: {{- include "common.tplvalues.render" (dict "value" .Values.replica.affinity "context" $) | nindent 8 }} + {{- else }} + affinity: + podAffinity: {{- include "common.affinities.pods" (dict "type" .Values.replica.podAffinityPreset "component" "node" "context" $) | nindent 10 }} + podAntiAffinity: {{- include "common.affinities.pods" (dict "type" .Values.replica.podAntiAffinityPreset "component" "node" "context" $) | nindent 10 }} + nodeAffinity: {{- include "common.affinities.nodes" (dict "type" .Values.replica.nodeAffinityPreset.type "key" .Values.replica.nodeAffinityPreset.key "values" .Values.replica.nodeAffinityPreset.values) | nindent 10 }} + {{- end }} + {{- if .Values.replica.nodeSelector }} + nodeSelector: {{- include "common.tplvalues.render" (dict "value" .Values.replica.nodeSelector "context" $) | nindent 8 }} + {{- end }} + {{- if .Values.replica.tolerations }} + tolerations: {{- include "common.tplvalues.render" (dict "value" .Values.replica.tolerations "context" $) | nindent 8 }} + {{- end }} + {{- if .Values.replica.topologySpreadConstraints }} + topologySpreadConstraints: {{- include "common.tplvalues.render" (dict "value" .Values.replica.topologySpreadConstraints "context" $) | nindent 8 }} + {{- end }} + {{- if .Values.replica.shareProcessNamespace }} + shareProcessNamespace: {{ .Values.replica.shareProcessNamespace }} + {{- end }} + {{- if .Values.replica.schedulerName }} + schedulerName: {{ .Values.replica.schedulerName | quote }} + {{- end }} + {{- if .Values.replica.dnsPolicy }} + dnsPolicy: {{ .Values.replica.dnsPolicy }} + {{- end }} + {{- if .Values.replica.dnsConfig }} + dnsConfig: {{- include "common.tplvalues.render" (dict "value" .Values.replica.dnsConfig "context" $) | nindent 8 }} + {{- end }} + terminationGracePeriodSeconds: {{ .Values.sentinel.terminationGracePeriodSeconds }} + containers: + - name: redis + image: {{ template "redis.image" . }} + imagePullPolicy: {{ .Values.image.pullPolicy | quote }} + {{- if not .Values.diagnosticMode.enabled }} + {{- if .Values.replica.lifecycleHooks }} + lifecycle: {{- include "common.tplvalues.render" (dict "value" .Values.replica.lifecycleHooks "context" $) | nindent 12 }} + {{- else }} + lifecycle: + preStop: + exec: + command: + - /bin/bash + - -c + - /opt/bitnami/scripts/start-scripts/prestop-redis.sh + {{- end }} + {{- end }} + {{- if .Values.replica.containerSecurityContext.enabled }} + securityContext: {{- omit .Values.replica.containerSecurityContext "enabled" | toYaml | nindent 12 }} + {{- end }} + {{- if .Values.diagnosticMode.enabled }} + command: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.command "context" $) | nindent 12 }} + {{- else if .Values.replica.command }} + command: {{- include "common.tplvalues.render" (dict "value" .Values.replica.command "context" $) | nindent 12 }} + {{- else }} + command: + - /bin/bash + {{- end }} + {{- if .Values.diagnosticMode.enabled }} + args: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.args "context" $) | nindent 12 }} + {{- else if .Values.replica.args }} + args: {{- include "common.tplvalues.render" (dict "value" .Values.replica.args "context" $) | nindent 12 }} + {{- else }} + args: + - -c + - /opt/bitnami/scripts/start-scripts/start-node.sh + {{- end }} + env: + - name: BITNAMI_DEBUG + value: {{ ternary "true" "false" (or .Values.image.debug .Values.diagnosticMode.enabled) | quote }} + - name: REDIS_MASTER_PORT_NUMBER + value: {{ .Values.replica.containerPorts.redis | quote }} + - name: ALLOW_EMPTY_PASSWORD + value: {{ ternary "no" "yes" .Values.auth.enabled | quote }} + {{- if .Values.auth.enabled }} + {{- if .Values.auth.usePasswordFiles }} + - name: REDIS_PASSWORD_FILE + value: "/opt/bitnami/redis/secrets/redis-password" + - name: REDIS_MASTER_PASSWORD_FILE + value: "/opt/bitnami/redis/secrets/redis-password" + {{- else }} + - name: REDIS_PASSWORD + valueFrom: + secretKeyRef: + name: {{ template "redis.secretName" . }} + key: {{ template "redis.secretPasswordKey" . }} + - name: REDIS_MASTER_PASSWORD + valueFrom: + secretKeyRef: + name: {{ template "redis.secretName" . }} + key: {{ template "redis.secretPasswordKey" . }} + {{- end }} + {{- end }} + - name: REDIS_TLS_ENABLED + value: {{ ternary "yes" "no" .Values.tls.enabled | quote }} + {{- if .Values.tls.enabled }} + - name: REDIS_TLS_PORT + value: {{ .Values.replica.containerPorts.redis | quote }} + - name: REDIS_TLS_AUTH_CLIENTS + value: {{ ternary "yes" "no" .Values.tls.authClients | quote }} + - name: REDIS_TLS_CERT_FILE + value: {{ template "redis.tlsCert" . }} + - name: REDIS_TLS_KEY_FILE + value: {{ template "redis.tlsCertKey" . }} + - name: REDIS_TLS_CA_FILE + value: {{ template "redis.tlsCACert" . }} + {{- if .Values.tls.dhParamsFilename }} + - name: REDIS_TLS_DH_PARAMS_FILE + value: {{ template "redis.tlsDHParams" . }} + {{- end }} + {{- else }} + - name: REDIS_PORT + value: {{ .Values.replica.containerPorts.redis | quote }} + {{- end }} + - name: REDIS_SENTINEL_TLS_ENABLED + value: {{ ternary "yes" "no" .Values.tls.enabled | quote }} + {{- if .Values.tls.enabled }} + - name: REDIS_SENTINEL_TLS_PORT_NUMBER + value: {{ .Values.sentinel.containerPorts.sentinel | quote }} + - name: REDIS_SENTINEL_TLS_AUTH_CLIENTS + value: {{ ternary "yes" "no" .Values.tls.authClients | quote }} + - name: REDIS_SENTINEL_TLS_CERT_FILE + value: {{ template "redis.tlsCert" . }} + - name: REDIS_SENTINEL_TLS_KEY_FILE + value: {{ template "redis.tlsCertKey" . }} + - name: REDIS_SENTINEL_TLS_CA_FILE + value: {{ template "redis.tlsCACert" . }} + {{- if .Values.tls.dhParamsFilename }} + - name: REDIS_SENTINEL_TLS_DH_PARAMS_FILE + value: {{ template "redis.tlsDHParams" . }} + {{- end }} + {{- else }} + - name: REDIS_SENTINEL_PORT + value: {{ .Values.sentinel.containerPorts.sentinel | quote }} + {{- end }} + - name: REDIS_DATA_DIR + value: {{ .Values.replica.persistence.path }} + {{- if .Values.replica.externalMaster.enabled }} + - name: REDIS_EXTERNAL_MASTER_HOST + value: {{ .Values.replica.externalMaster.host | quote }} + - name: REDIS_EXTERNAL_MASTER_PORT + value: {{ .Values.replica.externalMaster.port | quote }} + {{- end }} + {{- if .Values.replica.extraEnvVars }} + {{- include "common.tplvalues.render" ( dict "value" .Values.replica.extraEnvVars "context" $ ) | nindent 12 }} + {{- end }} + {{- if or .Values.replica.extraEnvVarsCM .Values.replica.extraEnvVarsSecret }} + envFrom: + {{- if .Values.replica.extraEnvVarsCM }} + - configMapRef: + name: {{ .Values.replica.extraEnvVarsCM }} + {{- end }} + {{- if .Values.replica.extraEnvVarsSecret }} + - secretRef: + name: {{ .Values.replica.extraEnvVarsSecret }} + {{- end }} + {{- end }} + ports: + - name: redis + containerPort: {{ .Values.replica.containerPorts.redis }} + {{- if not .Values.diagnosticMode.enabled }} + {{- if .Values.replica.customStartupProbe }} + startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.replica.customStartupProbe "context" $) | nindent 12 }} + {{- else if .Values.replica.startupProbe.enabled }} + startupProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.replica.startupProbe "enabled") "context" $) | nindent 12 }} + exec: + command: + - sh + - -c + - /health/ping_liveness_local.sh {{ .Values.replica.livenessProbe.timeoutSeconds }} + {{- end }} + {{- if .Values.replica.customLivenessProbe }} + livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.replica.customLivenessProbe "context" $) | nindent 12 }} + {{- else if .Values.replica.livenessProbe.enabled }} + livenessProbe: + initialDelaySeconds: {{ .Values.replica.livenessProbe.initialDelaySeconds }} + periodSeconds: {{ .Values.replica.livenessProbe.periodSeconds }} + timeoutSeconds: {{ .Values.replica.livenessProbe.timeoutSeconds }} + successThreshold: {{ .Values.replica.livenessProbe.successThreshold }} + failureThreshold: {{ .Values.replica.livenessProbe.failureThreshold }} + exec: + command: + - sh + - -c + - /health/ping_liveness_local.sh {{ .Values.replica.livenessProbe.timeoutSeconds }} + {{- end }} + {{- if .Values.replica.customReadinessProbe }} + readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.replica.customReadinessProbe "context" $) | nindent 12 }} + {{- else if .Values.replica.readinessProbe.enabled }} + readinessProbe: + initialDelaySeconds: {{ .Values.replica.readinessProbe.initialDelaySeconds }} + periodSeconds: {{ .Values.replica.readinessProbe.periodSeconds }} + timeoutSeconds: {{ .Values.replica.readinessProbe.timeoutSeconds }} + successThreshold: {{ .Values.replica.readinessProbe.successThreshold }} + failureThreshold: {{ .Values.replica.readinessProbe.failureThreshold }} + exec: + command: + - sh + - -c + - /health/ping_readiness_local.sh {{ .Values.replica.readinessProbe.timeoutSeconds }} + {{- end }} + {{- end }} + {{- if .Values.replica.resources }} + resources: {{- toYaml .Values.replica.resources | nindent 12 }} + {{- end }} + volumeMounts: + - name: start-scripts + mountPath: /opt/bitnami/scripts/start-scripts + - name: health + mountPath: /health + {{- if .Values.sentinel.persistence.enabled }} + - name: sentinel-data + mountPath: /opt/bitnami/redis-sentinel/etc + {{- end }} + {{- if .Values.auth.usePasswordFiles }} + - name: redis-password + mountPath: /opt/bitnami/redis/secrets/ + {{- end }} + - name: redis-data + mountPath: {{ .Values.replica.persistence.path }} + {{- if .Values.replica.persistence.subPath }} + subPath: {{ .Values.replica.persistence.subPath }} + {{- else if .Values.replica.persistence.subPathExpr }} + subPathExpr: {{ .Values.replica.persistence.subPathExpr }} + {{- end }} + - name: config + mountPath: /opt/bitnami/redis/mounted-etc + - name: redis-tmp-conf + mountPath: /opt/bitnami/redis/etc + - name: tmp + mountPath: /tmp + {{- if .Values.tls.enabled }} + - name: redis-certificates + mountPath: /opt/bitnami/redis/certs + readOnly: true + {{- end }} + {{- if .Values.replica.extraVolumeMounts }} + {{- include "common.tplvalues.render" ( dict "value" .Values.replica.extraVolumeMounts "context" $ ) | nindent 12 }} + {{- end }} + - name: sentinel + image: {{ template "redis.sentinel.image" . }} + imagePullPolicy: {{ .Values.sentinel.image.pullPolicy | quote }} + {{- if not .Values.diagnosticMode.enabled }} + {{- if .Values.sentinel.lifecycleHooks }} + lifecycle: {{- include "common.tplvalues.render" (dict "value" .Values.sentinel.lifecycleHooks "context" $) | nindent 12 }} + {{- else }} + lifecycle: + preStop: + exec: + command: + - /bin/bash + - -c + - /opt/bitnami/scripts/start-scripts/prestop-sentinel.sh + {{- end }} + {{- end }} + {{- if .Values.sentinel.containerSecurityContext.enabled }} + securityContext: {{- omit .Values.sentinel.containerSecurityContext "enabled" | toYaml | nindent 12 }} + {{- end }} + {{- if .Values.diagnosticMode.enabled }} + command: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.command "context" $) | nindent 12 }} + {{- else if .Values.sentinel.command }} + command: {{- include "common.tplvalues.render" (dict "value" .Values.sentinel.command "context" $) | nindent 12 }} + {{- else }} + command: + - /bin/bash + {{- end }} + {{- if .Values.diagnosticMode.enabled }} + args: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.args "context" $) | nindent 12 }} + {{- else if .Values.sentinel.args }} + args: {{- include "common.tplvalues.render" (dict "value" .Values.sentinel.args "context" $) | nindent 12 }} + {{- else }} + args: + - -c + - /opt/bitnami/scripts/start-scripts/start-sentinel.sh + {{- end }} + env: + - name: BITNAMI_DEBUG + value: {{ ternary "true" "false" (or .Values.sentinel.image.debug .Values.diagnosticMode.enabled) | quote }} + {{- if .Values.auth.enabled }} + {{- if .Values.auth.usePasswordFiles }} + - name: REDIS_PASSWORD_FILE + value: "/opt/bitnami/redis/secrets/redis-password" + {{- else }} + - name: REDIS_PASSWORD + valueFrom: + secretKeyRef: + name: {{ template "redis.secretName" . }} + key: {{ template "redis.secretPasswordKey" . }} + {{- end }} + {{- else }} + - name: ALLOW_EMPTY_PASSWORD + value: "yes" + {{- end }} + - name: REDIS_SENTINEL_TLS_ENABLED + value: {{ ternary "yes" "no" .Values.tls.enabled | quote }} + {{- if .Values.tls.enabled }} + - name: REDIS_SENTINEL_TLS_PORT_NUMBER + value: {{ .Values.sentinel.containerPorts.sentinel | quote }} + - name: REDIS_SENTINEL_TLS_AUTH_CLIENTS + value: {{ ternary "yes" "no" .Values.tls.authClients | quote }} + - name: REDIS_SENTINEL_TLS_CERT_FILE + value: {{ template "redis.tlsCert" . }} + - name: REDIS_SENTINEL_TLS_KEY_FILE + value: {{ template "redis.tlsCertKey" . }} + - name: REDIS_SENTINEL_TLS_CA_FILE + value: {{ template "redis.tlsCACert" . }} + {{- if .Values.tls.dhParamsFilename }} + - name: REDIS_SENTINEL_TLS_DH_PARAMS_FILE + value: {{ template "redis.tlsDHParams" . }} + {{- end }} + {{- else }} + - name: REDIS_SENTINEL_PORT + value: {{ .Values.sentinel.containerPorts.sentinel | quote }} + {{- end }} + {{- if .Values.sentinel.externalMaster.enabled }} + - name: REDIS_EXTERNAL_MASTER_HOST + value: {{ .Values.sentinel.externalMaster.host | quote }} + - name: REDIS_EXTERNAL_MASTER_PORT + value: {{ .Values.sentinel.externalMaster.port | quote }} + {{- end }} + {{- if .Values.sentinel.extraEnvVars }} + {{- include "common.tplvalues.render" ( dict "value" .Values.sentinel.extraEnvVars "context" $ ) | nindent 12 }} + {{- end }} + {{- if or .Values.sentinel.extraEnvVarsCM .Values.sentinel.extraEnvVarsSecret }} + envFrom: + {{- if .Values.sentinel.extraEnvVarsCM }} + - configMapRef: + name: {{ .Values.sentinel.extraEnvVarsCM }} + {{- end }} + {{- if .Values.sentinel.extraEnvVarsSecret }} + - secretRef: + name: {{ .Values.sentinel.extraEnvVarsSecret }} + {{- end }} + {{- end }} + ports: + - name: redis-sentinel + containerPort: {{ .Values.sentinel.containerPorts.sentinel }} + {{- if not .Values.diagnosticMode.enabled }} + {{- if .Values.sentinel.customStartupProbe }} + startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.sentinel.customStartupProbe "context" $) | nindent 12 }} + {{- else if .Values.sentinel.startupProbe.enabled }} + startupProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.sentinel.startupProbe "enabled") "context" $) | nindent 12 }} + exec: + command: + - sh + - -c + - /health/ping_sentinel.sh {{ .Values.sentinel.livenessProbe.timeoutSeconds }} + {{- end }} + {{- if .Values.sentinel.customLivenessProbe }} + livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.sentinel.customLivenessProbe "context" $) | nindent 12 }} + {{- else if .Values.sentinel.livenessProbe.enabled }} + livenessProbe: + initialDelaySeconds: {{ .Values.sentinel.livenessProbe.initialDelaySeconds }} + periodSeconds: {{ .Values.sentinel.livenessProbe.periodSeconds }} + timeoutSeconds: {{ .Values.sentinel.livenessProbe.timeoutSeconds }} + successThreshold: {{ .Values.sentinel.livenessProbe.successThreshold }} + failureThreshold: {{ .Values.sentinel.livenessProbe.failureThreshold }} + exec: + command: + - sh + - -c + - /health/ping_sentinel.sh {{ .Values.sentinel.livenessProbe.timeoutSeconds }} + {{- end }} + {{- end }} + {{- if not .Values.diagnosticMode.enabled }} + {{- if .Values.sentinel.customReadinessProbe }} + readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.sentinel.customReadinessProbe "context" $) | nindent 12 }} + {{- else if .Values.sentinel.readinessProbe.enabled }} + readinessProbe: + initialDelaySeconds: {{ .Values.sentinel.readinessProbe.initialDelaySeconds }} + periodSeconds: {{ .Values.sentinel.readinessProbe.periodSeconds }} + timeoutSeconds: {{ .Values.sentinel.readinessProbe.timeoutSeconds }} + successThreshold: {{ .Values.sentinel.readinessProbe.successThreshold }} + failureThreshold: {{ .Values.sentinel.readinessProbe.failureThreshold }} + exec: + command: + - sh + - -c + - /health/ping_sentinel.sh {{ .Values.sentinel.readinessProbe.timeoutSeconds }} + {{- end }} + {{- end }} + {{- if .Values.sentinel.resources }} + resources: {{- toYaml .Values.sentinel.resources | nindent 12 }} + {{- end }} + volumeMounts: + - name: start-scripts + mountPath: /opt/bitnami/scripts/start-scripts + - name: health + mountPath: /health + - name: sentinel-data + mountPath: /opt/bitnami/redis-sentinel/etc + {{- if .Values.auth.usePasswordFiles }} + - name: redis-password + mountPath: /opt/bitnami/redis/secrets/ + {{- end }} + - name: redis-data + mountPath: {{ .Values.replica.persistence.path }} + {{- if .Values.replica.persistence.subPath }} + subPath: {{ .Values.replica.persistence.subPath }} + {{- else if .Values.replica.persistence.subPathExpr }} + subPathExpr: {{ .Values.replica.persistence.subPathExpr }} + {{- end }} + - name: config + mountPath: /opt/bitnami/redis-sentinel/mounted-etc + {{- if .Values.tls.enabled }} + - name: redis-certificates + mountPath: /opt/bitnami/redis/certs + readOnly: true + {{- end }} + {{- if .Values.sentinel.extraVolumeMounts }} + {{- include "common.tplvalues.render" ( dict "value" .Values.sentinel.extraVolumeMounts "context" $ ) | nindent 12 }} + {{- end }} + {{- if .Values.metrics.enabled }} + - name: metrics + image: {{ template "redis.metrics.image" . }} + imagePullPolicy: {{ .Values.metrics.image.pullPolicy | quote }} + {{- if .Values.metrics.containerSecurityContext.enabled }} + securityContext: {{- omit .Values.metrics.containerSecurityContext "enabled" | toYaml | nindent 12 }} + {{- end }} + {{- if .Values.diagnosticMode.enabled }} + command: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.command "context" $) | nindent 12 }} + {{- else }} + command: + - /bin/bash + - -c + - | + if [[ -f '/secrets/redis-password' ]]; then + export REDIS_PASSWORD=$(cat /secrets/redis-password) + fi + redis_exporter{{- range $key, $value := .Values.metrics.extraArgs }} --{{ $key }}={{ $value }}{{- end }} + {{- end }} + {{- if .Values.diagnosticMode.enabled }} + args: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.args "context" $) | nindent 12 }} + {{- end }} + env: + - name: REDIS_ALIAS + value: {{ template "common.names.fullname" . }} + {{- if .Values.auth.enabled }} + - name: REDIS_USER + value: default + {{- if (not .Values.auth.usePasswordFiles) }} + - name: REDIS_PASSWORD + valueFrom: + secretKeyRef: + name: {{ template "redis.secretName" . }} + key: {{ template "redis.secretPasswordKey" . }} + {{- end }} + {{- end }} + {{- if .Values.tls.enabled }} + - name: REDIS_ADDR + value: rediss://{{ .Values.metrics.redisTargetHost }}:{{ .Values.replica.containerPorts.redis }} + {{- if .Values.tls.authClients }} + - name: REDIS_EXPORTER_TLS_CLIENT_KEY_FILE + value: {{ template "redis.tlsCertKey" . }} + - name: REDIS_EXPORTER_TLS_CLIENT_CERT_FILE + value: {{ template "redis.tlsCert" . }} + {{- end }} + - name: REDIS_EXPORTER_TLS_CA_CERT_FILE + value: {{ template "redis.tlsCACert" . }} + {{- end }} + {{- if .Values.metrics.extraEnvVars }} + {{- include "common.tplvalues.render" (dict "value" .Values.metrics.extraEnvVars "context" $) | nindent 12 }} + {{- end }} + ports: + - name: metrics + containerPort: 9121 + {{- if not .Values.diagnosticMode.enabled }} + {{- if .Values.metrics.customStartupProbe }} + startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.metrics.customStartupProbe "context" $) | nindent 12 }} + {{- else if .Values.metrics.startupProbe.enabled }} + startupProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.metrics.startupProbe "enabled") "context" $) | nindent 12 }} + tcpSocket: + port: metrics + {{- end }} + {{- if .Values.metrics.customLivenessProbe }} + livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.metrics.customLivenessProbe "context" $) | nindent 12 }} + {{- else if .Values.metrics.livenessProbe.enabled }} + livenessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.metrics.livenessProbe "enabled") "context" $) | nindent 12 }} + tcpSocket: + port: metrics + {{- end }} + {{- if .Values.metrics.customReadinessProbe }} + readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.metrics.customReadinessProbe "context" $) | nindent 12 }} + {{- else if .Values.metrics.readinessProbe.enabled }} + readinessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.metrics.readinessProbe "enabled") "context" $) | nindent 12 }} + httpGet: + path: / + port: metrics + {{- end }} + {{- end }} + {{- if .Values.metrics.resources }} + resources: {{- toYaml .Values.metrics.resources | nindent 12 }} + {{- end }} + volumeMounts: + {{- if .Values.auth.usePasswordFiles }} + - name: redis-password + mountPath: /secrets/ + {{- end }} + {{- if .Values.tls.enabled }} + - name: redis-certificates + mountPath: /opt/bitnami/redis/certs + readOnly: true + {{- end }} + {{- if .Values.metrics.extraVolumeMounts }} + {{- include "common.tplvalues.render" ( dict "value" .Values.metrics.extraVolumeMounts "context" $ ) | nindent 12 }} + {{- end }} + {{- end }} + {{- if .Values.replica.sidecars }} + {{- include "common.tplvalues.render" (dict "value" .Values.replica.sidecars "context" $) | nindent 8 }} + {{- end }} + {{- $needsVolumePermissions := and .Values.volumePermissions.enabled .Values.replica.persistence.enabled .Values.replica.podSecurityContext.enabled .Values.replica.containerSecurityContext.enabled }} + {{- if or .Values.replica.initContainers $needsVolumePermissions .Values.sysctl.enabled }} + initContainers: + {{- if .Values.replica.initContainers }} + {{- include "common.tplvalues.render" (dict "value" .Values.replica.initContainers "context" $) | nindent 8 }} + {{- end }} + {{- if $needsVolumePermissions }} + - name: volume-permissions + image: {{ include "redis.volumePermissions.image" . }} + imagePullPolicy: {{ .Values.volumePermissions.image.pullPolicy | quote }} + command: + - /bin/bash + - -ec + - | + {{- if eq ( toString ( .Values.volumePermissions.containerSecurityContext.runAsUser )) "auto" }} + chown -R `id -u`:`id -G | cut -d " " -f2` {{ .Values.replica.persistence.path }} + {{- else }} + chown -R {{ .Values.replica.containerSecurityContext.runAsUser }}:{{ .Values.replica.podSecurityContext.fsGroup }} {{ .Values.replica.persistence.path }} + {{- end }} + {{- if eq ( toString ( .Values.volumePermissions.containerSecurityContext.runAsUser )) "auto" }} + securityContext: {{- omit .Values.volumePermissions.containerSecurityContext "runAsUser" | toYaml | nindent 12 }} + {{- else }} + securityContext: {{- .Values.volumePermissions.containerSecurityContext | toYaml | nindent 12 }} + {{- end }} + {{- if .Values.volumePermissions.resources }} + resources: {{- toYaml .Values.volumePermissions.resources | nindent 12 }} + {{- end }} + volumeMounts: + - name: redis-data + mountPath: {{ .Values.replica.persistence.path }} + {{- if .Values.replica.persistence.subPath }} + subPath: {{ .Values.replica.persistence.subPath }} + {{- else if .Values.replica.persistence.subPathExpr }} + subPathExpr: {{ .Values.replica.persistence.subPathExpr }} + {{- end }} + {{- end }} + {{- if .Values.sysctl.enabled }} + - name: init-sysctl + image: {{ include "redis.sysctl.image" . }} + imagePullPolicy: {{ default "" .Values.sysctl.image.pullPolicy | quote }} + securityContext: + privileged: true + runAsUser: 0 + {{- if .Values.sysctl.command }} + command: {{- include "common.tplvalues.render" (dict "value" .Values.sysctl.command "context" $) | nindent 12 }} + {{- end }} + {{- if .Values.sysctl.resources }} + resources: {{- toYaml .Values.sysctl.resources | nindent 12 }} + {{- end }} + {{- if .Values.sysctl.mountHostSys }} + volumeMounts: + - name: host-sys + mountPath: /host-sys + {{- end }} + {{- end }} + {{- end }} + volumes: + - name: start-scripts + configMap: + name: {{ printf "%s-scripts" (include "common.names.fullname" .) }} + defaultMode: 0755 + - name: health + configMap: + name: {{ printf "%s-health" (include "common.names.fullname" .) }} + defaultMode: 0755 + {{- if .Values.auth.usePasswordFiles }} + - name: redis-password + secret: + secretName: {{ template "redis.secretName" . }} + items: + - key: {{ template "redis.secretPasswordKey" . }} + path: redis-password + {{- end }} + - name: config + configMap: + name: {{ include "redis.configmapName" . }} + {{- if .Values.sysctl.mountHostSys }} + - name: host-sys + hostPath: + path: /sys + {{- end }} + {{- if not .Values.sentinel.persistence.enabled }} + - name: sentinel-data + {{- if or .Values.sentinel.persistence.medium .Values.sentinel.persistence.sizeLimit }} + emptyDir: + {{- if .Values.sentinel.persistence.medium }} + medium: {{ .Values.sentinel.persistence.medium | quote }} + {{- end }} + {{- if .Values.sentinel.persistence.sizeLimit }} + sizeLimit: {{ .Values.sentinel.persistence.sizeLimit | quote }} + {{- end }} + {{- else }} + emptyDir: {} + {{- end }} + {{- end }} + - name: redis-tmp-conf + {{- if or .Values.sentinel.persistence.medium .Values.sentinel.persistence.sizeLimit }} + emptyDir: + {{- if .Values.sentinel.persistence.medium }} + medium: {{ .Values.sentinel.persistence.medium | quote }} + {{- end }} + {{- if .Values.sentinel.persistence.sizeLimit }} + sizeLimit: {{ .Values.sentinel.persistence.sizeLimit | quote }} + {{- end }} + {{- else }} + emptyDir: {} + {{- end }} + - name: tmp + {{- if or .Values.sentinel.persistence.medium .Values.sentinel.persistence.sizeLimit }} + emptyDir: + {{- if .Values.sentinel.persistence.medium }} + medium: {{ .Values.sentinel.persistence.medium | quote }} + {{- end }} + {{- if .Values.sentinel.persistence.sizeLimit }} + sizeLimit: {{ .Values.sentinel.persistence.sizeLimit | quote }} + {{- end }} + {{- else }} + emptyDir: {} + {{- end }} + {{- if .Values.replica.extraVolumes }} + {{- include "common.tplvalues.render" ( dict "value" .Values.replica.extraVolumes "context" $ ) | nindent 8 }} + {{- end }} + {{- if .Values.metrics.extraVolumes }} + {{- include "common.tplvalues.render" ( dict "value" .Values.metrics.extraVolumes "context" $ ) | nindent 8 }} + {{- end }} + {{- if .Values.sentinel.extraVolumes }} + {{- include "common.tplvalues.render" ( dict "value" .Values.sentinel.extraVolumes "context" $ ) | nindent 8 }} + {{- end }} + {{- if .Values.tls.enabled }} + - name: redis-certificates + secret: + secretName: {{ include "redis.tlsSecretName" . }} + defaultMode: 256 + {{- end }} + {{- if not .Values.replica.persistence.enabled }} + - name: redis-data + {{- if or .Values.sentinel.persistence.medium .Values.sentinel.persistence.sizeLimit }} + emptyDir: + {{- if .Values.sentinel.persistence.medium }} + medium: {{ .Values.sentinel.persistence.medium | quote }} + {{- end }} + {{- if .Values.sentinel.persistence.sizeLimit }} + sizeLimit: {{ .Values.sentinel.persistence.sizeLimit | quote }} + {{- end }} + {{- else }} + emptyDir: {} + {{- end }} + {{- else if .Values.replica.persistence.existingClaim }} + - name: redis-data + persistentVolumeClaim: + claimName: {{ printf "%s" (tpl .Values.replica.persistence.existingClaim .) }} + {{- else }} + volumeClaimTemplates: + - metadata: + name: redis-data + labels: {{- include "common.labels.matchLabels" . | nindent 10 }} + app.kubernetes.io/component: node + {{- if .Values.replica.persistence.annotations }} + annotations: {{- toYaml .Values.replica.persistence.annotations | nindent 10 }} + {{- end }} + spec: + accessModes: + {{- range .Values.replica.persistence.accessModes }} + - {{ . | quote }} + {{- end }} + resources: + requests: + storage: {{ .Values.replica.persistence.size | quote }} + {{- if .Values.replica.persistence.selector }} + selector: {{- include "common.tplvalues.render" ( dict "value" .Values.replica.persistence.selector "context" $) | nindent 10 }} + {{- end }} + {{- include "common.storage.class" (dict "persistence" .Values.replica.persistence "global" .Values.global) | nindent 8 }} + {{- if .Values.sentinel.persistence.enabled }} + - metadata: + name: sentinel-data + labels: {{- include "common.labels.matchLabels" . | nindent 10 }} + app.kubernetes.io/component: node + {{- if .Values.sentinel.persistence.annotations }} + annotations: {{- toYaml .Values.sentinel.persistence.annotations | nindent 10 }} + {{- end }} + spec: + accessModes: + {{- range .Values.sentinel.persistence.accessModes }} + - {{ . | quote }} + {{- end }} + resources: + requests: + storage: {{ .Values.sentinel.persistence.size | quote }} + {{- if .Values.sentinel.persistence.selector }} + selector: {{- include "common.tplvalues.render" ( dict "value" .Values.sentinel.persistence.selector "context" $) | nindent 10 }} + {{- end }} + {{- if .Values.sentinel.persistence.dataSource }} + dataSource: {{- include "common.tplvalues.render" (dict "value" .Values.sentinel.persistence.dataSource "context" $) | nindent 10 }} + {{- end }} + {{- include "common.storage.class" (dict "persistence" .Values.sentinel.persistence "global" .Values.global) | nindent 8 }} + {{- end }} + {{- end }} +{{- end }} +{{- end }} diff --git a/redis-vrf/templates/serviceaccount.yaml b/redis-vrf/templates/serviceaccount.yaml new file mode 100644 index 00000000..9faa1752 --- /dev/null +++ b/redis-vrf/templates/serviceaccount.yaml @@ -0,0 +1,21 @@ +{{- if and .Values.serviceAccount.create (and (not .Values.master.serviceAccount.create) (not .Values.replica.serviceAccount.create)) }} +apiVersion: v1 +kind: ServiceAccount +automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }} +metadata: + name: {{ template "redis.serviceAccountName" . }} + namespace: {{ .Release.Namespace | quote }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + {{- if or .Values.commonAnnotations .Values.serviceAccount.annotations }} + annotations: + {{- if or .Values.commonAnnotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.serviceAccount.annotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.serviceAccount.annotations "context" $ ) | nindent 4 }} + {{- end }} + {{- end }} +{{- end }} \ No newline at end of file diff --git a/redis-vrf/templates/servicemonitor.yaml b/redis-vrf/templates/servicemonitor.yaml new file mode 100644 index 00000000..9bdad949 --- /dev/null +++ b/redis-vrf/templates/servicemonitor.yaml @@ -0,0 +1,44 @@ +{{- if and .Values.metrics.enabled .Values.metrics.serviceMonitor.enabled }} +apiVersion: monitoring.coreos.com/v1 +kind: ServiceMonitor +metadata: + name: {{ template "common.names.fullname" . }} + namespace: {{ default .Release.Namespace .Values.metrics.serviceMonitor.namespace | quote }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + {{- if .Values.metrics.serviceMonitor.additionalLabels }} + {{- include "common.tplvalues.render" (dict "value" .Values.metrics.serviceMonitor.additionalLabels "context" $) | nindent 4 }} + {{- end }} + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} +spec: + endpoints: + - port: http-metrics + {{- if .Values.metrics.serviceMonitor.interval }} + interval: {{ .Values.metrics.serviceMonitor.interval }} + {{- end }} + {{- if .Values.metrics.serviceMonitor.scrapeTimeout }} + scrapeTimeout: {{ .Values.metrics.serviceMonitor.scrapeTimeout }} + {{- end }} + {{- if .Values.metrics.serviceMonitor.honorLabels }} + honorLabels: {{ .Values.metrics.serviceMonitor.honorLabels }} + {{- end }} + {{- if .Values.metrics.serviceMonitor.relabellings }} + relabelings: {{- toYaml .Values.metrics.serviceMonitor.relabellings | nindent 6 }} + {{- end }} + {{- if .Values.metrics.serviceMonitor.metricRelabelings }} + metricRelabelings: {{- toYaml .Values.metrics.serviceMonitor.metricRelabelings | nindent 6 }} + {{- end }} + {{- if .Values.metrics.serviceMonitor.podTargetLabels }} + podTargetLabels: {{- toYaml .Values.metrics.serviceMonitor.podTargetLabels | nindent 4 }} + {{- end }} + namespaceSelector: + matchNames: + - {{ .Release.Namespace }} + selector: + matchLabels: {{- include "common.labels.matchLabels" . | nindent 6 }} + app.kubernetes.io/component: metrics +{{- end }} diff --git a/redis-vrf/templates/tls-secret.yaml b/redis-vrf/templates/tls-secret.yaml new file mode 100644 index 00000000..4f9c39b8 --- /dev/null +++ b/redis-vrf/templates/tls-secret.yaml @@ -0,0 +1,30 @@ +{{- if (include "redis.createTlsSecret" .) }} +{{- $secretName := printf "%s-crt" (include "common.names.fullname" .) }} +{{- $existingCerts := (lookup "v1" "Secret" .Release.Namespace $secretName).data | default dict }} +{{- $ca := genCA "redis-ca" 365 }} +{{- $releaseNamespace := .Release.Namespace }} +{{- $clusterDomain := .Values.clusterDomain }} +{{- $fullname := include "common.names.fullname" . }} +{{- $serviceName := include "common.names.fullname" . }} +{{- $headlessServiceName := printf "%s-headless" (include "common.names.fullname" .) }} +{{- $masterServiceName := printf "%s-master" (include "common.names.fullname" .) }} +{{- $altNames := list (printf "*.%s.%s.svc.%s" $serviceName $releaseNamespace $clusterDomain) (printf "%s.%s.svc.%s" $masterServiceName $releaseNamespace $clusterDomain) (printf "*.%s.%s.svc.%s" $masterServiceName $releaseNamespace $clusterDomain) (printf "*.%s.%s.svc.%s" $headlessServiceName $releaseNamespace $clusterDomain) (printf "%s.%s.svc.%s" $headlessServiceName $releaseNamespace $clusterDomain) "127.0.0.1" "localhost" $fullname }} +{{- $crt := genSignedCert $fullname nil $altNames 365 $ca }} +apiVersion: v1 +kind: Secret +metadata: + name: {{ $secretName }} + namespace: {{ .Release.Namespace | quote }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} +type: kubernetes.io/tls +data: + ca.crt: {{ (get $existingCerts "ca.crt") | default ($ca.Cert | b64enc | quote ) }} + tls.crt: {{ (get $existingCerts "tls.crt") | default ($crt.Cert | b64enc | quote) }} + tls.key: {{ (get $existingCerts "tls.key") | default ($crt.Key | b64enc | quote) }} +{{- end }} diff --git a/redis-vrf/values.schema.json b/redis-vrf/values.schema.json new file mode 100644 index 00000000..d6e226b8 --- /dev/null +++ b/redis-vrf/values.schema.json @@ -0,0 +1,156 @@ +{ + "$schema": "http://json-schema.org/schema#", + "type": "object", + "properties": { + "architecture": { + "type": "string", + "title": "Redis architecture", + "form": true, + "description": "Allowed values: `standalone` or `replication`", + "enum": ["standalone", "replication"] + }, + "auth": { + "type": "object", + "title": "Authentication configuration", + "form": true, + "properties": { + "enabled": { + "type": "boolean", + "form": true, + "title": "Use password authentication" + }, + "password": { + "type": "string", + "title": "Redis password", + "form": true, + "description": "Defaults to a random 10-character alphanumeric string if not set", + "hidden": { + "value": false, + "path": "auth/enabled" + } + } + } + }, + "master": { + "type": "object", + "title": "Master replicas settings", + "form": true, + "properties": { + "kind": { + "type": "string", + "title": "Workload Kind", + "form": true, + "description": "Allowed values: `Deployment` or `StatefulSet`", + "enum": ["Deployment", "StatefulSet"] + }, + "persistence": { + "type": "object", + "title": "Persistence for master replicas", + "form": true, + "properties": { + "enabled": { + "type": "boolean", + "form": true, + "title": "Enable persistence", + "description": "Enable persistence using Persistent Volume Claims" + }, + "size": { + "type": "string", + "title": "Persistent Volume Size", + "form": true, + "render": "slider", + "sliderMin": 1, + "sliderMax": 100, + "sliderUnit": "Gi", + "hidden": { + "value": false, + "path": "master/persistence/enabled" + } + } + } + } + } + }, + "replica": { + "type": "object", + "title": "Redis replicas settings", + "form": true, + "hidden": { + "value": "standalone", + "path": "architecture" + }, + "properties": { + "replicaCount": { + "type": "integer", + "form": true, + "title": "Number of Redis replicas" + }, + "persistence": { + "type": "object", + "title": "Persistence for Redis replicas", + "form": true, + "properties": { + "enabled": { + "type": "boolean", + "form": true, + "title": "Enable persistence", + "description": "Enable persistence using Persistent Volume Claims" + }, + "size": { + "type": "string", + "title": "Persistent Volume Size", + "form": true, + "render": "slider", + "sliderMin": 1, + "sliderMax": 100, + "sliderUnit": "Gi", + "hidden": { + "value": false, + "path": "replica/persistence/enabled" + } + } + } + } + } + }, + "volumePermissions": { + "type": "object", + "properties": { + "enabled": { + "type": "boolean", + "form": true, + "title": "Enable Init Containers", + "description": "Use an init container to set required folder permissions on the data volume before mounting it in the final destination" + } + } + }, + "metrics": { + "type": "object", + "form": true, + "title": "Prometheus metrics details", + "properties": { + "enabled": { + "type": "boolean", + "title": "Create Prometheus metrics exporter", + "description": "Create a side-car container to expose Prometheus metrics", + "form": true + }, + "serviceMonitor": { + "type": "object", + "properties": { + "enabled": { + "type": "boolean", + "title": "Create Prometheus Operator ServiceMonitor", + "description": "Create a ServiceMonitor to track metrics using Prometheus Operator", + "form": true, + "hidden": { + "value": false, + "path": "metrics/enabled" + } + } + } + } + } + } + } +} diff --git a/redis/values.yaml b/redis-vrf/values.yaml similarity index 99% rename from redis/values.yaml rename to redis-vrf/values.yaml index 97501549..55ff6caa 100644 --- a/redis/values.yaml +++ b/redis-vrf/values.yaml @@ -10,6 +10,9 @@ ## @param global.redis.password Global Redis® password (overrides `auth.password`) ## global: + name: redis-vrf + namespace: redis + imageRegistry: "" ## E.g. ## imagePullSecrets: diff --git a/request-response/values.yaml b/request-response/values.yaml index 83cc7aac..ccc08455 100644 --- a/request-response/values.yaml +++ b/request-response/values.yaml @@ -2,6 +2,9 @@ ## created by Bisonai global: + name: request-response + namespace: orakl + appName: orakl-request-response image: repository: public.ecr.aws/bisonai/orakl-core #repository url diff --git a/storage-aws/Chart.yaml b/storage-aws/Chart.yaml deleted file mode 100644 index cc992294..00000000 --- a/storage-aws/Chart.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: v1 -name: orakl-log-aws-storage -description: A Helm chart for Kubernetes - -type: application - -version: 0.1.0 - -appVersion: "0.1.0" diff --git a/storage-aws/NOTES.txt b/storage-aws/NOTES.txt deleted file mode 100644 index e9456211..00000000 --- a/storage-aws/NOTES.txt +++ /dev/null @@ -1 +0,0 @@ -Welcome to Orakl Storage diff --git a/storage-aws/README.md b/storage-aws/README.md deleted file mode 100644 index a48f7b55..00000000 --- a/storage-aws/README.md +++ /dev/null @@ -1,24 +0,0 @@ -## Persistent Volum Claim for Orakl ## - -This chart will deploy two separate PVCs for the external storage of Orakl. - -- *Orakl Database:* This volume will have an SQLite database for Orakl Settings. -- *Orakl Log:* This volume will have logs of Orakl according to Pod's Hostname. - -*You can increase or decrease a volume size by changing the 'Values.yaml' file. - -``` -persistentVolume: - log: - name: orakl-log - accessModes: - - ReadWriteOnce - labels: {} - annotations: {} - existingClaim: "" - mountPath: / - size: 2Gi - subPath: "" - storageClass: - -``` \ No newline at end of file diff --git a/storage-aws/templates/log-pv.yaml b/storage-aws/templates/log-pv.yaml deleted file mode 100644 index 5e5057dd..00000000 --- a/storage-aws/templates/log-pv.yaml +++ /dev/null @@ -1,17 +0,0 @@ -{{- if .Values.config.efsFileSystemId }} -apiVersion: v1 -kind: PersistentVolume -metadata: - name: "{{ .Values.name | default "orakl-log" }}-pv" -spec: - capacity: - storage: "{{ .Values.config.size }}" - - accessModes: - - ReadWriteMany - volumeMode: Filesystem - nfs: - server: "{{ .Values.config.efsFileSystemId }}.efs.{{ .Values.config.region }}.amazonaws.com" - path: /log/ - storageClassName: orakl-sc - {{- end }} \ No newline at end of file diff --git a/storage-aws/templates/log-pvc.yaml b/storage-aws/templates/log-pvc.yaml deleted file mode 100644 index b72f8a87..00000000 --- a/storage-aws/templates/log-pvc.yaml +++ /dev/null @@ -1,18 +0,0 @@ -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: "{{ .Values.name | default "orakl-log" }}" -spec: - accessModes: - {{- if .Values.config.efsFileSystemId }} - - ReadWriteMany - {{ else }} - - ReadWriteOnce - {{ end }} - resources: - requests: - storage: "{{ .Values.config.size }}" - volumeName: "{{ .Values.name | default "orakl-log" }}-pv" - {{- if .Values.config.efsFileSystemId }} - storageClassName: orakl-sc - {{- end }} diff --git a/storage-aws/templates/sc.yaml b/storage-aws/templates/sc.yaml deleted file mode 100644 index a9599e09..00000000 --- a/storage-aws/templates/sc.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: storage.k8s.io/v1 -kind: StorageClass -metadata: - name: orakl-sc -provisioner: efs.csi.aws.com \ No newline at end of file diff --git a/storage-aws/values.yaml b/storage-aws/values.yaml deleted file mode 100644 index a554bee5..00000000 --- a/storage-aws/values.yaml +++ /dev/null @@ -1,8 +0,0 @@ -name: orakl-log - -config: - efsFileSystemId: - region: - size: - -storageClass: orakl-sc \ No newline at end of file diff --git a/storage-gcp/Chart.yaml b/storage-gcp/Chart.yaml deleted file mode 100644 index e175bf83..00000000 --- a/storage-gcp/Chart.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: v1 -name: orakl-log-gcp-storage -description: A Helm chart for Kubernetes - -type: application - -version: 0.1.0 - -appVersion: "0.1.0" diff --git a/storage-gcp/NOTES.txt b/storage-gcp/NOTES.txt deleted file mode 100644 index e9456211..00000000 --- a/storage-gcp/NOTES.txt +++ /dev/null @@ -1 +0,0 @@ -Welcome to Orakl Storage diff --git a/storage-gcp/README.md b/storage-gcp/README.md deleted file mode 100644 index a48f7b55..00000000 --- a/storage-gcp/README.md +++ /dev/null @@ -1,24 +0,0 @@ -## Persistent Volum Claim for Orakl ## - -This chart will deploy two separate PVCs for the external storage of Orakl. - -- *Orakl Database:* This volume will have an SQLite database for Orakl Settings. -- *Orakl Log:* This volume will have logs of Orakl according to Pod's Hostname. - -*You can increase or decrease a volume size by changing the 'Values.yaml' file. - -``` -persistentVolume: - log: - name: orakl-log - accessModes: - - ReadWriteOnce - labels: {} - annotations: {} - existingClaim: "" - mountPath: / - size: 2Gi - subPath: "" - storageClass: - -``` \ No newline at end of file diff --git a/storage-gcp/templates/log-pv.yaml b/storage-gcp/templates/log-pv.yaml deleted file mode 100644 index 0ce61b63..00000000 --- a/storage-gcp/templates/log-pv.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: v1 -kind: PersistentVolume -metadata: - name: "{{ .Values.name | default "orakl-log" }}-pv" -spec: - capacity: - storage: "{{ .Values.config.size }}" - accessModes: - - ReadWriteMany - gcePersistentDisk: - pdName: "{{ .Values.config.pdName }}" - fsType: ext4 - storageClassName: orakl-sc \ No newline at end of file diff --git a/storage-gcp/templates/log-pvc.yaml b/storage-gcp/templates/log-pvc.yaml deleted file mode 100644 index 5dcbbbef..00000000 --- a/storage-gcp/templates/log-pvc.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: "{{ .Values.name | default "orakl-log" }}" -spec: - accessModes: - - ReadWriteMany - resources: - requests: - storage: "{{ .Values.config.size }}" - volumeName: "{{ .Values.config.name | default "orakl-log" }}-pv" - - storageClassName: orakl-sc \ No newline at end of file diff --git a/storage-gcp/templates/sc.yaml b/storage-gcp/templates/sc.yaml deleted file mode 100644 index c13060d5..00000000 --- a/storage-gcp/templates/sc.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: storage.k8s.io/v1 -kind: StorageClass -metadata: - name: orakl-sc -provisioner: kubernetes.io/gce-pd - diff --git a/storage-gcp/values.yaml b/storage-gcp/values.yaml deleted file mode 100644 index 2a26e1d6..00000000 --- a/storage-gcp/values.yaml +++ /dev/null @@ -1,6 +0,0 @@ -name: orakl-log -storageClass: orakl-sc - -config: - size: - pdName: \ No newline at end of file diff --git a/vrf/values.yaml b/vrf/values.yaml index 79944524..3986f1c6 100644 --- a/vrf/values.yaml +++ b/vrf/values.yaml @@ -2,6 +2,9 @@ ## created by Bisonai global: + name: vrf + namespace: orakl + appName: orakl-vrf image: repository: public.ecr.aws/u6t6w0e4/orakl-core #repository url From 35ff32d1ad6b53d6b4ca2d9bed2b0d9fba1e18c7 Mon Sep 17 00:00:00 2001 From: Nick <148735107+nick-bisonai@users.noreply.github.com> Date: Thu, 14 Mar 2024 14:22:52 +0900 Subject: [PATCH 155/190] feat: deploy v0.0.1.20240314.0433.ce446c4 (#230) Co-authored-by: orakl-bot --- fetcher/Chart.yaml | 5 +---- fetcher/values.yaml | 14 +------------- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/fetcher/Chart.yaml b/fetcher/Chart.yaml index 98b7a4fd..ab01341c 100644 --- a/fetcher/Chart.yaml +++ b/fetcher/Chart.yaml @@ -1,7 +1,6 @@ apiVersion: v2 name: orakl-fetcher description: A Helm chart for Kubernetes - # A chart can be either an 'application' or a 'library' chart. # # Application charts are a collection of templates that can be packaged into versioned archives @@ -11,14 +10,12 @@ description: A Helm chart for Kubernetes # a dependency of application charts to inject those utilities and functions into the rendering # pipeline. Library charts do not define any templates and therefore cannot be deployed. type: application - # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) version: 0.1.32 - # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "v0.0.1.20240224.0402.541c45d" +appVersion: "v0.0.1.20240314.0433.ce446c4" diff --git a/fetcher/values.yaml b/fetcher/values.yaml index c34b7b03..4cb85dd7 100644 --- a/fetcher/values.yaml +++ b/fetcher/values.yaml @@ -4,30 +4,24 @@ global: name: fetcher namespace: orakl - image: repository: public.ecr.aws/u6t6w0e4/orakl-fetcher #repository url pullPolicy: IfNotPresent - tag: "v0.0.1.20240224.0402.541c45d" + tag: "v0.0.1.20240314.0433.ce446c4" imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: [] - secretManager: enabled: false secretId: versionId: - affinity: enabled: false key: kubernetes.io/hostname value: - externalIp: enabled: false - podAnnotations: {} - livenessProbe: enabled: true path: /api/v1 @@ -36,7 +30,6 @@ global: timeoutSeconds: 5 successThreshold: 1 failureThreshold: 5 - readinessProbe: enabled: true path: /api/v1 @@ -45,7 +38,6 @@ global: timeoutSeconds: 1 successThreshold: 1 failureThreshold: 5 - fetcher: enabled: true replicas: 1 @@ -58,11 +50,8 @@ fetcher: annotations: {} # -- Automount API credentials for the Service Account automountServiceAccountToken: true - podSecurityContext: {} - containerSecurityContext: {} - resources: limits: cpu: 1000m @@ -70,7 +59,6 @@ fetcher: requests: cpu: 1000m memory: 2Gi - nodeSelector: {} tolerations: [] dotenv: {} From 07619273af1386d2b2bdac087a31e61942671428 Mon Sep 17 00:00:00 2001 From: Nick <148735107+nick-bisonai@users.noreply.github.com> Date: Thu, 14 Mar 2024 14:34:00 +0900 Subject: [PATCH 156/190] deploy baobab-godelegator-v0.0.1.20240313.0958.82d191d (#228) * feat: deploy v0.0.1.20240313.0958.82d191d * Update Chart.yaml --------- Co-authored-by: orakl-bot --- godelegator/Chart.yaml | 5 +---- godelegator/values.yaml | 12 +----------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/godelegator/Chart.yaml b/godelegator/Chart.yaml index e93c2637..a4c43373 100644 --- a/godelegator/Chart.yaml +++ b/godelegator/Chart.yaml @@ -1,7 +1,6 @@ apiVersion: v2 name: orakl-godelegator description: A Helm chart for Kubernetes - # A chart can be either an 'application' or a 'library' chart. # # Application charts are a collection of templates that can be packaged into versioned archives @@ -11,14 +10,12 @@ description: A Helm chart for Kubernetes # a dependency of application charts to inject those utilities and functions into the rendering # pipeline. Library charts do not define any templates and therefore cannot be deployed. type: application - # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) version: 0.0.1 - # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "v0.0.1.20240229.0732.a084a43" +appVersion: "v0.0.1.20240313.0958.82d191d" diff --git a/godelegator/values.yaml b/godelegator/values.yaml index e7dda0a9..21e6ee46 100644 --- a/godelegator/values.yaml +++ b/godelegator/values.yaml @@ -4,27 +4,22 @@ global: name: godelegator namespace: orakl - image: repository: public.ecr.aws/bisonai/orakl-godelegator #repository url pullPolicy: IfNotPresent - tag: "v0.0.1.20240229.0732.a084a43" + tag: "v0.0.1.20240313.0958.82d191d" imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: [] - secretManager: enabled: true secretId: versionId: - affinity: enabled: false key: kubernetes.io/hostname value: - podAnnotations: - livenessProbe: enabled: true path: /api/v1/ @@ -33,7 +28,6 @@ global: timeoutSeconds: 5 successThreshold: 1 failureThreshold: 5 - readinessProbe: enabled: true path: /api/v1/ @@ -42,7 +36,6 @@ global: timeoutSeconds: 1 successThreshold: 1 failureThreshold: 5 - godelegator: enabled: true replicas: 1 @@ -51,10 +44,8 @@ godelegator: name: sa annotations: {} automountServiceAccountToken: true - podSecurityContext: {} containerSecurityContext: {} - resources: limits: cpu: 500m @@ -62,7 +53,6 @@ godelegator: requests: cpu: 500m memory: 1Gi - nodeSelector: {} tolerations: [] dotenv: {} From ae8d184f25ba4f3949561fee3400fbce3ef88304 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jay=28=EA=B9=80=EC=9E=AC=ED=9B=88=29?= Date: Sat, 16 Mar 2024 17:37:20 +0900 Subject: [PATCH 157/190] feat: Add bisontry-messenger (#240) Co-authored-by: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> --- bisontry-messenger/Chart.yaml | 5 +++++ bisontry-messenger/templates/deployment.yaml | 23 ++++++++++++++++++++ bisontry-messenger/values.yaml | 12 ++++++++++ 3 files changed, 40 insertions(+) create mode 100644 bisontry-messenger/Chart.yaml create mode 100644 bisontry-messenger/templates/deployment.yaml create mode 100644 bisontry-messenger/values.yaml diff --git a/bisontry-messenger/Chart.yaml b/bisontry-messenger/Chart.yaml new file mode 100644 index 00000000..2792451d --- /dev/null +++ b/bisontry-messenger/Chart.yaml @@ -0,0 +1,5 @@ +apiVersion: v2 +name: bisontry-messenger +description: Bisontry Messenger service. +version: 0.1.0 +appVersion: v0.1.0.20231228.2125.41dd762 diff --git a/bisontry-messenger/templates/deployment.yaml b/bisontry-messenger/templates/deployment.yaml new file mode 100644 index 00000000..0ffdb841 --- /dev/null +++ b/bisontry-messenger/templates/deployment.yaml @@ -0,0 +1,23 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ .Values.deployment.name }} +spec: + replicas: {{ .Values.deployment.replicas }} + selector: + matchLabels: + app: {{ .Values.deployment.name }} + template: + metadata: + labels: + app: {{ .Values.deployment.name }} + spec: + imagePullSecrets: + - name: bisontry-gar-json-key + containers: + - name: {{ .Values.deployment.name }} + image: {{ .Values.image.repository }}:{{ .Values.image.tag }} + imagePullPolicy: Always + envFrom: + - secretRef: + name: {{ .Values.deployment.name }}-secrets diff --git a/bisontry-messenger/values.yaml b/bisontry-messenger/values.yaml new file mode 100644 index 00000000..c744cf46 --- /dev/null +++ b/bisontry-messenger/values.yaml @@ -0,0 +1,12 @@ +global: + name: bisontry-messenger + namespace: orakl + +image: + repository: asia-southeast1-docker.pkg.dev/bisontry/bisontry/bisontry-messenger + tag: v0.0.1.20240216.0351.30594bb + +deployment: + name: bisontry-messenger + replicas: 1 + resources: From cd129fc82d0c4f6a079d2ac7f9a1cd1907722f8e Mon Sep 17 00:00:00 2001 From: Nick <148735107+nick-bisonai@users.noreply.github.com> Date: Mon, 18 Mar 2024 11:22:59 +0900 Subject: [PATCH 158/190] feat: deploy v0.0.1.20240315.0618.c907cbb (#239) Co-authored-by: orakl-bot --- api/Chart.yaml | 5 +---- api/values.yaml | 11 +---------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/api/Chart.yaml b/api/Chart.yaml index 71c1c72c..c0f943ac 100644 --- a/api/Chart.yaml +++ b/api/Chart.yaml @@ -1,7 +1,6 @@ apiVersion: v2 name: orakl-api description: A Helm chart for Kubernetes - # A chart can be either an 'application' or a 'library' chart. # # Application charts are a collection of templates that can be packaged into versioned archives @@ -11,14 +10,12 @@ description: A Helm chart for Kubernetes # a dependency of application charts to inject those utilities and functions into the rendering # pipeline. Library charts do not define any templates and therefore cannot be deployed. type: application - # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) version: 0.1.0 - # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "v0.0.1.20240215.1237.1c4d022" +appVersion: "v0.0.1.20240315.0618.c907cbb" diff --git a/api/values.yaml b/api/values.yaml index 22ff4199..6b0262a5 100644 --- a/api/values.yaml +++ b/api/values.yaml @@ -6,18 +6,15 @@ global: image: repository: public.ecr.aws/bisonai/orakl-api pullPolicy: IfNotPresent - tag: "v0.0.1.20240215.1237.1c4d022" + tag: "v0.0.1.20240315.0618.c907cbb" imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: [] - affinity: enabled: false key: kubernetes.io/hostname value: - podAnnotations: {} - livenessProbe: enabled: true path: /api/v1/ @@ -26,7 +23,6 @@ global: timeoutSeconds: 5 successThreshold: 1 failureThreshold: 5 - readinessProbe: enabled: true path: /api/v1/ @@ -35,14 +31,11 @@ global: timeoutSeconds: 5 successThreshold: 1 failureThreshold: 5 - api: enabled: true replicas: 1 podSecurityContext: {} - containerSecurityContext: {} - resources: limits: cpu: 2000m @@ -50,11 +43,9 @@ api: requests: cpu: 2000m memory: 4Gi - nodeSelector: {} tolerations: [] dotenv: {} - deployment: name: orakl-api replicas: 1 From c04025cd4d1a47118b8d0468ccd3b4bf688f7073 Mon Sep 17 00:00:00 2001 From: Nick <148735107+nick-bisonai@users.noreply.github.com> Date: Mon, 18 Mar 2024 11:23:19 +0900 Subject: [PATCH 159/190] feat: deploy v0.6.1.20240315.0618.c907cbb (#236) Co-authored-by: orakl-bot --- cli/Chart.yaml | 2 +- cli/values.yaml | 15 +-------------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/cli/Chart.yaml b/cli/Chart.yaml index 6c04a57d..45223557 100644 --- a/cli/Chart.yaml +++ b/cli/Chart.yaml @@ -3,4 +3,4 @@ name: orakl-cli description: A Helm chart for Kubernetes type: application version: 0.1.2 -appVersion: "v0.6.1.20240208.0505.ce676ce" +appVersion: "v0.6.1.20240315.0618.c907cbb" diff --git a/cli/values.yaml b/cli/values.yaml index fe16caf0..e0c703cc 100644 --- a/cli/values.yaml +++ b/cli/values.yaml @@ -4,33 +4,26 @@ global: name: cli namespace: orakl - image: repository: public.ecr.aws/u6t6w0e4/orakl-cli pullPolicy: IfNotPresent - tag: "v0.6.1.20240208.0505.ce676ce" + tag: "v0.6.1.20240315.0618.c907cbb" imagePullPolicy: IfNotPresent # -- If defined, uses a Secret to pull an image from a private Docker registry or repository imagePullSecrets: [] - secretManager: enabled: false secretId: versionId: - hostPath: enable: false volumes: - volumeMounts: - affinity: enabled: false key: kubernetes.io/hostname value: - podAnnotations: {} - livenessProbe: enabled: true initialDelaySeconds: 20 @@ -38,7 +31,6 @@ global: timeoutSeconds: 5 successThreshold: 1 failureThreshold: 5 - readinessProbe: enabled: true initialDelaySeconds: 20 @@ -46,7 +38,6 @@ global: timeoutSeconds: 1 successThreshold: 1 failureThreshold: 5 - cli: enabled: true replicas: 1 @@ -59,11 +50,8 @@ cli: annotations: {} # -- Automount API credentials for the Service Account automountServiceAccountToken: true - podSecurityContext: {} - containerSecurityContext: {} - resources: limits: cpu: 400m @@ -71,7 +59,6 @@ cli: requests: cpu: 400m memory: 1Gi - nodeSelector: {} tolerations: [] dotenv: {} From 49406e6ae79b00b696d473e7e775503a578f22ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jay=28=EA=B9=80=EC=9E=AC=ED=9B=88=29?= Date: Mon, 18 Mar 2024 13:06:32 +0900 Subject: [PATCH 160/190] (Baobab) Deploy `bisontry-messenger` (#241) * fix: Remove env part * feat: Add bisontry-secrets * feat: Revert remove env part * fix: Add missing key `password` * feat: Add external IP address --------- Co-authored-by: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> --- bisontry-messenger/templates/service.yaml | 13 +++++ secret-store/bisontry-messenger-secret.yaml | 59 +++++++++++++++++++++ 2 files changed, 72 insertions(+) create mode 100644 bisontry-messenger/templates/service.yaml create mode 100644 secret-store/bisontry-messenger-secret.yaml diff --git a/bisontry-messenger/templates/service.yaml b/bisontry-messenger/templates/service.yaml new file mode 100644 index 00000000..c6d5ab23 --- /dev/null +++ b/bisontry-messenger/templates/service.yaml @@ -0,0 +1,13 @@ +apiVersion: v1 +kind: Service +metadata: + name: {{ .Values.deployment.name }} +spec: + # type: ClusterIP + ports: + - port: 80 + targetPort: 3000 + protocol: TCP + type: LoadBalancer + selector: + app: {{ .Values.deployment.name }} diff --git a/secret-store/bisontry-messenger-secret.yaml b/secret-store/bisontry-messenger-secret.yaml new file mode 100644 index 00000000..1cc6987e --- /dev/null +++ b/secret-store/bisontry-messenger-secret.yaml @@ -0,0 +1,59 @@ +apiVersion: external-secrets.io/v1beta1 +kind: ExternalSecret +metadata: + name: bisontry-messenger-secrets +spec: + refreshInterval: "15s" + secretStoreRef: + name: vault-backend + kind: SecretStore + data: + - secretKey: BAOBAB_MONITOR_POSTGRES_USER + remoteRef: + key: baobab/bisontry-messenger + property: BAOBAB_MONITOR_POSTGRES_USER + - secretKey: BAOBAB_MONITOR_POSTGRES_PASSWORD + remoteRef: + key: baobab/bisontry-messenger + property: BAOBAB_MONITOR_POSTGRES_PASSWORD + - secretKey: BAOBAB_MONITOR_POSTGRES_HOST + remoteRef: + key: baobab/bisontry-messenger + property: BAOBAB_MONITOR_POSTGRES_HOST + - secretKey: BAOBAB_MONITOR_POSTGRES_DATABASE + remoteRef: + key: baobab/bisontry-messenger + property: BAOBAB_MONITOR_POSTGRES_DATABASE + - secretKey: BAOBAB_MONITOR_POSTGRES_PORT + remoteRef: + key: baobab/bisontry-messenger + property: BAOBAB_MONITOR_POSTGRES_PORT + - secretKey: CYPRESS_MONITOR_POSTGRES_USER + remoteRef: + key: baobab/bisontry-messenger + property: CYPRESS_MONITOR_POSTGRES_USER + - secretKey: CYPRESS_MONITOR_POSTGRES_PASSWORD + remoteRef: + key: baobab/bisontry-messenger + property: CYPRESS_MONITOR_POSTGRES_PASSWORD + - secretKey: CYPRESS_MONITOR_POSTGRES_HOST + remoteRef: + key: baobab/bisontry-messenger + property: CYPRESS_MONITOR_POSTGRES_HOST + - secretKey: CYPRESS_MONITOR_POSTGRES_DATABASE + remoteRef: + key: baobab/bisontry-messenger + property: CYPRESS_MONITOR_POSTGRES_DATABASE + - secretKey: CYPRESS_MONITOR_POSTGRES_PORT + remoteRef: + key: baobab/bisontry-messenger + property: CYPRESS_MONITOR_POSTGRES_PORT + - secretKey: BAOBAB_SLACK_WEBHOOK_URL + remoteRef: + key: baobab/bisontry-messenger + property: BAOBAB_SLACK_WEBHOOK_URL + - secretKey: CYPRESS_SLACK_WEBHOOK_URL + remoteRef: + key: baobab/bisontry-messenger + property: CYPRESS_SLACK_WEBHOOK_URL + From cf9394806eed76fd6500248cfdb4dc5e56939944 Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Wed, 27 Mar 2024 22:05:15 +0900 Subject: [PATCH 161/190] feat: Add cronjob set and add tls-renew job template --- cronjobs/.helmignore | 23 +++++++++++ cronjobs/Chart.yaml | 10 +++++ cronjobs/README.md | 3 ++ cronjobs/templates/_helpers.tpl | 27 +++++++++++++ cronjobs/templates/cronjob.yaml | 70 +++++++++++++++++++++++++++++++++ cronjobs/templates/sa.yaml | 20 ++++++++++ cronjobs/values.yaml | 31 +++++++++++++++ 7 files changed, 184 insertions(+) create mode 100644 cronjobs/.helmignore create mode 100644 cronjobs/Chart.yaml create mode 100644 cronjobs/README.md create mode 100644 cronjobs/templates/_helpers.tpl create mode 100644 cronjobs/templates/cronjob.yaml create mode 100644 cronjobs/templates/sa.yaml create mode 100644 cronjobs/values.yaml diff --git a/cronjobs/.helmignore b/cronjobs/.helmignore new file mode 100644 index 00000000..0e8a0eb3 --- /dev/null +++ b/cronjobs/.helmignore @@ -0,0 +1,23 @@ +# Patterns to ignore when building packages. +# This supports shell glob matching, relative path matching, and +# negation (prefixed with !). Only one pattern per line. +.DS_Store +# Common VCS dirs +.git/ +.gitignore +.bzr/ +.bzrignore +.hg/ +.hgignore +.svn/ +# Common backup files +*.swp +*.bak +*.tmp +*.orig +*~ +# Various IDEs +.project +.idea/ +*.tmproj +.vscode/ diff --git a/cronjobs/Chart.yaml b/cronjobs/Chart.yaml new file mode 100644 index 00000000..5aace104 --- /dev/null +++ b/cronjobs/Chart.yaml @@ -0,0 +1,10 @@ +apiVersion: v2 +name: orakl-cronjobs +description: Helpful cronjobs for manage Orakl Network. +version: 0.1.0 +keyword: + - cron +home: "https://helm.orakl.network" +source: + - "https://github.com/bisonai/orakl-helm-charts" + diff --git a/cronjobs/README.md b/cronjobs/README.md new file mode 100644 index 00000000..f4c9fa06 --- /dev/null +++ b/cronjobs/README.md @@ -0,0 +1,3 @@ +# Orakl Cronjob +This chart to manage cronjobs in Orakl. +Please add new job into the values.yaml file. diff --git a/cronjobs/templates/_helpers.tpl b/cronjobs/templates/_helpers.tpl new file mode 100644 index 00000000..51c21d38 --- /dev/null +++ b/cronjobs/templates/_helpers.tpl @@ -0,0 +1,27 @@ +{{/* vim: set filetype=mustache: */}} + +{{/* +Create chart name and version as used by the chart label. +*/}} +{{- define "cronjobs.chart" -}} +{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} +{{- end }} + +{{/* +Common labels +*/}} +{{- define "cronjobs.labels" -}} +helm.sh/chart: {{ include "cronjobs.chart" . }} +{{- if .Chart.AppVersion }} +app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} +{{- end }} +app.kubernetes.io/managed-by: {{ .Release.Service }} +{{- end }} + +{{/* +Expand the release name of the chart. +*/}} +{{- define "cronjobs.releaseName" -}} +{{- default .Release.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} +{{- end -}} + diff --git a/cronjobs/templates/cronjob.yaml b/cronjobs/templates/cronjob.yaml new file mode 100644 index 00000000..e2c9dcb8 --- /dev/null +++ b/cronjobs/templates/cronjob.yaml @@ -0,0 +1,70 @@ +{{- range $jobname, $job := .Values.jobs }} +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + name: {{ include "cronjobs.releaseName" $ }}-{{ $jobname }} + namespace: orakl + labels: + {{- include "cronjobs.labels" $ | nindent 4 }} +spec: + concurrencyPolicy: {{ $job.concurrencyPolicy }} + failedJobsHistoryLimit: {{ $job.failedJobsHistoryLimit }} + jobTemplate: + spec: + ttlSecondsAfterFinished: {{ $job.ttlSecondsAfterFinished }} + template: + metadata: + labels: + app: {{ include "cronjobs.releaseName" $ }} + cron: {{ $jobname }} + spec: + serviceAccountName: {{ $.Release.Name}}-{{ $jobname }} + containers: + - image: {{ $job.image.repository }}:{{ $job.image.tag }} + imagePullPolicy: {{ $job.image.imagePullPolicy }} + name: {{ $jobname }} + {{- with $job.env }} + env: +{{ toYaml . | indent 12 }} + {{- end }} + {{- with $job.envFrom }} + envFrom: +{{ toYaml . | indent 12 }} + {{- end }} + {{- with $job.command }} + command: +{{ toYaml . | indent 12 }} + {{- end }} + {{- with $job.args }} + args: +{{ toYaml . | indent 12 }} + {{- end }} + {{- with $job.resources }} + resources: +{{ toYaml . | indent 14 }} + {{- end }} + {{- with $job.volumeMounts }} + volumeMounts: +{{ toYaml . | indent 12 }} + {{- end }} + {{- with $job.nodeSelector }} + nodeSelector: +{{ toYaml . | indent 12 }} + {{- end }} + {{- with $job.affinity }} + affinity: +{{ toYaml . | indent 12 }} + {{- end }} + {{- with $job.tolerations }} + tolerations: +{{ toYaml . | indent 12 }} + {{- end }} + restartPolicy: {{ $job.restartPolicy }} + {{- with $job.volumes }} + volumes: +{{ toYaml . | indent 12 }} + {{- end }} + schedule: {{ $job.schedule | quote }} + successfulJobsHistoryLimit: {{ $job.successfulJobsHistoryLimit }} +{{- end }} diff --git a/cronjobs/templates/sa.yaml b/cronjobs/templates/sa.yaml new file mode 100644 index 00000000..d2c69304 --- /dev/null +++ b/cronjobs/templates/sa.yaml @@ -0,0 +1,20 @@ +{{- range $jobname, $job := .Values.jobs }} +--- +apiVersion: v1 +kind: ServiceAccount +metadata: + {{- if and (hasKey $job "serviceAccount") (hasKey $job "serviceAccount.name") }} + name: {{ $job.serviceAccount.name }} + {{- else }} + name: {{ $.Release.Name}}-{{ $jobname }} + {{- end }} + labels: + {{- include "cronjobs.labels" $ | nindent 4 }} + cron: {{ $jobname }} + {{- if and (hasKey $job "serviceAccount") (hasKey $job "serviceAccount.annotations") }} + {{- with $job.serviceAccount.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} + {{- end }} +{{- end }} diff --git a/cronjobs/values.yaml b/cronjobs/values.yaml new file mode 100644 index 00000000..986bca29 --- /dev/null +++ b/cronjobs/values.yaml @@ -0,0 +1,31 @@ +jobs: + ### + # Renew TLS certificate for `*.orakl.network` domain + ### + orakl-tls-renew: + image: + repository: debian + tag: latest + imagePullPolicy: IfNotPresent + schedule: "0 0 1 */2 *" + failedJobHistoryLimit: 3 + successfulJobHistoryLimit: 10 + concurrencyPolicy: Forbid + restartPolicy: Never + ttlSecondsAfterFinished: 30 + volumes: + - name: orakl-tls-renew-volume + gcePersistentDisk: + pdName: orakl-tls-renew-disk + fsType: ext4 + volumeMounts: + - name: orakl-tls-renew-volume + mountPath: /etc/letsencrypt + command: ["/bin/bash"] + args: + - "-c" + - | + apt -y update && apt -y install curl + curl https://getcroc.schollz.com | bash + stdin: true + tty: true From f04e9ca35fc638684f2ad87bf79a8d993ba70aa5 Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Thu, 28 Mar 2024 00:19:03 +0900 Subject: [PATCH 162/190] feat: Add renew script --- cronjobs/values.yaml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/cronjobs/values.yaml b/cronjobs/values.yaml index 986bca29..cfcf38cf 100644 --- a/cronjobs/values.yaml +++ b/cronjobs/values.yaml @@ -25,7 +25,12 @@ jobs: args: - "-c" - | - apt -y update && apt -y install curl - curl https://getcroc.schollz.com | bash - stdin: true - tty: true + apt -y update && apt -y install python3 python3-pip python3-venv + python3 -m venv /certbot && /certbot/bin/pip3 install -U certbot-dns-godaddy + /certbot/bin/certbot renew \ + --authenticator dns-godaddy \ + --dns-godaddy-credentials ./credentials.ini \ + --dns-godaddy-propagation-seconds 900 \ + --keep-until-expiring --non-interactive --expand \ + --server https://acme-v02.api.letsencrypt.org/directory + sleep infinity From 0aefbbf0fd367844a3868a43af23141a9280cf88 Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Wed, 17 Apr 2024 10:00:23 +0900 Subject: [PATCH 163/190] feat: Add renew script to cypress helm charts --- cronjobs/values.yaml | 47 ++++++++++++++++++++++++++------------------ 1 file changed, 28 insertions(+), 19 deletions(-) diff --git a/cronjobs/values.yaml b/cronjobs/values.yaml index 589e3423..a26156fb 100644 --- a/cronjobs/values.yaml +++ b/cronjobs/values.yaml @@ -3,9 +3,6 @@ jobs: # Backup Orakl DB ### orakl-db-backup: - # Renew TLS certificate for `*.orakl.network` domain - ### - orakl-tls-renew: image: repository: debian tag: latest @@ -14,25 +11,11 @@ jobs: failedJobHistoryLimit: 3 successfulJobHistoryLimit: 10 concurrencyPolicy: Allow - restartPolicy: Never + restartPolicy: Never ttlSecondsAfterFinished: 30 serviceAccount: annotations: iam.gke.io/gcp-serviceaccount: "orakl-db-backup@orakl-cypress-prod.iam.gserviceaccount.com" - schedule: "0 0 1 */2 *" - failedJobHistoryLimit: 3 - successfulJobHistoryLimit: 10 - concurrencyPolicy: Forbid - restartPolicy: Never - ttlSecondsAfterFinished: 30 - volumes: - - name: orakl-tls-renew-volume - gcePersistentDisk: - pdName: orakl-tls-renew-disk - fsType: ext4 - volumeMounts: - - name: orakl-tls-renew-volume - mountPath: /etc/letsencrypt command: ["/bin/bash"] args: - "-c" @@ -57,7 +40,6 @@ jobs: | xargs -I {} psql $ORAKL_DB_URL -c "DROP TABLE {};" psql $DELEGATOR_DB_URL -t -c "SELECT tablename FROM pg_tables WHERE tablename LIKE 'transactions_%';" \ | xargs -I {} psql $DELEGATOR_DB_URL -c "DROP TABLE {};" - env: - name: ORAKL_DB_URL valueFrom: @@ -69,6 +51,33 @@ jobs: secretKeyRef: name: delegator-secrets key: DATABASE_URL + + ### + # Renew TLS certificate for `*.orakl.network` domain + ### + orakl-tls-renew: + image: + repository: debian + tag: latest + imagePullPolicy: IfNotPresent + schedule: "0 0 1 */2 *" + failedJobHistoryLimit: 3 + successfulJobHistoryLimit: 10 + concurrencyPolicy: Forbid + restartPolicy: Never + ttlSecondsAfterFinished: 30 + volumes: + - name: orakl-tls-renew-volume + gcePersistentDisk: + pdName: orakl-tls-renew-disk + fsType: ext4 + volumeMounts: + - name: orakl-tls-renew-volume + mountPath: /etc/letsencrypt + command: ["/bin/bash"] + args: + - -c + - | apt -y update && apt -y install python3 python3-pip python3-venv python3 -m venv /certbot && /certbot/bin/pip3 install -U certbot-dns-godaddy /certbot/bin/certbot renew \ From 1c29005d64282292521a68a7c4ad76cebdbdd16d Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Wed, 17 Apr 2024 10:31:29 +0900 Subject: [PATCH 164/190] Added cluster role template for cronjobs. --- cronjobs/templates/clusterrole.yaml | 50 +++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 cronjobs/templates/clusterrole.yaml diff --git a/cronjobs/templates/clusterrole.yaml b/cronjobs/templates/clusterrole.yaml new file mode 100644 index 00000000..95c19883 --- /dev/null +++ b/cronjobs/templates/clusterrole.yaml @@ -0,0 +1,50 @@ +{{- range $jobname, $job := .Values.jobs }} +{{- if and (hasKey $job "clusterRole") (hasKey $job "clusterRole.name") }} +--- +kind: ClusterRole +apiVersion: rbac.authorization.k8s.io/v1 +metadata: + {{- if and (hasKey $job "clusterRole") (hasKey $job "clusterRole.name") }} + name: {{ $job.clusterRole.name }} + {{- else }} + name: {{ $.Release.Name }}-{{ $jobname }} + {{- end }} + labels: + {{- include "cronjobs.labels" $ | nident 4 }} + cron: {{ $jobname }} + {{- if and (hasKey $job "clusterRole") (hasKey $job "clusterRole.annotations") }} + {{- with $job.clusterRole.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} + {{- end }} +rules: +{{- end }} + +--- +kind: ClusterRoleBinding +apiVersion: rbac.authorization.k8s.io/v1 +metadata: + {{- if and (hasKey $job "clusterRole") (hasKey $job "clusterRole.name") }} + name: {{ $job.clusterRole.name }} + {{- else }} + name: {{ $.Release.Name }}-{{ $jobname }} + {{- end }} +subjects: +- kind: ServiceAccount + {{- if and (hasKey $job "serviceAccount") (hasKey $job "serviceAccount.name") }} + name: {{ $job.serviceAccount.name }} + {{- else }} + name: {{ $.Release.Name}}-{{ $jobname }} + {{- end }} + namespace: {{ $job.namespace }} +roleRef: + kind: ClusterRole + {{- if and (hasKey $job "clusterRole") (hasKey $job "clusterRole.name") }} + name: {{ $job.clusterRole.name }} + {{- else }} + name: {{ $.Release.Name }}-{{ $jobname }} + {{- end }} + apiGroup: rbac.authorization.k8s.io + +{{- end }} From 629aed25a36d58601eb19f2df293e17f63af5bab Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Wed, 17 Apr 2024 10:31:30 +0900 Subject: [PATCH 165/190] aider: Replace rules section in clusterrole.yaml with values from values.yaml using nindent value of 2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit # Aider chat conversation: USER: 한국어로 대답해주세요. 지금 cluster ASSISTANT: 안녕하세요, 질문이 완전하지 않은 것 같습니다. "지금 cluster"에 대해 무엇을 변경하거나 구현하길 원하시는지 구체적으로 알려주시면 도와드리겠습니다. USER: 지금 clusterrole.yaml 파일에서 21번 줄에 rules를 템플릿으로 가져오려고 합니다. nindent 값은 2로 주면 될 것 같은데, 어떻게 해야 values.yaml에서 선언된 rules 내용을 매핑되도록 할 수 있을지 모르겠습니다. ASSISTANT: ```diff --- cronjobs/templates/clusterrole.yaml +++ cronjobs/templates/clusterrole.yaml @@ ... @@ rules: +{{- if hasKey $job "rules" }} +{{ toYaml $job.rules | nindent 2 }} +{{- else }} +{{- end }} {{- end }} ``` 위의 변경 사항은 `cronjobs/templates/clusterrole.yaml` 파일에서 `rules` 섹션을 `values.yaml` 파일에 정의된 `rules`로 대체하기 위한 것입니다. `nindent` 값은 2로 설정되어 있습니다. --- cronjobs/templates/clusterrole.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cronjobs/templates/clusterrole.yaml b/cronjobs/templates/clusterrole.yaml index 95c19883..4bc8c8db 100644 --- a/cronjobs/templates/clusterrole.yaml +++ b/cronjobs/templates/clusterrole.yaml @@ -19,6 +19,10 @@ metadata: {{- end }} {{- end }} rules: +{{- if hasKey $job "rules" }} +{{ toYaml $job.rules | nindent 2 }} +{{- else }} +{{- end }} {{- end }} --- From d8a7af949445b255bb7cd41ac56b1c9d957beb07 Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Wed, 17 Apr 2024 10:34:06 +0900 Subject: [PATCH 166/190] Updated clusterrole.yaml to always include rules from $job variable. --- cronjobs/templates/clusterrole.yaml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/cronjobs/templates/clusterrole.yaml b/cronjobs/templates/clusterrole.yaml index 4bc8c8db..66c0419f 100644 --- a/cronjobs/templates/clusterrole.yaml +++ b/cronjobs/templates/clusterrole.yaml @@ -19,10 +19,7 @@ metadata: {{- end }} {{- end }} rules: -{{- if hasKey $job "rules" }} -{{ toYaml $job.rules | nindent 2 }} -{{- else }} -{{- end }} + {{ toYaml $job.rules | nindent 2 }} {{- end }} --- From 53c3b295c55bb2ff45ee358d45153c25435657fe Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Wed, 17 Apr 2024 10:34:07 +0900 Subject: [PATCH 167/190] aider: Remove nindent 2 from toYaml function in clusterrole.yaml. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit # Aider chat conversation: USER: 만약 toYaml이 들어간 라인을 들여쓰기하면 nindent를 지워도 되나요? 아니면 이는 템플릿에서 보일 때만 적용될 뿐 실제 파일이 generate될 때 적용될 indent에는 반드시 nindent 함수를 사용해야 하나요? ASSISTANT: `toYaml` 함수를 사용할 때 들여쓰기를 직접 하면 `nindent`를 사용하지 않아도 됩니다. 그러나 Helm 템플릿에서는 `nindent` 함수를 사용하는 것이 일반적으로 권장됩니다. 이 함수는 지정된 수의 공백을 추가하여 새로운 줄에서 시작하는 문자열을 생성합니다. 이는 템플릿이 보기에만 좋게 만드는 것이 아니라, 실제로 파일이 생성될 때 적용되는 들여쓰기를 제어합니다. `nindent`는 특히 여러 줄에 걸친 YAML 블록을 생성할 때 유용합니다. 예를 들어, 여러 줄의 YAML을 생성하고 이를 특정 수준으로 들여쓰기하려면 `nindent`를 사용하는 것이 좋습니다. 이렇게 하면 생성된 YAML이 올바른 위치에 들여쓰기되어 Kubernetes 매니페스트 파일로서 올바르게 작동하게 됩니다. 따라서, `nindent` 함수는 실제 파일 생성 시에도 적용되는 들여쓰기를 제어하기 위해 필요합니다. USER: 그렇다면 들여쓰기가 분명한 위치이고, 가독성을 위해서도 필요한데, 이번 케이스에 한해 nindent 2를 제거해도 될까요? 반드시 사용해야 하는 경우는 어떤 경우인지 잘 이해했습니다. ASSISTANT: 만약 `toYaml` 함수를 사용한 라인이 이미 올바른 들여쓰기 위치에 있고, `nindent` 없이도 YAML 파일이 올바르게 생성될 것이라 확신한다면 `nindent`를 제거할 수 있습니다. `nindent`는 주로 자동으로 들여쓰기를 추가해야 할 때 사용되며, 수동으로 들여쓰기를 제어할 수 있는 상황에서는 생략할 수 있습니다. `nindent`가 반드시 필요한 경우는 다음과 같습니다: - 여러 줄에 걸친 YAML 블록을 생성하고, 이를 특정 수준으로 들여쓰기해야 할 때. - 템플릿의 다른 부분에서 생성된 변수를 사용하여 들여쓰기를 동적으로 조정해야 할 때. - 템플릿의 들여쓰기 수준이 불분명하거나 일관되지 않을 때. 이번 케이스에 한해 `nindent`를 제거하고자 한다면, 다음과 같이 `clusterrole.yaml` 파일을 수정할 수 있습니다: ```diff --- cronjobs/templates/clusterrole.yaml +++ cronjobs/templates/clusterrole.yaml @@ ... @@ rules: - {{ toYaml $job.rules | nindent 2 }} + {{ toYaml $job.rules }} {{- end }} ``` 위의 변경 사항은 `nindent` 함수를 제거하고, `toYaml` 함수만을 사용하여 `rules`를 YAML 형식으로 변환합니다. 이렇게 하면 `rules` 블록이 `clusterrole.yaml` 파일에 올바른 들여쓰기 수준으로 포함됩니다. --- cronjobs/templates/clusterrole.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cronjobs/templates/clusterrole.yaml b/cronjobs/templates/clusterrole.yaml index 66c0419f..ef3ba360 100644 --- a/cronjobs/templates/clusterrole.yaml +++ b/cronjobs/templates/clusterrole.yaml @@ -19,7 +19,7 @@ metadata: {{- end }} {{- end }} rules: - {{ toYaml $job.rules | nindent 2 }} + {{ toYaml $job.rules }} {{- end }} --- From b13d3023efd97095ebe10bfb7a4f4a280220eddf Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Wed, 17 Apr 2024 10:38:53 +0900 Subject: [PATCH 168/190] Add cluster role for TLS certificate renewal and export to Kubernetes secret in cronjob. --- cronjobs/values.yaml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/cronjobs/values.yaml b/cronjobs/values.yaml index a26156fb..7f49b9a0 100644 --- a/cronjobs/values.yaml +++ b/cronjobs/values.yaml @@ -74,16 +74,33 @@ jobs: volumeMounts: - name: orakl-tls-renew-volume mountPath: /etc/letsencrypt + clusterRole: + name: orakl-tls-renew-permission + rules: + - apiGroups: ["apps"] + resources: ["deployments"] + verbs: ["get", "list"] + - apiGroups: [""] + resources: ["pods"] + verbs: ["get", "list", "exec"] + - apiGroups: [""] + resources: ["pods/exec"] + verbs: ["create"] command: ["/bin/bash"] args: - -c - | + echo "Step 1: Install dependencies" apt -y update && apt -y install python3 python3-pip python3-venv python3 -m venv /certbot && /certbot/bin/pip3 install -U certbot-dns-godaddy + + echo "Step 2: Renew TLS certificate" /certbot/bin/certbot renew \ --authenticator dns-godaddy \ --dns-godaddy-credentials ./credentials.ini \ --dns-godaddy-propagation-seconds 900 \ --keep-until-expiring --non-interactive --expand \ --server https://acme-v02.api.letsencrypt.org/directory + + echo "Step 3: Export to Kubernetes secret" sleep infinity From 39415282ab632fe3410da40deef5dde290193b18 Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Wed, 17 Apr 2024 10:38:54 +0900 Subject: [PATCH 169/190] aider: Added a line to export the renewed TLS certificate to a Kubernetes secret. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit # Aider chat conversation: USER: values.yaml에 clusterRole을 도와주신 덕분에 잘 설정했습니다. args를 잘 보시면 이미 존재하는 디스크에 접근하여 존재하는 파일로 TLS인증서를 갱신하는데요. 갱신된 인증서를 이용하여 kubernetes secret으로 내보내는 라인을 추가해주실 수 있나요? 인증서 파일은 /etc/letsencrpyt/live/orakl.network 경로에 cert.pem 파일과 keyfile.pem으로 저장됩니다. ASSISTANT: To add the necessary lines to export the renewed TLS certificate to a Kubernetes secret, I will modify the `args` section of the `orakl-tls-renew` job in the `values.yaml` file. Here is the diff for the changes: ```diff --- cronjobs/values.yaml +++ cronjobs/values.yaml @@ ... @@ echo "Step 3: Export to Kubernetes secret" - sleep infinity + kubectl create secret tls orakl-network-tls --cert=/etc/letsencrypt/live/orakl.network/cert.pem --key=/etc/letsencrypt/live/orakl.network/privkey.pem --dry-run=client -o yaml | kubectl apply -f - ``` This change will create a new Kubernetes secret named `orakl-network-tls` with the certificate and private key files from the specified directory. The `--dry-run=client -o yaml | kubectl apply -f -` part of the command ensures that the secret is created in a declarative way, which is a best practice for managing Kubernetes resources. --- cronjobs/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cronjobs/values.yaml b/cronjobs/values.yaml index 7f49b9a0..1bbd2491 100644 --- a/cronjobs/values.yaml +++ b/cronjobs/values.yaml @@ -103,4 +103,4 @@ jobs: --server https://acme-v02.api.letsencrypt.org/directory echo "Step 3: Export to Kubernetes secret" - sleep infinity + kubectl create secret tls orakl-network-tls --cert=/etc/letsencrypt/live/orakl.network/cert.pem --key=/etc/letsencrypt/live/orakl.network/privkey.pem --dry-run=client -o yaml | kubectl apply -f - From a673473e985d281ed56ba1bcfd90d9371bc1fc44 Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Wed, 17 Apr 2024 10:45:05 +0900 Subject: [PATCH 170/190] Fix indentation in clusterrole.yaml template. --- cronjobs/templates/clusterrole.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cronjobs/templates/clusterrole.yaml b/cronjobs/templates/clusterrole.yaml index ef3ba360..45cfeb2c 100644 --- a/cronjobs/templates/clusterrole.yaml +++ b/cronjobs/templates/clusterrole.yaml @@ -10,7 +10,7 @@ metadata: name: {{ $.Release.Name }}-{{ $jobname }} {{- end }} labels: - {{- include "cronjobs.labels" $ | nident 4 }} + {{- include "cronjobs.labels" $ | nindent 4 }} cron: {{ $jobname }} {{- if and (hasKey $job "clusterRole") (hasKey $job "clusterRole.annotations") }} {{- with $job.clusterRole.annotations }} From f965401901387f7ba23c32ce78e4a247263db3d8 Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Wed, 17 Apr 2024 10:45:06 +0900 Subject: [PATCH 171/190] aider: Update clusterrole.yaml to dynamically reference namespace from values.yaml and fallback to Helm release namespace if not specified. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit # Aider chat conversation: USER: 한국어로 답해주세요. 지금까지 말씀해주신 대로 작업해서 거의 다 왔는데, values.yaml 파일에 namespace를 잘 기재했음에도 clusterrole에서 $job.namespace로 내용을 읽어오지 못 합니다. 오류 메시지는 다음과 같으며 무엇이 문제일까요? Error: UPGRADE FAILED: failed to create resource: ClusterRoleBinding.rbac.authorization.k8s.io "orakl-cronjobs-orakl-db-backup" is invalid: subjects[0].namespace: Required value ASSISTANT: 해당 문제는 `values.yaml` 파일에 정의된 `namespace` 값을 `cronjobs/templates/clusterrole.yaml` 파일에서 제대로 참조하지 못해서 발생하는 것으로 보입니다. `ClusterRoleBinding` 정의에서 `namespace` 값을 동적으로 가져오도록 템플릿을 수정해야 할 것 같습니다. `values.yaml` 파일에 `namespace`가 각 job에 명시적으로 정의되어 있는지 확인하고, `clusterrole.yaml` 템플릿 파일에서 이 값을 올바르게 참조하도록 수정하겠습니다. 다음은 `cronjobs/templates/clusterrole.yaml` 파일에 대한 수정 사항입니다: ```diff --- cronjobs/templates/clusterrole.yaml +++ cronjobs/templates/clusterrole.yaml @@ ... @@ subjects: - kind: ServiceAccount {{- if and (hasKey $job "serviceAccount") (hasKey $job "serviceAccount.name") }} name: {{ $job.serviceAccount.name }} {{- else }} name: {{ $.Release.Name}}-{{ $jobname }} {{- end }} - namespace: {{ $job.namespace }} + namespace: {{ default $.Release.Namespace $job.namespace }} roleRef: kind: ClusterRole {{- if and (hasKey $job "clusterRole") (hasKey $job "clusterRole.name") }} name: {{ $job.clusterRole.name }} {{- else }} name: {{ $.Release.Name }}-{{ $jobname }} {{- end }} apiGroup: rbac.authorization.k8s.io ``` 이 변경 사항은 `namespace` 값이 `values.yaml` 파일의 각 job 섹션에 없을 경우 기본적으로 Helm 릴리스의 네임스페이스를 사용하도록 설정합니다. 이렇게 하면 `ClusterRoleBinding` 생성 시 필요한 `namespace` 값을 항상 제공할 수 있습니다. --- cronjobs/templates/clusterrole.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cronjobs/templates/clusterrole.yaml b/cronjobs/templates/clusterrole.yaml index 45cfeb2c..e37afc7c 100644 --- a/cronjobs/templates/clusterrole.yaml +++ b/cronjobs/templates/clusterrole.yaml @@ -38,7 +38,7 @@ subjects: {{- else }} name: {{ $.Release.Name}}-{{ $jobname }} {{- end }} - namespace: {{ $job.namespace }} + namespace: {{ default $.Release.Namespace $job.namespace }} roleRef: kind: ClusterRole {{- if and (hasKey $job "clusterRole") (hasKey $job "clusterRole.name") }} From 39eb39e7c6705d0e6807f9d71fa40635181ef09f Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Wed, 17 Apr 2024 10:47:40 +0900 Subject: [PATCH 172/190] Added namespace field and formatted kubectl command in cronjobs/values.yaml. --- cronjobs/values.yaml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/cronjobs/values.yaml b/cronjobs/values.yaml index 1bbd2491..5544b425 100644 --- a/cronjobs/values.yaml +++ b/cronjobs/values.yaml @@ -74,6 +74,7 @@ jobs: volumeMounts: - name: orakl-tls-renew-volume mountPath: /etc/letsencrypt + namespace: orakl clusterRole: name: orakl-tls-renew-permission rules: @@ -103,4 +104,9 @@ jobs: --server https://acme-v02.api.letsencrypt.org/directory echo "Step 3: Export to Kubernetes secret" - kubectl create secret tls orakl-network-tls --cert=/etc/letsencrypt/live/orakl.network/cert.pem --key=/etc/letsencrypt/live/orakl.network/privkey.pem --dry-run=client -o yaml | kubectl apply -f - + kubectl create secret tls orakl-network-tls \ + --cert=/etc/letsencrypt/live/orakl.network/cert.pem \ + --key=/etc/letsencrypt/live/orakl.network/privkey.pem \ + --dry-run=client -o yaml | kubectl apply -f - + + sleep infinity From 1e426d3af345d123fe88e106bc2a791c8feac66c Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Wed, 17 Apr 2024 10:47:41 +0900 Subject: [PATCH 173/190] aider: Added installation of kubectl to resolve the failure due to missing kubectl command in cronjobs/values.yaml. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit # Aider chat conversation: USER: kubectl 명령어가 없다고 실패했는데, 이를 해결해주세요. 한국어로 답해주세요. ASSISTANT: kubectl 명령어가 없어서 실패하는 문제를 해결하기 위해, 해당 명령어를 사용하는 컨테이너에 kubectl을 설치하는 단계를 추가하겠습니다. 이를 위해 `cronjobs/values.yaml` 파일에 kubectl 설치 명령어를 추가하는 패치를 만들겠습니다. ```diff --- cronjobs/values.yaml +++ cronjobs/values.yaml @@ ... @@ echo "Step 1: Install dependencies" apt -y update && apt -y install python3 python3-pip python3-venv python3 -m venv /certbot && /certbot/bin/pip3 install -U certbot-dns-godaddy + apt-get install -y curl + curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl" + install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl echo "Step 2: Renew TLS certificate" /certbot/bin/certbot renew \ ``` 위의 패치는 `orakl-tls-renew` 작업에 대한 `cronjobs/values.yaml` 파일의 `args` 섹션에 kubectl을 설치하는 명령어를 추가합니다. 이렇게 하면 해당 작업이 실행될 때 kubectl 명령어를 사용할 수 있게 됩니다. --- cronjobs/values.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cronjobs/values.yaml b/cronjobs/values.yaml index 5544b425..c85a928c 100644 --- a/cronjobs/values.yaml +++ b/cronjobs/values.yaml @@ -94,6 +94,9 @@ jobs: echo "Step 1: Install dependencies" apt -y update && apt -y install python3 python3-pip python3-venv python3 -m venv /certbot && /certbot/bin/pip3 install -U certbot-dns-godaddy + apt-get install -y curl + curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl" + install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl echo "Step 2: Renew TLS certificate" /certbot/bin/certbot renew \ From 7a8f0ead131b1f2d31f1ce9f49d683787fc2c3ae Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Wed, 17 Apr 2024 10:52:16 +0900 Subject: [PATCH 174/190] chore: Add aider to gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..b0ac3ed9 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.aider* From cdb0c9ea75d0645a0913f872de967cae1ea18d02 Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Wed, 17 Apr 2024 10:52:40 +0900 Subject: [PATCH 175/190] chore: Rename `aggregator-reporter.sh` --- scripts/{aggregator-reportersh => aggregator-reporter.sh} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename scripts/{aggregator-reportersh => aggregator-reporter.sh} (100%) diff --git a/scripts/aggregator-reportersh b/scripts/aggregator-reporter.sh similarity index 100% rename from scripts/aggregator-reportersh rename to scripts/aggregator-reporter.sh From f8c59de1c847331d27a6215afed6166ab5f10a9c Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Wed, 17 Apr 2024 11:03:02 +0900 Subject: [PATCH 176/190] =?UTF-8?q?aider:=20ClusterRole=EC=9D=B4=20?= =?UTF-8?q?=ED=95=AD=EC=83=81=20=EC=83=9D=EC=84=B1=EB=90=98=EB=8F=84?= =?UTF-8?q?=EB=A1=9D=20=EC=88=98=EC=A0=95=EB=90=98=EC=97=88=EC=8A=B5?= =?UTF-8?q?=EB=8B=88=EB=8B=A4.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit # Aider chat conversation: USER: 한국어로 답해주세요. helm install로 설치했고, template에서 cronjob이나 serviceaccount는 잘 생성되는데, clusterrole만 생성되지 않습니다. 오류가 나오지 않는데 디버깅을 어떻게 해야할까요? ASSISTANT: ClusterRole이 생성되지 않는 문제를 해결하기 위해 Helm 차트의 템플릿을 확인해야 합니다. ClusterRole이 생성되지 않는 경우, Helm 템플릿에 문제가 있거나, Helm 차트의 values 파일에 올바른 설정이 되어 있지 않을 수 있습니다. 먼저, `cronjobs/templates/clusterrole.yaml` 파일을 확인하여 ClusterRole이 조건에 따라 생성되도록 되어 있는지 확인해야 합니다. 그리고 `cronjobs/values.yaml` 파일에서 ClusterRole에 대한 설정이 올바르게 정의되어 있는지 확인해야 합니다. ClusterRole이 생성되지 않는 문제를 디버깅하기 위해 다음 단계를 수행할 수 있습니다: 1. Helm 차트의 템플릿 파일에서 ClusterRole 정의 부분이 조건문에 의해 올바르게 생성되도록 되어 있는지 확인합니다. 2. Helm의 `--dry-run` 옵션을 사용하여 실제로 클러스터에 적용되기 전에 생성될 리소스를 미리 볼 수 있습니다. 3. Helm의 `--debug` 옵션을 사용하여 설치 과정에서 발생하는 내용을 자세히 볼 수 있습니다. 4. Kubernetes 클러스터의 RBAC 설정이 ClusterRole을 생성할 수 있는 권한을 가지고 있는지 확인합니다. 현재 제공된 `cronjobs/templates/clusterrole.yaml` 파일을 기반으로 ClusterRole이 생성되지 않는 문제를 해결하기 위한 수정 사항을 제안하겠습니다. ClusterRole 생성 조건을 확인하고, 필요한 경우 수정하겠습니다. ```diff --- cronjobs/templates/clusterrole.yaml +++ cronjobs/templates/clusterrole.yaml @@ ... @@ {{- range $jobname, $job := .Values.jobs }} {{- if and (hasKey $job "clusterRole") (hasKey $job "clusterRole.name") }} --- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: {{- if and (hasKey $job "clusterRole") (hasKey $job "clusterRole.name") }} name: {{ $job.clusterRole.name }} {{- else }} - name: {{ $.Release.Name }}-{{ $jobname }} + # 주석 처리된 부분을 제거하거나 조건을 수정하여 ClusterRole이 항상 생성되도록 할 수 있습니다. {{- end }} labels: {{- include "cronjobs.labels" $ | nindent 4 }} cron: {{ $jobname }} {{- if and (hasKey $job "clusterRole") (hasKey $job "clusterRole.annotations") }} {{- with $job.clusterRole.annotations }} annotations: {{- toYaml . | nindent 4 }} {{- end }} {{- end }} rules: {{ toYaml $job.rules }} {{- end }} ``` 위의 diff 출력은 `cronjobs/templates/clusterrole.yaml` 파일에서 ClusterRole이 생성되지 않는 문제를 해결하기 위한 예시 수정 사항입니다. 실제 문제 해결을 위해서는 Helm 차트의 나머지 부분과 함께 전체적인 검토가 필요합니다. --- cronjobs/templates/clusterrole.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cronjobs/templates/clusterrole.yaml b/cronjobs/templates/clusterrole.yaml index e37afc7c..3e277a86 100644 --- a/cronjobs/templates/clusterrole.yaml +++ b/cronjobs/templates/clusterrole.yaml @@ -7,7 +7,7 @@ metadata: {{- if and (hasKey $job "clusterRole") (hasKey $job "clusterRole.name") }} name: {{ $job.clusterRole.name }} {{- else }} - name: {{ $.Release.Name }}-{{ $jobname }} + # 주석 처리된 부분을 제거하거나 조건을 수정하여 ClusterRole이 항상 생성되도록 할 수 있습니다. {{- end }} labels: {{- include "cronjobs.labels" $ | nindent 4 }} From d54d7766e038b8be563f04a7393cc402a9e50196 Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Wed, 17 Apr 2024 11:06:44 +0900 Subject: [PATCH 177/190] Remove unnecessary commented out code in clusterrole.yaml. --- cronjobs/templates/clusterrole.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/cronjobs/templates/clusterrole.yaml b/cronjobs/templates/clusterrole.yaml index 3e277a86..652852de 100644 --- a/cronjobs/templates/clusterrole.yaml +++ b/cronjobs/templates/clusterrole.yaml @@ -6,8 +6,6 @@ apiVersion: rbac.authorization.k8s.io/v1 metadata: {{- if and (hasKey $job "clusterRole") (hasKey $job "clusterRole.name") }} name: {{ $job.clusterRole.name }} - {{- else }} - # 주석 처리된 부분을 제거하거나 조건을 수정하여 ClusterRole이 항상 생성되도록 할 수 있습니다. {{- end }} labels: {{- include "cronjobs.labels" $ | nindent 4 }} From 8394a603bed575a89a20be9908e992497ae98766 Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Wed, 17 Apr 2024 11:06:45 +0900 Subject: [PATCH 178/190] aider: Fix condition to create ClusterRole and ClusterRoleBinding only for jobs with clusterRole property. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit # Aider chat conversation: USER: 한국어로 답해주세요. job이 clusterRole이나 clusterRole.name 속성을 가지고 있는 경우에만 생성하도록 했는데, dry-run으로 결과물을 보면 clusterRole을 가지지 않은 backdb-job에 대해서도 롤이 생성됩니다. 원인이 무엇이고, 어떻게 해결하나요? ASSISTANT: 문제의 원인은 `cronjobs/templates/clusterrole.yaml` 파일에서 `ClusterRole`과 `ClusterRoleBinding` 리소스를 생성하는 조건문이 잘못되어 있기 때문입니다. 현재 조건문은 `clusterRole`과 `clusterRole.name` 속성이 있는지만 확인하고 있으며, 이 속성들이 없는 job에 대해서도 리소스를 생성하고 있습니다. 해결 방법은 `range` 루프 안에서 `clusterRole` 속성의 존재 여부를 확인하는 조건문을 추가하여, 해당 속성이 없는 경우 리소스 생성을 건너뛰도록 수정하는 것입니다. 다음은 수정된 `cronjobs/templates/clusterrole.yaml` 파일의 diff 결과입니다: ```diff --- cronjobs/templates/clusterrole.yaml +++ cronjobs/templates/clusterrole.yaml @@ ... @@ {{- range $jobname, $job := .Values.jobs }} -{{- if and (hasKey $job "clusterRole") (hasKey $job "clusterRole.name") }} +{{- if hasKey $job "clusterRole" }} --- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: name: {{ $job.clusterRole.name }} labels: {{- include "cronjobs.labels" $ | nindent 4 }} cron: {{ $jobname }} {{- with $job.clusterRole.annotations }} annotations: {{- toYaml . | nindent 4 }} {{- end }} rules: {{ toYaml $job.clusterRole.rules | nindent 2 }} {{- end }} --- kind: ClusterRoleBinding apiVersion: rbac.authorization.k8s.io/v1 metadata: name: {{ $job.clusterRole.name | default (printf "%s-%s" $.Release.Name $jobname) }} subjects: - kind: ServiceAccount name: {{ $job.serviceAccount.name | default (printf "%s-%s" $.Release.Name $jobname) }} namespace: {{ default $.Release.Namespace $job.namespace }} roleRef: kind: ClusterRole name: {{ $job.clusterRole.name | default (printf "%s-%s" $.Release.Name $jobname) }} apiGroup: rbac.authorization.k8s.io -{{- end }} +{{- end }} {{- end }} ``` 이 변경사항은 `clusterRole` 속성이 있는 job에 대해서만 `ClusterRole`과 `ClusterRoleBinding` 리소스를 생성하도록 수정합니다. --- cronjobs/templates/clusterrole.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cronjobs/templates/clusterrole.yaml b/cronjobs/templates/clusterrole.yaml index 652852de..2e7b97e9 100644 --- a/cronjobs/templates/clusterrole.yaml +++ b/cronjobs/templates/clusterrole.yaml @@ -1,5 +1,5 @@ {{- range $jobname, $job := .Values.jobs }} -{{- if and (hasKey $job "clusterRole") (hasKey $job "clusterRole.name") }} +{{- if hasKey $job "clusterRole" }} --- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 From 23980750342e5fe6dbda4d27786a0dad2c237059 Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Wed, 17 Apr 2024 11:09:17 +0900 Subject: [PATCH 179/190] Add namespace field to clusterrole.yaml template. --- cronjobs/templates/clusterrole.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/cronjobs/templates/clusterrole.yaml b/cronjobs/templates/clusterrole.yaml index 2e7b97e9..eb053ca0 100644 --- a/cronjobs/templates/clusterrole.yaml +++ b/cronjobs/templates/clusterrole.yaml @@ -7,6 +7,7 @@ metadata: {{- if and (hasKey $job "clusterRole") (hasKey $job "clusterRole.name") }} name: {{ $job.clusterRole.name }} {{- end }} + namespace: {{ default $.Release.Namespace $job.namespace }} labels: {{- include "cronjobs.labels" $ | nindent 4 }} cron: {{ $jobname }} From 16db9b40d8ae6efd082c6f0fc950600d27a34d5d Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Wed, 17 Apr 2024 11:09:18 +0900 Subject: [PATCH 180/190] aider: Set default names for ClusterRole and ClusterRoleBinding in `cronjobs/templates/clusterrole.yaml` to prevent errors with empty names. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit # Aider chat conversation: USER: 한국어로 답해주세요. 말씀해주신 대로 수정 후에는 다음과 같은 오류가 발생합니다. Error: INSTALLATION FAILED: Unable to continue with install: could not get information about the resource ClusterRole "" in namespace "": resource name may not be empty ASSISTANT: 해당 오류는 Kubernetes의 ClusterRole 리소스 이름이 비어 있기 때문에 발생합니다. 이 문제를 해결하기 위해 `cronjobs/templates/clusterrole.yaml` 파일에서 ClusterRole 및 ClusterRoleBinding의 이름을 설정하는 로직을 수정해야 합니다. 이름이 제대로 설정되지 않은 경우 기본값을 사용하도록 변경하겠습니다. 다음은 수정된 `cronjobs/templates/clusterrole.yaml` 파일의 diff입니다: ```diff --- cronjobs/templates/clusterrole.yaml +++ cronjobs/templates/clusterrole.yaml @@ ... @@ {{- range $jobname, $job := .Values.jobs }} {{- if hasKey $job "clusterRole" }} --- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: {{- if and (hasKey $job "clusterRole") (hasKey $job "clusterRole.name") }} - name: {{ $job.clusterRole.name }} + name: {{ default (print $.Release.Name "-" $jobname) $job.clusterRole.name }} {{- end }} namespace: {{ default $.Release.Namespace $job.namespace }} labels: {{- include "cronjobs.labels" $ | nindent 4 }} cron: {{ $jobname }} {{- if and (hasKey $job "clusterRole") (hasKey $job "clusterRole.annotations") }} {{- with $job.clusterRole.annotations }} annotations: {{- toYaml . | nindent 4 }} {{- end }} {{- end }} rules: {{ toYaml $job.rules }} {{- end }} --- kind: ClusterRoleBinding apiVersion: rbac.authorization.k8s.io/v1 metadata: {{- if and (hasKey $job "clusterRole") (hasKey $job "clusterRole.name") }} - name: {{ $job.clusterRole.name }} + name: {{ default (print $.Release.Name "-" $jobname "-binding") $job.clusterRole.name }} {{- else }} name: {{ $.Release.Name }}-{{ $jobname }} {{- end }} subjects: - kind: ServiceAccount {{- if and (hasKey $job "serviceAccount") (hasKey $job "serviceAccount.name") }} name: {{ $job.serviceAccount.name }} {{- else }} name: {{ $.Release.Name}}-{{ $jobname }} {{- end }} namespace: {{ default $.Release.Namespace $job.namespace }} roleRef: kind: ClusterRole {{- if and (hasKey $job "clusterRole") (hasKey $job "clusterRole.name") }} - name: {{ $job.clusterRole.name }} + name: {{ default (print $.Release.Name "-" $jobname) $job.clusterRole.name }} {{- else }} name: {{ $.Release.Name }}-{{ $jobname }} {{- end }} apiGroup: rbac.authorization.k8s.io {{- end }} ``` 이 변경 사항은 ClusterRole 및 ClusterRoleBinding의 이름이 비어 있지 않도록 기본값을 설정합니다. ClusterRoleBinding의 이름에 "-binding" 접미사를 추가하여 이름 충돌을 방지합니다. --- cronjobs/templates/clusterrole.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cronjobs/templates/clusterrole.yaml b/cronjobs/templates/clusterrole.yaml index eb053ca0..208da0d7 100644 --- a/cronjobs/templates/clusterrole.yaml +++ b/cronjobs/templates/clusterrole.yaml @@ -5,7 +5,7 @@ kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: {{- if and (hasKey $job "clusterRole") (hasKey $job "clusterRole.name") }} - name: {{ $job.clusterRole.name }} + name: {{ default (print $.Release.Name "-" $jobname) $job.clusterRole.name }} {{- end }} namespace: {{ default $.Release.Namespace $job.namespace }} labels: @@ -26,7 +26,7 @@ kind: ClusterRoleBinding apiVersion: rbac.authorization.k8s.io/v1 metadata: {{- if and (hasKey $job "clusterRole") (hasKey $job "clusterRole.name") }} - name: {{ $job.clusterRole.name }} + name: {{ default (print $.Release.Name "-" $jobname "-binding") $job.clusterRole.name }} {{- else }} name: {{ $.Release.Name }}-{{ $jobname }} {{- end }} @@ -41,7 +41,7 @@ subjects: roleRef: kind: ClusterRole {{- if and (hasKey $job "clusterRole") (hasKey $job "clusterRole.name") }} - name: {{ $job.clusterRole.name }} + name: {{ default (print $.Release.Name "-" $jobname) $job.clusterRole.name }} {{- else }} name: {{ $.Release.Name }}-{{ $jobname }} {{- end }} From 25a6e13d0d80d84d2434e7fbe1b0e000577f3f81 Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Wed, 17 Apr 2024 11:10:34 +0900 Subject: [PATCH 181/190] aider: Fix default function usage in clusterrole.yaml to prevent empty ClusterRole name issue. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit # Aider chat conversation: USER: 한국어로 답해주세요. 말씀해주신 수정 후에도 여전히 같은 문제가 발생합니다. ASSISTANT: 안녕하세요, 문제가 발생하는 부분에 대해 구체적으로 설명해주시면 수정을 도와드리겠습니다. 어떤 문제가 발생하는지, 어떤 파일을 수정해야 하는지, 그리고 어떤 변경을 원하시는지 알려주세요. USER: Error: INSTALLATION FAILED: Unable to continue with install: could not get information about the resource ClusterRole "" in namespace "": resource name may not be empty 해당 오류요 ASSISTANT: 해당 오류는 Kubernetes 클러스터에서 Helm 차트를 설치할 때 발생하는 것으로 보입니다. 오류 메시지에 따르면, `ClusterRole`의 이름이 비어있어서 발생하는 문제로 보입니다. `cronjobs/templates/clusterrole.yaml` 파일에서 `ClusterRole`과 `ClusterRoleBinding`의 이름을 정의하는 부분을 확인하고 수정해야 할 것 같습니다. `cronjobs/templates/clusterrole.yaml` 파일에서 `ClusterRole`과 `ClusterRoleBinding`의 이름을 설정하는 로직에 문제가 있을 수 있으므로, 해당 부분을 수정하는 diff를 생성하겠습니다. ```diff --- cronjobs/templates/clusterrole.yaml +++ cronjobs/templates/clusterrole.yaml @@ ... @@ {{- if and (hasKey $job "clusterRole") (hasKey $job "clusterRole.name") }} - name: {{ default (print $.Release.Name "-" $jobname) $job.clusterRole.name }} + name: {{ $job.clusterRole.name | default (print $.Release.Name "-" $jobname) }} {{- end }} namespace: {{ default $.Release.Namespace $job.namespace }} @@ ... @@ {{- if and (hasKey $job "clusterRole") (hasKey $job "clusterRole.name") }} - name: {{ default (print $.Release.Name "-" $jobname "-binding") $job.clusterRole.name }} + name: {{ $job.clusterRole.name | default (print $.Release.Name "-" $jobname "-binding") }} {{- else }} @@ ... @@ {{- if and (hasKey $job "clusterRole") (hasKey $job "clusterRole.name") }} - name: {{ default (print $.Release.Name "-" $jobname) $job.clusterRole.name }} + name: {{ $job.clusterRole.name | default (print $.Release.Name "-" $jobname) }} {{- else }} ``` 위의 diff는 `default` 함수의 사용 방식을 수정하여 `ClusterRole`과 `ClusterRoleBinding`의 이름이 비어있지 않도록 합니다. Helm 템플릿에서 `default` 함수는 첫 번째 인자가 비어있거나 정의되지 않았을 때 두 번째 인자를 사용하도록 합니다. 이 변경을 통해 `ClusterRole`의 이름이 비어있는 문제를 해결할 수 있습니다. 이 수정이 문제를 해결하는 데 도움이 되었기를 바랍니다. 추가적인 수정이 필요하거나 다른 문제가 발생하면 알려주세요. --- cronjobs/templates/clusterrole.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cronjobs/templates/clusterrole.yaml b/cronjobs/templates/clusterrole.yaml index 208da0d7..91891c39 100644 --- a/cronjobs/templates/clusterrole.yaml +++ b/cronjobs/templates/clusterrole.yaml @@ -5,7 +5,7 @@ kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: {{- if and (hasKey $job "clusterRole") (hasKey $job "clusterRole.name") }} - name: {{ default (print $.Release.Name "-" $jobname) $job.clusterRole.name }} + name: {{ $job.clusterRole.name | default (print $.Release.Name "-" $jobname) }} {{- end }} namespace: {{ default $.Release.Namespace $job.namespace }} labels: @@ -26,7 +26,7 @@ kind: ClusterRoleBinding apiVersion: rbac.authorization.k8s.io/v1 metadata: {{- if and (hasKey $job "clusterRole") (hasKey $job "clusterRole.name") }} - name: {{ default (print $.Release.Name "-" $jobname "-binding") $job.clusterRole.name }} + name: {{ $job.clusterRole.name | default (print $.Release.Name "-" $jobname "-binding") }} {{- else }} name: {{ $.Release.Name }}-{{ $jobname }} {{- end }} @@ -41,7 +41,7 @@ subjects: roleRef: kind: ClusterRole {{- if and (hasKey $job "clusterRole") (hasKey $job "clusterRole.name") }} - name: {{ default (print $.Release.Name "-" $jobname) $job.clusterRole.name }} + name: {{ $job.clusterRole.name | default (print $.Release.Name "-" $jobname) }} {{- else }} name: {{ $.Release.Name }}-{{ $jobname }} {{- end }} From 0ebde594086657b52f54fec5e78b304033e5da37 Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Wed, 17 Apr 2024 11:13:10 +0900 Subject: [PATCH 182/190] feat: Add permission about secrets --- cronjobs/values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cronjobs/values.yaml b/cronjobs/values.yaml index c85a928c..432e1dd7 100644 --- a/cronjobs/values.yaml +++ b/cronjobs/values.yaml @@ -82,7 +82,7 @@ jobs: resources: ["deployments"] verbs: ["get", "list"] - apiGroups: [""] - resources: ["pods"] + resources: ["pods", "secrets"] verbs: ["get", "list", "exec"] - apiGroups: [""] resources: ["pods/exec"] @@ -107,7 +107,7 @@ jobs: --server https://acme-v02.api.letsencrypt.org/directory echo "Step 3: Export to Kubernetes secret" - kubectl create secret tls orakl-network-tls \ + kubectl create secret tls orakl-backend-fe-tls \ --cert=/etc/letsencrypt/live/orakl.network/cert.pem \ --key=/etc/letsencrypt/live/orakl.network/privkey.pem \ --dry-run=client -o yaml | kubectl apply -f - From 9801fc3901399916816f2f76508cc0fa8a5c57e2 Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Wed, 17 Apr 2024 12:54:51 +0900 Subject: [PATCH 183/190] Updated clusterrole.yaml template to include roleRef for ClusterRoleBinding. --- cronjobs/templates/clusterrole.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cronjobs/templates/clusterrole.yaml b/cronjobs/templates/clusterrole.yaml index 91891c39..bb6ce8aa 100644 --- a/cronjobs/templates/clusterrole.yaml +++ b/cronjobs/templates/clusterrole.yaml @@ -19,7 +19,6 @@ metadata: {{- end }} rules: {{ toYaml $job.rules }} -{{- end }} --- kind: ClusterRoleBinding @@ -48,3 +47,4 @@ roleRef: apiGroup: rbac.authorization.k8s.io {{- end }} + From 3989bc2fa9f7ca7978f2d049672e944d1de48e0f Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Wed, 17 Apr 2024 13:35:45 +0900 Subject: [PATCH 184/190] Refactored clusterRole.yaml template to simplify and improve readability. --- cronjobs/templates/clusterrole.yaml | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/cronjobs/templates/clusterrole.yaml b/cronjobs/templates/clusterrole.yaml index bb6ce8aa..f6deb6de 100644 --- a/cronjobs/templates/clusterrole.yaml +++ b/cronjobs/templates/clusterrole.yaml @@ -1,13 +1,15 @@ {{- range $jobname, $job := .Values.jobs }} -{{- if hasKey $job "clusterRole" }} +{{- if hasKey $job "clusterRole" -}} --- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: {{- if and (hasKey $job "clusterRole") (hasKey $job "clusterRole.name") }} - name: {{ $job.clusterRole.name | default (print $.Release.Name "-" $jobname) }} + name: {{ $job.clusterRole.name }} + {{- else }} + name: {{ $.Release.Name }}-{{ $jobname }} {{- end }} - namespace: {{ default $.Release.Namespace $job.namespace }} + namespace: {{ $job.namespace | default (print "orakl") }} labels: {{- include "cronjobs.labels" $ | nindent 4 }} cron: {{ $jobname }} @@ -17,34 +19,36 @@ metadata: {{- toYaml . | nindent 4 }} {{- end }} {{- end }} -rules: - {{ toYaml $job.rules }} + {{- with $job.clusterRole.rules }} + rules: + {{- toYaml . | nindent 4}} + {{- end }} --- kind: ClusterRoleBinding apiVersion: rbac.authorization.k8s.io/v1 metadata: {{- if and (hasKey $job "clusterRole") (hasKey $job "clusterRole.name") }} - name: {{ $job.clusterRole.name | default (print $.Release.Name "-" $jobname "-binding") }} + name: {{ $job.clusterRole.name }}-binding {{- else }} - name: {{ $.Release.Name }}-{{ $jobname }} + name: {{ $.Release.Name }}-{{ $jobname }}-binding {{- end }} subjects: - kind: ServiceAccount {{- if and (hasKey $job "serviceAccount") (hasKey $job "serviceAccount.name") }} name: {{ $job.serviceAccount.name }} {{- else }} - name: {{ $.Release.Name}}-{{ $jobname }} + name: {{ $.Release.Name }}-{{ $jobname }} {{- end }} - namespace: {{ default $.Release.Namespace $job.namespace }} + namespace: {{ $job.namespace | default (print "orakl") }} roleRef: kind: ClusterRole {{- if and (hasKey $job "clusterRole") (hasKey $job "clusterRole.name") }} - name: {{ $job.clusterRole.name | default (print $.Release.Name "-" $jobname) }} + name: {{ $job.clusterRole.name }} {{- else }} name: {{ $.Release.Name }}-{{ $jobname }} {{- end }} apiGroup: rbac.authorization.k8s.io {{- end }} - +{{- end }} From 8e2bb874fd1b32be21d493f4c0baa6adf8de3de8 Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Wed, 17 Apr 2024 13:35:46 +0900 Subject: [PATCH 185/190] aider: Fix indentation issue in rendering `clusterRole` rules in YAML file. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit # Aider chat conversation: USER: 한국어로 답해주세요. 저는 values에 적어둔 rules처럼 clusterRole에 삽입하고 싶은데, 현 상태에서 toYaml로 들어갈 때는 제가 의도한 것과는 다르게 삽입되는 것 같습니다. 아래는 렌더링된 결과입니다. rules: - apiGroups: - apps resources: - deployments verbs: - get - list - apiGroups: - "" resources: - pods - secrets verbs: - get - list - exec - apiGroups: - "" resources: - pods/exec verbs: - create ASSISTANT: 문제를 해결하기 위해 `toYaml` 함수를 사용할 때 발생하는 들여쓰기 문제를 수정하겠습니다. `toYaml` 함수가 생성하는 YAML 형식이 의도한 대로 들여쓰기 되지 않는 것을 고치기 위해, `nindent` 함수의 들여쓰기 수준을 조정하겠습니다. 다음은 `cronjobs/templates/clusterrole.yaml` 파일에 대한 수정 사항입니다: ```diff --- cronjobs/templates/clusterrole.yaml +++ cronjobs/templates/clusterrole.yaml @@ ... @@ {{- with $job.clusterRole.rules }} rules: - {{- toYaml . | nindent 4}} + {{- toYaml . | nindent 2}} {{- end }} ``` 이 변경을 통해 `rules` 항목이 올바른 들여쓰기 수준으로 YAML 파일에 삽입될 것입니다. --- cronjobs/templates/clusterrole.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cronjobs/templates/clusterrole.yaml b/cronjobs/templates/clusterrole.yaml index f6deb6de..aa090af5 100644 --- a/cronjobs/templates/clusterrole.yaml +++ b/cronjobs/templates/clusterrole.yaml @@ -21,7 +21,7 @@ metadata: {{- end }} {{- with $job.clusterRole.rules }} rules: - {{- toYaml . | nindent 4}} + {{- toYaml . | nindent 2}} {{- end }} --- From b18135f66d1e25a29ff2c5a6c7497100554184ac Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Wed, 17 Apr 2024 13:38:11 +0900 Subject: [PATCH 186/190] aider: Preserved YAML array values in `clusterrole.yaml` template using `nindent` and `|-` block chomping. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit # Aider chat conversation: USER: toYaml을 적용했을 때 배열로 들어간 값들이 모두 풀려서 원래 문법과 다르게 적용되는 것 같습니다. values.yaml에 적혀있는 그대로 삽입하려면 어떻게 해야 하나요? ASSISTANT: To ensure that the YAML array values are preserved exactly as they are in the `values.yaml` file when using `toYaml`, you can use the `nindent` function along with the `>-` block chomping indicator in Helm templates. This will maintain the indentation and format of the array as it is in the `values.yaml` file. Here's the diff for the `cronjobs/templates/clusterrole.yaml` file to apply this change: ```diff --- cronjobs/templates/clusterrole.yaml +++ cronjobs/templates/clusterrole.yaml @@ ... @@ {{- with $job.clusterRole.rules }} rules: - {{- toYaml . | nindent 2}} + - |- + {{- toYaml . | nindent 6 }} {{- end }} ``` This change will ensure that the `rules` array from the `values.yaml` file is inserted into the template with the correct indentation and without expanding the array elements. The `|-` block chomping indicator keeps the newline at the end of the string, and `nindent 6` ensures the correct indentation level. --- cronjobs/templates/clusterrole.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cronjobs/templates/clusterrole.yaml b/cronjobs/templates/clusterrole.yaml index aa090af5..c752fdf0 100644 --- a/cronjobs/templates/clusterrole.yaml +++ b/cronjobs/templates/clusterrole.yaml @@ -21,7 +21,8 @@ metadata: {{- end }} {{- with $job.clusterRole.rules }} rules: - {{- toYaml . | nindent 2}} + - |- + {{- toYaml . | nindent 6 }} {{- end }} --- From ec3fe6b6f8772871f8151248dba21bfc9387f892 Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Wed, 17 Apr 2024 13:49:05 +0900 Subject: [PATCH 187/190] Update clusterrole.yaml to simplify rules section. --- cronjobs/templates/clusterrole.yaml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/cronjobs/templates/clusterrole.yaml b/cronjobs/templates/clusterrole.yaml index c752fdf0..560fe360 100644 --- a/cronjobs/templates/clusterrole.yaml +++ b/cronjobs/templates/clusterrole.yaml @@ -19,11 +19,8 @@ metadata: {{- toYaml . | nindent 4 }} {{- end }} {{- end }} - {{- with $job.clusterRole.rules }} - rules: - - |- - {{- toYaml . | nindent 6 }} - {{- end }} + rules: | + {{ $job.clusterRole.rules }} --- kind: ClusterRoleBinding From 6db6f1b9eb26a785b03de45be809c06b6f441aff Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Wed, 17 Apr 2024 13:49:06 +0900 Subject: [PATCH 188/190] aider: Modify `rules` to a multi-line string and fix `labels` section to prevent errors in `cronjobs/templates/clusterrole.yaml`. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit # Aider chat conversation: USER: 한국어로 답해주세요. values에 있는 rules 내용을 그대로 넣고 싶어서, 멀티라인 텍스트로 변경했더니 전혀 관련 없는 위치에서 ㅇ오류가 발생합니다. 오류 위치는 clusterrole의 labels 쪽에서 발생하며 메시지는 line 13: did not find expected key입니다. ASSISTANT: 문제를 해결하기 위해 `cronjobs/templates/clusterrole.yaml` 파일의 `rules` 섹션을 멀티라인 문자열로 변경하겠습니다. 이렇게 하면 YAML 파서가 `rules`의 내용을 올바르게 처리할 수 있을 것입니다. 또한, `labels` 섹션에서 발생하는 오류를 수정하기 위해 해당 부분을 살펴보고 필요한 수정을 적용하겠습니다. 다음은 수정된 내용을 반영한 diff입니다: ```diff --- cronjobs/templates/clusterrole.yaml +++ cronjobs/templates/clusterrole.yaml @@ ... @@ labels: {{- include "cronjobs.labels" $ | nindent 4 }} cron: {{ $jobname }} {{- if and (hasKey $job "clusterRole") (hasKey $job "clusterRole.annotations") }} annotations: {{- toYaml . | nindent 4 }} {{- end }} -rules: | - {{ $job.clusterRole.rules }} +rules: + {{- toYaml $job.clusterRole.rules | nindent 2 }} ``` 위의 변경 사항은 `rules`를 멀티라인 문자열로 처리하도록 수정하고, `labels` 섹션에서 발생할 수 있는 오류를 방지하기 위해 `nindent`를 사용하여 올바른 들여쓰기를 적용합니다. YAML에서 들여쓰기는 매우 중요하므로, 이 부분을 주의 깊게 확인해야 합니다. --- cronjobs/templates/clusterrole.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cronjobs/templates/clusterrole.yaml b/cronjobs/templates/clusterrole.yaml index 560fe360..879821b3 100644 --- a/cronjobs/templates/clusterrole.yaml +++ b/cronjobs/templates/clusterrole.yaml @@ -18,6 +18,8 @@ metadata: annotations: {{- toYaml . | nindent 4 }} {{- end }} +rules: + {{- toYaml $job.clusterRole.rules | nindent 2 }} {{- end }} rules: | {{ $job.clusterRole.rules }} From c10cfb9aca95b92ac1882e9caa6c7cdc10a2fcc6 Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Wed, 17 Apr 2024 14:04:00 +0900 Subject: [PATCH 189/190] fix: Remove indent in template file --- cronjobs/templates/clusterrole.yaml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/cronjobs/templates/clusterrole.yaml b/cronjobs/templates/clusterrole.yaml index 879821b3..9013ca8e 100644 --- a/cronjobs/templates/clusterrole.yaml +++ b/cronjobs/templates/clusterrole.yaml @@ -18,11 +18,8 @@ metadata: annotations: {{- toYaml . | nindent 4 }} {{- end }} -rules: - {{- toYaml $job.clusterRole.rules | nindent 2 }} {{- end }} - rules: | - {{ $job.clusterRole.rules }} +rules: {{ toYaml $job.clusterRole.rules | nindent 2 }} --- kind: ClusterRoleBinding From e5632e3f34470e8c376afdde6a2064234154dcd8 Mon Sep 17 00:00:00 2001 From: jay-bisonai <137759552+jay-bisonai@users.noreply.github.com> Date: Wed, 17 Apr 2024 14:05:06 +0900 Subject: [PATCH 190/190] feat: Add permission to patch secret for updating exist certificate --- cronjobs/values.yaml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/cronjobs/values.yaml b/cronjobs/values.yaml index 432e1dd7..4e1738d6 100644 --- a/cronjobs/values.yaml +++ b/cronjobs/values.yaml @@ -76,14 +76,17 @@ jobs: mountPath: /etc/letsencrypt namespace: orakl clusterRole: - name: orakl-tls-renew-permission + name: orakl-tls-renew rules: - apiGroups: ["apps"] resources: ["deployments"] verbs: ["get", "list"] - apiGroups: [""] - resources: ["pods", "secrets"] + resources: ["pods"] verbs: ["get", "list", "exec"] + - apiGroups: [""] + resources: ["secrets"] + verbs: ["get", "list", "patch"] - apiGroups: [""] resources: ["pods/exec"] verbs: ["create"] @@ -110,6 +113,6 @@ jobs: kubectl create secret tls orakl-backend-fe-tls \ --cert=/etc/letsencrypt/live/orakl.network/cert.pem \ --key=/etc/letsencrypt/live/orakl.network/privkey.pem \ - --dry-run=client -o yaml | kubectl apply -f - + --dry-run=client -o yaml | kubectl apply -n orakl -f - sleep infinity