chore(gateway): add route for gateway

Author: duanhongyi

charts/gateway/templates/drycc-certificate.yaml

@@ -5,8 +5,10 @@ metadata:
   name: drycc-certificate
 spec:
   dnsNames:
-  {{- range .Values.domainPrefixs }}
-  - {{printf "%s.%s" . $.Values.global.platformDomain}}
+  {{- range $app := .Values.apps }}
+  {{- if $app.hostname }}
+  - {{ tpl $app.hostname $ }}
+  {{- end }}
   {{- end }}
   issuerRef:
     kind: Issuer

charts/gateway/templates/drycc-gateway.yaml

@@ -5,15 +5,22 @@ metadata:
 spec:
   gatewayClassName: {{ .Values.global.gatewayClass }}
   listeners:
-  - name: http
-    port: 80
-    protocol: HTTP
+  {{- range $index, $app := .Values.apps }}
+  - name: {{ printf "%s-%v-%d" $app.protocol $app.port $index | lower }}
+    port: {{ $app.port }}
+    {{- if $app.hostname }}
+    hostname: {{ tpl $app.hostname $ }}
+    {{- end }}
+    protocol: {{ $app.protocol }}
     allowedRoutes:
       namespaces:
         from: All
-  {{- if .Values.global.certManagerEnabled}}
-  - name: https
+  {{- if and (eq $app.protocol "HTTP") ($.Values.global.certManagerEnabled) }}
+  - name: {{ printf "%s-%v-%d" "https" $app.port $index | lower }}
     port: 443
+    {{- if $app.hostname }}
+    hostname: {{ tpl $app.hostname $ }}
+    {{- end }}
     protocol: HTTPS
     tls:
       certificateRefs:
@@ -25,4 +32,4 @@ spec:
       namespaces:
         from: All
   {{- end }}
-  {{- with .Values.customListeners }}{{- toYaml . | nindent 2 }}{{- end }}
+  {{- end }}

charts/gateway/templates/drycc-route.yaml

@@ -0,0 +1,34 @@
+{{ range $index, $app := .Values.apps }}
+---
+apiVersion: gateway.networking.k8s.io/{{ if (eq $app.protocol "HTTP") }}v1beta1{{ else }}v1alpha2{{ end }}
+kind: {{ $app.protocol }}Route
+metadata:
+  name: {{ $app.name }}
+  labels:
+    app: {{ $app.name }}
+    chart: "{{ $.Chart.Name }}-{{ $.Chart.Version }}"
+    release: "{{ $.Release.Name }}"
+    heritage: "{{ $.Release.Service }}"
+spec:
+  {{- if $app.hostname }}
+  hostnames:
+  - {{ tpl $app.hostname $ }}
+  {{- end }}
+  parentRefs:
+  - group: gateway.networking.k8s.io
+    kind: Gateway
+    name: drycc-gateway
+    sectionName: {{ printf "%s-%v-%d" $app.protocol $app.port $index | lower }}
+ {{- if and (eq $app.protocol "HTTP") ($.Values.global.certManagerEnabled) }}
+  - group: gateway.networking.k8s.io
+    kind: Gateway
+    name: drycc-gateway
+    sectionName: {{ printf "%s-%v-%d" "https" $app.port $index | lower }}
+  {{- end }}
+  rules:
+  {{- range $service := $app.services }}
+  - backendRefs:
+    - name: {{ $service.name }}
+      port: {{ $service.port }}
+  {{- end }}
+{{- end }}

charts/gateway/values.yaml

@@ -5,17 +5,49 @@ acme:
   externalAccountBinding:
     keyID: ""
     keySecret: ""
-# This will be the hostname prefix that is used to build endpoints
-domainPrefixs:
-- drycc
-- drycc-rabbitmq
-- drycc-passport
-- drycc-influxdb
-- drycc-prometheus
-- drycc-monitor-grafana
-
-# custom listeners
-customListeners: []
+# gateway apps
+apps:
+  - name: drycc-builder
+    port: 2222
+    protocol: TCP
+    services:
+    - name: drycc-builder
+      port: 2222
+  - name: drycc-controller
+    port: 80
+    hostname: drycc.{{ .Values.global.platformDomain }}
+    protocol: HTTP
+    services:
+    - name: drycc-controller-api
+      port: 80
+  - name: drycc-rabbitmq
+    port: 80
+    hostname: drycc-rabbitmq.{{ .Values.global.platformDomain }}
+    protocol: HTTP
+    services:
+    - name: drycc-rabbitmq
+      port: 15672
+  - name: drycc-passport
+    port: 80
+    hostname: drycc-passport.{{ .Values.global.platformDomain }}
+    protocol: HTTP
+    services:
+    - name: drycc-passport
+      port: 80
+  - name: drycc-prometheus
+    port: 80
+    hostname: drycc-prometheus.{{ .Values.global.platformDomain }}
+    protocol: HTTP
+    services:
+    - name: drycc-prometheus
+      port: 9090
+  - name: drycc-monitor-grafana
+    port: 80
+    hostname: drycc-monitor-grafana.{{ .Values.global.platformDomain }}
+    protocol: HTTP
+    services:
+    - name: drycc-monitor-grafana
+      port: 80
 
 global:
   # Admin email, used for each component to send email to administrator
@@ -26,4 +58,4 @@ global:
   # This will be the hostname that is used to build endpoints such as "drycc.$HOSTNAME"
   platformDomain: ""
   # Whether certManagerEnabled is true to automatically generate drycc certificates
-  certManagerEnabled: true
+  certManagerEnabled: false