Merge branch 'master' into multi-options

.ci/install-kuttl.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 
-sudo curl -Lo /usr/local/bin/kubectl-kuttl https://github.com/kudobuilder/kuttl/releases/download/v0.7.2/kubectl-kuttl_0.7.2_linux_x86_64
+sudo curl -Lo /usr/local/bin/kubectl-kuttl https://github.com/kudobuilder/kuttl/releases/download/v0.10.0/kubectl-kuttl_0.10.0_linux_x86_64
 sudo chmod +x /usr/local/bin/kubectl-kuttl
 export PATH=$PATH:/usr/local/bin

.ci/setup-docker.sh

@@ -8,4 +8,4 @@ curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
 sudo apt-key fingerprint 0EBFCD88
 sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
 sudo apt-get update
-sudo apt-get install docker-ce docker-ce-cli containerd.io
+sudo apt-get install docker-ce docker-ce-cli containerd.io socat

.github/workflows/base-checks.yaml

@@ -12,7 +12,7 @@ jobs:
     steps:
     - uses: actions/[email protected]
       with:
-        go-version: '1.14.4'
+        go-version: 1.16
     - uses: actions/[email protected]
     - uses: jpkrohling/[email protected]
       with:

.github/workflows/e2e-kubernetes.yaml

@@ -8,28 +8,28 @@ on:
 
 jobs:
   end-to-end:
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-20.04
     strategy:
       matrix:
         TEST_GROUP: [smoke, es, cassandra, streaming, examples1, examples2, generate, upgrade, istio]
     steps:
     - uses: actions/[email protected]
       with:
-        go-version: '1.14.4'
-    - uses: jpkrohling/[email protected]
+        go-version: 1.16
+    - uses: actions/[email protected]
+    - name: "setup docker"
+      run: ./.ci/setup-docker.sh
+    - uses: manusa/[email protected]
       with:
-        minikube-version: v1.5.2
+        minikube version: 'v1.20.0'
+        kubernetes version: 'v1.19.1'
+        driver: none
+        github token: ${{ secrets.GITHUB_TOKEN }}
+        start args: '--addons=ingress --wait=all'
     - uses: jpkrohling/[email protected]
     - uses: jpkrohling/[email protected]
       with:
         operator-sdk-version: v0.18.2
-    - uses: actions/[email protected]
-
-    - name: "setup docker"
-      run: ./.ci/setup-docker.sh
-
-    - name: "start minikube"
-      run: ./.ci/start-minikube.sh
 
     - name: "install go tools"
       run: make install-tools

.github/workflows/e2e-kuttl.yaml

@@ -10,12 +10,18 @@ jobs:
   e2e-tests:
     name: End-to-end tests
     runs-on: ubuntu-20.04
+    strategy:
+      matrix:
+       kube-version:
+       - "1.19"
+       - "1.20"
+       - "1.21"
     steps:
 
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.15
+          go-version: 1.16
 
       - name: Check out code into the Go module directory
         uses: actions/checkout@v2
@@ -24,4 +30,6 @@ jobs:
         run: ./.ci/install-kuttl.sh
 
       - name: "run tests"
-        run: make install kuttl-e2e
+        env:
+          KUBE_VERSION: ${{ matrix.kube-version }}
+        run: make install kuttl-e2e KUBE_VERSION=$KUBE_VERSION

.github/workflows/release.yaml

@@ -10,7 +10,7 @@ jobs:
     steps:
     - uses: actions/[email protected]
       with:
-        go-version: '1.14.4'
+        go-version: 1.16
     - uses: actions/[email protected]
     - uses: jpkrohling/[email protected]
       with:

CHANGELOG.md

@@ -1,6 +1,17 @@
 Changes by Version
 ==================
 
+1.23.0 (2021-07-11)
+-------------------
+* Implement backoff limit for jobs ([#1468](https://github.com/jaegertracing/jaeger-operator/pull/1468), [@chasekiefer](https://github.com/chasekiefer))
+* Remove OwnerReferences from CA configmaps ([#1467](https://github.com/jaegertracing/jaeger-operator/pull/1467), [@rubenvp8510](https://github.com/rubenvp8510))
+* Add compatibility matrix ([#1465](https://github.com/jaegertracing/jaeger-operator/pull/1465), [@jpkrohling](https://github.com/jpkrohling))
+* Promote crd to apiextensions.k8s.io/v1 ([#1456](https://github.com/jaegertracing/jaeger-operator/pull/1456), [@rubenvp8510](https://github.com/rubenvp8510))
+* Add preserve unknown fields annotation to FreeForm and Options fields ([#1435](https://github.com/jaegertracing/jaeger-operator/pull/1435), [@rubenvp8510](https://github.com/rubenvp8510))
+* Migrate remaining flags and some env vars to 1.22 ([#1449](https://github.com/jaegertracing/jaeger-operator/pull/1449), [@rubenvp8510](https://github.com/rubenvp8510))
+* Fix override storage and ingress values when upgrade to 1.22 ([#1439](https://github.com/jaegertracing/jaeger-operator/pull/1439), [@rubenvp8510](https://github.com/rubenvp8510))
+* Add agent dnsPolicy option ([#1370](https://github.com/jaegertracing/jaeger-operator/pull/1370), [@faceair](https://github.com/faceair))
+
 1.22.1 (2021-04-19)
 -------------------
 * Allow configure custom certificates to collector ([#1418](https://github.com/jaegertracing/jaeger-operator/pull/1418), [@rubenvp8510](https://github.com/rubenvp8510))

Makefile

@@ -41,6 +41,9 @@ UNIT_TEST_PACKAGES := $(shell go list ./cmd/... ./pkg/... | grep -v elasticsearc
 
 TEST_OPTIONS = $(VERBOSE) -kubeconfig $(KUBERNETES_CONFIG) -namespacedMan ../../deploy/test/namespace-manifests.yaml -globalMan ../../deploy/test/global-manifests.yaml -root .
 
+KUBE_VERSION ?= 1.21
+KIND_CONFIG ?= kind-$(KUBE_VERSION).yaml
+
 .DEFAULT_GOAL := build
 
 .PHONY: check
@@ -393,7 +396,7 @@ install-tools:
 		golang.org/x/lint/golint \
 		golang.org/x/tools/cmd/goimports \
 		github.com/securego/gosec/cmd/[email protected] \
-		sigs.k8s.io/controller-tools/cmd/controller-gen@v0.3.0 \
+		sigs.k8s.io/controller-tools/cmd/controller-gen@v0.5.0 \
 		k8s.io/code-generator/cmd/[email protected] \
 		k8s.io/kube-openapi/cmd/[email protected]
 
@@ -419,7 +422,7 @@ check-operatorhub-pr-template:
 .PHONY: local-jaeger-container
 local-jaeger-container:
 	@echo "Starting local container with Jaeger. Check http://localhost:16686"
-	@docker run -d --rm -p 16686:16686 -p 6831:6831/udp --name jaeger jaegertracing/all-in-one:1.15 > /dev/null
+	@docker run -d --rm -p 16686:16686 -p 6831:6831/udp --name jaeger jaegertracing/all-in-one:1.22 > /dev/null
 
 .PHONY: changelog
 changelog:
@@ -488,12 +491,18 @@ prepare-e2e-kuttl-tests: build docker build-assert-job
 
 # end-to-tests
 .PHONY: kuttl-e2e
-kuttl-e2e: prepare-e2e-kuttl-tests run-kuttl-e2e
+kuttl-e2e: prepare-e2e-kuttl-tests start-kind run-kuttl-e2e
 
 .PHONY: run-kuttl-e2e
 run-kuttl-e2e:
 	$(KUTTL) test
 
+start-kind: 
+	kind create cluster --config $(KIND_CONFIG)
+	kind load docker-image local/jaeger-operator:e2e
+	kind load docker-image local/asserts:e2e
+	kind load docker-image jaegertracing/vertx-create-span:operator-e2e-tests
+
 .PHONY: build-assert-job
 build-assert-job:
 	@docker build -t local/asserts:e2e  -f Dockerfile.asserts .

README.md

@@ -50,6 +50,26 @@ In this example, the Jaeger UI is available at http://192.168.122.34.
 
 The official documentation for the Jaeger Operator, including all its customization options, are available under the main [Jaeger Documentation](https://www.jaegertracing.io/docs/latest/operator/).
 
+## Compatibility matrix
+
+### Jaeger Operator vs. Jaeger
+
+The Jaeger Operator follows the same versioning as the operand (Jaeger) up to the minor part of the version. For example, the Jaeger Operator v1.22.2 tracks Jaeger 1.22.0. The patch part of the version indicates the patch level of the operator itself, not that of Jaeger. Whenever a new patch version is released for Jaeger, we'll release a new patch version of the operator.
+
+### Jaeger Operator vs. Kubernetes
+
+We strive to be compatible with the widest range of Kubernetes versions as possible, but some changes to Kubernetes itself require us to break compatibility with older Kubernetes versions, be it because of code imcompatibilities, or in the name of maintainability.
+
+Our promise is that we'll follow what's common practice in the Kubernetes world and support N-2 versions, based on the release date of the Jaeger Operator.
+
+For instance, when we released v1.22.0, the latest Kubernetes version was v1.20.5. As such, the minimum version of Kubernetes we support for Jaeger Operator v1.22.0 is v1.18 and we tested it with up to 1.20.
+
+The Jaeger Operator *might* work on versions outside of the given range, but when opening new issues, please make sure to test your scenario on a supported version.
+
+| Jaeger Operator | Kubernetes           |
+|-----------------|----------------------|
+| v1.23           | v1.19+               |
+| v1.22           | v1.18 to v1.20       |
 
 ## (experimental) Generate Kubernetes manifest file
 

RELEASE.md

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

build/Dockerfile

@@ -1,4 +1,4 @@
-FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.14 as builder
+FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.16 as builder
 
 ARG JAEGER_VERSION
 ENV JAEGER_VERSION=${JAEGER_VERSION}