Skip to content

Commit 4a2134f

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #1133 from haircommander/bump-1.27
bump to kube 1.27 and go 1.20
2 parents bfb29f2 + c953d28 commit 4a2134f

File tree

10 files changed

+21
-22
lines changed

10 files changed

+21
-22
lines changed

‎.github/workflows/build.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- name: Install Go
2121
uses: actions/setup-go@v2
2222
with:
23-
go-version: '1.19'
23+
go-version: '1.20'
2424

2525
- name: Set env
2626
shell: bash
@@ -64,7 +64,7 @@ jobs:
6464
- name: Install Go
6565
uses: actions/setup-go@v2
6666
with:
67-
go-version: '1.19'
67+
go-version: '1.20'
6868

6969
- name: Set env
7070
shell: bash

‎.github/workflows/containerd.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
- name: Install Go
4848
uses: actions/setup-go@v2
4949
with:
50-
go-version: '1.19'
50+
go-version: '1.20'
5151

5252
- name: Set env
5353
shell: bash

‎.github/workflows/crio.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- name: Install go
2121
uses: actions/setup-go@v2
2222
with:
23-
go-version: '1.19'
23+
go-version: '1.20'
2424

2525
- name: Setup environment
2626
shell: bash

‎.github/workflows/e2e.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- name: Install Go
2121
uses: actions/setup-go@v2
2222
with:
23-
go-version: '1.19'
23+
go-version: '1.20'
2424

2525
- name: Set env
2626
shell: bash

‎.github/workflows/release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
steps:
1111
- uses: actions/setup-go@v2
1212
with:
13-
go-version: '1.19'
13+
go-version: '1.20'
1414
- name: Set env
1515
shell: bash
1616
run: |

‎.golangci.yml

+1-4
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ run:
55
linters:
66
disable-all: true
77
enable:
8-
- deadcode
98
- depguard
109
- durationcheck
1110
- forcetypeassert
@@ -21,11 +20,10 @@ linters:
2120
- prealloc
2221
- predeclared
2322
- promlinter
24-
- structcheck
2523
- tagliatelle
2624
- typecheck
27-
- varcheck
2825
- wastedassign
26+
- unused
2927
# - asciicheck
3028
# - bodyclose
3129
# - cyclop
@@ -75,7 +73,6 @@ linters:
7573
# - tparallel
7674
# - unconvert
7775
# - unparam
78-
# - unused
7976
# - whitespace
8077
# - wrapcheck
8178
# - wsl

‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ install.lint: $(GOLANGCI_LINT)
112112

113113
$(GOLANGCI_LINT):
114114
export \
115-
VERSION=v1.46.2 \
115+
VERSION=v1.52.2 \
116116
URL=https://raw.githubusercontent.com/golangci/golangci-lint \
117117
BINDIR=${BUILD_BIN_PATH} && \
118118
curl -sfL $$URL/$$VERSION/install.sh | sh -s $$VERSION

‎go.mod

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/kubernetes-sigs/cri-tools
22

3-
go 1.19
3+
go 1.20
44

55
require (
66
github.com/docker/distribution v2.8.1+incompatible
@@ -24,9 +24,9 @@ require (
2424
k8s.io/api v0.25.0
2525
k8s.io/apimachinery v0.25.0
2626
k8s.io/client-go v1.5.2
27-
k8s.io/cri-api v0.26.0
28-
k8s.io/kubectl v0.26.0
29-
k8s.io/kubernetes v1.26.0
27+
k8s.io/cri-api v0.27.0
28+
k8s.io/kubectl v0.27.0
29+
k8s.io/kubernetes v1.27.0
3030
sigs.k8s.io/yaml v1.3.0
3131
)
3232

‎pkg/validate/container.go

+6-4
Original file line numberDiff line numberDiff line change
@@ -573,8 +573,9 @@ func pathExists(path string) bool {
573573

574574
// parseDockerJSONLog parses logs in Docker JSON log format.
575575
// Docker JSON log format example:
576-
// {"log":"content 1","stream":"stdout","time":"2016-10-20T18:39:20.57606443Z"}
577-
// {"log":"content 2","stream":"stderr","time":"2016-10-20T18:39:20.57606444Z"}
576+
//
577+
// {"log":"content 1","stream":"stdout","time":"2016-10-20T18:39:20.57606443Z"}
578+
// {"log":"content 2","stream":"stderr","time":"2016-10-20T18:39:20.57606444Z"}
578579
func parseDockerJSONLog(log []byte, msg *logMessage) {
579580
var l jsonlog.JSONLog
580581

@@ -588,8 +589,9 @@ func parseDockerJSONLog(log []byte, msg *logMessage) {
588589

589590
// parseCRILog parses logs in CRI log format.
590591
// CRI log format example :
591-
// 2016-10-06T00:17:09.669794202Z stdout P The content of the log entry 1
592-
// 2016-10-06T00:17:10.113242941Z stderr F The content of the log entry 2
592+
//
593+
// 2016-10-06T00:17:09.669794202Z stdout P The content of the log entry 1
594+
// 2016-10-06T00:17:10.113242941Z stderr F The content of the log entry 2
593595
func parseCRILog(log string, msg *logMessage) {
594596
logMessage := strings.SplitN(log, " ", 4)
595597
if len(log) < 4 {

‎vendor/modules.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -702,7 +702,7 @@ k8s.io/component-base/metrics/prometheusextension
702702
k8s.io/component-base/tracing
703703
k8s.io/component-base/tracing/api/v1
704704
k8s.io/component-base/version
705-
# k8s.io/cri-api v0.26.0 => k8s.io/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20221208195143-b46a3f887ca9
705+
# k8s.io/cri-api v0.27.0 => k8s.io/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20221208195143-b46a3f887ca9
706706
## explicit; go 1.19
707707
k8s.io/cri-api/pkg/apis
708708
k8s.io/cri-api/pkg/apis/runtime/v1
@@ -728,11 +728,11 @@ k8s.io/kube-openapi/pkg/schemamutation
728728
k8s.io/kube-openapi/pkg/spec3
729729
k8s.io/kube-openapi/pkg/util/proto
730730
k8s.io/kube-openapi/pkg/validation/spec
731-
# k8s.io/kubectl v0.26.0 => k8s.io/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20221208195143-b46a3f887ca9
731+
# k8s.io/kubectl v0.27.0 => k8s.io/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20221208195143-b46a3f887ca9
732732
## explicit; go 1.19
733733
k8s.io/kubectl/pkg/util/interrupt
734734
k8s.io/kubectl/pkg/util/term
735-
# k8s.io/kubernetes v1.26.0 => k8s.io/kubernetes v1.26.0
735+
# k8s.io/kubernetes v1.27.0 => k8s.io/kubernetes v1.26.0
736736
## explicit; go 1.19
737737
k8s.io/kubernetes/pkg/apis/core
738738
k8s.io/kubernetes/pkg/apis/scheduling

0 commit comments

Comments
 (0)