[MOSIP-35987]Pushing local changes to develop after testing

.github/workflows/chart-lint-publish.yml

@@ -38,6 +38,7 @@ on:
       - 0.*
       - develop
       - release*
+      - MOSIP-35987
     paths:
       - 'helm/**'
 

Dockerfile

@@ -8,7 +8,8 @@ LABEL source=${SOURCE}
 LABEL commit_hash=${COMMIT_HASH}
 LABEL commit_id=${COMMIT_ID}
 LABEL build_time=${BUILD_TIME}
-RUN npm install -g npm newman newman-reporter-htmlextra pem-jwk
+RUN npm install -g [email protected] && \
+    npm install -g newman newman-reporter-htmlextra pem-jwk
 RUN apk add curl && \
     apk add openssl && \
     apk add jq && \

README.md

@@ -1,18 +1,13 @@
 # Partner Onboarding Utils
 
 ## Overview
-This repository contains Postman collection to onboard partners on to MOSIP. 
-
+This repository contains Postman collection to onboard partners on to MOSIP.
 * `run-onboard.sh`:  Onboard any partner.
 * `default.sh`: Onboard default partners that are required to run a sandbox.  
-
 ## Docker
-Docker to run `default.sh` is created to facilitate easy onboarding during installion. Refer `docker-build.sh` and `docker-run.sh`. Use this docker while installing MOSIP on Kubernetes. The docker runs an HTTP server to view the reports. Although this is a one-time job, the docker is run as Kubernetes Deployment with long sleep time set to review reports. If you restart the docker it will run the onboarding again.
-
-The scripts assume a Keycloak client `mosip-deployment-client` with roles `GLOBAL_ADMIN`, `ID_AUTHENTICATION`, `PARTNER_ADMIN` is already created. 
-
-If the `ENABLE_INSECURE` environment variable is set to `true`, the script will proceed with downloading an SSL certificate and subsequently provide it for utilization in **Newman** collections and **curl** API calls during execution. This functionality is designed for scenarios where the script is required to be used on a server that possesses self-signed SSL certificates.
-
+* Docker to run `default.sh` is created to facilitate easy onboarding during installion. Refer `docker-build.sh` and `docker-run.sh`. Use this docker while installing MOSIP on Kubernetes. The docker runs an HTTP server to view the reports. Although this is a one-time job, the docker is run as Kubernetes Deployment with long sleep time set to review reports. If you restart the docker it will run the onboarding again.
+* The scripts assume a Keycloak client `mosip-deployment-client` with roles `GLOBAL_ADMIN`, `ID_AUTHENTICATION`, `PARTNER_ADMIN` is already created. 
+* If the `ENABLE_INSECURE` environment variable is set to `true`, the script will proceed with downloading an SSL certificate and subsequently provide it for utilization in **Newman** collections and **curl** API calls during execution. This functionality is designed for scenarios where the script is required to be used on a server that possesses self-signed SSL certificates.
 ## License
 This project is licensed under the terms of [Mozilla Public License 2.0](LICENSE).
 

helm/partner-onboarder/.gitignore

@@ -1,2 +1,2 @@
 charts/
-Charts.yaml
+Chart.lock

helm/partner-onboarder/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: partner-onboarder
 description: A Helm chart for onboarding default partners for MOSIP sandbox.
 type: application
-version: 0.0.1-develop
+version: 1.5.0-es-develop
 appVersion: ""
 dependencies:
   - name: common

helm/partner-onboarder/README.md

@@ -1,40 +1,24 @@
-# OTPManager
-
-Helm chart for installing Kernel module OTPManager.
-
+# Partner Onboarder
+Helm chart for installing MOSIP Partner onboarder.
 ## TL;DR
-
 ```console
 $ helm repo add mosip https://mosip.github.io
 $ helm install my-release mosip/partner-onboarder
 ```
-
-## Introduction
-
-OTPManager is  part of the kernel modules, but has a separate Helm chart so as to install and manage it in a completely indepedent namespace.
-
 ## Prerequisites
 
 - Kubernetes 1.12+
 - Helm 3.1.0
 - PV provisioner support in the underlying infrastructure
 - ReadWriteMany volumes for deployment scaling
-
 ## Installing the Chart
-
 To install the chart with the release name `partner-onboarder`.
-
 ```console
 helm install my-release mosip/partner-onboarder
 ```
-
-> **Tip**: List all releases using `helm list`
-
+**Tip**: List all releases using `helm list`
 ## Uninstalling the Chart
-
 To uninstall/delete the `my-release` deployment:
-
 ```console
 helm delete my-release
 ```
-

helm/partner-onboarder/templates/configmap.yaml

@@ -4,7 +4,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ $cm_name }}
+  name: {{ $cm_name }}-{{ $.Release.Name }}
   namespace: {{ $.Release.Namespace }}
   labels: {{- include "common.labels.standard" $ | nindent 8 }}
     {{- if $.Values.commonLabels }}
@@ -18,4 +18,4 @@ data:
   {{ $key }}: {{ $value | quote }}
   {{- end }}
 {{- end }}
-{{- end }}
+{{- end }}

helm/partner-onboarder/templates/jobs.yaml

@@ -38,17 +38,21 @@ spec:
           env:
             - name: MODULE
               value: {{ $module.name }}
+            - name: push_reports_to_s3
+              value: {{ quote $.Values.onboarding.variables.push_reports_to_s3 }}
+            - name: mosipid
+              value: {{ quote $.Values.onboarding.variables.mosipid }}
           envFrom:
             {{- if $.Values.onboarding.configmaps }}
             {{- range $cm_name, $cm_value := $.Values.onboarding.configmaps }}
             - configMapRef:
-                name: {{ $cm_name }}
+                name: {{ $cm_name }}-{{ $.Release.Name }}
             {{- end }}
             {{- end }}
             {{- if $.Values.onboarding.secrets }}
             {{- range $secret_name, $secret_value := $.Values.onboarding.secrets }}
             - secretRef:
-                name: {{ $secret_name }}
+                name: {{ $secret_name }}-{{ $.Release.Name }}
             {{- end }}
             {{- end }}
             {{- if $.Values.extraEnvVarsSecret }}
@@ -66,5 +70,16 @@ spec:
           {{- if $.Values.resources }}
           resources: {{- toYaml $.Values.resources | nindent 12 }}
           {{- end }}
+          volumeMounts:
+          {{- if eq $.Values.onboarding.variables.push_reports_to_s3 false }}
+            - name: {{ $.Values.onboarding.volumes.reports.name }}
+              mountPath: /home/mosip/reports/
+          {{- end }}
+      volumes:
+      {{- if eq $.Values.onboarding.variables.push_reports_to_s3 false }}
+      - name: {{ $.Values.onboarding.volumes.reports.name }}
+        persistentVolumeClaim:
+          claimName: {{ $.Values.onboarding.volumes.reports.name }}-{{ $.Release.Namespace }}-{{ $module.name }}-pvc
+      {{- end }}
+{{- end }}
 {{- end }}
-{{- end }}

helm/partner-onboarder/templates/pv.yaml

@@ -0,0 +1,25 @@
+{{- range $module := $.Values.onboarding.modules }}
+{{- if $module.enabled }}
+{{- if eq $.Values.onboarding.variables.push_reports_to_s3 false }}
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: {{ $.Values.onboarding.volumes.reports.name }}-{{ $.Release.Namespace }}-{{ $module.name }}-pvc
+  labels:
+    name: {{ $.Values.onboarding.volumes.reports.name }}
+spec:
+  storageClassName: {{ $.Values.onboarding.volumes.reports.storageClass }}
+  capacity:
+    storage: {{ $.Values.onboarding.volumes.reports.size }}
+  accessModes:
+    {{- range $.Values.onboarding.volumes.reports.accessModes }}
+      - {{ . }}
+    {{- end }}
+  nfs:
+    server: {{ $.Values.onboarding.volumes.reports.nfs.server }}
+    path: {{ $.Values.onboarding.volumes.reports.nfs.path }}
+#  mountOptions:
+#    - nolock
+{{- end }}
+{{- end }}
+{{- end }}

helm/partner-onboarder/templates/pvc.yaml

@@ -0,0 +1,23 @@
+{{- range $module := $.Values.onboarding.modules }}
+{{- if $module.enabled }}
+{{- if eq $.Values.onboarding.variables.push_reports_to_s3 false }}
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: {{ $.Values.onboarding.volumes.reports.name }}-{{ $.Release.Namespace }}-{{ $module.name }}-pvc
+  namespace: {{ $.Release.Namespace | quote }}
+spec:
+  storageClassName: {{ $.Values.onboarding.volumes.reports.storageClass }}
+  accessModes:
+    {{- range $.Values.onboarding.volumes.reports.accessModes }}
+      - {{ . }}
+    {{- end }}
+  resources:
+    requests:
+      storage: {{ $.Values.onboarding.volumes.reports.size }}
+  selector:
+    matchLabels:
+      name: {{ $.Values.onboarding.volumes.reports.name }}
+{{- end }}
+{{- end }}
+{{- end }}

helm/partner-onboarder/templates/rolebinding.yaml

@@ -5,7 +5,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
 subjects:
   - kind: ServiceAccount
-    name: {{ .Release.Name }}
+    name: {{ template "partner-onboarder.serviceAccountName" . }}
     namespace: {{ .Release.Namespace }}
 roleRef:
   kind: Role
@@ -19,11 +19,11 @@ metadata:
   namespace: {{ .Release.Namespace }}
 subjects:
   - kind: ServiceAccount
-    name: {{ .Release.Name }}
+    name: {{ template "partner-onboarder.serviceAccountName" . }}
     namespace: {{ .Release.Namespace }}
 roleRef:
   kind: Role
   name: {{ .Release.Name }}-secrets-pods-role
   apiGroup: rbac.authorization.k8s.io
 
----
+---

helm/partner-onboarder/templates/secrets.yaml

@@ -4,7 +4,7 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ $secret_name }}
+  name: {{ $secret_name }}-{{ $.Release.Name }}
   namespace: {{ $.Release.Namespace }}
   labels: {{- include "common.labels.standard" $ | nindent 8 }}
     {{- if $.Values.commonLabels }}
@@ -19,4 +19,4 @@ data:
   {{ $key }}: {{ $value  | b64enc | quote  }}
   {{- end }}
 {{- end }}
-{{- end }}
+{{- end }}

helm/partner-onboarder/values.yaml

@@ -53,8 +53,8 @@ service:
 
 image:
   registry: docker.io
-  repository: mosipqa/partner-onboarder
-  tag: develop
+  repository: mosipdev/partner-onboarder
+  tag: MOSIP-35987
   ## 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
@@ -262,7 +262,6 @@ extraEnvVarsCM:
 ## Secret with extra environment variables
 ##
 extraEnvVarsSecret:
-  - s3
   - keycloak
   - keycloak-client-secrets
 
@@ -428,30 +427,29 @@ metrics:
 onboarding:
   modules:
     - name: ida
-      enabled: true
+      enabled: false
     - name: print
-      enabled: true
+      enabled: false
     - name: abis
-      enabled: true
+      enabled: false
     - name: resident
-      enabled: true
+      enabled: false
     - name: mimoto
-      enabled: true
+      enabled: false
     - name: digitalcard
-      enabled: true
+      enabled: false
     - name: esignet
       enabled: false
-    - name: demo-oidc
+    - name: mock-rp-oidc
       enabled: false
     - name: resident-oidc
       enabled: false
     - name: mimoto-keybinding
-      enabled: true
+      enabled: false
     - name: mimoto-oidc
       enabled: false
     - name: signup-oidc
       enabled: false
-
   configmaps:
     s3:
       s3-host: 'http://minio.minio:9000'
@@ -462,3 +460,21 @@ onboarding:
       ns_esignet: esignet
       ns_signup: signup
   secrets:
+    s3:
+      s3-user-secret: 'password'
+  volumes:
+    reports:
+      name: onboarder-reports
+      storageClass: nfs-client
+      accessModes:
+        - ReadWriteMany
+      size: 10Mi
+      existingClaim:
+      # Dir where config and keys are written inside container
+      mountDir: /home/mosip/reports
+      nfs:
+        path: "/srv/nfs/sandbox/onboarding"  # Dir within the nfs server where config repo is cloned/maintained locally.
+        server: "nfs-server"  # Ip address of nfs server.
+  variables:
+    push_reports_to_s3: true
+    mosipid: false