From 1132d8f50995280aa2e1d901dd8575265f10cbdf Mon Sep 17 00:00:00 2001
From: Keshav Prasad <keshavprasadms@gmail.com>
Date: Wed, 15 Dec 2021 12:16:38 +0530
Subject: [PATCH] Release 4.4.1 vdn (#3078)
* fix: adding log4j env property injection (#3070)
* fix: add _JAVA_OPTIONS (#3073)
* fix: add _JAVA_OPTIONS, cleanup of charts (#3074)
---
.../helm_charts/core/adminutils/Chart.yaml | 5 --
.../core/adminutils/templates/configmap.yaml | 22 -----
.../core/adminutils/templates/deployment.yaml | 68 ---------------
.../helm_charts/core/adminutils/values.j2 | 53 ------------
.../helm_charts/core/analytics/Chart.yaml | 5 --
.../core/analytics/templates/deployment.yaml | 78 -----------------
.../helm_charts/core/analytics/values.j2 | 32 -------
.../core/assessment/templates/deployment.yaml | 2 +
kubernetes/helm_charts/core/badger/Chart.yaml | 5 --
.../core/badger/templates/deployment.yaml | 63 --------------
kubernetes/helm_charts/core/badger/values.j2 | 25 ------
.../core/cert/templates/deployment.yaml | 2 +
.../certregistry/templates/deployment.yaml | 2 +
.../core/content/templates/deployment.yaml | 2 +
kubernetes/helm_charts/core/groups/Chart.yaml | 5 --
.../core/groups/templates/configmap.yaml | 11 ---
.../core/groups/templates/deployment.yaml | 72 ----------------
kubernetes/helm_charts/core/groups/values.j2 | 31 -------
.../helm_charts/core/learner/.helmignore | 22 -----
.../helm_charts/core/learner/Chart.yaml | 5 --
.../core/learner/templates/_helpers.tpl | 45 ----------
.../core/learner/templates/configmap.yaml | 11 ---
.../core/learner/templates/deployment.yaml | 80 -----------------
kubernetes/helm_charts/core/learner/values.j2 | 31 -------
kubernetes/helm_charts/core/lms/Chart.yaml | 5 --
.../core/lms/templates/configmap.yaml | 11 ---
.../core/lms/templates/deployment.yaml | 85 -------------------
kubernetes/helm_charts/core/lms/values.j2 | 31 -------
.../core/mvc/templates/deployment.yaml | 3 +
.../helm_charts/core/nodebb/.helmignore | 22 -----
kubernetes/helm_charts/core/nodebb/Chart.yaml | 5 --
.../core/nodebb/templates/_helpers.tpl | 45 ----------
.../core/nodebb/templates/configmap.yaml | 1 -
.../core/nodebb/templates/deployment.yaml | 85 -------------------
kubernetes/helm_charts/core/nodebb/values.j2 | 27 ------
.../helm_charts/core/notification/Chart.yaml | 5 --
.../notification/templates/configmap.yaml | 10 ---
.../notification/templates/deployment.yaml | 59 -------------
.../helm_charts/core/notification/values.j2 | 65 --------------
.../core/opensaber/templates/deployment.yaml | 3 +
kubernetes/helm_charts/core/report/Chart.yaml | 5 --
.../core/report/templates/_helpers.tpl | 45 ----------
.../core/report/templates/configmap.yaml | 10 ---
.../core/report/templates/deployment.yaml | 59 -------------
kubernetes/helm_charts/core/report/values.j2 | 26 ------
.../core/search/templates/deployment.yaml | 2 +
.../core/taxonomy/templates/deployment.yaml | 2 +
.../core/telemetry-dp-logstash/Chart.yaml | 5 --
.../templates/deployment.yaml | 66 --------------
.../core/telemetry-dp-logstash/values.j2 | 23 -----
.../templates/deployment.yaml | 3 +
.../core/telemetrydplogstash/values.j2 | 23 -----
.../helm_charts/core/userorg/Chart.yaml | 5 --
.../core/userorg/templates/configmap.yaml | 10 ---
.../core/userorg/templates/deployment.yaml | 59 -------------
kubernetes/helm_charts/core/userorg/values.j2 | 25 ------
56 files changed, 21 insertions(+), 1486 deletions(-)
delete mode 100644 kubernetes/helm_charts/core/adminutils/Chart.yaml
delete mode 100644 kubernetes/helm_charts/core/adminutils/templates/configmap.yaml
delete mode 100644 kubernetes/helm_charts/core/adminutils/templates/deployment.yaml
delete mode 100644 kubernetes/helm_charts/core/adminutils/values.j2
delete mode 100644 kubernetes/helm_charts/core/analytics/Chart.yaml
delete mode 100644 kubernetes/helm_charts/core/analytics/templates/deployment.yaml
delete mode 100644 kubernetes/helm_charts/core/analytics/values.j2
delete mode 100755 kubernetes/helm_charts/core/badger/Chart.yaml
delete mode 100755 kubernetes/helm_charts/core/badger/templates/deployment.yaml
delete mode 100755 kubernetes/helm_charts/core/badger/values.j2
delete mode 100644 kubernetes/helm_charts/core/groups/Chart.yaml
delete mode 100644 kubernetes/helm_charts/core/groups/templates/configmap.yaml
delete mode 100644 kubernetes/helm_charts/core/groups/templates/deployment.yaml
delete mode 100644 kubernetes/helm_charts/core/groups/values.j2
delete mode 100644 kubernetes/helm_charts/core/learner/.helmignore
delete mode 100644 kubernetes/helm_charts/core/learner/Chart.yaml
delete mode 100644 kubernetes/helm_charts/core/learner/templates/_helpers.tpl
delete mode 100644 kubernetes/helm_charts/core/learner/templates/configmap.yaml
delete mode 100644 kubernetes/helm_charts/core/learner/templates/deployment.yaml
delete mode 100644 kubernetes/helm_charts/core/learner/values.j2
delete mode 100644 kubernetes/helm_charts/core/lms/Chart.yaml
delete mode 100644 kubernetes/helm_charts/core/lms/templates/configmap.yaml
delete mode 100644 kubernetes/helm_charts/core/lms/templates/deployment.yaml
delete mode 100644 kubernetes/helm_charts/core/lms/values.j2
delete mode 100644 kubernetes/helm_charts/core/nodebb/.helmignore
delete mode 100644 kubernetes/helm_charts/core/nodebb/Chart.yaml
delete mode 100644 kubernetes/helm_charts/core/nodebb/templates/_helpers.tpl
delete mode 100644 kubernetes/helm_charts/core/nodebb/templates/configmap.yaml
delete mode 100644 kubernetes/helm_charts/core/nodebb/templates/deployment.yaml
delete mode 100644 kubernetes/helm_charts/core/nodebb/values.j2
delete mode 100644 kubernetes/helm_charts/core/notification/Chart.yaml
delete mode 100644 kubernetes/helm_charts/core/notification/templates/configmap.yaml
delete mode 100644 kubernetes/helm_charts/core/notification/templates/deployment.yaml
delete mode 100644 kubernetes/helm_charts/core/notification/values.j2
delete mode 100644 kubernetes/helm_charts/core/report/Chart.yaml
delete mode 100644 kubernetes/helm_charts/core/report/templates/_helpers.tpl
delete mode 100644 kubernetes/helm_charts/core/report/templates/configmap.yaml
delete mode 100644 kubernetes/helm_charts/core/report/templates/deployment.yaml
delete mode 100644 kubernetes/helm_charts/core/report/values.j2
delete mode 100644 kubernetes/helm_charts/core/telemetry-dp-logstash/Chart.yaml
delete mode 100644 kubernetes/helm_charts/core/telemetry-dp-logstash/templates/deployment.yaml
delete mode 100644 kubernetes/helm_charts/core/telemetry-dp-logstash/values.j2
delete mode 100644 kubernetes/helm_charts/core/telemetrydplogstash/values.j2
delete mode 100644 kubernetes/helm_charts/core/userorg/Chart.yaml
delete mode 100644 kubernetes/helm_charts/core/userorg/templates/configmap.yaml
delete mode 100644 kubernetes/helm_charts/core/userorg/templates/deployment.yaml
delete mode 100644 kubernetes/helm_charts/core/userorg/values.j2
diff --git a/kubernetes/helm_charts/core/adminutils/Chart.yaml b/kubernetes/helm_charts/core/adminutils/Chart.yaml
deleted file mode 100644
index 29e0228e6..000000000
--- a/kubernetes/helm_charts/core/adminutils/Chart.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-apiVersion: v1
-appVersion: "1.0"
-description: A Helm chart for Kubernetes
-name: adminutils
-version: 0.1.0
diff --git a/kubernetes/helm_charts/core/adminutils/templates/configmap.yaml b/kubernetes/helm_charts/core/adminutils/templates/configmap.yaml
deleted file mode 100644
index 0d2fd83ac..000000000
--- a/kubernetes/helm_charts/core/adminutils/templates/configmap.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-apiVersion: v1
-data:
- {{- range $key, $val := .Values.adminutilenv }}
- {{ $key }}: {{ $val }}
- {{- end }}
-kind: ConfigMap
-metadata:
- creationTimestamp: null
- name: {{ .Chart.Name }}-config
- namespace: {{ .Values.namespace }}
-
----
-{{- $keys := .Files.Glob "keys/*" }}
-{{ if $keys }}
-apiVersion: v1
-kind: Secret
-metadata:
- name: private-keys
-type: Opaque
-data:
-{{ (.Files.Glob "keys/*").AsSecrets | indent 2 }}
-{{ end }}
diff --git a/kubernetes/helm_charts/core/adminutils/templates/deployment.yaml b/kubernetes/helm_charts/core/adminutils/templates/deployment.yaml
deleted file mode 100644
index ddda16139..000000000
--- a/kubernetes/helm_charts/core/adminutils/templates/deployment.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- name: {{ .Chart.Name }}
- namespace: {{ .Values.namespace }}
- annotations:
- reloader.stakater.com/auto: "true"
-spec:
- replicas: {{ .Values.replicaCount }}
- strategy:
- rollingUpdate:
- maxSurge: {{ .Values.strategy.maxsurge }}
- maxUnavailable: {{ .Values.strategy.maxunavailable }}
- selector:
- matchLabels:
- app: {{ .Chart.Name }}
- template:
- metadata:
- labels:
- app: {{ .Chart.Name }}
- spec:
-{{- if .Values.imagepullsecrets }}
- imagePullSecrets:
- - name: {{ .Values.imagepullsecrets }}
-{{- end }}
- containers:
- - name: {{ .Chart.Name }}
- image: "{{ .Values.dockerhub }}/{{ .Values.repository }}:{{ .Values.image_tag }}"
- envFrom:
- - configMapRef:
- name: {{ .Chart.Name }}-config
- resources:
-{{ toYaml .Values.resources | indent 10 }}
- ports:
- - containerPort: {{ .Values.network.port }}
- {{- if .Values.healthcheck }}
- livenessProbe:
-{{ toYaml .Values.livenessProbe | indent 10 }}
- readinessProbe:
-{{ toYaml .Values.readinessProbe | indent 10 }}
- {{- end }}
-{{- $keys := .Files.Glob "keys/*" }}
-{{- if $keys }}
- volumeMounts:
- - mountPath: /keys/
- name: rsa-keys
- volumes:
- - name: rsa-keys
- secret:
- secretName: private-keys
-{{ end }}
-
----
-apiVersion: v1
-kind: Service
-metadata:
- name: adminutil
- namespace: {{ .Values.namespace }}
- labels:
- app: {{ .Chart.Name }}
-spec:
- ports:
- - name: http-{{ .Chart.Name }}
- protocol: TCP
- port: {{ .Values.network.targetport }}
- selector:
- app: {{ .Chart.Name }}
diff --git a/kubernetes/helm_charts/core/adminutils/values.j2 b/kubernetes/helm_charts/core/adminutils/values.j2
deleted file mode 100644
index 9f0b00bc8..000000000
--- a/kubernetes/helm_charts/core/adminutils/values.j2
+++ /dev/null
@@ -1,53 +0,0 @@
-### Default variable file for cert-service ###
-
-namespace: {{ namespace }}
-imagepullsecrets: {{ imagepullsecrets }}
-dockerhub: {{ dockerhub }}
-
-replicaCount: {{adminutil_replicacount|default(1)}}
-repository: {{adminutil_repository|default('adminutil')}}
-image_tag: {{image_tag}}
-resources:
- requests:
- cpu: {{adminutil_cpu_req|default('100m')}}
- memory: {{adminutil_mem_req|default('100Mi')}}
- limits:
- cpu: {{adminutil_cpu_limit|default('1000m')}}
- memory: {{adminutil_memory_limit|default('1024Mi')}}
-network:
- port: 4000
- targetport: 4000
-strategy:
- type: RollingUpdate
- maxsurge: {{ adminutil_maxsurge|default('25%') }}
- maxunavailable: {{ adminutil_maxunavailable|default('25%') }}
-
-{{ adminutils_liveness_readiness | to_nice_yaml }}
-
-adminutilenv:
- JAVA_OPTS: "-Xms{{adminutil__initial_heap_size|default('256m')}} -Xmx{{adminutil__max_heap_size|default('256m')}}"
- SERVER_PORT: '"{{adminutil__port|default('4000')}}"'
- AM_ADMIN_API_ENDPOINT: "http://kong.{{namespace}}.svc.cluster.local:8001"
- SPRING_PROFILES_ACTIVE: {{adminutil__spring_profile|default('production')}}
- DEFAULT_CONSUMER_GROUP: {{adminutil__default_consumer_group|default('contentUser')}}
- ENDPOINTS_HEALTH_ID: {{adminutil__health_id|default('apihealth')}}
- ENDPOINTS_HEALTH_SENSITIVE: '"{{adminutil__is_health_sensitive|default('false')}}"'
- ENDPOINTS_METRICS_ID: {{adminutil__metrics_id|default('metrics')}}
- ENDPOINTS_METRICS_SENSITIVE: '"{{adminutil__is_metrics_sensitive|default('false')}}"'
- AM_ADMIN_API_KEYS: "device,access"
- AM_ADMIN_API_DEVICE_BASEPATH: "/keys/"
- AM_ADMIN_API_DEVICE_KEYPREFIX: '"{{ adminutil__device_keyprefix }}"'
- AM_ADMIN_API_DEVICE_KEYSTART: '"{{ adminutil__device_keystart }}"'
- AM_ADMIN_API_DEVICE_KEYCOUNT: '"{{ adminutil__device_keycount }}"'
- AM_ADMIN_API_ACCESS_BASEPATH: "/keys/"
- AM_ADMIN_API_ACCESS_KEYPREFIX: '"{{ adminutil__access_keyprefix }}"'
- AM_ADMIN_API_ACCESS_KEYSTART: '"{{ adminutil__access_keystart }}"'
- AM_ADMIN_API_ACCESS_KEYCOUNT: '"{{ adminutil__access_keycount }}"'
- REFRESH_TOKEN_PUBLIC_BASEPATH: "/keys/"
- REFRESH_TOKEN_PUBLIC_KEYPREFIX: '"{{ adminutil_refresh_token_public_key_prefix }}"'
- REFRESH_TOKEN_KID: '"{{ adminutil_refresh_token_public_key_kid }}"'
- REFRESH_TOKEN_DOMAIN: '"{{ keycloak_auth_server_url }}/realms/{{ keycloak_realm }}"'
- REFRESH_TOKEN_PRELOAD: '"{{ adminutil_refresh_token_preload }}"'
- ACCESS_TOKEN_VALIDITY: '"{{ adminutil_access_token_validity }}"'
- REFRESH_TOKEN_OFFLINE_VALIDITY: '"{{ adminutil_refresh_token_offline_validity }}"'
- REFRESH_TOKEN_LOG_OLDER_THAN: '"{{ adminutil_refresh_token_log_older_than }}"'
diff --git a/kubernetes/helm_charts/core/analytics/Chart.yaml b/kubernetes/helm_charts/core/analytics/Chart.yaml
deleted file mode 100644
index fad12b63f..000000000
--- a/kubernetes/helm_charts/core/analytics/Chart.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-apiVersion: v1
-appVersion: "1.0"
-description: A Helm chart for Kubernetes
-name: analytics
-version: 0.1.0
diff --git a/kubernetes/helm_charts/core/analytics/templates/deployment.yaml b/kubernetes/helm_charts/core/analytics/templates/deployment.yaml
deleted file mode 100644
index 54c4f9ab1..000000000
--- a/kubernetes/helm_charts/core/analytics/templates/deployment.yaml
+++ /dev/null
@@ -1,78 +0,0 @@
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- name: {{ .Chart.Name }}
- namespace: {{ .Values.namespace }}
- annotations:
- reloader.stakater.com/auto: "true"
-spec:
- replicas: {{ .Values.replicaCount }}
- strategy:
- rollingUpdate:
- maxSurge: {{ .Values.strategy.maxsurge }}
- maxUnavailable: {{ .Values.strategy.maxunavailable }}
- selector:
- matchLabels:
- app: {{ .Chart.Name }}
- template:
- metadata:
- labels:
- app: {{ .Chart.Name }}
- spec:
-{{- if .Values.imagepullsecrets }}
- imagePullSecrets:
- - name: {{ .Values.imagepullsecrets }}
-{{- end }}
- volumes:
- - name: {{ .Chart.Name }}-config
- configMap:
- name: {{ .Chart.Name }}-config
- containers:
- - name: {{ .Chart.Name }}
- image: "{{ .Values.dockerhub }}/{{ .Values.repository }}:{{ .Values.image_tag }}"
- imagePullPolicy: Always
- env:
- - name: JAVA_OPTIONS
- value: {{ .Values.env.javaoptions | quote }}
- - name: MIN_HEAP
- value: {{ .Values.env.min_heap | quote }}
- - name: MAX_HEAP
- value: {{ .Values.env.max_heap | quote }}
- - name: azure_storage_secret
- value: {{ .Values.env.azure_private_account_secret | quote }}
- - name: azure_storage_key
- value: {{ .Values.env.azure_private_account_name | quote }}
- envFrom:
- - configMapRef:
- name: {{ .Chart.Name }}-config
- resources:
-{{ toYaml .Values.resources | indent 10 }}
- ports:
- - containerPort: {{ .Values.network.port }}
- {{- if .Values.healthcheck }}
- livenessProbe:
-{{ toYaml .Values.livenessProbe | indent 10 }}
- readinessProbe:
-{{ toYaml .Values.readinessProbe | indent 10 }}
- {{- end }}
- volumeMounts:
- - name: {{ .Chart.Name }}-config
- mountPath: /home/analytics/application.conf
- subPath: analytics_api_service.conf
-
----
-apiVersion: v1
-kind: Service
-metadata:
- name: {{ .Chart.Name }}-service
- namespace: {{ .Values.namespace }}
- labels:
- app: {{ .Chart.Name }}
-spec:
- ports:
- - name: http-{{ .Chart.Name }}
- protocol: TCP
- port: {{ .Values.network.targetport }}
- selector:
- app: {{ .Chart.Name }}
diff --git a/kubernetes/helm_charts/core/analytics/values.j2 b/kubernetes/helm_charts/core/analytics/values.j2
deleted file mode 100644
index ab93c8676..000000000
--- a/kubernetes/helm_charts/core/analytics/values.j2
+++ /dev/null
@@ -1,32 +0,0 @@
-### Default variable file for cert-service ###
-
-namespace: {{ namespace }}
-imagepullsecrets: {{ imagepullsecrets }}
-dockerhub: {{ dockerhub }}
-
-env:
- javaoptions: {{analytics_java_mem_limit|default('-Xmx600m')}}
- min_heap: {{analytics_min_heap_limit|default('-Xms1g')}}
- max_heap: {{analytics_max_heap_limit|default('-Xmx2g')}}
- azure_private_account_secret: {{ sunbird_private_storage_account_key }}
- azure_private_account_name: {{ sunbird_private_storage_account_name }}
-
-replicaCount: {{analytics_replicacount|default(1)}}
-repository: {{analytics_repository|default('sunbird-analytics-service')}}
-image_tag: {{ image_tag }}
-resources:
- requests:
- cpu: {{analytics_cpu_req|default('100m')}}
- memory: {{analytics_mem_req|default('100Mi')}}
- limits:
- cpu: {{analytics_cpu_limit|default('1')}}
- memory: {{analytics_mem_limit|default('1024Mi')}}
-network:
- port: 9000
- targetport: 9000
-strategy:
- type: RollingUpdate
- maxsurge: {{ analytics_maxsurge|default('25%') }}
- maxunavailable: {{ analytics_maxunavailable|default('25%') }}
-
-{{ analytics_liveness_readiness | to_nice_yaml }}
diff --git a/kubernetes/helm_charts/core/assessment/templates/deployment.yaml b/kubernetes/helm_charts/core/assessment/templates/deployment.yaml
index 5f353c55f..2a3d0a263 100644
--- a/kubernetes/helm_charts/core/assessment/templates/deployment.yaml
+++ b/kubernetes/helm_charts/core/assessment/templates/deployment.yaml
@@ -38,6 +38,8 @@ spec:
env:
- name: JAVA_OPTIONS
value: {{ .Values.env.javaoptions | quote }}
+ - name: _JAVA_OPTIONS
+ value: -Dlog4j2.formatMsgNoLookups=true
envFrom:
- configMapRef:
name: {{ .Chart.Name }}-config
diff --git a/kubernetes/helm_charts/core/badger/Chart.yaml b/kubernetes/helm_charts/core/badger/Chart.yaml
deleted file mode 100755
index c87735cf9..000000000
--- a/kubernetes/helm_charts/core/badger/Chart.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-apiVersion: v1
-appVersion: "1.0"
-description: A Helm chart for Kubernetes
-name: badger
-version: 0.1.0
diff --git a/kubernetes/helm_charts/core/badger/templates/deployment.yaml b/kubernetes/helm_charts/core/badger/templates/deployment.yaml
deleted file mode 100755
index b3fbc36ca..000000000
--- a/kubernetes/helm_charts/core/badger/templates/deployment.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- name: {{ .Chart.Name }}
- namespace: {{ .Values.namespace }}
- annotations:
- reloader.stakater.com/auto: "true"
-spec:
- replicas: {{ .Values.replicaCount }}
- strategy:
- rollingUpdate:
- maxSurge: {{ .Values.strategy.maxsurge }}
- maxUnavailable: {{ .Values.strategy.maxunavailable }}
- selector:
- matchLabels:
- app: {{ .Chart.Name }}
- template:
- metadata:
- labels:
- app: {{ .Chart.Name }}
- spec:
-{{- if .Values.imagepullsecrets }}
- imagePullSecrets:
- - name: {{ .Values.imagepullsecrets }}
-{{- end }}
- volumes:
- - name: {{ .Chart.Name }}-config
- configMap:
- name: {{ .Chart.Name }}-config
- containers:
- - name: {{ .Chart.Name }}
- image: "{{ .Values.dockerhub }}/{{ .Values.repository }}:{{ .Values.image_tag }}"
- resources:
-{{ toYaml .Values.resources | indent 10 }}
- ports:
- - containerPort: {{ .Values.network.port }}
- {{- if .Values.healthcheck }}
- livenessProbe:
-{{ toYaml .Values.livenessProbe | indent 10 }}
- readinessProbe:
-{{ toYaml .Values.readinessProbe | indent 10 }}
- {{- end }}
- volumeMounts:
- - name: {{ .Chart.Name }}-config
- mountPath: /badger/code/apps/mainsite/settings_local.py
- subPath: settings_local.py
-
----
-apiVersion: v1
-kind: Service
-metadata:
- name: {{ .Chart.Name }}-service
- namespace: {{ .Values.namespace }}
- labels:
- app: {{ .Chart.Name }}
-spec:
- ports:
- - name: http-{{ .Chart.Name }}
- protocol: TCP
- port: {{ .Values.network.targetport }}
- selector:
- app: {{ .Chart.Name }}
diff --git a/kubernetes/helm_charts/core/badger/values.j2 b/kubernetes/helm_charts/core/badger/values.j2
deleted file mode 100755
index f98f76652..000000000
--- a/kubernetes/helm_charts/core/badger/values.j2
+++ /dev/null
@@ -1,25 +0,0 @@
-### Default variable file for badger-service ###
-
-namespace: {{ namespace }}
-imagepullsecrets: {{ imagepullsecrets }}
-dockerhub: {{ dockerhub }}
-
-replicaCount: {{badger_replicacount|default(1)}}
-repository: {{badger_repository|default('badger')}}
-image_tag: {{ image_tag }}
-resources:
- requests:
- cpu: {{badger_cpu_req|default('100m')}}
- memory: {{badger_mem_req|default('100Mi')}}
- limits:
- cpu: {{badger_cpu_limit|default('500m')}}
- memory: {{badger_mem_limit|default('500Mi')}}
-network:
- port: 8004
- targetport: 8004
-strategy:
- type: RollingUpdate
- maxsurge: {{ badger_maxsurge|default('25%') }}
- maxunavailable: {{ badger_maxunavailable|default('25%') }}
-
-{{ badger_liveness_readiness | to_nice_yaml }}
diff --git a/kubernetes/helm_charts/core/cert/templates/deployment.yaml b/kubernetes/helm_charts/core/cert/templates/deployment.yaml
index 0d1e794d0..577cda9ab 100644
--- a/kubernetes/helm_charts/core/cert/templates/deployment.yaml
+++ b/kubernetes/helm_charts/core/cert/templates/deployment.yaml
@@ -31,6 +31,8 @@ spec:
env:
- name: JAVA_OPTIONS
value: {{ .Values.env.javaoptions | quote }}
+ - name: _JAVA_OPTIONS
+ value: -Dlog4j2.formatMsgNoLookups=true
envFrom:
- configMapRef:
name: {{ .Chart.Name }}-config
diff --git a/kubernetes/helm_charts/core/certregistry/templates/deployment.yaml b/kubernetes/helm_charts/core/certregistry/templates/deployment.yaml
index bcfa950e3..885383e19 100644
--- a/kubernetes/helm_charts/core/certregistry/templates/deployment.yaml
+++ b/kubernetes/helm_charts/core/certregistry/templates/deployment.yaml
@@ -31,6 +31,8 @@ spec:
env:
- name: JAVA_OPTIONS
value: {{ .Values.env.javaoptions | quote }}
+ - name: _JAVA_OPTIONS
+ value: -Dlog4j2.formatMsgNoLookups=true
envFrom:
- configMapRef:
name: {{ .Chart.Name }}-config
diff --git a/kubernetes/helm_charts/core/content/templates/deployment.yaml b/kubernetes/helm_charts/core/content/templates/deployment.yaml
index 714521a20..4b9efc53d 100644
--- a/kubernetes/helm_charts/core/content/templates/deployment.yaml
+++ b/kubernetes/helm_charts/core/content/templates/deployment.yaml
@@ -38,6 +38,8 @@ spec:
env:
- name: JAVA_OPTIONS
value: {{ .Values.env.javaoptions | quote }}
+ - name: _JAVA_OPTIONS
+ value: -Dlog4j2.formatMsgNoLookups=true
envFrom:
- configMapRef:
name: {{ .Chart.Name }}-config
diff --git a/kubernetes/helm_charts/core/groups/Chart.yaml b/kubernetes/helm_charts/core/groups/Chart.yaml
deleted file mode 100644
index abf54a22e..000000000
--- a/kubernetes/helm_charts/core/groups/Chart.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-apiVersion: v1
-appVersion: "1.0"
-description: A Helm chart for Kubernetes
-name: groups
-version: 0.1.0
diff --git a/kubernetes/helm_charts/core/groups/templates/configmap.yaml b/kubernetes/helm_charts/core/groups/templates/configmap.yaml
deleted file mode 100644
index 810570ef9..000000000
--- a/kubernetes/helm_charts/core/groups/templates/configmap.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
----
-{{- $keys := .Files.Glob "keys/*" }}
-{{ if $keys }}
-apiVersion: v1
-kind: Secret
-metadata:
- name: groups-access-keys
-type: Opaque
-data:
-{{ (.Files.Glob "keys/*").AsSecrets | indent 2 }}
-{{ end }}
diff --git a/kubernetes/helm_charts/core/groups/templates/deployment.yaml b/kubernetes/helm_charts/core/groups/templates/deployment.yaml
deleted file mode 100644
index 3f12a3346..000000000
--- a/kubernetes/helm_charts/core/groups/templates/deployment.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- name: {{ .Chart.Name }}
- namespace: {{ .Values.namespace }}
- annotations:
- reloader.stakater.com/auto: "true"
-spec:
- replicas: {{ .Values.replicaCount }}
- strategy:
- rollingUpdate:
- maxSurge: {{ .Values.strategy.maxsurge }}
- maxUnavailable: {{ .Values.strategy.maxunavailable }}
- selector:
- matchLabels:
- app: {{ .Chart.Name }}
- template:
- metadata:
- labels:
- app: {{ .Chart.Name }}
- spec:
-{{- if .Values.imagepullsecrets }}
- imagePullSecrets:
- - name: {{ .Values.imagepullsecrets }}
-{{- end }}
- containers:
- - name: {{ .Chart.Name }}
- image: "{{ .Values.dockerhub }}/{{ .Values.repository }}:{{ .Values.image_tag }}"
- imagePullPolicy: Always
- env:
- - name: JAVA_OPTIONS
- value: {{ .Values.env.javaoptions | quote }}
- envFrom:
- - configMapRef:
- name: {{ .Chart.Name }}-config
- resources:
-{{ toYaml .Values.resources | indent 10 }}
- ports:
- - containerPort: {{ .Values.network.port }}
- {{- if .Values.healthcheck }}
- livenessProbe:
-{{ toYaml .Values.livenessProbe | indent 10 }}
- readinessProbe:
-{{ toYaml .Values.readinessProbe | indent 10 }}
- {{- end }}
-{{- $keys := .Files.Glob "keys/*" }}
-{{- if $keys }}
- volumeMounts:
- - mountPath: {{ .Values.groups_device_basepath }}
- name: access-keys
- volumes:
- - name: access-keys
- secret:
- secretName: groups-access-keys
-{{ end }}
-
----
-apiVersion: v1
-kind: Service
-metadata:
- name: {{ .Chart.Name }}-service
- namespace: {{ .Values.namespace }}
- labels:
- app: {{ .Chart.Name }}
-spec:
- ports:
- - name: http-{{ .Chart.Name }}
- protocol: TCP
- port: {{ .Values.network.targetport }}
- selector:
- app: {{ .Chart.Name }}
diff --git a/kubernetes/helm_charts/core/groups/values.j2 b/kubernetes/helm_charts/core/groups/values.j2
deleted file mode 100644
index 43f1928a6..000000000
--- a/kubernetes/helm_charts/core/groups/values.j2
+++ /dev/null
@@ -1,31 +0,0 @@
-### Default variable file for groups-service ###
-
-namespace: {{ namespace }}
-imagepullsecrets: {{ imagepullsecrets }}
-dockerhub: {{ dockerhub }}
-
-
-env:
- javaoptions: {{groups_java_mem_limit|default('-Xmx500m')}}
-
-replicaCount: {{groups_replicacount|default(1)}}
-repository: {{groups_repository|default('groups_service')}}
-image_tag: {{ image_tag }}
-resources:
- requests:
- cpu: {{groups_cpu_req|default('100m')}}
- memory: {{groups_mem_req|default('300Mi')}}
- limits:
- cpu: {{groups_cpu_limit|default('1')}}
- memory: {{groups_mem_limit|default('1024Mi')}}
-network:
- port: 9000
- targetport: 9000
-strategy:
- type: RollingUpdate
- maxsurge: {{ groups_maxsurge|default('25%') }}
- maxunavailable: {{ groups_maxunavailable|default('25%') }}
-
-{{ groups_liveness_readiness | to_nice_yaml }}
-
-groups_device_basepath: {{ groups_device_basepath | default('/keys/') }}
diff --git a/kubernetes/helm_charts/core/learner/.helmignore b/kubernetes/helm_charts/core/learner/.helmignore
deleted file mode 100644
index 50af03172..000000000
--- a/kubernetes/helm_charts/core/learner/.helmignore
+++ /dev/null
@@ -1,22 +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
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
-.vscode/
diff --git a/kubernetes/helm_charts/core/learner/Chart.yaml b/kubernetes/helm_charts/core/learner/Chart.yaml
deleted file mode 100644
index d2c54a936..000000000
--- a/kubernetes/helm_charts/core/learner/Chart.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-apiVersion: v1
-appVersion: "1.0"
-description: A Helm chart for Kubernetes
-name: learner
-version: 0.1.0
diff --git a/kubernetes/helm_charts/core/learner/templates/_helpers.tpl b/kubernetes/helm_charts/core/learner/templates/_helpers.tpl
deleted file mode 100644
index 420ba7943..000000000
--- a/kubernetes/helm_charts/core/learner/templates/_helpers.tpl
+++ /dev/null
@@ -1,45 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "learner.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 "learner.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 "learner.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Common labels
-*/}}
-{{- define "learner.labels" -}}
-app.kubernetes.io/name: {{ include "learner.name" . }}
-helm.sh/chart: {{ include "learner.chart" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-{{- if .Chart.AppVersion }}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-{{- end }}
-app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- end -}}
diff --git a/kubernetes/helm_charts/core/learner/templates/configmap.yaml b/kubernetes/helm_charts/core/learner/templates/configmap.yaml
deleted file mode 100644
index f6dacc41b..000000000
--- a/kubernetes/helm_charts/core/learner/templates/configmap.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
----
-{{- $keys := .Files.Glob "keys/*" }}
-{{ if $keys }}
-apiVersion: v1
-kind: Secret
-metadata:
- name: learner-access-keys
-type: Opaque
-data:
-{{ (.Files.Glob "keys/*").AsSecrets | indent 2 }}
-{{ end }}
diff --git a/kubernetes/helm_charts/core/learner/templates/deployment.yaml b/kubernetes/helm_charts/core/learner/templates/deployment.yaml
deleted file mode 100644
index 81117a28f..000000000
--- a/kubernetes/helm_charts/core/learner/templates/deployment.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- name: {{ .Chart.Name }}
- namespace: {{ .Values.namespace }}
- annotations:
- reloader.stakater.com/auto: "true"
-spec:
- replicas: {{ .Values.replicaCount }}
- strategy:
- rollingUpdate:
- maxSurge: {{ .Values.strategy.maxsurge }}
- maxUnavailable: {{ .Values.strategy.maxunavailable }}
- selector:
- matchLabels:
- app: {{ .Chart.Name }}
- template:
- metadata:
- labels:
- app: {{ .Chart.Name }}
- spec:
-{{- if .Values.imagepullsecrets }}
- imagePullSecrets:
- - name: {{ .Values.imagepullsecrets }}
-{{- end }}
- containers:
- - name: {{ .Chart.Name }}
- image: "{{ .Values.dockerhub }}/{{ .Values.repository }}:{{ .Values.image_tag }}"
- imagePullPolicy: Always
- env:
- - name: JAVA_OPTIONS
- value: {{ .Values.env.javaoptions | quote }}
- envFrom:
- - configMapRef:
- name: {{ .Chart.Name }}-config
- resources:
-{{ toYaml .Values.resources | indent 10 }}
- ports:
- - containerPort: {{ .Values.network.port }}
- {{- if .Values.healthcheck }}
- livenessProbe:
-{{ toYaml .Values.livenessProbe | indent 10 }}
- readinessProbe:
-{{ toYaml .Values.readinessProbe | indent 10 }}
- {{- end }}
- volumeMounts:
- - name: {{ .Chart.Name }}-xml-config
- mountPath: /home/sunbird/learner/learning-service-1.0-SNAPSHOT/config/logback.xml
- subPath: learner-service_logback.xml
-{{- $keys := .Files.Glob "keys/*" }}
-{{- if $keys }}
- - mountPath: {{ .Values.learner_device_basepath }}
- name: access-keys
-{{- end }}
- volumes:
- - name: {{ .Chart.Name }}-xml-config
- configMap:
- name: {{ .Chart.Name }}-xml-config
-{{- $keys := .Files.Glob "keys/*" }}
-{{- if $keys }}
- - name: access-keys
- secret:
- secretName: learner-access-keys
-{{- end }}
----
-apiVersion: v1
-kind: Service
-metadata:
- name: {{ .Chart.Name }}-service
- namespace: {{ .Values.namespace }}
- labels:
- app: {{ .Chart.Name }}
-spec:
- ports:
- - name: http-{{ .Chart.Name }}
- protocol: TCP
- port: {{ .Values.network.targetport }}
- selector:
- app: {{ .Chart.Name }}
diff --git a/kubernetes/helm_charts/core/learner/values.j2 b/kubernetes/helm_charts/core/learner/values.j2
deleted file mode 100644
index 0faa781ea..000000000
--- a/kubernetes/helm_charts/core/learner/values.j2
+++ /dev/null
@@ -1,31 +0,0 @@
-
-### Default variable file for learner-service ###
-
-namespace: {{ namespace }}
-imagepullsecrets: {{ imagepullsecrets }}
-dockerhub: {{ dockerhub }}
-
-env:
- javaoptions: {{learner_java_mem_limit|default('-Xmx600m')}}
-
-replicaCount: {{learner_replicacount|default(1)}}
-repository: {{learner_repository|default('learner_service')}}
-image_tag: {{ image_tag }}
-resources:
- requests:
- cpu: {{learner_cpu_req|default('100m')}}
- memory: {{learner_mem_req|default('100Mi')}}
- limits:
- cpu: {{learner_cpu_limit|default('1')}}
- memory: {{learner_mem_limit|default('1024Mi')}}
-network:
- port: 9000
- targetport: 9000
-strategy:
- type: RollingUpdate
- maxsurge: {{ learner_maxsurge|default('25%') }}
- maxunavailable: {{ learner_maxunavailable|default('25%') }}
-
-{{ learner_liveness_readiness | to_nice_yaml }}
-
-learner_device_basepath: {{ learner_device_basepath | default('/keys/') }}
diff --git a/kubernetes/helm_charts/core/lms/Chart.yaml b/kubernetes/helm_charts/core/lms/Chart.yaml
deleted file mode 100644
index 5ebad8066..000000000
--- a/kubernetes/helm_charts/core/lms/Chart.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-apiVersion: v1
-appVersion: "1.0"
-description: A Helm chart for Kubernetes
-name: lms
-version: 0.1.0
diff --git a/kubernetes/helm_charts/core/lms/templates/configmap.yaml b/kubernetes/helm_charts/core/lms/templates/configmap.yaml
deleted file mode 100644
index 07d61ad08..000000000
--- a/kubernetes/helm_charts/core/lms/templates/configmap.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
----
-{{- $keys := .Files.Glob "keys/*" }}
-{{ if $keys }}
-apiVersion: v1
-kind: Secret
-metadata:
- name: lms-access-keys
-type: Opaque
-data:
-{{ (.Files.Glob "keys/*").AsSecrets | indent 2 }}
-{{ end }}
diff --git a/kubernetes/helm_charts/core/lms/templates/deployment.yaml b/kubernetes/helm_charts/core/lms/templates/deployment.yaml
deleted file mode 100644
index 1c797c37e..000000000
--- a/kubernetes/helm_charts/core/lms/templates/deployment.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- name: {{ .Chart.Name }}
- namespace: {{ .Values.namespace }}
- annotations:
- reloader.stakater.com/auto: "true"
-spec:
- replicas: {{ .Values.replicaCount }}
- strategy:
- rollingUpdate:
- maxSurge: {{ .Values.strategy.maxsurge }}
- maxUnavailable: {{ .Values.strategy.maxunavailable }}
- selector:
- matchLabels:
- app: {{ .Chart.Name }}
- template:
- metadata:
- labels:
- app: {{ .Chart.Name }}
- spec:
-{{- if .Values.imagepullsecrets }}
- imagePullSecrets:
- - name: {{ .Values.imagepullsecrets }}
-{{- end }}
- volumes:
- - name: {{ .Chart.Name }}-xml-config
- configMap:
- name: {{ .Chart.Name }}-xml-config
- containers:
- - name: {{ .Chart.Name }}
- image: "{{ .Values.dockerhub }}/{{ .Values.repository }}:{{ .Values.image_tag }}"
- imagePullPolicy: Always
- env:
- - name: JAVA_OPTIONS
- value: {{ .Values.env.javaoptions | quote }}
- envFrom:
- - configMapRef:
- name: {{ .Chart.Name }}-config
- resources:
-{{ toYaml .Values.resources | indent 10 }}
- ports:
- - containerPort: {{ .Values.network.port }}
- {{- if .Values.healthcheck }}
- livenessProbe:
-{{ toYaml .Values.livenessProbe | indent 10 }}
- readinessProbe:
-{{ toYaml .Values.readinessProbe | indent 10 }}
- {{- end }}
- volumeMounts:
- - name: {{ .Chart.Name }}-xml-config
- mountPath: /home/sunbird/lms/lms-service-1.0-SNAPSHOT/config/logback.xml
- subPath: lms-service_logback.xml
-{{- $keys := .Files.Glob "keys/*" }}
-{{- if $keys }}
- - mountPath: {{ .Values.lms_device_basepath }}
- name: access-keys
-{{- end }}
- volumes:
- - name: {{ .Chart.Name }}-xml-config
- configMap:
- name: {{ .Chart.Name }}-xml-config
-{{- $keys := .Files.Glob "keys/*" }}
-{{- if $keys }}
- - name: access-keys
- secret:
- secretName: lms-access-keys
-{{- end }}
-
----
-apiVersion: v1
-kind: Service
-metadata:
- name: {{ .Chart.Name }}-service
- namespace: {{ .Values.namespace }}
- labels:
- app: {{ .Chart.Name }}
-spec:
- ports:
- - name: http-{{ .Chart.Name }}
- protocol: TCP
- port: {{ .Values.network.targetport }}
- selector:
- app: {{ .Chart.Name }}
diff --git a/kubernetes/helm_charts/core/lms/values.j2 b/kubernetes/helm_charts/core/lms/values.j2
deleted file mode 100644
index 0714daad9..000000000
--- a/kubernetes/helm_charts/core/lms/values.j2
+++ /dev/null
@@ -1,31 +0,0 @@
-### Default variable file for lms-service ###
-
-namespace: {{ namespace }}
-imagepullsecrets: {{ imagepullsecrets }}
-dockerhub: {{ dockerhub }}
-
-
-env:
- javaoptions: {{lms_java_mem_limit|default('-Xmx600m')}}
-
-replicaCount: {{lms_replicacount|default(1)}}
-repository: {{lms_repository|default('lms_service')}}
-image_tag: {{ image_tag }}
-resources:
- requests:
- cpu: {{lms_cpu_req|default('100m')}}
- memory: {{lms_mem_req|default('100Mi')}}
- limits:
- cpu: {{lms_cpu_limit|default('1')}}
- memory: {{lms_mem_limit|default('1024Mi')}}
-network:
- port: 9005
- targetport: 9000
-strategy:
- type: RollingUpdate
- maxsurge: {{ lms_maxsurge|default('25%') }}
- maxunavailable: {{ lms_maxunavailable|default('25%') }}
-
-{{ lms_liveness_readiness | to_nice_yaml }}
-
-lms_device_basepath: {{ lms_device_basepath | default('/keys/') }}
diff --git a/kubernetes/helm_charts/core/mvc/templates/deployment.yaml b/kubernetes/helm_charts/core/mvc/templates/deployment.yaml
index 625b0ef12..98fca71e2 100644
--- a/kubernetes/helm_charts/core/mvc/templates/deployment.yaml
+++ b/kubernetes/helm_charts/core/mvc/templates/deployment.yaml
@@ -38,6 +38,9 @@ spec:
envFrom:
- configMapRef:
name: {{ .Chart.Name }}-config
+ env:
+ - name: _JAVA_OPTIONS
+ value: -Dlog4j2.formatMsgNoLookups=true
resources:
{{ toYaml .Values.resources | indent 10 }}
ports:
diff --git a/kubernetes/helm_charts/core/nodebb/.helmignore b/kubernetes/helm_charts/core/nodebb/.helmignore
deleted file mode 100644
index 50af03172..000000000
--- a/kubernetes/helm_charts/core/nodebb/.helmignore
+++ /dev/null
@@ -1,22 +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
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
-.vscode/
diff --git a/kubernetes/helm_charts/core/nodebb/Chart.yaml b/kubernetes/helm_charts/core/nodebb/Chart.yaml
deleted file mode 100644
index 92b3d1bb7..000000000
--- a/kubernetes/helm_charts/core/nodebb/Chart.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-apiVersion: v1
-appVersion: "1.0"
-description: A Helm chart for Kubernetes
-name: nodebb
-version: 0.1.0
diff --git a/kubernetes/helm_charts/core/nodebb/templates/_helpers.tpl b/kubernetes/helm_charts/core/nodebb/templates/_helpers.tpl
deleted file mode 100644
index 83b59b74a..000000000
--- a/kubernetes/helm_charts/core/nodebb/templates/_helpers.tpl
+++ /dev/null
@@ -1,45 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "print.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 "print.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 "print.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Common labels
-*/}}
-{{- define "print.labels" -}}
-app.kubernetes.io/name: {{ include "print.name" . }}
-helm.sh/chart: {{ include "print.chart" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-{{- if .Chart.AppVersion }}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-{{- end }}
-app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- end -}}
diff --git a/kubernetes/helm_charts/core/nodebb/templates/configmap.yaml b/kubernetes/helm_charts/core/nodebb/templates/configmap.yaml
deleted file mode 100644
index bdec29c8d..000000000
--- a/kubernetes/helm_charts/core/nodebb/templates/configmap.yaml
+++ /dev/null
@@ -1 +0,0 @@
-# This file will get replaced at runtime
diff --git a/kubernetes/helm_charts/core/nodebb/templates/deployment.yaml b/kubernetes/helm_charts/core/nodebb/templates/deployment.yaml
deleted file mode 100644
index b25dd6987..000000000
--- a/kubernetes/helm_charts/core/nodebb/templates/deployment.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- name: {{ .Chart.Name }}
- namespace: {{ .Values.namespace }}
- annotations:
- reloader.stakater.com/auto: "true"
-spec:
- replicas: {{ .Values.replicaCount }}
- strategy:
- rollingUpdate:
- maxSurge: {{ .Values.strategy.maxsurge }}
- maxUnavailable: {{ .Values.strategy.maxunavailable }}
- selector:
- matchLabels:
- app: {{ .Chart.Name }}
- template:
- metadata:
- labels:
- app: {{ .Chart.Name }}
- spec:
-{{- if .Values.imagepullsecrets }}
- imagePullSecrets:
- - name: {{ .Values.imagepullsecrets }}
-{{- end }}
- volumes:
- - name: nodebb-config-json
- configMap:
- name: nodebb-config-json
- containers:
- - name: {{ .Chart.Name }}
- image: "{{ .Values.dockerhub }}/{{ .Values.repository }}:{{ .Values.image_tag }}"
- imagePullPolicy: Always
- volumeMounts:
- - name: nodebb-config-json
- mountPath: /usr/src/app/config.json
- subPath: config.json
- resources:
-{{ toYaml .Values.resources | indent 10 }}
- ports:
- - containerPort: {{ .Values.network.port }}
- {{- if .Values.healthcheck }}
- livenessProbe:
-{{ toYaml .Values.livenessProbe | indent 10 }}
- readinessProbe:
-{{ toYaml .Values.readinessProbe | indent 10 }}
- {{- end }}
-
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: nodebb-config-json
-data:
- config.json: |-
- {
- "url": "{{ .Values.nodebb_url }}",
- "secret": "100101",
- "database": "redis",
- "port": "4567",
- "redis": {
- "host": "{{ .Values.redis_nodebb_host }}",
- "port": 6379,
- "username": "",
- "password": "",
- "database": "0"
- }
- }
-
----
-apiVersion: v1
-kind: Service
-metadata:
- name: {{ .Chart.Name }}-service
- namespace: {{ .Values.namespace }}
- labels:
- app: {{ .Chart.Name }}
-spec:
- ports:
- - name: http-{{ .Chart.Name }}
- protocol: TCP
- port: {{ .Values.network.port }}
- selector:
- app: {{ .Chart.Name }}
diff --git a/kubernetes/helm_charts/core/nodebb/values.j2 b/kubernetes/helm_charts/core/nodebb/values.j2
deleted file mode 100644
index b5cbc5fd9..000000000
--- a/kubernetes/helm_charts/core/nodebb/values.j2
+++ /dev/null
@@ -1,27 +0,0 @@
-#jinja2:lstrip_blocks: True
-
-### Default variable file for nodebb-service ###
-
-namespace: {{ namespace }}
-imagepullsecrets: {{ imagepullsecrets }}
-dockerhub: {{ dockerhub }}
-
-replicaCount: {{nodebb_replicacount|default(1)}}
-repository: {{nodebb_repository|default('nodebb')}}
-image_tag: {{ image_tag }}
-resources:
- requests:
- cpu: {{nodebb_cpu_req|default('50m')}}
- memory: {{nodebb_mem_req|default('50Mi')}}
- limits:
- cpu: {{nodebb_cpu_limit|default('1')}}
- memory: {{nodebb_mem_limit|default('1024Mi')}}
-network:
- port: 4567
-strategy:
- type: RollingUpdate
- maxsurge: {{ nodebb_maxsurge|default('25%') }}
- maxunavailable: {{ nodebb_maxunavailable|default('25%') }}
-
-nodebb_url: {{ sunbird_nodebb_url }}
-redis_nodebb_host: {{ redis_nodebb_host }}
diff --git a/kubernetes/helm_charts/core/notification/Chart.yaml b/kubernetes/helm_charts/core/notification/Chart.yaml
deleted file mode 100644
index e4f958f07..000000000
--- a/kubernetes/helm_charts/core/notification/Chart.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-apiVersion: v1
-appVersion: "1.0"
-description: A Helm chart for Kubernetes
-name: notification
-version: 0.1.0
diff --git a/kubernetes/helm_charts/core/notification/templates/configmap.yaml b/kubernetes/helm_charts/core/notification/templates/configmap.yaml
deleted file mode 100644
index 2ebdaf39b..000000000
--- a/kubernetes/helm_charts/core/notification/templates/configmap.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-#apiVersion: v1
-#data:
-# {{- range $key, $val := .Values.notificationenv }}
-# {{ $key }}: {{ $val }}
-# {{- end }}
-#kind: ConfigMap
-#metadata:
-# creationTimestamp: null
-# name: {{ .Chart.Name }}-config
-# namespace: {{ .Values.namespace }}
diff --git a/kubernetes/helm_charts/core/notification/templates/deployment.yaml b/kubernetes/helm_charts/core/notification/templates/deployment.yaml
deleted file mode 100644
index a82590540..000000000
--- a/kubernetes/helm_charts/core/notification/templates/deployment.yaml
+++ /dev/null
@@ -1,59 +0,0 @@
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- name: {{ .Chart.Name }}
- namespace: {{ .Values.namespace }}
- annotations:
- reloader.stakater.com/auto: "true"
-spec:
- replicas: {{ .Values.replicaCount }}
- strategy:
- rollingUpdate:
- maxSurge: {{ .Values.strategy.maxsurge }}
- maxUnavailable: {{ .Values.strategy.maxunavailable }}
- selector:
- matchLabels:
- app: {{ .Chart.Name }}
- template:
- metadata:
- labels:
- app: {{ .Chart.Name }}
- spec:
-{{- if .Values.imagepullsecrets }}
- imagePullSecrets:
- - name: {{ .Values.imagepullsecrets }}
-{{- end }}
- containers:
- - name: {{ .Chart.Name }}
- image: "{{ .Values.dockerhub }}/{{ .Values.repository }}:{{ .Values.image_tag }}"
- imagePullPolicy: Always
- envFrom:
- - configMapRef:
- name: {{ .Chart.Name }}-config
- resources:
-{{ toYaml .Values.resources | indent 10 }}
- ports:
- - containerPort: {{ .Values.network.port }}
- {{- if .Values.healthcheck }}
- livenessProbe:
-{{ toYaml .Values.livenessProbe | indent 10 }}
- readinessProbe:
-{{ toYaml .Values.readinessProbe | indent 10 }}
- {{- end }}
-
----
-apiVersion: v1
-kind: Service
-metadata:
- name: {{ .Chart.Name }}-service
- namespace: {{ .Values.namespace }}
- labels:
- app: {{ .Chart.Name }}
-spec:
- ports:
- - name: http-{{ .Chart.Name }}
- protocol: TCP
- port: {{ .Values.network.targetport }}
- selector:
- app: {{ .Chart.Name }}
diff --git a/kubernetes/helm_charts/core/notification/values.j2 b/kubernetes/helm_charts/core/notification/values.j2
deleted file mode 100644
index a37b1c8d7..000000000
--- a/kubernetes/helm_charts/core/notification/values.j2
+++ /dev/null
@@ -1,65 +0,0 @@
-### Default variable file for enc-service ###
-
-namespace: {{ namespace }}
-imagepullsecrets: {{ imagepullsecrets }}
-dockerhub: {{ dockerhub }}
-
-replicaCount: {{notification_replicacount|default(1)}}
-repository: {{notification_repository|default('notification_service')}}
-image_tag: {{ image_tag }}
-resources:
- requests:
- cpu: {{notification_cpu_req|default('50m')}}
- memory: {{notification_mem_req|default('50Mi')}}
- limits:
- cpu: {{notification_cpu_limit|default('1')}}
- memory: {{notification_mem_limit|default('500Mi')}}
-network:
- port: 9012
- targetport: 9000
-strategy:
- type: RollingUpdate
- maxsurge: {{ notification_maxsurge|default('25%') }}
- maxunavailable: {{ notification_maxunavailable|default('25%') }}
-
-notification:
- readinessprobe:
- enabled: true
- livenessprobe:
- enabled: true
- readinessProbe:
- httpGet:
- path: /health
- port: 9000
- initialDelaySeconds: 30
- periodSeconds: 10
- timeoutSeconds: 5
- failureThreshold: 5
- successThreshold: 1
- livenessProbe:
- httpGet:
- path: /service/health
- port: 9000
- initialDelaySeconds: 60
- periodSeconds: 10
-
-notification:
- readinessprobe:
- enabled: true
- livenessprobe:
- enabled: true
- readinessProbe:
- httpGet:
- path: /health
- port: 9000
- initialDelaySeconds: 30
- periodSeconds: 10
- timeoutSeconds: 5
- failureThreshold: 5
- successThreshold: 1
- livenessProbe:
- httpGet:
- path: /service/health
- port: 9000
- initialDelaySeconds: 60
- periodSeconds: 10
diff --git a/kubernetes/helm_charts/core/opensaber/templates/deployment.yaml b/kubernetes/helm_charts/core/opensaber/templates/deployment.yaml
index 13c47c4b8..374662b7f 100644
--- a/kubernetes/helm_charts/core/opensaber/templates/deployment.yaml
+++ b/kubernetes/helm_charts/core/opensaber/templates/deployment.yaml
@@ -31,6 +31,9 @@ spec:
envFrom:
- configMapRef:
name: {{ .Chart.Name }}-config
+ env:
+ - name: _JAVA_OPTIONS
+ value: -Dlog4j2.formatMsgNoLookups=true
resources:
{{ toYaml .Values.resources | indent 10 }}
ports:
diff --git a/kubernetes/helm_charts/core/report/Chart.yaml b/kubernetes/helm_charts/core/report/Chart.yaml
deleted file mode 100644
index 3ef91a05f..000000000
--- a/kubernetes/helm_charts/core/report/Chart.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-apiVersion: v1
-appVersion: "1.0"
-description: A Helm chart for Kubernetes
-name: report
-version: 0.1.0
diff --git a/kubernetes/helm_charts/core/report/templates/_helpers.tpl b/kubernetes/helm_charts/core/report/templates/_helpers.tpl
deleted file mode 100644
index 590205843..000000000
--- a/kubernetes/helm_charts/core/report/templates/_helpers.tpl
+++ /dev/null
@@ -1,45 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "telemetry.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 "telemetry.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 "telemetry.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Common labels
-*/}}
-{{- define "telemetry.labels" -}}
-app.kubernetes.io/name: {{ include "telemetry.name" . }}
-helm.sh/chart: {{ include "telemetry.chart" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-{{- if .Chart.AppVersion }}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-{{- end }}
-app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- end -}}
diff --git a/kubernetes/helm_charts/core/report/templates/configmap.yaml b/kubernetes/helm_charts/core/report/templates/configmap.yaml
deleted file mode 100644
index 00fdbaa0c..000000000
--- a/kubernetes/helm_charts/core/report/templates/configmap.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-#apiVersion: v1
-#data:
-# {{- range $key, $val := .Values.telemetryenv }}
-# {{ $key }}: {{ $val }}
-# {{- end }}
-#kind: ConfigMap
-#metadata:
-# creationTimestamp: null
-# name: {{ .Chart.Name }}-config
-# namespace: {{ .Values.namespace }}
diff --git a/kubernetes/helm_charts/core/report/templates/deployment.yaml b/kubernetes/helm_charts/core/report/templates/deployment.yaml
deleted file mode 100644
index a82590540..000000000
--- a/kubernetes/helm_charts/core/report/templates/deployment.yaml
+++ /dev/null
@@ -1,59 +0,0 @@
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- name: {{ .Chart.Name }}
- namespace: {{ .Values.namespace }}
- annotations:
- reloader.stakater.com/auto: "true"
-spec:
- replicas: {{ .Values.replicaCount }}
- strategy:
- rollingUpdate:
- maxSurge: {{ .Values.strategy.maxsurge }}
- maxUnavailable: {{ .Values.strategy.maxunavailable }}
- selector:
- matchLabels:
- app: {{ .Chart.Name }}
- template:
- metadata:
- labels:
- app: {{ .Chart.Name }}
- spec:
-{{- if .Values.imagepullsecrets }}
- imagePullSecrets:
- - name: {{ .Values.imagepullsecrets }}
-{{- end }}
- containers:
- - name: {{ .Chart.Name }}
- image: "{{ .Values.dockerhub }}/{{ .Values.repository }}:{{ .Values.image_tag }}"
- imagePullPolicy: Always
- envFrom:
- - configMapRef:
- name: {{ .Chart.Name }}-config
- resources:
-{{ toYaml .Values.resources | indent 10 }}
- ports:
- - containerPort: {{ .Values.network.port }}
- {{- if .Values.healthcheck }}
- livenessProbe:
-{{ toYaml .Values.livenessProbe | indent 10 }}
- readinessProbe:
-{{ toYaml .Values.readinessProbe | indent 10 }}
- {{- end }}
-
----
-apiVersion: v1
-kind: Service
-metadata:
- name: {{ .Chart.Name }}-service
- namespace: {{ .Values.namespace }}
- labels:
- app: {{ .Chart.Name }}
-spec:
- ports:
- - name: http-{{ .Chart.Name }}
- protocol: TCP
- port: {{ .Values.network.targetport }}
- selector:
- app: {{ .Chart.Name }}
diff --git a/kubernetes/helm_charts/core/report/values.j2 b/kubernetes/helm_charts/core/report/values.j2
deleted file mode 100644
index d4c73485c..000000000
--- a/kubernetes/helm_charts/core/report/values.j2
+++ /dev/null
@@ -1,26 +0,0 @@
-
-### variables for report service ###
-
-namespace: {{ namespace }}
-imagepullsecrets: {{ imagepullsecrets }}
-dockerhub: {{ dockerhub }}
-
-replicaCount: {{report_replicacount|default(1)}}
-repository: {{report_repository|default('report-service')}}
-image_tag: {{ image_tag }}
-resources:
- requests:
- cpu: {{report_cpu_req|default('100m')}}
- memory: {{report_mem_req|default('100Mi')}}
- limits:
- cpu: {{report_cpu_limit|default('1')}}
- memory: {{report_mem_limit|default('1024Mi')}}
-network:
- port: 3030
- targetport: 3030
-strategy:
- type: RollingUpdate
- maxsurge: {{ report_maxsurge|default('25%') }}
- maxunavailable: {{ report_maxunavailable|default('25%') }}
-
-{{ report_liveness_readiness | to_nice_yaml }}
diff --git a/kubernetes/helm_charts/core/search/templates/deployment.yaml b/kubernetes/helm_charts/core/search/templates/deployment.yaml
index 34293c1af..a41ce6cad 100644
--- a/kubernetes/helm_charts/core/search/templates/deployment.yaml
+++ b/kubernetes/helm_charts/core/search/templates/deployment.yaml
@@ -38,6 +38,8 @@ spec:
env:
- name: JAVA_OPTIONS
value: {{ .Values.env.javaoptions | quote }}
+ - name: _JAVA_OPTIONS
+ value: -Dlog4j2.formatMsgNoLookups=true
envFrom:
- configMapRef:
name: {{ .Chart.Name }}-config
diff --git a/kubernetes/helm_charts/core/taxonomy/templates/deployment.yaml b/kubernetes/helm_charts/core/taxonomy/templates/deployment.yaml
index 6c45087c0..1461b6e1f 100644
--- a/kubernetes/helm_charts/core/taxonomy/templates/deployment.yaml
+++ b/kubernetes/helm_charts/core/taxonomy/templates/deployment.yaml
@@ -38,6 +38,8 @@ spec:
env:
- name: JAVA_OPTIONS
value: {{ .Values.env.javaoptions | quote }}
+ - name: _JAVA_OPTIONS
+ value: -Dlog4j2.formatMsgNoLookups=true
envFrom:
- configMapRef:
name: {{ .Chart.Name }}-config
diff --git a/kubernetes/helm_charts/core/telemetry-dp-logstash/Chart.yaml b/kubernetes/helm_charts/core/telemetry-dp-logstash/Chart.yaml
deleted file mode 100644
index 3760b5476..000000000
--- a/kubernetes/helm_charts/core/telemetry-dp-logstash/Chart.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-apiVersion: v1
-appVersion: "1.0"
-description: A Helm chart for Kubernetes
-name: telemetry-logstash-dock
-version: 0.1.0
diff --git a/kubernetes/helm_charts/core/telemetry-dp-logstash/templates/deployment.yaml b/kubernetes/helm_charts/core/telemetry-dp-logstash/templates/deployment.yaml
deleted file mode 100644
index 6f584f7d2..000000000
--- a/kubernetes/helm_charts/core/telemetry-dp-logstash/templates/deployment.yaml
+++ /dev/null
@@ -1,66 +0,0 @@
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- name: {{ .Release.Name }}
- namespace: {{ .Values.namespace }}
- annotations:
- reloader.stakater.com/auto: "true"
-spec:
- replicas: {{ .Values.replicaCount }}
- strategy:
- rollingUpdate:
- maxSurge: {{ .Values.strategy.maxsurge }}
- maxUnavailable: {{ .Values.strategy.maxunavailable }}
- selector:
- matchLabels:
- app: {{ .Release.Name }}
- template:
- metadata:
- labels:
- app: {{ .Release.Name }}
- spec:
-{{- if .Values.imagepullsecrets }}
- imagePullSecrets:
- - name: {{ .Values.imagepullsecrets }}
-{{- end }}
- volumes:
- - name: {{ .Release.Name }}-config
- configMap:
- name: {{ .Release.Name }}-config
- containers:
- - name: {{ .Release.Name }}
- image: "{{ .Values.dockerhub }}/{{ .Values.repository }}:{{ .Values.image_tag }}"
- imagePullPolicy: Always
- envFrom:
- - configMapRef:
- name: {{ .Release.Name }}-config
- resources:
-{{ toYaml .Values.resources | indent 10 }}
- ports:
- - containerPort: {{ .Values.network.port }}
- {{- if .Values.healthcheck }}
- livenessProbe:
-{{ toYaml .Values.livenessProbe | indent 10 }}
- readinessProbe:
-{{ toYaml .Values.readinessProbe | indent 10 }}
- {{- end }}
- volumeMounts:
- - name: {{ .Release.Name }}-config
- mountPath: /etc/telemetry-logstash.conf
-
----
-apiVersion: v1
-kind: Service
-metadata:
- name: {{ .Release.Name }}-service
- namespace: {{ .Values.namespace }}
- labels:
- app: {{ .Release.Name }}
-spec:
- ports:
- - name: http-{{ .Release.Name }}
- protocol: TCP
- port: {{ .Values.network.targetport }}
- selector:
- app: {{ .Release.Name }}
diff --git a/kubernetes/helm_charts/core/telemetry-dp-logstash/values.j2 b/kubernetes/helm_charts/core/telemetry-dp-logstash/values.j2
deleted file mode 100644
index d6e104f35..000000000
--- a/kubernetes/helm_charts/core/telemetry-dp-logstash/values.j2
+++ /dev/null
@@ -1,23 +0,0 @@
-### Default variable file for cert-service ###
-
-namespace: {{ namespace }}
-imagepullsecrets: {{ imagepullsecrets }}
-dockerhub: sunbird
-
-replicaCount: {{telemetry_logstash_replicacount|default(1)}}
-repository: 'telemetry_logstash'
-image_tag: 5.6-alpine
-resources:
- requests:
- cpu: {{telemetry_logstash_cpu_req|default('100m')}}
- memory: {{telemetry_logstash_mem_req|default('100Mi')}}
- limits:
- cpu: {{telemetry_logstash_cpu_limit|default('1')}}
- memory: {{telemetry_logstash_mem_limit|default('1024Mi')}}
-network:
- port: 5044
- targetport: 5044
-strategy:
- type: RollingUpdate
- maxsurge: {{ telemetry_logstash_maxsurge|default('25%') }}
- maxunavailable: {{ telemetry_logstash_maxunavailable|default('25%') }}
diff --git a/kubernetes/helm_charts/core/telemetry-logstash-dock/templates/deployment.yaml b/kubernetes/helm_charts/core/telemetry-logstash-dock/templates/deployment.yaml
index cedc0aa4b..d1abb281b 100644
--- a/kubernetes/helm_charts/core/telemetry-logstash-dock/templates/deployment.yaml
+++ b/kubernetes/helm_charts/core/telemetry-logstash-dock/templates/deployment.yaml
@@ -35,6 +35,9 @@ spec:
envFrom:
- configMapRef:
name: {{ .Release.Name }}-config
+ env:
+ - name: _JAVA_OPTIONS
+ value: -Dlog4j2.formatMsgNoLookups=true
resources:
{{ toYaml .Values.resources | indent 10 }}
ports:
diff --git a/kubernetes/helm_charts/core/telemetrydplogstash/values.j2 b/kubernetes/helm_charts/core/telemetrydplogstash/values.j2
deleted file mode 100644
index d6e104f35..000000000
--- a/kubernetes/helm_charts/core/telemetrydplogstash/values.j2
+++ /dev/null
@@ -1,23 +0,0 @@
-### Default variable file for cert-service ###
-
-namespace: {{ namespace }}
-imagepullsecrets: {{ imagepullsecrets }}
-dockerhub: sunbird
-
-replicaCount: {{telemetry_logstash_replicacount|default(1)}}
-repository: 'telemetry_logstash'
-image_tag: 5.6-alpine
-resources:
- requests:
- cpu: {{telemetry_logstash_cpu_req|default('100m')}}
- memory: {{telemetry_logstash_mem_req|default('100Mi')}}
- limits:
- cpu: {{telemetry_logstash_cpu_limit|default('1')}}
- memory: {{telemetry_logstash_mem_limit|default('1024Mi')}}
-network:
- port: 5044
- targetport: 5044
-strategy:
- type: RollingUpdate
- maxsurge: {{ telemetry_logstash_maxsurge|default('25%') }}
- maxunavailable: {{ telemetry_logstash_maxunavailable|default('25%') }}
diff --git a/kubernetes/helm_charts/core/userorg/Chart.yaml b/kubernetes/helm_charts/core/userorg/Chart.yaml
deleted file mode 100644
index c7c993ab6..000000000
--- a/kubernetes/helm_charts/core/userorg/Chart.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-apiVersion: v1
-appVersion: "1.0"
-description: A Helm chart for Kubernetes
-name: userorg
-version: 0.1.0
diff --git a/kubernetes/helm_charts/core/userorg/templates/configmap.yaml b/kubernetes/helm_charts/core/userorg/templates/configmap.yaml
deleted file mode 100644
index 94fd443c7..000000000
--- a/kubernetes/helm_charts/core/userorg/templates/configmap.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-#apiVersion: v1
-#data:
-# {{- range $key, $val := .Values.userorgenv }}
-# {{ $key }}: {{ $val }}
-# {{- end }}
-#kind: ConfigMap
-#metadata:
-# creationTimestamp: null
-# name: {{ .Chart.Name }}-config
-# namespace: {{ .Values.namespace }}
diff --git a/kubernetes/helm_charts/core/userorg/templates/deployment.yaml b/kubernetes/helm_charts/core/userorg/templates/deployment.yaml
deleted file mode 100644
index d3f83edaf..000000000
--- a/kubernetes/helm_charts/core/userorg/templates/deployment.yaml
+++ /dev/null
@@ -1,59 +0,0 @@
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- name: {{ .Chart.Name }}
- namespace: {{ .Values.namespace }}
- annotations:
- reloader.stakater.com/auto: "true"
-spec:
- replicas: {{ .Values.replicaCount }}
- strategy:
- rollingUpdate:
- maxSurge: {{ .Values.strategy.maxsurge }}
- maxUnavailable: {{ .Values.strategy.maxunavailable }}
- selector:
- matchLabels:
- app: {{ .Chart.Name }}
- template:
- metadata:
- labels:
- app: {{ .Chart.Name }}
- spec:
-{{- if .Values.imagepullsecrets }}
- imagePullSecrets:
- - name: {{ .Values.imagepullsecrets }}
-{{- end }}
- containers:
- - name: {{ .Chart.Name }}
- image: "{{ .Values.dockerhub }}/{{ .Values.repository }}:{{ .Values.image_tag }}"
- imagePullPolicy: Always
- envFrom:
- - configMapRef:
- name: {{ .Chart.Name }}-config
- resources:
-{{ toYaml .Values.resources | indent 10 }}
- ports:
- - containerPort: {{ .Values.network.port }}
- {{- if .Values.healthcheck }}
- livenessProbe:
-{{ toYaml .Values.livenessProbe | indent 10 }}
- readinessProbe:
-{{ toYaml .Values.readinessProbe | indent 10 }}
- {{- end }}
-
----
-apiVersion: v1
-kind: Service
-metadata:
- name: user-org-service
- namespace: {{ .Values.namespace }}
- labels:
- app: {{ .Chart.Name }}
-spec:
- ports:
- - name: http-{{ .Chart.Name }}
- protocol: TCP
- port: {{ .Values.network.targetport }}
- selector:
- app: {{ .Chart.Name }}
diff --git a/kubernetes/helm_charts/core/userorg/values.j2 b/kubernetes/helm_charts/core/userorg/values.j2
deleted file mode 100644
index 6508b4d13..000000000
--- a/kubernetes/helm_charts/core/userorg/values.j2
+++ /dev/null
@@ -1,25 +0,0 @@
-### Default variable file for userorg-service ###
-
-namespace: {{ namespace }}
-imagepullsecrets: {{ imagepullsecrets }}
-dockerhub: {{ dockerhub }}
-
-replicaCount: {{userorg_replicacount|default(1)}}
-repository: {{userorg_repository|default('user_org_service')}}
-image_tag: {{ image_tag }}
-resources:
- requests:
- cpu: {{userorg_cpu_req|default('100m')}}
- memory: {{userorg_mem_req|default('100Mi')}}
- limits:
- cpu: {{userorg_cpu_limit|default('1')}}
- memory: {{userorg_mem_limit|default('1024Mi')}}
-network:
- port: 9008
- targetport: 9000
-strategy:
- type: RollingUpdate
- maxsurge: {{ userorg_maxsurge|default('25%') }}
- maxunavailable: {{ userorg_maxunavailable|default('25%') }}
-
-{{ userorg_liveness_readiness | to_nice_yaml }}
--
GitLab