From 65c5f04706dc30013a45cbed43313b3e3367bdd8 Mon Sep 17 00:00:00 2001 From: Gary Brown Date: Fri, 22 Mar 2019 06:44:02 +0000 Subject: [PATCH] Change Operator provider to CNCF (#263) Signed-off-by: Gary Brown --- .travis/release.sh | 4 ++++ deploy/olm-catalog/jaeger-operator.csv.yaml | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.travis/release.sh b/.travis/release.sh index 027728180..2dd633118 100755 --- a/.travis/release.sh +++ b/.travis/release.sh @@ -22,6 +22,10 @@ sed "s/currentCSV: jaeger-operator.*/currentCSV: jaeger-operator.v${OPERATOR_VER sed "s~containerImage: docker.io/jaegertracing/jaeger-operator.*~containerImage: docker.io/${BUILD_IMAGE}~gi" -i deploy/olm-catalog/jaeger-operator.csv.yaml sed "s/name: jaeger-operator\.v.*/name: jaeger-operator.v${OPERATOR_VERSION}/gi" -i deploy/olm-catalog/jaeger-operator.csv.yaml sed "s~image: jaegertracing/jaeger-operator.*~image: ${BUILD_IMAGE}~gi" -i deploy/olm-catalog/jaeger-operator.csv.yaml + +export PREVIOUS_OPERATOR_VERSION=`grep "version: [0-9]" deploy/olm-catalog/jaeger-operator.csv.yaml | cut -f4 -d' '` +sed "s/replaces: jaeger-operator\.v.*/replaces: jaeger-operator.v${PREVIOUS_OPERATOR_VERSION}/gi" -i deploy/olm-catalog/jaeger-operator.csv.yaml + ## there's a "version: v1" there somewhere that we want to avoid sed -E "s/version: ([0-9\.]+).*/version: ${OPERATOR_VERSION}/gi" -i deploy/olm-catalog/jaeger-operator.csv.yaml diff --git a/deploy/olm-catalog/jaeger-operator.csv.yaml b/deploy/olm-catalog/jaeger-operator.csv.yaml index 5e6bfc702..0269987cc 100644 --- a/deploy/olm-catalog/jaeger-operator.csv.yaml +++ b/deploy/olm-catalog/jaeger-operator.csv.yaml @@ -59,6 +59,7 @@ metadata: support: Jaeger creationTimestamp: null name: jaeger-operator.v1.10.0 + replaces: jaeger-operator.v1.9.0 namespace: placeholder spec: apiservicedefinitions: {} @@ -253,7 +254,7 @@ spec: - email: jaeger-tracing@googlegroups.com name: Jaeger Google Group provider: - name: Jaeger + name: CNCF selector: matchLabels: name: jaeger-operator