Skip to content

Commit

Permalink
Bump go to 1.22 and controller-gen to 1.14 (#2646)
Browse files Browse the repository at this point in the history
* Bump go to 1.22

Signed-off-by: Pavol Loffay <p.loffay@gmail.com>

* Bump controller-gen

Signed-off-by: Pavol Loffay <p.loffay@gmail.com>

* Fix

Signed-off-by: Pavol Loffay <p.loffay@gmail.com>

---------

Signed-off-by: Pavol Loffay <p.loffay@gmail.com>
  • Loading branch information
pavolloffay committed Aug 9, 2024
1 parent 312a731 commit 3636f15
Show file tree
Hide file tree
Showing 11 changed files with 10 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/base-checks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ linters-settings:
goimports:
local-prefixes: github.com/jaegertracing/jaeger-operator
gosimple:
go: "1.21"
go: "1.22"

linters:
enable:
Expand All @@ -29,5 +29,5 @@ linters:
- errcheck

run:
go: '1.21'
go: '1.22'
timeout: 10m
1 change: 0 additions & 1 deletion apis/v1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -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"]'
Expand Down
2 changes: 1 addition & 1 deletion bundle/manifests/jaegertracing.io_jaegers.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/jaegertracing.io_jaegers.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/jaegertracing/jaeger-operator

go 1.21
go 1.22

require (
github.com/Masterminds/semver v1.5.0
Expand Down
2 changes: 1 addition & 1 deletion hack/install/install-controller-gen.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
VERSION="0.12.0"
VERSION="0.14.0"

echo "Installing controller-gen"

Expand Down
1 change: 0 additions & 1 deletion pkg/kafka/v1beta2/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 3636f15

Please sign in to comment.