Skip to content

Commit 14b481a

Browse files
Merge pull request #1536 from tesshuflower/golang_1.23
Golang 1.23
2 parents 9dc08b2 + 06dc308 commit 14b481a

File tree

7 files changed

+9
-5
lines changed

7 files changed

+9
-5
lines changed

.github/workflows/operator.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ on: # yamllint disable-line rule:truthy
1313
workflow_dispatch:
1414

1515
env:
16-
GO_VERSION: "1.22"
16+
GO_VERSION: "1.23"
1717
KIND_VERSION: "0.25.0"
1818
GO111MODULE: "on"
1919
OPERATOR_IMAGE: "quay.io/backube/volsync"

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
99

1010
### Changed
1111

12+
- Updated release to build on golang 1.23
1213
- Syncthing updated to v1.29.2
1314
- kube-rbac-proxy image configurable in helm chart values
1415
- mover scripts updated to use sync -f to only sync the target filesystem at

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
######################################################################
22
# Establish a common builder image for all golang-based images
3-
FROM golang:1.22 AS golang-builder
3+
FROM golang:1.23 AS golang-builder
44
USER root
55
WORKDIR /workspace
66
# We don't vendor modules. Enforce that behavior

Dockerfile.volsync-custom-scorecard-tests

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the volsync-custom-scorecard-tests binary
2-
FROM golang:1.22 as builder
2+
FROM golang:1.23 as builder
33

44
# Copy the go source
55
COPY ./custom-scorecard-tests/. /workspace/

controllers/mover/syncthing/syncthing_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1894,7 +1894,8 @@ var _ = Describe("Syncthing utils", func() {
18941894
cert, err := tls.X509KeyPair(certPEM.Bytes(), certKeyPEM.Bytes())
18951895
Expect(err).ToNot(HaveOccurred())
18961896
Expect(cert).ToNot(BeNil())
1897-
Expect(cert.Leaf).To(BeNil())
1897+
// cert.Leaf is now populated with golang 1.23 (https://pkg.go.dev/crypto/tls#X509KeyPair)
1898+
Expect(cert.Leaf).NotTo(BeNil())
18981899
Expect(cert.Certificate[0]).ToNot(BeNil())
18991900
Expect(cert.PrivateKey).ToNot(BeNil())
19001901
})

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/backube/volsync
22

3-
go 1.22.0
3+
go 1.23.0
44

55
require (
66
github.com/dop251/diskrsync v1.3.0

helm/volsync/Chart.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ annotations: # https://artifacthub.io/docs/topics/annotations/helm/
2424
# Changelog for current chart & app version
2525
# Kinds: added, changed, deprecated, removed, fixed, and security
2626
artifacthub.io/changes: |
27+
- kind: changed
28+
description: Updated release to build on golang 1.23
2729
- kind: changed
2830
description: Syncthing updated to v1.29.2
2931
- kind: changed

0 commit comments

Comments
 (0)