Merge pull request #666 from bhumi46/develop

[MOSIP-36477]updated keystorejob,role and rolebinding name
mosip · Oct 10, 2024 · c4cefa5 · c4cefa5
2 parents 5bc792f + af97305
commit c4cefa5
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 7 deletions.
diff --git a/deploy/install.sh b/deploy/install.sh
@@ -17,6 +17,12 @@ function installing_regclient() {
   kubectl label ns $NS istio-injection=enabled --overwrite
   helm repo update
 
+  read -p "Is values.yaml for data-archive chart set correctly as part of Pre-requisites?(Y/n) " yn
+  if [[ "$yn" != "Y" ]]; then
+    echo "ERROR: values.yaml not set correctly; EXITING."
+    exit 1
+  fi
+
   echo Copy configmaps
   sed -i 's/\r$//' copy_cm.sh
   ./copy_cm.sh
@@ -26,7 +32,7 @@ function installing_regclient() {
   HEALTH_URL=https://$INTERNAL_HOST/v1/syncdata/actuator/health
 
   echo Installing reg client downloader. This may take a few minutes ..
-  helm -n $NS install regclient mosip/regclient \
+  helm -n $NS install regclient mosip/regclient -f values.yaml \
     --set regclient.upgradeServerUrl=https://$REGCLIENT_HOST \
     --set regclient.healthCheckUrl=$HEALTH_URL \
     --set regclient.hostName=$INTERNAL_HOST \

diff --git a/deploy/values.yaml b/deploy/values.yaml
@@ -0,0 +1,6 @@
+regclient:
+  version: 1.2.1-SNAPSHOT
+image:
+  registry: docker.io
+  repository: mosipqa/registration-client
+  tag: develop
diff --git a/helm/regclient/templates/keystorejob.yaml b/helm/regclient/templates/keystorejob.yaml
@@ -1,7 +1,7 @@
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: "{{ .Values.job.name }}-{{ .Release.Namespace }}"
+  name: "{{ .Values.job.image.name }}-{{ .Release.Namespace }}"
   namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/managed-by: {{.Release.Service | quote }}

diff --git a/helm/regclient/templates/keystorerole.yaml b/helm/regclient/templates/keystorerole.yaml
@@ -2,7 +2,7 @@ kind: Role
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   namespace: {{ .Release.Namespace }}
-  name: "{{ .Values.job.rolename }}-{{ .Release.Namespace }}"
+  name: "{{ .Values.job.image.rolename }}-{{ .Release.Namespace }}"
   annotations:
     "helm.sh/hook": pre-install
     "helm.sh/hook-weight": "-4" #The Role will execute after the ServiceAccount

diff --git a/helm/regclient/templates/keystorerolebinding.yaml b/helm/regclient/templates/keystorerolebinding.yaml
@@ -1,7 +1,7 @@
 kind: RoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: "{{ .Values.job.rolebindingname }}-{{ .Release.Namespace }}"
+  name: "{{ .Values.job.image.rolebindingname }}-{{ .Release.Namespace }}"
   namespace: {{ .Release.Namespace }}
   annotations:
     "helm.sh/hook": pre-install

diff --git a/helm/regclient/values.yaml b/helm/regclient/values.yaml
@@ -97,7 +97,7 @@ startupProbe:
   initialDelaySeconds: 0
   periodSeconds: 30
   timeoutSeconds: 5
-  failureThreshold: 10
+  failureThreshold: 60
   successThreshold: 1
 
 livenessProbe:
@@ -108,7 +108,7 @@ livenessProbe:
   initialDelaySeconds: 20
   periodSeconds: 60
   timeoutSeconds: 5
-  failureThreshold: 2
+  failureThreshold: 60
   successThreshold: 1
 
 readinessProbe:
@@ -119,7 +119,7 @@ readinessProbe:
   initialDelaySeconds: 0
   periodSeconds: 60
   timeoutSeconds: 5
-  failureThreshold: 2
+  failureThreshold: 60
   successThreshold: 1
 
 ##