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.

Sign up for GitHub

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

migrate k8s ingress schema to v1 #901

Merged
merged 5 commits into from
Apr 27, 2022
Merged

migrate k8s ingress schema to v1 #901

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dd08402
migrate k8s ingress schema to v1
andrewpcone Mar 30, 2022
2038d94
Merge branch 'master' into schema_version_bump
robertdavidsmith Apr 1, 2022
ea1f695
Merge branch 'master' into schema_version_bump
andrewpcone Apr 15, 2022
10f0e99
Merge branch 'master' into schema_version_bump
andrewpcone Apr 26, 2022
36748e5
Merge branch 'master' into schema_version_bump
carlocamurri Apr 27, 2022
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
Next Next commit
migrate k8s ingress schema to v1
  • Loading branch information
@andrewpcone
andrewpcone committed Mar 30, 2022
commit dd0840202ef50cd56c729b625379c2c61255c393
9 changes: 6 additions & 3 deletions deployment/armada/templates/ingress.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: extensions/v1beta1
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: {{ .Values.ingress.nameOverride | default (include "armada.name" .) }}
Expand All @@ -25,9 +25,12 @@ spec:
http:
paths:
- path: /
pathType: ImplementationSpecific
backend:
serviceName: {{ include "armada.name" $root }}
servicePort: {{ $root.Values.applicationConfig.grpcPort }}
service:
name: {{ include "armada.name" $root }}
port:
number: {{ $root.Values.applicationConfig.grpcPort }}
{{ end }}
tls:
- hosts:
Expand Down
9 changes: 6 additions & 3 deletions deployment/armada/templates/ingressrest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: extensions/v1beta1
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: {{ .Values.ingress.nameOverride | default (include "armada.name" .) }}-rest
Expand All @@ -25,9 +25,12 @@ spec:
http:
paths:
- path: /api(/|$)(.*)
pathType: ImplementationSpecific
backend:
serviceName: {{ include "armada.name" $root }}
servicePort: {{ $root.Values.applicationConfig.httpPort }}
service:
name: {{ include "armada.name" $root }}
port:
number: {{ $root.Values.applicationConfig.httpPort }}
{{ end }}
tls:
- hosts:
Expand Down
9 changes: 6 additions & 3 deletions deployment/binoculars/templates/ingress.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: extensions/v1beta1
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: {{ include "binoculars.name" . }}
Expand All @@ -25,9 +25,12 @@ spec:
http:
paths:
- path: /
pathType: ImplementationSpecific
backend:
serviceName: {{ include "binoculars.name" $root }}
servicePort: {{ $root.Values.applicationConfig.grpcPort }}
service:
name: {{ include "binoculars.name" $root }}
port:
number: {{ $root.Values.applicationConfig.grpcPort }}
{{ end }}
tls:
- hosts:
Expand Down
9 changes: 6 additions & 3 deletions deployment/binoculars/templates/ingressrest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: extensions/v1beta1
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: {{ include "binoculars.name" . }}-rest
Expand All @@ -25,9 +25,12 @@ spec:
http:
paths:
- path: /api(/|$)(.*)
pathType: ImplementationSpecific
backend:
serviceName: {{ include "binoculars.name" $root }}
servicePort: {{ $root.Values.applicationConfig.httpPort }}
service:
name: {{ include "binoculars.name" $root }}
port:
number: {{ $root.Values.applicationConfig.httpPort }}
{{ end }}
tls:
- hosts:
Expand Down
9 changes: 6 additions & 3 deletions deployment/lookout/templates/ingressweb.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: extensions/v1beta1
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: {{ include "lookout.name" . }}-web
Expand All @@ -24,9 +24,12 @@ spec:
http:
paths:
- path: /
pathType: ImplementationSpecific
backend:
serviceName: {{ include "lookout.name" $root }}
servicePort: {{ $root.Values.applicationConfig.httpPort }}
service:
name: {{ include "lookout.name" $root }}
port:
number: {{ $root.Values.applicationConfig.httpPort }}
{{ end }}
tls:
- hosts:
Expand Down