[OSSM-5574] Update GatewayAPI version for OSSM2.5 (#649)

* [OSSM-5574] Update GatewayAPI version for OSSM2.5

* [OSSM-5550] Update service type in GatewayAPI test to work in OCP on PSI

pkg/tests/tasks/traffic/ingress/gatewayapi_test.go

@@ -1,12 +1,14 @@
 package ingress
 
 import (
+ "fmt"
  "testing"
 
  "github.com/maistra/maistra-test-tool/pkg/app"
  "github.com/maistra/maistra-test-tool/pkg/tests/ossm"
  "github.com/maistra/maistra-test-tool/pkg/util/check/assert"
  "github.com/maistra/maistra-test-tool/pkg/util/env"
+ "github.com/maistra/maistra-test-tool/pkg/util/gatewayapi"
  "github.com/maistra/maistra-test-tool/pkg/util/oc"
  "github.com/maistra/maistra-test-tool/pkg/util/pod"
  "github.com/maistra/maistra-test-tool/pkg/util/retry"
@@ -28,7 +30,8 @@ func TestGatewayApi(t *testing.T) {
  ossm.DeployControlPlane(t)
 
  t.LogStep("Install Gateway API CRD's")
- shell.Executef(t, "kubectl get crd gateways.gateway.networking.k8s.io &> /dev/null && echo 'Gateway API CRDs already installed' || kubectl apply -k github.com/kubernetes-sigs/gateway-api/config/crd/experimental?ref=v0.5.1")
+ shell.Executef(t, "kubectl get crd gateways.gateway.networking.k8s.io &> /dev/null && echo 'Gateway API CRDs already installed' || kubectl apply -k github.com/kubernetes-sigs/gateway-api/config/crd/experimental?ref=%s",
+ gatewayapi.GetSupportedVersion(env.GetSMCPVersion()))
 
  oc.CreateNamespace(t, ns)
 
@@ -82,14 +85,14 @@ func TestGatewayApi(t *testing.T) {
  })
 
  t.LogStep("Wait for Gateway to be ready")
- oc.WaitCondition(t, ns, "Gateway", "gateway", "Ready")
+ oc.WaitCondition(t, ns, "Gateway", "gateway", gatewayapi.GetWaitingCondition(env.GetSMCPVersion()))
 
  t.LogStep("Verfiy the GatewayApi access the httpbin service using curl")
  retry.UntilSuccess(t, func(t TestHelper) {
  oc.Exec(t,
  pod.MatchingSelector("app=istio-ingressgateway", meshNamespace),
  "istio-proxy",
- "curl http://gateway.foo.svc.cluster.local:8080/get -H Host:httpbin.example.com -s -o /dev/null -w %{http_code}",
+ fmt.Sprintf("curl http://%s.foo.svc.cluster.local:8080/get -H Host:httpbin.example.com -s -o /dev/null -w %%{http_code}", gatewayapi.GetDefaultServiceName(env.GetSMCPVersion(), "gateway", "istio")),
  assert.OutputContains("200",
  "Access the httpbin service with GatewayApi",
  "Unable to access the httpbin service with GatewayApi"))
@@ -128,14 +131,14 @@ func TestGatewayApi(t *testing.T) {
  })
 
  t.LogStep("Wait for Gateway to be ready")
- oc.WaitCondition(t, ns, "Gateway", "gateway", "Ready")
+ oc.WaitCondition(t, ns, "Gateway", "gateway", gatewayapi.GetWaitingCondition(env.GetSMCPVersion()))
 
  t.LogStep("Verify the Gateway-Controller Profile access the httpbin service using curl")
  retry.UntilSuccess(t, func(t TestHelper) {
  oc.Exec(t,
  pod.MatchingSelector("app=istiod", meshNamespace),
  "discovery",
- "curl http://gateway.foo.svc.cluster.local:8080/get -H Host:httpbin.example.com -s -o /dev/null -w %{http_code}",
+ fmt.Sprintf("curl http://%s.foo.svc.cluster.local:8080/get -H Host:httpbin.example.com -s -o /dev/null -w %%{http_code}", gatewayapi.GetDefaultServiceName(env.GetSMCPVersion(), "gateway", "ocp")),
  assert.OutputContains("200",
  "Access the httpbin service with GatewayApi",
  "Unable to access the httpbin service with GatewayApi"))
@@ -149,6 +152,8 @@ const gatewayAndRouteYAML = `
 apiVersion: gateway.networking.k8s.io/v1beta1
 kind: Gateway
 metadata:
+ annotations:
+ networking.istio.io/service-type: "ClusterIP"
  name: gateway
 spec:
  gatewayClassName: {{ .GatewayClassName }}

pkg/util/gatewayapi/gatewayapi.go

@@ -0,0 +1,44 @@
+package gatewayapi
+
+import (
+ "github.com/maistra/maistra-test-tool/pkg/util/version"
+)
+
+func GetSupportedVersion(smcp version.Version) string {
+ switch smcp {
+ case version.SMCP_2_3:
+ return "v0.5.1"
+ case version.SMCP_2_4:
+ return "v0.5.1"
+ case version.SMCP_2_5:
+ return "v0.6.2"
+ default:
+ return "v0.6.2"
+ }
+}
+
+func GetDefaultServiceName(smcp version.Version, gatewayName string, className string) string {
+ switch smcp {
+ case version.SMCP_2_3:
+ return gatewayName
+ case version.SMCP_2_4:
+ return gatewayName
+ case version.SMCP_2_5:
+ return gatewayName + "-" + className
+ default:
+ return gatewayName + "-" + className
+ }
+}
+
+func GetWaitingCondition(smcp version.Version) string {
+ switch smcp {
+ case version.SMCP_2_3:
+ return "Ready"
+ case version.SMCP_2_4:
+ return "Ready"
+ case version.SMCP_2_5:
+ return "Programmed"
+ default:
+ return "Programmed"
+ }
+}