diff --git a/hawkbit-extended-runtimes/hawkbit-update-server-azure/deployment/arm/hawkBitInfrastructureDeployment.json b/hawkbit-extended-runtimes/hawkbit-update-server-azure/deployment/arm/hawkBitInfrastructureDeployment.json index ec8db03..8b06ffe 100644 --- a/hawkbit-extended-runtimes/hawkbit-update-server-azure/deployment/arm/hawkBitInfrastructureDeployment.json +++ b/hawkbit-extended-runtimes/hawkbit-update-server-azure/deployment/arm/hawkBitInfrastructureDeployment.json @@ -255,6 +255,9 @@ "uri": "https://raw.githubusercontent.com/eclipse/hawkbit-extensions/master/hawkbit-extended-runtimes/hawkbit-update-server-azure/deployment/arm/templates/kubernetesDeploy.json" }, "parameters": { + "kubernetesVersion": { + "value": "1.22.6" + }, "clusterName": { "value": "[variables('aksClusterName')]" }, diff --git a/hawkbit-extended-runtimes/hawkbit-update-server-azure/deployment/arm/templates/kubernetesDeploy.json b/hawkbit-extended-runtimes/hawkbit-update-server-azure/deployment/arm/templates/kubernetesDeploy.json index 4a03e0f..0cf4975 100644 --- a/hawkbit-extended-runtimes/hawkbit-update-server-azure/deployment/arm/templates/kubernetesDeploy.json +++ b/hawkbit-extended-runtimes/hawkbit-update-server-azure/deployment/arm/templates/kubernetesDeploy.json @@ -4,7 +4,7 @@ "parameters": { "kubernetesVersion": { "type": "string", - "defaultValue": "1.17.9", + "defaultValue": "1.22.6", "metadata": { "description": "Kubernetes version." } diff --git a/hawkbit-extended-runtimes/hawkbit-update-server-azure/deployment/helm/hawkbit/templates/ingress.yaml b/hawkbit-extended-runtimes/hawkbit-update-server-azure/deployment/helm/hawkbit/templates/ingress.yaml index 067ab96..5159edb 100644 --- a/hawkbit-extended-runtimes/hawkbit-update-server-azure/deployment/helm/hawkbit/templates/ingress.yaml +++ b/hawkbit-extended-runtimes/hawkbit-update-server-azure/deployment/helm/hawkbit/templates/ingress.yaml @@ -1,7 +1,7 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "hawkbit.fullname" . -}} {{- $ingressPaths := .Values.ingress.paths -}} -apiVersion: networking.k8s.io/v1beta1 +apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: {{ $fullName }} @@ -30,15 +30,18 @@ spec: paths: {{- range $ingressPaths }} - path: {{ . }} + pathType: Prefix backend: - serviceName: {{ $fullName }} - servicePort: http + service: + name: {{ $fullName }} + port: + name: http {{- end }} {{- end }} {{- end }} {{- if .Values.ingress.tls.enabled }} --- -apiVersion: cert-manager.io/v1alpha2 +apiVersion: cert-manager.io/v1 kind: Issuer metadata: name: letsencrypt-prod @@ -53,7 +56,7 @@ spec: ingress: class: nginx --- -apiVersion: cert-manager.io/v1alpha2 +apiVersion: cert-manager.io/v1 kind: Issuer metadata: name: letsencrypt-staging