From c6f9262aa9ac7a609fb5c950fab6006ce83fd975 Mon Sep 17 00:00:00 2001 From: ashnamehrotra Date: Wed, 24 Jan 2024 11:13:42 -0800 Subject: [PATCH] add node watch back Signed-off-by: ashnamehrotra --- config/rbac/role.yaml | 1 + controllers/imagelist/imagelist_controller.go | 2 +- main.go | 1 + .../eraser/templates/eraser-manager-role-clusterrole.yaml | 1 + manifest_staging/deploy/eraser.yaml | 3 ++- 5 files changed, 6 insertions(+), 2 deletions(-) diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml index ecbc1110c0..53ddc8b2f6 100644 --- a/config/rbac/role.yaml +++ b/config/rbac/role.yaml @@ -23,6 +23,7 @@ rules: verbs: - get - list + - watch - apiGroups: - "" resources: diff --git a/controllers/imagelist/imagelist_controller.go b/controllers/imagelist/imagelist_controller.go index fc34d94d78..96d1b5ed04 100644 --- a/controllers/imagelist/imagelist_controller.go +++ b/controllers/imagelist/imagelist_controller.go @@ -124,7 +124,7 @@ type Reconciler struct { //+kubebuilder:rbac:groups=eraser.sh,resources=imagelists,verbs=get;list;watch;create;update;patch;delete //+kubebuilder:rbac:groups="",resources=podtemplates,verbs=get;list;watch;create;update;patch;delete //+kubebuilder:rbac:groups=eraser.sh,resources=imagelists/status,verbs=get;update;patch -//+kubebuilder:rbac:groups="",resources=nodes,verbs=get;list +//+kubebuilder:rbac:groups="",resources=nodes,verbs=get;list;watch //+kubebuilder:rbac:groups="",resources=pods,verbs=get;list;watch;update;create;delete // Reconcile is part of the main kubernetes reconciliation loop which aims to diff --git a/main.go b/main.go index 2126130055..ef6193d56d 100644 --- a/main.go +++ b/main.go @@ -153,6 +153,7 @@ func main() { }, ), }, + // to watch ImageLists &eraserv1.ImageList{}: { Field: fields.OneTermEqualSelector("metadata.name", "imagelist"), }, diff --git a/manifest_staging/charts/eraser/templates/eraser-manager-role-clusterrole.yaml b/manifest_staging/charts/eraser/templates/eraser-manager-role-clusterrole.yaml index cd8d2c7a29..892b07ffce 100644 --- a/manifest_staging/charts/eraser/templates/eraser-manager-role-clusterrole.yaml +++ b/manifest_staging/charts/eraser/templates/eraser-manager-role-clusterrole.yaml @@ -27,6 +27,7 @@ rules: verbs: - get - list + - watch - apiGroups: - "" resources: diff --git a/manifest_staging/deploy/eraser.yaml b/manifest_staging/deploy/eraser.yaml index a22b7fc176..430787f8df 100644 --- a/manifest_staging/deploy/eraser.yaml +++ b/manifest_staging/deploy/eraser.yaml @@ -321,6 +321,7 @@ rules: verbs: - get - list + - watch - apiGroups: - "" resources: @@ -431,7 +432,7 @@ data: imageJob: successRatio: 1.0 cleanup: - delayOnSuccess: 0s + delayOnSuccess: 24h delayOnFailure: 24h pullSecrets: [] # image pull secrets for collector/scanner/eraser priorityClassName: "" # priority class name for collector/scanner/eraser