Merge pull request #3180 from briandowns/security-issue-584

add etcd s3 secret and access key flags to secret data

pkg/nodeconfig/nodeconfig.go

@@ -102,11 +102,15 @@ func isSecret(key string) bool {
 		version.ProgramUpper + "_DATASTORE_ENDPOINT",
 		version.ProgramUpper + "_AGENT_TOKEN",
 		version.ProgramUpper + "_CLUSTER_SECRET",
+		"AWS_ACCESS_KEY_ID",
+		"AWS_SECRET_ACCESS_KEY",
 		"--token",
 		"-t",
 		"--agent-token",
 		"--datastore-endpoint",
 		"--cluster-secret",
+		"--etcd-s3-access-key",
+		"--etcd-s3-secret-key",
 	}
 	for _, secret := range secretData {
 		if key == secret {