From aa82beab063fe0e3d26a827c4db4d828433424da Mon Sep 17 00:00:00 2001 From: Bob Kukura Date: Fri, 10 Dec 2021 12:59:46 -0500 Subject: [PATCH] Preparing release v1.29.0 (#1660) Signed-off-by: Robert Kukura --- CHANGELOG.md | 6 ++++++ RELEASE.md | 10 +++++----- .../jaeger-operator.clusterserviceversion.yaml | 8 ++++---- config/manager/kustomization.yaml | 2 +- .../bases/jaeger-operator.clusterserviceversion.yaml | 2 +- versions.txt | 4 ++-- 6 files changed, 19 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b3bdcafd5..06fe99723 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,12 @@ Changes by Version ================== +1.29.0 (2021-12-10) +------------------- +* Fix default namespace ([#1651](https://github.com/jaegertracing/jaeger-operator/pull/1651), [@rubenvp8510](https://github.com/rubenvp8510)) +* Fix finding the correct instance when there are multiple jaeger instances during injecting the sidecar ([#1639](https://github.com/jaegertracing/jaeger-operator/pull/1639), [@alibo](https://github.com/alibo)) +* Migrate to operator-sdk 1.13 ([#1623](https://github.com/jaegertracing/jaeger-operator/pull/1623), [@rubenvp8510](https://github.com/rubenvp8510)) + 1.28.0 (2021-11-08) ------------------- * Use CRDs to detect features in the cluster ([#1608](https://github.com/jaegertracing/jaeger-operator/pull/1608), [@pavolloffay](https://github.com/pavolloffay)) diff --git a/RELEASE.md b/RELEASE.md index 7f5247814..0efd095fd 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 `make prepare-release OPERATOR_VERSION=1.28.0`, using the operator version that will be released. +1. Run `OPERATOR_VERSION=1.29.0 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.28.0" + git commit -sm "Preparing release 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.28.0` +1. Once the changes above are merged and available in `master` tag it with the desired version, prefixed with `v`, eg. `v1.29.0` ``` git checkout master - git tag v1.28.0 - git push git@github.com:jaegertracing/jaeger-operator.git v1.28.0 + git tag v1.29.0 + git push git@github.com:jaegertracing/jaeger-operator.git v1.29.0 ``` 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 59ebf5cca..dd0490fa3 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.28.0 + name: jaeger-operator.v1.29.0 namespace: placeholder spec: apiservicedefinitions: {} @@ -384,7 +384,7 @@ spec: fieldPath: metadata.namespace - name: OPERATOR_NAME value: jaeger-operator - image: quay.io/jaegertracing/jaeger-operator:v1.28.0 + image: quay.io/jaegertracing/jaeger-operator:v1.29.0 livenessProbe: httpGet: path: /healthz @@ -468,8 +468,8 @@ spec: maturity: alpha provider: name: CNCF - replaces: jaeger-operator.v1.27.0 + replaces: jaeger-operator.v1.28.0 selector: matchLabels: name: jaeger-operator - version: 1.28.0 + version: 1.29.0 diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index c8eae6919..7a2e5655e 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: v1.28.0 + newTag: v1.29.0 diff --git a/config/manifests/bases/jaeger-operator.clusterserviceversion.yaml b/config/manifests/bases/jaeger-operator.clusterserviceversion.yaml index 82630c93a..5c03d6f1d 100644 --- a/config/manifests/bases/jaeger-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/jaeger-operator.clusterserviceversion.yaml @@ -124,7 +124,7 @@ spec: maturity: alpha provider: name: CNCF - replaces: jaeger-operator.v1.27.0 + replaces: jaeger-operator.v1.28.0 selector: matchLabels: name: jaeger-operator diff --git a/versions.txt b/versions.txt index d69938671..094dfefc3 100644 --- a/versions.txt +++ b/versions.txt @@ -1,7 +1,7 @@ # The Jaeger version to use by default. This is updated manually. Make sure to update the changelog # and add an upgrade procedure (pkg/upgrade) for the new version. -jaeger=1.28.0 +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.28.0 +operator=1.29.0