diff --git a/devops/azure/chart/templates/deployment.yaml b/devops/azure/chart/templates/deployment.yaml index 62c0be7e4a980d4affbf2ca44138f5b6401e99a1..b2ca07c784aac63e1fe3ef06b0812d9396339f95 100644 --- a/devops/azure/chart/templates/deployment.yaml +++ b/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 diff --git a/devops/gcp/deploy/README.md b/devops/gcp/deploy/README.md index 1c5ae37774a2b64bc4a61083acf6caf967f9c332..004503a7c6cafc7ca9e7482835481dd65b5048b8 100644 --- a/devops/gcp/deploy/README.md +++ b/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 diff --git a/devops/gcp/deploy/templates/virtual-service.yml b/devops/gcp/deploy/templates/virtual-service.yml index 1853711e2ea2d5479d092bdeebf495d5a0dbca1c..08ee52c324f875f7018d4314110aa1b87e60d21f 100644 --- a/devops/gcp/deploy/templates/virtual-service.yml +++ b/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 diff --git a/devops/gcp/deploy/values.yaml b/devops/gcp/deploy/values.yaml index d3d3697d7bc87c2e2e0cad80eebed3e74e9bf397..ab85162ba6cd74957a7c8391a864a500b26f1f4b 100644 --- a/devops/gcp/deploy/values.yaml +++ b/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 diff --git a/provider/partition-ibm/pom.xml b/provider/partition-ibm/pom.xml index dced2fa65e7fe5cba746cee72419e98a2af66722..ecfd38614fa791c236edaafefde9f531d493eac2 100644 --- a/provider/partition-ibm/pom.xml +++ b/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>