Skip to content

Commit c909052

Browse files
authored
Fix #1715: BUG: reloaders error while setting "reloader: true" in clus (#1716)
* Fix #1715: skip reloader entries with empty namespace * Fix #1715: BUG: reloaders error while setting "reloader: true" in clust * Fix BUG: reloaders error while setting "reloader: true" in clust
1 parent 93f5f07 commit c909052

2 files changed

Lines changed: 22 additions & 1 deletion

File tree

lib/clusterops/reloader.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ func deployReloaderInstance(ctx context.Context, reloaderClient client.Client,
112112
reloaderInfo := make([]libsveltosv1beta1.ReloaderInfo, 0, len(resources))
113113
for i := range resources {
114114
resource := &resources[i]
115-
if watchForRollingUpgrade(resource) {
115+
if watchForRollingUpgrade(resource) && resource.Namespace != "" {
116116
reloaderInfo = append(reloaderInfo,
117117
libsveltosv1beta1.ReloaderInfo{
118118
Namespace: resource.Namespace,

lib/clusterops/reloader_utils_test.go

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,27 @@ var _ = Describe("Reloader utils", func() {
9999
Expect(reflect.DeepEqual(reloaders.Items[0].Spec.ReloaderInfo, reloaderInfo)).To(BeTrue())
100100
})
101101

102+
It("deployReloaderInstance skips resources with empty namespace", func() {
103+
c := fake.NewClientBuilder().WithScheme(scheme).Build()
104+
105+
resources := []corev1.ObjectReference{
106+
{Kind: "Deployment", Namespace: randomString(), Name: randomString()},
107+
{Kind: "Deployment", Namespace: "", Name: randomString()},
108+
{Kind: "DaemonSet", Namespace: "", Name: randomString()},
109+
}
110+
111+
clusterProfileName := randomString()
112+
feature := libsveltosv1beta1.FeatureHelm
113+
Expect(clusterops.DeployReloaderInstance(context.TODO(), c, clusterProfileName,
114+
feature, resources, textlogger.NewLogger(textlogger.NewConfig()))).To(Succeed())
115+
116+
reloaders := &libsveltosv1beta1.ReloaderList{}
117+
Expect(c.List(context.TODO(), reloaders)).To(Succeed())
118+
Expect(len(reloaders.Items)).To(Equal(1))
119+
Expect(len(reloaders.Items[0].Spec.ReloaderInfo)).To(Equal(1))
120+
Expect(reloaders.Items[0].Spec.ReloaderInfo[0].Namespace).ToNot(BeEmpty())
121+
})
122+
102123
It("deployReloaderInstance creates/updates reloader instance", func() {
103124
c := fake.NewClientBuilder().WithScheme(scheme).Build()
104125

0 commit comments

Comments
 (0)