diff --git a/build/cd/deploy.go b/build/cd/deploy.go index 121bd08a794ee8609e40131b0ee654969e470892..7db5f70ec6c8ad387752fde59ef2492fee255062 100644 --- a/build/cd/deploy.go +++ b/build/cd/deploy.go @@ -370,8 +370,9 @@ func createIngress(env string) *netv1.Ingress { APIVersion: "v1", }, ObjectMeta: metav1.ObjectMeta{ - Name: env, - Namespace: "cocsn", + Name: env, + Namespace: "cocsn", + Annotations: map[string]string{"nginx.ingress.kubernetes.io/grpc-backend": "true"}, }, Spec: netv1.IngressSpec{ Rules: []netv1.IngressRule{ @@ -381,10 +382,9 @@ func createIngress(env string) *netv1.Ingress { HTTP: &netv1.HTTPIngressRuleValue{ Paths: []netv1.HTTPIngressPath{ { - Path: "/api", Backend: netv1.IngressBackend{ ServiceName: env, - ServicePort: intstr.IntOrString{IntVal: 8080}, + ServicePort: intstr.IntOrString{IntVal: 55055}, }, }, }, diff --git a/build/ci/.test.yml b/build/ci/.test.yml index e4209b3bb7773f44ee961cfd6379ad9554645963..9324aa0e971cae11cb831d9e46e95887c6acd90b 100644 --- a/build/ci/.test.yml +++ b/build/ci/.test.yml @@ -6,7 +6,7 @@ integration-test: - job: "deploy:integration-test" variables: GOSDN_LOG: "nolog" - GOSDN_TEST_API_ENDPOINT: http://gosdn-$CI_COMMIT_SHA.apps.ocp.fbi.h-da.de/api + GOSDN_TEST_API_ENDPOINT: http://gosdn-$CI_COMMIT_SHA.apps.ocp.fbi.h-da.de rules: - if: $CI_NIGHTLY when: delayed diff --git a/test/integration/cmdIntegration_test.go b/test/integration/cmdIntegration_test.go index dd24e37caa1144b200e1aa47b9bc6f97ae77c298..8f88a4328d471354b30d78171343c25a4517cd0b 100644 --- a/test/integration/cmdIntegration_test.go +++ b/test/integration/cmdIntegration_test.go @@ -19,7 +19,7 @@ const unreachable = "203.0.113.10:6030" const testPath = "/system/config/hostname" var testAddress = "141.100.70.171:6030" -var testAPIEndpoint = "http://gosdn-latest.apps.ocp.fbi.h-da.de/api" +var testAPIEndpoint = "http://gosdn-latest.apps.ocp.fbi.h-da.de" var testUsername = "admin" var testPassword = "arista" var opt *tpb.TransportOption