Skip to content

Commit a0beef1

Browse files
authored
update to discovery.k8s.io/v1 (kubernetes-sigs#3073)
* update to discovery.k8s.io/v1 * fix upstream prow tests for 2.4 branch set ASSUME_NO_MOVING_GC_UNSAFE_RISK_IT_WITH=go1.20, since 2.4 branch uses go 1.19
1 parent a92e689 commit a0beef1

File tree

7 files changed

+7
-7
lines changed

7 files changed

+7
-7
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ all: controller
2020

2121
# Run tests
2222
test: generate fmt vet manifests helm-lint
23-
go test -race ./pkg/... ./webhooks/... -coverprofile cover.out
23+
ASSUME_NO_MOVING_GC_UNSAFE_RISK_IT_WITH=go1.20 go test -race ./pkg/... ./webhooks/... -coverprofile cover.out
2424

2525
# Build controller binary
2626
controller: generate fmt vet

controllers/elbv2/eventhandlers/endpointslices.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55

66
"github.com/go-logr/logr"
77
"github.com/pkg/errors"
8-
discv1 "k8s.io/api/discovery/v1beta1"
8+
discv1 "k8s.io/api/discovery/v1"
99
"k8s.io/apimachinery/pkg/api/equality"
1010
"k8s.io/apimachinery/pkg/types"
1111
"k8s.io/client-go/util/workqueue"

controllers/elbv2/eventhandlers/endpointslices_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"github.com/golang/mock/gomock"
88
"github.com/google/go-cmp/cmp"
99
"github.com/stretchr/testify/assert"
10-
discv1 "k8s.io/api/discovery/v1beta1"
10+
discv1 "k8s.io/api/discovery/v1"
1111
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1212
"k8s.io/apimachinery/pkg/types"
1313
"k8s.io/client-go/util/workqueue"

controllers/elbv2/targetgroupbinding_controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"github.com/aws/aws-sdk-go/aws"
2525
"github.com/pkg/errors"
2626
corev1 "k8s.io/api/core/v1"
27-
discv1 "k8s.io/api/discovery/v1beta1"
27+
discv1 "k8s.io/api/discovery/v1"
2828
"k8s.io/client-go/tools/record"
2929
"k8s.io/client-go/util/workqueue"
3030
"sigs.k8s.io/aws-load-balancer-controller/controllers/elbv2/eventhandlers"

pkg/backend/endpoint_resolver.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"github.com/go-logr/logr"
99
"github.com/pkg/errors"
1010
corev1 "k8s.io/api/core/v1"
11-
discovery "k8s.io/api/discovery/v1beta1"
11+
discovery "k8s.io/api/discovery/v1"
1212
apierrors "k8s.io/apimachinery/pkg/api/errors"
1313
"k8s.io/apimachinery/pkg/types"
1414
"k8s.io/apimachinery/pkg/util/intstr"

pkg/backend/endpoint_resolver_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323

2424
"github.com/stretchr/testify/assert"
2525
corev1 "k8s.io/api/core/v1"
26-
discovery "k8s.io/api/discovery/v1beta1"
26+
discovery "k8s.io/api/discovery/v1"
2727
)
2828

2929
func Test_defaultEndpointResolver_ResolvePodEndpoints(t *testing.T) {

pkg/backend/endpoint_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package backend
22

33
import (
44
corev1 "k8s.io/api/core/v1"
5-
discv1 "k8s.io/api/discovery/v1beta1"
5+
discv1 "k8s.io/api/discovery/v1"
66
"k8s.io/apimachinery/pkg/labels"
77
"sigs.k8s.io/aws-load-balancer-controller/pkg/k8s"
88
)

0 commit comments

Comments
 (0)