Merge 7103ae1 into 4f5b08d

CHANGELOG.md

@@ -1,6 +1,23 @@
 Changes by Version
 ==================
 
+1.21.3 (2021-02-09)
+-------------------
+
+* Migrate jaeger.tags in existing CRs ([#1380](https://github.com/jaegertracing/jaeger-operator/pull/1380), [@jpkrohling](https://github.com/jpkrohling))
+* Remove support for the experimental OpenTelemetry-based Jaeger ([#1379](https://github.com/jaegertracing/jaeger-operator/pull/1379), [@jpkrohling](https://github.com/jpkrohling))
+* Fix way we force es secret reconcile ([#1374](https://github.com/jaegertracing/jaeger-operator/pull/1374), [@kevinearls](https://github.com/kevinearls))
+* added the codeql.yml ([#1313](https://github.com/jaegertracing/jaeger-operator/pull/1313), [@KrishnaSindhur](https://github.com/KrishnaSindhur))
+* Fix service port naming convention ([#1368](https://github.com/jaegertracing/jaeger-operator/pull/1368), [@lujiajing1126](https://github.com/lujiajing1126))
+* Add volumes and volume-mounts for spark dependencies ([#1359](https://github.com/jaegertracing/jaeger-operator/pull/1359), [@kevinearls](https://github.com/kevinearls))
+* Create missing CA config maps on deployment controller ([#1347](https://github.com/jaegertracing/jaeger-operator/pull/1347), [@jpkrohling](https://github.com/jpkrohling))
+* set non root group ([#1339](https://github.com/jaegertracing/jaeger-operator/pull/1339), [@UsaninMax](https://github.com/UsaninMax))
+* Kafka 2.4 not supported by RH AMQ operator 1.6 ([#1335](https://github.com/jaegertracing/jaeger-operator/pull/1335), [@jkandasa](https://github.com/jkandasa))
+* Trigger deployments reconciliation when jaeger instance is created ([#1334](https://github.com/jaegertracing/jaeger-operator/pull/1334), [@rubenvp8510](https://github.com/rubenvp8510))
+* Copy common spec to avoid touching persisted CR spec ([#1333](https://github.com/jaegertracing/jaeger-operator/pull/1333), [@rubenvp8510](https://github.com/rubenvp8510))
+* Try to resolve container.name from the injected agent args ([#1319](https://github.com/jaegertracing/jaeger-operator/pull/1319), [@lujiajing1126](https://github.com/lujiajing1126))
+* Fix typo in CONTRIBUTING.md ([#1321](https://github.com/jaegertracing/jaeger-operator/pull/1321), [@sniperking1234](https://github.com/sniperking1234))
+
 1.21.2 (2020-11-20)
 -------------------
 

RELEASE.md

@@ -13,15 +13,15 @@
 1. Commit version change and changelog and create a pull request:
 
    ```
-   git commit -m "Preparing relase 1.16.0" -s
+   git commit -sm "Preparing relase v1.21.3"
    ```
 
 1. Tag and push
 
     ```
     git checkout master ## it's only possible to release from master for now!
-    git tag release/v1.16.0
-    git push git@github.com:jaegertracing/jaeger-operator.git release/v1.16.0
+    git tag release/v1.21.3
+    git push git@github.com:jaegertracing/jaeger-operator.git release/v1.21.3
     ```
 
 1. Wait until release CI job finishes and then pull the changes:

pkg/upgrade/v1_22_0_test.go

@@ -15,6 +15,12 @@ import (
 
 func TestUpgradeJaegerTagssv1_22_0(t *testing.T) {
 	latestVersion := "1.22.0"
+
+	// this is here because 1.22 isn't in the version map yet
+	// remove this code once it's been added there
+	upgrades[latestVersion] = upgrade1_22_0
+	parseSemVer()
+
 	opts := v1.NewOptions(map[string]interface{}{
 		"jaeger.tags": "somekey=somevalue",
 	})

pkg/upgrade/versions.go

@@ -16,6 +16,6 @@ var (
 		"1.17.0": upgrade1_17_0,
 		"1.18.0": upgrade1_18_0,
 		"1.20.0": upgrade1_20_0,
-		"1.22.0": upgrade1_22_0,
+		// "1.22.0": upgrade1_22_0, // enable once 1.22 is to be released
 	}
 )

versions.txt

@@ -4,4 +4,4 @@ jaeger=1.21.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.21.2
+operator=1.21.3