Skip to content

Commit 624f7ca

Browse files
michbeck100michbeck100
authored
feat: api7 adds ingress template (#110)
1 parent 69a734b commit 624f7ca

File tree

4 files changed

+153
-1
lines changed

4 files changed

+153
-1
lines changed

‎charts/api7/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ type: application
1515
# This is the chart version. This version number should be incremented each time you make changes
1616
# to the chart and its templates, including the app version.
1717
# Versions are expected to follow Semantic Versioning (https://semver.org/)
18-
version: 0.12.13
18+
version: 0.13.0
1919

2020
# This is the version number of the application being deployed. This version number should be
2121
# incremented each time you make changes to the application. Versions are not expected to

‎charts/api7/templates/dashboard-ingress.yaml‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
{{- if .Values.dashboard_service.ingress.enabled -}}
2+
{{- $fullName := include "api7ee3.fullname" . -}}
3+
{{- $svcPort := .Values.dashboard_service.port -}}
4+
{{- if and .Values.dashboard_service.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }}
5+
{{- if not (hasKey .Values.dashboard_service.ingress.annotations "kubernetes.io/ingress.class") }}
6+
{{- $_ := set .Values.dashboard_service.ingress.annotations "kubernetes.io/ingress.class" .Values.dashboard_service.ingress.className}}
7+
{{- end }}
8+
{{- end }}
9+
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
10+
apiVersion: networking.k8s.io/v1
11+
{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
12+
apiVersion: networking.k8s.io/v1beta1
13+
{{- else -}}
14+
apiVersion: extensions/v1beta1
15+
{{- end }}
16+
kind: Ingress
17+
metadata:
18+
name: {{ $fullName }}
19+
labels:
20+
{{- include "api7ee3.labels" . | nindent 4 }}
21+
{{- with .Values.dashboard_service.ingress.annotations }}
22+
annotations:
23+
{{- toYaml . | nindent 4 }}
24+
{{- end }}
25+
spec:
26+
{{- if and .Values.dashboard_service.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }}
27+
ingressClassName: {{ .Values.dashboard_service.ingress.className }}
28+
{{- end }}
29+
{{- if .Values.dashboard_service.ingress.tls }}
30+
tls:
31+
{{- range .Values.dashboard_service.ingress.tls }}
32+
- hosts:
33+
{{- range .hosts }}
34+
- {{ . | quote }}
35+
{{- end }}
36+
secretName: {{ .secretName }}
37+
{{- end }}
38+
{{- end }}
39+
rules:
40+
{{- range .Values.dashboard_service.ingress.hosts }}
41+
- host: {{ .host | quote }}
42+
http:
43+
paths:
44+
{{- range .paths }}
45+
- path: {{ .path }}
46+
{{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }}
47+
pathType: {{ .pathType }}
48+
{{- end }}
49+
backend:
50+
{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
51+
service:
52+
name: {{ $fullName }}
53+
port:
54+
number: {{ $svcPort }}
55+
{{- else }}
56+
serviceName: {{ $fullName }}
57+
servicePort: {{ $svcPort }}
58+
{{- end }}
59+
{{- end }}
60+
{{- end }}
61+
{{- end }}

‎charts/api7/templates/dp-manager-ingress.yaml‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
{{- if .Values.dp_manager_service.ingress.enabled -}}
2+
{{- $fullName := include "api7ee3.fullname" . -}}
3+
{{- $svcPort := .Values.dp_manager_service.port -}}
4+
{{- if and .Values.dp_manager_service.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }}
5+
{{- if not (hasKey .Values.dp_manager_service.ingress.annotations "kubernetes.io/ingress.class") }}
6+
{{- $_ := set .Values.dp_manager_service.ingress.annotations "kubernetes.io/ingress.class" .Values.dp_manager_service.ingress.className}}
7+
{{- end }}
8+
{{- end }}
9+
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
10+
apiVersion: networking.k8s.io/v1
11+
{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
12+
apiVersion: networking.k8s.io/v1beta1
13+
{{- else -}}
14+
apiVersion: extensions/v1beta1
15+
{{- end }}
16+
kind: Ingress
17+
metadata:
18+
name: {{ $fullName }}
19+
labels:
20+
{{- include "api7ee3.labels" . | nindent 4 }}
21+
{{- with .Values.dp_manager_service.ingress.annotations }}
22+
annotations:
23+
{{- toYaml . | nindent 4 }}
24+
{{- end }}
25+
spec:
26+
{{- if and .Values.dp_manager_service.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }}
27+
ingressClassName: {{ .Values.dp_manager_service.ingress.className }}
28+
{{- end }}
29+
{{- if .Values.dp_manager_service.ingress.tls }}
30+
tls:
31+
{{- range .Values.dp_manager_service.ingress.tls }}
32+
- hosts:
33+
{{- range .hosts }}
34+
- {{ . | quote }}
35+
{{- end }}
36+
secretName: {{ .secretName }}
37+
{{- end }}
38+
{{- end }}
39+
rules:
40+
{{- range .Values.dp_manager_service.ingress.hosts }}
41+
- host: {{ .host | quote }}
42+
http:
43+
paths:
44+
{{- range .paths }}
45+
- path: {{ .path }}
46+
{{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }}
47+
pathType: {{ .pathType }}
48+
{{- end }}
49+
backend:
50+
{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
51+
service:
52+
name: {{ $fullName }}
53+
port:
54+
number: {{ $svcPort }}
55+
{{- else }}
56+
serviceName: {{ $fullName }}
57+
servicePort: {{ $svcPort }}
58+
{{- end }}
59+
{{- end }}
60+
{{- end }}
61+
{{- end }}

‎charts/api7/values.yaml‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,41 @@ dashboard_service:
5050
type: ClusterIP
5151
port: 7080
5252
tlsPort: 7443
53+
ingress:
54+
enabled: false
55+
className: ""
56+
annotations: {}
57+
# kubernetes.io/ingress.class: nginx
58+
# kubernetes.io/tls-acme: "true"
59+
hosts:
60+
- host: dashboard.local
61+
paths:
62+
- path: /
63+
pathType: ImplementationSpecific
64+
tls: []
65+
# - secretName: dashboard-tls
66+
# hosts:
67+
# - dashboard.local
5368

5469
dp_manager_service:
5570
type: ClusterIP
5671
port: 7900
5772
tlsPort: 7943
73+
ingress:
74+
enabled: false
75+
className: ""
76+
annotations: {}
77+
# kubernetes.io/ingress.class: nginx
78+
# kubernetes.io/tls-acme: "true"
79+
hosts:
80+
- host: dp-manager.local
81+
paths:
82+
- path: /
83+
pathType: ImplementationSpecific
84+
tls: []
85+
# - secretName: dp-manager-tls
86+
# hosts:
87+
# - dp-manager.local
5888

5989
resources: {}
6090
# We usually recommend not to specify default resources and to leave this as a conscious

0 commit comments

Comments
 (0)