mirror of
https://github.com/open-cluster-management-io/ocm.git
synced 2026-02-14 10:00:11 +00:00
c516beffa6
Some checks failed
Post / images (amd64, addon-manager) (push) Failing after 46s
Post / images (amd64, placement) (push) Failing after 41s
Post / images (amd64, registration-operator) (push) Failing after 39s
Post / images (amd64, work) (push) Failing after 42s
Post / images (arm64, addon-manager) (push) Failing after 39s
Post / images (arm64, placement) (push) Failing after 39s
Post / images (arm64, registration) (push) Failing after 40s
Post / images (arm64, registration-operator) (push) Failing after 42s
Post / images (arm64, work) (push) Failing after 39s
Post / images (amd64, registration) (push) Failing after 7m46s
Post / image manifest (addon-manager) (push) Has been skipped
Post / image manifest (placement) (push) Has been skipped
Post / image manifest (registration) (push) Has been skipped
Post / image manifest (registration-operator) (push) Has been skipped
Post / image manifest (work) (push) Has been skipped
Post / trigger clusteradm e2e (push) Has been skipped
Post / coverage (push) Failing after 14m33s
Scorecard supply-chain security / Scorecard analysis (push) Failing after 1m25s
Close stale issues and PRs / stale (push) Successful in 46s
* Add addon conversion webhook for v1alpha1/v1beta1 API migration 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com> Signed-off-by: Qing Hao <qhao@redhat.com> * Fix GroupVersion compatibility issues after API dependency update This commit fixes compilation and test errors introduced by updating the API dependency to use native conversion functions from PR #411. Changes include: 1. Fix GroupVersion type mismatches across the codebase: - Updated OwnerReference creation to use schema.GroupVersion - Fixed webhook scheme registration to use proper GroupVersion type - Applied fixes to addon, placement, migration, work, and registration controllers 2. Enhance addon conversion webhook: - Use native API conversion functions from addon/v1beta1/conversion.go - Fix InstallNamespace annotation key to match expected format - Add custom logic to populate deprecated ConfigReferent field in ConfigReferences - Properly preserve annotations during v1alpha1 <-> v1beta1 conversion 3. Remove duplicate conversion code: - Deleted pkg/addon/webhook/conversion/ directory (~500 lines) - Now using native conversion functions from the API repository 4. Patch vendored addon-framework: - Fixed GroupVersion errors in agentdeploy utils All unit tests pass successfully (97 packages, 0 failures). Signed-off-by: Qing Hao <qhao@redhat.com> --------- Signed-off-by: Qing Hao <qhao@redhat.com> Co-authored-by: Claude <noreply@anthropic.com>
75 lines
3.2 KiB
Go
75 lines
3.2 KiB
Go
package framework
|
|
|
|
import (
|
|
"context"
|
|
|
|
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
|
|
|
addonv1alpha1 "open-cluster-management.io/api/addon/v1alpha1"
|
|
addonv1beta1 "open-cluster-management.io/api/addon/v1beta1"
|
|
)
|
|
|
|
// CreateClusterManagementAddOnV1Alpha1 creates a ClusterManagementAddOn using v1alpha1 API
|
|
func (hub *Hub) CreateClusterManagementAddOnV1Alpha1(name string, addon *addonv1alpha1.ClusterManagementAddOn) (*addonv1alpha1.ClusterManagementAddOn, error) {
|
|
if addon == nil {
|
|
addon = &addonv1alpha1.ClusterManagementAddOn{
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Name: name,
|
|
},
|
|
Spec: addonv1alpha1.ClusterManagementAddOnSpec{},
|
|
}
|
|
}
|
|
return hub.AddonClient.AddonV1alpha1().ClusterManagementAddOns().Create(
|
|
context.TODO(), addon, metav1.CreateOptions{})
|
|
}
|
|
|
|
// GetClusterManagementAddOnV1Alpha1 gets a ClusterManagementAddOn using v1alpha1 API
|
|
func (hub *Hub) GetClusterManagementAddOnV1Alpha1(name string) (*addonv1alpha1.ClusterManagementAddOn, error) {
|
|
return hub.AddonClient.AddonV1alpha1().ClusterManagementAddOns().Get(
|
|
context.TODO(), name, metav1.GetOptions{})
|
|
}
|
|
|
|
// UpdateClusterManagementAddOnV1Alpha1 updates a ClusterManagementAddOn using v1alpha1 API
|
|
func (hub *Hub) UpdateClusterManagementAddOnV1Alpha1(addon *addonv1alpha1.ClusterManagementAddOn) (*addonv1alpha1.ClusterManagementAddOn, error) {
|
|
return hub.AddonClient.AddonV1alpha1().ClusterManagementAddOns().Update(
|
|
context.TODO(), addon, metav1.UpdateOptions{})
|
|
}
|
|
|
|
// DeleteClusterManagementAddOnV1Alpha1 deletes a ClusterManagementAddOn using v1alpha1 API
|
|
func (hub *Hub) DeleteClusterManagementAddOnV1Alpha1(name string) error {
|
|
return hub.AddonClient.AddonV1alpha1().ClusterManagementAddOns().Delete(
|
|
context.TODO(), name, metav1.DeleteOptions{})
|
|
}
|
|
|
|
// CreateClusterManagementAddOnV1Beta1 creates a ClusterManagementAddOn using v1beta1 API
|
|
func (hub *Hub) CreateClusterManagementAddOnV1Beta1(name string, addon *addonv1beta1.ClusterManagementAddOn) (*addonv1beta1.ClusterManagementAddOn, error) {
|
|
if addon == nil {
|
|
addon = &addonv1beta1.ClusterManagementAddOn{
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Name: name,
|
|
},
|
|
Spec: addonv1beta1.ClusterManagementAddOnSpec{},
|
|
}
|
|
}
|
|
return hub.AddonClient.AddonV1beta1().ClusterManagementAddOns().Create(
|
|
context.TODO(), addon, metav1.CreateOptions{})
|
|
}
|
|
|
|
// GetClusterManagementAddOnV1Beta1 gets a ClusterManagementAddOn using v1beta1 API
|
|
func (hub *Hub) GetClusterManagementAddOnV1Beta1(name string) (*addonv1beta1.ClusterManagementAddOn, error) {
|
|
return hub.AddonClient.AddonV1beta1().ClusterManagementAddOns().Get(
|
|
context.TODO(), name, metav1.GetOptions{})
|
|
}
|
|
|
|
// UpdateClusterManagementAddOnV1Beta1 updates a ClusterManagementAddOn using v1beta1 API
|
|
func (hub *Hub) UpdateClusterManagementAddOnV1Beta1(addon *addonv1beta1.ClusterManagementAddOn) (*addonv1beta1.ClusterManagementAddOn, error) {
|
|
return hub.AddonClient.AddonV1beta1().ClusterManagementAddOns().Update(
|
|
context.TODO(), addon, metav1.UpdateOptions{})
|
|
}
|
|
|
|
// DeleteClusterManagementAddOnV1Beta1 deletes a ClusterManagementAddOn using v1beta1 API
|
|
func (hub *Hub) DeleteClusterManagementAddOnV1Beta1(name string) error {
|
|
return hub.AddonClient.AddonV1beta1().ClusterManagementAddOns().Delete(
|
|
context.TODO(), name, metav1.DeleteOptions{})
|
|
}
|