Merge pull request #289 from justinsb/fix_kubectl_version

tests: run with a known version of kubectl

Author: k8s-ci-robot

bin/.gitignore

@@ -0,0 +1 @@
+kubectl

dev/update-golden

@@ -0,0 +1,22 @@
+#!/bin/bash
+
+# CI script to run tests in the mode where they write the golden output files
+set -o errexit
+set -o nounset
+set -o pipefail
+
+# cd to the repo root
+REPO_ROOT=$(git rev-parse --show-toplevel)
+cd "${REPO_ROOT}"
+
+# Ensure we run with a known version of kubectl
+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
+fi
+chmod +x bin/kubectl
+export PATH="${REPO_ROOT}/bin:$PATH"
+echo "kubectl version is $(kubectl version --client)"
+
+WRITE_GOLDEN_OUTPUT=1 go test -count=1 -v ./...

hack/ci/test.sh

@@ -24,10 +24,22 @@ REPO_ROOT=$(dirname "${BASH_SOURCE}")/../..
 source "${CI_ROOT}/fetch_kubebuilder_release_bin.sh"
 
 cd "${REPO_ROOT}"
+# Make sure REPO_ROOT is an absolute path
+REPO_ROOT=$(pwd)
+
+# Ensure we run with a known version of kubectl
+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
+fi
+chmod +x bin/kubectl
+export PATH="${REPO_ROOT}/bin:$PATH"
+echo "kubectl version is $(kubectl version --client)"
 
 export GO111MODULE=on
 
-go test sigs.k8s.io/kubebuilder-declarative-pattern/pkg/...
+go test -v -count=1 sigs.k8s.io/kubebuilder-declarative-pattern/pkg/...
 
 cd examples/guestbook-operator
 go test sigs.k8s.io/kubebuilder-declarative-pattern/examples/guestbook-operator/controllers/...

pkg/patterns/declarative/pkg/applier/exec_test.go

@@ -144,6 +144,18 @@ metadata:
 }
 
 func TestKubectlApplier(t *testing.T) {
+	kubectlPath, err := exec.LookPath("kubectl")
+	if err != nil {
+		t.Fatalf("failed to find kubectl on path: %v", err)
+	}
+	t.Logf("kubectl found at %q", kubectlPath)
+
+	kubectlVersion, err := exec.Command("kubectl", "version", "--client").CombinedOutput()
+	if err != nil {
+		t.Fatalf("failed to run kubectl version: %v", err)
+	}
+	t.Logf("kubectl version is %q", kubectlVersion)
+
 	applier := NewExec()
 	runApplierGoldenTests(t, "testdata/kubectl", true, applier)
 }

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

@@ -9,7 +9,7 @@ Kubectl-Command: kubectl apply
 ---
 
 GET /api?timeout=32s
-Accept: application/json, */*
+Accept: application/json;g=apidiscovery.k8s.io;v=v2beta1;as=APIGroupDiscoveryList,application/json
 Accept-Encoding: gzip
 Kubectl-Command: kubectl apply
 
@@ -28,8 +28,8 @@ Kubectl-Command: kubectl apply
 
 ---
 
-GET /api/v1?timeout=32s
-Accept: application/json, */*
+GET /apis?timeout=32s
+Accept: application/json;g=apidiscovery.k8s.io;v=v2beta1;as=APIGroupDiscoveryList,application/json
 Accept-Encoding: gzip
 Kubectl-Command: kubectl apply
 
@@ -38,7 +38,7 @@ Kubectl-Command: kubectl apply
 
 ---
 
-GET /apis?timeout=32s
+GET /apis/v1?timeout=32s
 Accept: application/json, */*
 Accept-Encoding: gzip
 Kubectl-Command: kubectl apply

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

@@ -9,7 +9,7 @@ Kubectl-Command: kubectl apply
 ---
 
 GET /api?timeout=32s
-Accept: application/json, */*
+Accept: application/json;g=apidiscovery.k8s.io;v=v2beta1;as=APIGroupDiscoveryList,application/json
 Accept-Encoding: gzip
 Kubectl-Command: kubectl apply
 
@@ -28,8 +28,8 @@ Kubectl-Command: kubectl apply
 
 ---
 
-GET /api/v1?timeout=32s
-Accept: application/json, */*
+GET /apis?timeout=32s
+Accept: application/json;g=apidiscovery.k8s.io;v=v2beta1;as=APIGroupDiscoveryList,application/json
 Accept-Encoding: gzip
 Kubectl-Command: kubectl apply
 
@@ -38,7 +38,7 @@ Kubectl-Command: kubectl apply
 
 ---
 
-GET /apis?timeout=32s
+GET /apis/v1?timeout=32s
 Accept: application/json, */*
 Accept-Encoding: gzip
 Kubectl-Command: kubectl apply

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

@@ -9,7 +9,7 @@ Kubectl-Command: kubectl apply
 ---
 
 GET /api?timeout=32s
-Accept: application/json, */*
+Accept: application/json;g=apidiscovery.k8s.io;v=v2beta1;as=APIGroupDiscoveryList,application/json
 Accept-Encoding: gzip
 Kubectl-Command: kubectl apply
 
@@ -28,8 +28,8 @@ Kubectl-Command: kubectl apply
 
 ---
 
-GET /api/v1?timeout=32s
-Accept: application/json, */*
+GET /apis?timeout=32s
+Accept: application/json;g=apidiscovery.k8s.io;v=v2beta1;as=APIGroupDiscoveryList,application/json
 Accept-Encoding: gzip
 Kubectl-Command: kubectl apply
 
@@ -38,7 +38,7 @@ Kubectl-Command: kubectl apply
 
 ---
 
-GET /apis?timeout=32s
+GET /apis/v1?timeout=32s
 Accept: application/json, */*
 Accept-Encoding: gzip
 Kubectl-Command: kubectl apply