Pelorus Operator v0.0.2

Pelorus Operator that addresses dora-metrics#777 Signed-off-by: Michal Pryc <mpryc@redhat.com>
mpryc · Jan 18, 2023 · 18171a2 · 18171a2
1 parent c76bed4
commit 18171a2
Show file tree

Hide file tree

Showing 9 changed files with 75 additions and 113 deletions.
diff --git a/pelorus-operator/Makefile b/pelorus-operator/Makefile
@@ -3,7 +3,7 @@
 # To re-generate a bundle for another specific version without changing the standard setup, you can:
 # - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2)
 # - use environment variables to overwrite this value (e.g export VERSION=0.0.2)
-VERSION ?= 0.0.1
+VERSION ?= 0.0.2
 
 # CHANNELS define the bundle channels used in the bundle.
 # Add a new line here if you would like to change its default config. (E.g CHANNELS = "candidate,fast,stable")

diff --git a/pelorus-operator/bundle/manifests/pelorus-operator.clusterserviceversion.yaml b/pelorus-operator/bundle/manifests/pelorus-operator.clusterserviceversion.yaml
@@ -12,7 +12,6 @@ metadata:
           },
           "spec": {
             "exporters": {
-              "global": {},
               "instances": [
                 {
                   "app_name": "deploytime-exporter",
@@ -50,16 +49,16 @@ metadata:
     capabilities: Basic Install
     categories: |
       Modernization & Migration,Developer Tools,Monitoring,Integration & Delivery
-    containerImage: quay.io/pelorus/pelorus-operator:0.0.1
-    createdAt: "2022-12-19T11:26:21Z"
+    containerImage: quay.io/pelorus/pelorus-operator:0.0.2
+    createdAt: "2023-01-18T16:48:37Z"
     description: |
       Tool that helps IT organizations measure their impact on the overall performance of their organization
     operatorframework.io/suggested-namespace: pelorus
     operators.operatorframework.io/builder: operator-sdk-v1.26.0
     operators.operatorframework.io/project_layout: helm.sdk.operatorframework.io/v1
     repository: https://github.com/konveyor/pelorus/
     support: Pelorus Community
-  name: pelorus-operator.v0.0.1
+  name: pelorus-operator.v0.0.2
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -152,63 +151,40 @@ spec:
           - patch
           - update
           - watch
-        - apiGroups:
-          - rbac.authorization.k8s.io
-          resources:
-          - clusterrolebindings
-          - clusterroles
-          verbs:
-          - '*'
-        - apiGroups:
-          - apps.openshift.io
-          resources:
-          - deploymentconfigs
-          verbs:
-          - '*'
-        - apiGroups:
-          - integreatly.org
-          resources:
-          - grafanadashboards
-          - grafanadatasources
-          - grafanas
-          verbs:
-          - '*'
-        - apiGroups:
-          - image.openshift.io
-          resources:
-          - imagestreams
-          verbs:
-          - '*'
-        - apiGroups:
-          - monitoring.coreos.com
-          resources:
-          - prometheuses
-          - prometheusrules
-          - servicemonitors
-          verbs:
-          - '*'
-        - apiGroups:
-          - route.openshift.io
-          resources:
-          - routes
-          verbs:
-          - '*'
         - apiGroups:
           - ""
           resources:
+          - pods
+          - services
+          - services/finalizers
+          - endpoints
+          - persistentvolumeclaims
+          - events
           - configmaps
           - secrets
-          - serviceaccounts
-          - services
           verbs:
-          - '*'
+          - create
+          - delete
+          - get
+          - list
+          - patch
+          - update
+          - watch
         - apiGroups:
-          - rbac.authorization.k8s.io
+          - apps
           resources:
-          - rolebindings
-          - roles
+          - deployments
+          - daemonsets
+          - replicasets
+          - statefulsets
           verbs:
-          - '*'
+          - create
+          - delete
+          - get
+          - list
+          - patch
+          - update
+          - watch
         - apiGroups:
           - operators.coreos.com
           resources:
@@ -358,7 +334,7 @@ spec:
                 - --metrics-bind-address=127.0.0.1:8080
                 - --leader-elect
                 - --leader-election-id=pelorus-operator
-                image: quay.io/pelorus/pelorus-operator:0.0.1
+                image: quay.io/pelorus/pelorus-operator:0.0.2
                 livenessProbe:
                   httpGet:
                     path: /healthz
@@ -460,4 +436,4 @@ spec:
   provider:
     name: Red Hat
     url: https://redhat.com
-  version: 0.0.1
+  version: 0.0.2
diff --git a/pelorus-operator/config/manager/kustomization.yaml b/pelorus-operator/config/manager/kustomization.yaml
@@ -5,4 +5,4 @@ kind: Kustomization
 images:
 - name: controller
   newName: quay.io/pelorus/pelorus-operator
-  newTag: 0.0.1
+  newTag: 0.0.2
diff --git a/pelorus-operator/config/manifests/bases/pelorus-operator.clusterserviceversion.yaml b/pelorus-operator/config/manifests/bases/pelorus-operator.clusterserviceversion.yaml
@@ -6,7 +6,7 @@ metadata:
     capabilities: Basic Install
     categories: |
       Modernization & Migration,Developer Tools,Monitoring,Integration & Delivery
-    containerImage: quay.io/pelorus/pelorus-operator:0.0.1
+    containerImage: quay.io/pelorus/pelorus-operator:0.0.2
     description: |
       Tool that helps IT organizations measure their impact on the overall performance of their organization
     operatorframework.io/suggested-namespace: pelorus

diff --git a/pelorus-operator/config/rbac/role.yaml b/pelorus-operator/config/rbac/role.yaml
@@ -45,62 +45,39 @@ rules:
   - patch
   - update
   - watch
-- verbs:
-  - "*"
-  apiGroups:
-  - "rbac.authorization.k8s.io"
-  resources:
-  - "clusterrolebindings"
-  - "clusterroles"
-- verbs:
-  - "*"
-  apiGroups:
-  - "apps.openshift.io"
-  resources:
-  - "deploymentconfigs"
-- verbs:
-  - "*"
-  apiGroups:
-  - "integreatly.org"
-  resources:
-  - "grafanadashboards"
-  - "grafanadatasources"
-  - "grafanas"
-- verbs:
-  - "*"
-  apiGroups:
-  - "image.openshift.io"
-  resources:
-  - "imagestreams"
-- verbs:
-  - "*"
-  apiGroups:
-  - "monitoring.coreos.com"
-  resources:
-  - "prometheuses"
-  - "prometheusrules"
-  - "servicemonitors"
-- verbs:
-  - "*"
-  apiGroups:
-  - "route.openshift.io"
-  resources:
-  - "routes"
-- verbs:
-  - "*"
-  apiGroups:
+- apiGroups:
   - ""
   resources:
-  - "configmaps"
-  - "secrets"
-  - "serviceaccounts"
-  - "services"
-- verbs:
-  - "*"
-  apiGroups:
-  - "rbac.authorization.k8s.io"
+  - pods
+  - services
+  - services/finalizers
+  - endpoints
+  - persistentvolumeclaims
+  - events
+  - configmaps
+  - secrets
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - apps
   resources:
-  - "rolebindings"
-  - "roles"
+  - deployments
+  - daemonsets
+  - replicasets
+  - statefulsets
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
 
 #+kubebuilder:scaffold:rules
diff --git a/pelorus-operator/config/samples/charts_v1alpha1_pelorus.yaml b/pelorus-operator/config/samples/charts_v1alpha1_pelorus.yaml
@@ -5,7 +5,6 @@ metadata:
 spec:
   # Default values copied from <project_dir>/helm-charts/pelorus/values.yaml
   exporters:
-    global: {}
     instances:
     - app_name: deploytime-exporter
       exporter_type: deploytime

diff --git a/pelorus-operator/helm-charts/pelorus/Chart.lock b/pelorus-operator/helm-charts/pelorus/Chart.lock
@@ -3,4 +3,4 @@ dependencies:
   repository: file://./subcharts/exporters
   version: 2.0.4
 digest: sha256:76d6f1ef53a7d8586a7d04dac9932b82460dcf135e48901741f510b401b906c3
-generated: "2022-12-19T12:26:16.845346124+01:00"
+generated: "2023-01-18T17:48:33.801502771+01:00"
diff --git a/pelorus-operator/watches.yaml b/pelorus-operator/watches.yaml
@@ -3,4 +3,5 @@
   version: v1alpha1
   kind: Pelorus
   chart: helm-charts/pelorus
+  watchDependentResources: false
 #+kubebuilder:scaffold:watch
diff --git a/scripts/pelorus-operator-patches/08_watches_dependent_resources.diff b/scripts/pelorus-operator-patches/08_watches_dependent_resources.diff
@@ -0,0 +1,9 @@
+--- watches.yaml.original	2023-01-18 17:44:32.236167254 +0100
++++ watches.yaml	2023-01-18 17:44:48.578216943 +0100
+@@ -3,4 +3,5 @@
+   version: v1alpha1
+   kind: Pelorus
+   chart: helm-charts/pelorus
++  watchDependentResources: false
+ #+kubebuilder:scaffold:watch
+