create configmap from-env-file #38882

fraenkel · 2016-12-16T18:46:17Z

Allow ConfigMaps to be created from Docker based env files.

Release-note:

1. create configmap has a new option --from-env-file that populates a configmap from file which follows a key=val format for each line.
2. create secret has a new option --from-env-file that populates a configmap from file which follows a key=val format for each line.

k8s-ci-robot · 2016-12-16T18:46:18Z

Hi @fraenkel. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with @k8s-bot ok to test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

If you have questions or suggestions related to this bot's behavior, please file an issue against the kubernetes/test-infra repository.

k8s-reviewable · 2016-12-16T18:46:24Z

This change is

fraenkel · 2017-01-16T15:18:16Z

@adohe Can we get this reviewed now that the proposal has been accepted. I will add some kubectl tests. I don't think e2e is needed.

bgrant0607 · 2017-01-20T03:03:25Z

ref #8800

fabianofranz · 2017-02-15T15:36:07Z

@k8s-bot ok to test

fabianofranz · 2017-02-17T16:57:21Z

pkg/kubectl/cmd/create_configmap.go

@@ -71,6 +77,7 @@ func NewCmdCreateConfigMap(f cmdutil.Factory, cmdOut io.Writer) *cobra.Command {
 	cmdutil.AddGeneratorFlags(cmd, cmdutil.ConfigMapV1GeneratorName)
 	cmd.Flags().StringSlice("from-file", []string{}, "Key files can be specified using their file path, in which case a default name will be given to them, or optionally with a name and file path, in which case the given name will be used.  Specifying a directory will iterate each named file in the directory that is a valid configmap key.")
 	cmd.Flags().StringArray("from-literal", []string{}, "Specify a key and literal value to insert in configmap (i.e. mykey=somevalue)")
+	cmd.Flags().String("from-env-file", "", "Specify an env file which contains key=val pairs that are inserted into a configmap.")


Reading the proposal, I think this should make it clear that multiple key=val pairs can be specified in lines, and that Docker .env is an example of valid file format. I'd suggest something like Specify the path to a file from which to read lines of key=val pairs to create as configmaps (i.e. a Docker .env file).

fabianofranz · 2017-02-17T16:57:50Z

pkg/kubectl/cmd/create_secret.go

@@ -85,6 +88,7 @@ func NewCmdCreateSecretGeneric(f cmdutil.Factory, cmdOut io.Writer) *cobra.Comma
 	cmdutil.AddGeneratorFlags(cmd, cmdutil.SecretV1GeneratorName)
 	cmd.Flags().StringSlice("from-file", []string{}, "Key files can be specified using their file path, in which case a default name will be given to them, or optionally with a name and file path, in which case the given name will be used.  Specifying a directory will iterate each named file in the directory that is a valid secret key.")
 	cmd.Flags().StringArray("from-literal", []string{}, "Specify a key and literal value to insert in secret (i.e. mykey=somevalue)")
+	cmd.Flags().String("from-env-file", "", "Specify an env file which contains key=val pairs that are inserted into a secret.")


fabianofranz · 2017-02-17T16:58:10Z

pkg/kubectl/cmd/create_configmap.go

+		  # Create a new configmap named my-config from the key=value pairs in the file
+		  kubectl create configmap my-config --from-file=path/to/bar
+
+			# Create a new configmap named my-config from an env file


Please correct the indentation here.

fabianofranz · 2017-02-17T16:58:50Z

pkg/kubectl/cmd/create_configmap.go

+		  kubectl create configmap my-config --from-file=path/to/bar
+
+			# Create a new configmap named my-config from an env file
+			kubectl create configmap my-config --from-env-file=path/to/bar`)


I'd suggest using .env in the examples, like ... --from-env-file=path/to/file.env.

fabianofranz · 2017-02-17T16:59:05Z

pkg/kubectl/cmd/create_secret.go

-	  kubectl create secret generic my-secret --from-literal=key1=supersecret --from-literal=key2=topsecret`)
+	  kubectl create secret generic my-secret --from-literal=key1=supersecret --from-literal=key2=topsecret
+
+		# Create a new secret named my-secret from an env file


Indentation.

fabianofranz · 2017-02-17T16:59:20Z

pkg/kubectl/cmd/create_secret.go

+	  kubectl create secret generic my-secret --from-literal=key1=supersecret --from-literal=key2=topsecret
+
+		# Create a new secret named my-secret from an env file
+		kubectl create secret generic my-secret --from-env-file=path/to/bar`)


Same, .env in the example.

fabianofranz · 2017-02-17T17:00:41Z

pkg/kubectl/configmap.go

@@ -186,6 +210,27 @@ func handleConfigMapFromFileSources(configMap *api.ConfigMap, fileSources []stri
 	return nil
 }

+// handleConfigMapFromEnvFileSources adds the specified env file source information


handleConfigMapFromEnvFileSource

fabianofranz · 2017-02-17T17:02:02Z

pkg/kubectl/configmap.go

+		}
+	}
+	if info.IsDir() {
+		return fmt.Errorf("must be a file")


"from-env-file must point to a file, not directory"

Right, if its a directory, we error saying it needs to be a file.

fabianofranz · 2017-02-17T17:08:16Z

pkg/kubectl/configmap.go

@@ -209,3 +254,48 @@ func addKeyFromLiteralToConfigMap(configMap *api.ConfigMap, keyName, data string
 	configMap.Data[keyName] = data
 	return nil
 }
+
+// addFromEnvFileToConfigMap adds an env file to a ConfigMap or returns an error.
+func addFromEnvFileToConfigMap(configMap *api.ConfigMap, filePath string) error {


Reuse the one in env_file.go?

Just needed to be removed.

fabianofranz · 2017-02-17T17:09:12Z

pkg/kubectl/env_file.go

+)
+
+// addFromEnvFile adds an env file to a ConfigMap or returns an error.
+func addFromEnvFile(filePath string, addTo func(key, value string) error) error {


Make it clear it's a generic func, not mentioning ConfigMap.

fraenkel · 2017-02-18T14:20:28Z

@fabianofranz All your concerns/comments should be resolved with this latest set of commits.

fabianofranz · 2017-02-20T19:11:23Z

@fraenkel tks! Note that the release note only mentions 'create configmap', must also include 'create secret'.

fabianofranz · 2017-02-20T19:11:40Z

/lgtm

fraenkel · 2017-02-21T11:43:09Z

@fabianofranz release note updated

fabianofranz · 2017-02-21T14:24:21Z

/approve
Thanks @fraenkel!

fabianofranz · 2017-02-21T17:10:00Z

/approve

fraenkel · 2017-03-11T15:16:13Z

Can someone add back the lgtm that got removed due to a rebase?

adohe-zz · 2017-03-12T03:59:28Z

/lgtm

k8s-github-robot · 2017-03-12T16:53:29Z

[APPROVALNOTIFIER] This PR is APPROVED

The following people have approved this PR: AdoHe, fabianofranz, fraenkel

Needs approval from an approver in each of these OWNERS Files:

~~hack/verify-flags/OWNERS~~ [fabianofranz]
~~pkg/kubectl/OWNERS~~ [fabianofranz]

We suggest the following people:
cc
You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

k8s-github-robot · 2017-03-24T19:33:24Z

Automatic merge from submit-queue (batch tested with PRs 41139, 41186, 38882, 37698, 42034)

k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Dec 16, 2016

k8s-github-robot assigned adohe-zz Dec 16, 2016

k8s-github-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. release-note-label-needed labels Dec 16, 2016

k8s-github-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed release-note-label-needed labels Jan 8, 2017

fraenkel force-pushed the configmap_env_file branch from 764d60c to e153ccc Compare January 12, 2017 15:36

fraenkel mentioned this pull request Jan 12, 2017

Initial --from-env-file proposal kubernetes/community#168

Merged

fraenkel mentioned this pull request Jan 17, 2017

Feature request: env_file support #40001

Closed

k8s-github-robot assigned fabianofranz and unassigned adohe-zz Jan 30, 2017

apelisse assigned adohe-zz Jan 31, 2017

fraenkel mentioned this pull request Feb 1, 2017

ENV files for pods #8800

Closed

fraenkel force-pushed the configmap_env_file branch 2 times, most recently from e1750ed to 9f254db Compare February 15, 2017 17:11

fabianofranz reviewed Feb 17, 2017

View reviewed changes

fraenkel force-pushed the configmap_env_file branch from 9f254db to a20349e Compare February 18, 2017 14:10

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 20, 2017

k8s-github-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Feb 21, 2017

k8s-github-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. and removed approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Mar 1, 2017

fraenkel added 2 commits March 8, 2017 07:58

create configmap from-env-file

7eb4962

create secret from-env-file

f281515

fraenkel force-pushed the configmap_env_file branch from a20349e to f281515 Compare March 8, 2017 15:59

k8s-github-robot removed lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Mar 8, 2017

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 12, 2017

fraenkel mentioned this pull request Mar 14, 2017

Create environment variables from all keys in a Secret/Configmap kubernetes/enhancements#174

Closed

23 tasks

k8s-github-robot merged commit 0e17e5b into kubernetes:master Mar 24, 2017

KnVerey mentioned this pull request Nov 7, 2022

Fix example of kubectl create configmap command #110209

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

create configmap from-env-file #38882

create configmap from-env-file #38882

fraenkel commented Dec 16, 2016 •

edited

Loading

k8s-ci-robot commented Dec 16, 2016

k8s-reviewable commented Dec 16, 2016

fraenkel commented Jan 16, 2017

bgrant0607 commented Jan 20, 2017

fabianofranz commented Feb 15, 2017

fabianofranz Feb 17, 2017

fabianofranz Feb 17, 2017

fabianofranz Feb 17, 2017

fabianofranz Feb 17, 2017

fabianofranz Feb 17, 2017

fabianofranz Feb 17, 2017

fabianofranz Feb 17, 2017

fabianofranz Feb 17, 2017

fraenkel Feb 18, 2017

fabianofranz Feb 17, 2017

fraenkel Feb 18, 2017

fabianofranz Feb 17, 2017

fraenkel commented Feb 18, 2017

fabianofranz commented Feb 20, 2017

fabianofranz commented Feb 20, 2017

fraenkel commented Feb 21, 2017

fabianofranz commented Feb 21, 2017

fabianofranz commented Feb 21, 2017

fraenkel commented Mar 11, 2017

adohe-zz commented Mar 12, 2017

k8s-github-robot commented Mar 12, 2017

k8s-github-robot commented Mar 24, 2017

create configmap from-env-file #38882

create configmap from-env-file #38882

Conversation

fraenkel commented Dec 16, 2016 • edited Loading

k8s-ci-robot commented Dec 16, 2016

k8s-reviewable commented Dec 16, 2016

fraenkel commented Jan 16, 2017

bgrant0607 commented Jan 20, 2017

fabianofranz commented Feb 15, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

fraenkel commented Feb 18, 2017

fabianofranz commented Feb 20, 2017

fabianofranz commented Feb 20, 2017

fraenkel commented Feb 21, 2017

fabianofranz commented Feb 21, 2017

fabianofranz commented Feb 21, 2017

fraenkel commented Mar 11, 2017

adohe-zz commented Mar 12, 2017

k8s-github-robot commented Mar 12, 2017

k8s-github-robot commented Mar 24, 2017

fraenkel commented Dec 16, 2016 •

edited

Loading