From 9dfdc3b710385e6e9666cbbf65666616c48c5734 Mon Sep 17 00:00:00 2001 From: Mika Riekkinen Date: Wed, 31 Aug 2022 08:18:43 +0300 Subject: [PATCH 1/7] Changed Ingress version from extensions/v1beta1 to networking.k8s.io/v1 --- Chart.yaml | 4 ++-- templates/alb-ingress.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Chart.yaml b/Chart.yaml index 6f2e1e1..ab76d87 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 -appVersion: "0.1.6" +appVersion: "0.2.0" description: A Helm chart for deploying microservices name: cxcloud-deployment-chart -version: 0.1.6 +version: 0.2.0 diff --git a/templates/alb-ingress.yaml b/templates/alb-ingress.yaml index a0690a8..896510c 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 }} From 9c0cefa64dd24f5ae81f09663db9110b70bb25fa Mon Sep 17 00:00:00 2001 From: Mika Riekkinen Date: Wed, 1 Mar 2023 09:39:00 +0200 Subject: [PATCH 2/7] Fixed ingress for v1 --- Chart.yaml | 4 ++-- templates/alb-ingress.yaml | 14 ++++++++++---- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/Chart.yaml b/Chart.yaml index ab76d87..9bbe90c 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 -appVersion: "0.2.0" +appVersion: "0.2.1" description: A Helm chart for deploying microservices name: cxcloud-deployment-chart -version: 0.2.0 +version: 0.2.1 diff --git a/templates/alb-ingress.yaml b/templates/alb-ingress.yaml index 896510c..ad83e7c 100644 --- a/templates/alb-ingress.yaml +++ b/templates/alb-ingress.yaml @@ -48,14 +48,20 @@ spec: paths: {{- if .Values.awsLbController.redirectToHTTPSPort }} - 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 }} From d99dbf8529b5683a795bd2b185a6959624f68d31 Mon Sep 17 00:00:00 2001 From: Mika Riekkinen Date: Wed, 1 Mar 2023 11:12:03 +0200 Subject: [PATCH 3/7] Removed greater than comparison --- templates/alb-ingress.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/alb-ingress.yaml b/templates/alb-ingress.yaml index ad83e7c..4cc7fb9 100644 --- a/templates/alb-ingress.yaml +++ b/templates/alb-ingress.yaml @@ -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 }} From aeb339e380911e09e4f6a42bd5b003bad0013265 Mon Sep 17 00:00:00 2001 From: Mika Riekkinen Date: Wed, 1 Mar 2023 11:12:44 +0200 Subject: [PATCH 4/7] 0.2.2 --- Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Chart.yaml b/Chart.yaml index 9bbe90c..2ca7b70 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 -appVersion: "0.2.1" +appVersion: "0.2.2" description: A Helm chart for deploying microservices name: cxcloud-deployment-chart -version: 0.2.1 +version: 0.2.2 From c7818dd7faf38b5cd665491427b21da0c986bbe2 Mon Sep 17 00:00:00 2001 From: Mika Riekkinen Date: Wed, 1 Mar 2023 11:14:03 +0200 Subject: [PATCH 5/7] 0.2.2 --- cxcloud-deployment-chart-0.2.2.tgz | Bin 0 -> 5865 bytes index.yaml | 13 +++++++++++++ 2 files changed, 13 insertions(+) create mode 100644 cxcloud-deployment-chart-0.2.2.tgz create mode 100644 index.yaml diff --git a/cxcloud-deployment-chart-0.2.2.tgz b/cxcloud-deployment-chart-0.2.2.tgz new file mode 100644 index 0000000000000000000000000000000000000000..b3ec373d8c8b9de8dfe3b8b154aac53cf812465f GIT binary patch literal 5865 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 Date: Fri, 3 Nov 2023 13:53:15 +0200 Subject: [PATCH 6/7] Removed asterisk from the path for redirectToHTTPSPort --- templates/alb-ingress.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/alb-ingress.yaml b/templates/alb-ingress.yaml index 4cc7fb9..6491735 100644 --- a/templates/alb-ingress.yaml +++ b/templates/alb-ingress.yaml @@ -47,7 +47,7 @@ spec: - http: paths: {{- if .Values.awsLbController.redirectToHTTPSPort }} - - path: /* + - path: / pathType: Prefix backend: service: From 1a6b2e8aa6782f87d8f97a4984221dfa735b3a94 Mon Sep 17 00:00:00 2001 From: Mika Riekkinen Date: Fri, 3 Nov 2023 13:55:31 +0200 Subject: [PATCH 7/7] 0.2.3 --- Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Chart.yaml b/Chart.yaml index 2ca7b70..6a53132 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 -appVersion: "0.2.2" +appVersion: "0.2.3" description: A Helm chart for deploying microservices name: cxcloud-deployment-chart -version: 0.2.2 +version: 0.2.3