Skip to content

Commit

Permalink
Merge pull request kubernetes#58846 from hzxuzhonghu/aggregator-fix
Browse files Browse the repository at this point in the history
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
```
  • Loading branch information
Kubernetes Submit Queue authored Jan 26, 2018
2 parents 910d1aa + 7bf825a commit 88abb43
Showing 1 changed file with 1 addition and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 88abb43

Please sign in to comment.