Skip to content

Commit 439c8f6

Browse files
authored
Merge pull request vmware-tanzu#65 from yi0909/topic/yijiang/VMSVC-1245/remove-tkg-cs
Stop creating TKG content source related resources.
2 parents 1bc9d53 + 1d3f8e7 commit 439c8f6

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

controllers/controllers.go

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,6 @@ func AddToManager(ctx *context.ControllerManagerContext, mgr manager.Manager) er
3333
if err := infraprovider.AddToManager(ctx, mgr); err != nil {
3434
return errors.Wrap(err, "failed to initialize InfraProvider controller")
3535
}
36-
if err := providerconfigmap.AddToManager(ctx, mgr); err != nil {
37-
return errors.Wrap(err, "failed to initialize ProviderConfigMap controller")
38-
}
3936
if err := virtualmachine.AddToManager(ctx, mgr); err != nil {
4037
return errors.Wrap(err, "failed to initialize VirtualMachine controller")
4138
}
@@ -68,6 +65,12 @@ func AddToManager(ctx *context.ControllerManagerContext, mgr manager.Manager) er
6865
if err := contentsource.AddToManager(ctx, mgr); err != nil {
6966
return errors.Wrap(err, "failed to initialize ContentSource controller")
7067
}
68+
// We only update TKG related ContentSource/ContentLibraryProvider/ContentSourceBinding resources
69+
// in provider configmap reconcile. These resources will be removed when the FSS is enabled,
70+
// add provider configmap controller to the manager only when the FSS is disabled.
71+
if err := providerconfigmap.AddToManager(ctx, mgr); err != nil {
72+
return errors.Wrap(err, "failed to initialize ProviderConfigMap controller")
73+
}
7174
}
7275
return nil
7376
}

0 commit comments

Comments
 (0)