Use Prefix PathType in ingresses everywhere (#3094)

Signed-off-by: JamesMurkin <[email protected]> Co-authored-by: JamesMurkin <[email protected]>
armadaproject · Nov 10, 2023 · 949f011 · 949f011
1 parent 0db72d2
commit 949f011
Show file tree

Hide file tree

Showing 11 changed files with 12 additions and 12 deletions.
diff --git a/deployment/armada/templates/ingress.yaml b/deployment/armada/templates/ingress.yaml
@@ -31,7 +31,7 @@ spec:
     http:
       paths:
         - path: /
-          pathType: ImplementationSpecific
+          pathType: Prefix
           backend:
             service:
               name: {{ include "armada.name" $root }}

diff --git a/deployment/armada/templates/ingressrest.yaml b/deployment/armada/templates/ingressrest.yaml
@@ -30,7 +30,7 @@ spec:
     http:
       paths:
         - path: /api(/|$)(.*)
-          pathType: ImplementationSpecific
+          pathType: Prefix
           backend:
             service:
               name: {{ include "armada.name" $root }}

diff --git a/deployment/binoculars/templates/ingress.yaml b/deployment/binoculars/templates/ingress.yaml
@@ -30,7 +30,7 @@ spec:
     http:
       paths:
         - path: /
-          pathType: ImplementationSpecific
+          pathType: Prefix
           backend:
             service:
               name: {{ include "binoculars.name" $root }}

diff --git a/deployment/binoculars/templates/ingressrest.yaml b/deployment/binoculars/templates/ingressrest.yaml
@@ -29,7 +29,7 @@ spec:
     http:
       paths:
         - path: /api(/|$)(.*)
-          pathType: ImplementationSpecific
+          pathType: Prefix
           backend:
             service:
               name: {{ include "binoculars.name" $root }}

diff --git a/deployment/jobservice/templates/ingress.yaml b/deployment/jobservice/templates/ingress.yaml
@@ -30,7 +30,7 @@ spec:
     http:
       paths:
         - path: /
-          pathType: ImplementationSpecific
+          pathType: Prefix
           backend:
             service:
               name: {{ include "jobservice.name" $root }}

diff --git a/deployment/lookout-v2/templates/ingressweb.yaml b/deployment/lookout-v2/templates/ingressweb.yaml
@@ -24,7 +24,7 @@ spec:
     http:
       paths:
         - path: /
-          pathType: ImplementationSpecific
+          pathType: Prefix
           backend:
             service:
               name: {{ include "lookout_v2.name" $root }}

diff --git a/deployment/scheduler/templates/scheduler-ingress.yaml b/deployment/scheduler/templates/scheduler-ingress.yaml
@@ -30,7 +30,7 @@ spec:
     http:
       paths:
         - path: /
-          pathType: ImplementationSpecific
+          pathType: Prefix
           backend:
             service:
               name: {{ include "armada-scheduler.name" $root }}

diff --git a/internal/common/eventutil/eventutil_test.go b/internal/common/eventutil/eventutil_test.go
@@ -136,7 +136,7 @@ func TestK8sServicesIngressesFromApiJob(t *testing.T) {
 	)
 
 	expectedIngressRules := make([]networking.IngressRule, 2)
-	pathType := networking.PathTypeImplementationSpecific
+	pathType := networking.PathTypePrefix
 	for i, container := range apiJob.PodSpec.Containers {
 		expectedIngressRules[i] = networking.IngressRule{
 			Host: fmt.Sprintf("%s-%d-armada-%s-0.%s.%s",

diff --git a/internal/executor/reporter/event_test.go b/internal/executor/reporter/event_test.go
@@ -167,7 +167,7 @@ func createNodeAllocatedPod() *v1.Pod {
 }
 
 func createIngress(hostname string, port int32) *networking.Ingress {
-	pathType := networking.PathTypeImplementationSpecific
+	pathType := networking.PathTypePrefix
 	return &networking.Ingress{
 		Spec: networking.IngressSpec{
 			Rules: []networking.IngressRule{

diff --git a/internal/executor/util/kubernetes_object.go b/internal/executor/util/kubernetes_object.go
@@ -98,7 +98,7 @@ func CreateIngress(
 		tlsHosts = append(tlsHosts, host)
 
 		// Workaround to get constant's address
-		pathType := networking.PathTypeImplementationSpecific
+		pathType := networking.PathTypePrefix
 		path := networking.IngressRule{
 			Host: host,
 			IngressRuleValue: networking.IngressRuleValue{

diff --git a/internal/executor/util/kubernetes_objects_test.go b/internal/executor/util/kubernetes_objects_test.go
@@ -179,7 +179,7 @@ func TestCreateIngress_Basic(t *testing.T) {
 
 	result := CreateIngress("testIngress", job, pod, service, ingressConfig, jobConfig)
 
-	pathType := networking.PathTypeImplementationSpecific
+	pathType := networking.PathTypePrefix
 	expectedIngressSpec := networking.IngressSpec{
 		TLS: []networking.IngressTLS{},
 		Rules: []networking.IngressRule{
@@ -228,7 +228,7 @@ func TestCreateIngress_TLS(t *testing.T) {
 
 	result := CreateIngress("testIngress", job, pod, service, ingressConfig, jobConfig)
 
-	pathType := networking.PathTypeImplementationSpecific
+	pathType := networking.PathTypePrefix
 	expectedIngressSpec := networking.IngressSpec{
 		TLS: []networking.IngressTLS{
 			{