diff --git a/Chart.yaml b/Chart.yaml index 6f2e1e1..6a53132 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 -appVersion: "0.1.6" +appVersion: "0.2.3" description: A Helm chart for deploying microservices name: cxcloud-deployment-chart -version: 0.1.6 +version: 0.2.3 diff --git a/cxcloud-deployment-chart-0.2.2.tgz b/cxcloud-deployment-chart-0.2.2.tgz new file mode 100644 index 0000000..b3ec373 Binary files /dev/null and b/cxcloud-deployment-chart-0.2.2.tgz differ diff --git a/index.yaml b/index.yaml new file mode 100644 index 0000000..e445d75 --- /dev/null +++ b/index.yaml @@ -0,0 +1,13 @@ +apiVersion: v1 +entries: + cxcloud-deployment-chart: + - apiVersion: v1 + appVersion: 0.2.2 + created: "2023-03-01T11:13:52.248157+02:00" + description: A Helm chart for deploying microservices + digest: 061af283e690bdfe0d676ddbb027440fb2a92c983ea1642be8e6e456705ce8bd + name: cxcloud-deployment-chart + urls: + - https://github.com/cxcloud/helm-charts/raw/master/cxcloud-deployment-chart-0.2.2.tgz + version: 0.2.2 +generated: "2023-03-01T11:13:52.246416+02:00" diff --git a/templates/alb-ingress.yaml b/templates/alb-ingress.yaml index a0690a8..6491735 100644 --- a/templates/alb-ingress.yaml +++ b/templates/alb-ingress.yaml @@ -1,6 +1,6 @@ {{- if .Values.awsLbController.enabled -}} {{- $name := include "cxcloud-service.name" . -}} -apiVersion: extensions/v1beta1 +apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: {{ $name }} @@ -9,7 +9,7 @@ metadata: annotations: kubernetes.io/ingress.class: alb alb.ingress.kubernetes.io/group.name: {{ .Values.awsLbController.groupName }} - {{- if gt .Values.awsLbController.groupOrder 0.0 }} + {{- if .Values.awsLbController.groupOrder }} alb.ingress.kubernetes.io/group.order: {{ .Values.awsLbController.groupOrder | quote }} {{- end }} alb.ingress.kubernetes.io/scheme: {{ .Values.awsLbController.scheme }} @@ -47,15 +47,21 @@ spec: - http: paths: {{- if .Values.awsLbController.redirectToHTTPSPort }} - - path: /* + - path: / + pathType: Prefix backend: - serviceName: redirect-to-https - servicePort: use-annotation + service: + name: redirect-to-https + port: + name: use-annotation {{- end }} - path: {{ .Values.awsLbController.path }} + pathType: Prefix backend: - serviceName: {{ $name }} - servicePort: {{ .Values.service.ports.http.port }} + service: + name: {{ $name }} + port: + number: {{ .Values.service.ports.http.port }} {{- if .Values.awsLbController.host }} host: {{ .Values.awsLbController.host | quote }} {{- end }}