Merge pull request #610 from vardhaman22/k8s-1.30

[release v2.9] k8s 1.30 dependencies update

.github/workflows/apidiff.yaml

@@ -10,6 +10,6 @@ jobs:
  fetch-depth: 0
  - uses: actions/setup-go@v5
  with:
- go-version: 1.21.x
+ go-version: 1.22.x
  - name: Generate API diff
  run: make apidiff

.github/workflows/build.yaml

@@ -15,6 +15,6 @@ jobs:
  - name: Install Go
  uses: actions/setup-go@v5
  with:
- go-version: 1.21.x
+ go-version: 1.22.x
  - name: Build
  run: make operator

.github/workflows/e2e.yaml

@@ -60,7 +60,7 @@ jobs:
  - name: Install Go
  uses: actions/setup-go@v5
  with:
- go-version: 1.21.x
+ go-version: 1.22.x
  - uses: helm/kind-action@0025e74a8c7512023d06dc019c617aa3cf561fde # v1.10.0
  with:
  version: v0.23.0

.github/workflows/lint.yaml

@@ -15,7 +15,7 @@ jobs:
  - name: Install Go
  uses: actions/setup-go@v5
  with:
- go-version: 1.21.x
+ go-version: 1.22.x
  - name: Analysis
  uses: golangci/golangci-lint-action@a4f60bb28d35aeee14e6880718e0c85ff1882e64 # v6.0.1
  with:

.github/workflows/unit.yaml

@@ -12,7 +12,7 @@ jobs:
  - name: Install Go
  uses: actions/setup-go@v5
  with:
- go-version: 1.21.x
+ go-version: 1.22.x
  - name: Run tests
  run: |
  make test

.github/workflows/verify.yaml

@@ -12,7 +12,7 @@ jobs:
  - name: Install Go
  uses: actions/setup-go@v5
  with:
- go-version: 1.21.x
+ go-version: 1.22.x
  - name: Run make verify
  run: |
  make verify

Dockerfile.dapper

@@ -8,14 +8,14 @@ RUN zypper -n update && \
 
 ENV GOLANG_ARCH_amd64=amd64 GOLANG_ARCH_arm=armv6l GOLANG_ARCH_arm64=arm64 GOLANG_ARCH=GOLANG_ARCH_${ARCH} \
  GOPATH=/go CGO_ENABLED=0 PATH=/go/bin:/usr/local/go/bin:${PATH} SHELL=/bin/bash
-RUN curl -sLf https://storage.googleapis.com/golang/go1.21.10.linux-${ARCH}.tar.gz | tar -xzf - -C /usr/local/
+RUN curl -sLf https://storage.googleapis.com/golang/go1.22.3.linux-${ARCH}.tar.gz | tar -xzf - -C /usr/local/
 # workaround for https://bugzilla.suse.com/show_bug.cgi?id=1183043
 RUN if [ "${ARCH}" == "arm64" ]; then \
  zypper -n install binutils-gold ; \
  fi
 
 RUN if [ "${ARCH}" = "amd64" ]; then \
- curl -sL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s v1.40.1; \
+ curl -sL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s v1.59.0; \
  fi
 RUN curl -sL https://get.helm.sh/helm-v3.3.0-linux-${ARCH}.tar.gz | tar xvzf - -C /usr/local/bin --strip-components=1
 

controller/eks-cluster-config-handler.go

@@ -20,7 +20,7 @@ import (
  ekscontrollers "github.com/rancher/eks-operator/pkg/generated/controllers/eks.cattle.io/v1"
  "github.com/rancher/eks-operator/templates"
  "github.com/rancher/eks-operator/utils"
- wranglerv1 "github.com/rancher/wrangler/v2/pkg/generated/controllers/core/v1"
+ wranglerv1 "github.com/rancher/wrangler/v3/pkg/generated/controllers/core/v1"
  "github.com/sirupsen/logrus"
  corev1 "k8s.io/api/core/v1"
  apierrors "k8s.io/apimachinery/pkg/api/errors"

controller/external.go

@@ -13,7 +13,7 @@ import (
  awsservices "github.com/rancher/eks-operator/pkg/eks"
  "github.com/rancher/eks-operator/pkg/eks/services"
  "github.com/rancher/eks-operator/utils"
- wranglerv1 "github.com/rancher/wrangler/v2/pkg/generated/controllers/core/v1"
+ wranglerv1 "github.com/rancher/wrangler/v3/pkg/generated/controllers/core/v1"
  "github.com/sirupsen/logrus"
 )
 

controller/internal.go

@@ -11,7 +11,7 @@ import (
  eksv1 "github.com/rancher/eks-operator/pkg/apis/eks.cattle.io/v1"
  "github.com/rancher/eks-operator/pkg/eks/services"
  "github.com/rancher/eks-operator/utils"
- wranglerv1 "github.com/rancher/wrangler/v2/pkg/generated/controllers/core/v1"
+ wranglerv1 "github.com/rancher/wrangler/v3/pkg/generated/controllers/core/v1"
  metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 

controller/suite_test.go

@@ -8,7 +8,7 @@ import (
  . "github.com/onsi/gomega"
  eksv1 "github.com/rancher/eks-operator/pkg/generated/controllers/eks.cattle.io"
  "github.com/rancher/eks-operator/pkg/test"
- "github.com/rancher/wrangler/v2/pkg/generated/controllers/core"
+ "github.com/rancher/wrangler/v3/pkg/generated/controllers/core"
  "k8s.io/client-go/rest"
  "sigs.k8s.io/controller-runtime/pkg/client"
  "sigs.k8s.io/controller-runtime/pkg/envtest"

go.mod

@@ -1,8 +1,13 @@
 module github.com/rancher/eks-operator
 
-go 1.21
+go 1.22.0
 
-replace k8s.io/client-go => k8s.io/client-go v0.29.4
+toolchain go1.22.3
+
+// to be removed when pkg/apis is updated after v1.30 support in rancher
+replace k8s.io/apiserver => k8s.io/apiserver v0.29.4
+
+replace k8s.io/client-go => k8s.io/client-go v0.30.1
 
 require (
  github.com/aws/aws-sdk-go v1.50.38
@@ -20,25 +25,25 @@ require (
  github.com/onsi/gomega v1.33.1
  github.com/pkg/errors v0.9.1
  github.com/rancher-sandbox/ele-testhelpers v0.0.0-20221213084338-a8ffdd2b87e3
- github.com/rancher/lasso v0.0.0-20240424194130-d87ec407d941
- github.com/rancher/rancher/pkg/apis v0.0.0-20240104144633-360c02b3761f
+ github.com/rancher/lasso v0.0.0-20240430201833-6f3def65ffc5
+ github.com/rancher/rancher/pkg/apis v0.0.0-20240126142034-676c3eb3dfa5
  github.com/rancher/wrangler-api v0.6.1-0.20200427172631-a7c2f09b783e
- github.com/rancher/wrangler/v2 v2.2.0-rc6
+ github.com/rancher/wrangler/v3 v3.0.0-rc2
  github.com/sirupsen/logrus v1.9.3
  github.com/stretchr/testify v1.9.0
- golang.org/x/net v0.25.0
- k8s.io/api v0.29.4
- k8s.io/apiextensions-apiserver v0.29.4
- k8s.io/apimachinery v0.29.4
- k8s.io/apiserver v0.29.4
+ golang.org/x/net v0.26.0
+ k8s.io/api v0.30.1
+ k8s.io/apiextensions-apiserver v0.30.1
+ k8s.io/apimachinery v0.30.1
+ k8s.io/apiserver v0.30.1
  k8s.io/client-go v12.0.0+incompatible
- sigs.k8s.io/controller-runtime v0.15.3
+ sigs.k8s.io/controller-runtime v0.17.3
  sigs.k8s.io/yaml v1.4.0
 )
 
 require (
  github.com/blang/semver/v4 v4.0.0 // indirect
- k8s.io/component-base v0.29.4 // indirect
+ k8s.io/component-base v0.30.1 // indirect
 )
 
 require (
@@ -57,10 +62,10 @@ require (
  github.com/davecgh/go-spew v1.1.1 // indirect
  github.com/emicklei/go-restful/v3 v3.11.0 // indirect
  github.com/evanphx/json-patch v5.6.0+incompatible // indirect
- github.com/evanphx/json-patch/v5 v5.6.0 // indirect
+ github.com/evanphx/json-patch/v5 v5.9.0 // indirect
  github.com/ghodss/yaml v1.0.0 // indirect
  github.com/go-logr/logr v1.4.1 // indirect
- github.com/go-logr/zapr v1.2.4 // indirect
+ github.com/go-logr/zapr v1.3.0 // 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
@@ -77,41 +82,43 @@ require (
  github.com/josharian/intern v1.0.0 // indirect
  github.com/json-iterator/go v1.1.12 // indirect
  github.com/mailru/easyjson v0.7.7 // indirect
- github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
+ github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
  github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
  github.com/modern-go/reflect2 v1.0.2 // indirect
  github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
  github.com/pmezard/go-difflib v1.0.0 // indirect
- github.com/prometheus/client_golang v1.16.0 // indirect
- github.com/prometheus/client_model v0.4.0 // indirect
- github.com/prometheus/common v0.44.0 // indirect
- github.com/prometheus/procfs v0.10.1 // indirect
+ github.com/prometheus/client_golang v1.18.0 // indirect
+ github.com/prometheus/client_model v0.5.0 // indirect
+ github.com/prometheus/common v0.45.0 // indirect
+ github.com/prometheus/procfs v0.12.0 // indirect
  github.com/rancher/aks-operator v1.3.0-rc1 // indirect
  github.com/rancher/fleet/pkg/apis v0.0.0-20231017140638-93432f288e79 // indirect
  github.com/rancher/gke-operator v1.3.0-rc2 // indirect
  github.com/rancher/norman v0.0.0-20240207153100-3bb70b772b52 // indirect
  github.com/rancher/rke v1.5.0 // indirect
  github.com/rancher/wrangler v1.1.1 // indirect
+ github.com/rancher/wrangler/v2 v2.2.0-rc6 // indirect
  github.com/spf13/pflag v1.0.5 // indirect
  go.uber.org/multierr v1.11.0 // indirect
- go.uber.org/zap v1.25.0 // indirect
+ go.uber.org/zap v1.26.0 // indirect
  golang.org/x/mod v0.17.0 // indirect
  golang.org/x/oauth2 v0.16.0 // indirect
  golang.org/x/sync v0.7.0 // indirect
- golang.org/x/sys v0.20.0 // indirect
- golang.org/x/term v0.20.0 // indirect
- golang.org/x/text v0.15.0 // indirect
+ golang.org/x/sys v0.21.0 // indirect
+ golang.org/x/term v0.21.0 // indirect
+ golang.org/x/text v0.16.0 // indirect
  golang.org/x/time v0.5.0 // indirect
- golang.org/x/tools v0.21.0 // indirect
+ golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
  google.golang.org/appengine v1.6.8 // indirect
  google.golang.org/protobuf v1.33.0 // indirect
  gopkg.in/inf.v0 v0.9.1 // indirect
  gopkg.in/yaml.v2 v2.4.0 // indirect
  gopkg.in/yaml.v3 v3.0.1 // indirect
- k8s.io/code-generator v0.29.4 // indirect
- k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01 // indirect
- k8s.io/klog/v2 v2.110.1 // indirect
- k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // 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/kubernetes v1.29.4 // indirect
  k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
  sigs.k8s.io/cli-utils v0.35.0 // indirect