Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to go 1.22 #711

Merged
merged 1 commit into from
Jun 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:

strategy:
matrix:
go: [ '1.20' ]
go: [ '1.22' ]

steps:
# Setup
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:

strategy:
matrix:
go-version: [ '1.20' ]
go-version: [ '1.22' ]
kube-version: [ 'v1.26.6' ]
solr-version: [ '9' ] # [ '8', '9' ]

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/smoke-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:

strategy:
matrix:
go: [ '1.20' ]
go: [ '1.22' ]

steps:
# Setup
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ ARCH = $(shell go env GOARCH)
TEST_PARALLELISM ?= 3

KUSTOMIZE_VERSION=v4.5.2
CONTROLLER_GEN_VERSION=v0.10.0
CONTROLLER_GEN_VERSION=v0.15.0
GO_LICENSES_VERSION=v1.6.0
GINKGO_VERSION = $(shell cat go.mod | grep 'github.com/onsi/ginkgo' | sed 's/.*\(v.*\)$$/\1/g')
KIND_VERSION=v0.20.0
KIND_VERSION=v0.23.0
YQ_VERSION=v4.33.3
CONTROLLER_RUNTIME_VERSION = $(shell cat go.mod | grep 'sigs.k8s.io/controller-runtime' | sed 's/.*\(v\(.*\)\.[^.]*\)$$/\2/g')
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
Expand Down
1 change: 0 additions & 1 deletion api/v1beta1/zz_generated.deepcopy.go

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

2 changes: 1 addition & 1 deletion build/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# limitations under the License.

# Build the manager binary
FROM golang:1.20 as builder
FROM golang:1.22 as builder

WORKDIR /workspace
ARG GO111MODULE=on
Expand Down
60 changes: 36 additions & 24 deletions config/crd/bases/solr.apache.org_solrbackups.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ metadata:
annotations:
operator.solr.apache.org/version: v0.9.0-prerelease
argocd.argoproj.io/sync-options: Replace=true
controller-gen.kubebuilder.io/version: v0.10.0
creationTimestamp: null
controller-gen.kubebuilder.io/version: v0.15.0
name: solrbackups.solr.apache.org
spec:
group: solr.apache.org
Expand Down Expand Up @@ -62,14 +61,19 @@ spec:
description: SolrBackup is the Schema for the solrbackups API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
description: |-
APIVersion defines the versioned schema of this representation of an object.
Servers should convert recognized schemas to the latest internal value, and
may reject unrecognized values.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
description: |-
Kind is a string value representing the REST resource this object represents.
Servers may infer this from the endpoint the client submits requests to.
Cannot be updated.
In CamelCase.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
type: string
metadata:
type: object
Expand All @@ -86,9 +90,11 @@ spec:
repository.
type: string
recurrence:
description: "Set this backup to be taken recurrently, with options
for scheduling and storage. \n NOTE: This is only supported for
Solr Clouds version 8.9+, as it uses the incremental backup API."
description: |-
Set this backup to be taken recurrently, with options for scheduling and storage.


NOTE: This is only supported for Solr Clouds version 8.9+, as it uses the incremental backup API.
properties:
disabled:
default: false
Expand All @@ -97,27 +103,33 @@ spec:
type: boolean
maxSaved:
default: 5
description: Define the number of backup points to save for this
backup at any given time. The oldest backups will be deleted
if too many exist when a backup is taken. If not provided, this
defaults to 5.
description: |-
Define the number of backup points to save for this backup at any given time.
The oldest backups will be deleted if too many exist when a backup is taken.
If not provided, this defaults to 5.
minimum: 1
type: integer
schedule:
description: "Perform a backup on the given schedule, in CRON
format. \n Multiple CRON syntaxes are supported - Standard CRON
(e.g. \"CRON_TZ=Asia/Seoul 0 6 * * ?\") - Predefined Schedules
(e.g. \"@yearly\", \"@weekly\", \"@daily\", etc.) - Intervals
(e.g. \"@every 10h30m\") \n For more information please check
this reference: https://pkg.go.dev/github.com/robfig/cron/v3?utm_source=godoc#hdr-CRON_Expression_Format"
description: |-
Perform a backup on the given schedule, in CRON format.


Multiple CRON syntaxes are supported
- Standard CRON (e.g. "CRON_TZ=Asia/Seoul 0 6 * * ?")
- Predefined Schedules (e.g. "@yearly", "@weekly", "@daily", etc.)
- Intervals (e.g. "@every 10h30m")


For more information please check this reference:
https://pkg.go.dev/github.com/robfig/cron/v3?utm_source=godoc#hdr-CRON_Expression_Format
type: string
required:
- schedule
type: object
repositoryName:
description: The name of the repository to use for the backup. Defaults
to "legacy_local_repository" if not specified (the auto-configured
repository for legacy singleton volumes).
description: |-
The name of the repository to use for the backup. Defaults to "legacy_local_repository" if not specified (the
auto-configured repository for legacy singleton volumes).
maxLength: 100
minLength: 1
pattern: '[a-zA-Z0-9]([-_a-zA-Z0-9]*[a-zA-Z0-9])?'
Expand Down
Loading
Loading