migrate k8s ingress schema to v1 (#901)

armadaproject · Apr 27, 2022 · 59a35a5 · 59a35a5
1 parent 05630db
commit 59a35a5
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 15 deletions.
diff --git a/deployment/armada/templates/ingress.yaml b/deployment/armada/templates/ingress.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ .Values.ingress.nameOverride | default (include "armada.name" .) }}
@@ -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:

diff --git a/deployment/armada/templates/ingressrest.yaml b/deployment/armada/templates/ingressrest.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ .Values.ingress.nameOverride | default (include "armada.name" .) }}-rest
@@ -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:

diff --git a/deployment/binoculars/templates/ingress.yaml b/deployment/binoculars/templates/ingress.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ include "binoculars.name" . }}
@@ -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:

diff --git a/deployment/binoculars/templates/ingressrest.yaml b/deployment/binoculars/templates/ingressrest.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ include "binoculars.name" . }}-rest
@@ -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:

diff --git a/deployment/lookout/templates/ingressweb.yaml b/deployment/lookout/templates/ingressweb.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ include "lookout.name" . }}-web
@@ -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: