Skip to content

Bug 1986003: Bump k8s.io to 1.22.0-rc.0 #1181

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

Merged
openshift-ci merged 3 commits into from
Jul 30, 2021
Merged

Bug 1986003: Bump k8s.io to 1.22.0-rc.0 #1181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8d49b1f
Change imports for go.etcd.io/etcd v3.5.0
soltysh Jul 19, 2021
deaa68b
bump(k8s.io/*): v0.22.0-rc.0
soltysh Jul 19, 2021
22f2a00
Drop duplicate verify-golang-versions
soltysh Jul 19, 2021
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: 0 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,6 @@ clean:
export TP_DEPLOYMENT_YAML ?=./manifests/0000_20_kube-apiserver-operator_06_deployment.yaml
export TP_CMD_PATH ?=./cmd/cluster-kube-apiserver-operator

$(call verify-golang-versions,Dockerfile.rhel7)
Copy link
Copy Markdown
Contributor

@sttts sttts Jul 30, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

where is this duplicated?

Copy link
Copy Markdown
Contributor Author

@soltysh soltysh Jul 30, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we already have that done inside build-machinery-go https://github.com/openshift/build-machinery-go/blob/master/make/golang.mk#L11

Copy link
Copy Markdown
Contributor

@p0lyn0mial p0lyn0mial Jul 30, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

line 37 -

cluster-kube-apiserver-operator/Makefile

Line 37 in 22f2a00

$(call verify-golang-versions,Dockerfile.rhel7)


# ensure the apirequestcounts crd is included in bindata
APIREQUESTCOUNT_CRD_TARGET := bindata/assets/kube-apiserver/apiserver.openshift.io_apirequestcount.yaml
APIREQUESTCOUNT_CRD_SOURCE := vendor/github.com/openshift/api/apiserver/v1/apiserver.openshift.io_apirequestcount.yaml
Expand Down
38 changes: 18 additions & 20 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,30 +8,28 @@ require (
github.com/davecgh/go-spew v1.1.1
github.com/ghodss/yaml v1.0.0
github.com/gonum/graph v0.0.0-20190426092945-678096d81a4b
github.com/google/go-cmp v0.5.2
github.com/google/go-cmp v0.5.5
github.com/google/gofuzz v1.2.0 // indirect
github.com/imdario/mergo v0.3.8
github.com/openshift/api v0.0.0-20210706092853-b63d499a70ce
github.com/openshift/build-machinery-go v0.0.0-20210423112049-9415d7ebd33e
github.com/openshift/client-go v0.0.0-20210521082421-73d9475a9142
github.com/openshift/library-go v0.0.0-20210723141450-212eeb60ef3e
github.com/openshift/api v0.0.0-20210730095913-85e1d547cdee
github.com/openshift/build-machinery-go v0.0.0-20210712174854-1bb7fd1518d3
github.com/openshift/client-go v0.0.0-20210730113412-1811c1b3fc0e
github.com/openshift/library-go v0.0.0-20210730114916-d82fae7e3feb
github.com/pkg/profile v1.5.0 // indirect
github.com/prometheus-operator/prometheus-operator/pkg/client v0.45.0
github.com/prometheus/client_golang v1.7.1
github.com/spf13/cobra v1.1.1
github.com/prometheus/client_golang v1.11.0
github.com/spf13/cobra v1.1.3
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.6.1
go.etcd.io/etcd v0.5.0-alpha.5.0.20200910180754-dd1b699fc489
golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073
k8s.io/api v0.21.1
k8s.io/apiextensions-apiserver v0.21.1
k8s.io/apimachinery v0.21.1
k8s.io/apiserver v0.21.1
k8s.io/client-go v0.21.1
k8s.io/component-base v0.21.1
k8s.io/klog/v2 v2.8.0
k8s.io/utils v0.0.0-20201110183641-67b214c5f920
github.com/stretchr/testify v1.7.0
go.etcd.io/etcd/client/v3 v3.5.0
golang.org/x/sys v0.0.0-20210616094352-59db8d763f22
k8s.io/api v0.22.0-rc.0
k8s.io/apiextensions-apiserver v0.22.0-rc.0
k8s.io/apimachinery v0.22.0-rc.0
k8s.io/apiserver v0.22.0-rc.0
k8s.io/client-go v0.22.0-rc.0
k8s.io/component-base v0.22.0-rc.0
k8s.io/klog/v2 v2.9.0
k8s.io/utils v0.0.0-20210707171843-4b05e18ac7d9
sigs.k8s.io/kube-storage-version-migrator v0.0.4
)

replace k8s.io/apiserver => github.com/openshift/kubernetes-apiserver v0.0.0-20210419140141-620426e63a99 // points to temporary-watch-reduction-patch-1.21 to pick up k/k/pull/100959
354 changes: 253 additions & 101 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion test/library/encryption/helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"k8s.io/apimachinery/pkg/runtime"

"github.com/stretchr/testify/require"
"go.etcd.io/etcd/clientv3"
"go.etcd.io/etcd/client/v3"

operatorv1client "github.com/openshift/client-go/operator/clientset/versioned/typed/operator/v1"
operatorlibrary "github.com/openshift/cluster-kube-apiserver-operator/test/library"
Expand Down
0 vendor/github.com/coreos/go-systemd/LICENSE → .../github.com/coreos/go-systemd/v22/LICENSE
View file
Open in desktop
File renamed without changes.
0 vendor/github.com/coreos/go-systemd/NOTICE → ...r/github.com/coreos/go-systemd/v22/NOTICE
View file
Open in desktop
File renamed without changes.
0 ....com/coreos/go-systemd/daemon/sdnotify.go → .../coreos/go-systemd/v22/daemon/sdnotify.go
View file
Open in desktop
File renamed without changes.
0 ....com/coreos/go-systemd/daemon/watchdog.go → .../coreos/go-systemd/v22/daemon/watchdog.go
View file
Open in desktop
File renamed without changes.
46 changes: 46 additions & 0 deletions vendor/github.com/coreos/go-systemd/v22/journal/journal.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 5 additions & 20 deletions ....com/coreos/go-systemd/journal/journal.go → ...os/go-systemd/v22/journal/journal_unix.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

35 changes: 35 additions & 0 deletions vendor/github.com/coreos/go-systemd/v22/journal/journal_windows.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 0 additions & 5 deletions vendor/github.com/coreos/pkg/NOTICE
View file
Open in desktop

This file was deleted.

39 changes: 0 additions & 39 deletions vendor/github.com/coreos/pkg/capnslog/README.md
View file
Open in desktop

This file was deleted.

Loading