feat(monitor): add ingress for monitor

Author: duanhongyi

charts/monitor/charts/grafana/templates/monitor-grafana-certificate.yaml

@@ -0,0 +1,16 @@
+{{ if .Values.cert_manager_enabled }}
+apiVersion: cert-manager.io/v1alpha2
+kind: Certificate
+metadata:
+  name: drycc-monitor-grafana
+  namespace: "{{ .Release.Namespace }}"
+spec:
+  secretName: drycc-monitor-grafana-auto-tls
+  issuerRef:
+    name: drycc-cluster-issuer
+    kind: ClusterIssuer
+  dnsNames:
+  - drycc.{{ .Values.platform_domain }}
+  privateKey:
+    rotationPolicy: Always
+{{- end }}

charts/monitor/charts/grafana/templates/monitor-grafana-ingress.yaml

@@ -0,0 +1,34 @@
+apiVersion: networking.k8s.io/v1beta1
+kind: Ingress
+metadata:
+  namespace: "{{ .Release.Namespace }}"
+  name: "drycc-monitor-grafana-ingress"
+  labels:
+    app: "drycc-monitor-grafana"
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    release: "{{ .Release.Name }}"
+    heritage: "{{ .Release.Service }}"
+  annotations:
+    kubernetes.io/tls-acme: "true"
+    {{- if not (eq .Values.global.ingress_class "") }}
+    kubernetes.io/ingress.class: "{{ .Values.global.ingress_class }}"
+    {{ end }}
+spec:
+  rules:
+  - host: drycc.{{ .Values.platform_domain }}
+    http:
+      paths:
+      {{- if eq .Values.global.ingress_class "gce" "alb" }}
+      - path: /*
+      {{- else }}{{/* Has annotations but ingress class is not "gce" nor "alb" */}}
+      - path: /
+      {{- end }}
+        backend:
+          serviceName: drycc-monitor-grafana
+          servicePort: 80
+  {{ if .Values.cert_manager_enabled }}
+  tls:
+    - secretName: drycc-monitor-grafana-auto-tls
+      hosts:
+        - drycc-monitor-grafana.{{ .Values.platform_domain }}
+  {{- end }}

charts/monitor/charts/grafana/templates/monitor-grafana-svc.yaml

@@ -6,11 +6,6 @@ metadata:
   labels:
     heritage: drycc
     app: drycc-monitor-grafana
-    router.drycc.cc/routable: "true"
-  annotations:
-    router.drycc.cc/domains: grafana
-    router.drycc.cc/connectTimeout: "10"
-    router.drycc.cc/tcpTimeout: "1200"
 spec:
   ports:
   - port: 80

charts/monitor/charts/influxdb/templates/monitor-influxdb-api-certificate.yaml

@@ -0,0 +1,16 @@
+{{ if .Values.cert_manager_enabled }}
+apiVersion: cert-manager.io/v1alpha2
+kind: Certificate
+metadata:
+  name: drycc-monitor-influxapi
+  namespace: "{{ .Release.Namespace }}"
+spec:
+  secretName: drycc-monitor-influxapi-auto-tls
+  issuerRef:
+    name: drycc-cluster-issuer
+    kind: ClusterIssuer
+  dnsNames:
+  - drycc.{{ .Values.platform_domain }}
+  privateKey:
+    rotationPolicy: Always
+{{- end }}

charts/monitor/charts/influxdb/templates/monitor-influxdb-api-ingress.yaml

@@ -0,0 +1,34 @@
+apiVersion: networking.k8s.io/v1beta1
+kind: Ingress
+metadata:
+  namespace: "{{ .Release.Namespace }}"
+  name: "drycc-monitor-influxapi-ingress"
+  labels:
+    app: "drycc-monitor-influxapi"
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    release: "{{ .Release.Name }}"
+    heritage: "{{ .Release.Service }}"
+  annotations:
+    kubernetes.io/tls-acme: "true"
+    {{- if not (eq .Values.global.ingress_class "") }}
+    kubernetes.io/ingress.class: "{{ .Values.global.ingress_class }}"
+    {{ end }}
+spec:
+  rules:
+  - host: drycc.{{ .Values.platform_domain }}
+    http:
+      paths:
+      {{- if eq .Values.global.ingress_class "gce" "alb" }}
+      - path: /*
+      {{- else }}{{/* Has annotations but ingress class is not "gce" nor "alb" */}}
+      - path: /
+      {{- end }}
+        backend:
+          serviceName: drycc-monitor-influxapi
+          servicePort: 80
+  {{ if .Values.cert_manager_enabled }}
+  tls:
+    - secretName: drycc-monitor-influxapi-auto-tls
+      hosts:
+        - drycc-monitor-influxapi.{{ .Values.platform_domain }}
+  {{- end }}

charts/monitor/charts/influxdb/templates/monitor-influxdb-api-svc.yaml

@@ -6,11 +6,6 @@ metadata:
   labels:
     heritage: drycc
     app: drycc-monitor-influxapi
-    router.drycc.cc/routable: "true"
-  annotations:
-    router.drycc.cc/domains: influxapi
-    router.drycc.cc/connectTimeout: "10"
-    router.drycc.cc/tcpTimeout: "1200"
 spec:
   ports:
   - port: 80

charts/monitor/charts/influxdb/templates/monitor-influxdb-ui-certificate.yaml

@@ -0,0 +1,16 @@
+{{ if .Values.cert_manager_enabled }}
+apiVersion: cert-manager.io/v1alpha2
+kind: Certificate
+metadata:
+  name: drycc-monitor-influxui
+  namespace: "{{ .Release.Namespace }}"
+spec:
+  secretName: drycc-monitor-influxui-auto-tls
+  issuerRef:
+    name: drycc-cluster-issuer
+    kind: ClusterIssuer
+  dnsNames:
+  - drycc.{{ .Values.platform_domain }}
+  privateKey:
+    rotationPolicy: Always
+{{- end }}

charts/monitor/charts/influxdb/templates/monitor-influxdb-ui-ingress.yaml

@@ -0,0 +1,34 @@
+apiVersion: networking.k8s.io/v1beta1
+kind: Ingress
+metadata:
+  namespace: "{{ .Release.Namespace }}"
+  name: "drycc-monitor-influxui-ingress"
+  labels:
+    app: "drycc-monitor-influxui"
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    release: "{{ .Release.Name }}"
+    heritage: "{{ .Release.Service }}"
+  annotations:
+    kubernetes.io/tls-acme: "true"
+    {{- if not (eq .Values.global.ingress_class "") }}
+    kubernetes.io/ingress.class: "{{ .Values.global.ingress_class }}"
+    {{ end }}
+spec:
+  rules:
+  - host: drycc.{{ .Values.platform_domain }}
+    http:
+      paths:
+      {{- if eq .Values.global.ingress_class "gce" "alb" }}
+      - path: /*
+      {{- else }}{{/* Has annotations but ingress class is not "gce" nor "alb" */}}
+      - path: /
+      {{- end }}
+        backend:
+          serviceName: drycc-monitor-influxui
+          servicePort: 80
+  {{ if .Values.cert_manager_enabled }}
+  tls:
+    - secretName: drycc-monitor-influxui-auto-tls
+      hosts:
+        - drycc-monitor-influxui.{{ .Values.platform_domain }}
+  {{- end }}

charts/monitor/charts/influxdb/templates/monitor-influxdb-ui-svc.yaml

@@ -6,11 +6,6 @@ metadata:
   labels:
     heritage: drycc
     app: drycc-monitor-influxui
-    router.drycc.cc/routable: "true"
-  annotations:
-    router.drycc.cc/domains: influx
-    router.drycc.cc/connectTimeout: "10"
-    router.drycc.cc/tcpTimeout: "1200"
 spec:
   ports:
   - port: 80