Skip to content
Merged
Show file tree
Hide file tree
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
1 change: 0 additions & 1 deletion controllers/clustersummary_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -668,7 +668,6 @@ func (r *ClusterSummaryReconciler) proceedDeployingClusterSummary(ctx context.Co
interval = kustomizeRefInterval
}
if interval > 0 {
r.setNextReconcileTime(clusterSummaryScope, interval)
return reconcile.Result{RequeueAfter: interval}, nil
}

Expand Down
21 changes: 17 additions & 4 deletions test/fv/remote_url_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,10 @@ var _ = Describe("Remote URL", func() {
saName = "metrics-server"
)

// Extra Labels/Annotations are deprecated. Not supported in pull mode
// Do not run in PullMode. ExtraLabels/ExtraAnnotations are deprecated. So not implemented in pull mode.
It("Deploy the content of a remote URL", Label("FV", "EXTENDED"), func() {
It("Deploy the content of a remote URL", Label("FV", "PULLMODE", "EXTENDED"), func() {
Byf("Create a ClusterProfile matching Cluster %s/%s", kindWorkloadCluster.GetNamespace(), kindWorkloadCluster.GetName())
clusterProfile := getClusterProfile(namePrefix, map[string]string{key: value})
clusterProfile.Spec.SyncMode = configv1beta1.SyncModeContinuous
clusterProfile.Spec.SyncMode = configv1beta1.SyncModeContinuousWithDriftDetection
Expect(k8sClient.Create(context.TODO(), clusterProfile)).To(Succeed())

verifyClusterProfileMatches(clusterProfile)
Expand Down Expand Up @@ -125,6 +123,21 @@ var _ = Describe("Remote URL", func() {
clusterSummary.Spec.ClusterNamespace, clusterSummary.Spec.ClusterName, libsveltosv1beta1.FeatureResources,
policies, nil)

verifyDriftDetectionManagerDeployment(workloadClient)

Byf("Deleting metric-server ServiceAccount %s/%s from the workload cluster", saNamespace, saName)
currentServiceAccount := &corev1.ServiceAccount{}
Expect(workloadClient.Get(context.TODO(),
types.NamespacedName{Namespace: saNamespace, Name: saName}, currentServiceAccount)).To(Succeed())
Expect(workloadClient.Delete(context.TODO(), currentServiceAccount)).To(Succeed())

Byf("Verifying Sveltos redeploys metric-server ServiceAccount %s/%s after it is deleted", saNamespace, saName)
Eventually(func() error {
return workloadClient.Get(context.TODO(),
types.NamespacedName{Namespace: saNamespace, Name: saName},
&corev1.ServiceAccount{})
}, timeout, pollingInterval).Should(BeNil())

Byf("Update ClusterProfile %s to not reference Remote URL", clusterProfile.Name)
err = retry.RetryOnConflict(retry.DefaultRetry, func() error {
Expect(k8sClient.Get(context.TODO(),
Expand Down