github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 05:27:21 +00:00
Code Issues Projects Releases Wiki Activity

fixup! unblock resources that the storage version manager depends on

Browse Source
This commit is contained in:
Haowei Cai 2020-11-12 16:37:17 -08:00
parent 1d5a8f8f24
commit f9f6959284
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
staging/src/k8s.io/apiserver/pkg/endpoints/filters/storageversion.go
View File

@ -78,9 +78,9 @@ func WithStorageVersionPrecondition(handler http.Handler, svm storageversion.Man
// NOTE: with this exception, if the bootstrap client writes namespaces with a new version, // NOTE: with this exception, if the bootstrap client writes namespaces with a new version,
// and the upgraded apiserver dies before updating the StorageVersion for namespaces, the // and the upgraded apiserver dies before updating the StorageVersion for namespaces, the
// storage migrator won't be able to tell these namespaces are stored in a different version in etcd. // storage migrator won't be able to tell these namespaces are stored in a different version in etcd.
// Because the bootstrap client only creates system namespace and doesn't update them. This can // Because the bootstrap client only creates system namespace and doesn't update them, this can
// only happen if the upgraded apiserver is the first apiserver that kicks off namespace creation, // only happen if the upgraded apiserver is the first apiserver that kicks off namespace creation,
// or if a upgraded server that joins an existing cluster have new system namespaces (other // or if an upgraded server that joins an existing cluster has new system namespaces (other
// than kube-system, kube-public, kube-node-lease) that need to be created. // than kube-system, kube-public, kube-node-lease) that need to be created.
u, hasUser := request.UserFrom(ctx) u, hasUser := request.UserFrom(ctx)
if requestInfo.APIGroup == "" && requestInfo.Resource == "namespaces" && if requestInfo.APIGroup == "" && requestInfo.Resource == "namespaces" &&