Merge branch 'master' into master-dev-merge

devops/azure/chart/templates/deployment.yaml

@@ -46,6 +46,10 @@ spec:
       - name: {{ .Chart.Name }}
         image: {{ .Values.image.repository }}/{{ .Chart.Name }}-{{ .Values.image.branch }}:{{ .Values.image.tag | default .Chart.AppVersion }}
         imagePullPolicy: Always
+        lifecycle:
+          preStop:
+            exec:
+              command: ["sleep","90"]
         ports:
         - containerPort: 80
         {{- if has .Values.env .Values.featureFlag.resourceLimits.enabledEnvs }}
@@ -107,4 +111,5 @@ spec:
         - name: azure_activedirectory_session_stateless
           value: "false"
         - name: azure_istioauth_enabled
-          value: "true"
\ No newline at end of file
+          value: "true"
+      terminationGracePeriodSeconds: 101  

devops/gcp/deploy/README.md

@@ -122,6 +122,7 @@ First you need to set variables in **values.yaml** file using any code editor. S
 **cicdEnabled** | whether CI/CD is enabled | boolean | false | yes
 **configmap** | configmap to be used | string | partition-config | yes
 **onPremEnabled** | whether on-prem is enabled | boolean | false | yes
+**publicAvailable** | public access to /api/partition | boolean | false | yes
 **secret** | secret for postgres | string | partition-postgres-secret | yes
 
 ### Install the helm chart

devops/gcp/deploy/templates/virtual-service.yml

@@ -13,11 +13,17 @@ spec:
   gateways:
     - service-gateway
   http:
+    {{- if .Values.conf.publicAvailable }}
     - match:
         - uri:
             prefix: "/api/partition"
+    {{- else }}
+    - match:
+        - uri:
+            exact: "/api/partition/v1/info"
+    {{- end }}
       route:
         - destination:
             port:
               number: 80
-            host: "{{ .Values.conf.appName }}.{{ .Release.Namespace }}.svc.cluster.local"
+            host: "{{ .Values.conf.appName }}.{{ .Release.Namespace }}.svc.cluster.local"
\ No newline at end of file

devops/gcp/deploy/values.yaml

@@ -17,6 +17,7 @@ conf:
   configmap: "partition-config"
   domain: ""
   onPremEnabled: false
+  publicAvailable: false
   secret: "partition-postgres-secret"
 namespacePolicy:
     mtlsMode: STRICT

provider/partition-ibm/pom.xml

@@ -38,7 +38,7 @@
         <dependency>
             <groupId>org.opengroup.osdu</groupId>
             <artifactId>os-core-lib-ibm</artifactId>
-            <version>0.15.2</version>
+            <version>0.16.0-rc1</version>
         </dependency>
         <dependency>
             <groupId>org.opengroup.osdu</groupId>