feat: remove YurtAppOverrider (#2280)

Co-authored-by: Jessie Wang <[email protected]>
openyurtio · Feb 4, 2025 · 0e6c0d4 · 0e6c0d4
1 parent 4647c09
commit 0e6c0d4
Show file tree

Hide file tree

Showing 28 changed files with 21 additions and 2,459 deletions.
diff --git a/charts/yurt-manager/crds/apps.openyurt.io_yurtappoverriders.yaml b/charts/yurt-manager/crds/apps.openyurt.io_yurtappoverriders.yaml
diff --git a/charts/yurt-manager/templates/yurt-manager-auto-generated.yaml b/charts/yurt-manager/templates/yurt-manager-auto-generated.yaml
@@ -110,12 +110,6 @@ metadata:
 ---
 apiVersion: v1
 kind: ServiceAccount
-metadata:
-  name: yurt-manager-yurt-app-overrider-controller
-  namespace: {{ .Release.Namespace }}
----
-apiVersion: v1
-kind: ServiceAccount
 metadata:
   name: yurt-manager-yurt-app-set-controller
   namespace: {{ .Release.Namespace }}
@@ -206,7 +200,6 @@ rules:
   - nodebuckets
   - nodepools
   - yurtappdaemons
-  - yurtappoverriders
   - yurtappsets
   - yurtstaticsets
   verbs:
@@ -810,26 +803,6 @@ rules:
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
-metadata:
-  name: yurt-manager-yurt-app-overrider-controller
-rules:
-- apiGroups:
-  - apps
-  resources:
-  - deployments
-  verbs:
-  - update
-- apiGroups:
-  - apps.openyurt.io
-  resources:
-  - yurtappdaemons
-  - yurtappoverriders
-  - yurtappsets
-  verbs:
-  - get
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
 metadata:
   name: yurt-manager-yurt-app-set-controller
 rules:
@@ -1186,19 +1159,6 @@ subjects:
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
-metadata:
-  name: yurt-manager-yurt-app-overrider-controller-binding
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: yurt-manager-yurt-app-overrider-controller
-subjects:
-- kind: ServiceAccount
-  name: yurt-manager-yurt-app-overrider-controller
-  namespace: {{ .Release.Namespace }}
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
 metadata:
   name: yurt-manager-yurt-app-set-controller-binding
 roleRef:
@@ -1241,26 +1201,6 @@ kind: MutatingWebhookConfiguration
 metadata:
   name: yurt-manager-mutating-webhook-configuration
 webhooks:
-- admissionReviewVersions:
-  - v1
-  clientConfig:
-    service:
-      name: yurt-manager-webhook-service
-      namespace: {{ .Release.Namespace }}
-      path: /mutate-apps-v1-deployment
-  failurePolicy: Ignore
-  name: mutate.apps.v1.deployment
-  rules:
-  - apiGroups:
-    - apps
-    apiVersions:
-    - v1
-    operations:
-    - CREATE
-    - UPDATE
-    resources:
-    - deployments
-  sideEffects: None
 - admissionReviewVersions:
   - v1
   clientConfig:
@@ -1401,27 +1341,6 @@ webhooks:
     resources:
     - yurtappdaemons
   sideEffects: None
-- admissionReviewVersions:
-  - v1
-  - v1beta1
-  clientConfig:
-    service:
-      name: yurt-manager-webhook-service
-      namespace: {{ .Release.Namespace }}
-      path: /mutate-apps-openyurt-io-v1alpha1-yurtappoverrider
-  failurePolicy: Fail
-  name: mutate.apps.v1alpha1.yurtappoverrider.openyurt.io
-  rules:
-  - apiGroups:
-    - apps.openyurt.io
-    apiVersions:
-    - v1alpha1
-    operations:
-    - CREATE
-    - UPDATE
-    resources:
-    - yurtappoverriders
-  sideEffects: None
 - admissionReviewVersions:
   - v1
   - v1beta1
@@ -1573,28 +1492,6 @@ webhooks:
     resources:
     - yurtappdaemons
   sideEffects: None
-- admissionReviewVersions:
-  - v1
-  - v1beta1
-  clientConfig:
-    service:
-      name: yurt-manager-webhook-service
-      namespace: {{ .Release.Namespace }}
-      path: /validate-apps-openyurt-io-v1alpha1-yurtappoverrider
-  failurePolicy: Fail
-  name: validate.apps.v1alpha1.yurtappoverrider.openyurt.io
-  rules:
-  - apiGroups:
-    - apps.openyurt.io
-    apiVersions:
-    - v1alpha1
-    operations:
-    - CREATE
-    - UPDATE
-    - DELETE
-    resources:
-    - yurtappoverriders
-  sideEffects: None
 - admissionReviewVersions:
   - v1
   - v1beta1

diff --git a/cmd/yurt-manager/app/options/options.go b/cmd/yurt-manager/app/options/options.go
@@ -35,7 +35,6 @@ type YurtManagerOptions struct {
 	YurtAppSetController          *YurtAppSetControllerOptions
 	YurtAppDaemonController       *YurtAppDaemonControllerOptions
 	PlatformAdminController       *PlatformAdminControllerOptions
-	YurtAppOverriderController    *YurtAppOverriderControllerOptions
 	NodeLifeCycleController       *NodeLifecycleControllerOptions
 	NodeBucketController          *NodeBucketControllerOptions
 	EndpointsController           *EndpointsControllerOptions
@@ -63,7 +62,6 @@ func NewYurtManagerOptions() (*YurtManagerOptions, error) {
 		YurtAppSetController:          NewYurtAppSetControllerOptions(),
 		YurtAppDaemonController:       NewYurtAppDaemonControllerOptions(),
 		PlatformAdminController:       NewPlatformAdminControllerOptions(),
-		YurtAppOverriderController:    NewYurtAppOverriderControllerOptions(),
 		NodeLifeCycleController:       NewNodeLifecycleControllerOptions(),
 		NodeBucketController:          NewNodeBucketControllerOptions(),
 		EndpointsController:           NewEndpointsControllerOptions(),
@@ -92,7 +90,6 @@ func (y *YurtManagerOptions) Flags(allControllers, disabledByDefaultControllers
 	y.YurtStaticSetController.AddFlags(fss.FlagSet("yurtstaticset controller"))
 	y.YurtAppDaemonController.AddFlags(fss.FlagSet("yurtappdaemon controller"))
 	y.PlatformAdminController.AddFlags(fss.FlagSet("iot controller"))
-	y.YurtAppOverriderController.AddFlags(fss.FlagSet("yurtappoverrider controller"))
 	y.NodeLifeCycleController.AddFlags(fss.FlagSet("nodelifecycle controller"))
 	y.NodeBucketController.AddFlags(fss.FlagSet("nodebucket controller"))
 	y.EndpointsController.AddFlags(fss.FlagSet("endpoints controller"))
@@ -120,7 +117,6 @@ func (y *YurtManagerOptions) Validate(allControllers []string, controllerAliases
 	errs = append(errs, y.YurtStaticSetController.Validate()...)
 	errs = append(errs, y.YurtAppDaemonController.Validate()...)
 	errs = append(errs, y.PlatformAdminController.Validate()...)
-	errs = append(errs, y.YurtAppOverriderController.Validate()...)
 	errs = append(errs, y.NodeLifeCycleController.Validate()...)
 	errs = append(errs, y.NodeBucketController.Validate()...)
 	errs = append(errs, y.EndpointsController.Validate()...)
@@ -167,9 +163,6 @@ func (y *YurtManagerOptions) ApplyTo(c *config.Config, controllerAliases map[str
 	if err := y.PlatformAdminController.ApplyTo(&c.ComponentConfig.PlatformAdminController); err != nil {
 		return err
 	}
-	if err := y.YurtAppOverriderController.ApplyTo(&c.ComponentConfig.YurtAppOverriderController); err != nil {
-		return err
-	}
 	if err := y.NodeLifeCycleController.ApplyTo(&c.ComponentConfig.NodeLifeCycleController); err != nil {
 		return err
 	}