forked from kubernetes/kubernetes
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
UPSTREAM: <carry>: use hardcoded rest mapper from library-go
- Loading branch information
Showing
16 changed files
with
243 additions
and
103 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,108 +1,11 @@ | ||
| package admission | ||
|
|
||
| import ( | ||
| "fmt" | ||
|
|
||
| "k8s.io/apimachinery/pkg/api/meta" | ||
| "k8s.io/apimachinery/pkg/runtime/schema" | ||
| ) | ||
|
|
||
| // defaultRESTMappings contains enough RESTMappings to have enough of the kube-controller-manager succeed when running | ||
| // against a kube-apiserver that cannot reach aggregated APIs to do a full mapping. This happens when the OwnerReferencesPermissionEnforcement | ||
| // admission plugin runs to confirm permissions. Don't add things just because you don't want to fail. These are here so that | ||
| // we can start enough back up to get the rest of the system working correctly. | ||
| var defaultRESTMappings = []meta.RESTMapping{ | ||
| { | ||
| GroupVersionKind: schema.GroupVersionKind{Group: "", Version: "v1", Kind: "ConfigMap"}, | ||
| Scope: meta.RESTScopeNamespace, | ||
| Resource: schema.GroupVersionResource{Group: "", Version: "v1", Resource: "configmaps"}, | ||
| }, | ||
| { | ||
| GroupVersionKind: schema.GroupVersionKind{Group: "", Version: "v1", Kind: "Pod"}, | ||
| Scope: meta.RESTScopeNamespace, | ||
| Resource: schema.GroupVersionResource{Group: "", Version: "v1", Resource: "pods"}, | ||
| }, | ||
| { | ||
| GroupVersionKind: schema.GroupVersionKind{Group: "", Version: "v1", Kind: "ReplicationController"}, | ||
| Scope: meta.RESTScopeNamespace, | ||
| Resource: schema.GroupVersionResource{Group: "", Version: "v1", Resource: "replicationcontrollers"}, | ||
| }, | ||
| { | ||
| GroupVersionKind: schema.GroupVersionKind{Group: "", Version: "v1", Kind: "Secret"}, | ||
| Scope: meta.RESTScopeNamespace, | ||
| Resource: schema.GroupVersionResource{Group: "", Version: "v1", Resource: "secrets"}, | ||
| }, | ||
| { | ||
| GroupVersionKind: schema.GroupVersionKind{Group: "", Version: "v1", Kind: "ServiceAccount"}, | ||
| Scope: meta.RESTScopeNamespace, | ||
| Resource: schema.GroupVersionResource{Group: "", Version: "v1", Resource: "serviceaccounts"}, | ||
| }, | ||
| { | ||
| GroupVersionKind: schema.GroupVersionKind{Group: "apps", Version: "v1", Kind: "ControllerRevision"}, | ||
| Scope: meta.RESTScopeNamespace, | ||
| Resource: schema.GroupVersionResource{Group: "apps", Version: "v1", Resource: "controllerrevisions"}, | ||
| }, | ||
| { | ||
| GroupVersionKind: schema.GroupVersionKind{Group: "apps", Version: "v1", Kind: "DaemonSet"}, | ||
| Scope: meta.RESTScopeNamespace, | ||
| Resource: schema.GroupVersionResource{Group: "apps", Version: "v1", Resource: "daemonsets"}, | ||
| }, | ||
| { | ||
| GroupVersionKind: schema.GroupVersionKind{Group: "apps", Version: "v1", Kind: "Deployment"}, | ||
| Scope: meta.RESTScopeNamespace, | ||
| Resource: schema.GroupVersionResource{Group: "apps", Version: "v1", Resource: "deployments"}, | ||
| }, | ||
| { | ||
| GroupVersionKind: schema.GroupVersionKind{Group: "apps", Version: "v1", Kind: "ReplicaSet"}, | ||
| Scope: meta.RESTScopeNamespace, | ||
| Resource: schema.GroupVersionResource{Group: "apps", Version: "v1", Resource: "replicasets"}, | ||
| }, | ||
| { | ||
| GroupVersionKind: schema.GroupVersionKind{Group: "apps", Version: "v1", Kind: "StatefulSet"}, | ||
| Scope: meta.RESTScopeNamespace, | ||
| Resource: schema.GroupVersionResource{Group: "apps", Version: "v1", Resource: "statefulsets"}, | ||
| }, | ||
| } | ||
| "github.com/openshift/library-go/pkg/client/openshiftrestmapper" | ||
| ) | ||
|
|
||
| func NewAdmissionRESTMapper(delegate meta.RESTMapper) meta.RESTMapper { | ||
| ret := HardCodedFirstRESTMapper{ | ||
| Mapping: map[schema.GroupVersionKind]meta.RESTMapping{}, | ||
| RESTMapper: delegate, | ||
| } | ||
| for i := range defaultRESTMappings { | ||
| curr := defaultRESTMappings[i] | ||
| ret.Mapping[curr.GroupVersionKind] = curr | ||
| } | ||
| return ret | ||
| } | ||
|
|
||
| // HardCodedFirstRESTMapper is a RESTMapper that will look for hardcoded mappings first, then delegate. | ||
| // This is done in service to `OwnerReferencesPermissionEnforcement` | ||
| type HardCodedFirstRESTMapper struct { | ||
| Mapping map[schema.GroupVersionKind]meta.RESTMapping | ||
| meta.RESTMapper | ||
| } | ||
|
|
||
| var _ meta.RESTMapper = HardCodedFirstRESTMapper{} | ||
|
|
||
| func (m HardCodedFirstRESTMapper) String() string { | ||
| return fmt.Sprintf("HardCodedRESTMapper{\n\t%v\n%v\n}", m.Mapping, m.RESTMapper) | ||
| } | ||
|
|
||
| // RESTMapping is the only function called today. The firsthit restmapper ought to make this work right. OwnerReferencesPermissionEnforcement | ||
| // only ever calls with one version. | ||
| func (m HardCodedFirstRESTMapper) RESTMappings(gk schema.GroupKind, versions ...string) ([]*meta.RESTMapping, error) { | ||
| // not exactly one version, delegate | ||
| if len(versions) != 1 { | ||
| return m.RESTMapper.RESTMappings(gk, versions...) | ||
| } | ||
| gvk := gk.WithVersion(versions[0]) | ||
|
|
||
| single, ok := m.Mapping[gvk] | ||
| // not handled, delegate | ||
| if !ok { | ||
| return m.RESTMapper.RESTMappings(gk, versions...) | ||
| } | ||
|
|
||
| return []*meta.RESTMapping{&single}, nil | ||
| return openshiftrestmapper.NewOpenShiftHardcodedRESTMapper(delegate) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.