release: Pelorus Operator version 0.0.5 (#886)

Signed-off-by: Mateus Oliveira <[email protected]>
dora-metrics · Mar 11, 2023 · 88bff21 · 88bff21
1 parent 7ed22f5
commit 88bff21
Show file tree

Hide file tree

Showing 30 changed files with 541 additions and 155 deletions.
diff --git a/charts/operators/Chart.yaml b/charts/operators/Chart.yaml
@@ -14,4 +14,4 @@ type: application
 
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
-version: 2.0.7
+version: 2.0.8
diff --git a/charts/pelorus/Chart.yaml b/charts/pelorus/Chart.yaml
@@ -14,9 +14,9 @@ type: application
 
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
-version: 2.0.8-rc.2
+version: 2.0.8
 
 dependencies:
   - name: exporters
-    version: "v2.0.8-rc.2"
+    version: 2.0.8
     repository: file://./subcharts/exporters
diff --git a/charts/pelorus/subcharts/exporters/Chart.yaml b/charts/pelorus/subcharts/exporters/Chart.yaml
@@ -14,4 +14,4 @@ type: application
 
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
-version: 2.0.8-rc.2
+version: 2.0.8
diff --git a/charts/pelorus/subcharts/exporters/templates/_buildconfig.yaml b/charts/pelorus/subcharts/exporters/templates/_buildconfig.yaml
@@ -17,7 +17,7 @@ spec:
   source:
     contextDir: {{ .source_context_dir | default "exporters/" }}
     git:
-      ref: {{ .source_ref | default "v2.0.7" }}
+      ref: {{ .source_ref | default "v2.0.8" }}
       uri: {{ .source_url | default "https://github.com/konveyor/pelorus.git"}}
     type: Git
   strategy:

diff --git a/charts/pelorus/subcharts/exporters/templates/_imagestream_from_image.yaml b/charts/pelorus/subcharts/exporters/templates/_imagestream_from_image.yaml
@@ -20,10 +20,10 @@ spec:
       name: {{ .image_name }}
     # .image_name is provided without tag
     {{- else }}
-      name: {{ .image_name }}:{{ .image_tag | default "v2.0.7" }}
+      name: {{ .image_name }}:{{ .image_tag | default "v2.0.8" }}
     {{- end }}
 {{- else }}
-      name: quay.io/pelorus/pelorus-{{ .exporter_type }}-exporter:{{ .image_tag | default "v2.0.7" }}
+      name: quay.io/pelorus/pelorus-{{ .exporter_type }}-exporter:{{ .image_tag | default "v2.0.8" }}
 # .image_name
 {{- end }}
     name: {{ .image_tag | default "stable" }}

diff --git a/charts/pelorus/values.yaml b/charts/pelorus/values.yaml
@@ -40,10 +40,14 @@ exporters:
 
     - app_name: failuretime-exporter
       exporter_type: failure
+      enabled: false
 
     - app_name: committime-exporter
       exporter_type: committime
 
+    - app_name: webhook-exporter
+      exporter_type: webhook
+
 # Experimental GitHub releasetime exporter
 #     - app_name: releasetime-exporter
 #       env_from_configmaps:

diff --git a/docs/Development.md b/docs/Development.md
@@ -218,7 +218,7 @@ If not defined specifically, exporters are using pre-built container images with
 
 Each Pelorus GitHub pull request that is [merged](https://github.com/konveyor/pelorus/pulls?q=is%3Apr+is%3Amerged) results in a new set of images that are tagged with the GitHub commit hash, for example `d6f6e6fa1c9d48ca1deeaf1c72585b94964cbf31` for the following [Pull Request](https://github.com/konveyor/pelorus/commit/d6f6e6fa1c9d48ca1deeaf1c72585b94964cbf31). The newest merged commit results in additional image tag `latest`.
 
-Each new Pelorus [release](https://github.com/konveyor/pelorus/releases) results in a new set of images that are tagged with the release number, for example `v2.0.7`. At the same time when release is made a `stable` tag is updated to point to the latest released version of the images.
+Each new Pelorus [release](https://github.com/konveyor/pelorus/releases) results in a new set of images that are tagged with the release number, for example `v2.0.8`. At the same time when release is made a `stable` tag is updated to point to the latest released version of the images.
 
 During Pelorus Helm deployment or update time user have option to specify the image tag for each exporter instance individually. Example below shows two different tags for the commit time exporter and two tags for the failure exporter.
 
@@ -258,7 +258,7 @@ exporters:
 
   - app_name: jira-failure-exporter
     exporter_type: failure
-    image_tag: v2.0.7 # Specific release
+    image_tag: v2.0.8 # Specific release
     env_from_secrets:
     - jira-credentials
     env_from_configmaps:

diff --git a/pelorus-operator/Dockerfile b/pelorus-operator/Dockerfile
@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM quay.io/operator-framework/helm-operator:v1.26.1
+FROM quay.io/operator-framework/helm-operator:v1.27.0
 
 ENV HOME=/opt/helm
 COPY watches.yaml ${HOME}/watches.yaml

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.4
+VERSION ?= 0.0.5
 
 # 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")
@@ -146,7 +146,7 @@ ifeq (,$(shell which helm-operator 2>/dev/null))
 	@{ \
 	set -e ;\
 	mkdir -p $(dir $(HELM_OPERATOR)) ;\
-	curl -sSLo $(HELM_OPERATOR) https://github.com/operator-framework/operator-sdk/releases/download/v1.26.1/helm-operator_$(OS)_$(ARCH) ;\
+	curl -sSLo $(HELM_OPERATOR) https://github.com/operator-framework/operator-sdk/releases/download/v1.27.0/helm-operator_$(OS)_$(ARCH) ;\
 	chmod +x $(HELM_OPERATOR) ;\
 	}
 else

diff --git a/pelorus-operator/bundle.Dockerfile b/pelorus-operator/bundle.Dockerfile
@@ -6,7 +6,7 @@ LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/
 LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
 LABEL operators.operatorframework.io.bundle.package.v1=pelorus-operator
 LABEL operators.operatorframework.io.bundle.channels.v1=alpha
-LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.26.1
+LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.27.0
 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
 LABEL operators.operatorframework.io.metrics.project_layout=helm.sdk.operatorframework.io/v1
 

diff --git a/pelorus-operator/bundle/manifests/charts.pelorus.konveyor.io_pelorus.yaml b/pelorus-operator/bundle/manifests/charts.pelorus.konveyor.io_pelorus.yaml
@@ -36,18 +36,150 @@ spec:
               Pelorus configuration that can be used in the Spec section is available
               at: https://pelorus.readthedocs.io/en/latest/GettingStarted/configuration/PelorusCore/'
             properties:
+              bucket_access_key:
+                description: S3 Access Key ID.
+                type: string
+              bucket_access_point:
+                description: S3 named network endpoint that is used to perform S3
+                  object operations.
+                type: string
+              bucket_secret_access_key:
+                description: S3 Secret Access Key.
+                type: string
+              custom_ca:
+                description: Whether or not the cluster serves custom signed certificates
+                  for ingress (e.g. router certs).
+                type: boolean
               exporters:
-                description: |-
-                  References configuration for the Pelorus exporters. More info about exporters configuration: https://pelorus.readthedocs.io/en/latest/GettingStarted/configuration/PelorusExporters/
-
-
-                    Example:
-                      instances:
-                        - app_name: < instance_name >
-                          enabled: < won't be created if set to false >
-                          exporter_type: < deploytime, committime, failure >
+                description: Configure Pelorus exporters' References.
+                properties:
+                  instances:
+                    items:
+                      properties:
+                        app_name:
+                          description: Must consist of lower case alphanumeric characters
+                            or '-'.
+                          type: string
+                        custom_certs:
+                          description: ConfigMap name(s) with custom CA certificates.
+                          items:
+                            properties:
+                              map_name:
+                                description: ConfigMap name created from Certificate
+                                  file.
+                                type: string
+                            required:
+                            - map_name
+                            type: object
+                          type: array
+                        enabled:
+                          default: true
+                          description: If set to false, exporter instance won't be
+                            created.
+                          type: boolean
+                        env_from_configmaps:
+                          description: ConfigMap name(s) with configuration used by
+                            the exporter instance.
+                          items:
+                            type: string
+                          type: array
+                        env_from_secrets:
+                          description: Secret name(s) with configuration used by the
+                            exporter instance.
+                          items:
+                            type: string
+                          type: array
+                        exporter_type:
+                          description: 'Exporter type as in the: https://pelorus.readthedocs.io/en/latest/Configuration/#configuring-exporters-overview'
+                          enum:
+                          - deploytime
+                          - committime
+                          - failure
+                          - webhook
+                          type: string
+                        extraEnv:
+                          description: List of Name and Value pairs used to configure
+                            the exporter instance.
+                          items:
+                            properties:
+                              name:
+                                description: Option name.
+                                type: string
+                              value:
+                                description: Option value.
+                                type: string
+                            required:
+                            - name
+                            - value
+                            type: object
+                          type: array
+                        image_name:
+                          description: DEVELOPMENT OPTION, DO NOT USE IN PRODUCTION
+                            Exporter image name, with registry.
+                          type: string
+                        image_tag:
+                          description: DEVELOPMENT OPTION, DO NOT USE IN PRODUCTION
+                            Exporter image tag.
+                          type: string
+                        source_ref:
+                          description: DEVELOPMENT OPTION, DO NOT USE IN PRODUCTION
+                            Exporter git reference or branch.
+                          type: string
+                        source_url:
+                          description: DEVELOPMENT OPTION, DO NOT USE IN PRODUCTION
+                            Exporter git source code.
+                          type: string
+                      required:
+                      - app_name
+                      - exporter_type
+                      type: object
+                    type: array
                 type: object
-                x-kubernetes-preserve-unknown-fields: true
+              external_prometheus_hosts:
+                description: List of additional external scrape hosts.
+                items:
+                  properties:
+                    hostname:
+                      description: The fully qualified domain name or IP Address of
+                        the external scrape host
+                      type: string
+                    id:
+                      description: Must consist of lower case alphanumeric characters
+                        or '-'.
+                      type: string
+                  required:
+                  - hostname
+                  type: object
+                type: array
+              federated_prometheus_hosts:
+                description: List of additional Federation hosts.
+                items:
+                  properties:
+                    hostname:
+                      description: The fully qualified domain name or IP Address of
+                        the Prometheus Federation host.
+                      type: string
+                    id:
+                      description: Must consist of lower case alphanumeric characters
+                        or '-'.
+                      type: string
+                    password:
+                      description: The federated Prometheus "basic auth" password.
+                      type: string
+                  required:
+                  - id
+                  - hostname
+                  type: object
+                type: array
+              openshift_prometheus_basic_auth_pass:
+                description: Password for Grafana to communicate with the Prometheus
+                  datasource. Must match the "Prometheus Internal Auth (htpasswd)".
+                type: string
+              openshift_prometheus_htpasswd_auth:
+                description: Credentials for the internal user that are used by Grafana
+                  to communicate with the Prometheus and Thanos deployed by Pelorus.
+                  Must match the "Grafana Datasource Internal Auth (basic auth)".
+                type: string
               prometheus_retention:
                 description: 'Prometheus Retention time. More information: https://pelorus.readthedocs.io/en/latest/GettingStarted/configuration/PelorusCore/#prometheus_retention'
                 type: string
@@ -64,6 +196,13 @@ spec:
               prometheus_storage_pvc_storageclass:
                 description: Prometheus Persistent Volume storage class to be used.
                 type: string
+              thanos_bucket_name:
+                description: S3 bucket name.
+                type: string
+              thanos_version:
+                description: DEVELOPMENT OPTION, DO NOT USE IN PRODUCTION Thanos version
+                  from the Official Thanos podman image.
+                type: string
             type: object
           status:
             description: Status defines the observed state of Pelorus