Break horizon resources into separate files

charts/horizon/templates/core-configmap.yaml

@@ -1,3 +1,4 @@
+{{- if .Values.ingest.enabled }}
 ---
 apiVersion: v1
 kind: ConfigMap
@@ -11,3 +12,4 @@ metadata:
     heritage: {{ .Release.Service }}
 data:
   stellar-core.cfg: | {{ include "core.config" . | nindent 4 }}
+{{- end }}

charts/horizon/templates/ingest-core-service.yaml

@@ -0,0 +1,21 @@
+{{- if .Values.ingest.enabled }}
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "common.fullname" . }}-ingest-core
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app: {{ include "common.fullname" . }}-ingest-core
+    chart: {{ include "common.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  type: ClusterIP
+  ports:
+    - name: core
+      port: 11626
+      targetPort: 11626
+  selector:
+    app: {{ include "common.fullname" . }}-ingest
+{{- end }}

charts/horizon/templates/ingress.yaml → charts/horizon/templates/ingest-ingress.yaml

@@ -28,33 +28,3 @@ spec:
             port:
               number: 80
 {{- end }}
-{{- if and .Values.web.enabled .Values.web.ingress.enabled }}
----
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: {{ include "common.fullname" . }}-web
-  namespace: {{ .Release.Namespace }}
-  {{- if .Values.web.ingress.annotations }}
-  annotations:
-    {{- range $key, $value := .Values.web.ingress.annotations }}
-    {{ $key }}: {{ $value | quote }}
-    {{- end }}
-  {{- end }}
-spec:
-  tls:
-  - secretName: {{ include "common.fullname" . }}-web-cert
-    hosts:
-    - {{ .Values.web.ingress.host }}
-  rules:
-  - host: {{ .Values.web.ingress.host }}
-    http:
-      paths:
-      - path: /
-        pathType: Prefix
-        backend:
-          service:
-            name: {{ include "common.fullname" . }}-web
-            port:
-              number: 80
-{{- end }}

charts/horizon/templates/ingest-service.yaml

@@ -0,0 +1,21 @@
+{{- if .Values.ingest.enabled }}
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "common.fullname" . }}-ingest
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app: {{ include "common.fullname" . }}-ingest
+    chart: {{ include "common.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  type: ClusterIP
+  ports:
+    - name: horizon
+      port: 80
+      targetPort: {{ .Values.ingest.horizonConfig.port }}
+  selector:
+    app: {{ include "common.fullname" . }}-ingest
+{{- end }}

charts/horizon/templates/ingest-statefulset.yaml

@@ -102,42 +102,4 @@ spec:
         requests:
           storage: {{ .Values.ingest.persistence.size | quote }}
   {{- end }}
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ include "common.fullname" . }}-ingest-core
-  namespace: {{ .Release.Namespace }}
-  labels:
-    app: {{ include "common.fullname" . }}-ingest-core
-    chart: {{ include "common.chart" . }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-spec:
-  type: ClusterIP
-  ports:
-    - name: core
-      port: 11626
-      targetPort: 11626
-  selector:
-    app: {{ include "common.fullname" . }}-ingest
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ include "common.fullname" . }}-ingest
-  namespace: {{ .Release.Namespace }}
-  labels:
-    app: {{ include "common.fullname" . }}-ingest
-    chart: {{ include "common.chart" . }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-spec:
-  type: ClusterIP
-  ports:
-    - name: horizon
-      port: 80
-      targetPort: {{ .Values.ingest.horizonConfig.port }}
-  selector:
-    app: {{ include "common.fullname" . }}-ingest
 {{- end }}

charts/horizon/templates/web-deployment.yaml

@@ -66,23 +66,4 @@ spec:
         {{- if .Values.web.resources }}
         resources: {{ toYaml .Values.web.resources | nindent 10 }}
         {{- end }}
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ include "common.fullname" . }}-web
-  namespace: {{ .Release.Namespace }}
-  labels:
-    app: {{ include "common.fullname" . }}-web
-    chart: {{ include "common.chart" . }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-spec:
-  type: ClusterIP
-  ports:
-    - name: core
-      port: 80
-      targetPort: {{ .Values.web.horizonConfig.port }}
-  selector:
-    app: {{ include "common.fullname" . }}-web
 {{- end }}

charts/horizon/templates/web-ingress.yaml

@@ -0,0 +1,30 @@
+{{- if and .Values.web.enabled .Values.web.ingress.enabled }}
+---
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: {{ include "common.fullname" . }}-web
+  namespace: {{ .Release.Namespace }}
+  {{- if .Values.web.ingress.annotations }}
+  annotations:
+    {{- range $key, $value := .Values.web.ingress.annotations }}
+    {{ $key }}: {{ $value | quote }}
+    {{- end }}
+  {{- end }}
+spec:
+  tls:
+  - secretName: {{ include "common.fullname" . }}-web-cert
+    hosts:
+    - {{ .Values.web.ingress.host }}
+  rules:
+  - host: {{ .Values.web.ingress.host }}
+    http:
+      paths:
+      - path: /
+        pathType: Prefix
+        backend:
+          service:
+            name: {{ include "common.fullname" . }}-web
+            port:
+              number: 80
+{{- end }}

charts/horizon/templates/web-service.yaml

@@ -0,0 +1,21 @@
+{{- if .Values.web.enabled }}
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "common.fullname" . }}-web
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app: {{ include "common.fullname" . }}-web
+    chart: {{ include "common.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  type: ClusterIP
+  ports:
+    - name: core
+      port: 80
+      targetPort: {{ .Values.web.horizonConfig.port }}
+  selector:
+    app: {{ include "common.fullname" . }}-web
+{{- end }}