Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove the application lister and cleaner from the eventing-controller #18281

Merged
merged 2 commits into from
Oct 9, 2023
Merged

Remove the application lister and cleaner from the eventing-controller #18281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2458e3a
Remove the application lister and cleaner
marcobebway Oct 6, 2023
ef07df1
Update image
marcobebway Oct 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion components/eventing-controller/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
280 changes: 55 additions & 225 deletions components/eventing-controller/config/crd/external/apirules-gateway-kyma-project-io.yaml
View file
Open in desktop

Large diffs are not rendered by default.

183 changes: 0 additions & 183 deletions ...ing-controller/config/crd/external/applications-applicationconnector-kyma-project-io.yaml
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion components/eventing-controller/config/crd/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
mfaizanse marked this conversation as resolved.
Show resolved Hide resolved
- external/applications-applicationconnector-kyma-project-io.yaml
#+kubebuilder:scaffold:crdkustomizeresource

patchesStrategicMerge:
Expand Down
8 changes: 0 additions & 8 deletions components/eventing-controller/config/rbac/role.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,6 @@ rules:
- get
- list
- watch
- apiGroups:
- applicationconnector.kyma-project.io
resources:
- applications
verbs:
- get
- list
- watch
- apiGroups:
- apps
resources:
Expand Down
1 change: 0 additions & 1 deletion components/eventing-controller/controllers/backend/reconciler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 0 additions & 2 deletions components/eventing-controller/controllers/subscription/eventmesh/reconciler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion components/eventing-controller/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions components/eventing-controller/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down
17 changes: 0 additions & 17 deletions components/eventing-controller/pkg/application/applicationtest/applicationtest.go
View file
Open in desktop

This file was deleted.

39 changes: 0 additions & 39 deletions components/eventing-controller/pkg/application/clean.go
View file
Open in desktop

This file was deleted.

67 changes: 0 additions & 67 deletions components/eventing-controller/pkg/application/clean_unit_test.go
View file
Open in desktop

This file was deleted.

Loading