Merge branch 'scope' into 'master'

Scope

See merge request !17

config/manager/manager.yaml

@@ -36,10 +36,5 @@ spec:
           requests:
             cpu: 200m
             memory: 20Mi
-        env:
-          - name: WATCH_NAMESPACE
-            valueFrom:
-              fieldRef:
-                fieldPath: metadata.name
       terminationGracePeriodSeconds: 10
       serviceAccountName: gitlab-operator

config/rbac/role.yaml

 
 ---
 apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
+kind: ClusterRole
 metadata:
   creationTimestamp: null
   name: manager-role
-  namespace: placeholder
 rules:
 - apiGroups:
   - apps

controllers/gitlab_controller.go

@@ -49,19 +49,19 @@ type GitLabReconciler struct {
 	Scheme *runtime.Scheme
 }
 
-// +kubebuilder:rbac:groups=apps.gitlab.com,namespace="placeholder",resources=gitlabs,verbs=get;list;watch;create;update;patch;delete
-// +kubebuilder:rbac:groups=apps.gitlab.com,namespace="placeholder",resources=gitlabs/status,verbs=get;update;patch
-// +kubebuilder:rbac:groups=apps,namespace="placeholder",resources=deployments,verbs=get;list;watch;create;update;patch;delete
-// +kubebuilder:rbac:groups=apps,namespace="placeholder",resources=statefulsets,verbs=get;list;watch;create;update;patch;delete
-// +kubebuilder:rbac:groups=core,namespace="placeholder",resources=secrets,verbs=get;list;watch;create;update;patch;delete
-// +kubebuilder:rbac:groups=core,namespace="placeholder",resources=configmaps,verbs=get;list;watch;create;update;patch;delete
-// +kubebuilder:rbac:groups=core,namespace="placeholder",resources=services,verbs=get;list;watch;create;update;patch;delete
-// +kubebuilder:rbac:groups=core,namespace="placeholder",resources=persistentvolumeclaims,verbs=get;list;watch;create;update;patch;delete
-// +kubebuilder:rbac:groups=batch,namespace="placeholder",resources=jobs,verbs=get;list;watch;create;update;patch;delete
-// +kubebuilder:rbac:groups=core,namespace="placeholder",resources=cronjobs,verbs=get;list;watch;create;update;patch;delete
-// +kubebuilder:rbac:groups=extensions,namespace="placeholder",resources=ingresses,verbs=get;list;watch;create;update;patch;delete
-// +kubebuilder:rbac:groups=monitoring.coreos.com,namespace="placeholder",resources=servicemonitors,verbs=get;list;watch;create;update;patch;delete
-// +kubebuilder:rbac:groups=monitoring.coreos.com,namespace="placeholder",resources=prometheuses,verbs=get;list;watch;create;update;patch;delete
+// +kubebuilder:rbac:groups=apps.gitlab.com,resources=gitlabs,verbs=get;list;watch;create;update;patch;delete
+// +kubebuilder:rbac:groups=apps.gitlab.com,resources=gitlabs/status,verbs=get;update;patch
+// +kubebuilder:rbac:groups=apps,resources=deployments,verbs=get;list;watch;create;update;patch;delete
+// +kubebuilder:rbac:groups=apps,resources=statefulsets,verbs=get;list;watch;create;update;patch;delete
+// +kubebuilder:rbac:groups=core,resources=secrets,verbs=get;list;watch;create;update;patch;delete
+// +kubebuilder:rbac:groups=core,resources=configmaps,verbs=get;list;watch;create;update;patch;delete
+// +kubebuilder:rbac:groups=core,resources=services,verbs=get;list;watch;create;update;patch;delete
+// +kubebuilder:rbac:groups=core,resources=persistentvolumeclaims,verbs=get;list;watch;create;update;patch;delete
+// +kubebuilder:rbac:groups=batch,resources=jobs,verbs=get;list;watch;create;update;patch;delete
+// +kubebuilder:rbac:groups=core,resources=cronjobs,verbs=get;list;watch;create;update;patch;delete
+// +kubebuilder:rbac:groups=extensions,resources=ingresses,verbs=get;list;watch;create;update;patch;delete
+// +kubebuilder:rbac:groups=monitoring.coreos.com,resources=servicemonitors,verbs=get;list;watch;create;update;patch;delete
+// +kubebuilder:rbac:groups=monitoring.coreos.com,resources=prometheuses,verbs=get;list;watch;create;update;patch;delete
 
 // Reconcile triggers when an event occurs on the watched resource
 func (r *GitLabReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {

controllers/glbackup_controller.go

@@ -46,8 +46,8 @@ type GLBackupReconciler struct {
 	Scheme *runtime.Scheme
 }
 
-// +kubebuilder:rbac:groups=apps.gitlab.com,namespace="placeholder",resources=glbackups,verbs=get;list;watch;create;update;patch;delete
-// +kubebuilder:rbac:groups=apps.gitlab.com,namespace="placeholder",resources=glbackups/status,verbs=get;update;patch
+// +kubebuilder:rbac:groups=apps.gitlab.com,resources=glbackups,verbs=get;list;watch;create;update;patch;delete
+// +kubebuilder:rbac:groups=apps.gitlab.com,resources=glbackups/status,verbs=get;update;patch
 
 // Reconcile triggers when an event occurs on the watched resource
 func (r *GLBackupReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {

controllers/runner_controller.go

@@ -43,8 +43,8 @@ type RunnerReconciler struct {
 	Scheme *runtime.Scheme
 }
 
-// +kubebuilder:rbac:groups=apps.gitlab.com,namespace="placeholder",resources=runners,verbs=get;list;watch;create;update;patch;delete
-// +kubebuilder:rbac:groups=apps.gitlab.com,namespace="placeholder",resources=runners/status,verbs=get;update;patch
+// +kubebuilder:rbac:groups=apps.gitlab.com,resources=runners,verbs=get;list;watch;create;update;patch;delete
+// +kubebuilder:rbac:groups=apps.gitlab.com,resources=runners/status,verbs=get;update;patch
 
 // Reconcile triggers when an event occurs on the watched resource
 func (r *RunnerReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {

main.go

@@ -74,7 +74,7 @@ func main() {
 
 	watchedNamespace, err := getWatchedNamespace()
 	if err != nil {
-		setupLog.Error(err, "unable to get watched namespace, the manager will watch all namespaces")
+		setupLog.Info("changing operator scope", "scope", "namespaced")
 	}
 
 	mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{