Merge pull request #345 from equinix-ms/master

chart: Add option for separate /v1/update and /flatcar ingress

Author: joaquimrocha

charts/nebraska/Chart.yaml

@@ -19,7 +19,7 @@ sources:
 maintainers:
   - name: kinvolk
     url: https://kinvolk.io/
-version: 0.1.1
+version: 0.1.2
 appVersion: "2.3.2"
 
 dependencies:

charts/nebraska/templates/update-ingress.yaml

@@ -0,0 +1,68 @@
+{{- if and .Values.ingress.enabled .Values.ingress.update.enabled }}
+{{- $fullName := include "nebraska.fullname" . }}
+{{- $svcPort := .Values.service.port }}
+{{- $kubeGitVersion := .Capabilities.KubeVersion.GitVersion }}
+{{- if semverCompare ">=1.19-0" $kubeGitVersion }}
+apiVersion: networking.k8s.io/v1
+{{- else if semverCompare ">=1.14-0" $kubeGitVersion }}
+apiVersion: networking.k8s.io/v1beta1
+{{- else }}
+apiVersion: extensions/v1beta1
+{{- end }}
+kind: Ingress
+metadata:
+  name: {{ $fullName | trunc 56 | trimSuffix "-" }}-update
+  labels:
+    {{- include "nebraska.labels" . | nindent 4 }}
+  {{- with .Values.ingress.update.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+  {{- if .Values.ingress.tls }}
+  tls:
+    {{- range .Values.ingress.tls }}
+    - hosts:
+        {{- range .hosts }}
+        - {{ . | quote }}
+        {{- end }}
+      secretName: {{ .secretName }}
+    {{- end }}
+  {{- end }}
+  rules:
+    {{- range .Values.ingress.hosts }}
+    - host: {{ . | quote }}
+      http:
+        paths:
+          - path: /v1/update
+            backend:
+            {{- if semverCompare ">=1.19-0" $kubeGitVersion }}
+              service:
+                name: {{ $fullName }}
+                port:
+                  number: {{ $svcPort }}
+            pathType: ImplementationSpecific
+            {{- else }}
+              serviceName: {{ $fullName }}
+              servicePort: {{ $svcPort }}
+            {{- end }}
+          {{- if $.Values.config.hostFlatcarPackages.enabled }}
+          {{- if regexFind ( printf "://%s(:[0-9]+)?/" . ) ( default "" $.Values.config.hostFlatcarPackages.nebraskaURL ) }}
+          - path: {{ regexReplaceAll "^[^/]+://[^/]+" $.Values.config.hostFlatcarPackages.nebraskaURL "" | trimAll "/" }}/flatcar
+          {{- else }}
+          - path: /flatcar
+          {{- end }}
+            backend:
+            {{- if semverCompare ">=1.19-0" $kubeGitVersion }}
+              service:
+                name: {{ $fullName }}
+                port:
+                  number: {{ $svcPort }}
+            pathType: ImplementationSpecific
+            {{- else }}
+              serviceName: {{ $fullName }}
+              servicePort: {{ $svcPort }}
+            {{- end }}
+          {{- end }}
+    {{- end }}
+  {{- end }}

charts/nebraska/values.yaml

@@ -116,6 +116,11 @@ ingress:
   annotations: {}
     # kubernetes.io/ingress.class: nginx
     # kubernetes.io/tls-acme: "true"
+  update:
+    # Create a separate ingress for the /v1/update and /flatcar paths,
+    # with it's own annotations.
+    enabled: false
+    annotations: {}
   hosts:
     - flatcar.example.com
   tls: []