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 Existing Namespace Not Found By Label #2204

Merged
merged 3 commits into from
Mar 5, 2024
Merged

Fix Existing Namespace Not Found By Label #2204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
657091e
Filter by kubernetes.io/metadata.name label
Mar 4, 2024
b3981d7
Switch fetchNamespace to Get instead of list
Mar 4, 2024
9becb03
Update internal/cmd/agent/controllers/bundledeployment/controller_tes…
manno Mar 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 7 additions & 10 deletions internal/cmd/agent/controllers/bundledeployment/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,35 +198,32 @@ func (h *handler) updateNamespace(ns *corev1.Namespace) error {
func (h *handler) fetchNamespace(releaseID string) (*corev1.Namespace, error) {
// releaseID is composed of release.Namespace/release.Name/release.Version
namespace := strings.Split(releaseID, "/")[0]
list, err := h.dynamic.Resource(nsResource).List(h.ctx, metav1.ListOptions{
LabelSelector: "name=" + namespace,
})
res, err := h.dynamic.Resource(nsResource).Get(h.ctx, namespace, metav1.GetOptions{})
if err != nil {
return nil, err
}
if len(list.Items) == 0 {
return nil, fmt.Errorf("namespace %s not found", namespace)
}
var ns corev1.Namespace
err = runtime.DefaultUnstructuredConverter.
FromUnstructured(list.Items[0].Object, &ns)
FromUnstructured(res.Object, &ns)
if err != nil {
return nil, err
}

return &ns, nil
}

// addLabelsFromOptions updates nsLabels so that it only contains all labels specified in optLabels, plus the `name` labels added by Helm when creating the namespace.
// addLabelsFromOptions updates nsLabels so that it only contains all labels
// specified in optLabels, plus the `kubernetes.io/metadata.name` labels added
// by kubernetes when creating the namespace.
func addLabelsFromOptions(nsLabels map[string]string, optLabels map[string]string) {
for k, v := range optLabels {
nsLabels[k] = v
}

// Delete labels not defined in the options.
// Keep the name label as it is added by helm when creating the namespace.
// Keep the `kubernetes.io/metadata.name` label as it is added by kubernetes when creating the namespace.
for k := range nsLabels {
if _, ok := optLabels[k]; k != "name" && !ok {
if _, ok := optLabels[k]; k != corev1.LabelMetadataName && !ok {
delete(nsLabels, k)
}
}
Expand Down
41 changes: 20 additions & 21 deletions internal/cmd/agent/controllers/bundledeployment/controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package bundledeployment
//go:generate mockgen --build_flags=--mod=mod -destination=../../../controller/mocks/dynamic_mock.go -package mocks k8s.io/client-go/dynamic Interface,NamespaceableResourceInterface

import (
"errors"
"testing"

"github.com/golang/mock/gomock"
Expand All @@ -12,6 +11,7 @@ import (
fleet "github.com/rancher/fleet/pkg/apis/fleet.cattle.io/v1alpha1"

corev1 "k8s.io/api/core/v1"
apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime"
Expand All @@ -33,13 +33,15 @@ func TestSetNamespaceLabelsAndAnnotations(t *testing.T) {
}},
ns: corev1.Namespace{
ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{"name": "test"},
Name: "namespace",
Labels: map[string]string{"kubernetes.io/metadata.name": "namespace"},
},
},
release: "namespace/foo/bar",
expectedNs: corev1.Namespace{
ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{"name": "test", "optLabel1": "optValue1", "optLabel2": "optValue2"},
Name: "namespace",
Labels: map[string]string{"kubernetes.io/metadata.name": "namespace", "optLabel1": "optValue1", "optLabel2": "optValue2"},
Annotations: map[string]string{"optAnn1": "optValue1"},
},
},
Expand All @@ -54,14 +56,16 @@ func TestSetNamespaceLabelsAndAnnotations(t *testing.T) {
}},
ns: corev1.Namespace{
ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{"nsLabel": "nsValue", "name": "test"},
Name: "namespace",
Labels: map[string]string{"nsLabel": "nsValue", "kubernetes.io/metadata.name": "namespace"},
Annotations: map[string]string{"nsAnn": "nsValue"},
},
},
release: "namespace/foo/bar",
expectedNs: corev1.Namespace{
ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{"optLabel": "optValue", "name": "test"},
Name: "namespace",
Labels: map[string]string{"optLabel": "optValue", "kubernetes.io/metadata.name": "namespace"},
Annotations: map[string]string{},
},
},
Expand All @@ -76,14 +80,16 @@ func TestSetNamespaceLabelsAndAnnotations(t *testing.T) {
}},
ns: corev1.Namespace{
ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{"bdLabel": "nsValue"},
Name: "namespace",
Labels: map[string]string{"bdLabel": "nsValue", "kubernetes.io/metadata.name": "namespace"},
Annotations: map[string]string{"bdAnn": "nsValue"},
},
},
release: "namespace/foo/bar",
expectedNs: corev1.Namespace{
ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{"bdLabel": "labelUpdated"},
Name: "namespace",
Labels: map[string]string{"bdLabel": "labelUpdated", "kubernetes.io/metadata.name": "namespace"},
Annotations: map[string]string{"bdAnn": "annUpdated"},
},
},
Expand All @@ -98,13 +104,10 @@ func TestSetNamespaceLabelsAndAnnotations(t *testing.T) {
mockDynamic := mocks.NewMockInterface(ctrl)
mockNamespaceableResourceInterface := mocks.NewMockNamespaceableResourceInterface(ctrl)
u, _ := runtime.DefaultUnstructuredConverter.ToUnstructured(&test.ns)
// Resource will be called twice, one time for UPDATE and another time for LIST
// Resource will be called twice, one time for UPDATE and another time for GET
mockDynamic.EXPECT().Resource(gomock.Any()).Return(mockNamespaceableResourceInterface).Times(2)
mockNamespaceableResourceInterface.EXPECT().List(gomock.Any(), metav1.ListOptions{
LabelSelector: "name=namespace",
}).Return(&unstructured.UnstructuredList{
Items: []unstructured.Unstructured{{Object: u}},
}, nil).Times(1)
mockNamespaceableResourceInterface.EXPECT().Get(gomock.Any(), "namespace", metav1.GetOptions{}).
Return(&unstructured.Unstructured{Object: u}, nil).Times(1)
uns, _ := runtime.DefaultUnstructuredConverter.ToUnstructured(&test.expectedNs)
mockNamespaceableResourceInterface.EXPECT().Update(gomock.Any(), &unstructured.Unstructured{Object: uns}, gomock.Any()).Times(1)

Expand All @@ -128,24 +131,20 @@ func TestSetNamespaceLabelsAndAnnotationsError(t *testing.T) {
},
}}
release := "test/foo/bar"
expectedErr := errors.New("namespace test not found")

ctrl := gomock.NewController(t)
defer ctrl.Finish()
mockDynamic := mocks.NewMockInterface(ctrl)
mockNamespaceableResourceInterface := mocks.NewMockNamespaceableResourceInterface(ctrl)
mockDynamic.EXPECT().Resource(gomock.Any()).Return(mockNamespaceableResourceInterface).Times(1)
mockNamespaceableResourceInterface.EXPECT().List(gomock.Any(), metav1.ListOptions{
LabelSelector: "name=test",
}).Return(&unstructured.UnstructuredList{
Items: []unstructured.Unstructured{},
}, nil).Times(1)
mockNamespaceableResourceInterface.EXPECT().Get(gomock.Any(), "test", metav1.GetOptions{}).
Return(nil, apierrors.NewNotFound(corev1.Resource("namespace"), "test")).Times(1)
h := handler{
dynamic: mockDynamic,
}
err := h.setNamespaceLabelsAndAnnotations(bd, release)

if err.Error() != expectedErr.Error() {
t.Errorf("expected error %v: got %v", expectedErr, err)
if !apierrors.IsNotFound(err) {
t.Errorf("expected not found error: got %v", err)
}
}