Merge pull request #1096 from ErikJiang/add_rls_label

migrate old version localArtifactSet
kubean-io · Jan 29, 2024 · 202bfcb · 202bfcb
2 parents b5e248c + 3a27e0d
commit 202bfcb
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 2 deletions.
diff --git a/pkg/controllers/offlineversion/controller.go b/pkg/controllers/offlineversion/controller.go
@@ -77,6 +77,19 @@ func (c *Controller) Reconcile(ctx context.Context, req controllerruntime.Reques
 	sprayRelease, ok := localartifactset.ObjectMeta.Labels[constants.KeySprayRelease]
 	if !ok {
 		klog.Warningf("No label %s found in %s", constants.KeySprayRelease, localartifactset.Name)
+
+		// Migrate old versions of LocalArtifactSet without a release version label.
+		sprayRelease = "master"
+		if localartifactset.ObjectMeta.Labels != nil {
+			localartifactset.ObjectMeta.Labels[constants.KeySprayRelease] = sprayRelease
+		} else {
+			localartifactset.ObjectMeta.Labels = map[string]string{constants.KeySprayRelease: sprayRelease}
+		}
+		_, err := c.LocalArtifactSetClientSet.KubeanV1alpha1().LocalArtifactSets().Update(context.Background(), localartifactset, metav1.UpdateOptions{})
+		if err != nil {
+			klog.Error(err)
+			return controllerruntime.Result{RequeueAfter: Loop}, nil
+		}
 		return controllerruntime.Result{}, nil
 	}
 

diff --git a/pkg/controllers/offlineversion/controller_test.go b/pkg/controllers/offlineversion/controller_test.go
@@ -489,7 +489,7 @@ func TestReconcile(t *testing.T) {
 			want: true,
 		},
 		{
-			name: "ComponentsversionGlobal not exist",
+			name: "localArtifact missing release label",
 			args: func() bool {
 				controller := &Controller{
 					Client:                    newFakeClient(),
@@ -511,11 +511,20 @@ func TestReconcile(t *testing.T) {
 					},
 				}
 
+				manifest := &manifestv1alpha1.Manifest{
+					ObjectMeta: metav1.ObjectMeta{
+						Name: "manifest-master",
+					},
+				}
+				infomanifest.GetVersionedManifest().Op("add", manifest, nil)
+				controller.InfoManifestClientSet.KubeanV1alpha1().Manifests().Create(context.Background(), manifest, metav1.CreateOptions{})
 				controller.Client.Create(context.Background(), &offlineVersionData)
 				controller.LocalArtifactSetClientSet.KubeanV1alpha1().LocalArtifactSets().Create(context.Background(), &offlineVersionData, metav1.CreateOptions{})
 
 				result, _ := controller.Reconcile(context.Background(), controllerruntime.Request{NamespacedName: types.NamespacedName{Name: offlineVersionData.Name}})
-				return result.RequeueAfter == 0 && result.Requeue == false
+				localartifactset, _ := controller.LocalArtifactSetClientSet.KubeanV1alpha1().LocalArtifactSets().Get(context.Background(), offlineVersionData.Name, metav1.GetOptions{})
+				release, ok := localartifactset.ObjectMeta.Labels[constants.KeySprayRelease]
+				return ok == true && release == "master" && result.Requeue == false && result.RequeueAfter == 0
 			},
 			want: true,
 		},