diff --git a/dev/update-golden b/dev/update-golden index 04099ce7..e4b0c943 100755 --- a/dev/update-golden +++ b/dev/update-golden @@ -13,7 +13,7 @@ cd "${REPO_ROOT}" if [[ ! -f "bin/kubectl" ]]; then echo "Downloading kubectl to bin/kubectl" mkdir -p bin/ - curl -L -o bin/kubectl https://dl.k8s.io/release/v1.26.0/bin/linux/amd64/kubectl + curl -L -o bin/kubectl https://dl.k8s.io/release/v1.32.1/bin/linux/amd64/kubectl fi chmod +x bin/kubectl export PATH="${REPO_ROOT}/bin:$PATH" diff --git a/hack/ci/test.sh b/hack/ci/test.sh index 7d489024..a8f3b244 100755 --- a/hack/ci/test.sh +++ b/hack/ci/test.sh @@ -31,7 +31,7 @@ REPO_ROOT=$(pwd) if [[ ! -f "bin/kubectl" ]]; then echo "Downloading kubectl to bin/kubectl" mkdir -p bin/ - curl -L -o bin/kubectl https://dl.k8s.io/release/v1.27.0/bin/linux/amd64/kubectl + curl -L -o bin/kubectl https://dl.k8s.io/release/v1.32.1/bin/linux/amd64/kubectl fi chmod +x bin/kubectl export PATH="${REPO_ROOT}/bin:$PATH" diff --git a/pkg/patterns/declarative/pkg/applier/testdata/kubectl/simple1/expected-apiserver.yaml b/pkg/patterns/declarative/pkg/applier/testdata/kubectl/simple1/expected-apiserver.yaml index e6b90cfe..d8d69daf 100644 --- a/pkg/patterns/declarative/pkg/applier/testdata/kubectl/simple1/expected-apiserver.yaml +++ b/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/com.github.proto-openapi.spec.v2@v1.0+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 diff --git a/pkg/patterns/declarative/pkg/applier/testdata/kubectl/simple2/expected-apiserver.yaml b/pkg/patterns/declarative/pkg/applier/testdata/kubectl/simple2/expected-apiserver.yaml index a610433c..87875f18 100644 --- a/pkg/patterns/declarative/pkg/applier/testdata/kubectl/simple2/expected-apiserver.yaml +++ b/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/com.github.proto-openapi.spec.v2@v1.0+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/com.github.proto-openapi.spec.v2@v1.0+protobuf +Accept-Encoding: gzip +Kubectl-Command: kubectl apply + + + --- PATCH /api/v1/namespaces/ns1?fieldManager=kubectl-client-side-apply&fieldValidation=Ignore diff --git a/pkg/patterns/declarative/pkg/applier/testdata/kubectl/simple3/expected-apiserver.yaml b/pkg/patterns/declarative/pkg/applier/testdata/kubectl/simple3/expected-apiserver.yaml index 137e3f21..93373c40 100644 --- a/pkg/patterns/declarative/pkg/applier/testdata/kubectl/simple3/expected-apiserver.yaml +++ b/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/com.github.proto-openapi.spec.v2@v1.0+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/com.github.proto-openapi.spec.v2@v1.0+protobuf +Accept-Encoding: gzip +Kubectl-Command: kubectl apply + + + --- GET /api/v1/namespaces/ns2