Enable rest-java endpoint by default

Signed-off-by: sdimitrov9 <[email protected]>

Author: sdimitrov9

charts/hedera-mirror-rest-java/templates/ingress.yaml

@@ -23,26 +23,16 @@ spec:
     http:
       paths:
       {{- range .paths }}
-        {{- $pathEnabled := false -}}
-          {{- if eq .path "/api/v1/accounts/(\\d+\\.){0,2}(\\d+|(0x)?[A-Fa-f0-9]{40}|(?:[A-Z2-7]{8})*(?:[A-Z2-7]{2}|[A-Z2-7]{4,5}|[A-Z2-7]{7,8}))/allowances/nfts" }}
-            {{- $pathEnabled = $.Values.gateway.endpoints.accounts.allowances.nfts.enabled -}}
-            {{- else if eq .path "/api/v1/accounts/(\\d+\\.){0,2}(\\d+|(0x)?[A-Fa-f0-9]{40}|(?:[A-Z2-7]{8})*(?:[A-Z2-7]{2}|[A-Z2-7]{4,5}|[A-Z2-7]{7,8}))/airdrops/outstanding" }}
-            {{- $pathEnabled = $.Values.gateway.endpoints.accounts.airdrops.outstanding.enabled -}}
-            {{- else if eq .path "/api/v1/accounts/(\\d+\\.){0,2}(\\d+|(0x)?[A-Fa-f0-9]{40}|(?:[A-Z2-7]{8})*(?:[A-Z2-7]{2}|[A-Z2-7]{4,5}|[A-Z2-7]{7,8}))/airdrops/pending" }}
-            {{- $pathEnabled = $.Values.gateway.endpoints.accounts.airdrops.pending.enabled -}}
-            {{- else if eq .path "/api/v1/topics/(\\d+\\.){0,2}\\d+$" }}
-            {{- $pathEnabled = $.Values.gateway.endpoints.topics.enabled -}}
-          {{- end }}
-          {{- if $pathEnabled }}
-            - path: {{ .path }}
-              pathType: {{ .type | default "ImplementationSpecific" }}
-              backend:
-                service:
-                  name: {{ $fullName }}
-                  port:
-                    number: {{ $servicePort }}
-          {{- end }}
+        {{- if or (empty .condition) (eq (tpl .condition $) "true") }}
+        - path: {{ .path }}
+          pathType: {{ .type | default "ImplementationSpecific" }}
+          backend:
+            service:
+              name: {{ $fullName }}
+              port:
+                number: {{ $servicePort }}
         {{- end }}
+      {{- end }}
   {{- end }}
   {{- if .Values.ingress.tls.enabled }}
   tls:

charts/hedera-mirror-rest-java/values.yaml

@@ -46,20 +46,10 @@ envFrom: []
 
 fullnameOverride: ""
 
-gateway:
-  endpoints:
-    accounts:
-      allowances:
-        nfts:
-          enabled: true
-      airdrops:
-        outstanding:
-          enabled: true
-        pending:
-          enabled: true
-    topics:
-      enabled: true
+routes:
+  networkStake: false
 
+gateway:
   gcp:
     backendPolicy:
       connectionDraining:
@@ -85,25 +75,10 @@ gateway:
           name: "{{ include \"hedera-mirror-rest-java.fullname\" $ }}"
           port: 80
       matches: |
-        {{- if .Values.gateway.endpoints.accounts.allowances.nfts.enabled }}
-        - path:
-            type: RegularExpression  # GKE does not yet support RegularExpression type
-            value: '/api/v1/accounts/(\d+\.){0,2}(\d+|(0x)?[A-Fa-f0-9]{40}|(?:[A-Z2-7]{8})*(?:[A-Z2-7]{2}|[A-Z2-7]{4,5}|[A-Z2-7]{7,8}))/allowances/nfts'
-        {{- end }}
-        {{- if .Values.gateway.endpoints.accounts.airdrops.outstanding.enabled }}
-        - path:
-            type: RegularExpression
-            value: '/api/v1/accounts/(\d+\.){0,2}(\d+|(0x)?[A-Fa-f0-9]{40}|(?:[A-Z2-7]{8})*(?:[A-Z2-7]{2}|[A-Z2-7]{4,5}|[A-Z2-7]{7,8}))/airdrops/outstanding'
-        {{- end }}
-        {{- if .Values.gateway.endpoints.accounts.airdrops.pending.enabled }}
-        - path:
-            type: RegularExpression
-            value: '/api/v1/accounts/(\d+\.){0,2}(\d+|(0x)?[A-Fa-f0-9]{40}|(?:[A-Z2-7]{8})*(?:[A-Z2-7]{2}|[A-Z2-7]{4,5}|[A-Z2-7]{7,8}))/airdrops/pending'
-        {{- end }}
-        {{- if .Values.gateway.endpoints.topics.enabled }}
+        {{- if .Values.routes.networkStake }}
         - path:
             type: RegularExpression
-            value: '/api/v1/topics/(\d+\.){0,2}\d+$'
+            value: '/api/v1/network/stake$'
         {{- end }}
   target:
     group: ""
@@ -153,6 +128,8 @@ ingress:
         - path: '/api/v1/accounts/(\d+\.){0,2}(\d+|(0x)?[A-Fa-f0-9]{40}|(?:[A-Z2-7]{8})*(?:[A-Z2-7]{2}|[A-Z2-7]{4,5}|[A-Z2-7]{7,8}))/airdrops/outstanding'
         - path: '/api/v1/accounts/(\d+\.){0,2}(\d+|(0x)?[A-Fa-f0-9]{40}|(?:[A-Z2-7]{8})*(?:[A-Z2-7]{2}|[A-Z2-7]{4,5}|[A-Z2-7]{7,8}))/airdrops/pending'
         - path: '/api/v1/topics/(\d+\.){0,2}\d+$'
+        - path: '/api/v1/network/stake$'
+          condition: "{{ .Values.routes.networkStake }}"
   tls:
     enabled: false
     secretName: ""