diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3692f4ed..00487c73 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,7 +10,7 @@ on: env: # Common versions - GO_VERSION: '1.16' + GO_VERSION: '1.17' GOLANGCI_VERSION: 'v1.31' DOCKER_BUILDX_VERSION: 'v0.4.2' @@ -75,6 +75,7 @@ jobs: uses: golangci/golangci-lint-action@v2 with: version: ${{ env.GOLANGCI_VERSION }} + skip-go-installation: true check-diff: runs-on: ubuntu-18.04 diff --git a/Makefile b/Makefile index 21ce0a59..4e83d3c0 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ PLATFORMS ?= linux_amd64 linux_arm64 # kind-related versions KIND_VERSION ?= v0.11.1 -KIND_NODE_IMAGE_TAG ?= v1.19.11 +KIND_NODE_IMAGE_TAG ?= v1.23.1 # -include will silently skip missing files, which allows us # to load those files with a target in the Makefile. If only # "include" was used, the make command would fail and refuse diff --git a/apis/cache/v1beta1/zz_generated.deepcopy.go b/apis/cache/v1beta1/zz_generated.deepcopy.go index 3060695c..3dc467bf 100644 --- a/apis/cache/v1beta1/zz_generated.deepcopy.go +++ b/apis/cache/v1beta1/zz_generated.deepcopy.go @@ -1,3 +1,4 @@ +//go:build !ignore_autogenerated // +build !ignore_autogenerated /* diff --git a/apis/compute/v1alpha3/zz_generated.deepcopy.go b/apis/compute/v1alpha3/zz_generated.deepcopy.go index 50b9a2aa..8384721e 100644 --- a/apis/compute/v1alpha3/zz_generated.deepcopy.go +++ b/apis/compute/v1alpha3/zz_generated.deepcopy.go @@ -1,3 +1,4 @@ +//go:build !ignore_autogenerated // +build !ignore_autogenerated /* diff --git a/apis/database/v1alpha3/zz_generated.deepcopy.go b/apis/database/v1alpha3/zz_generated.deepcopy.go index 9b34394c..0f0837af 100644 --- a/apis/database/v1alpha3/zz_generated.deepcopy.go +++ b/apis/database/v1alpha3/zz_generated.deepcopy.go @@ -1,3 +1,4 @@ +//go:build !ignore_autogenerated // +build !ignore_autogenerated /* diff --git a/apis/database/v1beta1/zz_generated.deepcopy.go b/apis/database/v1beta1/zz_generated.deepcopy.go index c6c0e0f6..0b309339 100644 --- a/apis/database/v1beta1/zz_generated.deepcopy.go +++ b/apis/database/v1beta1/zz_generated.deepcopy.go @@ -1,3 +1,4 @@ +//go:build !ignore_autogenerated // +build !ignore_autogenerated /* diff --git a/apis/dns/v1alpha1/zz_generated.deepcopy.go b/apis/dns/v1alpha1/zz_generated.deepcopy.go index 7b3d8fa7..6076abfe 100644 --- a/apis/dns/v1alpha1/zz_generated.deepcopy.go +++ b/apis/dns/v1alpha1/zz_generated.deepcopy.go @@ -1,3 +1,4 @@ +//go:build !ignore_autogenerated // +build !ignore_autogenerated /* diff --git a/apis/keyvault/v1alpha1/zz_generated.deepcopy.go b/apis/keyvault/v1alpha1/zz_generated.deepcopy.go index d26f5f19..3a688fc1 100644 --- a/apis/keyvault/v1alpha1/zz_generated.deepcopy.go +++ b/apis/keyvault/v1alpha1/zz_generated.deepcopy.go @@ -1,3 +1,4 @@ +//go:build !ignore_autogenerated // +build !ignore_autogenerated /* diff --git a/apis/network/v1alpha3/zz_generated.deepcopy.go b/apis/network/v1alpha3/zz_generated.deepcopy.go index 50ef2c2d..cbf863ff 100644 --- a/apis/network/v1alpha3/zz_generated.deepcopy.go +++ b/apis/network/v1alpha3/zz_generated.deepcopy.go @@ -1,3 +1,4 @@ +//go:build !ignore_autogenerated // +build !ignore_autogenerated /* diff --git a/apis/storage/v1alpha3/zz_generated.deepcopy.go b/apis/storage/v1alpha3/zz_generated.deepcopy.go index 91e358f9..56517093 100644 --- a/apis/storage/v1alpha3/zz_generated.deepcopy.go +++ b/apis/storage/v1alpha3/zz_generated.deepcopy.go @@ -1,3 +1,4 @@ +//go:build !ignore_autogenerated // +build !ignore_autogenerated /* diff --git a/apis/v1alpha3/zz_generated.deepcopy.go b/apis/v1alpha3/zz_generated.deepcopy.go index 05c6b17e..f71ed288 100644 --- a/apis/v1alpha3/zz_generated.deepcopy.go +++ b/apis/v1alpha3/zz_generated.deepcopy.go @@ -1,3 +1,4 @@ +//go:build !ignore_autogenerated // +build !ignore_autogenerated /* diff --git a/apis/v1beta1/zz_generated.deepcopy.go b/apis/v1beta1/zz_generated.deepcopy.go index eae92fae..c16eadc5 100644 --- a/apis/v1beta1/zz_generated.deepcopy.go +++ b/apis/v1beta1/zz_generated.deepcopy.go @@ -1,3 +1,4 @@ +//go:build !ignore_autogenerated // +build !ignore_autogenerated /* diff --git a/cluster/local/integration_tests.sh b/cluster/local/integration_tests.sh index a54ae397..6c1751a1 100755 --- a/cluster/local/integration_tests.sh +++ b/cluster/local/integration_tests.sh @@ -137,13 +137,13 @@ echo "${PVC_YAML}" | "${KUBECTL}" create -f - # install crossplane from master channel echo_step "installing crossplane from master channel" -"${HELM3}" repo add crossplane-master https://charts.crossplane.io/master/ -chart_version="$("${HELM3}" search repo crossplane-master/crossplane --devel | awk 'FNR == 2 {print $2}')" -echo_info "using crossplane version ${chart_version}" +"${HELM3}" repo add crossplane-stable https://charts.crossplane.io/stable +# chart_version="$("${HELM3}" search repo crossplane-master/crossplane --devel | awk 'FNR == 2 {print $2}')" +echo_info "using crossplane version 1.6.4" echo # we replace empty dir with our PVC so that the /cache dir in the kind node # container is exposed to the crossplane pod -"${HELM3}" install crossplane --namespace crossplane-system crossplane-master/crossplane --version ${chart_version} --devel --wait --set packageCache.pvc=package-cache +"${HELM3}" install crossplane --namespace crossplane-system crossplane-stable/crossplane --version 1.6.4 --wait --set packageCache.pvc=package-cache # ----------- integration tests echo_step "--- INTEGRATION TESTS ---" diff --git a/go.mod b/go.mod index 858b2474..02a7a97e 100644 --- a/go.mod +++ b/go.mod @@ -1,9 +1,8 @@ module github.com/crossplane/provider-azure -go 1.13 +go 1.17 require ( - github.com/Azure/azure-pipeline-go v0.2.2 // indirect github.com/Azure/azure-sdk-for-go v61.4.0+incompatible github.com/Azure/azure-storage-blob-go v0.7.0 // azure-sdk-for-go repository does not use go.mod so we need to maintain this dependency manually. @@ -12,24 +11,93 @@ require ( github.com/Azure/go-autorest/autorest/azure/auth v0.4.0 github.com/Azure/go-autorest/autorest/date v0.3.0 github.com/Azure/go-autorest/autorest/to v0.3.0 - github.com/Azure/go-autorest/autorest/validation v0.2.0 // indirect github.com/crossplane/crossplane-runtime v0.14.0 github.com/crossplane/crossplane-tools v0.0.0-20210320162312-1baca298c527 - github.com/gofrs/uuid v4.2.0+incompatible // indirect github.com/google/go-cmp v0.5.2 github.com/google/uuid v1.1.2 - github.com/kr/text v0.2.0 // indirect - github.com/mattn/go-ieproxy v0.0.0-20190805055040-f9202b1cfdeb // indirect github.com/mitchellh/copystructure v1.2.0 - github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect github.com/onsi/gomega v1.10.2 github.com/pkg/errors v0.9.1 - golang.org/x/tools v0.0.0-20200916195026-c9a70fc28ce3 // indirect gopkg.in/alecthomas/kingpin.v2 v2.2.6 - gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect k8s.io/api v0.20.1 k8s.io/apimachinery v0.20.2 k8s.io/client-go v0.20.1 sigs.k8s.io/controller-runtime v0.8.0 sigs.k8s.io/controller-tools v0.4.0 ) + +require ( + github.com/Azure/azure-pipeline-go v0.2.2 // indirect + github.com/Azure/go-autorest v14.2.0+incompatible // indirect + github.com/Azure/go-autorest/autorest/azure/cli v0.3.0 // indirect + github.com/Azure/go-autorest/autorest/validation v0.2.0 // indirect + github.com/Azure/go-autorest/logger v0.2.1 // indirect + github.com/Azure/go-autorest/tracing v0.6.0 // indirect + github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect + github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d // indirect + github.com/beorn7/perks v1.0.1 // indirect + github.com/cespare/xxhash/v2 v2.1.1 // indirect + github.com/dave/jennifer v1.3.0 // indirect + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/dimchansky/utfbom v1.1.0 // indirect + github.com/evanphx/json-patch v4.9.0+incompatible // indirect + github.com/fatih/color v1.7.0 // indirect + github.com/form3tech-oss/jwt-go v3.2.2+incompatible // indirect + github.com/fsnotify/fsnotify v1.4.9 // indirect + github.com/go-logr/logr v0.3.0 // indirect + github.com/go-logr/zapr v0.2.0 // indirect + github.com/gobuffalo/flect v0.2.0 // indirect + github.com/gofrs/uuid v4.2.0+incompatible // indirect + github.com/gogo/protobuf v1.3.1 // indirect + github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect + github.com/golang/protobuf v1.4.3 // indirect + github.com/google/gofuzz v1.1.0 // indirect + github.com/googleapis/gnostic v0.5.1 // indirect + github.com/hashicorp/golang-lru v0.5.4 // indirect + github.com/imdario/mergo v0.3.10 // indirect + github.com/inconshreveable/mousetrap v1.0.0 // indirect + github.com/json-iterator/go v1.1.10 // indirect + github.com/kr/text v0.2.0 // indirect + github.com/mattn/go-colorable v0.1.2 // indirect + github.com/mattn/go-ieproxy v0.0.0-20190805055040-f9202b1cfdeb // indirect + github.com/mattn/go-isatty v0.0.8 // indirect + github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect + github.com/mitchellh/go-homedir v1.1.0 // indirect + github.com/mitchellh/reflectwalk v1.0.2 // indirect + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect + github.com/modern-go/reflect2 v1.0.1 // indirect + github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect + github.com/prometheus/client_golang v1.7.1 // indirect + github.com/prometheus/client_model v0.2.0 // indirect + github.com/prometheus/common v0.10.0 // indirect + github.com/prometheus/procfs v0.2.0 // indirect + github.com/spf13/afero v1.2.2 // indirect + github.com/spf13/cobra v1.1.1 // indirect + github.com/spf13/pflag v1.0.5 // indirect + go.uber.org/atomic v1.6.0 // indirect + go.uber.org/multierr v1.5.0 // indirect + go.uber.org/zap v1.15.0 // indirect + golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0 // indirect + golang.org/x/mod v0.3.0 // indirect + golang.org/x/net v0.0.0-20201110031124-69a78807bb2b // indirect + golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect + golang.org/x/sys v0.0.0-20201112073958-5cba982894dd // indirect + golang.org/x/text v0.3.4 // indirect + golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e // indirect + golang.org/x/tools v0.0.0-20200916195026-c9a70fc28ce3 // indirect + golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect + gomodules.xyz/jsonpatch/v2 v2.1.0 // indirect + google.golang.org/appengine v1.6.6 // indirect + google.golang.org/protobuf v1.25.0 // indirect + gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect + gopkg.in/inf.v0 v0.9.1 // indirect + gopkg.in/yaml.v2 v2.3.0 // indirect + gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 // indirect + k8s.io/apiextensions-apiserver v0.20.1 // indirect + k8s.io/component-base v0.20.1 // indirect + k8s.io/klog/v2 v2.4.0 // indirect + k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd // indirect + k8s.io/utils v0.0.0-20201110183641-67b214c5f920 // indirect + sigs.k8s.io/structured-merge-diff/v4 v4.0.2 // indirect + sigs.k8s.io/yaml v1.2.0 // indirect +)