From cbecf8b936293ba3e154bab0fa3ad6e4cb662da0 Mon Sep 17 00:00:00 2001
From: Rajesh <rjshrjndrn@gmail.com>
Date: Sat, 23 Nov 2019 16:00:07 +0000
Subject: [PATCH] Adding proper variable structure for images
---
3node/helm-charts/adminutil/values.j2 | 6 +++---
3node/helm-charts/apimanager/values.j2 | 4 ++--
3node/helm-charts/badger/values.j2 | 6 +++---
3node/helm-charts/cert/values.j2 | 4 ++--
3node/helm-charts/content/values.j2 | 6 +++---
3node/helm-charts/learner/values.j2 | 4 ++--
3node/helm-charts/lms/values.j2 | 4 ++--
3node/helm-charts/notification/values.j2 | 4 ++--
3node/helm-charts/telemetry/values.j2 | 4 ++--
3node/helm-charts/userorg/values.j2 | 6 +++---
private_repo/ansible/inventory/dev/Core/common.yml | 3 +--
11 files changed, 25 insertions(+), 26 deletions(-)
diff --git a/3node/helm-charts/adminutil/values.j2 b/3node/helm-charts/adminutil/values.j2
index 4c9de7e6d..5475262e8 100644
--- a/3node/helm-charts/adminutil/values.j2
+++ b/3node/helm-charts/adminutil/values.j2
@@ -5,8 +5,8 @@ imagepullsecrets: {{ imagepullsecrets }}
dockerhub: {{ dockerhub }}
replicaCount: {{replicacount|default(1)}}
-repository: {{cert_repository|default('adminutil')}}
-image_tag: {{image_tag }}
+repository: {{adminutil.repository|default('adminutil')}}
+image_tag: {{adminutil.image_tag }}
resources:
cpu: {{adminutil_service_cpu|default('50m')}}
memory: {{adminutil_service_memory|default('50Mi')}}
@@ -27,4 +27,4 @@ adminutilenv:
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')}}"'
\ No newline at end of file
+ ENDPOINTS_METRICS_SENSITIVE: '"{{adminutil__is_metrics_sensitive|default('false')}}"'
diff --git a/3node/helm-charts/apimanager/values.j2 b/3node/helm-charts/apimanager/values.j2
index 164a7dce6..573f09cce 100755
--- a/3node/helm-charts/apimanager/values.j2
+++ b/3node/helm-charts/apimanager/values.j2
@@ -5,8 +5,8 @@ imagepullsecrets: {{ imagepullsecrets }}
dockerhub: {{ dockerhub }}
replicaCount: {{replicacount|default(1)}}
-repository: {{kong_repository|default('kong')}}
-image_tag: {{api_manager.image_tag }}
+repository: {{apimanager.repository|default('kong')}}
+image_tag: {{apimanager.image_tag }}
resources:
cpu: {{api_manager_cpu|default('50m')}}
memory: {{api_manager_memory|default('50Mi')}}
diff --git a/3node/helm-charts/badger/values.j2 b/3node/helm-charts/badger/values.j2
index 9ff1a552a..6179fa1c6 100755
--- a/3node/helm-charts/badger/values.j2
+++ b/3node/helm-charts/badger/values.j2
@@ -5,8 +5,8 @@ imagepullsecrets: {{ imagepullsecrets }}
dockerhub: {{ dockerhub }}
replicaCount: {{replicacount|default(1)}}
-repository: {{cert_repository|default('badger')}}
-image_tag: {{image_tag }}
+repository: {{badger.repository|default('badger')}}
+image_tag: {{badger.image_tag }}
resources:
cpu: {{badger_service_cpu|default('50m')}}
memory: {{badger_service_memory|default('50Mi')}}
@@ -16,4 +16,4 @@ network:
strategy:
type: RollingUpdate
maxsurge: 1
- maxunavailable: 0
\ No newline at end of file
+ maxunavailable: 0
diff --git a/3node/helm-charts/cert/values.j2 b/3node/helm-charts/cert/values.j2
index d3acf12b4..d15c1f1f2 100644
--- a/3node/helm-charts/cert/values.j2
+++ b/3node/helm-charts/cert/values.j2
@@ -5,8 +5,8 @@ imagepullsecrets: {{ imagepullsecrets }}
dockerhub: {{ dockerhub }}
replicaCount: {{replicacount|default(1)}}
-repository: {{cert_repository|default('cert_service')}}
-image_tag: {{image_tag }}
+repository: {{cert.repository|default('cert_service')}}
+image_tag: {{cert.image_tag }}
resources:
cpu: {{cert_service_cpu|default('50m')}}
memory: {{cert_service_memory|default('50Mi')}}
diff --git a/3node/helm-charts/content/values.j2 b/3node/helm-charts/content/values.j2
index 27d5bfca8..f80c48da1 100644
--- a/3node/helm-charts/content/values.j2
+++ b/3node/helm-charts/content/values.j2
@@ -5,8 +5,8 @@ imagepullsecrets: {{ imagepullsecrets }}
dockerhub: {{ dockerhub }}
replicaCount: {{replicacount|default(1)}}
-repository: {{content_repository|default('content-service')}}
-image_tag: {{ image_tag }}
+repository: {{content.repository|default('content-service')}}
+image_tag: {{ content.image_tag }}
resources:
cpu: {{content_service_cpu|default('50m')}}
memory: {{content_service_memory|default('50Mi')}}
@@ -72,4 +72,4 @@ sunbird_cassandra_consistency_level: quorum
sunbird_cassandra_consistency_level: {{sunbird_cassandra_consistency_level}}
{% endif %}
-sunbird_cassandra_replication_strategy: '{{sunbird_cassandra_replication_strategy}}'
\ No newline at end of file
+sunbird_cassandra_replication_strategy: '{{sunbird_cassandra_replication_strategy}}'
diff --git a/3node/helm-charts/learner/values.j2 b/3node/helm-charts/learner/values.j2
index 63a264f88..442a12010 100644
--- a/3node/helm-charts/learner/values.j2
+++ b/3node/helm-charts/learner/values.j2
@@ -6,8 +6,8 @@ imagepullsecrets: {{ imagepullsecrets }}
dockerhub: {{ dockerhub }}
replicaCount: {{replicacount|default(1)}}
-repository: {{learner_repository|default('learner_service')}}
-image_tag: {{image_tag }}
+repository: {{learner.repository|default('learner_service')}}
+image_tag: {{learner.image_tag }}
resources:
cpu: {{learner_service_cpu|default('50m')}}
memory: {{learner_service_memory|default('50Mi')}}
diff --git a/3node/helm-charts/lms/values.j2 b/3node/helm-charts/lms/values.j2
index e6c749cc6..718a3dc8d 100644
--- a/3node/helm-charts/lms/values.j2
+++ b/3node/helm-charts/lms/values.j2
@@ -5,8 +5,8 @@ imagepullsecrets: {{ imagepullsecrets }}
dockerhub: {{ dockerhub }}
replicaCount: {{replicacount|default(1)}}
-repository: {{lms_repository|default('lms_service')}}
-image_tag: {{image_tag }}
+repository: {{lms.repository|default('lms_service')}}
+image_tag: {{lms.image_tag }}
resources:
cpu: {{lms_service_cpu|default('50m')}}
memory: {{lms_service_memory|default('50Mi')}}
diff --git a/3node/helm-charts/notification/values.j2 b/3node/helm-charts/notification/values.j2
index 1dc63d7a8..7514ac3f0 100644
--- a/3node/helm-charts/notification/values.j2
+++ b/3node/helm-charts/notification/values.j2
@@ -5,8 +5,8 @@ imagepullsecrets: {{ imagepullsecrets }}
dockerhub: {{ dockerhub }}
replicaCount: {{replicacount|default(1)}}
-repository: {{notification_repository|default('notification_service')}}
-image_tag: {{image_tag }}
+repository: {{notification.repository|default('notification_service')}}
+image_tag: {{ notification.image_tag }}
resources:
cpu: {{notification_service_cpu|default('50m')}}
memory: {{notification_service_memory|default('50Mi')}}
diff --git a/3node/helm-charts/telemetry/values.j2 b/3node/helm-charts/telemetry/values.j2
index 62873a07d..d001ef5b8 100644
--- a/3node/helm-charts/telemetry/values.j2
+++ b/3node/helm-charts/telemetry/values.j2
@@ -6,8 +6,8 @@ imagepullsecrets: {{ imagepullsecrets }}
dockerhub: {{ dockerhub }}
replicaCount: {{replicacount|default(1)}}
-repository: {{telemetry_repository|default('telemetry-service')}}
-image_tag: {{image_tag }}
+repository: {{telemetry.repository|default('telemetry-service')}}
+image_tag: {{ telemetry.image_tag }}
resources:
cpu: {{telemetry_service_cpu|default('50m')}}
memory: {{telemetry_service_memory|default('50Mi')}}
diff --git a/3node/helm-charts/userorg/values.j2 b/3node/helm-charts/userorg/values.j2
index f03089574..9e0fb939e 100644
--- a/3node/helm-charts/userorg/values.j2
+++ b/3node/helm-charts/userorg/values.j2
@@ -5,8 +5,8 @@ imagepullsecrets: {{ imagepullsecrets }}
dockerhub: {{ dockerhub }}
replicaCount: {{replicacount|default(1)}}
-repository: {{userorg_repository|default('user_org_service')}}
-image_tag: {{image_tag }}
+repository: {{userorg.repository|default('user_org_service')}}
+image_tag: {{userorg.image_tag }}
resources:
cpu: {{userorg_service_cpu|default('50m')}}
memory: {{userorg_service_memory|default('50Mi')}}
@@ -37,4 +37,4 @@ userorgenv:
database_connectionInfo_2_password: {{user_org_database_connectionInfo_2_password}}
database_connectionInfo_2_uri: {{user_org_database_connectionInfo_2_uri}}
-
\ No newline at end of file
+
diff --git a/private_repo/ansible/inventory/dev/Core/common.yml b/private_repo/ansible/inventory/dev/Core/common.yml
index 5abdbe166..a0516652c 100644
--- a/private_repo/ansible/inventory/dev/Core/common.yml
+++ b/private_repo/ansible/inventory/dev/Core/common.yml
@@ -67,7 +67,7 @@ namespace: "{{env}}"
imagepullsecrets: ''
dockerhub: "sunbird"
kubeconfig_path: "/etc/rancher/k3s/k3s.yaml"
-api_manager:
+apimanager:
image_tag: 1.8.0-gold
player:
image_tag: release-2.4.0
@@ -80,7 +80,6 @@ learner:
telemetry:
image_tag: release-2.1.0
userorg:
- image_tag:
lms:
notification:
cert:
--
GitLab