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

Allow setting service account with kubectl run

Browse Source
This commit is contained in:
Jordan Liggitt 2017-05-23 20:32:00 -04:00
parent b039c6e185
commit e8f2879bfd
No known key found for this signature in database
GPG Key ID: 39928704103C7229
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/kubectl/cmd/run.go
View File

@ -117,6 +117,7 @@ func addRunFlags(cmd *cobra.Command) {
cmd.Flags().Bool("rm", false, "If true, delete resources created in this command for attached containers.") cmd.Flags().Bool("rm", false, "If true, delete resources created in this command for attached containers.")
cmd.Flags().String("overrides", "", i18n.T("An inline JSON override for the generated object. If this is non-empty, it is used to override the generated object. Requires that the object supply a valid apiVersion field.")) cmd.Flags().String("overrides", "", i18n.T("An inline JSON override for the generated object. If this is non-empty, it is used to override the generated object. Requires that the object supply a valid apiVersion field."))
cmd.Flags().StringArray("env", []string{}, "Environment variables to set in the container") cmd.Flags().StringArray("env", []string{}, "Environment variables to set in the container")
cmd.Flags().String("serviceaccount", "", "Service account to set in the pod spec")
cmd.Flags().String("port", "", i18n.T("The port that this container exposes. If --expose is true, this is also the port used by the service that is created.")) cmd.Flags().String("port", "", i18n.T("The port that this container exposes. If --expose is true, this is also the port used by the service that is created."))
cmd.Flags().Int("hostport", -1, "The host port mapping for the container port. To demonstrate a single-machine container.") cmd.Flags().Int("hostport", -1, "The host port mapping for the container port. To demonstrate a single-machine container.")
cmd.Flags().StringP("labels", "l", "", "Labels to apply to the pod(s).") cmd.Flags().StringP("labels", "l", "", "Labels to apply to the pod(s).")

8
pkg/kubectl/run.go
View File

@ -52,6 +52,7 @@ func (DeploymentV1Beta1) ParamNames() []GeneratorParam {
{"env", false}, {"env", false},
{"requests", false}, {"requests", false},
{"limits", false}, {"limits", false},
{"serviceaccount", false},
} }
} }
@ -141,6 +142,7 @@ func (DeploymentAppsV1Beta1) ParamNames() []GeneratorParam {
{"env", false}, {"env", false},
{"requests", false}, {"requests", false},
{"limits", false}, {"limits", false},
{"serviceaccount", false},
} }
} }
@ -306,6 +308,7 @@ func (JobV1) ParamNames() []GeneratorParam {
{"requests", false}, {"requests", false},
{"limits", false}, {"limits", false},
{"restart", false}, {"restart", false},
{"serviceaccount", false},
} }
} }
@ -400,6 +403,7 @@ func (CronJobV2Alpha1) ParamNames() []GeneratorParam {
{"limits", false}, {"limits", false},
{"restart", false}, {"restart", false},
{"schedule", true}, {"schedule", true},
{"serviceaccount", false},
} }
} }
@ -498,6 +502,7 @@ func (BasicReplicationController) ParamNames() []GeneratorParam {
{"env", false}, {"env", false},
{"requests", false}, {"requests", false},
{"limits", false}, {"limits", false},
{"serviceaccount", false},
} }
} }
@ -603,6 +608,7 @@ func makePodSpec(params map[string]string, name string) (*v1.PodSpec, error) {
} }
spec := v1.PodSpec{ spec := v1.PodSpec{
ServiceAccountName: params["serviceaccount"],
Containers: []v1.Container{ Containers: []v1.Container{
{ {
Name: name, Name: name,
@ -761,6 +767,7 @@ func (BasicPod) ParamNames() []GeneratorParam {
{"env", false}, {"env", false},
{"requests", false}, {"requests", false},
{"limits", false}, {"limits", false},
{"serviceaccount", false},
} }
} }
@ -821,6 +828,7 @@ func (BasicPod) Generate(genericParams map[string]interface{}) (runtime.Object,
Labels: labels, Labels: labels,
}, },
Spec: v1.PodSpec{ Spec: v1.PodSpec{
ServiceAccountName: params["serviceaccount"],
Containers: []v1.Container{ Containers: []v1.Container{
{ {
Name: name, Name: name,