[DSD-4594] created separate artifactory-share for signup (mosip#73)

* [DSD-4594] created separate artifactory-share for signup Signed-off-by: Rakshitha650 <[email protected]> * [DSD-4594] created separate artifactory-share for signup Signed-off-by: Rakshitha650 <[email protected]> * [DSD-4594] created separate artifactory-share for signup --------- Signed-off-by: Rakshitha650 <[email protected]> Signed-off-by: Mengleang <[email protected]> Signed-off-by: mengleang-0090 <[email protected]> Signed-off-by: mengleang-0090 <[email protected]>
mengleang-0090 · Mar 27, 2024 · 59151d1 · 59151d1
1 parent 2b9db25
commit 59151d1
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 2 deletions.
diff --git a/helm/signup-service/copy_cm.sh b/helm/signup-service/copy_cm.sh
@@ -7,7 +7,6 @@ function copying_cm() {
   DST_NS=signup
 
   $COPY_UTIL configmap global default $DST_NS
-  $COPY_UTIL configmap artifactory-share artifactory $DST_NS
   $COPY_UTIL configmap config-server-share config-server $DST_NS
   $COPY_UTIL configmap softhsm-signup-share softhsm $DST_NS
   return 0

diff --git a/helm/signup-service/templates/_helpers.tpl b/helm/signup-service/templates/_helpers.tpl
@@ -57,4 +57,15 @@ Return podAnnotations
 {{- end }}
 {{- end -}}
 
+User
+{{/*
+Baseurl for artifactory service
+*/}}
+{{- define "artifactory.baseUrl" -}}
+{{ printf "http://artifactory.artifactory:%s" (.Values.service.port | toString) }}
+{{- end -}}
+
+
+
+
 
diff --git a/helm/signup-service/templates/configmap-share.yaml b/helm/signup-service/templates/configmap-share.yaml
@@ -0,0 +1,25 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  labels:
+    {{- include "common.labels.standard" . | nindent 4 }}
+    app.kubernetes.io/component: artifactory
+  name: artifactory-share
+  {{- if .Values.commonAnnotations }}
+  annotations:
+    {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+  {{- end }}
+data:
+  artifactory_url_env: {{ include "artifactory.baseUrl" . | quote }}
+  iam_adapter_url_env: {{ printf "%s%s" (include "artifactory.baseUrl" .) .Values.artifacts.iamAdapter | quote }}
+  iam_adapter_regproc_url_env: {{ printf "%s%s" (include "artifactory.baseUrl" .) .Values.artifacts.iamAdapterRegproc | quote }}
+  iam_adapter_regproc_ext_url_env: {{ printf "%s%s" (include "artifactory.baseUrl" .) .Values.artifacts.iamAdapterRegprocExt | quote }}
+  zip_file_path: {{ .Values.artifacts.hsmClientZip | quote }}
+  cache_provider_url_env: {{ printf "%s%s" (include "artifactory.baseUrl" .) .Values.artifacts.cacheProvider | quote }}
+  runtime_dep_url_env: {{ printf "%s%s" (include "artifactory.baseUrl" .) .Values.artifacts.runtimeDep | quote }}
+  regproc_jars_env: {{ .Values.artifacts.regprocJars | quote }}
+  preregistration_i18n_bundle_url_env: {{ printf "%s%s" (include "artifactory.baseUrl" .) .Values.artifacts.preregistrationBundleUrl | quote }}
+  virusscanner_url_env: {{ printf "%s%s" (include "artifactory.baseUrl" .) .Values.artifacts.virusscannerUrl | quote }}
+  auth_wrapper_url_env: {{ printf "%s%s" (include "artifactory.baseUrl" .) .Values.artifacts.authwrapperUrl | quote }}
+  esignet_wrapper_url_env: {{ printf "%s%s" (include "artifactory.baseUrl" .) .Values.artifacts.esignetauthwrapperUrl | quote }}
+
diff --git a/helm/signup-service/values.yaml b/helm/signup-service/values.yaml
@@ -53,7 +53,7 @@ service:
 image:
   registry: docker.io
   repository: mosipqa/signup-service
-  tag: 1.x.x
+  tag: release-1.x.x
   ## Specify a imagePullPolicy
   ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
   ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -443,6 +443,21 @@ metrics:
     #     labels:
     #       severity: error
     rules: []
+## There are various jars and libs in artifactory.  Listing their locations here.  The locations are vis-a-vis
+## /usr/share/nginx/html/artifactory path in artifactory docker
+artifacts:
+  iamAdapter: /artifactory/libs-release-local/io/mosip/kernel/kernel-auth-adapter-lite.jar
+  iamAdapterRegproc: /artifactory/libs-release-local/io/mosip/kernel/kernel-auth-adapter.jar
+  iamAdapterRegprocExt: /artifactory/libs-release-local/io/mosip/kernel/kernel-auth-adapter.jar
+  hsmClientZip: /artifactory/libs-release-local/hsm/client.zip
+  cacheProvider: /artifactory/libs-release-local/cache/cache-provider.jar
+  runtimeDep: /artifactory/libs-release-local/io/mosip/kernel/
+  regprocJars: /artifactory/libs-release-local/clamav/kernel-virusscanner-clamav.jar
+  runtimeDepUrl: /artifactory/libs-release-local/io/mosip/kernel/
+  preregistrationBundleUrl: /artifactory/libs-release-local/i18n/pre-registration-i18n-bundle.zip
+  virusscannerUrl: /artifactory/libs-release-local/clamav/kernel-virusscanner-clamav.jar
+  authwrapperUrl: /artifactory/libs-release-local/idp/idp-auth-wrapper/authentication-wrapper.jar
+  esignetauthwrapperUrl: /artifactory/libs-release-local/esignet/esignet-wrapper.zip
 
 signup:
 ## Only internal access