From 869416276ce9958189dd365116bae10a077a9e9a Mon Sep 17 00:00:00 2001 From: Bob Haddleton Date: Thu, 13 Jun 2024 09:32:14 -0500 Subject: [PATCH] Update build module and go version (#272) Signed-off-by: Bob Haddleton --- .github/workflows/ci.yml | 2 +- .github/workflows/e2e.yaml | 2 +- .gitmodules | 2 +- Makefile | 4 ++++ build | 2 +- go.mod | 5 +++-- go.sum | 6 ++++-- package/crds/tf.upbound.io_providerconfigs.yaml | 7 +++++++ package/crds/tf.upbound.io_storeconfigs.yaml | 7 +++++++ package/crds/tf.upbound.io_workspaces.yaml | 14 ++++++++++++++ 10 files changed, 43 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8fde4559..83e574d0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,7 +12,7 @@ jobs: ci: uses: upbound/official-providers-ci/.github/workflows/provider-ci.yml@main with: - go-version: "1.21" + go-version: "1.22" upjet-based-provider: false secrets: UPBOUND_MARKETPLACE_PUSH_ROBOT_USR: ${{ secrets.UPBOUND_MARKETPLACE_PUSH_ROBOT_USR }} diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index 62903abc..9946f474 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -8,7 +8,7 @@ jobs: e2e: uses: upbound/official-providers-ci/.github/workflows/pr-comment-trigger.yml@main with: - go-version: "1.21" + go-version: "1.22" secrets: UPTEST_CLOUD_CREDENTIALS: ${{ secrets.UPTEST_CLOUD_CREDENTIALS }} UPTEST_DATASOURCE: ${{ secrets.UPTEST_DATASOURCE }} diff --git a/.gitmodules b/.gitmodules index c2fad470..8f84209c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "build"] path = build - url = https://github.com/upbound/build + url = https://github.com/crossplane/build diff --git a/Makefile b/Makefile index eae6d25f..24627b52 100644 --- a/Makefile +++ b/Makefile @@ -29,6 +29,7 @@ GO111MODULE = on UP_VERSION = v0.28.0 # UP_CHANNEL = stable UPTEST_VERSION = v0.5.0 +CROSSPLANE_VERSION = 1.16.0 -include build/makelib/k8s_tools.mk # Setup Images @@ -177,3 +178,6 @@ go.mod.cachedir: @go env GOMODCACHE .PHONY: go.mod.cachedir + +vendor: modules.download +vendor.check: modules.check diff --git a/build b/build index 75a9fe3a..e27d7abf 160000 --- a/build +++ b/build @@ -1 +1 @@ -Subproject commit 75a9fe3ae6b6de82c5f7ddc6a267617940f16b83 +Subproject commit e27d7abf77647e61846b660cda2c0014f06b8ecf diff --git a/go.mod b/go.mod index 1df6a5d9..263f61c9 100644 --- a/go.mod +++ b/go.mod @@ -1,10 +1,10 @@ module github.com/upbound/provider-terraform -go 1.21 +go 1.22 require ( github.com/MakeNowJust/heredoc v1.0.0 - github.com/crossplane/crossplane-runtime v1.15.1 + github.com/crossplane/crossplane-runtime v1.16.0 github.com/crossplane/crossplane-tools v0.0.0-20230925130601-628280f8bf79 github.com/google/go-cmp v0.6.0 github.com/google/uuid v1.4.0 @@ -33,6 +33,7 @@ require ( github.com/aws/aws-sdk-go v1.44.122 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect + github.com/blang/semver/v4 v4.0.0 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/dave/jennifer v1.4.1 // indirect github.com/davecgh/go-spew v1.1.1 // indirect diff --git a/go.sum b/go.sum index 73c0d190..c315c8bc 100644 --- a/go.sum +++ b/go.sum @@ -203,6 +203,8 @@ github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d h1:xDfNPAt8lFiC1UJrqV3uuy861HCTo708pDMbjHHdCas= github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d/go.mod h1:6QX/PXZ00z/TKoufEY6K/a0k6AhaJrQKdFe6OfVXsa4= +github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM= +github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= @@ -224,8 +226,8 @@ github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWH github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= -github.com/crossplane/crossplane-runtime v1.15.1 h1:g1h75tNYOQT152IUNxs8ZgSsRFQKrZN9z69KefMujXs= -github.com/crossplane/crossplane-runtime v1.15.1/go.mod h1:kRcJjJQmBFrR2n/KhwL8wYS7xNfq3D8eK4JliEScOHI= +github.com/crossplane/crossplane-runtime v1.16.0 h1:lz+l0wEB3qowdTmN7t0PZkfuNSvfOoEhQrEYFbYqMow= +github.com/crossplane/crossplane-runtime v1.16.0/go.mod h1:Pz2tdGVMF6KDGzHZOkvKro0nKc8EzK0sb/nSA7pH4Dc= github.com/crossplane/crossplane-tools v0.0.0-20230925130601-628280f8bf79 h1:HigXs5tEQxWz0fcj8hzbU2UAZgEM7wPe0XRFOsrtF8Y= github.com/crossplane/crossplane-tools v0.0.0-20230925130601-628280f8bf79/go.mod h1:+e4OaFlOcmr0JvINHl/yvEYBrZawzTgj6pQumOH1SS0= github.com/dave/jennifer v1.4.1 h1:XyqG6cn5RQsTj3qlWQTKlRGAyrTcsk1kUmWdZBzRjDw= diff --git a/package/crds/tf.upbound.io_providerconfigs.yaml b/package/crds/tf.upbound.io_providerconfigs.yaml index 7fe0de93..dca7409c 100644 --- a/package/crds/tf.upbound.io_providerconfigs.yaml +++ b/package/crds/tf.upbound.io_providerconfigs.yaml @@ -154,6 +154,13 @@ spec: A Message containing details about this condition's last transition from one status to another, if any. type: string + observedGeneration: + description: |- + ObservedGeneration represents the .metadata.generation that the condition was set based upon. + For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date + with respect to the current state of the instance. + format: int64 + type: integer reason: description: A Reason for this condition's last transition from one status to another. diff --git a/package/crds/tf.upbound.io_storeconfigs.yaml b/package/crds/tf.upbound.io_storeconfigs.yaml index 5c0be7e9..7acd7da5 100644 --- a/package/crds/tf.upbound.io_storeconfigs.yaml +++ b/package/crds/tf.upbound.io_storeconfigs.yaml @@ -183,6 +183,13 @@ spec: A Message containing details about this condition's last transition from one status to another, if any. type: string + observedGeneration: + description: |- + ObservedGeneration represents the .metadata.generation that the condition was set based upon. + For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date + with respect to the current state of the instance. + format: int64 + type: integer reason: description: A Reason for this condition's last transition from one status to another. diff --git a/package/crds/tf.upbound.io_workspaces.yaml b/package/crds/tf.upbound.io_workspaces.yaml index dee223d6..62cb01e3 100644 --- a/package/crds/tf.upbound.io_workspaces.yaml +++ b/package/crds/tf.upbound.io_workspaces.yaml @@ -440,6 +440,13 @@ spec: A Message containing details about this condition's last transition from one status to another, if any. type: string + observedGeneration: + description: |- + ObservedGeneration represents the .metadata.generation that the condition was set based upon. + For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date + with respect to the current state of the instance. + format: int64 + type: integer reason: description: A Reason for this condition's last transition from one status to another. @@ -463,6 +470,13 @@ spec: x-kubernetes-list-map-keys: - type x-kubernetes-list-type: map + observedGeneration: + description: |- + ObservedGeneration is the latest metadata.generation + which resulted in either a ready state, or stalled due to error + it can not recover from without human intervention. + format: int64 + type: integer type: object required: - spec