seg_yinzy
/
che-operator
mirror of https://github.com/eclipse-che/che-operator.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: configure runtime controller with namespace event filter (#1146) 

* fix: configure runtime controller with namespace event filter
* Increase memory limit to 1Gi

Signed-off-by: Anatolii Bazko <abazko@redhat.com>
pull/1141/head
Anatolii Bazko 2021-10-18 13:53:52 +03:00 committed by GitHub
parent 0667196156
commit 06aa35c92c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bundle/next-all-namespaces/eclipse-che-preview-openshift/manifests/che-operator.clusterserviceversion.yaml
View File

@ -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-363.next
namespace: placeholder
spec:
apiservicedefinitions: {}
@ -1162,7 +1162,7 @@ spec:
resources:
limits:
cpu: 500m
memory: 256Mi
memory: 1Gi
requests:
cpu: 100m
memory: 64Mi
@ -1414,4 +1414,4 @@ spec:
maturity: stable
provider:
name: Eclipse Foundation
version: 7.38.0-360.next
version: 7.38.0-363.next

6
bundle/next/eclipse-che-preview-kubernetes/manifests/che-operator.clusterserviceversion.yaml
View File

@ -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-324.next
namespace: placeholder
spec:
apiservicedefinitions: {}
@ -1151,7 +1151,7 @@ spec:
resources:
limits:
cpu: 500m
memory: 256Mi
memory: 1Gi
requests:
cpu: 100m
memory: 64Mi
@ -1381,4 +1381,4 @@ spec:
maturity: stable
provider:
name: Eclipse Foundation
version: 7.38.0-321.next
version: 7.38.0-324.next

6
bundle/next/eclipse-che-preview-openshift/manifests/che-operator.clusterserviceversion.yaml
View File

@ -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-331.next
namespace: placeholder
spec:
apiservicedefinitions: {}
@ -1162,7 +1162,7 @@ spec:
resources:
limits:
cpu: 500m
memory: 256Mi
memory: 1Gi
requests:
cpu: 100m
memory: 64Mi
@ -1414,4 +1414,4 @@ spec:
maturity: stable
provider:
name: Eclipse Foundation
version: 7.38.0-328.next
version: 7.38.0-331.next

2
config/manager/manager.yaml
View File

@ -146,7 +146,7 @@ spec:
resources:
limits:
cpu: 500m
memory: 256Mi
memory: 1Gi
requests:
cpu: 100m
memory: 64Mi

10
controllers/che/checluster_controller.go
View File

@ -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
@ -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)
}

2
controllers/checlusterbackup/checlusterbackup_controller.go
View File

@ -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.

2
controllers/checlusterrestore/checlusterrestore_controller.go
View File

@ -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.