Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into Issue-1894
Browse files Browse the repository at this point in the history
rubenvp8510 authored May 29, 2022
2 parents c06036c + cb6c038 commit 474e2be
Showing 5 changed files with 21 additions and 7 deletions.
16 changes: 15 additions & 1 deletion .ci/prepare-release.sh
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
#!/bin/bash

if [[ "${OPERATOR_VERSION}x" == "x" ]]; then
if [[ -z $OPERATOR_VERSION ]]; then
echo "OPERATOR_VERSION isn't set. Skipping process."
exit 1
fi

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

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

@@ -14,4 +15,17 @@ sed "s~operator=${PREVIOUS_VERSION}~operator=${OPERATOR_VERSION}~gi" -i versions
# changes to deploy/operator.yaml
sed "s~replaces: jaeger-operator.v.*~replaces: jaeger-operator.v${PREVIOUS_VERSION}~i" -i config/manifests/bases/jaeger-operator.clusterserviceversion.yaml

# Update the examples according to the release
# statefulset-manual-sidecar
sed -i "s~jaeger-agent:.*~jaeger-agent:${JAEGER_VERSION}~gi" examples/statefulset-manual-sidecar.yaml

# operator-with-tracing
sed -i "s~jaeger-operator:.*~jaeger-operator:${OPERATOR_VERSION}~gi" examples/operator-with-tracing.yaml
sed -i "s~jaeger-agent:.*~jaeger-agent:${JAEGER_VERSION}~gi" examples/operator-with-tracing.yaml

# tracegen
sed -i "s~jaeger-tracegen:.*~jaeger-tracegen:${JAEGER_VERSION}~gi" examples/tracegen.yaml
sed -i "s~jaeger-agent:.*~jaeger-agent:${JAEGER_VERSION}~gi" examples/tracegen.yaml


VERSION=${OPERATOR_VERSION} USER=jaegertracing make bundle
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@ IMG ?= ${IMG_PREFIX}/${OPERATOR_NAME}:${VERSION}
BUNDLE_IMG ?= ${IMG_PREFIX}/${OPERATOR_NAME}-bundle:$(addprefix v,${VERSION})
OUTPUT_BINARY ?= "$(BIN_DIR)/jaeger-operator"
VERSION_PKG ?= "github.com/jaegertracing/jaeger-operator/pkg/version"
JAEGER_VERSION ?= "$(shell grep jaeger= versions.txt | awk -F= '{print $$2}')"
export JAEGER_VERSION ?= "$(shell grep jaeger= versions.txt | awk -F= '{print $$2}')"
# Kafka and kafka operator variables
STORAGE_NAMESPACE ?= "${shell kubectl get sa default -o jsonpath='{.metadata.namespace}' || oc project -q}"
KAFKA_NAMESPACE ?= "kafka"
4 changes: 2 additions & 2 deletions examples/operator-with-tracing.yaml
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@ spec:
serviceAccountName: jaeger-operator
containers:
- name: jaeger-operator
image: jaegertracing/jaeger-operator:1.20.0
image: jaegertracing/jaeger-operator:1.34.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.20
image: jaegertracing/jaeger-agent:1.34.1
env:
- name: POD_NAMESPACE
valueFrom:
2 changes: 1 addition & 1 deletion examples/statefulset-manual-sidecar.yaml
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ spec:
- containerPort: 8080
protocol: TCP
- name: jaeger-agent
image: jaegertracing/jaeger-agent:1.17.0 # The agent version should match the operator version
image: jaegertracing/jaeger-agent:1.34.1
imagePullPolicy: IfNotPresent
ports:
- containerPort: 5775
4 changes: 2 additions & 2 deletions examples/tracegen.yaml
Original file line number Diff line number Diff line change
@@ -20,12 +20,12 @@ spec:
spec:
containers:
- name: tracegen
image: jaegertracing/jaeger-tracegen:1.17
image: jaegertracing/jaeger-tracegen:1.34.1
args:
- -duration=30m
- -workers=10
- name: jaeger-agent
image: jaegertracing/jaeger-agent:1.17
image: jaegertracing/jaeger-agent:1.34.1
args:
- --reporter.grpc.host-port=dns:///simple-prod-collector-headless.default:14250
env:

0 comments on commit 474e2be

Please sign in to comment.