Prepare release 1.65.0 (#2797)

* Prepare release 1.65.0 Signed-off-by: Ruben Vargas <[email protected]> * change sidecar image to use agent versionn Signed-off-by: Ruben Vargas <[email protected]> * remove quotes from agent version Signed-off-by: Ruben Vargas <[email protected]> * upgrade cassandra in tests Signed-off-by: Ruben Vargas <[email protected]> * bump to cassandra 5.0 Signed-off-by: Ruben Vargas <[email protected]> * remove entrypoint command from test Signed-off-by: Ruben Vargas <[email protected]> * fix replaces Signed-off-by: Ruben Vargas <[email protected]> --------- Signed-off-by: Ruben Vargas <[email protected]>
jaegertracing · Jan 23, 2025 · 77c2ee4 · 77c2ee4
1 parent 614322e
commit 77c2ee4
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 17 deletions.
diff --git a/.ci/prepare-release.sh b/.ci/prepare-release.sh
@@ -8,6 +8,7 @@ fi
 
 
 JAEGER_VERSION=$(echo $JAEGER_VERSION | tr -d '"')
+JAEGER_AGENT_VERSION=$(echo $JAEGER_AGENT_VERSION | tr -d '"')
 
 
 PREVIOUS_VERSION=$(grep operator= versions.txt | awk -F= '{print $2}')

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 Changes by Version
 ==================
+## v1.65.0 (2025-01-22)
+
+* Pin agent version to 1.62.0 ([#2790](https://github.com/jaegertracing/jaeger-operator/pull/2790), [@rubenvp8510](https://github.com/rubenvp8510))
+* Added compatibility for Jaeger Operator v1.61.x and v1.62.x ([#2725](https://github.com/jaegertracing/jaeger-operator/pull/2725), [@mooneeb](https://github.com/mooneeb))
 
 ## v1.62.0 (2024-10-10)
 

diff --git a/bundle/manifests/jaeger-operator.clusterserviceversion.yaml b/bundle/manifests/jaeger-operator.clusterserviceversion.yaml
@@ -19,15 +19,15 @@ metadata:
     categories: Logging & Tracing
     certified: "false"
     containerImage: quay.io/jaegertracing/jaeger-operator:1.62.0
-    createdAt: "2024-10-09T03:00:10Z"
+    createdAt: "2025-01-22T20:40:19Z"
     description: Provides tracing, monitoring and troubleshooting for microservices-based
       distributed systems
     operators.openshift.io/infrastructure-features: '["disconnected"]'
     operators.operatorframework.io/builder: operator-sdk-v1.32.0
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
     repository: https://github.com/jaegertracing/jaeger-operator
     support: Jaeger Community
-  name: jaeger-operator.v1.62.0
+  name: jaeger-operator.v1.65.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.62.0
+                image: quay.io/jaegertracing/jaeger-operator:1.65.0
                 livenessProbe:
                   httpGet:
                     path: /healthz
@@ -527,11 +527,11 @@ spec:
   minKubeVersion: 1.19.0
   provider:
     name: CNCF
-  replaces: jaeger-operator.v1.61.0
+  replaces: jaeger-operator.v1.62.0
   selector:
     matchLabels:
       name: jaeger-operator
-  version: 1.62.0
+  version: 1.65.0
   webhookdefinitions:
   - admissionReviewVersions:
     - v1

diff --git 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.62.0
+  newTag: 1.65.0
diff --git 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.61.0
+  replaces: jaeger-operator.v1.62.0
   selector:
     matchLabels:
       name: jaeger-operator

diff --git 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.62.0
+    image: jaegertracing/all-in-one:1.65.0
     options:
       log-level: debug
       query:

diff --git 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.62.0
+        image: jaegertracing/jaeger-operator:1.65.0
         ports:
         - containerPort: 8383
           name: http-metrics

diff --git a/examples/tracegen.yaml b/examples/tracegen.yaml
@@ -20,7 +20,7 @@ spec:
     spec:
       containers:
       - name: tracegen
-        image: jaegertracing/jaeger-tracegen:1.62.0
+        image: jaegertracing/jaeger-tracegen:1.65.0
         args:
         - -duration=30m
         - -workers=10

diff --git a/pkg/inject/sidecar.go b/pkg/inject/sidecar.go
@@ -301,7 +301,7 @@ func container(jaeger *v1.Jaeger, dep *appsv1.Deployment, agentIdx int) corev1.C
 	dep.Spec.Template.Spec.ImagePullSecrets = util.RemoveDuplicatedImagePullSecrets(append(dep.Spec.Template.Spec.ImagePullSecrets, jaeger.Spec.Agent.ImagePullSecrets...))
 	dep.Spec.Template.Spec.Volumes = util.RemoveDuplicatedVolumes(append(dep.Spec.Template.Spec.Volumes, volumesAndMountsSpec.Volumes...))
 	containerDefinition := corev1.Container{
-		Image: util.ImageName(jaeger.Spec.Agent.Image, "jaeger-agent-image"),
+		Image: util.AgentImageName(jaeger.Spec.Agent.Image, "jaeger-agent-image"),
 		Name:  "jaeger-agent",
 		Args:  args,
 		Env:   envs,

diff --git a/tests/cassandra.yml b/tests/cassandra.yml
@@ -46,10 +46,7 @@ items:
         terminationGracePeriodSeconds: 1800
         containers:
         - name: cassandra
-          image: cassandra:3.11
-          command:
-          - /docker-entrypoint.sh
-          - "-R"
+          image: cassandra:5.0
           ports:
           - containerPort: 7000
             name: intra-node

diff --git 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.62.0
+jaeger=1.65.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.62.0
+operator=1.65.0
Original file line number	Diff line number	Diff line change
Expand Up		@@ -8,6 +8,7 @@ fi


		JAEGER_VERSION=$(echo $JAEGER_VERSION \| tr -d '"')
		JAEGER_AGENT_VERSION=$(echo $JAEGER_AGENT_VERSION \| tr -d '"')


		PREVIOUS_VERSION=$(grep operator= versions.txt \| awk -F= '{print $2}')
Expand Down