From 5758bc06171786f15e98255a2857bd653c444bbf Mon Sep 17 00:00:00 2001
From: G33tha <geetha.p@optit.co>
Date: Wed, 27 Nov 2019 10:39:37 +0530
Subject: [PATCH] Issue #000 feat: added cert registry helm charts

---
 .../helm_charts/core/certregistry/Chart.yaml  |  5 ++
 .../certregistry/templates/configmap.yaml     | 11 ++++
 .../certregistry/templates/deployment.yaml    | 52 +++++++++++++++++++
 .../helm_charts/core/certregistry/values.j2   | 31 +++++++++++
 kubernetes/helm_charts/core/player/values.j2  |  4 +-
 5 files changed, 101 insertions(+), 2 deletions(-)
 create mode 100644 kubernetes/helm_charts/core/certregistry/Chart.yaml
 create mode 100644 kubernetes/helm_charts/core/certregistry/templates/configmap.yaml
 create mode 100644 kubernetes/helm_charts/core/certregistry/templates/deployment.yaml
 create mode 100644 kubernetes/helm_charts/core/certregistry/values.j2

diff --git a/kubernetes/helm_charts/core/certregistry/Chart.yaml b/kubernetes/helm_charts/core/certregistry/Chart.yaml
new file mode 100644
index 000000000..7e55b46ee
--- /dev/null
+++ b/kubernetes/helm_charts/core/certregistry/Chart.yaml
@@ -0,0 +1,5 @@
+apiVersion: v1
+appVersion: "1.0"
+description: A Helm chart for Kubernetes
+name: certregistry
+version: 0.1.0
diff --git a/kubernetes/helm_charts/core/certregistry/templates/configmap.yaml b/kubernetes/helm_charts/core/certregistry/templates/configmap.yaml
new file mode 100644
index 000000000..26d83cf0a
--- /dev/null
+++ b/kubernetes/helm_charts/core/certregistry/templates/configmap.yaml
@@ -0,0 +1,11 @@
+apiVersion: v1
+data:
+  {{- range $key, $val := .Values.certregistryenv }}
+  {{ $key }}: {{ $val }}
+  {{- end }}
+kind: ConfigMap
+metadata:
+  creationTimestamp: null
+  name: {{ .Chart.Name }}-config
+  namespace: {{ .Values.namespace }}
+
diff --git a/kubernetes/helm_charts/core/certregistry/templates/deployment.yaml b/kubernetes/helm_charts/core/certregistry/templates/deployment.yaml
new file mode 100644
index 000000000..405e85784
--- /dev/null
+++ b/kubernetes/helm_charts/core/certregistry/templates/deployment.yaml
@@ -0,0 +1,52 @@
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ .Chart.Name }}
+  namespace: {{ .Values.namespace }}
+spec:
+  replicas: {{ .Values.replicaCount }}
+  strategy:
+     type: {{ .Values.strategy.type }}
+     rollingUpdate:
+       maxsurge: {{ .Values.strategy.maxsurge }}
+       maxUnavailable: {{ .Values.strategy.maxunavailable }}
+  selector:
+    matchLabels:
+      app: {{ .Chart.Name }}
+  template:
+    metadata:
+      annotations:
+        readiness.status.sidecar.istio.io/applicationPorts: ""
+        checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
+      labels:
+        app: {{ .Chart.Name }}
+    spec:
+      imagePullSecrets:
+      - name: {{ .Values.imagepullsecrets }}
+      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 }}
+
+---
+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/certregistry/values.j2 b/kubernetes/helm_charts/core/certregistry/values.j2
new file mode 100644
index 000000000..81138f4dd
--- /dev/null
+++ b/kubernetes/helm_charts/core/certregistry/values.j2
@@ -0,0 +1,31 @@
+### Default variable file for cert-registry-service ###
+
+namespace: {{ namespace }}
+imagepullsecrets: {{ imagepullsecrets }}
+dockerhub: {{ dockerhub }}
+
+replicaCount: {{certregistry_replicacount|default(1)}}
+repository: {{certregistry_repository|default('cert_registry_service')}}
+image_tag: {{image_tag }}
+resources:
+  requests:
+    cpu: {{certregistry_service_cpu_req|default('50m')}}
+    memory: {{certregistry_service_mem_req|default('50Mi')}}
+  limits:
+    cpu: {{certregistry_service_cpu_limit|default('1')}}
+    memory: {{certregistry_service_mem_limit|default('550Mi')}}
+network:
+  port: 9013
+  targetport: 9000
+strategy:
+  type: RollingUpdate
+  maxsurge: 1
+  maxunavailable: 0
+
+certregistryenv:
+  cert_service_base_url: {{sunbird_cert_service_url}}
+  sunbird_es_host: {{sunbird_es_host}}
+  sunbird_es_port: '"{{sunbird_es_port}}'"
+  
+  
+
diff --git a/kubernetes/helm_charts/core/player/values.j2 b/kubernetes/helm_charts/core/player/values.j2
index f52e268c7..daaad0bc8 100644
--- a/kubernetes/helm_charts/core/player/values.j2
+++ b/kubernetes/helm_charts/core/player/values.j2
@@ -26,8 +26,8 @@ sunbird_portal_player_cdn_enabled: "{{sunbird_portal_player_cdn_enabled}}"
 
 playerenv:
   sunbird_port: '"3000"'
-  sunbird_content_player_url: {{sunbird_apimanager_service_base_url}}
-  sunbird_learner_player_url: {{sunbird_apimanager_service_base_url}}
+  sunbird_content_player_url: {{sunbird_apimanager_service_base_url}}/
+  sunbird_learner_player_url: {{sunbird_apimanager_service_base_url}}/
   sunbird_content_proxy_url: {{sunbird_knowledge_mw_service_url}}
   sunbird_echo_api_url: {{sunbird_echo_api_url}}
   sunbird_autocreate_trampoline_user: '"false"'
-- 
GitLab