Skip to content

Commit

Permalink
Use Go 1.23 (#1574)
Browse files Browse the repository at this point in the history
* 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>
  • Loading branch information
1gtm and ishtiaqhimel authored Aug 20, 2024
1 parent 6747863 commit c1f2acf
Show file tree
Hide file tree
Showing 9 changed files with 15 additions and 17 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ concurrency:
jobs:
build:
name: Build
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
steps:
- name: Set up Go 1.22
- name: Set up Go 1.23
uses: actions/setup-go@v1
with:
go-version: '1.22'
go-version: '1.23'
id: go

- name: Check out code into the Go module directory
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ concurrency:
jobs:
build:
if: contains(github.event.issue.html_url, '/pull/') && startsWith(github.event.comment.body, '/ok-to-test')
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v1

Expand Down Expand Up @@ -52,7 +52,7 @@ jobs:
make push
config:
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
needs: build
outputs:
matrix: ${{ steps.set-matrix.outputs.matrix }}
Expand Down Expand Up @@ -82,7 +82,7 @@ jobs:
kubernetes:
name: Kubernetes
needs: config
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
strategy:
matrix: ${{ fromJson(needs.config.outputs.matrix) }}
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-tracker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ concurrency:

jobs:
build:
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04

steps:
- uses: actions/checkout@v1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ concurrency:
jobs:
build:
name: Build
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v1

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/update-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ concurrency:
jobs:
build:
name: Build
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
steps:
- name: Set up Go 1.22
- name: Set up Go 1.23
uses: actions/setup-go@v1
with:
go-version: '1.22'
go-version: '1.23'
id: go

- uses: actions/checkout@v1
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ TAG := $(VERSION)_$(OS)_$(ARCH)
TAG_PROD := $(TAG)
TAG_DBG := $(VERSION)-dbg_$(OS)_$(ARCH)

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

Expand Down
3 changes: 1 addition & 2 deletions pkg/cmds/create_volumesnapshot.go
Original file line number Diff line number Diff line change
Expand Up @@ -231,8 +231,7 @@ func (opt *VSoption) createVolumeSnapshot(bsMeta metav1.ObjectMeta, inv invoker.
}
err := prober.RunProbe(opt.config, targetInfo.Hooks.PostBackup.Handler, podName, opt.namespace)
if err != nil {
return nil, fmt.Errorf(err.Error() + "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'")
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)
}
backupOutput.BackupTargetStatus.Conditions = append(backupOutput.BackupTargetStatus.Conditions, kmapi.Condition{
Type: api_v1beta1.PostBackupHookExecutionSucceeded,
Expand Down
3 changes: 1 addition & 2 deletions pkg/cmds/restore_volumesnapshot.go
Original file line number Diff line number Diff line change
Expand Up @@ -254,8 +254,7 @@ func (opt *VSoption) restoreVolumeSnapshot(targetInfo invoker.RestoreTargetInfo)
}
err := prober.RunProbe(opt.config, targetInfo.Hooks.PostRestore.Handler, podName, opt.namespace)
if err != nil {
return nil, fmt.Errorf(err.Error() + "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'")
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)
}
klog.Infoln("postRestore hooks has been executed successfully")
}
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/framework/minio_server.go
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ func (f *Framework) SecretForMinioServer(ips []net.IP) core.Secret {

return core.Secret{
ObjectMeta: metav1.ObjectMeta{
Name: fmt.Sprintf(MinioServerSecret + f.namespace),
Name: MinioServerSecret + f.namespace,
Namespace: f.namespace,
},
Data: map[string][]byte{
Expand Down

0 comments on commit c1f2acf

Please sign in to comment.