Skip to content

Commit

Permalink
Preparing release v1.29.0 (#1660)
Browse files Browse the repository at this point in the history
Signed-off-by: Robert Kukura <[email protected]>
  • Loading branch information
Bob Kukura authored Dec 10, 2021
1 parent 75eb503 commit aa82bea
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 13 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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))
Expand Down
10 changes: 5 additions & 5 deletions RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 [email protected]:jaegertracing/jaeger-operator.git v1.28.0
git tag v1.29.0
git push [email protected]:jaegertracing/jaeger-operator.git v1.29.0
```
1. The GitHub Workflow will take it from here, creating a GitHub release and publishing the images
Expand Down
8 changes: 4 additions & 4 deletions bundle/manifests/jaeger-operator.clusterserviceversion.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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: {}
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
2 changes: 1 addition & 1 deletion 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/jaegertracing/jaeger-operator
newTag: v1.28.0
newTag: v1.29.0
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions versions.txt
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit aa82bea

Please sign in to comment.