Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 3 commits into from
Feb 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion helm/signup-service/copy_cm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 11 additions & 0 deletions helm/signup-service/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -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 -}}





25 changes: 25 additions & 0 deletions helm/signup-service/templates/configmap-share.yaml
Original file line number Diff line number Diff line change
@@ -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 }}

17 changes: 16 additions & 1 deletion helm/signup-service/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Loading