Update Kubernetes to v1.17.17-k3s1

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
pull/2834/head v1.17.17+k3s1
Brad Davidson 2021-01-13 16:23:58 -08:00 committed by Brad Davidson
parent e0f96b45e1
commit e8c9484078
12 changed files with 125 additions and 106 deletions

52
go.mod
View File

@ -33,31 +33,31 @@ replace (
github.com/prometheus/client_model => github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910
github.com/prometheus/common => github.com/prometheus/common v0.0.0-20181126121408-4724e9255275
github.com/prometheus/procfs => github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a
k8s.io/api => github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.17.15-k3s1
k8s.io/apiextensions-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.17.15-k3s1
k8s.io/apimachinery => github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.17.15-k3s1
k8s.io/apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.17.15-k3s1
k8s.io/cli-runtime => github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.17.15-k3s1
k8s.io/client-go => github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.17.15-k3s1
k8s.io/cloud-provider => github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.17.15-k3s1
k8s.io/cluster-bootstrap => github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.17.15-k3s1
k8s.io/code-generator => github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.17.15-k3s1
k8s.io/component-base => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.17.15-k3s1
k8s.io/cri-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.17.15-k3s1
k8s.io/csi-translation-lib => github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.17.15-k3s1
k8s.io/kube-aggregator => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.17.15-k3s1
k8s.io/kube-controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.17.15-k3s1
k8s.io/kube-proxy => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.17.15-k3s1
k8s.io/kube-scheduler => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.17.15-k3s1
k8s.io/kubectl => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.17.15-k3s1
k8s.io/kubelet => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.17.15-k3s1
k8s.io/kubernetes => github.com/k3s-io/kubernetes v1.17.15-k3s1
k8s.io/legacy-cloud-providers => github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.17.15-k3s1
k8s.io/metrics => github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.17.15-k3s1
k8s.io/node-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/node-api v1.17.15-k3s1
k8s.io/sample-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-apiserver v1.17.15-k3s1
k8s.io/sample-cli-plugin => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-cli-plugin v1.17.15-k3s1
k8s.io/sample-controller => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-controller v1.17.15-k3s1
k8s.io/api => github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.17.17-k3s1
k8s.io/apiextensions-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.17.17-k3s1
k8s.io/apimachinery => github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.17.17-k3s1
k8s.io/apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.17.17-k3s1
k8s.io/cli-runtime => github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.17.17-k3s1
k8s.io/client-go => github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.17.17-k3s1
k8s.io/cloud-provider => github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.17.17-k3s1
k8s.io/cluster-bootstrap => github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.17.17-k3s1
k8s.io/code-generator => github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.17.17-k3s1
k8s.io/component-base => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.17.17-k3s1
k8s.io/cri-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.17.17-k3s1
k8s.io/csi-translation-lib => github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.17.17-k3s1
k8s.io/kube-aggregator => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.17.17-k3s1
k8s.io/kube-controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.17.17-k3s1
k8s.io/kube-proxy => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.17.17-k3s1
k8s.io/kube-scheduler => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.17.17-k3s1
k8s.io/kubectl => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.17.17-k3s1
k8s.io/kubelet => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.17.17-k3s1
k8s.io/kubernetes => github.com/k3s-io/kubernetes v1.17.17-k3s1
k8s.io/legacy-cloud-providers => github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.17.17-k3s1
k8s.io/metrics => github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.17.17-k3s1
k8s.io/node-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/node-api v1.17.17-k3s1
k8s.io/sample-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-apiserver v1.17.17-k3s1
k8s.io/sample-cli-plugin => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-cli-plugin v1.17.17-k3s1
k8s.io/sample-controller => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-controller v1.17.17-k3s1
mvdan.cc/unparam => mvdan.cc/unparam v0.0.0-20190209190245-fbb59629db34
)
@ -123,5 +123,5 @@ require (
k8s.io/component-base v0.0.0
k8s.io/cri-api v0.0.0
k8s.io/klog v1.0.0
k8s.io/kubernetes v1.17.15
k8s.io/kubernetes v1.17.17
)

86
go.sum
View File

@ -521,49 +521,49 @@ github.com/k3s-io/containerd v1.3.9-k3s1 h1:VeMMmcojFZDJlLkgtIr7GAmDUgtGS7ME3KvL
github.com/k3s-io/containerd v1.3.9-k3s1/go.mod h1:eMCLnqhZCzg+cZuvfMLStYPsrx5cWGpdZL6krPhK8RI=
github.com/k3s-io/cri v1.3.0-k3s.9 h1:1PUJysV7YQElM5JEjnHdOQ2kgwtTiSJ5fpx1j4/WjzU=
github.com/k3s-io/cri v1.3.0-k3s.9/go.mod h1:fGPUUHMKQik/vIegSe05DtX/m4miovdtvVLqRUFAkK0=
github.com/k3s-io/kubernetes v1.17.15-k3s1 h1:FOF2bKmNtvi7jSbN6stpYlfst16tUQeHoAQQqqm+L5A=
github.com/k3s-io/kubernetes v1.17.15-k3s1/go.mod h1:J8bqjhrOYZ/dDhaQU8sEfM+aH81x3Urfw1uODZc7ZfU=
github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.17.15-k3s1 h1:OQlgpxRujsWkt5wARXaNADZWi53oezXOKoZ/9/NXYw4=
github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.17.15-k3s1/go.mod h1:D7sf1F7GAHEK5DOn11dKP5J/QJvUShU2AopXe/AXghk=
github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.17.15-k3s1 h1:UmJdrEbz4ni12E3nIhPDPqQiFVzhl9EMc2xLA9XUCSM=
github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.17.15-k3s1/go.mod h1:t7xE4B3a1No++QbRlihSWT6HFc2hJeKY7tD3hVzUH04=
github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.17.15-k3s1 h1:2ngy2KczEd9pp4GFV+BzQ9wtmJ1cJkonYHtE3l7ybQk=
github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.17.15-k3s1/go.mod h1:SNGiMTQO86w2jZv4F8XbEzo/oxw/SVhYrUc6PeLKIUM=
github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.17.15-k3s1 h1:9w9AZ/cmMBWUQKi729tK/f27IE+peWpXwxNHPwUvxek=
github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.17.15-k3s1/go.mod h1:460zYYu4Oz1IQnJVEIw61q/liMtZg4rJxWa6te3TAX8=
github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.17.15-k3s1 h1:rG02mR3ecE3B2lQYQKutUDMZBe9JptbOe5SZ2WT7L08=
github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.17.15-k3s1/go.mod h1:gDRxKO8EN1rpLXzjeVmzc8c9RFs0ZqY8WJf/li0tNQc=
github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.17.15-k3s1 h1:nwGJjcLH5P/pSX2phlDo+7tHa5Uwph2Rw9NghApDPrw=
github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.17.15-k3s1/go.mod h1:TECGv+eYoAdQLqXqLn6lbdWb7W17Ibw22Wksad3Wad0=
github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.17.15-k3s1 h1:eIPEG+EWEkcFrfegatBwfnTWtBqatgySFpK7sKL/xjY=
github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.17.15-k3s1/go.mod h1:ycFddVBapK98UCwexOuDsvQLD3tfiVdRlXm2jjNP14c=
github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.17.15-k3s1 h1:DEjF75STyLPjB8Qb/SRlR1qJbrmsl7DuUzkiMj+FsD0=
github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.17.15-k3s1/go.mod h1:45LXh7SMJ3p4QnHER5TrOGhYz0CWcjb3xyq6aQqnebk=
github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.17.15-k3s1 h1:mmpTbz7OYCc/5pR3y8qkNQ8dryIlg+0M8WNN1ZmZmgM=
github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.17.15-k3s1/go.mod h1:SSBU1UzegXPz71t1XwnyfZzhclthC7gz/GVmpj7dezI=
github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.17.15-k3s1 h1:LbFnBCs3pHmaAZAeNguyo69xAb+iTs5EtT8QTaI5HZs=
github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.17.15-k3s1/go.mod h1:cTBtMr/eUcihQ4sFhgiDPlmlFpn1xBY37yQ+zNcT1IE=
github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.17.15-k3s1 h1:uf27CumJAS5ZOt9AjCYZYiTG4xJdJO+pD9VWYNNp/SY=
github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.17.15-k3s1/go.mod h1:MFtntPG6S7PSTqf06WHsjhdZ/gOTxfzFgNEzfhO5Uus=
github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.17.15-k3s1 h1:IZLqSktPBVvzhCgu7thiEy4coeZ+KZ58oO2mlkabbj4=
github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.17.15-k3s1/go.mod h1:k7r//UcXL2LipyGNpT/v/LG7Dsa9wILmaV4XyRhIPF4=
github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.17.15-k3s1 h1:iQt+MR1QJjCMScT9pvrbXyhqA6ejJey8mUSmrKmOHyM=
github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.17.15-k3s1/go.mod h1:oiCmE5poHbGfbkdIVMoITelay3hTqhonrn8EPg9c4kM=
github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.17.15-k3s1 h1:uxQwSP0OCKpyZJCIdLHKDVH28Zf4wQv+meJzSxBAok8=
github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.17.15-k3s1/go.mod h1:mKHow8zS1GpDcLHlAgghj2BKPOZrpEIHA30lWyRF3gg=
github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.17.15-k3s1 h1:XtIjkUIXzP7GpJz4Z0PM2OJ+iHluY304WOgV9ViXkvw=
github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.17.15-k3s1/go.mod h1:6SB+e2ragxZ8CPWrgNZ7F9KkCFykx5zQjnLVP2SWQ00=
github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.17.15-k3s1 h1:FvRTweks620satxG2egCvikGxHsiZnnAJMY3tf/EJO0=
github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.17.15-k3s1/go.mod h1:8rHmgUeQCsvaVrSy79lQc3DKD5PQp9cJH0DLw2GSAdk=
github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.17.15-k3s1 h1:eAokpA1Zm9YOnNbRXISkkXlxG4GfHwPjFaoWYjwaqg0=
github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.17.15-k3s1/go.mod h1:GQ+tU0gTBihZ7OA9ISKQFAVS9ur7huPo+EAfoKJfO2Q=
github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.17.15-k3s1 h1:lQZ0vmAGPK7hi1OPgjhX8fZyI5QrsuTOBYXKrtIqu6o=
github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.17.15-k3s1/go.mod h1:oHq6KV/WjiamPxKs2Np7JxcOEwHXfMybRBnLrMsTOHs=
github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.17.15-k3s1 h1:+1YzJvEK7kLpf84+695o5hBzre3qRH9Ar6oDT8mN3e0=
github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.17.15-k3s1/go.mod h1:/Ay7JUxnDftnjC20qd2wU13RQSAi6jsvdbx5P3g+Rig=
github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.17.15-k3s1 h1:zhDyvzBn7I3gWGvjyQw/5wl3cSRmUchGB9dOWQVgcw8=
github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.17.15-k3s1/go.mod h1:e70DTGI+y72YcU8iGDifilyP5uW6sPmBflDEjtiH/p0=
github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-apiserver v1.17.15-k3s1/go.mod h1:Aa3q34X2DLzqzugHP1xGSjJsPsaWdzhexM9Thk/AG7g=
github.com/k3s-io/kubernetes v1.17.17-k3s1 h1:z8OnWFDurLPRqhlTf4EdmWm06IYsZLuhVQmofrL7Reo=
github.com/k3s-io/kubernetes v1.17.17-k3s1/go.mod h1:J8bqjhrOYZ/dDhaQU8sEfM+aH81x3Urfw1uODZc7ZfU=
github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.17.17-k3s1 h1:u73fKSBMXqZ7sMYcKwySceqrQMMTYhMnkCfLiCfusGo=
github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.17.17-k3s1/go.mod h1:D7sf1F7GAHEK5DOn11dKP5J/QJvUShU2AopXe/AXghk=
github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.17.17-k3s1 h1:LmUAgNMjXYUXLPESC+Mg8LbLQ0AvAygiNXnKzYVz9RE=
github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.17.17-k3s1/go.mod h1:t7xE4B3a1No++QbRlihSWT6HFc2hJeKY7tD3hVzUH04=
github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.17.17-k3s1 h1:D1FyNNGwOZZQcDJFrOZqLzmLEsV0On6DOneKD5Zc6cI=
github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.17.17-k3s1/go.mod h1:SNGiMTQO86w2jZv4F8XbEzo/oxw/SVhYrUc6PeLKIUM=
github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.17.17-k3s1 h1:4FUKOKigHMDPY5YVpqFYj3VTw0p1WnKVg+EmuLB10YI=
github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.17.17-k3s1/go.mod h1:460zYYu4Oz1IQnJVEIw61q/liMtZg4rJxWa6te3TAX8=
github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.17.17-k3s1 h1:eoxigo8eCE28Z85DwvgMexLvSrsuwER3r1l422XdLcM=
github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.17.17-k3s1/go.mod h1:gDRxKO8EN1rpLXzjeVmzc8c9RFs0ZqY8WJf/li0tNQc=
github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.17.17-k3s1 h1:e2k1ZdpFYTmHSwN/ZIIJUNfCUHHIeeay+B8WrVCqzRw=
github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.17.17-k3s1/go.mod h1:TECGv+eYoAdQLqXqLn6lbdWb7W17Ibw22Wksad3Wad0=
github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.17.17-k3s1 h1:vX1uM2a+4OSfrJfddjnypdFBalff1td4Rm9B+lMCLjI=
github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.17.17-k3s1/go.mod h1:ycFddVBapK98UCwexOuDsvQLD3tfiVdRlXm2jjNP14c=
github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.17.17-k3s1 h1:oGhb2sdxO5cCJlA+xnTS1Ukf3Oj2dCcPzfKx8w/Lu6A=
github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.17.17-k3s1/go.mod h1:45LXh7SMJ3p4QnHER5TrOGhYz0CWcjb3xyq6aQqnebk=
github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.17.17-k3s1 h1:1BEpogV6+r+iIKs35+Qf6HL6l2fDP7xhfMaSKfoMSV4=
github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.17.17-k3s1/go.mod h1:SSBU1UzegXPz71t1XwnyfZzhclthC7gz/GVmpj7dezI=
github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.17.17-k3s1 h1:EELVaJV8sVFskHjRW0400PHvWAkF1hSljuZCePO+rxw=
github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.17.17-k3s1/go.mod h1:cTBtMr/eUcihQ4sFhgiDPlmlFpn1xBY37yQ+zNcT1IE=
github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.17.17-k3s1 h1:RU8mptPfGzHZH9PMdIQUHtf826HDSYeVJmGJ2CHNo5c=
github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.17.17-k3s1/go.mod h1:MFtntPG6S7PSTqf06WHsjhdZ/gOTxfzFgNEzfhO5Uus=
github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.17.17-k3s1 h1:RE1/XK7d53Ny0RDxXIiuXx5RmeJyQ7/rs57yYaQdOfA=
github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.17.17-k3s1/go.mod h1:k7r//UcXL2LipyGNpT/v/LG7Dsa9wILmaV4XyRhIPF4=
github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.17.17-k3s1 h1:FEpaUd74mzIH4W41AYNyVSZXpOeOffe92hjff8HZ9WQ=
github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.17.17-k3s1/go.mod h1:oiCmE5poHbGfbkdIVMoITelay3hTqhonrn8EPg9c4kM=
github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.17.17-k3s1 h1:2X8MlqqSepTgnuSF38AY2oU+1did3gaycR+Ald1Hd0E=
github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.17.17-k3s1/go.mod h1:mKHow8zS1GpDcLHlAgghj2BKPOZrpEIHA30lWyRF3gg=
github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.17.17-k3s1 h1:apxYSlpoe1t+y1TaosWS1zlDVm+3uVTGiJCoz6b4DEk=
github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.17.17-k3s1/go.mod h1:6SB+e2ragxZ8CPWrgNZ7F9KkCFykx5zQjnLVP2SWQ00=
github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.17.17-k3s1 h1:4Lmjs+K5TTIUcsXVXWQQvbOuMwVoQYKub3NsfpRj2GA=
github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.17.17-k3s1/go.mod h1:8rHmgUeQCsvaVrSy79lQc3DKD5PQp9cJH0DLw2GSAdk=
github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.17.17-k3s1 h1:7UIiehG4EjxPAdUVKq/UxfYEGxSPDyoKJzyxE2TWvHQ=
github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.17.17-k3s1/go.mod h1:GQ+tU0gTBihZ7OA9ISKQFAVS9ur7huPo+EAfoKJfO2Q=
github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.17.17-k3s1 h1:pdPNglvirPGp/O3EbaptWxlrPOquIW3+zNB9lMszS/M=
github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.17.17-k3s1/go.mod h1:oHq6KV/WjiamPxKs2Np7JxcOEwHXfMybRBnLrMsTOHs=
github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.17.17-k3s1 h1:we4BL/ynD/HhlmdKYTkZZMhAXSX2zdwbUJldH4DACkY=
github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.17.17-k3s1/go.mod h1:/Ay7JUxnDftnjC20qd2wU13RQSAi6jsvdbx5P3g+Rig=
github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.17.17-k3s1 h1:KurDysh3QN3G/fCeBCn6TEp/O9/WXmd8B9SP6PhjbzA=
github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.17.17-k3s1/go.mod h1:e70DTGI+y72YcU8iGDifilyP5uW6sPmBflDEjtiH/p0=
github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-apiserver v1.17.17-k3s1/go.mod h1:Aa3q34X2DLzqzugHP1xGSjJsPsaWdzhexM9Thk/AG7g=
github.com/karrick/godirwalk v1.7.5 h1:VbzFqwXwNbAZoA6W5odrLr+hKK197CcENcPh6E/gJ0M=
github.com/karrick/godirwalk v1.7.5/go.mod h1:2c9FRhkDxdIbgkOnCEvnSWs71Bhugbl46shStcFDJ34=
github.com/keybase/go-crypto v0.0.0-20190403132359-d65b6b94177f/go.mod h1:ghbZscTyKdM07+Fw3KSi0hcJm+AlEUWj8QLlPtijN/M=

View File

@ -3,8 +3,8 @@ package version
var (
gitMajor = "1"
gitMinor = "17"
gitVersion = "v1.17.15-k3s1"
gitCommit = "6de5b4e17702a4184de16f8595a8abe7fbed209d"
gitVersion = "v1.17.17-k3s1"
gitCommit = "db29017b8486a7b90ab0a6561749458193809787"
gitTreeState = "clean"
buildDate = "2020-12-10T00:24:25Z"
buildDate = "2021-01-13T19:06:17Z"
)

View File

@ -340,6 +340,7 @@ func (r *requestInfo) toCurl() string {
headers := ""
for key, values := range r.RequestHeaders {
for _, value := range values {
value = maskValue(key, value)
headers += fmt.Sprintf(` -H %q`, fmt.Sprintf("%s: %s", key, value))
}
}

View File

@ -3,8 +3,8 @@ package version
var (
gitMajor = "1"
gitMinor = "17"
gitVersion = "v1.17.15-k3s1"
gitCommit = "6de5b4e17702a4184de16f8595a8abe7fbed209d"
gitVersion = "v1.17.17-k3s1"
gitCommit = "db29017b8486a7b90ab0a6561749458193809787"
gitTreeState = "clean"
buildDate = "2020-12-10T00:24:25Z"
buildDate = "2021-01-13T19:06:17Z"
)

View File

@ -144,7 +144,7 @@ func makeMounts(pod *v1.Pod, podDir string, container *v1.Container, hostName, h
mountEtcHostsFile = mountEtcHostsFile && (mount.MountPath != etcHostsPath)
vol, ok := podVolumes[mount.Name]
if !ok || vol.Mounter == nil {
klog.Errorf("Mount cannot be satisfied for container %q, because the volume is missing or the volume mounter is nil: %+v", container.Name, mount)
klog.Errorf("Mount cannot be satisfied for container %q, because the volume is missing (ok=%v) or the volume mounter (vol.Mounter) is nil (vol=%+v): %+v", container.Name, ok, vol, mount)
return nil, cleanupAction, fmt.Errorf("cannot find volume %q to mount into container %q", mount.Name, container.Name)
}

View File

@ -226,6 +226,17 @@ func IsZero(a corev1.ResourceList) bool {
return true
}
// RemoveZeros returns a new resource list that only has no zero values
func RemoveZeros(a corev1.ResourceList) corev1.ResourceList {
result := corev1.ResourceList{}
for key, value := range a {
if !value.IsZero() {
result[key] = value
}
}
return result
}
// IsNegative returns the set of resource names that have a negative value.
func IsNegative(a corev1.ResourceList) []corev1.ResourceName {
results := []corev1.ResourceName{}

View File

@ -510,7 +510,10 @@ func CheckRequest(quotas []corev1.ResourceQuota, a admission.Attributes, evaluat
}
}
if quota.IsZero(deltaUsage) {
// ignore items in deltaUsage with zero usage
deltaUsage = quota.RemoveZeros(deltaUsage)
// if there is no remaining non-zero usage, short-circuit and return
if len(deltaUsage) == 0 {
return quotas, nil
}

View File

@ -86,13 +86,16 @@ go_test(
"//staging/src/k8s.io/api/core/v1:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/types:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/intstr:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library",
"//staging/src/k8s.io/client-go/informers:go_default_library",
"//staging/src/k8s.io/client-go/kubernetes/fake:go_default_library",
"//staging/src/k8s.io/cloud-provider/volume:go_default_library",
"//vendor/github.com/aws/aws-sdk-go/aws:go_default_library",
"//vendor/github.com/aws/aws-sdk-go/aws/awserr:go_default_library",
"//vendor/github.com/aws/aws-sdk-go/service/ec2:go_default_library",
"//vendor/github.com/aws/aws-sdk-go/service/elb:go_default_library",
"//vendor/github.com/aws/aws-sdk-go/service/elbv2:go_default_library",
"//vendor/github.com/stretchr/testify/assert:go_default_library",
"//vendor/github.com/stretchr/testify/mock:go_default_library",
"//vendor/github.com/stretchr/testify/require:go_default_library",

View File

@ -603,7 +603,9 @@ func (c *Cloud) ensureTargetGroup(targetGroup *elbv2.TargetGroup, serviceName ty
}
actualIDs := []string{}
for _, healthDescription := range healthResponse.TargetHealthDescriptions {
if healthDescription.TargetHealth.Reason != nil {
if aws.StringValue(healthDescription.TargetHealth.State) == elbv2.TargetHealthStateEnumHealthy {
actualIDs = append(actualIDs, *healthDescription.Target.Id)
} else if healthDescription.TargetHealth.Reason != nil {
switch aws.StringValue(healthDescription.TargetHealth.Reason) {
case elbv2.TargetHealthReasonEnumTargetDeregistrationInProgress:
// We don't need to count this instance in service if it is

View File

@ -138,6 +138,12 @@ func (g *Cloud) ensureInternalLoadBalancer(clusterName, clusterID string, svc *v
return nil, err
}
klog.V(2).Infof("ensureInternalLoadBalancer(%v): reserved IP %q for the forwarding rule", loadBalancerName, ipToUse)
defer func() {
// Release the address if all resources were created successfully, or if we error out.
if err := addrMgr.ReleaseAddress(); err != nil {
klog.Errorf("ensureInternalLoadBalancer: failed to release address reservation, possibly causing an orphan: %v", err)
}
}()
}
// Ensure firewall rules if necessary
@ -177,13 +183,6 @@ func (g *Cloud) ensureInternalLoadBalancer(clusterName, clusterID string, svc *v
g.clearPreviousInternalResources(svc, loadBalancerName, existingBackendService, backendServiceName, hcName)
}
if addrMgr != nil {
// Now that the controller knows the forwarding rule exists, we can release the address.
if err := addrMgr.ReleaseAddress(); err != nil {
klog.Errorf("ensureInternalLoadBalancer: failed to release address reservation, possibly causing an orphan: %v", err)
}
}
// Get the most recent forwarding rule for the address.
updatedFwdRule, err := g.GetRegionForwardingRule(loadBalancerName, g.region)
if err != nil {

42
vendor/modules.txt vendored
View File

@ -1137,7 +1137,7 @@ gopkg.in/square/go-jose.v2/jwt
gopkg.in/warnings.v0
# gopkg.in/yaml.v2 v2.2.8
gopkg.in/yaml.v2
# k8s.io/api v0.17.0 => github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.17.15-k3s1
# k8s.io/api v0.17.0 => github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.17.17-k3s1
k8s.io/api/admission/v1
k8s.io/api/admission/v1beta1
k8s.io/api/admissionregistration/v1
@ -1181,7 +1181,7 @@ k8s.io/api/settings/v1alpha1
k8s.io/api/storage/v1
k8s.io/api/storage/v1alpha1
k8s.io/api/storage/v1beta1
# k8s.io/apiextensions-apiserver v0.17.0 => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.17.15-k3s1
# k8s.io/apiextensions-apiserver v0.17.0 => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.17.17-k3s1
k8s.io/apiextensions-apiserver/pkg/apihelpers
k8s.io/apiextensions-apiserver/pkg/apis/apiextensions
k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/install
@ -1229,7 +1229,7 @@ k8s.io/apiextensions-apiserver/pkg/generated/openapi
k8s.io/apiextensions-apiserver/pkg/registry/customresource
k8s.io/apiextensions-apiserver/pkg/registry/customresource/tableconvertor
k8s.io/apiextensions-apiserver/pkg/registry/customresourcedefinition
# k8s.io/apimachinery v0.17.0 => github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.17.15-k3s1
# k8s.io/apimachinery v0.17.0 => github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.17.17-k3s1
k8s.io/apimachinery/pkg/api/equality
k8s.io/apimachinery/pkg/api/errors
k8s.io/apimachinery/pkg/api/meta
@ -1291,7 +1291,7 @@ k8s.io/apimachinery/pkg/watch
k8s.io/apimachinery/third_party/forked/golang/json
k8s.io/apimachinery/third_party/forked/golang/netutil
k8s.io/apimachinery/third_party/forked/golang/reflect
# k8s.io/apiserver v0.0.0 => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.17.15-k3s1
# k8s.io/apiserver v0.0.0 => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.17.17-k3s1
k8s.io/apiserver/pkg/admission
k8s.io/apiserver/pkg/admission/configuration
k8s.io/apiserver/pkg/admission/initializer
@ -1408,7 +1408,7 @@ k8s.io/apiserver/plugin/pkg/authenticator/request/basicauth
k8s.io/apiserver/plugin/pkg/authenticator/token/oidc
k8s.io/apiserver/plugin/pkg/authenticator/token/webhook
k8s.io/apiserver/plugin/pkg/authorizer/webhook
# k8s.io/cli-runtime v0.0.0 => github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.17.15-k3s1
# k8s.io/cli-runtime v0.0.0 => github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.17.17-k3s1
k8s.io/cli-runtime/pkg/genericclioptions
k8s.io/cli-runtime/pkg/kustomize
k8s.io/cli-runtime/pkg/kustomize/k8sdeps
@ -1421,7 +1421,7 @@ k8s.io/cli-runtime/pkg/kustomize/k8sdeps/transformer/patch
k8s.io/cli-runtime/pkg/kustomize/k8sdeps/validator
k8s.io/cli-runtime/pkg/printers
k8s.io/cli-runtime/pkg/resource
# k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible => github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.17.15-k3s1
# k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible => github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.17.17-k3s1
k8s.io/client-go/discovery
k8s.io/client-go/discovery/cached
k8s.io/client-go/discovery/cached/disk
@ -1614,20 +1614,20 @@ k8s.io/client-go/util/jsonpath
k8s.io/client-go/util/keyutil
k8s.io/client-go/util/retry
k8s.io/client-go/util/workqueue
# k8s.io/cloud-provider v0.0.0 => github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.17.15-k3s1
# k8s.io/cloud-provider v0.0.0 => github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.17.17-k3s1
k8s.io/cloud-provider
k8s.io/cloud-provider/node/helpers
k8s.io/cloud-provider/service/helpers
k8s.io/cloud-provider/volume
k8s.io/cloud-provider/volume/errors
k8s.io/cloud-provider/volume/helpers
# k8s.io/cluster-bootstrap v0.0.0 => github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.17.15-k3s1
# k8s.io/cluster-bootstrap v0.0.0 => github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.17.17-k3s1
k8s.io/cluster-bootstrap/token/api
k8s.io/cluster-bootstrap/token/jws
k8s.io/cluster-bootstrap/token/util
k8s.io/cluster-bootstrap/util/secrets
k8s.io/cluster-bootstrap/util/tokens
# k8s.io/code-generator v0.17.0 => github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.17.15-k3s1
# k8s.io/code-generator v0.17.0 => github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.17.17-k3s1
k8s.io/code-generator/cmd/client-gen/args
k8s.io/code-generator/cmd/client-gen/generators
k8s.io/code-generator/cmd/client-gen/generators/fake
@ -1642,7 +1642,7 @@ k8s.io/code-generator/cmd/lister-gen/args
k8s.io/code-generator/cmd/lister-gen/generators
k8s.io/code-generator/pkg/namer
k8s.io/code-generator/pkg/util
# k8s.io/component-base v0.0.0 => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.17.15-k3s1
# k8s.io/component-base v0.0.0 => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.17.17-k3s1
k8s.io/component-base/cli/flag
k8s.io/component-base/cli/globalflag
k8s.io/component-base/codec
@ -1659,10 +1659,10 @@ k8s.io/component-base/metrics/prometheus/version
k8s.io/component-base/metrics/prometheus/workqueue
k8s.io/component-base/version
k8s.io/component-base/version/verflag
# k8s.io/cri-api v0.0.0 => github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.17.15-k3s1
# k8s.io/cri-api v0.0.0 => github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.17.17-k3s1
k8s.io/cri-api/pkg/apis
k8s.io/cri-api/pkg/apis/runtime/v1alpha2
# k8s.io/csi-translation-lib v0.0.0 => github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.17.15-k3s1
# k8s.io/csi-translation-lib v0.0.0 => github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.17.17-k3s1
k8s.io/csi-translation-lib
k8s.io/csi-translation-lib/plugins
# k8s.io/gengo v0.0.0-20191120174120-e74f70b9b27e
@ -1677,7 +1677,7 @@ k8s.io/gengo/types
k8s.io/heapster/metrics/api/v1/types
# k8s.io/klog v1.0.0
k8s.io/klog
# k8s.io/kube-aggregator v0.17.0 => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.17.15-k3s1
# k8s.io/kube-aggregator v0.17.0 => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.17.17-k3s1
k8s.io/kube-aggregator/pkg/apis/apiregistration
k8s.io/kube-aggregator/pkg/apis/apiregistration/install
k8s.io/kube-aggregator/pkg/apis/apiregistration/v1
@ -1705,7 +1705,7 @@ k8s.io/kube-aggregator/pkg/controllers/status
k8s.io/kube-aggregator/pkg/registry/apiservice
k8s.io/kube-aggregator/pkg/registry/apiservice/etcd
k8s.io/kube-aggregator/pkg/registry/apiservice/rest
# k8s.io/kube-controller-manager v0.0.0 => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.17.15-k3s1
# k8s.io/kube-controller-manager v0.0.0 => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.17.17-k3s1
k8s.io/kube-controller-manager/config/v1alpha1
# k8s.io/kube-openapi v0.0.0-20200410145947-bcb3869e6f29
k8s.io/kube-openapi/pkg/aggregator
@ -1716,12 +1716,12 @@ k8s.io/kube-openapi/pkg/schemaconv
k8s.io/kube-openapi/pkg/util
k8s.io/kube-openapi/pkg/util/proto
k8s.io/kube-openapi/pkg/util/proto/validation
# k8s.io/kube-proxy v0.0.0 => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.17.15-k3s1
# k8s.io/kube-proxy v0.0.0 => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.17.17-k3s1
k8s.io/kube-proxy/config/v1alpha1
# k8s.io/kube-scheduler v0.0.0 => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.17.15-k3s1
# k8s.io/kube-scheduler v0.0.0 => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.17.17-k3s1
k8s.io/kube-scheduler/config/v1
k8s.io/kube-scheduler/config/v1alpha1
# k8s.io/kubectl v0.0.0 => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.17.15-k3s1
# k8s.io/kubectl v0.0.0 => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.17.17-k3s1
k8s.io/kubectl/pkg/apps
k8s.io/kubectl/pkg/cmd
k8s.io/kubectl/pkg/cmd/annotate
@ -1797,11 +1797,11 @@ k8s.io/kubectl/pkg/util/storage
k8s.io/kubectl/pkg/util/templates
k8s.io/kubectl/pkg/util/term
k8s.io/kubectl/pkg/validation
# k8s.io/kubelet v0.0.0 => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.17.15-k3s1
# k8s.io/kubelet v0.0.0 => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.17.17-k3s1
k8s.io/kubelet/config/v1beta1
k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1
k8s.io/kubelet/pkg/apis/pluginregistration/v1
# k8s.io/kubernetes v1.17.15 => github.com/k3s-io/kubernetes v1.17.15-k3s1
# k8s.io/kubernetes v1.17.17 => github.com/k3s-io/kubernetes v1.17.17-k3s1
k8s.io/kubernetes/cmd/cloud-controller-manager/app
k8s.io/kubernetes/cmd/cloud-controller-manager/app/apis/config
k8s.io/kubernetes/cmd/cloud-controller-manager/app/apis/config/scheme
@ -2538,7 +2538,7 @@ k8s.io/kubernetes/third_party/forked/gonum/graph
k8s.io/kubernetes/third_party/forked/gonum/graph/internal/linear
k8s.io/kubernetes/third_party/forked/gonum/graph/simple
k8s.io/kubernetes/third_party/forked/gonum/graph/traverse
# k8s.io/legacy-cloud-providers v0.0.0 => github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.17.15-k3s1
# k8s.io/legacy-cloud-providers v0.0.0 => github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.17.17-k3s1
k8s.io/legacy-cloud-providers/aws
k8s.io/legacy-cloud-providers/azure
k8s.io/legacy-cloud-providers/azure/auth
@ -2547,7 +2547,7 @@ k8s.io/legacy-cloud-providers/openstack
k8s.io/legacy-cloud-providers/vsphere
k8s.io/legacy-cloud-providers/vsphere/vclib
k8s.io/legacy-cloud-providers/vsphere/vclib/diskmanagers
# k8s.io/metrics v0.0.0 => github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.17.15-k3s1
# k8s.io/metrics v0.0.0 => github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.17.17-k3s1
k8s.io/metrics/pkg/apis/custom_metrics
k8s.io/metrics/pkg/apis/custom_metrics/v1beta1
k8s.io/metrics/pkg/apis/custom_metrics/v1beta2