Fix test expectations with new API discovery requests

Author: tomasaschan

pkg/patterns/declarative/pkg/applier/testdata/kubectl/simple1/expected-apiserver.yaml

@@ -4,19 +4,10 @@ Accept-Encoding: gzip
 
 
 
----
-
-GET /openapi/v2?timeout=32s
-Accept: application/[email protected]+protobuf
-Accept-Encoding: gzip
-Kubectl-Command: kubectl apply
-
-
-
 ---
 
 GET /api?timeout=32s
-Accept: application/json;g=apidiscovery.k8s.io;v=v2beta1;as=APIGroupDiscoveryList,application/json
+Accept: application/json;g=apidiscovery.k8s.io;v=v2;as=APIGroupDiscoveryList,application/json;g=apidiscovery.k8s.io;v=v2beta1;as=APIGroupDiscoveryList,application/json
 Accept-Encoding: gzip
 Kubectl-Command: kubectl apply
 
@@ -34,7 +25,7 @@ Kubectl-Command: kubectl apply
 ---
 
 GET /apis?timeout=32s
-Accept: application/json;g=apidiscovery.k8s.io;v=v2beta1;as=APIGroupDiscoveryList,application/json
+Accept: application/json;g=apidiscovery.k8s.io;v=v2;as=APIGroupDiscoveryList,application/json;g=apidiscovery.k8s.io;v=v2beta1;as=APIGroupDiscoveryList,application/json
 Accept-Encoding: gzip
 Kubectl-Command: kubectl apply
 

pkg/patterns/declarative/pkg/applier/testdata/kubectl/simple2/expected-apiserver.yaml

@@ -4,19 +4,10 @@ Accept-Encoding: gzip
 
 
 
----
-
-GET /openapi/v2?timeout=32s
-Accept: application/[email protected]+protobuf
-Accept-Encoding: gzip
-Kubectl-Command: kubectl apply
-
-
-
 ---
 
 GET /api?timeout=32s
-Accept: application/json;g=apidiscovery.k8s.io;v=v2beta1;as=APIGroupDiscoveryList,application/json
+Accept: application/json;g=apidiscovery.k8s.io;v=v2;as=APIGroupDiscoveryList,application/json;g=apidiscovery.k8s.io;v=v2beta1;as=APIGroupDiscoveryList,application/json
 Accept-Encoding: gzip
 Kubectl-Command: kubectl apply
 
@@ -34,7 +25,7 @@ Kubectl-Command: kubectl apply
 ---
 
 GET /apis?timeout=32s
-Accept: application/json;g=apidiscovery.k8s.io;v=v2beta1;as=APIGroupDiscoveryList,application/json
+Accept: application/json;g=apidiscovery.k8s.io;v=v2;as=APIGroupDiscoveryList,application/json;g=apidiscovery.k8s.io;v=v2beta1;as=APIGroupDiscoveryList,application/json
 Accept-Encoding: gzip
 Kubectl-Command: kubectl apply
 
@@ -238,6 +229,24 @@ Kubectl-Command: kubectl apply
 
 
 
+---
+
+GET /openapi/v3?timeout=32s
+Accept: application/json, */*
+Accept-Encoding: gzip
+Kubectl-Command: kubectl apply
+
+
+
+---
+
+GET /openapi/v2?timeout=32s
+Accept: application/[email protected]+protobuf
+Accept-Encoding: gzip
+Kubectl-Command: kubectl apply
+
+
+
 ---
 
 PATCH /api/v1/namespaces/ns1?fieldManager=kubectl-client-side-apply&fieldValidation=Ignore

pkg/patterns/declarative/pkg/applier/testdata/kubectl/simple3/expected-apiserver.yaml

@@ -4,19 +4,10 @@ Accept-Encoding: gzip
 
 
 
----
-
-GET /openapi/v2?timeout=32s
-Accept: application/[email protected]+protobuf
-Accept-Encoding: gzip
-Kubectl-Command: kubectl apply
-
-
-
 ---
 
 GET /api?timeout=32s
-Accept: application/json;g=apidiscovery.k8s.io;v=v2beta1;as=APIGroupDiscoveryList,application/json
+Accept: application/json;g=apidiscovery.k8s.io;v=v2;as=APIGroupDiscoveryList,application/json;g=apidiscovery.k8s.io;v=v2beta1;as=APIGroupDiscoveryList,application/json
 Accept-Encoding: gzip
 Kubectl-Command: kubectl apply
 
@@ -34,7 +25,7 @@ Kubectl-Command: kubectl apply
 ---
 
 GET /apis?timeout=32s
-Accept: application/json;g=apidiscovery.k8s.io;v=v2beta1;as=APIGroupDiscoveryList,application/json
+Accept: application/json;g=apidiscovery.k8s.io;v=v2;as=APIGroupDiscoveryList,application/json;g=apidiscovery.k8s.io;v=v2beta1;as=APIGroupDiscoveryList,application/json
 Accept-Encoding: gzip
 Kubectl-Command: kubectl apply
 
@@ -238,6 +229,24 @@ Kubectl-Command: kubectl apply
 
 
 
+---
+
+GET /openapi/v3?timeout=32s
+Accept: application/json, */*
+Accept-Encoding: gzip
+Kubectl-Command: kubectl apply
+
+
+
+---
+
+GET /openapi/v2?timeout=32s
+Accept: application/[email protected]+protobuf
+Accept-Encoding: gzip
+Kubectl-Command: kubectl apply
+
+
+
 ---
 
 GET /api/v1/namespaces/ns2