From fcba4082683a830939ba5475dcbcd6d797d1cae9 Mon Sep 17 00:00:00 2001
From: Pavol Loffay
Date: Fri, 9 Aug 2024 11:36:57 +0200
Subject: [PATCH] Preparing release v1.60.0 (#2648)
Signed-off-by: Pavol Loffay
---
CHANGELOG.md | 7 ++-
COMPATIBILITY.md | 60 +++++++++----------
RELEASE.md | 2 +-
...jaeger-operator.clusterserviceversion.yaml | 10 ++--
config/manager/kustomization.yaml | 2 +-
...jaeger-operator.clusterserviceversion.yaml | 2 +-
examples/all-in-one-with-options.yaml | 2 +-
examples/operator-with-tracing.yaml | 4 +-
examples/statefulset-manual-sidecar.yaml | 2 +-
examples/tracegen.yaml | 2 +-
versions.txt | 4 +-
11 files changed, 51 insertions(+), 46 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 34b288fc5..b403d8e92 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,11 @@
Changes by Version
==================
-## v1.58.0 (2024-05-06)
+
+## v1.60.0 (2024-08-09)
+* Test on k8s 1.30 ([#2647](https://github.com/jaegertracing/jaeger-operator/pull/2647), [@pavolloffay](https://github.com/pavolloffay))
+* Bump go to 1.22 and controller-gen to 1.14 ([#2646](https://github.com/jaegertracing/jaeger-operator/pull/2646), [@pavolloffay](https://github.com/pavolloffay))
+
+## v1.59.0 (2024-08-06)
* Update compatibility matrix for v1.57.x ([#2594](https://github.com/jaegertracing/jaeger-operator/pull/2594), [@mooneeb](https://github.com/mooneeb))
* imagePullSecrets is not set for agent DaemonSet ([#2563](https://github.com/jaegertracing/jaeger-operator/pull/2563), [@antoniomerlin](https://github.com/antoniomerlin))
diff --git a/COMPATIBILITY.md b/COMPATIBILITY.md
index 086ac4d1b..8d420848a 100644
--- a/COMPATIBILITY.md
+++ b/COMPATIBILITY.md
@@ -1,32 +1,32 @@
The following table shows the compatibility of Jaeger Operator with three different components: Kubernetes, Strimzi Operator, and Cert-Manager.
-| Jaeger Operator | Kubernetes | Strimzi Operator | Cert-Manager |
-|-----------------|-----------------|--------------------|--------------|
-| v1.59.x | v1.19 to v1.28 | v0.32 | v1.6.1 |
-| v1.58.x | skipped | skipped | skipped |
-| v1.57.x | v1.19 to v1.28 | v0.32 | v1.6.1 |
-| v1.56.x | v1.19 to v1.28 | v0.32 | v1.6.1 |
-| v1.55.x | v1.19 to v1.28 | v0.32 | v1.6.1 |
-| v1.54.x | v1.19 to v1.28 | v0.32 | v1.6.1 |
-| v1.53.x | v1.19 to v1.28 | v0.32 | v1.6.1 |
-| v1.52.x | v1.19 to v1.28 | v0.32 | v1.6.1 |
-| v1.51.x | v1.19 to v1.28 | v0.32 | v1.6.1 |
-| v1.50.x | v1.19 to v1.28 | v0.32 | v1.6.1 |
-| v1.49.x | v1.19 to v1.28 | v0.32 | v1.6.1 |
-| v1.48.x | v1.19 to v1.27 | v0.32 | v1.6.1 |
-| v1.47.x | v1.19 to v1.27 | v0.32 | v1.6.1 |
-| v1.46.x | v1.19 to v1.26 | v0.32 | v1.6.1 |
-| v1.45.x | v1.19 to v1.26 | v0.32 | v1.6.1 |
-| v1.44.x | v1.19 to v1.26 | v0.32 | v1.6.1 |
-| v1.43.x | v1.19 to v1.26 | v0.32 | v1.6.1 |
-| v1.42.x | v1.19 to v1.26 | v0.32 | v1.6.1 |
-| v1.41.x | v1.19 to v1.25 | v0.30 | v1.6.1 |
-| v1.40.x | v1.19 to v1.25 | v0.30 | v1.6.1 |
-| v1.39.x | v1.19 to v1.25 | v0.30 | v1.6.1 |
-| v1.38.x | v1.19 to v1.25 | v0.30 | v1.6.1 |
-| v1.37.x | v1.19 to v1.24 | v0.23 | v1.6.1 |
-| v1.36.x | v1.19 to v1.24 | v0.23 | v1.6.1 |
-| v1.35.x | v1.19 to v1.24 | v0.23 | v1.6.1 |
-| v1.34.x | v1.19 to v1.24 | v0.23 | v1.6.1 |
-| v1.33.x | v1.19 to v1.23 | v0.23 | v1.6.1 |
-| v1.32.x | v1.19 to v1.22 | v0.23 | v1.6.1 |
+| Jaeger Operator | Kubernetes | Strimzi Operator | Cert-Manager |
+|-----------------|----------------|--------------------|--------------|
+| v1.60.x | v1.19 to v1.30 | v0.32 | v1.6.1 |
+| v1.59.x | v1.19 to v1.28 | v0.32 | v1.6.1 |
+| v1.58.x | skipped | skipped | skipped |
+| v1.57.x | v1.19 to v1.28 | v0.32 | v1.6.1 |
+| v1.56.x | v1.19 to v1.28 | v0.32 | v1.6.1 |
+| v1.55.x | v1.19 to v1.28 | v0.32 | v1.6.1 |
+| v1.54.x | v1.19 to v1.28 | v0.32 | v1.6.1 |
+| v1.53.x | v1.19 to v1.28 | v0.32 | v1.6.1 |
+| v1.52.x | v1.19 to v1.28 | v0.32 | v1.6.1 |
+| v1.51.x | v1.19 to v1.28 | v0.32 | v1.6.1 |
+| v1.50.x | v1.19 to v1.28 | v0.32 | v1.6.1 |
+| v1.49.x | v1.19 to v1.28 | v0.32 | v1.6.1 |
+| v1.48.x | v1.19 to v1.27 | v0.32 | v1.6.1 |
+| v1.47.x | v1.19 to v1.27 | v0.32 | v1.6.1 |
+| v1.46.x | v1.19 to v1.26 | v0.32 | v1.6.1 |
+| v1.45.x | v1.19 to v1.26 | v0.32 | v1.6.1 |
+| v1.44.x | v1.19 to v1.26 | v0.32 | v1.6.1 |
+| v1.43.x | v1.19 to v1.26 | v0.32 | v1.6.1 |
+| v1.42.x | v1.19 to v1.26 | v0.32 | v1.6.1 |
+| v1.41.x | v1.19 to v1.25 | v0.30 | v1.6.1 |
+| v1.40.x | v1.19 to v1.25 | v0.30 | v1.6.1 |
+| v1.39.x | v1.19 to v1.25 | v0.30 | v1.6.1 |
+| v1.38.x | v1.19 to v1.25 | v0.30 | v1.6.1 |
+| v1.37.x | v1.19 to v1.24 | v0.23 | v1.6.1 |
+| v1.36.x | v1.19 to v1.24 | v0.23 | v1.6.1 |
+| v1.35.x | v1.19 to v1.24 | v0.23 | v1.6.1 |
+| v1.34.x | v1.19 to v1.24 | v0.23 | v1.6.1 |
+| v1.33.x | v1.19 to v1.23 | v0.23 | v1.6.1 |
diff --git a/RELEASE.md b/RELEASE.md
index 6da7d19f5..86848a8e0 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -66,7 +66,7 @@ The operator should be released within a week after the [Jaeger release](https:/
| Version | Release Manager |
|---------| -------------------------------------------------------- |
-| 1.60.0 | [Pavol Loffay](https://github.com/pavolloffay) |
| 1.61.0 | [Israel Blancas](https://github.com/iblancasa) |
| 1.62.0 | [Ruben Vargas](https://github.com/rubenvp8510) |
| 1.63.0 | [Benedikt Bongartz](https://github.com/frzifus) |
+| 1.64.0 | [Pavol Loffay](https://github.com/pavolloffay) |
diff --git a/bundle/manifests/jaeger-operator.clusterserviceversion.yaml b/bundle/manifests/jaeger-operator.clusterserviceversion.yaml
index 7ad9bf23c..98b713bbe 100644
--- a/bundle/manifests/jaeger-operator.clusterserviceversion.yaml
+++ b/bundle/manifests/jaeger-operator.clusterserviceversion.yaml
@@ -19,7 +19,7 @@ metadata:
categories: Logging & Tracing
certified: "false"
containerImage: quay.io/jaegertracing/jaeger-operator:1.59.0
- createdAt: "2024-08-09T08:45:04Z"
+ createdAt: "2024-08-09T09:12:17Z"
description: Provides tracing, monitoring and troubleshooting for microservices-based
distributed systems
operators.openshift.io/infrastructure-features: '["disconnected"]'
@@ -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.59.0
+ name: jaeger-operator.v1.60.0
namespace: placeholder
spec:
apiservicedefinitions: {}
@@ -414,7 +414,7 @@ spec:
value: DEBUG
- name: KAFKA-PROVISIONING-MINIMAL
value: "true"
- image: quay.io/jaegertracing/jaeger-operator:1.59.0
+ image: quay.io/jaegertracing/jaeger-operator:1.60.0
livenessProbe:
httpGet:
path: /healthz
@@ -527,11 +527,11 @@ spec:
minKubeVersion: 1.19.0
provider:
name: CNCF
- replaces: jaeger-operator.v1.57.0
+ replaces: jaeger-operator.v1.59.0
selector:
matchLabels:
name: jaeger-operator
- version: 1.59.0
+ version: 1.60.0
webhookdefinitions:
- admissionReviewVersions:
- v1
diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
index c1e32ca95..30fc78e36 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.59.0
+ newTag: 1.60.0
diff --git a/config/manifests/bases/jaeger-operator.clusterserviceversion.yaml b/config/manifests/bases/jaeger-operator.clusterserviceversion.yaml
index 54f46cc91..6f9e568dd 100644
--- a/config/manifests/bases/jaeger-operator.clusterserviceversion.yaml
+++ b/config/manifests/bases/jaeger-operator.clusterserviceversion.yaml
@@ -125,7 +125,7 @@ spec:
minKubeVersion: 1.19.0
provider:
name: CNCF
- replaces: jaeger-operator.v1.57.0
+ replaces: jaeger-operator.v1.59.0
selector:
matchLabels:
name: jaeger-operator
diff --git a/examples/all-in-one-with-options.yaml b/examples/all-in-one-with-options.yaml
index b1e23f410..6e76a1d2c 100644
--- a/examples/all-in-one-with-options.yaml
+++ b/examples/all-in-one-with-options.yaml
@@ -5,7 +5,7 @@ metadata:
spec:
strategy: allInOne
allInOne:
- image: jaegertracing/all-in-one:1.59.0
+ image: jaegertracing/all-in-one:1.60.0
options:
log-level: debug
query:
diff --git a/examples/operator-with-tracing.yaml b/examples/operator-with-tracing.yaml
index da7c421bd..1166f7f76 100644
--- a/examples/operator-with-tracing.yaml
+++ b/examples/operator-with-tracing.yaml
@@ -17,7 +17,7 @@ spec:
serviceAccountName: jaeger-operator
containers:
- name: jaeger-operator
- image: jaegertracing/jaeger-operator:1.59.0
+ image: jaegertracing/jaeger-operator:1.60.0
ports:
- containerPort: 8383
name: http-metrics
@@ -41,7 +41,7 @@ spec:
- name: OPERATOR_NAME
value: "jaeger-operator"
- name: jaeger-agent
- image: jaegertracing/jaeger-agent:1.59.0
+ image: jaegertracing/jaeger-agent:1.60.0
env:
- name: POD_NAMESPACE
valueFrom:
diff --git a/examples/statefulset-manual-sidecar.yaml b/examples/statefulset-manual-sidecar.yaml
index bbdab815f..66b92afe1 100644
--- a/examples/statefulset-manual-sidecar.yaml
+++ b/examples/statefulset-manual-sidecar.yaml
@@ -23,7 +23,7 @@ spec:
- containerPort: 8080
protocol: TCP
- name: jaeger-agent
- image: jaegertracing/jaeger-agent:1.59.0
+ image: jaegertracing/jaeger-agent:1.60.0
imagePullPolicy: IfNotPresent
ports:
- containerPort: 5775
diff --git a/examples/tracegen.yaml b/examples/tracegen.yaml
index 8efc4df3f..fb78110cf 100644
--- a/examples/tracegen.yaml
+++ b/examples/tracegen.yaml
@@ -20,7 +20,7 @@ spec:
spec:
containers:
- name: tracegen
- image: jaegertracing/jaeger-tracegen:1.59.0
+ image: jaegertracing/jaeger-tracegen:1.60.0
args:
- -duration=30m
- -workers=10
diff --git a/versions.txt b/versions.txt
index 98a870475..30e48a19c 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.59.0
+jaeger=1.60.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.59.0
+operator=1.60.0