Skip to content

fix: configure runtime controller with namespace event filter #1146

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

Merged
tolusha merged 4 commits into from
Oct 18, 2021
Merged

fix: configure runtime controller with namespace event filter #1146

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
34c2219
fix: configure runtime controller with namespace event filter
tolusha Oct 17, 2021
2765cdc
Increase limits
tolusha Oct 17, 2021
91c3954
set request memory to 64Mi
tolusha Oct 18, 2021
3d31a84
Increase memory limit to 1Gi
tolusha Oct 18, 2021
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
8 changes: 4 additions & 4 deletions ...amespaces/eclipse-che-preview-openshift/manifests/che-operator.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ metadata:
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
repository: https://github.com/eclipse-che/che-operator
support: Eclipse Foundation
name: eclipse-che-preview-openshift.v7.38.0-360.next
name: eclipse-che-preview-openshift.v7.38.0-361.next
namespace: placeholder
spec:
apiservicedefinitions: {}
Expand Down Expand Up @@ -1162,10 +1162,10 @@ spec:
resources:
limits:
cpu: 500m
memory: 256Mi
memory: 512Mi
requests:
cpu: 100m
memory: 64Mi
memory: 256Mi
securityContext:
allowPrivilegeEscalation: false
capabilities:
Expand Down Expand Up @@ -1414,4 +1414,4 @@ spec:
maturity: stable
provider:
name: Eclipse Foundation
version: 7.38.0-360.next
version: 7.38.0-361.next
8 changes: 4 additions & 4 deletions bundle/next/eclipse-che-preview-kubernetes/manifests/che-operator.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ metadata:
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
repository: https://github.com/eclipse-che/che-operator
support: Eclipse Foundation
name: eclipse-che-preview-kubernetes.v7.38.0-321.next
name: eclipse-che-preview-kubernetes.v7.38.0-322.next
namespace: placeholder
spec:
apiservicedefinitions: {}
Expand Down Expand Up @@ -1151,10 +1151,10 @@ spec:
resources:
limits:
cpu: 500m
memory: 256Mi
memory: 512Mi
requests:
cpu: 100m
memory: 64Mi
memory: 256Mi
securityContext:
capabilities:
drop:
Expand Down Expand Up @@ -1381,4 +1381,4 @@ spec:
maturity: stable
provider:
name: Eclipse Foundation
version: 7.38.0-321.next
version: 7.38.0-322.next
8 changes: 4 additions & 4 deletions bundle/next/eclipse-che-preview-openshift/manifests/che-operator.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ metadata:
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
repository: https://github.com/eclipse-che/che-operator
support: Eclipse Foundation
name: eclipse-che-preview-openshift.v7.38.0-328.next
name: eclipse-che-preview-openshift.v7.38.0-329.next
namespace: placeholder
spec:
apiservicedefinitions: {}
Expand Down Expand Up @@ -1162,10 +1162,10 @@ spec:
resources:
limits:
cpu: 500m
memory: 256Mi
memory: 512Mi
requests:
cpu: 100m
memory: 64Mi
memory: 256Mi
securityContext:
allowPrivilegeEscalation: false
capabilities:
Expand Down Expand Up @@ -1414,4 +1414,4 @@ spec:
maturity: stable
provider:
name: Eclipse Foundation
version: 7.38.0-328.next
version: 7.38.0-329.next
4 changes: 2 additions & 2 deletions config/manager/manager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,10 +146,10 @@ spec:
resources:
limits:
cpu: 500m
memory: 256Mi
memory: 512Mi
requests:
cpu: 100m
memory: 64Mi
memory: 256Mi
Copy link
Member

@sparkoo sparkoo Oct 18, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do we really need to increase request memory?

Copy link
Contributor Author

@tolusha tolusha Oct 18, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agree. We can keep old value.

hostIPC: false
hostNetwork: false
hostPID: false
Expand Down
10 changes: 5 additions & 5 deletions controllers/che/checluster_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ func (r *CheClusterReconciler) SetupWithManager(mgr ctrl.Manager) error {
return []ctrl.Request{}
}

contollerBuilder := ctrl.NewControllerManagedBy(mgr).
controllerBuilder := ctrl.NewControllerManagedBy(mgr).
// Watch for changes to primary resource CheCluster
Watches(&source.Kind{Type: &orgv1.CheCluster{}}, &handler.EnqueueRequestForObject{}).
// Watch for changes to secondary resources and requeue the owner CheCluster
Expand Down Expand Up @@ -201,22 +201,22 @@ func (r *CheClusterReconciler) SetupWithManager(mgr ctrl.Manager) error {
)

if isOpenShift {
contollerBuilder = contollerBuilder.Watches(&source.Kind{Type: &routev1.Route{}}, &handler.EnqueueRequestForOwner{
controllerBuilder = controllerBuilder.Watches(&source.Kind{Type: &routev1.Route{}}, &handler.EnqueueRequestForOwner{
IsController: true,
OwnerType: &orgv1.CheCluster{},
})
} else {
contollerBuilder = contollerBuilder.Watches(&source.Kind{Type: &networking.Ingress{}}, &handler.EnqueueRequestForOwner{
controllerBuilder = controllerBuilder.Watches(&source.Kind{Type: &networking.Ingress{}}, &handler.EnqueueRequestForOwner{
IsController: true,
OwnerType: &orgv1.CheCluster{},
})
}

if r.namespace != "" {
contollerBuilder.WithEventFilter(util.InNamespaceEventFilter(r.namespace))
controllerBuilder = controllerBuilder.WithEventFilter(util.InNamespaceEventFilter(r.namespace))
}

return contollerBuilder.
return controllerBuilder.
For(&orgv1.CheCluster{}).
Complete(r)
}
Expand Down
2 changes: 1 addition & 1 deletion controllers/checlusterbackup/checlusterbackup_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ func (r *ReconcileCheClusterBackup) SetupWithManager(mgr ctrl.Manager) error {
Watches(&source.Kind{Type: &chev1.CheClusterBackup{}}, &handler.EnqueueRequestForObject{}, builder.WithPredicates(backupCRPredicate))

if r.namespace != "" {
bldr.WithEventFilter(util.InNamespaceEventFilter(r.namespace))
bldr = bldr.WithEventFilter(util.InNamespaceEventFilter(r.namespace))
}

return bldr.
Expand Down
2 changes: 1 addition & 1 deletion controllers/checlusterrestore/checlusterrestore_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ func (r *ReconcileCheClusterRestore) SetupWithManager(mgr ctrl.Manager) error {
Watches(&source.Kind{Type: &chev1.CheClusterRestore{}}, &handler.EnqueueRequestForObject{}, builder.WithPredicates(restoreCRPredicate))

if r.namespace != "" {
bldr.WithEventFilter(util.InNamespaceEventFilter(r.namespace))
bldr = bldr.WithEventFilter(util.InNamespaceEventFilter(r.namespace))
}

return bldr.
Expand Down