From 1e9c2ad74c2ad0ad5a65bbd44abf58a8c1889b12 Mon Sep 17 00:00:00 2001 From: Bob Kukura Date: Wed, 15 Dec 2021 13:02:28 -0500 Subject: [PATCH] Preparing release v1.29.1 (#1674) Signed-off-by: Robert Kukura --- CHANGELOG.md | 4 ++++ RELEASE.md | 10 +++++----- .../jaeger-operator.clusterserviceversion.yaml | 6 +++--- config/manager/kustomization.yaml | 2 +- versions.txt | 2 +- 5 files changed, 14 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 06fe99723..92a56fafd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ Changes by Version ================== +1.29.1 (2021-12-15) +------------------- +* Register oschema for openshift resources ([#1673](https://github.com/jaegertracing/jaeger-operator/pull/1673), [@rubenvp8510](https://github.com/rubenvp8510)) + 1.29.0 (2021-12-10) ------------------- * Fix default namespace ([#1651](https://github.com/jaegertracing/jaeger-operator/pull/1651), [@rubenvp8510](https://github.com/rubenvp8510)) diff --git a/RELEASE.md b/RELEASE.md index 0efd095fd..27a6a9d24 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -5,22 +5,22 @@ Steps to release a new version of the Jaeger Operator: 1. Change the `versions.txt `so that it lists the target version of the Jaeger (if it is required). Don't touch the operator version it will be changed automatically in the next step. -1. Run `OPERATOR_VERSION=1.29.0 make prepare-release`, using the operator version that will be released. +1. Run `OPERATOR_VERSION=1.29.1 make prepare-release`, using the operator version that will be released. 1. Prepare a changelog since last release. 1. Commit the changes and create a pull request: ``` - git commit -sm "Preparing release v1.29.0" + git commit -sm "Preparing release v1.29.1" ``` -1. Once the changes above are merged and available in `master` tag it with the desired version, prefixed with `v`, eg. `v1.29.0` +1. Once the changes above are merged and available in `master` tag it with the desired version, prefixed with `v`, eg. `v1.29.1` ``` git checkout master - git tag v1.29.0 - git push git@github.com:jaegertracing/jaeger-operator.git v1.29.0 + git tag v1.29.1 + git push git@github.com:jaegertracing/jaeger-operator.git v1.29.1 ``` 1. The GitHub Workflow will take it from here, creating a GitHub release and publishing the images diff --git a/bundle/manifests/jaeger-operator.clusterserviceversion.yaml b/bundle/manifests/jaeger-operator.clusterserviceversion.yaml index e414c2bec..f0d8da052 100644 --- a/bundle/manifests/jaeger-operator.clusterserviceversion.yaml +++ b/bundle/manifests/jaeger-operator.clusterserviceversion.yaml @@ -27,7 +27,7 @@ metadata: operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 repository: https://github.com/jaegertracing/jaeger-operator support: Jaeger Community - name: jaeger-operator.v1.29.0 + name: jaeger-operator.v1.29.1 namespace: placeholder spec: apiservicedefinitions: {} @@ -384,7 +384,7 @@ spec: fieldPath: metadata.namespace - name: OPERATOR_NAME value: jaeger-operator - image: quay.io/jaegertracing/jaeger-operator:1.29.0 + image: quay.io/jaegertracing/jaeger-operator:1.29.1 livenessProbe: httpGet: path: /healthz @@ -472,4 +472,4 @@ spec: selector: matchLabels: name: jaeger-operator - version: 1.29.0 + version: 1.29.1 diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index 5a90b1883..f7f201df6 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -5,4 +5,4 @@ kind: Kustomization images: - name: controller newName: quay.io/jaegertracing/jaeger-operator - newTag: 1.29.0 + newTag: 1.29.1 diff --git a/versions.txt b/versions.txt index 094dfefc3..136000b43 100644 --- a/versions.txt +++ b/versions.txt @@ -4,4 +4,4 @@ jaeger=1.29.0 # DO NOT EDIT the next value, it is updated automatically during the release. # Represents the current (latest) release of the Jaeger Operator. -operator=1.29.0 +operator=1.29.1