Merge branch 'main' into add-support-for-kafka-secrets

jaegertracing · Jun 1, 2022 · 6555594 · 6555594
2 parents f45cca3 + 635c7be
commit 6555594
Show file tree

Hide file tree

Showing 53 changed files with 627 additions and 183 deletions.
diff --git a/.ci/prepare-release.sh b/.ci/prepare-release.sh
@@ -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
diff --git a/.github/workflows/publish-images.yaml b/.github/workflows/publish-images.yaml
@@ -14,7 +14,7 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - uses: docker/[email protected]
-    - uses: docker/setup-buildx-action@v1.7.0
+    - uses: docker/setup-buildx-action@v2.0.0
     - name: "publishes the images"
       env:
         DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -25,7 +25,7 @@ jobs:
       run: ./hack/install/install-kustomize.sh
 
     - uses: docker/[email protected]
-    - uses: docker/setup-buildx-action@v1.7.0
+    - uses: docker/setup-buildx-action@v2.0.0
 
     - name: "generate release resources"
       run: make release-artifacts USER=jaegertracing

diff --git a/.gitignore b/.gitignore
@@ -6,6 +6,7 @@ vendor
 bin
 tests/_build
 _build
+logs
 # Created by https://www.gitignore.io/api/go,vim,emacs,visualstudiocode
 ### Emacs ###
 # -*- mode: gitignore; -*-
@@ -92,5 +93,6 @@ bin
 ### Timestamp files to avoid rebuilding Docker images if not needed ###
 build-assert-job
 docker-e2e-upgrade-image
+build-e2e-upgrade-image
 ### Reports for E2E tests
 reports
diff --git a/Makefile b/Makefile
@@ -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"
@@ -60,7 +60,7 @@ LD_FLAGS ?= "-X $(VERSION_PKG).version=$(VERSION) -X $(VERSION_PKG).buildDate=$(
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
 ENVTEST_K8S_VERSION = 1.22
 # Options for kuttl testing
-KUBE_VERSION ?= 1.20
+export KUBE_VERSION ?= 1.20
 KIND_CONFIG ?= kind-$(KUBE_VERSION).yaml
 
 SCORECARD_TEST_IMG ?= quay.io/operator-framework/scorecard-test:v$(OPERATOR_SDK_VERSION)
@@ -129,7 +129,7 @@ build: format
 
 .PHONY: docker
 docker:
-	$(VECHO)[ ! -z "$(PIPELINE)" ] || docker build --build-arg=GOPROXY=${GOPROXY} --build-arg=JAEGER_VERSION=${JAEGER_VERSION} --build-arg=TARGETARCH=$(GOARCH) --build-arg VERSION_DATE=${VERSION_DATE}  --build-arg VERSION_PKG=${VERSION_PKG} -t "$(IMG)" . ${DOCKER_BUILD_OPTIONS}
+	$(VECHO)[ ! -z "$(PIPELINE)" ] || docker build --build-arg=GOPROXY=${GOPROXY} --build-arg=VERSION=${VERSION} --build-arg=JAEGER_VERSION=${JAEGER_VERSION} --build-arg=TARGETARCH=$(GOARCH) --build-arg VERSION_DATE=${VERSION_DATE}  --build-arg VERSION_PKG=${VERSION_PKG} -t "$(IMG)" . ${DOCKER_BUILD_OPTIONS}
 
 .PHONY: dockerx
 dockerx:
@@ -312,6 +312,7 @@ uninstall: manifests kustomize ## Uninstall CRDs from the K8s cluster specified
 
 .PHONY: deploy
 deploy: manifests kustomize ## Deploy controller to the K8s cluster specified in ~/.kube/config.
+	kubectl create namespace observability 2>&1 | grep -v "already exists" || true
 	cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG}
 	$(KUSTOMIZE) build config/default | kubectl apply -f -
 

diff --git a/...le/manifests/jaeger-operator-metrics-reader_rbac.authorization.k8s.io_v1_clusterrole.yaml b/...le/manifests/jaeger-operator-metrics-reader_rbac.authorization.k8s.io_v1_clusterrole.yaml
@@ -3,7 +3,6 @@ kind: ClusterRole
 metadata:
   creationTimestamp: null
   labels:
-    app.kubernetes.io/name: jaeger-operator
     name: jaeger-operator
   name: jaeger-operator-metrics-reader
 rules:

diff --git a/bundle/manifests/jaeger-operator-metrics_v1_service.yaml b/bundle/manifests/jaeger-operator-metrics_v1_service.yaml
@@ -4,7 +4,6 @@ metadata:
   creationTimestamp: null
   labels:
     app.kubernetes.io/component: metrics
-    app.kubernetes.io/name: jaeger-operator
     name: jaeger-operator
   name: jaeger-operator-metrics
 spec:
@@ -14,7 +13,6 @@ spec:
     protocol: TCP
     targetPort: https
   selector:
-    app.kubernetes.io/name: jaeger-operator
     name: jaeger-operator
 status:
   loadBalancer: {}
diff --git a/bundle/manifests/jaeger-operator-webhook-service_v1_service.yaml b/bundle/manifests/jaeger-operator-webhook-service_v1_service.yaml
@@ -3,7 +3,6 @@ kind: Service
 metadata:
   creationTimestamp: null
   labels:
-    app.kubernetes.io/name: jaeger-operator
     name: jaeger-operator
   name: jaeger-operator-webhook-service
 spec:
@@ -12,7 +11,6 @@ spec:
     protocol: TCP
     targetPort: 9443
   selector:
-    app.kubernetes.io/name: jaeger-operator
     name: jaeger-operator
 status:
   loadBalancer: {}
diff --git a/bundle/manifests/jaeger-operator.clusterserviceversion.yaml b/bundle/manifests/jaeger-operator.clusterserviceversion.yaml
@@ -376,13 +376,11 @@ spec:
           replicas: 1
           selector:
             matchLabels:
-              app.kubernetes.io/name: jaeger-operator
               name: jaeger-operator
           strategy: {}
           template:
             metadata:
               labels:
-                app.kubernetes.io/name: jaeger-operator
                 name: jaeger-operator
             spec:
               containers:
@@ -532,7 +530,7 @@ spec:
     generateName: deployment.sidecar-injector.jaegertracing.io
     objectSelector:
       matchExpressions:
-      - key: app.kubernetes.io/name
+      - key: name
         operator: NotIn
         values:
         - jaeger-operator

diff --git a/bundle/manifests/jaegertracing.io_jaegers.yaml b/bundle/manifests/jaegertracing.io_jaegers.yaml
@@ -6,7 +6,6 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.8.0
   creationTimestamp: null
   labels:
-    app.kubernetes.io/name: jaeger-operator
     name: jaeger-operator
   name: jaegers.jaegertracing.io
 spec:

diff --git a/bundle/manifests/prometheus_rbac.authorization.k8s.io_v1_role.yaml b/bundle/manifests/prometheus_rbac.authorization.k8s.io_v1_role.yaml
@@ -6,7 +6,6 @@ metadata:
     include.release.openshift.io/single-node-developer: "true"
   creationTimestamp: null
   labels:
-    app.kubernetes.io/name: jaeger-operator
     name: jaeger-operator
   name: prometheus
 rules:

diff --git a/bundle/manifests/prometheus_rbac.authorization.k8s.io_v1_rolebinding.yaml b/bundle/manifests/prometheus_rbac.authorization.k8s.io_v1_rolebinding.yaml
@@ -6,7 +6,6 @@ metadata:
     include.release.openshift.io/single-node-developer: "true"
   creationTimestamp: null
   labels:
-    app.kubernetes.io/name: jaeger-operator
     name: jaeger-operator
   name: prometheus
 roleRef:

diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml
@@ -15,7 +15,6 @@ namespace: observability
 # https://kubernetes.io/docs/concepts/overview/working-with-objects/common-labels/#labels
 commonLabels:
   name: jaeger-operator
-  app.kubernetes.io/name: jaeger-operator
 
 bases:
 - ../crd

diff --git a/config/webhook/deployment_inject_patch.yaml b/config/webhook/deployment_inject_patch.yaml
@@ -6,7 +6,7 @@ webhooks:
   - name: deployment.sidecar-injector.jaegertracing.io
     objectSelector: # Skip resources with the name jaeger-operator
       matchExpressions:
-        - key: app.kubernetes.io/name
+        - key: name
           operator: NotIn
           values:
             - "jaeger-operator"
diff --git a/controllers/appsv1/deployment_webhook.go b/controllers/appsv1/deployment_webhook.go
@@ -73,7 +73,7 @@ func (d *deploymentInterceptor) Handle(ctx context.Context, req admission.Reques
 
 	if dep.Labels["app"] == "jaeger" && dep.Labels["app.kubernetes.io/component"] != "query" {
 		// Don't touch jaeger deployments
-		return admission.Allowed("is jeager deployment, we do not touch it")
+		return admission.Allowed("is jaeger deployment, we do not touch it")
 
 	}
 

diff --git a/controllers/appsv1/deployment_webhook_test.go b/controllers/appsv1/deployment_webhook_test.go
@@ -243,7 +243,7 @@ func TestReconcilieDeployment(t *testing.T) {
 				AdmissionResponse: admissionv1.AdmissionResponse{
 					Allowed: true,
 					Result: &metav1.Status{
-						Reason: "is jeager deployment, we do not touch it",
+						Reason: "is jaeger deployment, we do not touch it",
 						Code:   200,
 					},
 				},

diff --git 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.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:

diff --git 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.17.0  # The agent version should match the operator version
+          image: jaegertracing/jaeger-agent:1.34.1
           imagePullPolicy: IfNotPresent
           ports:
             - containerPort: 5775

diff --git a/examples/tracegen.yaml b/examples/tracegen.yaml
@@ -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:

diff --git a/go.mod b/go.mod
@@ -4,6 +4,7 @@ go 1.17
 
 require (
 	github.com/Masterminds/semver v1.5.0
+	github.com/google/go-cmp v0.5.8
 	github.com/googleapis/gnostic v0.5.5
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/openshift/api v0.0.0-20210713130143-be21c6cb1bea
@@ -15,7 +16,7 @@ require (
 	github.com/sirupsen/logrus v1.8.1
 	github.com/spf13/cobra v1.4.0
 	github.com/spf13/pflag v1.0.5
-	github.com/spf13/viper v1.10.1
+	github.com/spf13/viper v1.12.0
 	github.com/stretchr/testify v1.7.1
 	github.com/uber/jaeger-client-go v2.30.0+incompatible
 	go.opentelemetry.io/otel v0.20.0
@@ -39,49 +40,49 @@ require (
 	github.com/cespare/xxhash/v2 v2.1.2 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/evanphx/json-patch v4.12.0+incompatible // indirect
-	github.com/fsnotify/fsnotify v1.5.1 // indirect
+	github.com/fsnotify/fsnotify v1.5.4 // indirect
 	github.com/go-logr/logr v1.2.0 // indirect
 	github.com/go-logr/zapr v1.2.0 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.2 // indirect
-	github.com/google/go-cmp v0.5.6 // indirect
 	github.com/google/gofuzz v1.1.0 // indirect
 	github.com/google/uuid v1.1.2 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/imdario/mergo v0.3.12 // indirect
 	github.com/inconshreveable/mousetrap v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/magiconair/properties v1.8.5 // indirect
+	github.com/magiconair/properties v1.8.6 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
-	github.com/mitchellh/mapstructure v1.4.3 // indirect
+	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/pelletier/go-toml v1.9.4 // indirect
+	github.com/pelletier/go-toml v1.9.5 // indirect
+	github.com/pelletier/go-toml/v2 v2.0.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/prometheus/client_model v0.2.0 // indirect
 	github.com/prometheus/common v0.32.1 // indirect
 	github.com/prometheus/procfs v0.7.3 // indirect
-	github.com/spf13/afero v1.6.0 // indirect
-	github.com/spf13/cast v1.4.1 // indirect
+	github.com/spf13/afero v1.8.2 // indirect
+	github.com/spf13/cast v1.5.0 // indirect
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
-	github.com/subosito/gotenv v1.2.0 // indirect
+	github.com/subosito/gotenv v1.3.0 // indirect
 	github.com/uber/jaeger-lib v2.2.0+incompatible // indirect
 	go.uber.org/atomic v1.7.0 // indirect
 	go.uber.org/multierr v1.6.0 // indirect
 	go.uber.org/zap v1.19.1 // indirect
-	golang.org/x/net v0.0.0-20211209124913-491a49abca63 // indirect
-	golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
-	golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect
-	golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b // indirect
+	golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2 // indirect
+	golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 // indirect
+	golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect
+	golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
 	golang.org/x/text v0.3.7 // indirect
 	golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
 	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/protobuf v1.27.1 // indirect
+	google.golang.org/protobuf v1.28.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
-	gopkg.in/ini.v1 v1.66.2 // indirect
+	gopkg.in/ini.v1 v1.66.4 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
-	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
+	gopkg.in/yaml.v3 v3.0.0 // indirect
 	k8s.io/apiextensions-apiserver v0.23.5 // indirect
 	k8s.io/component-base v0.23.5 // indirect
 	k8s.io/klog/v2 v2.30.0 // indirect