Merge pull request #8 from lalithkota/main

Modified keycloak keymanager and etc secret sources

kubernetes/keymanager/config-server-values.yaml

@@ -1,9 +1,9 @@
 gitRepo:
-  uri: https://github.com/lalithkota/mosip-config
-  version: develop-openg2p-standalone
+  uri: https://github.com/openg2p/mosip-config
+  version: develop3-v3
   ## Folders within the base repo where properties may be found.
   searchFolders: ""
   private: false
   ## User name of user who has access to the private repo. Ignore for public repo
   username: ""
-  token: ""
+  token: ""

kubernetes/keymanager/install.sh

@@ -49,11 +49,13 @@ $COPY_UTIL secret conf-secrets-various $CONF_SECRETS_NS $CONFIG_SERVER_NS
 
 ./dummy_secrets.sh
 
-helm -n $CONFIG_SERVER_NS install config-server mosip/config-server -f config-server-values.yaml --version 12.0.2 --wait
+helm -n $CONFIG_SERVER_NS install config-server mosip/config-server -f config-server-values.yaml --version 12.0.2
 
-kubectl -n $CONFIG_SERVER_NS set env --keys=openg2p_admin_client_secret --from=secret/keycloak-client-secret deployment/config-server --prefix=SPRING_CLOUD_CONFIG_SERVER_OVERRIDES_
+kubectl -n $CONFIG_SERVER_NS set env --keys=openg2p_admin_client_secret --from=secret/keycloak-client-secrets deployment/config-server --prefix=SPRING_CLOUD_CONFIG_SERVER_OVERRIDES_
 kubectl -n $CONFIG_SERVER_NS set env deployment/config-server SPRING_CLOUD_CONFIG_SERVER_OVERRIDES_HUB_SECRET_ENCRYPTION_KEY-
 
+kubectl -n $CONFIG_SERVER_NS rollout status deploy/config-server
+
 echo Installing Artifactory
 helm -n $ARTIFACTORY_NS install artifactory mosip/artifactory --version 12.0.2 --wait
 
@@ -68,4 +70,4 @@ helm -n $KEYMANAGER_NS install kernel-keygen mosip/keygen -f keygen-values.yaml
 echo Installing Keymanager
 helm -n $KEYMANAGER_NS install keymanager mosip/keymanager --version 12.0.2 --set istio.enabled=false --wait
 
-envsubst < istio-virtualservice.template.yaml | kubectl -n $NS apply -f -
+envsubst < istio-virtualservice.template.yaml | kubectl -n $KEYMANAGER_NS apply -f -

kubernetes/minio/install.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 export KEYCLOAK_REALM_NAME=${KEYCLOAK_REALM_NAME:-openg2p}
-export OPENG2P_MINIO_CLIENT_SECRET=$(kubectl -n $NS get secret keycloak-client-secrets -o jsonpath={.data.openg2p_minio_client_secret} | base64 --decode)
+export OPENG2P_MINIO_CLIENT_SECRET=$(kubectl -n keycloak get secret keycloak-client-secrets -o jsonpath={.data.openg2p_minio_client_secret} | base64 --decode)
 export SANDBOX_HOSTNAME=${SANDBOX_HOSTNAME:-openg2p.sandbox.net}
 export MINIO_HOSTNAME=${MINIO_HOSTNAME:-minio.$SANDBOX_HOSTNAME}
 

kubernetes/mpesa/virtualservice.yaml

@@ -14,4 +14,4 @@ spec:
         - destination:
             host: simple-mpesa
             port:
-              number: 80
+              number: 80

kubernetes/postgresql/values-init.yaml

@@ -0,0 +1,79 @@
+dbUserPasswords:
+  dbuserPassword: ""
+
+databases:
+  mosip_master:
+    enabled: false
+    branch: develop
+
+  mosip_audit:
+    enabled: true
+    branch: develop
+
+  mosip_keymgr:
+    enabled: true 
+    branch: develop
+
+  mosip_kernel:
+    enabled: false
+    branch: develop
+
+  mosip_idmap:
+    enabled: false
+    branch: develop
+
+  mosip_prereg:
+    enabled: false
+    branch: develop
+
+  mosip_idrepo:
+    enabled: false
+    branch: develop
+
+  mosip_ida:
+    enabled: false
+    branch: develop
+
+  mosip_credential:
+    enabled: false
+    branch: develop
+
+  mosip_regprc:
+    enabled: false
+    branch: develop
+
+  mosip_regdevice:
+    enabled: false
+    branch: develop
+
+  mosip_authdevice:
+    enabled: false
+    branch: develop
+
+  mosip_pms:
+    enabled: false
+    branch: develop
+
+  mosip_hotlist:
+    enabled: false
+    branch: develop
+
+  mosip_resident:
+    enabled: false
+    branch: develop
+
+  mosip_toolkit:
+    enabled: false
+    branch: develop
+
+  mosip_digitalcard:
+    enabled: false
+    branch: develop
+
+  mosip_esignet:
+    enabled: true
+    branch: develop
+
+  mosip_mockidentitysystem:
+    enabled: true
+    branch: develop