Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

✨ Update k8s version in envtest #1269

Merged
merged 1 commit into from
Nov 19, 2020
Merged

✨ Update k8s version in envtest #1269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion hack/check-everything.sh
View file
Open in desktop
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
View file
Open in desktop
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
4 changes: 2 additions & 2 deletions pkg/internal/testing/integration/internal/integration_tests/etcd_integration_test.go
View file
Open in desktop
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:"))
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The help text for etcd seems to have this format:

Expected
      <string>:
      Member:
        --name 'default'
       ...

and:

  Expected
      <string>: Usage:

        etcd [flags]
          Start an etcd server.

})
})