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.

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

Update dependencies #27

Merged
merged 1 commit into from
Jan 24, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
strategy:
matrix:
include:
- kind-node-version: v1.20.0
- kind-node-version: v1.21.2
steps:
- uses: actions/checkout@v2
- name: Determine Go version from go.mod
Expand Down
8 changes: 2 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,8 @@ test: ## Run tests

# See https://storage.googleapis.com/kubebuilder-tools/ for list of supported K8s versions
#
# A note on 1.20.2:
# 1.20.2 is not (yet) supported, because starting the Kubernetes API controller with
# `--insecure-port` and `--insecure-bind-address` flags is now deprecated,
# but envtest was not updated accordingly.
#integration-test: export ENVTEST_K8S_VERSION = 1.20.2
integration-test: export ENVTEST_K8S_VERSION = 1.19.2
# 1.20.3 is not supported
zugao marked this conversation as resolved.
Show resolved Hide resolved
integration-test: export ENVTEST_K8S_VERSION = 1.21.2
integration-test: export KUBEBUILDER_ATTACH_CONTROL_PLANE_OUTPUT = $(INTEGRATION_TEST_DEBUG_OUTPUT)
integration-test: $(CROSSPLANE_CRDS) ## Run integration tests with envtest
test -f ${ENVTEST_ASSETS_DIR}/setup-envtest.sh || \
zugao marked this conversation as resolved.
Show resolved Hide resolved
Expand Down
2 changes: 1 addition & 1 deletion Makefile.vars.mk
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ DOCKER_CMD ?= docker
DOCKER_ARGS ?= --rm --user "$$(id -u)" --volume "$${PWD}:/src" --workdir /src

KIND_VERSION ?= 0.11.1
KIND_NODE_VERSION ?= v1.20.0
KIND_NODE_VERSION ?= v1.21.2
KIND ?= $(TESTBIN_DIR)/kind

ENABLE_LEADER_ELECTION ?= false
Expand Down
18 changes: 13 additions & 5 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,21 @@ go 1.16

require (
code.cloudfoundry.org/lager v2.0.0+incompatible
github.com/crossplane/crossplane-runtime v0.14.0
github.com/coreos/etcd v3.3.15+incompatible // indirect
github.com/crossplane/crossplane-runtime v0.15.1-0.20211029211307-c72bcdd922eb
github.com/go-openapi/strfmt v0.19.5 // indirect
github.com/gorilla/mux v1.8.0
github.com/hashicorp/go-getter v1.4.0 // indirect
github.com/pivotal-cf/brokerapi/v7 v7.5.0
github.com/stretchr/testify v1.7.0
github.com/vshn/crossplane-service-broker v0.6.0
k8s.io/api v0.20.1
k8s.io/client-go v0.20.1
sigs.k8s.io/controller-runtime v0.8.0
github.com/vshn/crossplane-service-broker v0.7.0
go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee // indirect
golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602 // indirect
gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e // indirect
k8s.io/api v0.21.3
k8s.io/client-go v0.21.3
k8s.io/klog v0.4.0 // indirect
sigs.k8s.io/controller-runtime v0.9.6
sigs.k8s.io/kustomize/kustomize/v3 v3.10.0
sigs.k8s.io/structured-merge-diff v0.0.0-20190817042607-6149e4549fca // indirect
)
258 changes: 258 additions & 0 deletions go.sum

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions pkg/custom/handler_test.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build integration
// +build integration

package custom
Expand Down
2 changes: 1 addition & 1 deletion testdata/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.19.2}"
k8s_version="${ENVTEST_K8S_VERSION:-1.21.2}"
goarch="$(go env GOARCH)"
goos="$(go env GOOS)"

Expand Down