fix: k8s 1.18

Signed-off-by: Ashing Zheng <[email protected]>

Author: ronething

test/e2e/framework/manifests/nginx.yaml

@@ -143,17 +143,23 @@ spec:
       port: 443
       protocol: TCP
       targetPort: 443
+      {{ if eq .IngressVersion "v1" -}}
       appProtocol: https
+      {{ end -}}
     - name: ws
       port: 8080
       protocol: TCP
       targetPort: 80
+      {{ if eq .IngressVersion "v1" -}}
       appProtocol: kubernetes.io/ws
+      {{ end -}}
     - name: wss
       port: 8443
       protocol: TCP
       targetPort: 443
+      {{ if eq .IngressVersion "v1" -}}
       appProtocol: kubernetes.io/wss
+      {{ end -}}
   type: ClusterIP
 ---
 apiVersion: v1

test/e2e/framework/nginx.go

@@ -36,8 +36,9 @@ var (
 )
 
 type NginxOptions struct {
-	Namespace string
-	Replicas  *int32
+	Namespace      string
+	Replicas       *int32
+	IngressVersion string
 }
 
 func init() {
@@ -51,6 +52,7 @@ func init() {
 func (f *Framework) DeployNginx(opts NginxOptions) *corev1.Service {
 	buf := bytes.NewBuffer(nil)
 
+	opts.IngressVersion = IngressVersion
 	err := ngxSpecTpl.Execute(buf, opts)
 	f.GomegaT.Expect(err).ToNot(HaveOccurred(), "rendering nginx spec")
 

test/e2e/gatewayapi/httproute.go

@@ -2444,6 +2444,9 @@ spec:
 	})
 
 	Context("Test Service With AppProtocol", func() {
+		if framework.IngressVersion != "v1" {
+			Skip("skipping test in non-v1 ingress version")
+		}
 		var (
 			httproute = `
 apiVersion: gateway.networking.k8s.io/v1