Bump dependencies wrangler v3

cnrancher · Jul 11, 2024 · 240352f · 240352f
1 parent 6f9859b
commit 240352f
Show file tree

Hide file tree

Showing 17 changed files with 203 additions and 132 deletions.
diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml
@@ -35,8 +35,8 @@ updates:
   # Ignore wrangler
   - dependency-name: "github.com/rancher/wrangler"
     update-types: [ "version-update:semver-major", "version-update:semver-minor", "version-update:semver-patch" ]
-  # Ignore wrangler v2
-  - dependency-name: "github.com/rancher/wrangler/v2"
+  # Ignore wrangler v3
+  - dependency-name: "github.com/rancher/wrangler/v3"
     update-types: [ "version-update:semver-major", "version-update:semver-minor", "version-update:semver-patch" ]
   # Ignore huaweicloud-sdk-v3
   - dependency-name: "github.com/huaweicloud/huaweicloud-sdk-go-v3"
@@ -70,8 +70,8 @@ updates:
   # Ignore wrangler
   - dependency-name: "github.com/rancher/wrangler"
     update-types: [ "version-update:semver-major", "version-update:semver-minor", "version-update:semver-patch" ]
-  # Ignore wrangler v2
-  - dependency-name: "github.com/rancher/wrangler/v2"
+  # Ignore wrangler v3
+  - dependency-name: "github.com/rancher/wrangler/v3"
     update-types: [ "version-update:semver-major", "version-update:semver-minor", "version-update:semver-patch" ]
   # Ignore huaweicloud-sdk-v3
   - dependency-name: "github.com/huaweicloud/huaweicloud-sdk-go-v3"
@@ -105,8 +105,8 @@ updates:
   # Ignore wrangler
   - dependency-name: "github.com/rancher/wrangler"
     update-types: [ "version-update:semver-major", "version-update:semver-minor", "version-update:semver-patch" ]
-  # Ignore wrangler v2
-  - dependency-name: "github.com/rancher/wrangler/v2"
+  # Ignore wrangler v3
+  - dependency-name: "github.com/rancher/wrangler/v3"
     update-types: [ "version-update:semver-major", "version-update:semver-minor", "version-update:semver-patch" ]
   # Ignore huaweicloud-sdk-v3
   - dependency-name: "github.com/huaweicloud/huaweicloud-sdk-go-v3"

diff --git a/Dockerfile.dapper b/Dockerfile.dapper
@@ -1,4 +1,4 @@
-FROM registry.suse.com/bci/golang:1.21
+FROM registry.suse.com/bci/golang:1.22
 
 ARG DAPPER_HOST_ARCH
 ENV ARCH=${DAPPER_HOST_ARCH}
@@ -10,6 +10,11 @@ RUN zypper ref && \
 
 RUN curl -sL https://get.helm.sh/helm-v3.12.1-linux-${ARCH}.tar.gz | \
     tar xvzf - -C /usr/local/bin --strip-components=1
+
+RUN if [ "${ARCH}" = "amd64" ]; then \
+    curl -sL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s v1.59.0; \
+fi
+
 # pre-copy/cache go.mod for pre-downloading dependencies
 COPY go.mod go.sum ./
 RUN go mod download && go mod verify

diff --git a/go.mod b/go.mod
@@ -1,37 +1,39 @@
 module github.com/cnrancher/cce-operator
 
-go 1.20
+go 1.22.0
+
+toolchain go1.22.3
 
 require (
 	github.com/Masterminds/semver/v3 v3.2.1
 	github.com/antonfisher/nested-logrus-formatter v1.3.1
-	github.com/huaweicloud/huaweicloud-sdk-go-v3 v0.1.84
-	github.com/rancher/lasso v0.0.0-20240123150939-7055397d6dfa
-	github.com/rancher/wrangler/v2 v2.1.3
+	github.com/huaweicloud/huaweicloud-sdk-go-v3 v0.1.104
+	github.com/rancher/lasso v0.0.0-20240603075835-701e919d08b7
+	github.com/rancher/wrangler/v3 v3.0.0-rc2
 	github.com/sirupsen/logrus v1.9.3
-	github.com/stretchr/testify v1.8.4
-	k8s.io/api v0.28.6
-	k8s.io/apimachinery v0.28.6
-	k8s.io/client-go v0.28.6
+	github.com/stretchr/testify v1.9.0
+	k8s.io/api v0.30.1
+	k8s.io/apimachinery v0.30.1
+	k8s.io/client-go v0.30.1
 )
 
 require (
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/emicklei/go-restful/v3 v3.9.0 // indirect
+	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
 	github.com/evanphx/json-patch v5.6.0+incompatible // indirect
 	github.com/ghodss/yaml v1.0.0 // indirect
-	github.com/go-logr/logr v1.2.4 // indirect
+	github.com/go-logr/logr v1.4.1 // indirect
 	github.com/go-openapi/jsonpointer v0.19.6 // indirect
 	github.com/go-openapi/jsonreference v0.20.2 // indirect
 	github.com/go-openapi/swag v0.22.3 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/golang/protobuf v1.5.3 // indirect
+	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/google/gnostic-models v0.6.8 // indirect
-	github.com/google/go-cmp v0.5.9 // indirect
+	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
-	github.com/google/uuid v1.3.0 // indirect
+	github.com/google/uuid v1.6.0 // indirect
 	github.com/imdario/mergo v0.3.12 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
@@ -49,29 +51,30 @@ require (
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/tjfoc/gmsm v1.4.1 // indirect
 	go.mongodb.org/mongo-driver v1.12.0 // indirect
-	golang.org/x/crypto v0.18.0 // indirect
-	golang.org/x/mod v0.14.0 // indirect
-	golang.org/x/net v0.19.0 // indirect
-	golang.org/x/oauth2 v0.10.0 // indirect
-	golang.org/x/sync v0.5.0 // indirect
-	golang.org/x/sys v0.16.0 // indirect
-	golang.org/x/term v0.16.0 // indirect
+	golang.org/x/crypto v0.22.0 // indirect
+	golang.org/x/mod v0.17.0 // indirect
+	golang.org/x/net v0.24.0 // indirect
+	golang.org/x/oauth2 v0.16.0 // indirect
+	golang.org/x/sync v0.7.0 // indirect
+	golang.org/x/sys v0.19.0 // indirect
+	golang.org/x/term v0.19.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
-	golang.org/x/tools v0.16.1 // indirect
+	golang.org/x/tools v0.20.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/protobuf v1.31.0 // indirect
+	google.golang.org/protobuf v1.33.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/apiextensions-apiserver v0.28.6 // indirect
-	k8s.io/code-generator v0.28.6 // indirect
-	k8s.io/gengo v0.0.0-20220902162205-c0856e24416d // indirect
-	k8s.io/klog/v2 v2.100.1 // indirect
-	k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
-	k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
+	k8s.io/apiextensions-apiserver v0.30.1 // indirect
+	k8s.io/code-generator v0.30.1 // indirect
+	k8s.io/gengo v0.0.0-20240228010128-51d4e06bde70 // indirect
+	k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 // indirect
+	k8s.io/klog/v2 v2.120.1 // indirect
+	k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
+	k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
 	sigs.k8s.io/yaml v1.3.0 // indirect
 )