Merge pull request #29 from techops-services/TECH-2705-patch-4

TECH-2705 - Match secret name
techops-services · Feb 9, 2024 · 4d411e3 · 4d411e3
2 parents f759def + fdf4c7f
commit 4d411e3
Showing 1 changed file with 31 additions and 31 deletions.
diff --git a/charts/graphprotocol-node/templates/ingress.yaml b/charts/graphprotocol-node/templates/ingress.yaml
@@ -20,7 +20,7 @@ spec:
       {{- range .Values.ingress.hosts }}
         - {{ . | quote }}
       {{- end }}
-      secretName: {{ $fullName }}-tls
+      secretName: {{ $fullName }}-ingress-tls
   {{- end }}
   rules:
     {{- range .Values.ingress.hosts }}
@@ -37,31 +37,31 @@ spec:
     {{- end }}
 {{- end }}
 ---
-{{- if .Values.ingressRpc.enabled -}}
+{{- if .Values.ingressIndex.enabled -}}
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-  name: {{ $fullName }}-rpc
+  name: {{ $fullName }}-index
   labels:
     {{- include "graphprotocol-node.labels" . | nindent 4 }}
-  {{- with .Values.ingressRpc.annotations }}
+  {{- with .Values.ingressIndex.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
-  {{- if .Values.ingressRpc.ingressClassName }}
-  ingressClassName: {{ .Values.ingressRpc.ingressClassName }}
+  {{- if .Values.ingressIndex.ingressClassName }}
+  ingressClassName: {{ .Values.ingressIndex.ingressClassName }}
   {{- end }}
-  {{- if .Values.ingressRpc.tls.enabled }}
+  {{- if .Values.ingressIndex.tls.enabled }}
   tls:
     - hosts:
-      {{- range .Values.ingressRpc.hosts }}
+      {{- range .Values.ingressIndex.hosts }}
         - {{ . | quote }}
       {{- end }}
-      secretName: {{ $fullName }}-rpc-tls
+      secretName: {{ $fullName }}-ingress-index-tls
   {{- end }}
   rules:
-    {{- range .Values.ingressRpc.hosts }}
+    {{- range .Values.ingressIndex.hosts }}
     - host: {{ . | quote }}
       http:
         paths:
@@ -71,35 +71,35 @@ spec:
               service:
                 name: {{ $fullName }}
                 port:
-                  number: 8020
+                  number: 8030
     {{- end }}
 {{- end }}
 ---
-{{- if .Values.ingressWebsocket.enabled -}}
+{{- if .Values.ingressRpc.enabled -}}
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-  name: {{ $fullName }}-ws
+  name: {{ $fullName }}-rpc
   labels:
     {{- include "graphprotocol-node.labels" . | nindent 4 }}
-  {{- with .Values.ingressWebsocket.annotations }}
+  {{- with .Values.ingressRpc.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
-  {{- if .Values.ingressWebsocket.ingressClassName }}
-  ingressClassName: {{ .Values.ingressWebsocket.ingressClassName }}
+  {{- if .Values.ingressRpc.ingressClassName }}
+  ingressClassName: {{ .Values.ingressRpc.ingressClassName }}
   {{- end }}
-  {{- if .Values.ingressWebsocket.tls.enabled }}
+  {{- if .Values.ingressRpc.tls.enabled }}
   tls:
     - hosts:
-      {{- range .Values.ingressWebsocket.hosts }}
+      {{- range .Values.ingressRpc.hosts }}
         - {{ . | quote }}
       {{- end }}
-      secretName: {{ $fullName }}-ws-tls
+      secretName: {{ $fullName }}-ingress-rpc-tls
   {{- end }}
   rules:
-    {{- range .Values.ingressWebsocket.hosts }}
+    {{- range .Values.ingressRpc.hosts }}
     - host: {{ . | quote }}
       http:
         paths:
@@ -109,35 +109,35 @@ spec:
               service:
                 name: {{ $fullName }}
                 port:
-                  number: 8001
+                  number: 8020
     {{- end }}
 {{- end }}
 ---
-{{- if .Values.ingressIndex.enabled -}}
+{{- if .Values.ingressWebsocket.enabled -}}
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-  name: {{ $fullName }}-index
+  name: {{ $fullName }}-ws
   labels:
     {{- include "graphprotocol-node.labels" . | nindent 4 }}
-  {{- with .Values.ingressIndex.annotations }}
+  {{- with .Values.ingressWebsocket.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
-  {{- if .Values.ingressIndex.ingressClassName }}
-  ingressClassName: {{ .Values.ingressIndex.ingressClassName }}
+  {{- if .Values.ingressWebsocket.ingressClassName }}
+  ingressClassName: {{ .Values.ingressWebsocket.ingressClassName }}
   {{- end }}
-  {{- if .Values.ingressIndex.tls.enabled }}
+  {{- if .Values.ingressWebsocket.tls.enabled }}
   tls:
     - hosts:
-      {{- range .Values.ingressIndex.hosts }}
+      {{- range .Values.ingressWebsocket.hosts }}
         - {{ . | quote }}
       {{- end }}
-      secretName: {{ $fullName }}-index-tls
+      secretName: {{ $fullName }}-ingress-websocket-tls
   {{- end }}
   rules:
-    {{- range .Values.ingressIndex.hosts }}
+    {{- range .Values.ingressWebsocket.hosts }}
     - host: {{ . | quote }}
       http:
         paths:
@@ -147,6 +147,6 @@ spec:
               service:
                 name: {{ $fullName }}
                 port:
-                  number: 8030
+                  number: 8001
     {{- end }}
 {{- end }}