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.

Sign up for GitHub

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

Jump to bottom

update kube dependencies to v1.25.0 #137

Merged
merged 13 commits into from
Sep 7, 2022
Merged

update kube dependencies to v1.25.0 #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
79e7bea
update kube dependencies to v1.25.0
humblec Aug 24, 2022
bb22b3d
move the setup version to 1.19
humblec Sep 5, 2022
985050e
fix ci failures
humblec Sep 5, 2022
8abd79a
update windows action to v1.19
humblec Sep 5, 2022
808d1d4
changes for subtree
humblec Sep 5, 2022
9a4fb39
Merge commit '24900cf717e565fde1a86d8b00c9d9669634d855' into kube-1.25
humblec Sep 5, 2022
24900cf
Squashed 'pkg/lib/iscsi/' changes from 0e71e17..7f4f7cc
humblec Sep 5, 2022
fd5c8f5
Squashed 'release-tools/' changes from d29a2e7..d24254f
humblec Sep 5, 2022
fe9f69f
Merge commit 'fd5c8f521f14fb48291920225da135dc5f2cc1e7' into kube-1.25
humblec Sep 5, 2022
5059b4d
Squashed 'pkg/lib/iscsi/' changes from 7f4f7cc..ce26141
humblec Sep 6, 2022
8477dd0
Merge commit '5059b4d56204458af21c17f4812e5f8c9d8fec3c' into kube-1.25
humblec Sep 6, 2022
602b9f4
fix utils go mod errors in the CI
humblec Sep 6, 2022
77d19e7
make go version declaration on 1.18
humblec Sep 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .github/workflows/codespell.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
name: Check for spelling errors
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- uses: codespell-project/actions-codespell@master
with:
check_filenames: true
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/darwin.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ jobs:
steps:

- name: Set up Go 1.x
uses: actions/setup-go@v3.1.0
uses: actions/setup-go@v3.3.0
with:
go-version: ^1.16
go-version: ^1.18
id: go

- name: Check out code into the Go module directory
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/golangci-lint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ jobs:
steps:
- uses: actions/setup-go@v3
with:
go-version: 1.17
go-version: 1.18
- uses: actions/checkout@v3
- name: golangci-lint
uses: golangci/golangci-lint-action@v3
with:
# Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
version: v1.45.2
version: v1.42.1

# Optional: working directory, useful for monorepos
# working-directory: somedir
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/linux.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- name: Set up Go 1.x
uses: actions/setup-go@v3.3.0
with:
go-version: ^1.17
go-version: ^1.18
id: go

- name: Check out code into the Go module directory
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pluto.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
steps:

- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Download pluto
uses: FairwindsOps/pluto/github-action@master
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/shellcheck.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
name: Shellcheck
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Run ShellCheck
uses: ludeeus/action-shellcheck@master
env:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/trivy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ jobs:
runs-on: ubuntu-18.04
steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Install go
uses: actions/setup-go@v3.1.0
uses: actions/setup-go@v3.3.0
with:
go-version: ^1.16
go-version: ^1.18

- name: Build an image from Dockerfile
run: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/windows.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@ jobs:
build:
strategy:
matrix:
go: [ '^1.16' ]
go: [ '^1.18' ]
platform: [windows-latest]
runs-on: ${{ matrix.platform }}
steps:
- name: Install Go
uses: actions/setup-go@v3.1.0
uses: actions/setup-go@v3.3.0
with:
go-version: ${{ matrix.go }}
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Run Windows Unit Tests
run: |
go version
Expand Down
2 changes: 1 addition & 1 deletion cmd/iscsiplugin/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"os"

"github.com/kubernetes-csi/csi-driver-iscsi/pkg/iscsi"
"k8s.io/klog/v2"
klog "k8s.io/klog/v2"
)

var (
Expand Down
89 changes: 45 additions & 44 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
module github.com/kubernetes-csi/csi-driver-iscsi

go 1.17
go 1.18

require (
github.com/container-storage-interface/spec v1.6.0
github.com/kubernetes-csi/csi-lib-iscsi v0.0.0-20220106022228-366f3190694e
github.com/kubernetes-csi/csi-lib-utils v0.11.0
golang.org/x/net v0.0.0-20220225172249-27dd8689420f
golang.org/x/net v0.0.0-20220722155237-a158d28d115b
google.golang.org/grpc v1.47.0
k8s.io/klog/v2 v2.60.1
k8s.io/kubernetes v1.24.1
k8s.io/mount-utils v0.24.1 // indirect
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9
k8s.io/klog/v2 v2.80.0
k8s.io/kubernetes v1.25.0
k8s.io/mount-utils v0.25.0 // indirect
k8s.io/utils v0.0.0-20220823124924-e9cbc92d1a73
)

require (
Expand All @@ -35,6 +35,7 @@ require (
github.com/json-iterator/go v1.1.12 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
github.com/moby/sys/mountinfo v0.6.2 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
Expand All @@ -45,7 +46,7 @@ require (
github.com/prometheus/procfs v0.7.3 // indirect
github.com/spf13/pflag v1.0.5 // indirect
golang.org/x/oauth2 v0.0.0-20220524215830-622c5d57e401 // indirect
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect
golang.org/x/sys v0.0.0-20220829200755-d48e67d00261 // indirect
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/time v0.0.0-20220411224347-583f2d630306 // indirect
Expand All @@ -55,71 +56,71 @@ require (
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/api v0.24.1 // indirect
k8s.io/apimachinery v0.24.1 // indirect
k8s.io/apiserver v0.24.1 // indirect
k8s.io/client-go v1.5.2 // indirect
k8s.io/cloud-provider v0.24.1 // indirect
k8s.io/component-base v0.24.1 // indirect
k8s.io/component-helpers v0.24.1 // indirect
k8s.io/kube-openapi v0.0.0-20220603121420-31174f50af60 // indirect
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
k8s.io/api v0.25.0 // indirect
k8s.io/apimachinery v0.26.0-alpha.0 // indirect
k8s.io/apiserver v0.25.0 // indirect
k8s.io/client-go v0.25.0 // indirect
k8s.io/cloud-provider v0.25.0 // indirect
k8s.io/component-base v0.25.0 // indirect
k8s.io/component-helpers v0.25.0 // indirect
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
)

replace k8s.io/api => k8s.io/api v0.24.0
replace k8s.io/api => k8s.io/api v0.25.0

replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.24.0
replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.25.0

replace k8s.io/apimachinery => k8s.io/apimachinery v0.24.0
replace k8s.io/apimachinery => k8s.io/apimachinery v0.26.0-alpha.0

replace k8s.io/apiserver => k8s.io/apiserver v0.24.0
replace k8s.io/apiserver => k8s.io/apiserver v0.25.0

replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.24.0
replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.25.0

replace k8s.io/client-go => k8s.io/client-go v0.24.0
replace k8s.io/client-go => k8s.io/client-go v0.25.0

replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.24.0
replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.25.0

replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.24.0
replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.25.0

replace k8s.io/code-generator => k8s.io/code-generator v0.24.0
replace k8s.io/code-generator => k8s.io/code-generator v0.25.0

replace k8s.io/component-base => k8s.io/component-base v0.24.0
replace k8s.io/component-base => k8s.io/component-base v0.25.0

replace k8s.io/component-helpers => k8s.io/component-helpers v0.24.0
replace k8s.io/component-helpers => k8s.io/component-helpers v0.25.0

replace k8s.io/controller-manager => k8s.io/controller-manager v0.24.0
replace k8s.io/controller-manager => k8s.io/controller-manager v0.25.0

replace k8s.io/cri-api => k8s.io/cri-api v0.24.0
replace k8s.io/cri-api => k8s.io/cri-api v0.25.0

replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.24.0
replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.25.0

replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.24.0
replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.25.0

replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.24.0
replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.25.0

replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.24.0
replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.25.0

replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.24.0
replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.25.0

replace k8s.io/kubectl => k8s.io/kubectl v0.24.0
replace k8s.io/kubectl => k8s.io/kubectl v0.25.0

replace k8s.io/kubelet => k8s.io/kubelet v0.24.0
replace k8s.io/kubelet => k8s.io/kubelet v0.25.0

replace k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.24.0
replace k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.25.0

replace k8s.io/metrics => k8s.io/metrics v0.24.0
replace k8s.io/metrics => k8s.io/metrics v0.25.0

replace k8s.io/mount-utils => k8s.io/mount-utils v0.24.0
replace k8s.io/mount-utils => k8s.io/mount-utils v0.25.0

replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.24.0
replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.25.0

replace k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.24.0
replace k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.25.0

replace k8s.io/sample-controller => k8s.io/sample-controller v0.24.0
replace k8s.io/sample-controller => k8s.io/sample-controller v0.25.0

replace github.com/kubernetes-csi/csi-lib-iscsi => ./pkg/lib/iscsi

replace k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.24.0
replace k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.25.0
Loading