Skip to content

K
k3s
Commit 099d47f0 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #31089 from ping035627/ping035627-patch-0822

Automatic merge from submit-queue Optimise the DefaultGenerators function It needn't define all the generators in the "DefaultGenerators" function, it just return the "cmdName" generator, the others is redundant.
parents 34141a79 0926f7d3
Hide whitespace changes
Inline Side-by-side
Showing with 58 additions and 46 deletions
pkg/kubectl/cmd/util/factory.go
View file @ 099d47f0
...@@ -191,54 +191,66 @@ const ( ...@@ -191,54 +191,66 @@ const (
// DefaultGenerators returns the set of default generators for use in Factory instances // DefaultGenerators returns the set of default generators for use in Factory instances
func DefaultGenerators(cmdName string) map[string]kubectl.Generator { func DefaultGenerators(cmdName string) map[string]kubectl.Generator {
generators := map[string]map[string]kubectl.Generator{} var generator map[string]kubectl.Generator
generators["expose"] = map[string]kubectl.Generator{ switch cmdName {
ServiceV1GeneratorName: kubectl.ServiceGeneratorV1{}, case "expose":
ServiceV2GeneratorName: kubectl.ServiceGeneratorV2{}, generator = map[string]kubectl.Generator{
} ServiceV1GeneratorName: kubectl.ServiceGeneratorV1{},
generators["service-clusterip"] = map[string]kubectl.Generator{ ServiceV2GeneratorName: kubectl.ServiceGeneratorV2{},
ServiceClusterIPGeneratorV1Name: kubectl.ServiceClusterIPGeneratorV1{}, }
} case "service-clusterip":
generators["service-nodeport"] = map[string]kubectl.Generator{ generator = map[string]kubectl.Generator{
ServiceNodePortGeneratorV1Name: kubectl.ServiceNodePortGeneratorV1{}, ServiceClusterIPGeneratorV1Name: kubectl.ServiceClusterIPGeneratorV1{},
} }
generators["service-loadbalancer"] = map[string]kubectl.Generator{ case "service-nodeport":
ServiceLoadBalancerGeneratorV1Name: kubectl.ServiceLoadBalancerGeneratorV1{}, generator = map[string]kubectl.Generator{
} ServiceNodePortGeneratorV1Name: kubectl.ServiceNodePortGeneratorV1{},
generators["deployment"] = map[string]kubectl.Generator{ }
DeploymentBasicV1Beta1GeneratorName: kubectl.DeploymentBasicGeneratorV1{}, case "service-loadbalancer":
} generator = map[string]kubectl.Generator{
generators["run"] = map[string]kubectl.Generator{ ServiceLoadBalancerGeneratorV1Name: kubectl.ServiceLoadBalancerGeneratorV1{},
RunV1GeneratorName: kubectl.BasicReplicationController{}, }
RunPodV1GeneratorName: kubectl.BasicPod{}, case "deployment":
DeploymentV1Beta1GeneratorName: kubectl.DeploymentV1Beta1{}, generator = map[string]kubectl.Generator{
JobV1Beta1GeneratorName: kubectl.JobV1Beta1{}, DeploymentBasicV1Beta1GeneratorName: kubectl.DeploymentBasicGeneratorV1{},
JobV1GeneratorName: kubectl.JobV1{}, }
ScheduledJobV2Alpha1GeneratorName: kubectl.ScheduledJobV2Alpha1{}, case "run":
} generator = map[string]kubectl.Generator{
generators["autoscale"] = map[string]kubectl.Generator{ RunV1GeneratorName: kubectl.BasicReplicationController{},
HorizontalPodAutoscalerV1Beta1GeneratorName: kubectl.HorizontalPodAutoscalerV1Beta1{}, RunPodV1GeneratorName: kubectl.BasicPod{},
HorizontalPodAutoscalerV1GeneratorName: kubectl.HorizontalPodAutoscalerV1{}, DeploymentV1Beta1GeneratorName: kubectl.DeploymentV1Beta1{},
} JobV1Beta1GeneratorName: kubectl.JobV1Beta1{},
generators["namespace"] = map[string]kubectl.Generator{ JobV1GeneratorName: kubectl.JobV1{},
NamespaceV1GeneratorName: kubectl.NamespaceGeneratorV1{}, ScheduledJobV2Alpha1GeneratorName: kubectl.ScheduledJobV2Alpha1{},
} }
case "autoscale":
generators["quota"] = map[string]kubectl.Generator{ generator = map[string]kubectl.Generator{
ResourceQuotaV1GeneratorName: kubectl.ResourceQuotaGeneratorV1{}, HorizontalPodAutoscalerV1Beta1GeneratorName: kubectl.HorizontalPodAutoscalerV1Beta1{},
} HorizontalPodAutoscalerV1GeneratorName: kubectl.HorizontalPodAutoscalerV1{},
}
generators["secret"] = map[string]kubectl.Generator{ case "namespace":
SecretV1GeneratorName: kubectl.SecretGeneratorV1{}, generator = map[string]kubectl.Generator{
} NamespaceV1GeneratorName: kubectl.NamespaceGeneratorV1{},
generators["secret-for-docker-registry"] = map[string]kubectl.Generator{ }
SecretForDockerRegistryV1GeneratorName: kubectl.SecretForDockerRegistryGeneratorV1{}, case "quota":
} generator = map[string]kubectl.Generator{
generators["secret-for-tls"] = map[string]kubectl.Generator{ ResourceQuotaV1GeneratorName: kubectl.ResourceQuotaGeneratorV1{},
SecretForTLSV1GeneratorName: kubectl.SecretForTLSGeneratorV1{}, }
case "secret":
generator = map[string]kubectl.Generator{
SecretV1GeneratorName: kubectl.SecretGeneratorV1{},
}
case "secret-for-docker-registry":
generator = map[string]kubectl.Generator{
SecretForDockerRegistryV1GeneratorName: kubectl.SecretForDockerRegistryGeneratorV1{},
}
case "secret-for-tls":
generator = map[string]kubectl.Generator{
SecretForTLSV1GeneratorName: kubectl.SecretForTLSGeneratorV1{},
}
} }
return generators[cmdName] return generator
} }
func getGroupVersionKinds(gvks []unversioned.GroupVersionKind, group string) []unversioned.GroupVersionKind { func getGroupVersionKinds(gvks []unversioned.GroupVersionKind, group string) []unversioned.GroupVersionKind {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment