Skip to content

⚠️ remove cmamanagedby migration shim and drop addon-framework v0.9.3 support #383

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

Open
tesshuflower wants to merge 1 commit into
base: main
Choose a base branch
from
Open

⚠️ remove cmamanagedby migration shim and drop addon-framework v0.9.3 support #383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 0 additions & 12 deletions pkg/addonmanager/base_manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import (
"open-cluster-management.io/addon-framework/pkg/addonmanager/controllers/agentdeploy"
"open-cluster-management.io/addon-framework/pkg/addonmanager/controllers/certificate"
"open-cluster-management.io/addon-framework/pkg/addonmanager/controllers/cmaconfig"
"open-cluster-management.io/addon-framework/pkg/addonmanager/controllers/cmamanagedby"
"open-cluster-management.io/addon-framework/pkg/addonmanager/controllers/registration"
"open-cluster-management.io/addon-framework/pkg/agent"
"open-cluster-management.io/addon-framework/pkg/utils"
Expand Down Expand Up @@ -163,16 +162,6 @@ func (a *BaseAddonManagerImpl) StartWithInformers(ctx context.Context,
mcaFilterFunc,
)

// This controller is used during migrating addons to be managed by addon-manager.
// This should be removed when the migration is done.
// The migration plan refer to https://github.com/open-cluster-management-io/ocm/issues/355.
managementAddonController := cmamanagedby.NewCMAManagedByController(
addonClient,
addonInformers.Addon().V1beta1().ClusterManagementAddOns(),
a.addonAgents,
utils.FilterByAddonName(a.addonAgents),
)

var addonConfigController, managementAddonConfigController factory.Controller
if len(a.addonConfigs) != 0 {
// ManagedClusterAddOn filter is intentionally disabled for the addon-config-controller.
Expand Down Expand Up @@ -225,7 +214,6 @@ func (a *BaseAddonManagerImpl) StartWithInformers(ctx context.Context,

go deployController.Run(ctx, 1)
go registrationController.Run(ctx, 1)
go managementAddonController.Run(ctx, 1)

if addonConfigController != nil {
go addonConfigController.Run(ctx, 1)
Expand Down
96 changes: 0 additions & 96 deletions pkg/addonmanager/controllers/cmamanagedby/controller.go
View file
Open in desktop

This file was deleted.

135 changes: 0 additions & 135 deletions pkg/addonmanager/controllers/cmamanagedby/controller_test.go
View file
Open in desktop

This file was deleted.

22 changes: 1 addition & 21 deletions pkg/utils/helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,9 @@ import (
"k8s.io/apimachinery/pkg/runtime/schema"
coreclientv1 "k8s.io/client-go/kubernetes/typed/core/v1"

addonapiv1alpha1 "open-cluster-management.io/api/addon/v1alpha1"
"open-cluster-management.io/addon-framework/pkg/agent"
addonapiv1beta1 "open-cluster-management.io/api/addon/v1beta1"
clusterv1 "open-cluster-management.io/api/cluster/v1"

"open-cluster-management.io/addon-framework/pkg/agent"
)

func MergeRelatedObjects(modified *bool, objs *[]addonapiv1beta1.ObjectReference, obj addonapiv1beta1.ObjectReference) {
Expand Down Expand Up @@ -249,24 +247,6 @@ func ownerRefMatched(existing, required metav1.OwnerReference) bool {
return true
}

// AddonManagementFilterFunc is to check if the addon should be managed by addon manager or self-managed
type AddonManagementFilterFunc func(cma *addonapiv1beta1.ClusterManagementAddOn) bool

func ManagedByAddonManager(obj interface{}) bool {
accessor, _ := meta.Accessor(obj)
annotations := accessor.GetAnnotations()
if len(annotations) == 0 {
return true
}

value, ok := annotations[addonapiv1alpha1.AddonLifecycleAnnotationKey]
if !ok {
return true
}

return value == addonapiv1alpha1.AddonLifecycleAddonManagerAnnotationValue
}

func FilterByAddonName(agentAddons map[string]agent.AgentAddon) func(obj interface{}) bool {
return func(obj interface{}) bool {
accessor, _ := meta.Accessor(obj)
Expand Down
4 changes: 0 additions & 4 deletions test/integration/kube/assertion_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime/schema"
"open-cluster-management.io/addon-framework/pkg/utils"
addonapiv1alpha1 "open-cluster-management.io/api/addon/v1alpha1"
addonapiv1beta1 "open-cluster-management.io/api/addon/v1beta1"
)

Expand Down Expand Up @@ -55,9 +54,6 @@ func createClusterManagementAddOn(name, defaultConfigNamespace, defaultConfigNam
&addonapiv1beta1.ClusterManagementAddOn{
ObjectMeta: metav1.ObjectMeta{
Name: name,
Annotations: map[string]string{
addonapiv1alpha1.AddonLifecycleAnnotationKey: addonapiv1alpha1.AddonLifecycleAddonManagerAnnotationValue,
},
},
Spec: addonapiv1beta1.ClusterManagementAddOnSpec{
DefaultConfigs: []addonapiv1beta1.AddOnConfig{
Expand Down
3 changes: 0 additions & 3 deletions test/integration/v1alpha1_kube/assertion_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,6 @@ func createClusterManagementAddOn(name, defaultConfigNamespace, defaultConfigNam
&addonapiv1alpha1.ClusterManagementAddOn{
ObjectMeta: metav1.ObjectMeta{
Name: name,
Annotations: map[string]string{
addonapiv1alpha1.AddonLifecycleAnnotationKey: addonapiv1alpha1.AddonLifecycleAddonManagerAnnotationValue,
},
},
Spec: addonapiv1alpha1.ClusterManagementAddOnSpec{
SupportedConfigs: []addonapiv1alpha1.ConfigMeta{
Expand Down
Loading