From b003836ceeec14a313e1e528316efd0403a0b74a Mon Sep 17 00:00:00 2001 From: Ben B Date: Wed, 19 Oct 2022 15:34:54 +0200 Subject: [PATCH] Preparing release v1.38.1 (#2086) Co-authored-by: Israel Blancas Signed-off-by: Benedikt Bongartz Signed-off-by: Benedikt Bongartz Co-authored-by: Israel Blancas --- CHANGELOG.md | 8 ++++++++ .../manifests/jaeger-operator.clusterserviceversion.yaml | 8 ++++---- config/manager/kustomization.yaml | 2 +- .../bases/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 +- tests/templates/assert-kafka-cluster.yaml.template | 2 +- tests/templates/assert-zookeeper-cluster.yaml.template | 2 +- tests/templates/openshift/report-spans.yaml.template | 2 +- versions.txt | 4 ++-- 12 files changed, 24 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f2582e91f..700fef18f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,14 @@ Changes by Version ================== + +1.38.1 (2022-10-11) +------------------- +* Add ability to specify es proxy resources ([#2079](https://github.com/jaegertracing/jaeger-operator/pull/2079), [@rubenvp8510](https://github.com/rubenvp8510)) +* Fix: CVE-2022-27664 ([#2081](https://github.com/jaegertracing/jaeger-operator/pull/2081), [@albertlockett](https://github.com/albertlockett)) +* Add liveness and readiness probes to injected sidecar ([#2077](https://github.com/jaegertracing/jaeger-operator/pull/2077), [@MacroPower](https://github.com/MacroPower)) +* Add http- port prefix to follow istio naming conventions ([#2075](https://github.com/jaegertracing/jaeger-operator/pull/2075), [@cnvergence](https://github.com/cnvergence)) + 1.38.0 (2022-09-19) ------------------- * added pathType to ingress ([#2066](https://github.com/jaegertracing/jaeger-operator/pull/2066), [@giautm](https://github.com/giautm)) diff --git a/bundle/manifests/jaeger-operator.clusterserviceversion.yaml b/bundle/manifests/jaeger-operator.clusterserviceversion.yaml index 7822ca0c1..f81d961f9 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.38.0 + name: jaeger-operator.v1.38.1 namespace: placeholder spec: apiservicedefinitions: {} @@ -403,7 +403,7 @@ spec: fieldPath: metadata.namespace - name: OPERATOR_NAME value: jaeger-operator - image: quay.io/jaegertracing/jaeger-operator:1.38.0 + image: quay.io/jaegertracing/jaeger-operator:1.38.1 livenessProbe: httpGet: path: /healthz @@ -518,11 +518,11 @@ spec: maturity: alpha provider: name: CNCF - replaces: jaeger-operator.v1.37.0 + replaces: jaeger-operator.v1.38.1 selector: matchLabels: name: jaeger-operator - version: 1.38.0 + version: 1.38.1 webhookdefinitions: - admissionReviewVersions: - v1 diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index 5dc49a471..029ab9e25 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.38.0 + newTag: 1.38.1 diff --git a/config/manifests/bases/jaeger-operator.clusterserviceversion.yaml b/config/manifests/bases/jaeger-operator.clusterserviceversion.yaml index c4d610ad4..9abdfc650 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.37.0 + replaces: jaeger-operator.v1.38.1 selector: matchLabels: name: jaeger-operator diff --git a/examples/all-in-one-with-options.yaml b/examples/all-in-one-with-options.yaml index 32529cbf0..edb638580 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.38.0 + image: jaegertracing/all-in-one:1.38.1 options: log-level: debug query: diff --git a/examples/operator-with-tracing.yaml b/examples/operator-with-tracing.yaml index 594829d5e..79205d547 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.38.0 + image: jaegertracing/jaeger-operator:1.38.1 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.38.0 + image: jaegertracing/jaeger-agent:1.38.1 env: - name: POD_NAMESPACE valueFrom: diff --git a/examples/statefulset-manual-sidecar.yaml b/examples/statefulset-manual-sidecar.yaml index 220a17f8d..5c92e0b1e 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.38.0 + image: jaegertracing/jaeger-agent:1.38.1 imagePullPolicy: IfNotPresent ports: - containerPort: 5775 diff --git a/examples/tracegen.yaml b/examples/tracegen.yaml index f2cec4a9e..d8f8e9157 100644 --- a/examples/tracegen.yaml +++ b/examples/tracegen.yaml @@ -20,7 +20,7 @@ spec: spec: containers: - name: tracegen - image: jaegertracing/jaeger-tracegen:1.38.0 + image: jaegertracing/jaeger-tracegen:1.38.1 args: - -duration=30m - -workers=10 diff --git a/tests/templates/assert-kafka-cluster.yaml.template b/tests/templates/assert-kafka-cluster.yaml.template index cd1d569e3..65f1cb7af 100644 --- a/tests/templates/assert-kafka-cluster.yaml.template +++ b/tests/templates/assert-kafka-cluster.yaml.template @@ -12,5 +12,5 @@ status: {{if eq .Env.KAFKA_USE_CUSTOM_PODSET "true" }} readyPods: {{ .Env.REPLICAS }} {{else}} - availableReplicas: 1 + availableReplicas: {{ .Env.REPLICAS }} {{end}} diff --git a/tests/templates/assert-zookeeper-cluster.yaml.template b/tests/templates/assert-zookeeper-cluster.yaml.template index e0c190d3d..49824dae5 100644 --- a/tests/templates/assert-zookeeper-cluster.yaml.template +++ b/tests/templates/assert-zookeeper-cluster.yaml.template @@ -12,5 +12,5 @@ status: {{if eq .Env.KAFKA_USE_CUSTOM_PODSET "true" }} readyPods: {{ .Env.REPLICAS }} {{else}} - availableReplicas: 1 + availableReplicas: {{ .Env.REPLICAS }} {{end}} diff --git a/tests/templates/openshift/report-spans.yaml.template b/tests/templates/openshift/report-spans.yaml.template index 7a239b580..521590c7e 100644 --- a/tests/templates/openshift/report-spans.yaml.template +++ b/tests/templates/openshift/report-spans.yaml.template @@ -5,5 +5,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep commands: - script: "SERVICE_ACCOUNT_NAME={{ .Env.SERVICE_ACCOUNT_NAME }} {{ .Env.GET_TOKEN_PROGRAM }} $NAMESPACE {{ .Env.JAEGER_NAME }} /dev/null" - - script: "DAYS={{ .Env.DAYS }} ASSERT_IMG={{ .Env.ASSERT_IMG }} {{if getenv "JOB_NUMBER"}}JOB_NUMBER={{ .Env.JOB_NUMBER }}{{end}} JAEGER_COLLECTOR_ENDPOINT={{ .Env.JAEGER_COLLECTOR_ENDPOINT }} {{if getenv "JAEGER_QUERY_ENDPOINT"}}JAEGER_QUERY_ENDPOINT={{ .Env.JAEGER_QUERY_ENDPOINT }} MOUNT_SECRET={{ .Env.SERVICE_ACCOUNT_NAME }} {{ .Env.GOMPLATE }} -f {{ .Env.TEMPLATES_DIR }}/report-spans.yaml.template -o report-span-{{ .Env.JOB_NUMBER }}-job.yaml" + - script: "DAYS={{ .Env.DAYS }} ASSERT_IMG={{ .Env.ASSERT_IMG }} {{if getenv "JOB_NUMBER"}}JOB_NUMBER={{ .Env.JOB_NUMBER }}{{end}} JAEGER_COLLECTOR_ENDPOINT={{ .Env.JAEGER_COLLECTOR_ENDPOINT }} {{if getenv "JAEGER_QUERY_ENDPOINT"}}JAEGER_QUERY_ENDPOINT={{ .Env.JAEGER_QUERY_ENDPOINT }}{{end}} MOUNT_SECRET={{ .Env.SERVICE_ACCOUNT_NAME }} {{ .Env.GOMPLATE }} -f {{ .Env.TEMPLATES_DIR }}/report-spans.yaml.template -o report-span-{{ .Env.JOB_NUMBER }}-job.yaml" - script: "kubectl apply -f report-span{{if getenv "JOB_NUMBER"}}-{{ .Env.JOB_NUMBER }}{{end}}-job.yaml -n $NAMESPACE" diff --git a/versions.txt b/versions.txt index 657397bec..cc9ae1975 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.38.0 +jaeger=1.38.1 # DO NOT EDIT the next value, it is updated automatically during the release. # Represents the current (latest) release of the Jaeger Operator. -operator=1.38.0 +operator=1.38.1