feat: add ingress for developer portal (#118)

Author: bzp2010

charts/api7/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.14.1
+version: 0.14.2
 
 # 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

charts/api7/templates/developer-portal-deploy.yaml

@@ -60,6 +60,10 @@ spec:
             - name: API_URL
               value: 'https://{{ include "api7ee3.fullname" . }}-dashboard:{{ .Values.dashboard_service.tlsPort }}'
           {{- end }}
+          {{- if not .Values.developer_portal_configuration.server.listen.tls.enabled }}
+            - name: DISABLE_HTTPS
+              value: "1"
+          {{- end}}
           {{- if .Values.developer_portal.extraEnvVars }}
           {{- include "api7ee3.tplvalues.render" (dict "value" .Values.developer_portal.extraEnvVars "context" $) | nindent 12 }}
           {{- end }}

charts/api7/templates/developer-portal-ingress.yaml

@@ -0,0 +1,61 @@
+{{- if .Values.developer_portal.ingress.enabled }}
+{{- $fullName := printf "%s-developer-portal" (include "api7ee3.fullname" .) -}}
+{{- $svcPort := .Values.developer_portal.port -}}
+{{- if and .Values.developer_portal.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }}
+  {{- if not (hasKey .Values.developer_portal.ingress.annotations "kubernetes.io/ingress.class") }}
+  {{- $_ := set .Values.developer_portal.ingress.annotations "kubernetes.io/ingress.class" .Values.developer_portal.ingress.className}}
+  {{- end }}
+{{- end }}
+{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
+apiVersion: networking.k8s.io/v1
+{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+apiVersion: networking.k8s.io/v1beta1
+{{- else -}}
+apiVersion: extensions/v1beta1
+{{- end }}
+kind: Ingress
+metadata:
+  name: {{ $fullName }}
+  labels:
+    {{- include "api7ee3.labels" . | nindent 4 }}
+  {{- with .Values.developer_portal.ingress.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+  {{- if and .Values.developer_portal.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }}
+  ingressClassName: {{ .Values.developer_portal.ingress.className }}
+  {{- end }}
+  {{- if .Values.developer_portal.ingress.tls }}
+  tls:
+    {{- range .Values.developer_portal.ingress.tls }}
+    - hosts:
+        {{- range .hosts }}
+        - {{ . | quote }}
+        {{- end }}
+      secretName: {{ .secretName }}
+    {{- end }}
+  {{- end }}
+  rules:
+    {{- range .Values.developer_portal.ingress.hosts }}
+    - host: {{ .host | quote }}
+      http:
+        paths:
+          {{- range .paths }}
+          - path: {{ .path }}
+            {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }}
+            pathType: {{ .pathType }}
+            {{- end }}
+            backend:
+              {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
+              service:
+                name: {{ $fullName }}
+                port:
+                  number: {{ $svcPort }}
+              {{- else }}
+              serviceName: {{ $fullName }}
+              servicePort: {{ $svcPort }}
+              {{- end }}
+          {{- end }}
+    {{- end }}
+{{- end }}

charts/api7/values.yaml

@@ -30,6 +30,23 @@ developer_portal:
     # Overrides the image tag whose default is the chart appVersion.
     tag: "v0.0.3"
   extraEnvVars: []
+  port: 4321
+  ingress:
+    enabled: false
+    className: ""
+    annotations: {}
+      # kubernetes.io/ingress.class: nginx
+      # kubernetes.io/tls-acme: "true"
+    hosts:
+      - host: developer-portal.local
+        paths:
+          - path: /
+            pathType: ImplementationSpecific
+    tls: []
+    #  - secretName: developer-portal-tls
+    #    hosts:
+    #      - developer-portal.local
+    
 
 imagePullSecret: ""
 nameOverride: ""
@@ -252,3 +269,5 @@ developer_portal_configuration:
     listen:
       host: "0.0.0.0"
       port: 4321
+      tls:
+        enabled: true