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

Merge pull request #93356 from justaugustus/vdf 

[VDF] Normalize container image references to k8s.gcr.io

Kubernetes-commit: 7348ab957c88ad8707592db47222053951d5f029
This commit is contained in:
Kubernetes Publisher 2020-07-25 02:58:17 -07:00
parent b1d12993db 0866d387da
commit fcf4262037
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Godeps/Godeps.json generated
View File

@ -676,7 +676,7 @@
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "554373823da4"
"Rev": "6b13c5bd95e0"
},
{
"ImportPath": "k8s.io/component-base",

4
go.mod
View File

@ -43,7 +43,7 @@ require (
gopkg.in/yaml.v2 v2.2.8
k8s.io/api v0.0.0-20200716171716-e4973e079a11
k8s.io/apimachinery v0.0.0-20200725020816-b84716e65c7b
k8s.io/client-go v0.0.0-20200725051634-554373823da4
k8s.io/client-go v0.0.0-20200725091656-6b13c5bd95e0
k8s.io/component-base v0.0.0-20200725052204-bbbd60b9d4a3
k8s.io/klog/v2 v2.2.0
k8s.io/kube-openapi v0.0.0-20200427153329-656914f816f9
@ -56,6 +56,6 @@ require (
replace (
k8s.io/api => k8s.io/api v0.0.0-20200716171716-e4973e079a11
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200725020816-b84716e65c7b
k8s.io/client-go => k8s.io/client-go v0.0.0-20200725051634-554373823da4
k8s.io/client-go => k8s.io/client-go v0.0.0-20200725091656-6b13c5bd95e0
k8s.io/component-base => k8s.io/component-base v0.0.0-20200725052204-bbbd60b9d4a3
)

2
go.sum
View File

@ -507,7 +507,7 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
k8s.io/api v0.0.0-20200716171716-e4973e079a11/go.mod h1:jXutK3obFCnsfnkm06ePMMz07MzBtfBdwb/tOGaxQDE=
k8s.io/apimachinery v0.0.0-20200725020816-b84716e65c7b/go.mod h1:eHbWZVMaaewmYBAUuRYnAmTTMtDhvpPNZuh8/6Yl7v0=
k8s.io/client-go v0.0.0-20200725051634-554373823da4/go.mod h1:3N80XUBrXSSjG9Sn5I7hoXDHZ3ru86S+7n0tdtWGe88=
k8s.io/client-go v0.0.0-20200725091656-6b13c5bd95e0/go.mod h1:3N80XUBrXSSjG9Sn5I7hoXDHZ3ru86S+7n0tdtWGe88=
k8s.io/component-base v0.0.0-20200725052204-bbbd60b9d4a3/go.mod h1:5ZD8jQEzYV2YtO1c4N4QmoOwn4f9RfTP7jc2FV+X5rY=
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=

2
pkg/server/egressselector/config_test.go
View File

@ -164,7 +164,7 @@ spec:
hostPath:
path: /etc/srv/kubernetes/pki/konnectivity-agent
containers:
- image: gcr.io/google-containers/proxy-agent:v0.0.3
- image: k8s.gcr.io/proxy-agent:v0.0.3
name: proxy-agent
command: ["/proxy-agent"]
args: ["--caCert=/etc/srv/kubernetes/pki/proxy-agent/ca.crt", "--agentCert=/etc/srv/kubernetes/pki/proxy-agent/client.crt", "--agentKey=/etc/srv/kubernetes/pki/proxy-agent/client.key", "--proxyServerHost=127.0.0.1", "--proxyServerPort=8132"]