瀏覽代碼

Merge pull request #4208 from varac/kubernetes_1.22

Kubernetes 1.22 support and basic helm test
Lauri Ojansivu 3 年之前
父節點
當前提交
fc6c4f85f0

+ 1 - 0
.gitignore

@@ -38,3 +38,4 @@ ehthumbs.db
 # Helm chart
 # Chart dependencies
 /helm/wekan/**/*.tgz
+/helm/wekan/charts

+ 1 - 1
helm/wekan/Chart.yaml

@@ -21,4 +21,4 @@ name: wekan
 sources:
   - https://github.com/wekan/wekan
 type: application
-version: 1.1.0
+version: 1.1.1

+ 0 - 1
helm/wekan/charts/.gitkeep

@@ -1 +0,0 @@
-

+ 7 - 6
helm/wekan/templates/ingress.yaml

@@ -2,7 +2,8 @@
 {{- $fullName := include "wekan.fullname" . -}}
 {{- $servicePort := .Values.service.port -}}
 {{- $ingressPath := .Values.ingress.path -}}
-apiVersion: networking.k8s.io/v1beta1
+{{- $ingressPathType := .Values.ingress.pathtype -}}
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ $fullName }}
@@ -27,17 +28,17 @@ spec:
       secretName: {{ .secretName }}
   {{- end }}
 {{- end }}
-  backend:
-    serviceName: {{ $fullName }}
-    servicePort: 8080
   rules:
   {{- range .Values.ingress.hosts }}
     - host: {{ . }}
       http:
         paths:
           - path: {{ $ingressPath }}
+            pathType: {{ $ingressPathType }}
             backend:
-              serviceName: {{ $fullName }}
-              servicePort: 8080
+              service:
+                name: {{ $fullName }}
+                port:
+                  number: 8080
   {{- end }}
 {{- end }}

+ 19 - 0
helm/wekan/templates/tests/test-http.yaml

@@ -0,0 +1,19 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: "{{ template "wekan.fullname" . }}-test-http"
+  labels:
+    app: {{ template "wekan.name" . }}
+    chart: {{ template "wekan.chart" . }}
+    component: wekan
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+  annotations:
+    "helm.sh/hook": test
+spec:
+  containers:
+    - name: wget
+      image: busybox
+      command: ['wget', '-O', '/dev/stdout']
+      args: ['{{ template "wekan.fullname" . }}:{{ .Values.service.port }}']
+  restartPolicy: Never

+ 2 - 1
helm/wekan/values.yaml

@@ -14,7 +14,7 @@ serviceAccounts:
 ##
 image:
   repository: quay.io/wekan/wekan
-  tag: v5.83
+  tag: v5.65
   pullPolicy: IfNotPresent
 
 ## Configuration for wekan component
@@ -56,6 +56,7 @@ ingress:
     # kubernetes.io/ingress.class: nginx
     # kubernetes.io/tls-acme: "true"
   path: /*
+  pathtype: ImplementationSpecific
   # This must match 'endpoint', unless your client supports different
   # hostnames.
   hosts: [ wekan.local ]