Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changed Ingress version from extensions/v1beta1 to networking.k8s.io/v1 #3

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Chart.yaml
Original file line number Diff line number Diff line change
@@ -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
Binary file added cxcloud-deployment-chart-0.2.2.tgz
Binary file not shown.
13 changes: 13 additions & 0 deletions index.yaml
Original file line number Diff line number Diff line change
@@ -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"
20 changes: 13 additions & 7 deletions templates/alb-ingress.yaml
Original file line number Diff line number Diff line change
@@ -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 }}
Expand All @@ -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 }}
Expand Down Expand Up @@ -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 }}
Expand Down