github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-30 23:15:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #58846 from hzxuzhonghu/aggregator-fix

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 58783, 58800, 58846). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

runtime-config bug in kube-aggregator

**What this PR does / why we need it**:

kube-aggregator api has upgraded to v1, and introduce a little bug. I have to fix it.

**Special notes for your reviewer**:
/assign @deads2k 
**Release note**:

```release-note
NONE
```
This commit is contained in:
Kubernetes Submit Queue 2018-01-26 10:19:39 -08:00 committed by GitHub
commit 88abb431ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
staging/src/k8s.io/kube-aggregator/pkg/apiserver/apiserver.go
View File

@ -196,7 +196,7 @@ func (c completedConfig) NewWithDelegate(delegationTarget genericapiserver.Deleg
}
apiGroupInfo.VersionedResourcesStorageMap["v1beta1"] = storage
}
if apiResourceConfig.AnyResourcesForVersionEnabled(v1beta1.SchemeGroupVersion) {
if apiResourceConfig.AnyResourcesForVersionEnabled(v1.SchemeGroupVersion) {
apiGroupInfo.GroupMeta.GroupVersion = v1.SchemeGroupVersion
storage := map[string]rest.Storage{}
version := v1.SchemeGroupVersion