diff --git a/.github/workflows/base-checks.yaml b/.github/workflows/base-checks.yaml index 498c4fbb5..4607e7201 100644 --- 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 index 9533e372b..892bbfddd 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -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/release.yaml b/.github/workflows/release.yaml index 29412caf7..b66d8610d 100644 --- 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 index 1c9d9f597..15b966357 100644 --- 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/apis/v1/zz_generated.deepcopy.go b/apis/v1/zz_generated.deepcopy.go index a3d1b059a..d014c321b 100644 --- a/apis/v1/zz_generated.deepcopy.go +++ b/apis/v1/zz_generated.deepcopy.go @@ -1,5 +1,4 @@ //go:build !ignore_autogenerated -// +build !ignore_autogenerated // Code generated by controller-gen. DO NOT EDIT. diff --git a/bundle/manifests/jaeger-operator.clusterserviceversion.yaml b/bundle/manifests/jaeger-operator.clusterserviceversion.yaml index 776cb1171..7ad9bf23c 100644 --- a/bundle/manifests/jaeger-operator.clusterserviceversion.yaml +++ b/bundle/manifests/jaeger-operator.clusterserviceversion.yaml @@ -19,7 +19,7 @@ metadata: categories: Logging & Tracing certified: "false" containerImage: quay.io/jaegertracing/jaeger-operator:1.59.0 - createdAt: "2024-07-15T10:13:19Z" + createdAt: "2024-08-09T08:45:04Z" description: Provides tracing, monitoring and troubleshooting for microservices-based distributed systems operators.openshift.io/infrastructure-features: '["disconnected"]' diff --git a/bundle/manifests/jaegertracing.io_jaegers.yaml b/bundle/manifests/jaegertracing.io_jaegers.yaml index e11919bdc..ae090b85c 100644 --- 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 index 490372241..49bf6cd68 100644 --- 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/go.mod b/go.mod index e9ef475e9..bfe22f88b 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/jaegertracing/jaeger-operator -go 1.21 +go 1.22 require ( github.com/Masterminds/semver v1.5.0 diff --git a/hack/install/install-controller-gen.sh b/hack/install/install-controller-gen.sh index f989e6600..26581850e 100755 --- 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/pkg/kafka/v1beta2/zz_generated.deepcopy.go b/pkg/kafka/v1beta2/zz_generated.deepcopy.go index db3174b2c..fa97eeccc 100644 --- a/pkg/kafka/v1beta2/zz_generated.deepcopy.go +++ b/pkg/kafka/v1beta2/zz_generated.deepcopy.go @@ -1,5 +1,4 @@ //go:build !ignore_autogenerated -// +build !ignore_autogenerated // Code generated by controller-gen. DO NOT EDIT.