mirror of
https://github.com/open-cluster-management-io/ocm.git
synced 2026-05-17 06:37:48 +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>
38 lines
1.1 KiB
Go
38 lines
1.1 KiB
Go
// Copyright Contributors to the Open Cluster Management project
|
|
|
|
package webhook
|
|
|
|
import (
|
|
clientgoscheme "k8s.io/client-go/kubernetes/scheme"
|
|
|
|
addonv1alpha1 "open-cluster-management.io/ocm/pkg/addon/webhook/v1alpha1"
|
|
addonv1beta1 "open-cluster-management.io/ocm/pkg/addon/webhook/v1beta1"
|
|
commonoptions "open-cluster-management.io/ocm/pkg/common/options"
|
|
)
|
|
|
|
// SetupWebhookServer sets up the webhook server with addon API schemes and conversion webhooks
|
|
func SetupWebhookServer(opts *commonoptions.WebhookOptions) error {
|
|
// Install schemes
|
|
if err := opts.InstallScheme(
|
|
clientgoscheme.AddToScheme,
|
|
addonv1alpha1.Install,
|
|
addonv1beta1.Install,
|
|
); err != nil {
|
|
return err
|
|
}
|
|
|
|
// Register ManagedClusterAddOn conversion webhooks (v1alpha1 is Hub)
|
|
opts.InstallWebhook(
|
|
&addonv1alpha1.ManagedClusterAddOnWebhook{},
|
|
&addonv1beta1.ManagedClusterAddOnWebhook{},
|
|
)
|
|
|
|
// Register ClusterManagementAddOn conversion webhooks (v1alpha1 is Hub)
|
|
opts.InstallWebhook(
|
|
&addonv1alpha1.ClusterManagementAddOnWebhook{},
|
|
&addonv1beta1.ClusterManagementAddOnWebhook{},
|
|
)
|
|
|
|
return nil
|
|
}
|