kubernetes
/
apiserver
mirror of https://github.com/kubernetes/apiserver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Switch to github.com/coreos/go-systemd/v22 and drop older package 

- We use the new v22 module released on May 10
- We drop the unmaintained `github.com/coreos/pkg`

Signed-off-by: Davanum Srinivas <davanum@gmail.com>

Kubernetes-commit: 7fcdbbef06d0bc8c4416db1d2cbba9f30d30e8c4
This commit is contained in:
Davanum Srinivas 2021-06-16 11:14:02 -04:00 committed by Kubernetes Publisher
parent c9f87ef43e
commit c2350dc583
3 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
go.mod
View File

@ -7,7 +7,7 @@ go 1.16
require (
github.com/NYTimes/gziphandler v1.1.1 // indirect
github.com/coreos/go-oidc v2.1.0+incompatible
github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e
github.com/coreos/go-systemd/v22 v22.3.2
github.com/davecgh/go-spew v1.1.1
github.com/emicklei/go-restful v2.9.5+incompatible
github.com/evanphx/json-patch v4.11.0+incompatible
@ -36,10 +36,10 @@ require (
google.golang.org/grpc v1.38.0
gopkg.in/natefinch/lumberjack.v2 v2.0.0
gopkg.in/square/go-jose.v2 v2.2.2
k8s.io/api v0.0.0-20210616055848-508b64175e92
k8s.io/apimachinery v0.0.0-20210616055704-0dc8a6790746
k8s.io/client-go v0.0.0-20210616060116-ef2d8844e4a7
k8s.io/component-base v0.0.0-20210616060642-d4f86f3ef572
k8s.io/api v0.0.0
k8s.io/apimachinery v0.0.0
k8s.io/client-go v0.0.0
k8s.io/component-base v0.0.0
k8s.io/klog/v2 v2.9.0
k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e
k8s.io/utils v0.0.0-20210521133846-da695404a2bc
@ -49,8 +49,9 @@ require (
)
replace (
k8s.io/api => k8s.io/api v0.0.0-20210616055848-508b64175e92
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210616055704-0dc8a6790746
k8s.io/client-go => k8s.io/client-go v0.0.0-20210616060116-ef2d8844e4a7
k8s.io/component-base => k8s.io/component-base v0.0.0-20210616060642-d4f86f3ef572
k8s.io/api => ../api
k8s.io/apimachinery => ../apimachinery
k8s.io/apiserver => ../apiserver
k8s.io/client-go => ../client-go
k8s.io/component-base => ../component-base
)

8
go.sum
View File

@ -769,14 +769,6 @@ honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
k8s.io/api v0.0.0-20210616055848-508b64175e92 h1:YVxzcVwsAdZjpFomGymFThWzhgSv74zUScoBpBEoaY4=
k8s.io/api v0.0.0-20210616055848-508b64175e92/go.mod h1:aUKXHSvqLKBcepIGetFkZZS3TRYC06cDgh0bj4Wdm98=
k8s.io/apimachinery v0.0.0-20210616055704-0dc8a6790746 h1:AtKebT7YpF5YhIXfOOjVC2JCsUQMEcfdQI0dBtbMd7g=
k8s.io/apimachinery v0.0.0-20210616055704-0dc8a6790746/go.mod h1:/5uIpUWARbptpKp8Acx8ZLRb88HuZlINrEfejwRJc9c=
k8s.io/client-go v0.0.0-20210616060116-ef2d8844e4a7 h1:ekuYteSKfaRCo+k3CtY0kQqfy3HwU8w6AKp6ybFpJiw=
k8s.io/client-go v0.0.0-20210616060116-ef2d8844e4a7/go.mod h1:QGopd7+mZB17mgXwubQneloRtjzrmp0+AeXBqmoSovk=
k8s.io/component-base v0.0.0-20210616060642-d4f86f3ef572 h1:uAxM/qh6aasYGa4018tHjG1ddkaaT77/vyci643juJA=
k8s.io/component-base v0.0.0-20210616060642-d4f86f3ef572/go.mod h1:++14obwYMiUl73VgDh28KDEi89lavDEb29nuLvWAXQU=
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
k8s.io/klog/v2 v2.9.0 h1:D7HV+n1V57XeZ0m6tdRkfknthUaM06VFbWldOFh8kzM=

2
pkg/server/genericapiserver.go
View File

@ -24,7 +24,7 @@ import (
"sync"
"time"
systemd "github.com/coreos/go-systemd/daemon"
systemd "github.com/coreos/go-systemd/v22/daemon"
"k8s.io/apimachinery/pkg/api/meta"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"