Mirrors/flux2
1
0
Fork 0
mirror of synced 2026-02-13 13:06:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix create secret commands

Browse Source 
Regression bug introduced in https://github.com/fluxcd/flux2/pull/788

Signed-off-by: Stefan Prodan <stefan.prodan@gmail.com>
This commit is contained in:
Stefan Prodan
2021-01-30 15:07:48 +02:00
parent 06bf469ba7
commit 4fd5684277
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/flux/create_secret.go
View File

@@ -51,6 +51,8 @@ func makeSecret(name string) (corev1.Secret, error) {
Namespace: rootArgs.namespace, Namespace: rootArgs.namespace,
Labels: secretLabels, Labels: secretLabels,
}, },
StringData: map[string]string{},
Data: nil,
}, nil }, nil
} }

14
cmd/flux/create_secret_git.go
View File

@@ -133,10 +133,10 @@ func createSecretGitCmdRun(cmd *cobra.Command, args []string) error {
return err return err
} }
secret.Data = map[string][]byte{ secret.StringData = map[string]string{
"identity": pair.PrivateKey, "identity": string(pair.PrivateKey),
"identity.pub": pair.PublicKey, "identity.pub": string(pair.PublicKey),
"known_hosts": hostKey, "known_hosts": string(hostKey),
} }
if !createArgs.export { if !createArgs.export {
@@ -148,9 +148,9 @@ func createSecretGitCmdRun(cmd *cobra.Command, args []string) error {
} }
// TODO: add cert data when it's implemented in source-controller // TODO: add cert data when it's implemented in source-controller
secret.Data = map[string][]byte{ secret.StringData = map[string]string{
"username": []byte(secretGitArgs.username), "username": secretGitArgs.username,
"password": []byte(secretGitArgs.password), "password": secretGitArgs.password,
} }
default: default:
return fmt.Errorf("git URL scheme '%s' not supported, can be: ssh, http and https", u.Scheme) return fmt.Errorf("git URL scheme '%s' not supported, can be: ssh, http and https", u.Scheme)