Skip to content

Commit

Permalink
Merge pull request #1539 from openshift-cherrypick-robot/cherry-pick-…
Browse files Browse the repository at this point in the history
…1536-to-release-0.12

[release-0.12] Golang 1.23
  • Loading branch information
openshift-merge-bot[bot] authored Feb 3, 2025
2 parents 1030db5 + 6e127b4 commit 9d2e4b7
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/operator.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.volsync-custom-scorecard-tests
Original file line number Diff line number Diff line change
@@ -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/
Expand Down
3 changes: 2 additions & 1 deletion controllers/mover/syncthing/syncthing_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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())
})
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/backube/volsync

go 1.22.0
go 1.23.0

require (
github.com/dop251/diskrsync v1.3.0
Expand Down
2 changes: 2 additions & 0 deletions helm/volsync/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 9d2e4b7

Please sign in to comment.