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

Bump Wrangler version to v2.0.2 #320

Merged
merged 1 commit into from
Jan 23, 2024
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 controller/eks-cluster-config-handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,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/pkg/generated/controllers/core/v1"
wranglerv1 "github.com/rancher/wrangler/v2/pkg/generated/controllers/core/v1"
"github.com/sirupsen/logrus"
corev1 "k8s.io/api/core/v1"
apierrors "k8s.io/apimachinery/pkg/api/errors"
Expand Down
2 changes: 1 addition & 1 deletion controller/external.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"github.com/aws/aws-sdk-go/aws/session"
"github.com/aws/aws-sdk-go/service/eks"
eksv1 "github.com/rancher/eks-operator/pkg/apis/eks.cattle.io/v1"
wranglerv1 "github.com/rancher/wrangler/pkg/generated/controllers/core/v1"
wranglerv1 "github.com/rancher/wrangler/v2/pkg/generated/controllers/core/v1"
)

// StartAWSSessions starts AWS sessions.
Expand Down
2 changes: 1 addition & 1 deletion controller/suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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/pkg/generated/controllers/core"
"github.com/rancher/wrangler/v2/pkg/generated/controllers/core"
"k8s.io/client-go/rest"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/envtest"
Expand Down
8 changes: 3 additions & 5 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,7 @@ module github.com/rancher/eks-operator

go 1.20

replace (
github.com/rancher/wrangler => github.com/rancher/wrangler v1.1.1-0.20230831050635-df1bd5aae9df
k8s.io/client-go => k8s.io/client-go v0.27.5
)
replace k8s.io/client-go => k8s.io/client-go v0.27.5

require (
github.com/aws/aws-sdk-go v1.49.16
Expand All @@ -18,8 +15,8 @@ require (
github.com/rancher-sandbox/ele-testhelpers v0.0.0-20221213084338-a8ffdd2b87e3
github.com/rancher/lasso v0.0.0-20230830164424-d684fdeb6f29
github.com/rancher/rancher/pkg/apis v0.0.0-20230915232223-a9ea4ce4a5ba
github.com/rancher/wrangler v1.1.1
github.com/rancher/wrangler-api v0.6.1-0.20200427172631-a7c2f09b783e
github.com/rancher/wrangler/v2 v2.0.2
github.com/sirupsen/logrus v1.9.3
github.com/stretchr/testify v1.8.4
k8s.io/api v0.27.5
Expand Down Expand Up @@ -76,6 +73,7 @@ require (
github.com/rancher/gke-operator v1.2.0-rc1 // indirect
github.com/rancher/norman v0.0.0-20230831160711-5de27f66385d // indirect
github.com/rancher/rke v1.5.0-rc5 // indirect
github.com/rancher/wrangler v1.1.1 // indirect
github.com/spf13/pflag v1.0.5 // indirect
go.uber.org/atomic v1.7.0 // indirect
go.uber.org/multierr v1.6.0 // indirect
Expand Down
1,080 changes: 8 additions & 1,072 deletions go.sum

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ import (

"github.com/rancher/eks-operator/controller"
eksv1 "github.com/rancher/eks-operator/pkg/generated/controllers/eks.cattle.io"
"github.com/rancher/wrangler-api/pkg/generated/controllers/apps"
core3 "github.com/rancher/wrangler/pkg/generated/controllers/core"
"github.com/rancher/wrangler/pkg/kubeconfig"
"github.com/rancher/wrangler/pkg/signals"
"github.com/rancher/wrangler/pkg/start"
"github.com/rancher/wrangler/v2/pkg/generated/controllers/apps"
core3 "github.com/rancher/wrangler/v2/pkg/generated/controllers/core"
"github.com/rancher/wrangler/v2/pkg/kubeconfig"
"github.com/rancher/wrangler/v2/pkg/signals"
"github.com/rancher/wrangler/v2/pkg/start"
"github.com/sirupsen/logrus"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/codegen/cleanup/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package main
import (
"os"

"github.com/rancher/wrangler/pkg/cleanup"
"github.com/rancher/wrangler/v2/pkg/cleanup"
"github.com/sirupsen/logrus"
)

Expand Down
8 changes: 4 additions & 4 deletions pkg/codegen/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import (

eksv1 "github.com/rancher/eks-operator/pkg/apis/eks.cattle.io/v1"
_ "github.com/rancher/wrangler-api/pkg/generated/controllers/apiextensions.k8s.io"
controllergen "github.com/rancher/wrangler/pkg/controller-gen"
"github.com/rancher/wrangler/pkg/controller-gen/args"
"github.com/rancher/wrangler/pkg/crd"
"github.com/rancher/wrangler/pkg/yaml"
controllergen "github.com/rancher/wrangler/v2/pkg/controller-gen"
"github.com/rancher/wrangler/v2/pkg/controller-gen/args"
"github.com/rancher/wrangler/v2/pkg/crd"
"github.com/rancher/wrangler/v2/pkg/yaml"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime/schema"
Expand Down
2 changes: 1 addition & 1 deletion pkg/generated/controllers/core/factory.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions pkg/generated/controllers/core/v1/interface.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions pkg/generated/controllers/core/v1/node.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions pkg/generated/controllers/core/v1/pod.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pkg/generated/controllers/core/v1/secret.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pkg/generated/controllers/eks.cattle.io/factory.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions pkg/generated/controllers/eks.cattle.io/v1/interface.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.