diff --git a/.github/workflows/operator.yml b/.github/workflows/operator.yml index ddb858d22..cf7c169fe 100644 --- a/.github/workflows/operator.yml +++ b/.github/workflows/operator.yml @@ -13,7 +13,7 @@ on: # yamllint disable-line rule:truthy workflow_dispatch: env: - GO_VERSION: "1.22" + GO_VERSION: "1.23" KIND_VERSION: "0.25.0" GO111MODULE: "on" OPERATOR_IMAGE: "quay.io/backube/volsync" diff --git a/CHANGELOG.md b/CHANGELOG.md index 15a72268b..0400663ca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed +- Updated release to build on golang 1.23 - Syncthing updated to v1.29.2 - kube-rbac-proxy image configurable in helm chart values - mover scripts updated to use sync -f to only sync the target filesystem at diff --git a/Dockerfile b/Dockerfile index db1be10e3..f7f8d3b46 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ ###################################################################### # Establish a common builder image for all golang-based images -FROM golang:1.22 AS golang-builder +FROM golang:1.23 AS golang-builder USER root WORKDIR /workspace # We don't vendor modules. Enforce that behavior diff --git a/Dockerfile.volsync-custom-scorecard-tests b/Dockerfile.volsync-custom-scorecard-tests index aa6e4be5c..89801b2b5 100644 --- a/Dockerfile.volsync-custom-scorecard-tests +++ b/Dockerfile.volsync-custom-scorecard-tests @@ -1,5 +1,5 @@ # Build the volsync-custom-scorecard-tests binary -FROM golang:1.22 as builder +FROM golang:1.23 as builder # Copy the go source COPY ./custom-scorecard-tests/. /workspace/ diff --git a/controllers/mover/syncthing/syncthing_test.go b/controllers/mover/syncthing/syncthing_test.go index 818e04ce0..377d43730 100644 --- a/controllers/mover/syncthing/syncthing_test.go +++ b/controllers/mover/syncthing/syncthing_test.go @@ -1894,7 +1894,8 @@ var _ = Describe("Syncthing utils", func() { cert, err := tls.X509KeyPair(certPEM.Bytes(), certKeyPEM.Bytes()) Expect(err).ToNot(HaveOccurred()) Expect(cert).ToNot(BeNil()) - Expect(cert.Leaf).To(BeNil()) + // cert.Leaf is now populated with golang 1.23 (https://pkg.go.dev/crypto/tls#X509KeyPair) + Expect(cert.Leaf).NotTo(BeNil()) Expect(cert.Certificate[0]).ToNot(BeNil()) Expect(cert.PrivateKey).ToNot(BeNil()) }) diff --git a/go.mod b/go.mod index c5c7ee58e..3b1cbcc3f 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/backube/volsync -go 1.22.0 +go 1.23.0 require ( github.com/dop251/diskrsync v1.3.0 diff --git a/helm/volsync/Chart.yaml b/helm/volsync/Chart.yaml index 59bf72780..372fc12a0 100644 --- a/helm/volsync/Chart.yaml +++ b/helm/volsync/Chart.yaml @@ -24,6 +24,8 @@ annotations: # https://artifacthub.io/docs/topics/annotations/helm/ # Changelog for current chart & app version # Kinds: added, changed, deprecated, removed, fixed, and security artifacthub.io/changes: | + - kind: changed + description: Updated release to build on golang 1.23 - kind: changed description: Syncthing updated to v1.29.2 - kind: changed