mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-22 11:21:47 +00:00
Merge pull request #60302 from deads2k/cli-19-revert
Automatic merge from submit-queue (batch tested with PRs 60302, 57921, 59042, 60126, 59561). 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>. Revert "Allow env to be updated via specific key in resource" This introduced an unstable test that is failing in our queue. /assign @soltysh I'm trying to find a real fix, but let's get the revert tested and ready. ```release-note NONE ```
This commit is contained in:
Kubernetes Submit Queue
GitHub
commit
d75f414d17
@ -79,9 +79,6 @@ var (
|
||||
# Import environment from a config map with a prefix
|
||||
kubectl set env --from=configmap/myconfigmap --prefix=MYSQL_ deployment/myapp
|
||||
|
||||
# Import specific keys from a config map
|
||||
kubectl set env --keys=my-example-key --from=configmap/myconfigmap deployment/myapp
|
||||
|
||||
# Remove the environment variable ENV from container 'c1' in all deployment configs
|
||||
kubectl set env deployments --all --containers="c1" ENV-
|
||||
|
||||
@ -117,7 +114,6 @@ type EnvOptions struct {
|
||||
Output string
|
||||
From string
|
||||
Prefix string
|
||||
Keys []string
|
||||
|
||||
Builder *resource.Builder
|
||||
Infos []*resource.Info
|
||||
@ -141,8 +137,7 @@ func NewCmdEnv(f cmdutil.Factory, in io.Reader, out, errout io.Writer) *cobra.Co
|
||||
Long: envLong,
|
||||
Example: fmt.Sprintf(envExample),
|
||||
Run: func(cmd *cobra.Command, args []string) {
|
||||
options.Complete(f, cmd)
|
||||
cmdutil.CheckErr(options.Validate(args))
|
||||
cmdutil.CheckErr(options.Complete(f, cmd, args))
|
||||
cmdutil.CheckErr(options.RunEnv(f))
|
||||
},
|
||||
}
|
||||
@ -152,7 +147,6 @@ func NewCmdEnv(f cmdutil.Factory, in io.Reader, out, errout io.Writer) *cobra.Co
|
||||
cmd.Flags().StringP("from", "", "", "The name of a resource from which to inject environment variables")
|
||||
cmd.Flags().StringP("prefix", "", "", "Prefix to append to variable names")
|
||||
cmd.Flags().StringArrayVarP(&options.EnvParams, "env", "e", options.EnvParams, "Specify a key-value pair for an environment variable to set into each container.")
|
||||
cmd.Flags().StringSliceVarP(&options.Keys, "keys", "", options.Keys, "Comma-separated list of keys to import from specified resource")
|
||||
cmd.Flags().BoolVar(&options.List, "list", options.List, "If true, display the environment and any changes in the standard format. this flag will removed when we have kubectl view env.")
|
||||
cmd.Flags().BoolVar(&options.Resolve, "resolve", options.Resolve, "If true, show secret or configmap references when listing variables")
|
||||
cmd.Flags().StringVarP(&options.Selector, "selector", "l", options.Selector, "Selector (label query) to filter on")
|
||||
@ -179,20 +173,18 @@ func keyToEnvName(key string) string {
|
||||
return strings.ToUpper(validEnvNameRegexp.ReplaceAllString(key, "_"))
|
||||
}
|
||||
|
||||
func contains(key string, keyList []string) bool {
|
||||
if len(keyList) == 0 {
|
||||
return true
|
||||
func (o *EnvOptions) Complete(f cmdutil.Factory, cmd *cobra.Command, args []string) error {
|
||||
if o.All && len(o.Selector) > 0 {
|
||||
return fmt.Errorf("cannot set --all and --selector at the same time")
|
||||
}
|
||||
resources, envArgs, ok := envutil.SplitEnvironmentFromResources(args)
|
||||
if !ok {
|
||||
return cmdutil.UsageErrorf(o.Cmd, "all resources must be specified before environment changes: %s", strings.Join(args, " "))
|
||||
}
|
||||
if len(o.Filenames) == 0 && len(resources) < 1 {
|
||||
return cmdutil.UsageErrorf(cmd, "one or more resources must be specified as <resource> <name> or <resource>/<name>")
|
||||
}
|
||||
|
||||
for _, k := range keyList {
|
||||
if k == key {
|
||||
return true
|
||||
}
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
func (o *EnvOptions) Complete(f cmdutil.Factory, cmd *cobra.Command) {
|
||||
o.UpdatePodSpecForObject = f.UpdatePodSpecForObject
|
||||
o.ContainerSelector = cmdutil.GetFlagString(cmd, "containers")
|
||||
o.List = cmdutil.GetFlagBool(cmd, "list")
|
||||
@ -203,38 +195,18 @@ func (o *EnvOptions) Complete(f cmdutil.Factory, cmd *cobra.Command) {
|
||||
o.Output = cmdutil.GetFlagString(cmd, "output")
|
||||
o.From = cmdutil.GetFlagString(cmd, "from")
|
||||
o.Prefix = cmdutil.GetFlagString(cmd, "prefix")
|
||||
o.Keys = cmdutil.GetFlagStringSlice(cmd, "keys")
|
||||
o.DryRun = cmdutil.GetDryRunFlag(cmd)
|
||||
|
||||
o.EnvArgs = envArgs
|
||||
o.Resources = resources
|
||||
o.Cmd = cmd
|
||||
|
||||
o.ShortOutput = cmdutil.GetFlagString(cmd, "output") == "name"
|
||||
|
||||
}
|
||||
|
||||
func (o *EnvOptions) Validate(args []string) error {
|
||||
if o.All && len(o.Selector) > 0 {
|
||||
return fmt.Errorf("cannot set --all and --selector at the same time")
|
||||
}
|
||||
resources, envArgs, ok := envutil.SplitEnvironmentFromResources(args)
|
||||
if !ok {
|
||||
return cmdutil.UsageErrorf(o.Cmd, "all resources must be specified before environment changes: %s", strings.Join(args, " "))
|
||||
}
|
||||
|
||||
if len(o.Filenames) == 0 && len(resources) == 0 {
|
||||
return cmdutil.UsageErrorf(o.Cmd, "one or more resources must be specified as <resource> <name> or <resource>/<name>")
|
||||
}
|
||||
|
||||
if o.List && len(o.Output) > 0 {
|
||||
return cmdutil.UsageErrorf(o.Cmd, "--list and --output may not be specified together")
|
||||
}
|
||||
|
||||
if len(o.Keys) > 0 && len(o.From) == 0 {
|
||||
return cmdutil.UsageErrorf(o.Cmd, "when specifying --keys, a configmap or secret must be provided with --from")
|
||||
}
|
||||
|
||||
o.EnvArgs = envArgs
|
||||
o.Resources = resources
|
||||
return nil
|
||||
}
|
||||
|
||||
@ -299,9 +271,7 @@ func (o *EnvOptions) RunEnv(f cmdutil.Factory) error {
|
||||
},
|
||||
},
|
||||
}
|
||||
if contains(key, o.Keys) {
|
||||
env = append(env, envVar)
|
||||
}
|
||||
env = append(env, envVar)
|
||||
}
|
||||
case *v1.ConfigMap:
|
||||
for key := range from.Data {
|
||||
@ -316,9 +286,7 @@ func (o *EnvOptions) RunEnv(f cmdutil.Factory) error {
|
||||
},
|
||||
},
|
||||
}
|
||||
if contains(key, o.Keys) {
|
||||
env = append(env, envVar)
|
||||
}
|
||||
env = append(env, envVar)
|
||||
}
|
||||
default:
|
||||
return fmt.Errorf("unsupported resource specified in --from")
|
||||
|
||||
@ -69,8 +69,7 @@ func TestSetEnvLocal(t *testing.T) {
|
||||
Filenames: []string{"../../../../examples/storage/cassandra/cassandra-controller.yaml"}},
|
||||
Out: buf,
|
||||
Local: true}
|
||||
opts.Complete(tf, cmd)
|
||||
err := opts.Validate([]string{"env=prod"})
|
||||
err := opts.Complete(tf, cmd, []string{"env=prod"})
|
||||
if err == nil {
|
||||
err = opts.RunEnv(tf)
|
||||
}
|
||||
@ -107,8 +106,7 @@ func TestSetMultiResourcesEnvLocal(t *testing.T) {
|
||||
Filenames: []string{"../../../../test/fixtures/pkg/kubectl/cmd/set/multi-resource-yaml.yaml"}},
|
||||
Out: buf,
|
||||
Local: true}
|
||||
opts.Complete(tf, cmd)
|
||||
err := opts.Validate([]string{"env=prod"})
|
||||
err := opts.Complete(tf, cmd, []string{"env=prod"})
|
||||
if err == nil {
|
||||
err = opts.RunEnv(tf)
|
||||
}
|
||||
@ -123,13 +121,11 @@ func TestSetMultiResourcesEnvLocal(t *testing.T) {
|
||||
}
|
||||
|
||||
func TestSetEnvRemote(t *testing.T) {
|
||||
out := new(bytes.Buffer)
|
||||
inputs := []struct {
|
||||
object runtime.Object
|
||||
apiPrefix, apiGroup, apiVersion string
|
||||
testAPIGroup string
|
||||
args []string
|
||||
opts *EnvOptions
|
||||
}{
|
||||
{
|
||||
object: &extensionsv1beta1.ReplicaSet{
|
||||
@ -150,7 +146,6 @@ func TestSetEnvRemote(t *testing.T) {
|
||||
testAPIGroup: "extensions",
|
||||
apiPrefix: "/apis", apiGroup: "extensions", apiVersion: "v1beta1",
|
||||
args: []string{"replicaset", "nginx", "env=prod"},
|
||||
opts: &EnvOptions{Out: out, Local: false},
|
||||
},
|
||||
{
|
||||
object: &appsv1beta2.ReplicaSet{
|
||||
@ -171,7 +166,6 @@ func TestSetEnvRemote(t *testing.T) {
|
||||
testAPIGroup: "extensions",
|
||||
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1beta2",
|
||||
args: []string{"replicaset", "nginx", "env=prod"},
|
||||
opts: &EnvOptions{Out: out, Local: false},
|
||||
},
|
||||
{
|
||||
object: &appsv1.ReplicaSet{
|
||||
@ -192,7 +186,6 @@ func TestSetEnvRemote(t *testing.T) {
|
||||
testAPIGroup: "extensions",
|
||||
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1",
|
||||
args: []string{"replicaset", "nginx", "env=prod"},
|
||||
opts: &EnvOptions{Out: out, Local: false},
|
||||
},
|
||||
{
|
||||
object: &extensionsv1beta1.DaemonSet{
|
||||
@ -213,7 +206,6 @@ func TestSetEnvRemote(t *testing.T) {
|
||||
testAPIGroup: "extensions",
|
||||
apiPrefix: "/apis", apiGroup: "extensions", apiVersion: "v1beta1",
|
||||
args: []string{"daemonset", "nginx", "env=prod"},
|
||||
opts: &EnvOptions{Out: out, Local: false},
|
||||
},
|
||||
{
|
||||
object: &appsv1beta2.DaemonSet{
|
||||
@ -234,7 +226,6 @@ func TestSetEnvRemote(t *testing.T) {
|
||||
testAPIGroup: "extensions",
|
||||
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1beta2",
|
||||
args: []string{"daemonset", "nginx", "env=prod"},
|
||||
opts: &EnvOptions{Out: out, Local: false},
|
||||
},
|
||||
{
|
||||
object: &appsv1.DaemonSet{
|
||||
@ -255,7 +246,6 @@ func TestSetEnvRemote(t *testing.T) {
|
||||
testAPIGroup: "extensions",
|
||||
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1",
|
||||
args: []string{"daemonset", "nginx", "env=prod"},
|
||||
opts: &EnvOptions{Out: out, Local: false},
|
||||
},
|
||||
{
|
||||
object: &extensionsv1beta1.Deployment{
|
||||
@ -276,7 +266,6 @@ func TestSetEnvRemote(t *testing.T) {
|
||||
testAPIGroup: "extensions",
|
||||
apiPrefix: "/apis", apiGroup: "extensions", apiVersion: "v1beta1",
|
||||
args: []string{"deployment", "nginx", "env=prod"},
|
||||
opts: &EnvOptions{Out: out, Local: false},
|
||||
},
|
||||
{
|
||||
object: &appsv1beta1.Deployment{
|
||||
@ -297,7 +286,6 @@ func TestSetEnvRemote(t *testing.T) {
|
||||
testAPIGroup: "extensions",
|
||||
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1beta1",
|
||||
args: []string{"deployment", "nginx", "env=prod"},
|
||||
opts: &EnvOptions{Out: out, Local: false},
|
||||
},
|
||||
{
|
||||
object: &appsv1beta2.Deployment{
|
||||
@ -318,7 +306,6 @@ func TestSetEnvRemote(t *testing.T) {
|
||||
testAPIGroup: "extensions",
|
||||
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1beta2",
|
||||
args: []string{"deployment", "nginx", "env=prod"},
|
||||
opts: &EnvOptions{Out: out, Local: false},
|
||||
},
|
||||
{
|
||||
object: &appsv1.Deployment{
|
||||
@ -339,7 +326,6 @@ func TestSetEnvRemote(t *testing.T) {
|
||||
testAPIGroup: "extensions",
|
||||
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1",
|
||||
args: []string{"deployment", "nginx", "env=prod"},
|
||||
opts: &EnvOptions{Out: out, Local: false},
|
||||
},
|
||||
{
|
||||
object: &appsv1beta1.StatefulSet{
|
||||
@ -360,7 +346,6 @@ func TestSetEnvRemote(t *testing.T) {
|
||||
testAPIGroup: "apps",
|
||||
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1beta1",
|
||||
args: []string{"statefulset", "nginx", "env=prod"},
|
||||
opts: &EnvOptions{Out: out, Local: false},
|
||||
},
|
||||
{
|
||||
object: &appsv1beta2.StatefulSet{
|
||||
@ -381,7 +366,6 @@ func TestSetEnvRemote(t *testing.T) {
|
||||
testAPIGroup: "apps",
|
||||
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1beta2",
|
||||
args: []string{"statefulset", "nginx", "env=prod"},
|
||||
opts: &EnvOptions{Out: out, Local: false},
|
||||
},
|
||||
{
|
||||
object: &appsv1.StatefulSet{
|
||||
@ -402,7 +386,6 @@ func TestSetEnvRemote(t *testing.T) {
|
||||
testAPIGroup: "apps",
|
||||
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1",
|
||||
args: []string{"statefulset", "nginx", "env=prod"},
|
||||
opts: &EnvOptions{Out: out, Local: false},
|
||||
},
|
||||
{
|
||||
object: &batchv1.Job{
|
||||
@ -423,7 +406,6 @@ func TestSetEnvRemote(t *testing.T) {
|
||||
testAPIGroup: "batch",
|
||||
apiPrefix: "/apis", apiGroup: "batch", apiVersion: "v1",
|
||||
args: []string{"job", "nginx", "env=prod"},
|
||||
opts: &EnvOptions{Out: out, Local: false},
|
||||
},
|
||||
{
|
||||
object: &v1.ReplicationController{
|
||||
@ -444,54 +426,6 @@ func TestSetEnvRemote(t *testing.T) {
|
||||
testAPIGroup: "",
|
||||
apiPrefix: "/api", apiGroup: "", apiVersion: "v1",
|
||||
args: []string{"replicationcontroller", "nginx", "env=prod"},
|
||||
opts: &EnvOptions{Out: out, Local: false},
|
||||
},
|
||||
{
|
||||
object: &appsv1.Deployment{
|
||||
ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
|
||||
Spec: appsv1.DeploymentSpec{
|
||||
Template: v1.PodTemplateSpec{
|
||||
Spec: v1.PodSpec{
|
||||
Containers: []v1.Container{
|
||||
{
|
||||
Name: "nginx",
|
||||
Image: "nginx",
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
testAPIGroup: "extensions",
|
||||
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1",
|
||||
args: []string{"deployment", "nginx", "env=prod"},
|
||||
opts: &EnvOptions{Out: out,
|
||||
Local: false,
|
||||
From: "configmap/myconfigmap"},
|
||||
},
|
||||
{
|
||||
object: &appsv1.Deployment{
|
||||
ObjectMeta: metav1.ObjectMeta{Name: "nginx"},
|
||||
Spec: appsv1.DeploymentSpec{
|
||||
Template: v1.PodTemplateSpec{
|
||||
Spec: v1.PodSpec{
|
||||
Containers: []v1.Container{
|
||||
{
|
||||
Name: "nginx",
|
||||
Image: "nginx",
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
testAPIGroup: "extensions",
|
||||
apiPrefix: "/apis", apiGroup: "apps", apiVersion: "v1",
|
||||
args: []string{"deployment", "nginx"},
|
||||
opts: &EnvOptions{Out: out,
|
||||
Local: false,
|
||||
Keys: []string{"test-key"},
|
||||
From: "configmap/myconfigmap"},
|
||||
},
|
||||
}
|
||||
for _, input := range inputs {
|
||||
@ -527,16 +461,16 @@ func TestSetEnvRemote(t *testing.T) {
|
||||
}),
|
||||
VersionedAPIPath: path.Join(input.apiPrefix, testapi.Default.GroupVersion().String()),
|
||||
}
|
||||
out := new(bytes.Buffer)
|
||||
cmd := NewCmdEnv(tf, out, out, out)
|
||||
cmd.SetOutput(out)
|
||||
cmd.Flags().Set("output", "yaml")
|
||||
opts := input.opts
|
||||
opts.Complete(tf, cmd)
|
||||
err := opts.Validate(input.args)
|
||||
opts := EnvOptions{
|
||||
Out: out,
|
||||
Local: false}
|
||||
err := opts.Complete(tf, cmd, input.args)
|
||||
assert.NoError(t, err)
|
||||
err = opts.RunEnv(tf)
|
||||
assert.NoError(t, err)
|
||||
}
|
||||
// TODO This global state restoration needs fixing, b/c it's wrong. Tests should not modify global state
|
||||
testapi.Default = testapi.Groups[""]
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user