Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bump to kube 1.27 and go 1.20 #1133

Merged
merged 3 commits into from
Apr 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v2
with:
go-version: '1.19'
go-version: '1.20'

- name: Set env
shell: bash
Expand Down Expand Up @@ -64,7 +64,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v2
with:
go-version: '1.19'
go-version: '1.20'

- name: Set env
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/containerd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v2
with:
go-version: '1.19'
go-version: '1.20'

- name: Set env
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/crio.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- name: Install go
uses: actions/setup-go@v2
with:
go-version: '1.19'
go-version: '1.20'

- name: Setup environment
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v2
with:
go-version: '1.19'
go-version: '1.20'

- name: Set env
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
steps:
- uses: actions/setup-go@v2
with:
go-version: '1.19'
go-version: '1.20'
- name: Set env
shell: bash
run: |
Expand Down
5 changes: 1 addition & 4 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ run:
linters:
disable-all: true
enable:
- deadcode
- depguard
- durationcheck
- forcetypeassert
Expand All @@ -21,11 +20,10 @@ linters:
- prealloc
- predeclared
- promlinter
- structcheck
- tagliatelle
- typecheck
- varcheck
- wastedassign
- unused
# - asciicheck
# - bodyclose
# - cyclop
Expand Down Expand Up @@ -75,7 +73,6 @@ linters:
# - tparallel
# - unconvert
# - unparam
# - unused
# - whitespace
# - wrapcheck
# - wsl
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ install.lint: $(GOLANGCI_LINT)

$(GOLANGCI_LINT):
export \
VERSION=v1.46.2 \
VERSION=v1.52.2 \
URL=https://raw.githubusercontent.com/golangci/golangci-lint \
BINDIR=${BUILD_BIN_PATH} && \
curl -sfL $$URL/$$VERSION/install.sh | sh -s $$VERSION
Expand Down
8 changes: 4 additions & 4 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/kubernetes-sigs/cri-tools

go 1.19
go 1.20

require (
github.com/docker/distribution v2.8.1+incompatible
Expand All @@ -24,9 +24,9 @@ require (
k8s.io/api v0.25.0
k8s.io/apimachinery v0.25.0
k8s.io/client-go v1.5.2
k8s.io/cri-api v0.26.0
k8s.io/kubectl v0.26.0
k8s.io/kubernetes v1.26.0
k8s.io/cri-api v0.27.0
k8s.io/kubectl v0.27.0
k8s.io/kubernetes v1.27.0
sigs.k8s.io/yaml v1.3.0
)

Expand Down
10 changes: 6 additions & 4 deletions pkg/validate/container.go
Original file line number Diff line number Diff line change
Expand Up @@ -573,8 +573,9 @@ func pathExists(path string) bool {

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

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

// parseCRILog parses logs in CRI log format.
// CRI log format example :
// 2016-10-06T00:17:09.669794202Z stdout P The content of the log entry 1
// 2016-10-06T00:17:10.113242941Z stderr F The content of the log entry 2
//
// 2016-10-06T00:17:09.669794202Z stdout P The content of the log entry 1
// 2016-10-06T00:17:10.113242941Z stderr F The content of the log entry 2
func parseCRILog(log string, msg *logMessage) {
logMessage := strings.SplitN(log, " ", 4)
if len(log) < 4 {
Expand Down
6 changes: 3 additions & 3 deletions vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -702,7 +702,7 @@ k8s.io/component-base/metrics/prometheusextension
k8s.io/component-base/tracing
k8s.io/component-base/tracing/api/v1
k8s.io/component-base/version
# k8s.io/cri-api v0.26.0 => k8s.io/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20221208195143-b46a3f887ca9
# k8s.io/cri-api v0.27.0 => k8s.io/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20221208195143-b46a3f887ca9
## explicit; go 1.19
k8s.io/cri-api/pkg/apis
k8s.io/cri-api/pkg/apis/runtime/v1
Expand All @@ -728,11 +728,11 @@ k8s.io/kube-openapi/pkg/schemamutation
k8s.io/kube-openapi/pkg/spec3
k8s.io/kube-openapi/pkg/util/proto
k8s.io/kube-openapi/pkg/validation/spec
# k8s.io/kubectl v0.26.0 => k8s.io/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20221208195143-b46a3f887ca9
# k8s.io/kubectl v0.27.0 => k8s.io/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20221208195143-b46a3f887ca9
## explicit; go 1.19
k8s.io/kubectl/pkg/util/interrupt
k8s.io/kubectl/pkg/util/term
# k8s.io/kubernetes v1.26.0 => k8s.io/kubernetes v1.26.0
# k8s.io/kubernetes v1.27.0 => k8s.io/kubernetes v1.26.0
## explicit; go 1.19
k8s.io/kubernetes/pkg/apis/core
k8s.io/kubernetes/pkg/apis/scheduling
Expand Down