Hostname + default metadata when no overrides (#120)

This should not affect instances where overrides are provided.
astriaorg · Oct 20, 2023 · a3f6e67 · a3f6e67
1 parent 32f9e03
commit a3f6e67
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/charts/rollup/Chart.yaml b/charts/rollup/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.4.2
+version: 0.4.3
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/charts/rollup/templates/ingress.yaml b/charts/rollup/templates/ingress.yaml
@@ -13,12 +13,16 @@ metadata:
     {{- with .Values.ingress.labels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
-  {{- with .Values.ingress.annotations }}
   annotations:
+  {{- if .Values.ingress.annotations  }}
+  {{- with .Values.ingress.annotations }}
     {{- range $key, $value := . }}
     {{ $key }}: {{ tpl $value $ | quote }}
     {{- end }}
   {{- end }}
+  {{- else }}
+    kubernetes.io/ingress.class: nginx
+  {{- end }}
 spec:
   {{- if and $ingressSupportsIngressClassName .Values.ingress.ingressClassName }}
   ingressClassName: {{ .Values.ingress.ingressClassName }}
@@ -37,7 +41,7 @@ spec:
     {{- tpl (toYaml .) $ | nindent 4 }}
   {{- end }}
   {{- else }}
-    - host: executor.{{ .Values.config.rollup.name }}.localdev.me
+    - host: executor.{{ .Values.config.rollup.name }}.{{ .Values.ingress.hostname }}
       http:
         paths:
           - path: "/"
@@ -47,7 +51,7 @@ spec:
                 name: {{ .Values.config.rollup.name }}-evm-service
                 port:
                   name: json-rpc-svc
-    - host: ws-executor.{{ .Values.config.rollup.name }}.localdev.me
+    - host: ws-executor.{{ .Values.config.rollup.name }}.{{ .Values.ingress.hostname }}
       http:
         paths:
           - path: "/"
@@ -57,7 +61,7 @@ spec:
                 name: {{ .Values.config.rollup.name }}-evm-service
                 port:
                   name: ws-rpc-svc
-    - host: faucet.{{ .Values.config.rollup.name }}.localdev.me
+    - host: faucet.{{ .Values.config.rollup.name }}.{{ .Values.ingress.hostname }}
       http:
         paths:
           - path: "/"
@@ -67,7 +71,7 @@ spec:
                 name: {{ .Values.config.rollup.name }}-faucet-service
                 port:
                   name: faucet-svc
-    - host: blockscout.{{ .Values.config.rollup.name }}.localdev.me
+    - host: blockscout.{{ .Values.config.rollup.name }}.{{ .Values.ingress.hostname }}
       http:
         paths:
           - path: "/"

diff --git a/charts/rollup/values.yaml b/charts/rollup/values.yaml
@@ -95,6 +95,8 @@ secretProvider:
 
 ingress:
   enabled: true
+  # This is only used when using the default hosts and not overriding below.
+  hostname: localdev.me
   # For Kubernetes >= 1.18 you should specify the ingress-controller via the field ingressClassName
   # See https://kubernetes.io/blog/2020/04/02/improvements-to-the-ingress-api-in-kubernetes-1.18/#specifying-the-class-of-an-ingress
   # ingressClassName: nginx