Preparing release v1.59.0 (jaegertracing#2608)

* Preparing release v1.58.0 Signed-off-by: Benedikt Bongartz <bongartz@klimlive.de> * changelog: remove jaeger deprecation entry Signed-off-by: Benedikt Bongartz <bongartz@klimlive.de> * Prepare release v1.59.0 Signed-off-by: Benedikt Bongartz <bongartz@klimlive.de> * otlp: set default host:port when not provided Signed-off-by: Benedikt Bongartz <bongartz@klimlive.de> * Update config/manifests/bases/jaeger-operator.clusterserviceversion.yaml Signed-off-by: Ben B. <bongartz@klimlive.de> * Update bundle/manifests/jaeger-operator.clusterserviceversion.yaml Signed-off-by: Ben B. <bongartz@klimlive.de> --------- Signed-off-by: Benedikt Bongartz <bongartz@klimlive.de> Signed-off-by: Ben B. <bongartz@klimlive.de>
IshwarKanse · Aug 6, 2024 · 03de379 · 03de379
1 parent 3658d04
commit 03de379
Show file tree

Hide file tree

Showing 14 changed files with 79 additions and 23 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 Changes by Version
 ==================
+## v1.58.0 (2024-05-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))
+
 ## v1.57.0 (2024-05-06)
 
 ## v1.55.0 (2024-03-22)

diff --git a/COMPATIBILITY.md b/COMPATIBILITY.md
@@ -2,6 +2,8 @@ The following table shows the compatibility of Jaeger Operator with three differ
 
 | 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       |
@@ -28,5 +30,3 @@ The following table shows the compatibility of Jaeger Operator with three differ
 | 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       |
-| v1.31.x         | v1.19 to v1.22  | v0.23              | v1.6.1       |
-| v1.30.x         | v1.19 to v1.22  | v0.23              |              |
diff --git 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.58.0  | [Benedikt Bongartz](https://github.com/frzifus)          |
-| 1.59.0  | [Pavol Loffay](https://github.com/pavolloffay)           |
-| 1.60.0  | [Israel Blancas](https://github.com/iblancasa)           |
-| 1.61.0  | [Ruben Vargas](https://github.com/rubenvp8510)           |
+| 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)          |
diff --git a/bundle/manifests/jaeger-operator.clusterserviceversion.yaml b/bundle/manifests/jaeger-operator.clusterserviceversion.yaml
@@ -18,16 +18,16 @@ metadata:
     capabilities: Deep Insights
     categories: Logging & Tracing
     certified: "false"
-    containerImage: quay.io/jaegertracing/jaeger-operator:1.56.0
-    createdAt: "2024-05-04T15:16:29Z"
+    containerImage: quay.io/jaegertracing/jaeger-operator:1.59.0
+    createdAt: "2024-07-15T10:13: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.57.0
+  name: jaeger-operator.v1.59.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.57.0
+                image: quay.io/jaegertracing/jaeger-operator:1.59.0
                 livenessProbe:
                   httpGet:
                     path: /healthz
@@ -527,11 +527,11 @@ spec:
   minKubeVersion: 1.19.0
   provider:
     name: CNCF
-  replaces: jaeger-operator.v1.56.0
+  replaces: jaeger-operator.v1.57.0
   selector:
     matchLabels:
       name: jaeger-operator
-  version: 1.57.0
+  version: 1.59.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.57.0
+  newTag: 1.59.0
diff --git a/config/manifests/bases/jaeger-operator.clusterserviceversion.yaml b/config/manifests/bases/jaeger-operator.clusterserviceversion.yaml
@@ -15,7 +15,7 @@ metadata:
     capabilities: Deep Insights
     categories: Logging & Tracing
     certified: "false"
-    containerImage: quay.io/jaegertracing/jaeger-operator:1.56.0
+    containerImage: quay.io/jaegertracing/jaeger-operator:1.59.0
     createdAt: "2023-05-16T04:47:12Z"
     description: Provides tracing, monitoring and troubleshooting for microservices-based
       distributed systems
@@ -125,7 +125,7 @@ spec:
   minKubeVersion: 1.19.0
   provider:
     name: CNCF
-  replaces: jaeger-operator.v1.56.0
+  replaces: jaeger-operator.v1.57.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.57.0
+    image: jaegertracing/all-in-one:1.59.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.57.0
+        image: jaegertracing/jaeger-operator:1.59.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.57.0
+        image: jaegertracing/jaeger-agent:1.59.0
         env:
         - name: POD_NAMESPACE
           valueFrom:

diff --git 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.57.0
+          image: jaegertracing/jaeger-agent:1.59.0
           imagePullPolicy: IfNotPresent
           ports:
             - containerPort: 5775

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

diff --git a/pkg/deployment/all_in_one_test.go b/pkg/deployment/all_in_one_test.go
@@ -54,6 +54,14 @@ func TestDefaultAllInOneImage(t *testing.T) {
 			Name:  "COLLECTOR_OTLP_ENABLED",
 			Value: "true",
 		},
+		{
+			Name:  "COLLECTOR_OTLP_GRPC_HOST_PORT",
+			Value: "0.0.0.0:4317",
+		},
+		{
+			Name:  "COLLECTOR_OTLP_HTTP_HOST_PORT",
+			Value: "0.0.0.0:4318",
+		},
 	}
 	assert.Equal(t, envvars, d.Spec.Template.Spec.Containers[0].Env)
 }

diff --git a/pkg/deployment/collector_test.go b/pkg/deployment/collector_test.go
@@ -93,6 +93,14 @@ func TestDefaultCollectorImage(t *testing.T) {
 			Name:  "COLLECTOR_OTLP_ENABLED",
 			Value: "true",
 		},
+		{
+			Name:  "COLLECTOR_OTLP_GRPC_HOST_PORT",
+			Value: "0.0.0.0:4317",
+		},
+		{
+			Name:  "COLLECTOR_OTLP_HTTP_HOST_PORT",
+			Value: "0.0.0.0:4318",
+		},
 	}
 	assert.Equal(t, envvars, containers[0].Env)
 }
@@ -393,6 +401,14 @@ func TestCollectorWithDirectStorageType(t *testing.T) {
 			Name:  "COLLECTOR_OTLP_ENABLED",
 			Value: "true",
 		},
+		{
+			Name:  "COLLECTOR_OTLP_GRPC_HOST_PORT",
+			Value: "0.0.0.0:4317",
+		},
+		{
+			Name:  "COLLECTOR_OTLP_HTTP_HOST_PORT",
+			Value: "0.0.0.0:4318",
+		},
 	}
 	assert.Equal(t, envvars, dep.Spec.Template.Spec.Containers[0].Env)
 	assert.Len(t, dep.Spec.Template.Spec.Containers[0].Args, 2)
@@ -436,6 +452,14 @@ func TestCollectorWithKafkaStorageType(t *testing.T) {
 			Name:  "COLLECTOR_OTLP_ENABLED",
 			Value: "true",
 		},
+		{
+			Name:  "COLLECTOR_OTLP_GRPC_HOST_PORT",
+			Value: "0.0.0.0:4317",
+		},
+		{
+			Name:  "COLLECTOR_OTLP_HTTP_HOST_PORT",
+			Value: "0.0.0.0:4318",
+		},
 	}
 	assert.Equal(t, envvars, dep.Spec.Template.Spec.Containers[0].Env)
 	assert.Len(t, dep.Spec.Template.Spec.Containers[0].Args, 3)
@@ -475,6 +499,14 @@ func TestCollectorWithIngesterNoOptionsStorageType(t *testing.T) {
 			Name:  "COLLECTOR_OTLP_ENABLED",
 			Value: "true",
 		},
+		{
+			Name:  "COLLECTOR_OTLP_GRPC_HOST_PORT",
+			Value: "0.0.0.0:4317",
+		},
+		{
+			Name:  "COLLECTOR_OTLP_HTTP_HOST_PORT",
+			Value: "0.0.0.0:4318",
+		},
 	}
 	assert.Equal(t, envvars, dep.Spec.Template.Spec.Containers[0].Env)
 	assert.Len(t, dep.Spec.Template.Spec.Containers[0].Args, 2)

diff --git a/pkg/deployment/otlp.go b/pkg/deployment/otlp.go
@@ -6,7 +6,11 @@ import (
 	"github.com/jaegertracing/jaeger-operator/pkg/util"
 )
 
-const collectorOTLPEnvVarName = "COLLECTOR_OTLP_ENABLED"
+const (
+	collectorOTLPEnvVarName     = "COLLECTOR_OTLP_ENABLED"
+	collectorOTLPEnvAddressGRPC = "COLLECTOR_OTLP_GRPC_HOST_PORT"
+	collectorOTLPEnvAddressHTTP = "COLLECTOR_OTLP_HTTP_HOST_PORT"
+)
 
 func getOTLPEnvVars(options []string) []corev1.EnvVar {
 	if !util.IsOTLPExplcitSet(options) {
@@ -15,6 +19,14 @@ func getOTLPEnvVars(options []string) []corev1.EnvVar {
 				Name:  collectorOTLPEnvVarName,
 				Value: "true",
 			},
+			{
+				Name:  collectorOTLPEnvAddressGRPC,
+				Value: "0.0.0.0:4317",
+			},
+			{
+				Name:  collectorOTLPEnvAddressHTTP,
+				Value: "0.0.0.0:4318",
+			},
 		}
 	}
 	return []corev1.EnvVar{}

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.57.0
+jaeger=1.59.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.57.0
+operator=1.59.0