TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-10-09 08:01:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix rebase issues

Browse Source 
Signed-off-by: Tom Proctor <tomhjp@users.noreply.github.com>
This commit is contained in:
Tom Proctor
2024-10-04 14:22:38 +01:00
parent 64776a0277
commit aebba51df8
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/k8s-operator/egress-services_test.go
View File

@@ -34,7 +34,7 @@ func TestTailscaleEgressServices(t *testing.T) {
UID: types.UID("1234-UID"), UID: types.UID("1234-UID"),
}, },
Spec: tsapi.ProxyGroupSpec{ Spec: tsapi.ProxyGroupSpec{
Replicas: pointer.To(3), Replicas: pointer.To[int32](3),
Type: tsapi.ProxyGroupTypeEgress, Type: tsapi.ProxyGroupTypeEgress,
}, },
} }

16
cmd/k8s-operator/operator.go
View File

@@ -356,12 +356,12 @@ func runReconcilers(opts reconcilerOpts) {
} }
egressSvcFilter := handler.EnqueueRequestsFromMapFunc(egressSvcsHandler) egressSvcFilter := handler.EnqueueRequestsFromMapFunc(egressSvcsHandler)
proxyGroupFilter := handler.EnqueueRequestsFromMapFunc(egressSvcsFromEgressProxyGroup(mgr.GetClient(), opts.log)) egressProxyGroupFilter := handler.EnqueueRequestsFromMapFunc(egressSvcsFromEgressProxyGroup(mgr.GetClient(), opts.log))
err = builder. err = builder.
ControllerManagedBy(mgr). ControllerManagedBy(mgr).
Named("egress-svcs-reconciler"). Named("egress-svcs-reconciler").
Watches(&corev1.Service{}, egressSvcFilter). Watches(&corev1.Service{}, egressSvcFilter).
Watches(&tsapi.ProxyGroup{}, proxyGroupFilter). Watches(&tsapi.ProxyGroup{}, egressProxyGroupFilter).
Complete(&egressSvcsReconciler{ Complete(&egressSvcsReconciler{
Client: mgr.GetClient(), Client: mgr.GetClient(),
tsNamespace: opts.tailscaleNamespace, tsNamespace: opts.tailscaleNamespace,
@@ -458,15 +458,15 @@ func runReconcilers(opts reconcilerOpts) {
} }
// Recorder reconciler. // Recorder reconciler.
proxyGroupFilter := handler.EnqueueRequestForOwner(mgr.GetScheme(), mgr.GetRESTMapper(), &tsapi.ProxyGroup{}) ownedByProxyGroupFilter := handler.EnqueueRequestForOwner(mgr.GetScheme(), mgr.GetRESTMapper(), &tsapi.ProxyGroup{})
proxyClassFilterForProxyGroup := handler.EnqueueRequestsFromMapFunc(proxyClassHandlerForProxyGroup(mgr.GetClient(), startlog)) proxyClassFilterForProxyGroup := handler.EnqueueRequestsFromMapFunc(proxyClassHandlerForProxyGroup(mgr.GetClient(), startlog))
err = builder.ControllerManagedBy(mgr). err = builder.ControllerManagedBy(mgr).
For(&tsapi.ProxyGroup{}). For(&tsapi.ProxyGroup{}).
Watches(&appsv1.StatefulSet{}, proxyGroupFilter). Watches(&appsv1.StatefulSet{}, ownedByProxyGroupFilter).
Watches(&corev1.ServiceAccount{}, proxyGroupFilter). Watches(&corev1.ServiceAccount{}, ownedByProxyGroupFilter).
Watches(&corev1.Secret{}, proxyGroupFilter). Watches(&corev1.Secret{}, ownedByProxyGroupFilter).
Watches(&rbacv1.Role{}, proxyGroupFilter). Watches(&rbacv1.Role{}, ownedByProxyGroupFilter).
Watches(&rbacv1.RoleBinding{}, proxyGroupFilter). Watches(&rbacv1.RoleBinding{}, ownedByProxyGroupFilter).
Watches(&tsapi.ProxyClass{}, proxyClassFilterForProxyGroup). Watches(&tsapi.ProxyClass{}, proxyClassFilterForProxyGroup).
Complete(&ProxyGroupReconciler{ Complete(&ProxyGroupReconciler{
recorder: eventRecorder, recorder: eventRecorder,

2
cmd/k8s-operator/proxygroup.go
View File

@@ -415,7 +415,7 @@ func pgTailscaledConfig(pg *tsapi.ProxyGroup, class *tsapi.ProxyClass, idx int32
// For egress proxies only, we need to ensure that stateful filtering is // For egress proxies only, we need to ensure that stateful filtering is
// not in place so that traffic from cluster can be forwarded via // not in place so that traffic from cluster can be forwarded via
// Tailscale IPs. // Tailscale IPs.
if pg.Spec.Type == tsapi.ProxyClassTypeEgress { if pg.Spec.Type == tsapi.ProxyGroupTypeEgress {
conf.NoStatefulFiltering = "true" conf.NoStatefulFiltering = "true"
} }
if shouldAcceptRoutes(class) { if shouldAcceptRoutes(class) {