Merge pull request #167 from nautobot/nn_nautobot_nginx

Re-organizing ingress paths
nautobot · Apr 21, 2022 · 6b60916 · 6b60916
2 parents e173381 + da1ebb9
commit 6b60916
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 18 deletions.
diff --git a/charts/nautobot/Chart.yaml b/charts/nautobot/Chart.yaml
@@ -30,7 +30,7 @@ annotations:
       description: Nautobot post_upgrade now occurs in an initContainer
 apiVersion: "v2"
 appVersion: "1.2.11"
-version: "2.0.0-alpha.6"
+version: "2.0.0-alpha.7"
 dependencies:
   - condition: "redis.enabled"
     name: "redis"

diff --git a/charts/nautobot/README.md b/charts/nautobot/README.md
@@ -1,6 +1,6 @@
 # nautobot
 
-![Version: 2.0.0-alpha.6](https://img.shields.io/badge/Version-2.0.0--alpha.6-informational?style=flat-square) ![AppVersion: 1.2.11](https://img.shields.io/badge/AppVersion-1.2.11-informational?style=flat-square)
+![Version: 2.0.0-alpha.7](https://img.shields.io/badge/Version-2.0.0--alpha.7-informational?style=flat-square) ![AppVersion: 1.2.11](https://img.shields.io/badge/AppVersion-1.2.11-informational?style=flat-square)
 
 Nautobot is a Network Source of Truth and Network Automation Platform.
 

diff --git a/charts/nautobot/templates/ingress.yaml b/charts/nautobot/templates/ingress.yaml
@@ -21,14 +21,6 @@ spec:
     - host: {{ .Values.ingress.hostname }}
       http:
         paths:
-          {{- if .Values.ingress.extraPaths }}
-          {{- toYaml .Values.ingress.extraPaths | nindent 10 }}
-          {{- end }}
-          - path: {{ .Values.ingress.path }}
-            {{- if eq "true" (include "common.ingress.supportsPathType" .) }}
-            pathType: {{ .Values.ingress.pathType }}
-            {{- end }}
-            backend: {{- include "common.ingress.backend" (dict "serviceName" (include "common.names.fullname" .) "servicePort" (default "https" .Values.ingress.backendProtocol) "context" $)  | nindent 14 }}
           {{- if .Values.nautobot.apiEndpoint.enabled }}
           - path: {{ .Values.ingress.path }}api
             {{- if eq "true" (include "common.ingress.supportsPathType" .) }}
@@ -43,19 +35,19 @@ spec:
             {{- end }}
             backend: {{- include "common.ingress.backend" (dict "serviceName" (printf "%s%s" (include "common.names.fullname" .) "-graphql") "servicePort" (default "https" .Values.ingress.backendProtocol) "context" $)  | nindent 14 }}
           {{- end }}
+          {{- if .Values.ingress.extraPaths }}
+          {{- toYaml .Values.ingress.extraPaths | nindent 10 }}
+          {{- end }}
+          - path: {{ .Values.ingress.path }}
+            {{- if eq "true" (include "common.ingress.supportsPathType" .) }}
+            pathType: {{ .Values.ingress.pathType }}
+            {{- end }}
+            backend: {{- include "common.ingress.backend" (dict "serviceName" (include "common.names.fullname" .) "servicePort" (default "https" .Values.ingress.backendProtocol) "context" $)  | nindent 14 }}
     {{- end }}
     {{- range .Values.ingress.extraHosts }}
     - host: {{ .hostname | quote }}
       http:
         paths:
-          {{- if .extraPaths }}
-          {{- toYaml .extraPaths | nindent 10 }}
-          {{- end }}
-          - path: {{ default "/" .path }}
-            {{- if eq "true" (include "common.ingress.supportsPathType" $) }}
-            pathType: {{ default "Prefix" .pathType }}
-            {{- end }}
-            backend: {{- include "common.ingress.backend" (dict "serviceName" (include "common.names.fullname" $) "servicePort" (default "https" .backendProtocol) "context" $) | nindent 14 }}
           {{- if .Values.nautobot.apiEndpoint.enabled }}
           - path: {{ .Values.ingress.path }}api
             {{- if eq "true" (include "common.ingress.supportsPathType" .) }}
@@ -70,6 +62,14 @@ spec:
             {{- end }}
             backend: {{- include "common.ingress.backend" (dict "serviceName" (printf "%s%s" (include "common.names.fullname" .) "-graphql") "servicePort" (default "https" .Values.ingress.backendProtocol) "context" $)  | nindent 14 }}
           {{- end }}
+          {{- if .extraPaths }}
+          {{- toYaml .extraPaths | nindent 10 }}
+          {{- end }}
+          - path: {{ default "/" .path }}
+            {{- if eq "true" (include "common.ingress.supportsPathType" $) }}
+            pathType: {{ default "Prefix" .pathType }}
+            {{- end }}
+            backend: {{- include "common.ingress.backend" (dict "serviceName" (include "common.names.fullname" $) "servicePort" (default "https" .backendProtocol) "context" $) | nindent 14 }}
     {{- end }}
   {{- if or .Values.ingress.tls .Values.ingress.extraTls }}
   tls: