Remove the application lister and cleaner from the eventing-controller (

#18281) * Remove the application lister and cleaner * Update image
kyma-project · Oct 9, 2023 · e2526c1 · e2526c1
1 parent 6efbe5f
commit e2526c1
Show file tree

Hide file tree

Showing 18 changed files with 79 additions and 701 deletions.
diff --git a/components/eventing-controller/Makefile b/components/eventing-controller/Makefile
@@ -134,7 +134,6 @@ copy-crds: manifests-local ## copy Eventing CRDs to installation/eventing
 copy-external-crds: ## copy external CRDs to config/crd/external
 	mkdir -p config/crd/external
 	cp ../../installation/resources/crds/api-gateway/apirules.gateway.crd.yaml config/crd/external/apirules-gateway-kyma-project-io.yaml
-	cp ../../installation/resources/crds/application-connector/applications.applicationconnector.crd.yaml config/crd/external/applications-applicationconnector-kyma-project-io.yaml
 
 $(eval $(call buildpack-cp-ro,resolve))
 $(eval $(call buildpack-mount,mod-verify))

diff --git a/components/eventing-controller/config/crd/external/apirules-gateway-kyma-project-io.yaml b/components/eventing-controller/config/crd/external/apirules-gateway-kyma-project-io.yaml
diff --git a/...ing-controller/config/crd/external/applications-applicationconnector-kyma-project-io.yaml b/...ing-controller/config/crd/external/applications-applicationconnector-kyma-project-io.yaml
diff --git a/components/eventing-controller/config/crd/kustomization.yaml b/components/eventing-controller/config/crd/kustomization.yaml
@@ -5,7 +5,6 @@ resources:
 - bases/eventing.kyma-project.io_subscriptions.yaml
 - bases/eventing.kyma-project.io_eventingbackends.yaml
 - external/apirules-gateway-kyma-project-io.yaml
-- external/applications-applicationconnector-kyma-project-io.yaml
 #+kubebuilder:scaffold:crdkustomizeresource
 
 patchesStrategicMerge:

diff --git a/components/eventing-controller/config/rbac/role.yaml b/components/eventing-controller/config/rbac/role.yaml
@@ -42,14 +42,6 @@ rules:
   - get
   - list
   - watch
-- apiGroups:
-  - applicationconnector.kyma-project.io
-  resources:
-  - applications
-  verbs:
-  - get
-  - list
-  - watch
 - apiGroups:
   - apps
   resources:

diff --git a/components/eventing-controller/controllers/backend/reconciler.go b/components/eventing-controller/controllers/backend/reconciler.go
@@ -139,7 +139,6 @@ func (r *Reconciler) SetBackendConfig(backendCfg env.BackendConfig) {
 // +kubebuilder:rbac:groups=apps,resources=deployments,verbs=get;list;watch;update;patch;create;delete
 // +kubebuilder:rbac:groups=eventing.kyma-project.io,resources=eventingbackends,verbs=get;list;watch;create;update;patch;delete
 // +kubebuilder:rbac:groups=eventing.kyma-project.io,resources=eventingbackends/status,verbs=get;update;patch
-// +kubebuilder:rbac:groups="applicationconnector.kyma-project.io",resources=applications,verbs=get;list;watch
 // +kubebuilder:rbac:groups="",resources=services,verbs=get;list;watch;delete
 // +kubebuilder:rbac:groups="",resources=pods,verbs=get;list;watch;delete
 

diff --git a/components/eventing-controller/controllers/subscription/eventmesh/reconciler.go b/components/eventing-controller/controllers/subscription/eventmesh/reconciler.go
@@ -105,8 +105,6 @@ func NewReconciler(ctx context.Context, client client.Client, logger *logger.Log
 // Generate required RBAC to emit kubernetes events in the controller.
 // +kubebuilder:rbac:groups="",resources=events,verbs=create;patch
 // +kubebuilder:rbac:groups=gateway.kyma-project.io,resources=apirules,verbs=get;list;watch;create;update;patch;delete
-// Generated required RBAC to list Applications (required by event type cleaner).
-// +kubebuilder:rbac:groups="applicationconnector.kyma-project.io",resources=applications,verbs=get;list;watch
 
 func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
 	// fetch current subscription object and ensure the object was not deleted in the meantime

diff --git a/components/eventing-controller/go.mod b/components/eventing-controller/go.mod
@@ -11,7 +11,6 @@ require (
 	github.com/kelseyhightower/envconfig v1.4.0
 	github.com/kyma-incubator/api-gateway v0.0.0-20220819093753-296e6704d413
 	github.com/kyma-project/kyma/common/logging v0.0.0-20230616102347-ad6927dc28d5
-	github.com/kyma-project/kyma/components/application-operator v0.0.0-20230127165033-ec8e43477eca
 	github.com/mitchellh/hashstructure/v2 v2.0.2
 	github.com/nats-io/nats-server/v2 v2.9.21
 	github.com/nats-io/nats.go v1.28.0

diff --git a/components/eventing-controller/go.sum b/components/eventing-controller/go.sum
@@ -92,8 +92,6 @@ github.com/kyma-project/api-gateway v0.0.0-20220819093753-296e6704d413 h1:fkGKNO
 github.com/kyma-project/api-gateway v0.0.0-20220819093753-296e6704d413/go.mod h1:5kBV6C2JEaapjTAn10Mo81Te4e6LN3epexUCSLXgQLI=
 github.com/kyma-project/kyma/common/logging v0.0.0-20230616102347-ad6927dc28d5 h1:Uey3jJWq9eyXiepEvqQjBIWwPGM8nMIylBpcTc9FuDM=
 github.com/kyma-project/kyma/common/logging v0.0.0-20230616102347-ad6927dc28d5/go.mod h1:JGb5RBi8Uz+RZ/jf54+qA+RqY6uPQBJ8pO1w3KSwm1Q=
-github.com/kyma-project/kyma/components/application-operator v0.0.0-20230127165033-ec8e43477eca h1:7UpCIk6+sMCOhPfolAlppRugSln5M4T8/dHJm8x0erc=
-github.com/kyma-project/kyma/components/application-operator v0.0.0-20230127165033-ec8e43477eca/go.mod h1:Tog02gZ1VT7yvFmhSqmiuGZpDYt18zTF4kr6E0N9ttk=
 github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
 github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
 github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=

diff --git a/components/eventing-controller/pkg/application/applicationtest/applicationtest.go b/components/eventing-controller/pkg/application/applicationtest/applicationtest.go
diff --git a/components/eventing-controller/pkg/application/clean.go b/components/eventing-controller/pkg/application/clean.go
diff --git a/components/eventing-controller/pkg/application/clean_unit_test.go b/components/eventing-controller/pkg/application/clean_unit_test.go