fix(openshift): fix issue 698 (#721)

Signed-off-by: cndoit18 <cndoit18@outlook.com>
goharbor · Aug 12, 2021 · 74aba7e · 74aba7e
1 parent 53ca0ac
commit 74aba7e
Show file tree

Hide file tree

Showing 6 changed files with 176 additions and 0 deletions.
diff --git a/charts/harbor-operator/templates/clusterrole.yaml b/charts/harbor-operator/templates/clusterrole.yaml
@@ -220,6 +220,27 @@ rules:
   - patch
   - update
   - watch
+- apiGroups:
+  - goharbor.io
+  resources:
+  - chartmuseums/finalizers
+  - cores/finalizers
+  - exporters/finalizers
+  - jobservices/finalizers
+  - notaryservers/finalizers
+  - notarysigners/finalizers
+  - portals/finalizers
+  - registries/finalizers
+  - registrycontrollers/finalizers
+  - trivies/finalizers
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
 - apiGroups:
   - goharbor.io
   resources:
@@ -268,6 +289,18 @@ rules:
   - get
   - list
   - watch
+- apiGroups:
+  - goharbor.io
+  resources:
+  - harborclusters/finalizers
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
 - apiGroups:
   - goharbor.io
   resources:
@@ -288,6 +321,18 @@ rules:
   - patch
   - update
   - watch
+- apiGroups:
+  - goharbor.io
+  resources:
+  - harborconfigurations/finalizers
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
 - apiGroups:
   - goharbor.io
   resources:
@@ -312,6 +357,18 @@ rules:
   - patch
   - update
   - watch
+- apiGroups:
+  - goharbor.io
+  resources:
+  - harbors/finalizers
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
 - apiGroups:
   - goharbor.io
   resources:

diff --git a/controllers/goharbor/configuration/cm_reconciler.go b/controllers/goharbor/configuration/cm_reconciler.go
@@ -68,6 +68,7 @@ func isConfiguration(obj metav1.Object) bool {
 }
 
 // +kubebuilder:rbac:groups=goharbor.io,resources=harborconfigurations,verbs=get;list;watch;create;update;patch;delete
+// +kubebuilder:rbac:groups=goharbor.io,resources=harborconfigurations/finalizers,verbs=get;list;watch;create;update;patch;delete
 // +kubebuilder:rbac:groups="",resources=configmaps,verbs=get;list;watch;create;update;patch;delete
 
 func (r *CmReconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager) error {

diff --git a/controllers/goharbor/harbor/harbor.go b/controllers/goharbor/harbor/harbor.go
@@ -26,6 +26,7 @@ type Reconciler struct {
 // +kubebuilder:rbac:groups=goharbor.io,resources=harbors,verbs=get;list;watch
 // +kubebuilder:rbac:groups=goharbor.io,resources=harbors/status,verbs=get;update;patch
 // +kubebuilder:rbac:groups=goharbor.io,resources=chartmuseums;cores;exporters;jobservices;notaryservers;notarysigners;portals;registries;registrycontrollers;trivies,verbs=get;list;watch;create;update;patch;delete
+// +kubebuilder:rbac:groups=goharbor.io,resources=chartmuseums/finalizers;cores/finalizers;exporters/finalizers;jobservices/finalizers;notaryservers/finalizers;notarysigners/finalizers;portals/finalizers;registries/finalizers;registrycontrollers/finalizers;trivies/finalizers,verbs=get;list;watch;create;update;patch;delete
 // +kubebuilder:rbac:groups=networking.k8s.io,resources=ingresses,verbs=get;list;watch;create;update;patch;delete
 // +kubebuilder:rbac:groups=networking.k8s.io,resources=networkpolicies,verbs=get;list;watch;create;update;patch;delete
 // +kubebuilder:rbac:groups=cert-manager.io,resources=issuers;certificates,verbs=get;list;watch;create;update;patch;delete

diff --git a/controllers/goharbor/harborcluster/ctrl_setup.go b/controllers/goharbor/harborcluster/ctrl_setup.go
@@ -49,13 +49,16 @@ type Reconciler struct {
 
 // +kubebuilder:rbac:groups=goharbor.io,resources=harborclusters,verbs=get;list;watch
 // +kubebuilder:rbac:groups=goharbor.io,resources=harborclusters/status,verbs=get;update;patch
+// +kubebuilder:rbac:groups=goharbor.io,resources=harborclusters/finalizers,verbs=get;list;watch;create;update;patch;delete
+// +kubebuilder:rbac:groups=apiextensions.k8s.io,resources=customresourcedefinitions,verbs=get;list;watch
 // +kubebuilder:rbac:groups=acid.zalan.do,resources=postgresqls;operatorconfigurations,verbs=get;list;watch;create;update;patch;delete;deletecollection
 // +kubebuilder:rbac:groups=acid.zalan.do,resources=postgresqls/status,verbs=get;update;patch
 // +kubebuilder:rbac:groups=databases.spotahome.com,resources=redisfailovers,verbs=*
 // +kubebuilder:rbac:groups=minio.min.io,resources=*,verbs=*
 // +kubebuilder:rbac:groups="",resources=pods,verbs=get;list;watch;create;update;patch;delete
 // +kubebuilder:rbac:groups=apps,resources=statefulsets;deployments,verbs=get;list;watch;create;update;patch;delete
 // +kubebuilder:rbac:groups=goharbor.io,resources=harbors,verbs=get;list;watch;create;update;patch;delete
+// +kubebuilder:rbac:groups=goharbor.io,resources=harbors/finalizers,verbs=get;list;watch;create;update;patch;delete
 // +kubebuilder:rbac:groups=apiextensions.k8s.io,resources=customresourcedefinitions,verbs=get;list;watch
 // +kubebuilder:rbac:groups=batch,resources=jobs,verbs=get;list;watch;create;update;patch;delete
 // +kubebuilder:rbac:groups="",resources=persistentvolumeclaims,verbs=get;list;watch;create;update;patch;delete

diff --git a/manifests/cluster/deployment.yaml b/manifests/cluster/deployment.yaml
@@ -33168,6 +33168,27 @@ rules:
   - patch
   - update
   - watch
+- apiGroups:
+  - goharbor.io
+  resources:
+  - chartmuseums/finalizers
+  - cores/finalizers
+  - exporters/finalizers
+  - jobservices/finalizers
+  - notaryservers/finalizers
+  - notarysigners/finalizers
+  - portals/finalizers
+  - registries/finalizers
+  - registrycontrollers/finalizers
+  - trivies/finalizers
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
 - apiGroups:
   - goharbor.io
   resources:
@@ -33216,6 +33237,18 @@ rules:
   - get
   - list
   - watch
+- apiGroups:
+  - goharbor.io
+  resources:
+  - harborclusters/finalizers
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
 - apiGroups:
   - goharbor.io
   resources:
@@ -33236,6 +33269,18 @@ rules:
   - patch
   - update
   - watch
+- apiGroups:
+  - goharbor.io
+  resources:
+  - harborconfigurations/finalizers
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
 - apiGroups:
   - goharbor.io
   resources:
@@ -33260,6 +33305,18 @@ rules:
   - patch
   - update
   - watch
+- apiGroups:
+  - goharbor.io
+  resources:
+  - harbors/finalizers
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
 - apiGroups:
   - goharbor.io
   resources:

diff --git a/manifests/harbor/deployment.yaml b/manifests/harbor/deployment.yaml
@@ -26172,6 +26172,27 @@ rules:
   - patch
   - update
   - watch
+- apiGroups:
+  - goharbor.io
+  resources:
+  - chartmuseums/finalizers
+  - cores/finalizers
+  - exporters/finalizers
+  - jobservices/finalizers
+  - notaryservers/finalizers
+  - notarysigners/finalizers
+  - portals/finalizers
+  - registries/finalizers
+  - registrycontrollers/finalizers
+  - trivies/finalizers
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
 - apiGroups:
   - goharbor.io
   resources:
@@ -26220,6 +26241,18 @@ rules:
   - get
   - list
   - watch
+- apiGroups:
+  - goharbor.io
+  resources:
+  - harborclusters/finalizers
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
 - apiGroups:
   - goharbor.io
   resources:
@@ -26240,6 +26273,18 @@ rules:
   - patch
   - update
   - watch
+- apiGroups:
+  - goharbor.io
+  resources:
+  - harborconfigurations/finalizers
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
 - apiGroups:
   - goharbor.io
   resources:
@@ -26264,6 +26309,18 @@ rules:
   - patch
   - update
   - watch
+- apiGroups:
+  - goharbor.io
+  resources:
+  - harbors/finalizers
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
 - apiGroups:
   - goharbor.io
   resources: