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.

Sign up for GitHub

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

Jump to bottom

fix(controller): include services that have pods labled injection as part of mesh #12005

Closed
wants to merge 1 commit into from
Closed

fix(controller): include services that have pods labled injection as part of mesh #12005

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
60 changes: 46 additions & 14 deletions pkg/plugins/runtime/k8s/controllers/service_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ package controllers
import (
"context"
"fmt"

"github.com/go-logr/logr"
"github.com/pkg/errors"
kube_core "k8s.io/api/core/v1"
kube_apierrs "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/labels"
kube_types "k8s.io/apimachinery/pkg/types"
kube_ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/builder"
Expand Down Expand Up @@ -41,19 +41,9 @@ func (r *ServiceReconciler) Reconcile(ctx context.Context, req kube_ctrl.Request
return kube_ctrl.Result{}, nil
}

namespace := &kube_core.Namespace{}
if err := r.Get(ctx, kube_types.NamespacedName{Name: svc.GetNamespace()}, namespace); err != nil {
if kube_apierrs.IsNotFound(err) {
return kube_ctrl.Result{}, nil
}
return kube_ctrl.Result{}, errors.Wrapf(err, "unable to fetch Service %s", req.NamespacedName.Name)
}

injectedLabel, _, err := metadata.Annotations(namespace.Labels).GetEnabled(metadata.KumaSidecarInjectionAnnotation)
if err != nil {
return kube_ctrl.Result{}, errors.Wrapf(err, "unable to check sidecar injection label on namespace %s", namespace.Name)
}
if !injectedLabel {
if svcPartOfMesh, err := r.isServicePartOfMesh(ctx, log, svc, req); err != nil {
return kube_ctrl.Result{}, err
} else if !svcPartOfMesh {
log.V(1).Info(req.NamespacedName.String() + "is not part of the mesh")
return kube_ctrl.Result{}, nil
}
Expand Down Expand Up @@ -90,6 +80,48 @@ func (r *ServiceReconciler) Reconcile(ctx context.Context, req kube_ctrl.Request
return kube_ctrl.Result{}, nil
}

func (r *ServiceReconciler) isServicePartOfMesh(ctx context.Context, log logr.Logger, svc *kube_core.Service, req kube_ctrl.Request) (bool, error) {
namespace := &kube_core.Namespace{}
if err := r.Get(ctx, kube_types.NamespacedName{Name: svc.GetNamespace()}, namespace); err != nil {
if kube_apierrs.IsNotFound(err) {
return false, nil
}
return false, errors.Wrapf(err, "unable to fetch Namespace %s", req.NamespacedName.Name)
}

injectEnabledOnNs, _, err := metadata.Annotations(namespace.Labels).GetEnabled(metadata.KumaSidecarInjectionAnnotation)
if err != nil {
return false, errors.Wrapf(err, "unable to check sidecar injection label on namespace %s", namespace.Name)
}

if !injectEnabledOnNs && svc.Spec.Selector != nil {
pods := &kube_core.PodList{}
if err := r.List(ctx, pods, kube_client.InNamespace(svc.GetNamespace()),
kube_client.MatchingLabelsSelector{Selector: labels.SelectorFromSet(svc.Spec.Selector)}); err != nil {
return false, errors.Wrapf(err, "unable to list pods of Service %s", req.NamespacedName.Name)
}

injectEnabledOnPod := false
for i := range pods.Items {
pod := pods.Items[i]
injectedEnabled, _, errLabel := metadata.Annotations(pod.Labels).GetEnabled(metadata.KumaSidecarInjectionAnnotation)
if errLabel == nil && pod.DeletionTimestamp == nil && injectedEnabled {
injectEnabledOnPod = true
break
}
}

if !injectEnabledOnPod {
log.V(1).Info(req.NamespacedName.String() + "is not part of the mesh")
return false, nil
}

return true, nil
}

return false, nil
}

func (r *ServiceReconciler) SetupWithManager(mgr kube_ctrl.Manager) error {
return kube_ctrl.NewControllerManagedBy(mgr).
Named("kuma-service-controller").
Expand Down
44 changes: 44 additions & 0 deletions pkg/plugins/runtime/k8s/controllers/service_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,30 @@ var _ = Describe("ServiceReconciler", func() {
},
Spec: kube_core.ServiceSpec{},
},
&kube_core.Service{
ObjectMeta: kube_meta.ObjectMeta{
Namespace: "non-system-ns-without-sidecar-injection",
Name: "service-with-pods-labeled",
Annotations: map[string]string{
"bogus-annotation": "1",
},
},
Spec: kube_core.ServiceSpec{
Selector: map[string]string{
"app": "app-pod-labeled",
},
},
},
&kube_core.Pod{
ObjectMeta: kube_meta.ObjectMeta{
Namespace: "non-system-ns-without-sidecar-injection",
Name: "pods-labeled-1",
Labels: map[string]string{
metadata.KumaSidecarInjectionAnnotation: metadata.AnnotationEnabled,
},
},
Spec: kube_core.PodSpec{},
},
&kube_core.Service{
ObjectMeta: kube_meta.ObjectMeta{
Namespace: "builtin-gateway",
Expand Down Expand Up @@ -137,6 +161,26 @@ var _ = Describe("ServiceReconciler", func() {
Expect(svc.GetAnnotations()).ToNot(HaveKey(metadata.IngressServiceUpstream))
})

It("should include service with pods annotated in a namespace not labeled", func() {
// given
req := kube_ctrl.Request{
NamespacedName: kube_types.NamespacedName{Namespace: "non-system-ns-without-sidecar-injection", Name: "service-with-pods-labeled"},
}

// when
result, err := reconciler.Reconcile(context.Background(), req)

// then
Expect(err).ToNot(HaveOccurred())
Expect(result).To(BeZero())

// and service is not annotated
svc := &kube_core.Service{}
err = kubeClient.Get(context.Background(), req.NamespacedName, svc)
Expect(err).ToNot(HaveOccurred())
Expect(svc.GetAnnotations()).To(HaveKey(metadata.IngressServiceUpstream))
})

It("should ignore service of builtin gateway", func() {
// given
req := kube_ctrl.Request{
Expand Down
Loading