diff --git a/.gitignore b/.gitignore index 0d8901ffb..e30d6282f 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,4 @@ ehthumbs.db # Helm chart # Chart dependencies /helm/wekan/**/*.tgz +/helm/wekan/charts diff --git a/helm/wekan/Chart.yaml b/helm/wekan/Chart.yaml index e324da3d8..b89c2fbf9 100644 --- a/helm/wekan/Chart.yaml +++ b/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 diff --git a/helm/wekan/charts/.gitkeep b/helm/wekan/charts/.gitkeep deleted file mode 100644 index 8b1378917..000000000 --- a/helm/wekan/charts/.gitkeep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/helm/wekan/templates/ingress.yaml b/helm/wekan/templates/ingress.yaml index 6904cdfa7..67ef37d32 100644 --- a/helm/wekan/templates/ingress.yaml +++ b/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 }} diff --git a/helm/wekan/templates/tests/test-http.yaml b/helm/wekan/templates/tests/test-http.yaml new file mode 100644 index 000000000..2ed7e7518 --- /dev/null +++ b/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 diff --git a/helm/wekan/values.yaml b/helm/wekan/values.yaml index 5fc9be2ef..0aea1215b 100644 --- a/helm/wekan/values.yaml +++ b/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 ]