Skip to content
This repository has been archived by the owner on Jul 16, 2024. It is now read-only.

Fix headless and service proxy name tc's #29

Merged
merged 1 commit into from
May 28, 2021
Merged
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
33 changes: 32 additions & 1 deletion jobs/kube2store/kube2store.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,14 @@ import (
"time"

"github.com/spf13/pflag"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/selection"
"k8s.io/client-go/informers"
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/tools/cache"
"k8s.io/klog"

"sigs.k8s.io/kpng/pkg/proxystore"
)
Expand All @@ -38,6 +43,13 @@ type Config struct {
NodeAnnotationGlobs []string
}

//TODO: need to find a better home for this
const (
// LabelServiceProxyName indicates that an alternative service
// proxy will implement this Service.
LabelServiceProxyName = "service.kubernetes.io/service-proxy-name"
)

func (c *Config) BindFlags(flags *pflag.FlagSet) {
flags.BoolVar(&c.UseSlices, "use-slices", true, "use EndpointsSlice (not Endpoints)")

Expand All @@ -60,7 +72,10 @@ func (j Job) Run(ctx context.Context) {
stopCh := ctx.Done()

// start informers
factory := informers.NewSharedInformerFactory(j.Kube, time.Second*30)
factory := informers.NewSharedInformerFactoryWithOptions(j.Kube, time.Second*30,
informers.WithTweakListOptions(func(options *metav1.ListOptions) {
options.LabelSelector = j.getLabelSelector().String()
}))
factory.Start(stopCh)

// start watches
Expand Down Expand Up @@ -98,3 +113,19 @@ func (j Job) eventHandler(informer cache.SharedIndexInformer) eventHandler {
informer: informer,
}
}

func (j Job) getLabelSelector() labels.Selector {
noProxyName, err := labels.NewRequirement(LabelServiceProxyName, selection.DoesNotExist, nil)
if err != nil {
klog.Exit(err)
}

noHeadlessEndpoints, err := labels.NewRequirement(v1.IsHeadlessService, selection.DoesNotExist, nil)
if err != nil {
klog.Exit(err)
}

labelSelector := labels.NewSelector()
labelSelector = labelSelector.Add(*noProxyName, *noHeadlessEndpoints)
return labelSelector
}