Merge pull request jaegertracing#33 from IshwarKanse/rebase-bot-main

Merge https://github.com/jaegertracing/jaeger-operator:main (15d2127) into main
IshwarKanse · Aug 15, 2024 · 2e0a4f3 · 2e0a4f3
2 parents 920a540 + 09e555a
commit 2e0a4f3
Show file tree

Hide file tree

Showing 24 changed files with 86 additions and 62 deletions.
diff --git a/.github/workflows/base-checks.yaml b/.github/workflows/base-checks.yaml
@@ -25,7 +25,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
       with:
-        go-version: "1.21"
+        go-version: "1.22"
 
     - name: "install kubebuilder"
       run: ./hack/install/install-kubebuilder.sh

diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
@@ -25,7 +25,7 @@ jobs:
       matrix:
        kube-version:
          - "1.19"
-         - "1.28"
+         - "1.30"
        testsuite:
          - { name: "elasticsearch", label: "Elasticsearch" }
          - { name: "examples", label: "Examples" }
@@ -43,7 +43,7 @@ jobs:
       - name: "Set up Go"
         uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
         with:
-          go-version: "1.21"
+          go-version: "1.22"
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@988b5a0280414f521da01fcc63a27aeeb4b104db # v3.6.1
         with:

diff --git a/.github/workflows/ossf-scorecard.yml b/.github/workflows/ossf-scorecard.yml
@@ -32,7 +32,7 @@ jobs:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@dc50aa9510b46c811795eb24b2f1ba02a914e534 # v2.3.3
+        uses: ossf/scorecard-action@62b2cac7ed8198b15735ed49ab1e5cf35480ba46 # v2.4.0
         with:
           results_file: results.sarif
           results_format: sarif
@@ -41,7 +41,7 @@ jobs:
       # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
       # format to the repository Actions tab.
       - name: "Upload artifact"
-        uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029 # v4.3.5
+        uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6
         with:
           name: SARIF file
           path: results.sarif

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -14,7 +14,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
       with:
-        go-version: "1.21"
+        go-version: "1.22"
 
     - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 

diff --git a/.golangci.yml b/.golangci.yml
@@ -13,7 +13,7 @@ linters-settings:
   goimports:
     local-prefixes: github.com/jaegertracing/jaeger-operator
   gosimple:
-    go: "1.21"
+    go: "1.22"
 
 linters:
   enable:
@@ -29,5 +29,5 @@ linters:
     - errcheck
 
 run:
-  go: '1.21'
+  go: '1.22'
   timeout: 10m
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,14 @@
 Changes by Version
 ==================
-## v1.58.0 (2024-05-06)
+
+## v1.60.0 (2024-08-13)
+* Fix Golang version in go.mod ([#2652](https://github.com/jaegertracing/jaeger-operator/pull/2652), [@iblancasa](https://github.com/iblancasa))
+
+## v1.60.0 (2024-08-09)
+* Test on k8s 1.30 ([#2647](https://github.com/jaegertracing/jaeger-operator/pull/2647), [@pavolloffay](https://github.com/pavolloffay))
+* Bump go to 1.22 and controller-gen to 1.14 ([#2646](https://github.com/jaegertracing/jaeger-operator/pull/2646), [@pavolloffay](https://github.com/pavolloffay))
+
+## v1.59.0 (2024-08-06)
 * Update compatibility matrix for v1.57.x ([#2594](https://github.com/jaegertracing/jaeger-operator/pull/2594), [@mooneeb](https://github.com/mooneeb))
 * imagePullSecrets is not set for agent DaemonSet ([#2563](https://github.com/jaegertracing/jaeger-operator/pull/2563), [@antoniomerlin](https://github.com/antoniomerlin))
 

diff --git a/COMPATIBILITY.md b/COMPATIBILITY.md
@@ -1,32 +1,32 @@
 The following table shows the compatibility of Jaeger Operator with three different components: Kubernetes, Strimzi Operator, and Cert-Manager.
 
-| Jaeger Operator | Kubernetes      | Strimzi Operator   | Cert-Manager |
-|-----------------|-----------------|--------------------|--------------|
-| v1.59.x         | v1.19 to v1.28  | v0.32              | v1.6.1       |
-| v1.58.x         | skipped         | skipped            | skipped      |
-| v1.57.x         | v1.19 to v1.28  | v0.32              | v1.6.1       |
-| v1.56.x         | v1.19 to v1.28  | v0.32              | v1.6.1       |
-| v1.55.x         | v1.19 to v1.28  | v0.32              | v1.6.1       |
-| v1.54.x         | v1.19 to v1.28  | v0.32              | v1.6.1       |
-| v1.53.x         | v1.19 to v1.28  | v0.32              | v1.6.1       |
-| v1.52.x         | v1.19 to v1.28  | v0.32              | v1.6.1       |
-| v1.51.x         | v1.19 to v1.28  | v0.32              | v1.6.1       |
-| v1.50.x         | v1.19 to v1.28  | v0.32              | v1.6.1       |
-| v1.49.x         | v1.19 to v1.28  | v0.32              | v1.6.1       |
-| v1.48.x         | v1.19 to v1.27  | v0.32              | v1.6.1       |
-| v1.47.x         | v1.19 to v1.27  | v0.32              | v1.6.1       |
-| v1.46.x         | v1.19 to v1.26  | v0.32              | v1.6.1       |
-| v1.45.x         | v1.19 to v1.26  | v0.32              | v1.6.1       |
-| v1.44.x         | v1.19 to v1.26  | v0.32              | v1.6.1       |
-| v1.43.x         | v1.19 to v1.26  | v0.32              | v1.6.1       |
-| v1.42.x         | v1.19 to v1.26  | v0.32              | v1.6.1       |
-| v1.41.x         | v1.19 to v1.25  | v0.30              | v1.6.1       |
-| v1.40.x         | v1.19 to v1.25  | v0.30              | v1.6.1       |
-| v1.39.x         | v1.19 to v1.25  | v0.30              | v1.6.1       |
-| v1.38.x         | v1.19 to v1.25  | v0.30              | v1.6.1       |
-| v1.37.x         | v1.19 to v1.24  | v0.23              | v1.6.1       |
-| v1.36.x         | v1.19 to v1.24  | v0.23              | v1.6.1       |
-| v1.35.x         | v1.19 to v1.24  | v0.23              | v1.6.1       |
-| v1.34.x         | v1.19 to v1.24  | v0.23              | v1.6.1       |
-| v1.33.x         | v1.19 to v1.23  | v0.23              | v1.6.1       |
-| v1.32.x         | v1.19 to v1.22  | v0.23              | v1.6.1       |
+| Jaeger Operator | Kubernetes     | Strimzi Operator   | Cert-Manager |
+|-----------------|----------------|--------------------|--------------|
+| v1.60.x         | v1.19 to v1.30 | v0.32              | v1.6.1       |
+| v1.59.x         | v1.19 to v1.28 | v0.32              | v1.6.1       |
+| v1.58.x         | skipped        | skipped            | skipped      |
+| v1.57.x         | v1.19 to v1.28 | v0.32              | v1.6.1       |
+| v1.56.x         | v1.19 to v1.28 | v0.32              | v1.6.1       |
+| v1.55.x         | v1.19 to v1.28 | v0.32              | v1.6.1       |
+| v1.54.x         | v1.19 to v1.28 | v0.32              | v1.6.1       |
+| v1.53.x         | v1.19 to v1.28 | v0.32              | v1.6.1       |
+| v1.52.x         | v1.19 to v1.28 | v0.32              | v1.6.1       |
+| v1.51.x         | v1.19 to v1.28 | v0.32              | v1.6.1       |
+| v1.50.x         | v1.19 to v1.28 | v0.32              | v1.6.1       |
+| v1.49.x         | v1.19 to v1.28 | v0.32              | v1.6.1       |
+| v1.48.x         | v1.19 to v1.27 | v0.32              | v1.6.1       |
+| v1.47.x         | v1.19 to v1.27 | v0.32              | v1.6.1       |
+| v1.46.x         | v1.19 to v1.26 | v0.32              | v1.6.1       |
+| v1.45.x         | v1.19 to v1.26 | v0.32              | v1.6.1       |
+| v1.44.x         | v1.19 to v1.26 | v0.32              | v1.6.1       |
+| v1.43.x         | v1.19 to v1.26 | v0.32              | v1.6.1       |
+| v1.42.x         | v1.19 to v1.26 | v0.32              | v1.6.1       |
+| v1.41.x         | v1.19 to v1.25 | v0.30              | v1.6.1       |
+| v1.40.x         | v1.19 to v1.25 | v0.30              | v1.6.1       |
+| v1.39.x         | v1.19 to v1.25 | v0.30              | v1.6.1       |
+| v1.38.x         | v1.19 to v1.25 | v0.30              | v1.6.1       |
+| v1.37.x         | v1.19 to v1.24 | v0.23              | v1.6.1       |
+| v1.36.x         | v1.19 to v1.24 | v0.23              | v1.6.1       |
+| v1.35.x         | v1.19 to v1.24 | v0.23              | v1.6.1       |
+| v1.34.x         | v1.19 to v1.24 | v0.23              | v1.6.1       |
+| v1.33.x         | v1.19 to v1.23 | v0.23              | v1.6.1       |
diff --git a/Makefile b/Makefile
@@ -85,9 +85,9 @@ 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 ?= $(LOCALBIN)/setup-envtest
-ENVTEST_K8S_VERSION = 1.27
+ENVTEST_K8S_VERSION = 1.30
 # Options for KIND version to use
-export KUBE_VERSION ?= 1.27
+export KUBE_VERSION ?= 1.30
 KIND_CONFIG ?= kind-$(KUBE_VERSION).yaml
 
 SCORECARD_TEST_IMG ?= quay.io/operator-framework/scorecard-test:v$(OPERATOR_SDK_VERSION)

diff --git a/RELEASE.md b/RELEASE.md
@@ -66,7 +66,7 @@ The operator should be released within a week after the [Jaeger release](https:/
 
 | Version | Release Manager                                          |
 |---------| -------------------------------------------------------- |
-| 1.60.0  | [Pavol Loffay](https://github.com/pavolloffay)           |
 | 1.61.0  | [Israel Blancas](https://github.com/iblancasa)           |
 | 1.62.0  | [Ruben Vargas](https://github.com/rubenvp8510)           |
 | 1.63.0  | [Benedikt Bongartz](https://github.com/frzifus)          |
+| 1.64.0  | [Pavol Loffay](https://github.com/pavolloffay)           |
diff --git a/apis/v1/zz_generated.deepcopy.go b/apis/v1/zz_generated.deepcopy.go
diff --git a/bundle/manifests/jaeger-operator.clusterserviceversion.yaml b/bundle/manifests/jaeger-operator.clusterserviceversion.yaml
@@ -19,15 +19,15 @@ metadata:
     categories: Logging & Tracing
     certified: "false"
     containerImage: quay.io/jaegertracing/jaeger-operator:1.59.0
-    createdAt: "2024-07-15T10:13:19Z"
+    createdAt: "2024-08-13T16:22:04Z"
     description: Provides tracing, monitoring and troubleshooting for microservices-based
       distributed systems
     operators.openshift.io/infrastructure-features: '["disconnected"]'
     operators.operatorframework.io/builder: operator-sdk-v1.32.0
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
     repository: https://github.com/jaegertracing/jaeger-operator
     support: Jaeger Community
-  name: jaeger-operator.v1.59.0
+  name: jaeger-operator.v1.60.1
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -414,7 +414,7 @@ spec:
                   value: DEBUG
                 - name: KAFKA-PROVISIONING-MINIMAL
                   value: "true"
-                image: quay.io/jaegertracing/jaeger-operator:1.59.0
+                image: quay.io/jaegertracing/jaeger-operator:1.60.1
                 livenessProbe:
                   httpGet:
                     path: /healthz
@@ -527,11 +527,11 @@ spec:
   minKubeVersion: 1.19.0
   provider:
     name: CNCF
-  replaces: jaeger-operator.v1.57.0
+  replaces: jaeger-operator.v1.60.0
   selector:
     matchLabels:
       name: jaeger-operator
-  version: 1.59.0
+  version: 1.60.1
   webhookdefinitions:
   - admissionReviewVersions:
     - v1

diff --git a/bundle/manifests/jaegertracing.io_jaegers.yaml b/bundle/manifests/jaegertracing.io_jaegers.yaml
@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     cert-manager.io/inject-ca-from: observability/jaeger-operator-serving-cert
-    controller-gen.kubebuilder.io/version: v0.12.0
+    controller-gen.kubebuilder.io/version: v0.14.0
   creationTimestamp: null
   labels:
     name: jaeger-operator

diff --git a/config/crd/bases/jaegertracing.io_jaegers.yaml b/config/crd/bases/jaegertracing.io_jaegers.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.12.0
+    controller-gen.kubebuilder.io/version: v0.14.0
   name: jaegers.jaegertracing.io
 spec:
   group: jaegertracing.io

diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
@@ -5,4 +5,4 @@ kind: Kustomization
 images:
 - name: controller
   newName: quay.io/jaegertracing/jaeger-operator
-  newTag: 1.59.0
+  newTag: 1.60.1
diff --git a/config/manifests/bases/jaeger-operator.clusterserviceversion.yaml b/config/manifests/bases/jaeger-operator.clusterserviceversion.yaml
@@ -125,7 +125,7 @@ spec:
   minKubeVersion: 1.19.0
   provider:
     name: CNCF
-  replaces: jaeger-operator.v1.57.0
+  replaces: jaeger-operator.v1.60.0
   selector:
     matchLabels:
       name: jaeger-operator

diff --git a/examples/all-in-one-with-options.yaml b/examples/all-in-one-with-options.yaml
@@ -5,7 +5,7 @@ metadata:
 spec:
   strategy: allInOne
   allInOne:
-    image: jaegertracing/all-in-one:1.59.0
+    image: jaegertracing/all-in-one:1.60.0
     options:
       log-level: debug
       query:

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.59.0
+        image: jaegertracing/jaeger-operator:1.60.1
         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.59.0
+        image: jaegertracing/jaeger-agent:1.60.0
         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.59.0
+          image: jaegertracing/jaeger-agent:1.60.0
           imagePullPolicy: IfNotPresent
           ports:
             - containerPort: 5775

diff --git a/examples/tracegen.yaml b/examples/tracegen.yaml
@@ -20,7 +20,7 @@ spec:
     spec:
       containers:
       - name: tracegen
-        image: jaegertracing/jaeger-tracegen:1.59.0
+        image: jaegertracing/jaeger-tracegen:1.60.0
         args:
         - -duration=30m
         - -workers=10

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/jaegertracing/jaeger-operator
 
-go 1.21
+go 1.22.0
 
 require (
 	github.com/Masterminds/semver v1.5.0

diff --git a/hack/install/install-controller-gen.sh b/hack/install/install-controller-gen.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-VERSION="0.12.0"
+VERSION="0.14.0"
 
 echo "Installing controller-gen"
 

diff --git a/kind-1.30.yaml b/kind-1.30.yaml
@@ -0,0 +1,18 @@
+kind: Cluster
+apiVersion: kind.x-k8s.io/v1alpha4
+nodes:
+- role: control-plane
+  image: kindest/node:v1.30.2@sha256:ecfe5841b9bee4fe9690f49c118c33629fa345e3350a0c67a5a34482a99d6bba
+  kubeadmConfigPatches:
+  - |
+    kind: InitConfiguration
+    nodeRegistration:
+      kubeletExtraArgs:
+        node-labels: "ingress-ready=true"
+  extraPortMappings:
+  - containerPort: 80
+    hostPort: 80
+    protocol: TCP
+  - containerPort: 443
+    hostPort: 443
+    protocol: TCP
diff --git a/pkg/kafka/v1beta2/zz_generated.deepcopy.go b/pkg/kafka/v1beta2/zz_generated.deepcopy.go
diff --git a/versions.txt b/versions.txt
@@ -1,7 +1,7 @@
 # The Jaeger version to use by default. This is updated manually. Make sure to update the changelog
 # and add an upgrade procedure (pkg/upgrade) for the new version.
-jaeger=1.59.0
+jaeger=1.60.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.59.0
+operator=1.60.1