Skip to content

Commit

Permalink
Merge pull request #1269 from varshaprasad96/update-k8s-version
Browse files Browse the repository at this point in the history
✨ Update k8s version in envtest
  • Loading branch information
k8s-ci-robot committed Nov 19, 2020
2 parents 8fe9e39 + c9c7097 commit 08cb9ee
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion hack/check-everything.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ source ${hack_dir}/setup-envtest.sh
tmp_root=/tmp
kb_root_dir=$tmp_root/kubebuilder

ENVTEST_K8S_VERSION=${ENVTEST_K8S_VERSION:-"1.16.4"}
ENVTEST_K8S_VERSION=${ENVTEST_K8S_VERSION:-"1.19.2"}

fetch_envtest_tools "$kb_root_dir"
fetch_envtest_tools "${hack_dir}/../pkg/internal/testing/integration/assets"
Expand Down
2 changes: 1 addition & 1 deletion hack/setup-envtest.sh
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ function fetch_envtest_tools {
tmp_root=/tmp
envtest_root_dir=$tmp_root/envtest

k8s_version="${ENVTEST_K8S_VERSION:-1.16.4}"
k8s_version="${ENVTEST_K8S_VERSION:-1.19.2}"
goarch="$(go env GOARCH)"
goos="$(go env GOOS)"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ var _ = Describe("Etcd", func() {
// for on StdErr
Expect(etcd.Start()).To(MatchError(ContainSubstring("timeout")))

Expect(stdout.String()).To(ContainSubstring("member flags"))
Expect(stderr.String()).To(ContainSubstring("usage: etcd"))
Expect(stdout.String()).To(ContainSubstring("Member:"))
Expect(stderr.String()).To(ContainSubstring("Usage:"))
})
})

0 comments on commit 08cb9ee

Please sign in to comment.