Pelorus Operator v0.0.2 (#786)

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

Hide file tree

Showing 12 changed files with 41 additions and 31 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/charts.pelorus.konveyor.io_pelorus.yaml b/pelorus-operator/bundle/manifests/charts.pelorus.konveyor.io_pelorus.yaml
@@ -34,11 +34,11 @@ spec:
             description: 'PelorusSpec defines state of the Pelorus application and
               allows to configure for the desired workflow. More information about
               Pelorus configuration that can be used in the Spec section is available
-              at: https://pelorus.readthedocs.io/en/latest/Configuration/'
+              at: https://pelorus.readthedocs.io/en/latest/GettingStarted/configuration/PelorusCore/'
             properties:
               exporters:
                 description: |-
-                  References configuration for the Pelorus exporters. More info about exporters configuration: https://pelorus.readthedocs.io/en/latest/Configuration/#configuring-exporters-details
+                  References configuration for the Pelorus exporters. More info about exporters configuration: https://pelorus.readthedocs.io/en/latest/GettingStarted/configuration/PelorusExporters/
 
 
                     Example:
@@ -49,14 +49,14 @@ spec:
                 type: object
                 x-kubernetes-preserve-unknown-fields: true
               prometheus_retention:
-                description: 'Prometheus Retention time. More information: https://pelorus.readthedocs.io/en/latest/Install/#configure-prometheus-retention'
+                description: 'Prometheus Retention time. More information: https://pelorus.readthedocs.io/en/latest/GettingStarted/configuration/PelorusCore/#prometheus_retention'
                 type: string
               prometheus_retention_size:
-                description: 'Prometheus Retention Size. More information: https://pelorus.readthedocs.io/en/latest/Install/#configure-prometheus-retention'
+                description: 'Prometheus Retention Size. More information: https://pelorus.readthedocs.io/en/latest/GettingStarted/configuration/PelorusCore/#prometheus_retention_size'
                 type: string
               prometheus_storage:
                 description: 'Use Prometheus Persistent Volume. More information:
-                  https://pelorus.readthedocs.io/en/latest/Install/#configure-prometheus-persistent-volume-recommended'
+                  https://pelorus.readthedocs.io/en/latest/GettingStarted/configuration/PelorusCore/#prometheus-persistent-volume'
                 type: boolean
               prometheus_storage_pvc_capacity:
                 description: Prometheus Persistent Volume capacity.

diff --git a/pelorus-operator/bundle/manifests/pelorus-operator.clusterserviceversion.yaml b/pelorus-operator/bundle/manifests/pelorus-operator.clusterserviceversion.yaml
@@ -50,16 +50,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-18T18:25:19Z"
     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: {}
@@ -358,7 +358,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
@@ -441,8 +441,8 @@ spec:
   links:
   - name: Pelorus Docs
     url: https://pelorus.readthedocs.io/en/latest/
-  - name: Pelorus Configuration Docs
-    url: https://pelorus.readthedocs.io/en/latest/Configuration/
+  - name: Pelorus Getting Started
+    url: https://pelorus.readthedocs.io/en/latest/GettingStarted/Overview/
   - name: Pelorus GIT repository
     url: https://github.com/konveyor/pelorus/
   maintainers:
@@ -460,4 +460,4 @@ spec:
   provider:
     name: Red Hat
     url: https://redhat.com
-  version: 0.0.1
+  version: 0.0.2
diff --git a/pelorus-operator/bundle/metadata/properties.yaml b/pelorus-operator/bundle/metadata/properties.yaml
@@ -6,4 +6,4 @@ dependencies:
 - type: olm.package
   value:
     packageName: grafana-operator
-    version: "4.6.0"
+    version: "4.8.0"
diff --git a/pelorus-operator/config/crd/bases/charts.pelorus.konveyor.io_pelorus.yaml b/pelorus-operator/config/crd/bases/charts.pelorus.konveyor.io_pelorus.yaml
@@ -45,14 +45,14 @@ spec:
               to configure for the desired workflow. More information about
               Pelorus configuration that can be used in the Spec section is
               available at:
-              https://pelorus.readthedocs.io/en/latest/Configuration/
+              https://pelorus.readthedocs.io/en/latest/GettingStarted/configuration/PelorusCore/
             type: object
             properties:
               exporters:
                 description: >-
                   References configuration for the Pelorus exporters. More
                   info about exporters configuration:
-                  https://pelorus.readthedocs.io/en/latest/Configuration/#configuring-exporters-details
+                  https://pelorus.readthedocs.io/en/latest/GettingStarted/configuration/PelorusExporters/
 
                     Example:
                       instances:
@@ -64,17 +64,17 @@ spec:
               prometheus_retention:
                 description: >-
                   Prometheus Retention time. More information:
-                  https://pelorus.readthedocs.io/en/latest/Install/#configure-prometheus-retention
+                  https://pelorus.readthedocs.io/en/latest/GettingStarted/configuration/PelorusCore/#prometheus_retention
                 type: string
               prometheus_retention_size:
                 description: >-
                   Prometheus Retention Size. More information:
-                  https://pelorus.readthedocs.io/en/latest/Install/#configure-prometheus-retention
+                  https://pelorus.readthedocs.io/en/latest/GettingStarted/configuration/PelorusCore/#prometheus_retention_size
                 type: string
               prometheus_storage:
                 description: >-
                   Use Prometheus Persistent Volume. More information:
-                  https://pelorus.readthedocs.io/en/latest/Install/#configure-prometheus-persistent-volume-recommended
+                  https://pelorus.readthedocs.io/en/latest/GettingStarted/configuration/PelorusCore/#prometheus-persistent-volume
                 type: boolean
               prometheus_storage_pvc_capacity:
                 description: Prometheus Persistent Volume capacity.

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
@@ -93,8 +93,8 @@ spec:
   links:
   - name: Pelorus Docs
     url: https://pelorus.readthedocs.io/en/latest/
-  - name: Pelorus Configuration Docs
-    url: https://pelorus.readthedocs.io/en/latest/Configuration/
+  - name: Pelorus Getting Started
+    url: https://pelorus.readthedocs.io/en/latest/GettingStarted/Overview/
   - name: Pelorus GIT repository
     url: https://github.com/konveyor/pelorus/
   maintainers:

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-18T19:25:13.200901467+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/04_pelorus_cluster_service_versions.diff b/scripts/pelorus-operator-patches/04_pelorus_cluster_service_versions.diff
@@ -101,8 +101,8 @@
 -    url: https://pelorus-operator.domain
 +  - name: Pelorus Docs
 +    url: https://pelorus.readthedocs.io/en/latest/
-+  - name: Pelorus Configuration Docs
-+    url: https://pelorus.readthedocs.io/en/latest/Configuration/
++  - name: Pelorus Getting Started
++    url: https://pelorus.readthedocs.io/en/latest/GettingStarted/Overview/
 +  - name: Pelorus GIT repository
 +    url: https://github.com/konveyor/pelorus/
    maintainers:

diff --git a/scripts/pelorus-operator-patches/07_spec_description.diff b/scripts/pelorus-operator-patches/07_spec_description.diff
@@ -42,15 +42,15 @@
 +              to configure for the desired workflow. More information about
 +              Pelorus configuration that can be used in the Spec section is
 +              available at:
-+              https://pelorus.readthedocs.io/en/latest/Configuration/
++              https://pelorus.readthedocs.io/en/latest/GettingStarted/configuration/PelorusCore/
              type: object
 -            x-kubernetes-preserve-unknown-fields: true
 +            properties:
 +              exporters:
 +                description: >-
 +                  References configuration for the Pelorus exporters. More
 +                  info about exporters configuration:
-+                  https://pelorus.readthedocs.io/en/latest/Configuration/#configuring-exporters-details
++                  https://pelorus.readthedocs.io/en/latest/GettingStarted/configuration/PelorusExporters/
 +
 +                    Example:
 +                      instances:
@@ -62,17 +62,17 @@
 +              prometheus_retention:
 +                description: >-
 +                  Prometheus Retention time. More information:
-+                  https://pelorus.readthedocs.io/en/latest/Install/#configure-prometheus-retention
++                  https://pelorus.readthedocs.io/en/latest/GettingStarted/configuration/PelorusCore/#prometheus_retention
 +                type: string
 +              prometheus_retention_size:
 +                description: >-
 +                  Prometheus Retention Size. More information:
-+                  https://pelorus.readthedocs.io/en/latest/Install/#configure-prometheus-retention
++                  https://pelorus.readthedocs.io/en/latest/GettingStarted/configuration/PelorusCore/#prometheus_retention_size
 +                type: string
 +              prometheus_storage:
 +                description: >-
 +                  Use Prometheus Persistent Volume. More information:
-+                  https://pelorus.readthedocs.io/en/latest/Install/#configure-prometheus-persistent-volume-recommended
++                  https://pelorus.readthedocs.io/en/latest/GettingStarted/configuration/PelorusCore/#prometheus-persistent-volume
 +                type: boolean
 +              prometheus_storage_pvc_capacity:
 +                description: Prometheus Persistent Volume capacity.

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
+