Merge pull request #210 from shubham17998/develop

[MOSIP-34934] Updated datashare helm to work as default and inji-datashare

helm/datashare/templates/gateway.yaml

@@ -0,0 +1,11 @@
+{{- if and .Values.istio.enabled .Values.istio.gateway.enabled }}
+apiVersion: networking.istio.io/v1alpha3
+kind: Gateway
+metadata:
+  name:  {{ .Release.Name }}
+spec:
+  selector:
+    istio: {{ .Values.istio.gateway.selector }}
+  servers:
+{{ toYaml .Values.istio.gateway.servers | indent 4 }}
+{{- end }}

helm/datashare/templates/virtualservice.yaml

@@ -15,11 +15,15 @@ spec:
   hosts:
   - "*"
   gateways:
-  - {{ .Values.istio.gateway }}
+  {{- include "common.tplvalues.render" ( dict "value" .Values.istio.vs.gateways "context" $ ) | nindent 4 }}
   http:
   - match:
       - uri:
-          prefix: {{ .Values.istio.prefix }}
+          prefix: {{ .Values.istio.vs.prefix }}
+    {{- if .Values.istio.vs.rewrite }}
+    rewrite:
+      uri: {{ .Values.istio.vs.rewrite }}
+    {{- end }}
     route:
     - destination:
         host: {{ template "common.names.fullname" . }}

helm/datashare/values.yaml

@@ -415,5 +415,19 @@ metrics:
 ## Only internal access
 istio:
   enabled: true
-  gateway: istio-system/internal
-  prefix: /v1/datashare
+  gateway:
+    enabled: false
+    selector:
+      istio: ingressgateway-internal
+    servers:
+      - hosts:
+          - api-internal.sandbox.xyz.net
+        port:
+          name: http
+          number: 80
+          protocol: HTTP
+  vs:
+    prefix: /v1/datashare
+    rewrite: ''
+    gateways:
+      - istio-system/internal