From 0c9d636c0abb1bf201f2a20a26a41fe3ccdad65e Mon Sep 17 00:00:00 2001 From: Rakshitha650 Date: Wed, 14 Feb 2024 18:15:13 +0530 Subject: [PATCH 1/3] [DSD-4594] created separate artifactory-share for signup Signed-off-by: Rakshitha650 --- helm/signup-service/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/signup-service/values.yaml b/helm/signup-service/values.yaml index 760fba16..af7c0662 100644 --- 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 From 33a03099e220d48eb5c9aaa14514a6bc555fdf0a Mon Sep 17 00:00:00 2001 From: Rakshitha650 Date: Wed, 14 Feb 2024 18:00:13 +0530 Subject: [PATCH 2/3] [DSD-4594] created separate artifactory-share for signup Signed-off-by: Rakshitha650 --- helm/signup-service/copy_cm.sh | 1 - helm/signup-service/install.sh | 2 +- helm/signup-service/templates/_helpers.tpl | 11 ++++++++ .../templates/configmap-share.yaml | 25 +++++++++++++++++++ helm/signup-service/values.yaml | 15 +++++++++++ 5 files changed, 52 insertions(+), 2 deletions(-) create mode 100644 helm/signup-service/templates/configmap-share.yaml diff --git a/helm/signup-service/copy_cm.sh b/helm/signup-service/copy_cm.sh index 68782f50..b1633658 100755 --- 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/install.sh b/helm/signup-service/install.sh index f9175493..d57cff56 100755 --- a/helm/signup-service/install.sh +++ b/helm/signup-service/install.sh @@ -90,7 +90,7 @@ function installing_signup() { fi echo Installing signup - helm -n $NS install signup mosip/signup --version $CHART_VERSION $ENABLE_INSECURE + helm -n $NS install signup /home/techno-376/IdeaProjects/esignet-signup/helm/signup-service --version $CHART_VERSION $ENABLE_INSECURE kubectl -n $NS get deploy -o name | xargs -n1 -t kubectl -n $NS rollout status diff --git a/helm/signup-service/templates/_helpers.tpl b/helm/signup-service/templates/_helpers.tpl index 1becb8f9..aaf70864 100644 --- 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 new file mode 100644 index 00000000..0ca93178 --- /dev/null +++ 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 index af7c0662..7553ed90 100644 --- a/helm/signup-service/values.yaml +++ b/helm/signup-service/values.yaml @@ -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 From 845f56e3b0cf4af526446225e0c26a40eecd2a2b Mon Sep 17 00:00:00 2001 From: Rakshitha650 Date: Wed, 14 Feb 2024 20:03:37 +0530 Subject: [PATCH 3/3] [DSD-4594] created separate artifactory-share for signup Signed-off-by: Rakshitha650 --- helm/signup-service/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/signup-service/install.sh b/helm/signup-service/install.sh index d57cff56..f9175493 100755 --- a/helm/signup-service/install.sh +++ b/helm/signup-service/install.sh @@ -90,7 +90,7 @@ function installing_signup() { fi echo Installing signup - helm -n $NS install signup /home/techno-376/IdeaProjects/esignet-signup/helm/signup-service --version $CHART_VERSION $ENABLE_INSECURE + helm -n $NS install signup mosip/signup --version $CHART_VERSION $ENABLE_INSECURE kubectl -n $NS get deploy -o name | xargs -n1 -t kubectl -n $NS rollout status