github/open-cluster-management
1
0
Fork 0
mirror of https://github.com/open-cluster-management-io/ocm.git synced 2026-02-14 10:00:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

using dir to reorg cluster-manager manifests (#1112)
Some checks failed
Scorecard supply-chain security / Scorecard analysis (push) Failing after 2m2s
Post / coverage (push) Failing after 39m59s
Post / images (amd64, addon-manager) (push) Failing after 8m42s
Post / images (amd64, placement) (push) Failing after 7m45s
Post / images (amd64, registration) (push) Failing after 7m51s
Post / images (amd64, registration-operator) (push) Failing after 7m38s
Post / images (amd64, work) (push) Failing after 7m44s
Post / images (arm64, addon-manager) (push) Failing after 7m51s
Post / images (arm64, placement) (push) Failing after 7m48s
Post / images (arm64, registration) (push) Failing after 7m55s
Post / images (arm64, registration-operator) (push) Failing after 7m49s
Post / images (arm64, work) (push) Failing after 7m50s
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
Close stale issues and PRs / stale (push) Successful in 54s

Browse Source 
Signed-off-by: Wei Liu <liuweixa@redhat.com>
This commit is contained in:
Wei Liu
2025-08-18 17:38:43 +08:00
committed by GitHub
parent a7364f21ef
commit 5bac053fe0
60 changed files with 73 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hack/copy-crds.sh
View File

@@ -8,9 +8,9 @@ for f in $HUB_CRD_FILES
do do
if [ -f "$BASE_DIR/$(basename $f).yaml-patch" ]; if [ -f "$BASE_DIR/$(basename $f).yaml-patch" ];
then then
$1 -o $BASE_DIR/$(basename $f).yaml-patch < $f > ./manifests/cluster-manager/hub/$(basename $f) "$1" -o "$BASE_DIR/$(basename "$f").yaml-patch" < "$f" > "./manifests/cluster-manager/hub/crds/$(basename "$f")"
else else
cp $f ./manifests/cluster-manager/hub/ cp $f ./manifests/cluster-manager/hub/crds
fi fi
done done

8
hack/verify-crds.sh
View File

@@ -8,11 +8,11 @@ for f in $HUB_CRD_FILES
do do
if [ -f "$BASE_DIR/$(basename $f).yaml-patch" ]; if [ -f "$BASE_DIR/$(basename $f).yaml-patch" ];
then then
$1 -o $BASE_DIR/$(basename $f).yaml-patch < $f > ./manifests/cluster-manager/hub/$(basename $f).tmp "$1" -o "$BASE_DIR/$(basename "$f").yaml-patch" < "$f" > "./manifests/cluster-manager/hub/crds/$(basename "$f").tmp"
diff -N ./manifests/cluster-manager/hub/$(basename $f).tmp ./manifests/cluster-manager/hub/$(basename $f) || ( echo 'crd content is incorrect' && false ) diff -N "./manifests/cluster-manager/hub/crds/$(basename "$f").tmp" "./manifests/cluster-manager/hub/crds/$(basename "$f")" || ( echo 'crd content is incorrect' && false )
rm ./manifests/cluster-manager/hub/$(basename $f).tmp rm "./manifests/cluster-manager/hub/crds/$(basename "$f").tmp"
else else
diff -N $f ./manifests/cluster-manager/hub/$(basename $f) || ( echo 'crd content is incorrect' && false ) diff -N "$f" "./manifests/cluster-manager/hub/crds/$(basename "$f")" || ( echo 'crd content is incorrect' && false )
fi fi
done done

0
manifests/cluster-manager/hub/cluster-manager-addon-manager-clusterrole.yaml → manifests/cluster-manager/hub/addon-manager/clusterrole.yaml
View File

0
manifests/cluster-manager/hub/cluster-manager-addon-manager-clusterrolebinding.yaml → manifests/cluster-manager/hub/addon-manager/clusterrolebinding.yaml
View File

0
manifests/cluster-manager/hub/cluster-manager-addon-manager-serviceaccount.yaml → manifests/cluster-manager/hub/addon-manager/serviceaccount.yaml
View File

0
manifests/cluster-manager/hub/cluster-manager-addon-manager-work-executor-admin-clusterrolebinding.yaml → manifests/cluster-manager/hub/addon-manager/work-executor-admin-clusterrolebinding.yaml
View File

0
manifests/cluster-manager/hub/cluster-manager-clusterprofiles-clusterrole.yaml → manifests/cluster-manager/hub/clusterprofiles/clusterrole.yaml
View File

0
manifests/cluster-manager/hub/cluster-manager-clusterprofiles-clusterrolebinding.yaml → manifests/cluster-manager/hub/clusterprofiles/clusterrolebinding.yaml
View File

0
manifests/cluster-manager/hub/0000_00_addon.open-cluster-management.io_clustermanagementaddons.crd.yaml → manifests/cluster-manager/hub/crds/0000_00_addon.open-cluster-management.io_clustermanagementaddons.crd.yaml
View File

0
manifests/cluster-manager/hub/0000_00_clusters.open-cluster-management.io_managedclusters.crd.yaml → manifests/cluster-manager/hub/crds/0000_00_clusters.open-cluster-management.io_managedclusters.crd.yaml
View File

0
manifests/cluster-manager/hub/0000_00_clusters.open-cluster-management.io_managedclustersets.crd.yaml → manifests/cluster-manager/hub/crds/0000_00_clusters.open-cluster-management.io_managedclustersets.crd.yaml
View File

0
manifests/cluster-manager/hub/0000_00_multicluster.x-k8s.io_clusterprofiles.crd.yaml → manifests/cluster-manager/hub/crds/0000_00_multicluster.x-k8s.io_clusterprofiles.crd.yaml
View File

0
manifests/cluster-manager/hub/0000_00_work.open-cluster-management.io_manifestworkreplicasets.crd.yaml → manifests/cluster-manager/hub/crds/0000_00_work.open-cluster-management.io_manifestworkreplicasets.crd.yaml
View File

0
manifests/cluster-manager/hub/0000_00_work.open-cluster-management.io_manifestworks.crd.yaml → manifests/cluster-manager/hub/crds/0000_00_work.open-cluster-management.io_manifestworks.crd.yaml
View File

0
manifests/cluster-manager/hub/0000_01_addon.open-cluster-management.io_managedclusteraddons.crd.yaml → manifests/cluster-manager/hub/crds/0000_01_addon.open-cluster-management.io_managedclusteraddons.crd.yaml
View File

0
manifests/cluster-manager/hub/0000_01_clusters.open-cluster-management.io_managedclustersetbindings.crd.yaml → manifests/cluster-manager/hub/crds/0000_01_clusters.open-cluster-management.io_managedclustersetbindings.crd.yaml
View File

0
manifests/cluster-manager/hub/0000_02_addon.open-cluster-management.io_addondeploymentconfigs.crd.yaml → manifests/cluster-manager/hub/crds/0000_02_addon.open-cluster-management.io_addondeploymentconfigs.crd.yaml
View File

0
manifests/cluster-manager/hub/0000_02_clusters.open-cluster-management.io_placements.crd.yaml → manifests/cluster-manager/hub/crds/0000_02_clusters.open-cluster-management.io_placements.crd.yaml
View File

0
manifests/cluster-manager/hub/0000_03_addon.open-cluster-management.io_addontemplates.crd.yaml → manifests/cluster-manager/hub/crds/0000_03_addon.open-cluster-management.io_addontemplates.crd.yaml
View File

0
manifests/cluster-manager/hub/0000_03_clusters.open-cluster-management.io_placementdecisions.crd.yaml → manifests/cluster-manager/hub/crds/0000_03_clusters.open-cluster-management.io_placementdecisions.crd.yaml
View File

0
manifests/cluster-manager/hub/0000_05_clusters.open-cluster-management.io_addonplacementscores.crd.yaml → manifests/cluster-manager/hub/crds/0000_05_clusters.open-cluster-management.io_addonplacementscores.crd.yaml
View File

0
manifests/cluster-manager/hub/cluster-manager-manifestworkreplicaset-clusterrole.yaml → manifests/cluster-manager/hub/manifestworkreplicaset/clusterrole.yaml
View File

0
manifests/cluster-manager/hub/cluster-manager-manifestworkreplicaset-clusterrolebinding.yaml → manifests/cluster-manager/hub/manifestworkreplicaset/clusterrolebinding.yaml
View File

0
manifests/cluster-manager/hub/cluster-manager-manifestworkreplicaset-serviceaccount.yaml → manifests/cluster-manager/hub/manifestworkreplicaset/serviceaccount.yaml
View File

0
manifests/cluster-manager/hub/cluster-manager-placement-clusterrole.yaml → manifests/cluster-manager/hub/placement/clusterrole.yaml
View File

0
manifests/cluster-manager/hub/cluster-manager-placement-clusterrolebinding.yaml → manifests/cluster-manager/hub/placement/clusterrolebinding.yaml
View File

0
manifests/cluster-manager/hub/cluster-manager-placement-serviceaccount.yaml → manifests/cluster-manager/hub/placement/serviceaccount.yaml
View File

0
manifests/cluster-manager/hub/cluster-manager-registration-clusterrole.yaml → manifests/cluster-manager/hub/registration/clusterrole.yaml
View File

0
manifests/cluster-manager/hub/cluster-manager-registration-clusterrolebinding.yaml → manifests/cluster-manager/hub/registration/clusterrolebinding.yaml
View File

0
manifests/cluster-manager/hub/cluster-manager-registration-serviceaccount.yaml → manifests/cluster-manager/hub/registration/serviceaccount.yaml
View File

0
manifests/cluster-manager/hub/cluster-manager-registration-webhook-clusterrole.yaml → manifests/cluster-manager/hub/registration/webhook-clusterrole.yaml
View File

0
manifests/cluster-manager/hub/cluster-manager-registration-webhook-clusterrolebinding.yaml → manifests/cluster-manager/hub/registration/webhook-clusterrolebinding.yaml
View File

0
manifests/cluster-manager/hub/cluster-manager-registration-webhook-clustersetbinding-validatingconfiguration.yaml → manifests/cluster-manager/hub/registration/webhook-clustersetbinding-validatingconfiguration.yaml
View File

0
manifests/cluster-manager/hub/cluster-manager-registration-webhook-endpoint-hosted.yaml → manifests/cluster-manager/hub/registration/webhook-endpoint-hosted.yaml
View File

0
manifests/cluster-manager/hub/cluster-manager-registration-webhook-mutatingconfiguration.yaml → manifests/cluster-manager/hub/registration/webhook-mutatingconfiguration.yaml
View File

0
manifests/cluster-manager/hub/cluster-manager-registration-webhook-service-hosted.yaml → manifests/cluster-manager/hub/registration/webhook-service-hosted.yaml
View File

0
manifests/cluster-manager/hub/cluster-manager-registration-webhook-service.yaml → manifests/cluster-manager/hub/registration/webhook-service.yaml
View File

0
manifests/cluster-manager/hub/cluster-manager-registration-webhook-serviceaccount.yaml → manifests/cluster-manager/hub/registration/webhook-serviceaccount.yaml
View File

0
manifests/cluster-manager/hub/cluster-manager-registration-webhook-validatingconfiguration.yaml → manifests/cluster-manager/hub/registration/webhook-validatingconfiguration.yaml
View File

0
manifests/cluster-manager/hub/cluster-manager-work-executor-admin-clusterrole.yaml → manifests/cluster-manager/hub/work/executor-admin-clusterrole.yaml
View File

0
manifests/cluster-manager/hub/cluster-manager-work-webhook-clusterrole.yaml → manifests/cluster-manager/hub/work/webhook-clusterrole.yaml
View File

0
manifests/cluster-manager/hub/cluster-manager-work-webhook-clusterrolebinding.yaml → manifests/cluster-manager/hub/work/webhook-clusterrolebinding.yaml
View File

0
manifests/cluster-manager/hub/cluster-manager-work-webhook-endpoint-hosted.yaml → manifests/cluster-manager/hub/work/webhook-endpoint-hosted.yaml
View File

0
manifests/cluster-manager/hub/cluster-manager-work-webhook-service-hosted.yaml → manifests/cluster-manager/hub/work/webhook-service-hosted.yaml
View File

0
manifests/cluster-manager/hub/cluster-manager-work-webhook-service.yaml → manifests/cluster-manager/hub/work/webhook-service.yaml
View File

0
manifests/cluster-manager/hub/cluster-manager-work-webhook-serviceaccount.yaml → manifests/cluster-manager/hub/work/webhook-serviceaccount.yaml
View File

0
manifests/cluster-manager/hub/cluster-manager-work-webhook-validatingconfiguration.yaml → manifests/cluster-manager/hub/work/webhook-validatingconfiguration.yaml
View File

0
manifests/cluster-manager/management/cluster-manager-addon-manager-deployment.yaml → manifests/cluster-manager/management/addon-manager/deployment.yaml
View File

0
manifests/cluster-manager/management/cluster-manager-grpc-server-deployment.yaml → manifests/cluster-manager/management/grpc-server/deployment.yaml
View File

0
manifests/cluster-manager/management/cluster-manager-manifestworkreplicaset-deployment.yaml → manifests/cluster-manager/management/manifestworkreplicaset/deployment.yaml
View File

0
manifests/cluster-manager/management/cluster-manager-placement-deployment.yaml → manifests/cluster-manager/management/placement/deployment.yaml
View File

0
manifests/cluster-manager/management/cluster-manager-registration-deployment.yaml → manifests/cluster-manager/management/registration/deployment.yaml
View File

0
manifests/cluster-manager/management/cluster-manager-registration-webhook-deployment.yaml → manifests/cluster-manager/management/registration/webhook-deployment.yaml
View File

0
manifests/cluster-manager/management/cluster-manager-work-webhook-deployment.yaml → manifests/cluster-manager/management/work/webhook-deployment.yaml
View File

22
pkg/operator/helpers/helpers_test.go
View File

@@ -899,7 +899,7 @@ func TestGetRelatedResource(t *testing.T) {
}{ }{
{ {
name: "get correct crd relatedResources", name: "get correct crd relatedResources",
manifestFile: "cluster-manager/hub/0000_00_addon.open-cluster-management.io_clustermanagementaddons.crd.yaml", manifestFile: "cluster-manager/hub/crds/0000_00_addon.open-cluster-management.io_clustermanagementaddons.crd.yaml",
config: manifests.HubConfig{ config: manifests.HubConfig{
ClusterManagerName: "test", ClusterManagerName: "test",
Replica: 1, Replica: 1,
@@ -915,7 +915,7 @@ func TestGetRelatedResource(t *testing.T) {
}, },
{ {
name: "get correct clusterrole relatedResources", name: "get correct clusterrole relatedResources",
manifestFile: "cluster-manager/hub/cluster-manager-registration-clusterrole.yaml", manifestFile: "cluster-manager/hub/registration/clusterrole.yaml",
config: manifests.HubConfig{ config: manifests.HubConfig{
ClusterManagerName: "test", ClusterManagerName: "test",
Replica: 1, Replica: 1,
@@ -931,7 +931,7 @@ func TestGetRelatedResource(t *testing.T) {
}, },
{ {
name: "get correct deployment relatedResources", name: "get correct deployment relatedResources",
manifestFile: "cluster-manager/management/cluster-manager-registration-deployment.yaml", manifestFile: "cluster-manager/management/registration/deployment.yaml",
config: manifests.HubConfig{ config: manifests.HubConfig{
ClusterManagerName: "test", ClusterManagerName: "test",
ClusterManagerNamespace: "test-namespace", ClusterManagerNamespace: "test-namespace",
@@ -977,7 +977,7 @@ func TestSetRelatedResourcesStatusesWithObj(t *testing.T) {
}{ }{
{ {
name: "append obj to nil relatedResources", name: "append obj to nil relatedResources",
manifestFile: "cluster-manager/hub/0000_00_addon.open-cluster-management.io_clustermanagementaddons.crd.yaml", manifestFile: "cluster-manager/hub/crds/0000_00_addon.open-cluster-management.io_clustermanagementaddons.crd.yaml",
config: manifests.HubConfig{ config: manifests.HubConfig{
ClusterManagerName: "test", ClusterManagerName: "test",
Replica: 1, Replica: 1,
@@ -995,7 +995,7 @@ func TestSetRelatedResourcesStatusesWithObj(t *testing.T) {
}, },
{ {
name: "append obj to empty relatedResources", name: "append obj to empty relatedResources",
manifestFile: "cluster-manager/hub/0000_00_addon.open-cluster-management.io_clustermanagementaddons.crd.yaml", manifestFile: "cluster-manager/hub/crds/0000_00_addon.open-cluster-management.io_clustermanagementaddons.crd.yaml",
config: manifests.HubConfig{ config: manifests.HubConfig{
ClusterManagerName: "test", ClusterManagerName: "test",
Replica: 1, Replica: 1,
@@ -1013,7 +1013,7 @@ func TestSetRelatedResourcesStatusesWithObj(t *testing.T) {
}, },
{ {
name: "append obj to relatedResources", name: "append obj to relatedResources",
manifestFile: "cluster-manager/hub/0000_00_addon.open-cluster-management.io_clustermanagementaddons.crd.yaml", manifestFile: "cluster-manager/hub/crds/0000_00_addon.open-cluster-management.io_clustermanagementaddons.crd.yaml",
config: manifests.HubConfig{ config: manifests.HubConfig{
ClusterManagerName: "test", ClusterManagerName: "test",
Replica: 1, Replica: 1,
@@ -1046,7 +1046,7 @@ func TestSetRelatedResourcesStatusesWithObj(t *testing.T) {
}, },
{ {
name: "append duplicate obj to relatedResources", name: "append duplicate obj to relatedResources",
manifestFile: "cluster-manager/hub/0000_00_addon.open-cluster-management.io_clustermanagementaddons.crd.yaml", manifestFile: "cluster-manager/hub/crds/0000_00_addon.open-cluster-management.io_clustermanagementaddons.crd.yaml",
config: manifests.HubConfig{ config: manifests.HubConfig{
ClusterManagerName: "test", ClusterManagerName: "test",
Replica: 1, Replica: 1,
@@ -1100,7 +1100,7 @@ func TestRemoveRelatedResourcesStatusesWithObj(t *testing.T) {
}{ }{
{ {
name: "remove obj from nil relatedResources", name: "remove obj from nil relatedResources",
manifestFile: "cluster-manager/hub/0000_00_addon.open-cluster-management.io_clustermanagementaddons.crd.yaml", manifestFile: "cluster-manager/hub/crds/0000_00_addon.open-cluster-management.io_clustermanagementaddons.crd.yaml",
config: manifests.HubConfig{ config: manifests.HubConfig{
ClusterManagerName: "test", ClusterManagerName: "test",
Replica: 1, Replica: 1,
@@ -1110,7 +1110,7 @@ func TestRemoveRelatedResourcesStatusesWithObj(t *testing.T) {
}, },
{ {
name: "remove obj from empty relatedResources", name: "remove obj from empty relatedResources",
manifestFile: "cluster-manager/hub/0000_00_addon.open-cluster-management.io_clustermanagementaddons.crd.yaml", manifestFile: "cluster-manager/hub/crds/0000_00_addon.open-cluster-management.io_clustermanagementaddons.crd.yaml",
config: manifests.HubConfig{ config: manifests.HubConfig{
ClusterManagerName: "test", ClusterManagerName: "test",
Replica: 1, Replica: 1,
@@ -1120,7 +1120,7 @@ func TestRemoveRelatedResourcesStatusesWithObj(t *testing.T) {
}, },
{ {
name: "remove obj from relatedResources", name: "remove obj from relatedResources",
manifestFile: "cluster-manager/hub/0000_00_addon.open-cluster-management.io_clustermanagementaddons.crd.yaml", manifestFile: "cluster-manager/hub/crds/0000_00_addon.open-cluster-management.io_clustermanagementaddons.crd.yaml",
config: manifests.HubConfig{ config: manifests.HubConfig{
ClusterManagerName: "test", ClusterManagerName: "test",
Replica: 1, Replica: 1,
@@ -1153,7 +1153,7 @@ func TestRemoveRelatedResourcesStatusesWithObj(t *testing.T) {
}, },
{ {
name: "remove not exist obj from relatedResources", name: "remove not exist obj from relatedResources",
manifestFile: "cluster-manager/hub/0000_00_addon.open-cluster-management.io_clustermanagementaddons.crd.yaml", manifestFile: "cluster-manager/hub/crds/0000_00_addon.open-cluster-management.io_clustermanagementaddons.crd.yaml",
config: manifests.HubConfig{ config: manifests.HubConfig{
ClusterManagerName: "test", ClusterManagerName: "test",
Replica: 1, Replica: 1,

12
pkg/operator/operators/clustermanager/controllers/clustermanagercontroller/clustermanager_controller_test.go
View File

@@ -804,12 +804,12 @@ func newFakeHubConfigWithResourceRequirement(t *testing.T, r *operatorapiv1.Reso
func getManifestFiles() []string { func getManifestFiles() []string {
return []string{ return []string{
"cluster-manager/management/cluster-manager-addon-manager-deployment.yaml", "cluster-manager/management/addon-manager/deployment.yaml",
"cluster-manager/management/cluster-manager-manifestworkreplicaset-deployment.yaml", "cluster-manager/management/manifestworkreplicaset/deployment.yaml",
"cluster-manager/management/cluster-manager-placement-deployment.yaml", "cluster-manager/management/placement/deployment.yaml",
"cluster-manager/management/cluster-manager-registration-deployment.yaml", "cluster-manager/management/registration/deployment.yaml",
"cluster-manager/management/cluster-manager-registration-webhook-deployment.yaml", "cluster-manager/management/registration/webhook-deployment.yaml",
"cluster-manager/management/cluster-manager-work-webhook-deployment.yaml", "cluster-manager/management/work/webhook-deployment.yaml",
} }
} }

26
pkg/operator/operators/clustermanager/controllers/clustermanagercontroller/clustermanager_crd_reconcile.go
View File

@@ -37,23 +37,23 @@ var (
// crdResourceFiles should be deployed in the hub cluster // crdResourceFiles should be deployed in the hub cluster
hubCRDResourceFiles = []string{ hubCRDResourceFiles = []string{
"cluster-manager/hub/0000_00_addon.open-cluster-management.io_clustermanagementaddons.crd.yaml", "cluster-manager/hub/crds/0000_00_addon.open-cluster-management.io_clustermanagementaddons.crd.yaml",
"cluster-manager/hub/0000_00_clusters.open-cluster-management.io_managedclusters.crd.yaml", "cluster-manager/hub/crds/0000_00_clusters.open-cluster-management.io_managedclusters.crd.yaml",
"cluster-manager/hub/0000_00_clusters.open-cluster-management.io_managedclustersets.crd.yaml", "cluster-manager/hub/crds/0000_00_clusters.open-cluster-management.io_managedclustersets.crd.yaml",
"cluster-manager/hub/0000_00_work.open-cluster-management.io_manifestworks.crd.yaml", "cluster-manager/hub/crds/0000_00_work.open-cluster-management.io_manifestworks.crd.yaml",
"cluster-manager/hub/0000_00_work.open-cluster-management.io_manifestworkreplicasets.crd.yaml", "cluster-manager/hub/crds/0000_00_work.open-cluster-management.io_manifestworkreplicasets.crd.yaml",
"cluster-manager/hub/0000_01_addon.open-cluster-management.io_managedclusteraddons.crd.yaml", "cluster-manager/hub/crds/0000_01_addon.open-cluster-management.io_managedclusteraddons.crd.yaml",
"cluster-manager/hub/0000_01_clusters.open-cluster-management.io_managedclustersetbindings.crd.yaml", "cluster-manager/hub/crds/0000_01_clusters.open-cluster-management.io_managedclustersetbindings.crd.yaml",
"cluster-manager/hub/0000_02_clusters.open-cluster-management.io_placements.crd.yaml", "cluster-manager/hub/crds/0000_02_clusters.open-cluster-management.io_placements.crd.yaml",
"cluster-manager/hub/0000_02_addon.open-cluster-management.io_addondeploymentconfigs.crd.yaml", "cluster-manager/hub/crds/0000_02_addon.open-cluster-management.io_addondeploymentconfigs.crd.yaml",
"cluster-manager/hub/0000_03_addon.open-cluster-management.io_addontemplates.crd.yaml", "cluster-manager/hub/crds/0000_03_addon.open-cluster-management.io_addontemplates.crd.yaml",
"cluster-manager/hub/0000_03_clusters.open-cluster-management.io_placementdecisions.crd.yaml", "cluster-manager/hub/crds/0000_03_clusters.open-cluster-management.io_placementdecisions.crd.yaml",
"cluster-manager/hub/0000_05_clusters.open-cluster-management.io_addonplacementscores.crd.yaml", "cluster-manager/hub/crds/0000_05_clusters.open-cluster-management.io_addonplacementscores.crd.yaml",
} }
hubClusterProfileCRDResourceFiles = []string{ hubClusterProfileCRDResourceFiles = []string{
// clusterprofile crd // clusterprofile crd
"cluster-manager/hub/0000_00_multicluster.x-k8s.io_clusterprofiles.crd.yaml", "cluster-manager/hub/crds/0000_00_multicluster.x-k8s.io_clusterprofiles.crd.yaml",
} }
) )

52
pkg/operator/operators/clustermanager/controllers/clustermanagercontroller/clustermanager_hub_reconcile.go
View File

@@ -28,53 +28,53 @@ var (
// The hubRbacResourceFiles should be deployed in the hub cluster. // The hubRbacResourceFiles should be deployed in the hub cluster.
hubRbacResourceFiles = []string{ hubRbacResourceFiles = []string{
// registration // registration
"cluster-manager/hub/cluster-manager-registration-clusterrole.yaml", "cluster-manager/hub/registration/clusterrole.yaml",
"cluster-manager/hub/cluster-manager-registration-clusterrolebinding.yaml", "cluster-manager/hub/registration/clusterrolebinding.yaml",
"cluster-manager/hub/cluster-manager-registration-serviceaccount.yaml", "cluster-manager/hub/registration/serviceaccount.yaml",
// registration-webhook // registration-webhook
"cluster-manager/hub/cluster-manager-registration-webhook-clusterrole.yaml", "cluster-manager/hub/registration/webhook-clusterrole.yaml",
"cluster-manager/hub/cluster-manager-registration-webhook-clusterrolebinding.yaml", "cluster-manager/hub/registration/webhook-clusterrolebinding.yaml",
"cluster-manager/hub/cluster-manager-registration-webhook-serviceaccount.yaml", "cluster-manager/hub/registration/webhook-serviceaccount.yaml",
// work-webhook // work-webhook
"cluster-manager/hub/cluster-manager-work-webhook-clusterrole.yaml", "cluster-manager/hub/work/webhook-clusterrole.yaml",
"cluster-manager/hub/cluster-manager-work-webhook-clusterrolebinding.yaml", "cluster-manager/hub/work/webhook-clusterrolebinding.yaml",
"cluster-manager/hub/cluster-manager-work-webhook-serviceaccount.yaml", "cluster-manager/hub/work/webhook-serviceaccount.yaml",
// work executor admin // work executor admin
"cluster-manager/hub/cluster-manager-work-executor-admin-clusterrole.yaml", "cluster-manager/hub/work/executor-admin-clusterrole.yaml",
// placement // placement
"cluster-manager/hub/cluster-manager-placement-clusterrole.yaml", "cluster-manager/hub/placement/clusterrole.yaml",
"cluster-manager/hub/cluster-manager-placement-clusterrolebinding.yaml", "cluster-manager/hub/placement/clusterrolebinding.yaml",
"cluster-manager/hub/cluster-manager-placement-serviceaccount.yaml", "cluster-manager/hub/placement/serviceaccount.yaml",
} }
mwReplicaSetResourceFiles = []string{ mwReplicaSetResourceFiles = []string{
// manifestworkreplicaset // manifestworkreplicaset
"cluster-manager/hub/cluster-manager-manifestworkreplicaset-clusterrole.yaml", "cluster-manager/hub/manifestworkreplicaset/clusterrole.yaml",
"cluster-manager/hub/cluster-manager-manifestworkreplicaset-clusterrolebinding.yaml", "cluster-manager/hub/manifestworkreplicaset/clusterrolebinding.yaml",
"cluster-manager/hub/cluster-manager-manifestworkreplicaset-serviceaccount.yaml", "cluster-manager/hub/manifestworkreplicaset/serviceaccount.yaml",
} }
hubAddOnManagerRbacResourceFiles = []string{ hubAddOnManagerRbacResourceFiles = []string{
// addon-manager // addon-manager
"cluster-manager/hub/cluster-manager-addon-manager-clusterrole.yaml", "cluster-manager/hub/addon-manager/clusterrole.yaml",
"cluster-manager/hub/cluster-manager-addon-manager-clusterrolebinding.yaml", "cluster-manager/hub/addon-manager/clusterrolebinding.yaml",
"cluster-manager/hub/cluster-manager-addon-manager-work-executor-admin-clusterrolebinding.yaml", "cluster-manager/hub/addon-manager/work-executor-admin-clusterrolebinding.yaml",
"cluster-manager/hub/cluster-manager-addon-manager-serviceaccount.yaml", "cluster-manager/hub/addon-manager/serviceaccount.yaml",
} }
// The hubHostedWebhookServiceFiles should only be deployed on the hub cluster when the deploy mode is hosted. // The hubHostedWebhookServiceFiles should only be deployed on the hub cluster when the deploy mode is hosted.
hubDefaultWebhookServiceFiles = []string{ hubDefaultWebhookServiceFiles = []string{
"cluster-manager/hub/cluster-manager-registration-webhook-service.yaml", "cluster-manager/hub/registration/webhook-service.yaml",
"cluster-manager/hub/cluster-manager-work-webhook-service.yaml", "cluster-manager/hub/work/webhook-service.yaml",
} }
hubHostedWebhookServiceFiles = []string{ hubHostedWebhookServiceFiles = []string{
"cluster-manager/hub/cluster-manager-registration-webhook-service-hosted.yaml", "cluster-manager/hub/registration/webhook-service-hosted.yaml",
"cluster-manager/hub/cluster-manager-work-webhook-service-hosted.yaml", "cluster-manager/hub/work/webhook-service-hosted.yaml",
} }
// hubHostedWebhookEndpointFiles only apply when the deploy mode is hosted and address is IPFormat. // hubHostedWebhookEndpointFiles only apply when the deploy mode is hosted and address is IPFormat.
hubHostedWebhookEndpointRegistration = "cluster-manager/hub/cluster-manager-registration-webhook-endpoint-hosted.yaml" hubHostedWebhookEndpointRegistration = "cluster-manager/hub/registration/webhook-endpoint-hosted.yaml"
hubHostedWebhookEndpointWork = "cluster-manager/hub/cluster-manager-work-webhook-endpoint-hosted.yaml" hubHostedWebhookEndpointWork = "cluster-manager/hub/work/webhook-endpoint-hosted.yaml"
grpcServerResourceFiles = []string{ grpcServerResourceFiles = []string{
"cluster-manager/hub/grpc-server/clusterrole.yaml", "cluster-manager/hub/grpc-server/clusterrole.yaml",

14
pkg/operator/operators/clustermanager/controllers/clustermanagercontroller/clustermanager_runtime_reconcile.go
View File

@@ -28,22 +28,22 @@ import (
var ( var (
// All deployments should be deployed in the management cluster. // All deployments should be deployed in the management cluster.
deploymentFiles = []string{ deploymentFiles = []string{
"cluster-manager/management/cluster-manager-registration-deployment.yaml", "cluster-manager/management/registration/deployment.yaml",
"cluster-manager/management/cluster-manager-registration-webhook-deployment.yaml", "cluster-manager/management/registration/webhook-deployment.yaml",
"cluster-manager/management/cluster-manager-work-webhook-deployment.yaml", "cluster-manager/management/work/webhook-deployment.yaml",
"cluster-manager/management/cluster-manager-placement-deployment.yaml", "cluster-manager/management/placement/deployment.yaml",
} }
addOnManagerDeploymentFiles = []string{ addOnManagerDeploymentFiles = []string{
"cluster-manager/management/cluster-manager-addon-manager-deployment.yaml", "cluster-manager/management/addon-manager/deployment.yaml",
} }
mwReplicaSetDeploymentFiles = []string{ mwReplicaSetDeploymentFiles = []string{
"cluster-manager/management/cluster-manager-manifestworkreplicaset-deployment.yaml", "cluster-manager/management/manifestworkreplicaset/deployment.yaml",
} }
grpcServerDeploymentFiles = []string{ grpcServerDeploymentFiles = []string{
"cluster-manager/management/cluster-manager-grpc-server-deployment.yaml", "cluster-manager/management/grpc-server/deployment.yaml",
} }
) )

8
pkg/operator/operators/clustermanager/controllers/clustermanagercontroller/clustermanager_webhook_reconcile.go
View File

@@ -27,12 +27,12 @@ var (
// The hubWebhookResourceFiles should be deployed in the hub cluster // The hubWebhookResourceFiles should be deployed in the hub cluster
// The service should may point to a external url which represent the webhook-server's address. // The service should may point to a external url which represent the webhook-server's address.
hubRegistrationWebhookResourceFiles = []string{ hubRegistrationWebhookResourceFiles = []string{
"cluster-manager/hub/cluster-manager-registration-webhook-validatingconfiguration.yaml", "cluster-manager/hub/registration/webhook-validatingconfiguration.yaml",
"cluster-manager/hub/cluster-manager-registration-webhook-mutatingconfiguration.yaml", "cluster-manager/hub/registration/webhook-mutatingconfiguration.yaml",
"cluster-manager/hub/cluster-manager-registration-webhook-clustersetbinding-validatingconfiguration.yaml", "cluster-manager/hub/registration/webhook-clustersetbinding-validatingconfiguration.yaml",
} }
hubWorkWebhookResourceFiles = []string{ hubWorkWebhookResourceFiles = []string{
"cluster-manager/hub/cluster-manager-work-webhook-validatingconfiguration.yaml", "cluster-manager/hub/work/webhook-validatingconfiguration.yaml",
} }
) )