| Lorenz Brun | f2b7ab6 | 2022-05-04 19:06:00 +0200 | [diff] [blame] | 1 | From 243792d1686cba86669bda9bc2c905cb9cd73a0c Mon Sep 17 00:00:00 2001 |
| 2 | From: Lorenz Brun <lorenz@monogon.tech> |
| 3 | Date: Wed, 4 May 2022 18:37:45 +0200 |
| 4 | Subject: [PATCH] Adopt to renamed function in K8s 1.24 |
| 5 | |
| 6 | --- |
| 7 | pkg/proxy/service.go | 2 +- |
| 8 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 9 | |
| Lorenz Brun | e6e570a | 2023-11-28 19:23:19 +0100 | [diff] [blame^] | 10 | diff --git a/cmd/nfproxy.go b/cmd/nfproxy.go |
| 11 | index 66972ab..83d8b01 100644 |
| 12 | --- a/cmd/nfproxy.go |
| 13 | +++ b/cmd/nfproxy.go |
| 14 | @@ -169,7 +169,7 @@ func main() { |
| 15 | // instantiate EndpointSlice controller, otherwise Endpoints controller will be used. |
| 16 | var ep epController |
| 17 | if endpointSlice { |
| 18 | - ep = controller.NewEndpointSliceController(nfproxy, client, kubeInformerFactory.Discovery().V1beta1().EndpointSlices()) |
| 19 | + ep = controller.NewEndpointSliceController(nfproxy, client, kubeInformerFactory.Discovery().V1().EndpointSlices()) |
| 20 | } else { |
| 21 | ep = controller.NewEndpointsController(nfproxy, client, kubeInformerFactory.Core().V1().Endpoints()) |
| 22 | } |
| 23 | diff --git a/pkg/controller/controller_endpointslice.go b/pkg/controller/controller_endpointslice.go |
| 24 | index ef97ef5..d060a4d 100644 |
| 25 | --- a/pkg/controller/controller_endpointslice.go |
| 26 | +++ b/pkg/controller/controller_endpointslice.go |
| 27 | @@ -20,9 +20,9 @@ import ( |
| 28 | "fmt" |
| 29 | |
| 30 | v1 "k8s.io/api/core/v1" |
| 31 | - discovery "k8s.io/api/discovery/v1beta1" |
| 32 | + discovery "k8s.io/api/discovery/v1" |
| 33 | utilruntime "k8s.io/apimachinery/pkg/util/runtime" |
| 34 | - "k8s.io/client-go/informers/discovery/v1beta1" |
| 35 | + discoveryv1 "k8s.io/client-go/informers/discovery/v1" |
| 36 | "k8s.io/client-go/kubernetes" |
| 37 | "k8s.io/client-go/kubernetes/scheme" |
| 38 | typedcorev1 "k8s.io/client-go/kubernetes/typed/core/v1" |
| 39 | @@ -119,7 +119,7 @@ func (c *endpointSliceController) Start(stopCh <-chan struct{}) error { |
| 40 | func NewEndpointSliceController( |
| 41 | proxy proxy.Proxy, |
| 42 | kubeClientset kubernetes.Interface, |
| 43 | - epSliceInformer v1beta1.EndpointSliceInformer) EndpointSliceController { |
| 44 | + epSliceInformer discoveryv1.EndpointSliceInformer) EndpointSliceController { |
| 45 | |
| 46 | klog.V(4).Info("Creating event broadcaster for EndpointSlice controller") |
| 47 | eventBroadcaster := record.NewBroadcaster() |
| 48 | diff --git a/pkg/proxy/cache.go b/pkg/proxy/cache.go |
| 49 | index 92d06ca..7ef0e6f 100644 |
| 50 | --- a/pkg/proxy/cache.go |
| 51 | +++ b/pkg/proxy/cache.go |
| 52 | @@ -21,7 +21,7 @@ import ( |
| 53 | "sync" |
| 54 | |
| 55 | v1 "k8s.io/api/core/v1" |
| 56 | - discovery "k8s.io/api/discovery/v1beta1" |
| 57 | + discovery "k8s.io/api/discovery/v1" |
| 58 | "k8s.io/apimachinery/pkg/types" |
| 59 | "k8s.io/klog" |
| 60 | ) |
| 61 | diff --git a/pkg/proxy/proxy.go b/pkg/proxy/proxy.go |
| 62 | index 7839820..5876784 100644 |
| 63 | --- a/pkg/proxy/proxy.go |
| 64 | +++ b/pkg/proxy/proxy.go |
| 65 | @@ -22,7 +22,7 @@ import ( |
| 66 | utilnftables "github.com/google/nftables" |
| 67 | "github.com/sbezverk/nfproxy/pkg/nftables" |
| 68 | v1 "k8s.io/api/core/v1" |
| 69 | - discovery "k8s.io/api/discovery/v1beta1" |
| 70 | + discovery "k8s.io/api/discovery/v1" |
| 71 | "k8s.io/apimachinery/pkg/types" |
| 72 | "k8s.io/client-go/tools/record" |
| 73 | "k8s.io/klog" |
| 74 | diff --git a/pkg/proxy/proxy_endpointslice.go b/pkg/proxy/proxy_endpointslice.go |
| 75 | index 5310ed3..5c97096 100644 |
| 76 | --- a/pkg/proxy/proxy_endpointslice.go |
| 77 | +++ b/pkg/proxy/proxy_endpointslice.go |
| 78 | @@ -21,7 +21,7 @@ import ( |
| 79 | "time" |
| 80 | |
| 81 | v1 "k8s.io/api/core/v1" |
| 82 | - discovery "k8s.io/api/discovery/v1beta1" |
| 83 | + discovery "k8s.io/api/discovery/v1" |
| 84 | "k8s.io/klog" |
| 85 | ) |
| 86 | |
| Lorenz Brun | f2b7ab6 | 2022-05-04 19:06:00 +0200 | [diff] [blame] | 87 | diff --git a/pkg/proxy/service.go b/pkg/proxy/service.go |
| Lorenz Brun | e6e570a | 2023-11-28 19:23:19 +0100 | [diff] [blame^] | 88 | index 9cc10b7..6e91fae 100644 |
| Lorenz Brun | f2b7ab6 | 2022-05-04 19:06:00 +0200 | [diff] [blame] | 89 | --- a/pkg/proxy/service.go |
| 90 | +++ b/pkg/proxy/service.go |
| 91 | @@ -152,7 +152,7 @@ func newServiceInfo(port *v1.ServicePort, service *v1.Service, baseInfo *BaseSer |
| 92 | |
| 93 | func newBaseServiceInfo(port *v1.ServicePort, service *v1.Service) *BaseServiceInfo { |
| 94 | onlyNodeLocalEndpoints := false |
| 95 | - if apiservice.RequestsOnlyLocalTraffic(service) { |
| 96 | + if apiservice.ExternalPolicyLocal(service) { |
| 97 | onlyNodeLocalEndpoints = true |
| 98 | } |
| 99 | var stickyMaxAgeSeconds int |
| Lorenz Brun | e6e570a | 2023-11-28 19:23:19 +0100 | [diff] [blame^] | 100 | diff --git a/pkg/proxy/tools.go b/pkg/proxy/tools.go |
| 101 | index 06c4ae3..3f7f0b9 100644 |
| 102 | --- a/pkg/proxy/tools.go |
| 103 | +++ b/pkg/proxy/tools.go |
| 104 | @@ -26,7 +26,7 @@ import ( |
| 105 | |
| 106 | utilnftables "github.com/google/nftables" |
| 107 | v1 "k8s.io/api/core/v1" |
| 108 | - discovery "k8s.io/api/discovery/v1beta1" |
| 109 | + discovery "k8s.io/api/discovery/v1" |
| 110 | metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" |
| 111 | "k8s.io/apimachinery/pkg/types" |
| 112 | "k8s.io/apimachinery/pkg/util/intstr" |
| Lorenz Brun | f2b7ab6 | 2022-05-04 19:06:00 +0200 | [diff] [blame] | 113 | -- |
| 114 | 2.25.1 |
| 115 | |