Skip to content

Commit

Permalink
Updated release of the Pelorus with it's pelorus-operator. (#845)
Browse files Browse the repository at this point in the history
Signed-off-by: Michal Pryc <[email protected]>
  • Loading branch information
mpryc authored Feb 28, 2023
1 parent e13dec6 commit c7478af
Show file tree
Hide file tree
Showing 25 changed files with 149 additions and 182 deletions.
2 changes: 1 addition & 1 deletion charts/operators/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.4
version: 2.0.6
4 changes: 2 additions & 2 deletions charts/pelorus/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.5
version: 2.0.6

dependencies:
- name: exporters
version: "v2.0.5"
version: "v2.0.6"
repository: file://./subcharts/exporters
2 changes: 1 addition & 1 deletion charts/pelorus/subcharts/exporters/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.5
version: 2.0.6
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ spec:
source:
contextDir: {{ .source_context_dir | default "exporters/" }}
git:
ref: {{ .source_ref | default "v2.0.4" }}
ref: {{ .source_ref | default "v2.0.6" }}
uri: {{ .source_url | default "https://github.com/konveyor/pelorus.git"}}
type: Git
strategy:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ spec:
name: {{ .image_name }}
# .image_name is provided without tag
{{- else }}
name: {{ .image_name }}:{{ .image_tag | default "stable" }}
name: {{ .image_name }}:{{ .image_tag | default "2.0.6" }}
{{- end }}
{{- else }}
name: quay.io/pelorus/pelorus-{{ .exporter_type }}-exporter:{{ .image_tag | default "stable" }}
name: quay.io/pelorus/pelorus-{{ .exporter_type }}-exporter:{{ .image_tag | default "2.0.6" }}
# .image_name
{{- end }}
name: {{ .image_tag | default "stable" }}
name: {{ .image_tag | default "2.0.6" }}
referencePolicy:
type: Local
# define
Expand Down
4 changes: 2 additions & 2 deletions docs/Development.md
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,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 `v1.7.1`. 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.6`. 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.

Expand Down Expand Up @@ -190,7 +190,7 @@ exporters:

- app_name: jira-failure-exporter
exporter_type: failure
image_tag: v1.7.1 # Specific release
image_tag: v2.0.6 # Specific release
env_from_secrets:
- jira-credentials
env_from_configmaps:
Expand Down
2 changes: 1 addition & 1 deletion pelorus-operator/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the manager binary
FROM quay.io/operator-framework/helm-operator:v1.26.0
FROM quay.io/operator-framework/helm-operator:v1.26.1

ENV HOME=/opt/helm
COPY watches.yaml ${HOME}/watches.yaml
Expand Down
4 changes: 2 additions & 2 deletions pelorus-operator/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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.2
VERSION ?= 0.0.3

# 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")
Expand Down Expand Up @@ -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.0/helm-operator_$(OS)_$(ARCH) ;\
curl -sSLo $(HELM_OPERATOR) https://github.com/operator-framework/operator-sdk/releases/download/v1.26.1/helm-operator_$(OS)_$(ARCH) ;\
chmod +x $(HELM_OPERATOR) ;\
}
else
Expand Down
2 changes: 1 addition & 1 deletion pelorus-operator/bundle.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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.0
LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.26.1
LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
LABEL operators.operatorframework.io.metrics.project_layout=helm.sdk.operatorframework.io/v1

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ metadata:
},
"spec": {
"exporters": {
"global": {},
"instances": [
{
"app_name": "deploytime-exporter",
Expand Down Expand Up @@ -50,16 +49,16 @@ metadata:
capabilities: Basic Install
categories: |
Modernization & Migration,Developer Tools,Monitoring,Integration & Delivery
containerImage: quay.io/pelorus/pelorus-operator:0.0.2
createdAt: "2023-01-18T18:25:19Z"
containerImage: quay.io/pelorus/pelorus-operator:0.0.3
createdAt: "2023-02-21T13:31:48Z"
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/builder: operator-sdk-v1.26.1
operators.operatorframework.io/project_layout: helm.sdk.operatorframework.io/v1
repository: https://github.com/konveyor/pelorus/
support: Pelorus Community
name: pelorus-operator.v0.0.2
name: pelorus-operator.v0.0.3
namespace: placeholder
spec:
apiservicedefinitions: {}
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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.2
image: quay.io/pelorus/pelorus-operator:0.0.3
livenessProbe:
httpGet:
path: /healthz
Expand Down Expand Up @@ -460,7 +436,8 @@ spec:
provider:
name: Red Hat
url: https://redhat.com
version: 0.0.2
replaces: pelorus-operator.v0.0.1
version: 0.0.3
replaces: pelorus-operator.v0.0.2
skips:
- pelorus-operator.v0.0.2
- pelorus-operator.v0.0.1
2 changes: 1 addition & 1 deletion pelorus-operator/bundle/metadata/annotations.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ annotations:
operators.operatorframework.io.bundle.metadata.v1: metadata/
operators.operatorframework.io.bundle.package.v1: pelorus-operator
operators.operatorframework.io.bundle.channels.v1: alpha
operators.operatorframework.io.metrics.builder: operator-sdk-v1.26.0
operators.operatorframework.io.metrics.builder: operator-sdk-v1.26.1
operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
operators.operatorframework.io.metrics.project_layout: helm.sdk.operatorframework.io/v1

Expand Down
12 changes: 6 additions & 6 deletions pelorus-operator/bundle/tests/scorecard/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ stages:
- entrypoint:
- scorecard-test
- basic-check-spec
image: quay.io/operator-framework/scorecard-test:v1.26.0
image: quay.io/operator-framework/scorecard-test:v1.26.1
labels:
suite: basic
test: basic-check-spec-test
Expand All @@ -18,7 +18,7 @@ stages:
- entrypoint:
- scorecard-test
- olm-bundle-validation
image: quay.io/operator-framework/scorecard-test:v1.26.0
image: quay.io/operator-framework/scorecard-test:v1.26.1
labels:
suite: olm
test: olm-bundle-validation-test
Expand All @@ -28,7 +28,7 @@ stages:
- entrypoint:
- scorecard-test
- olm-crds-have-validation
image: quay.io/operator-framework/scorecard-test:v1.26.0
image: quay.io/operator-framework/scorecard-test:v1.26.1
labels:
suite: olm
test: olm-crds-have-validation-test
Expand All @@ -38,7 +38,7 @@ stages:
- entrypoint:
- scorecard-test
- olm-crds-have-resources
image: quay.io/operator-framework/scorecard-test:v1.26.0
image: quay.io/operator-framework/scorecard-test:v1.26.1
labels:
suite: olm
test: olm-crds-have-resources-test
Expand All @@ -48,7 +48,7 @@ stages:
- entrypoint:
- scorecard-test
- olm-spec-descriptors
image: quay.io/operator-framework/scorecard-test:v1.26.0
image: quay.io/operator-framework/scorecard-test:v1.26.1
labels:
suite: olm
test: olm-spec-descriptors-test
Expand All @@ -58,7 +58,7 @@ stages:
- entrypoint:
- scorecard-test
- olm-status-descriptors
image: quay.io/operator-framework/scorecard-test:v1.26.0
image: quay.io/operator-framework/scorecard-test:v1.26.1
labels:
suite: olm
test: olm-status-descriptors-test
Expand Down
2 changes: 1 addition & 1 deletion pelorus-operator/config/manager/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ kind: Kustomization
images:
- name: controller
newName: quay.io/pelorus/pelorus-operator
newTag: 0.0.2
newTag: 0.0.3
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
capabilities: Basic Install
categories: |
Modernization & Migration,Developer Tools,Monitoring,Integration & Delivery
containerImage: quay.io/pelorus/pelorus-operator:0.0.2
containerImage: quay.io/pelorus/pelorus-operator:0.0.3
description: |
Tool that helps IT organizations measure their impact on the overall performance of their organization
operatorframework.io/suggested-namespace: pelorus
Expand Down
Loading

0 comments on commit c7478af

Please sign in to comment.