Skip to content

Commit c1f2acf

Browse files
1gtmishtiaqhimel
andauthored
Use Go 1.23 (#1574)
* Use Go 1.23 /cherry-pick Signed-off-by: 1gtm <1gtm@appscode.com> * Fix linter issue Signed-off-by: Md. Ishtiaq Islam <ishtiaq@appscode.com> --------- Signed-off-by: 1gtm <1gtm@appscode.com> Signed-off-by: Md. Ishtiaq Islam <ishtiaq@appscode.com> Co-authored-by: Md. Ishtiaq Islam <ishtiaq@appscode.com>
1 parent 6747863 commit c1f2acf

File tree

9 files changed

+15
-17
lines changed

9 files changed

+15
-17
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ concurrency:
1717
jobs:
1818
build:
1919
name: Build
20-
runs-on: ubuntu-20.04
20+
runs-on: ubuntu-24.04
2121
steps:
22-
- name: Set up Go 1.22
22+
- name: Set up Go 1.23
2323
uses: actions/setup-go@v1
2424
with:
25-
go-version: '1.22'
25+
go-version: '1.23'
2626
id: go
2727

2828
- name: Check out code into the Go module directory

.github/workflows/e2e.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ concurrency:
1818
jobs:
1919
build:
2020
if: contains(github.event.issue.html_url, '/pull/') && startsWith(github.event.comment.body, '/ok-to-test')
21-
runs-on: ubuntu-20.04
21+
runs-on: ubuntu-24.04
2222
steps:
2323
- uses: actions/checkout@v1
2424

@@ -52,7 +52,7 @@ jobs:
5252
make push
5353
5454
config:
55-
runs-on: ubuntu-20.04
55+
runs-on: ubuntu-24.04
5656
needs: build
5757
outputs:
5858
matrix: ${{ steps.set-matrix.outputs.matrix }}
@@ -82,7 +82,7 @@ jobs:
8282
kubernetes:
8383
name: Kubernetes
8484
needs: config
85-
runs-on: ubuntu-20.04
85+
runs-on: ubuntu-24.04
8686
strategy:
8787
matrix: ${{ fromJson(needs.config.outputs.matrix) }}
8888
steps:

.github/workflows/release-tracker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ concurrency:
1212

1313
jobs:
1414
build:
15-
runs-on: ubuntu-20.04
15+
runs-on: ubuntu-24.04
1616

1717
steps:
1818
- uses: actions/checkout@v1

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ concurrency:
1414
jobs:
1515
build:
1616
name: Build
17-
runs-on: ubuntu-20.04
17+
runs-on: ubuntu-24.04
1818
steps:
1919
- uses: actions/checkout@v1
2020

.github/workflows/update-docs.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ concurrency:
1414
jobs:
1515
build:
1616
name: Build
17-
runs-on: ubuntu-20.04
17+
runs-on: ubuntu-24.04
1818
steps:
19-
- name: Set up Go 1.22
19+
- name: Set up Go 1.23
2020
uses: actions/setup-go@v1
2121
with:
22-
go-version: '1.22'
22+
go-version: '1.23'
2323
id: go
2424

2525
- uses: actions/checkout@v1

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ TAG := $(VERSION)_$(OS)_$(ARCH)
7272
TAG_PROD := $(TAG)
7373
TAG_DBG := $(VERSION)-dbg_$(OS)_$(ARCH)
7474

75-
GO_VERSION ?= 1.22
75+
GO_VERSION ?= 1.23
7676
BUILD_IMAGE ?= ghcr.io/appscode/golang-dev:$(GO_VERSION)
7777
TEST_IMAGE ?= ghcr.io/appscode/golang-dev:$(GO_VERSION)-stash
7878

pkg/cmds/create_volumesnapshot.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -231,8 +231,7 @@ func (opt *VSoption) createVolumeSnapshot(bsMeta metav1.ObjectMeta, inv invoker.
231231
}
232232
err := prober.RunProbe(opt.config, targetInfo.Hooks.PostBackup.Handler, podName, opt.namespace)
233233
if err != nil {
234-
return nil, fmt.Errorf(err.Error() + "Warning: The actual backup process may be succeeded." +
235-
"Hence, the backup snapshots might be present in the backend even if the overall BackupSession phase is 'Failed'")
234+
return nil, fmt.Errorf("%w Warning: The actual backup process may be succeeded. Hence, the backup snapshots might be present in the backend even if the overall BackupSession phase is 'Failed'", err)
236235
}
237236
backupOutput.BackupTargetStatus.Conditions = append(backupOutput.BackupTargetStatus.Conditions, kmapi.Condition{
238237
Type: api_v1beta1.PostBackupHookExecutionSucceeded,

pkg/cmds/restore_volumesnapshot.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -254,8 +254,7 @@ func (opt *VSoption) restoreVolumeSnapshot(targetInfo invoker.RestoreTargetInfo)
254254
}
255255
err := prober.RunProbe(opt.config, targetInfo.Hooks.PostRestore.Handler, podName, opt.namespace)
256256
if err != nil {
257-
return nil, fmt.Errorf(err.Error() + "Warning: The actual restore process may be succeeded." +
258-
"Hence, the restored data might be present in the target even if the overall RestoreSession phase is 'Failed'")
257+
return nil, fmt.Errorf("%w Warning: The actual restore process may be succeeded. Hence, the restored data might be present in the target even if the overall RestoreSession phase is 'Failed'", err)
259258
}
260259
klog.Infoln("postRestore hooks has been executed successfully")
261260
}

test/e2e/framework/minio_server.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ func (f *Framework) SecretForMinioServer(ips []net.IP) core.Secret {
108108

109109
return core.Secret{
110110
ObjectMeta: metav1.ObjectMeta{
111-
Name: fmt.Sprintf(MinioServerSecret + f.namespace),
111+
Name: MinioServerSecret + f.namespace,
112112
Namespace: f.namespace,
113113
},
114114
Data: map[string][]byte{

0 commit comments

Comments
 (0)