From e3f5a8fee308f18a599bacc88457d9efd057a1df Mon Sep 17 00:00:00 2001 From: Robert Wittman Date: Thu, 3 Feb 2022 11:07:55 -0500 Subject: [PATCH] Add GPG options to Gitlab and BitBucket bootstraps Signed-off-by: Robert Wittman --- cmd/flux/bootstrap_bitbucket_server.go | 1 + cmd/flux/bootstrap_github.go | 1 - cmd/flux/bootstrap_gitlab.go | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/cmd/flux/bootstrap_bitbucket_server.go b/cmd/flux/bootstrap_bitbucket_server.go index 56e1a906..d71754e4 100644 --- a/cmd/flux/bootstrap_bitbucket_server.go +++ b/cmd/flux/bootstrap_bitbucket_server.go @@ -254,6 +254,7 @@ func bootstrapBServerCmdRun(cmd *cobra.Command, args []string) error { bootstrap.WithKubeconfig(kubeconfigArgs), bootstrap.WithLogger(logger), bootstrap.WithCABundle(caBundle), + bootstrap.WithGitCommitSigning(bootstrapArgs.gpgKeyRingPath, bootstrapArgs.gpgPassphrase, bootstrapArgs.gpgKeyID), } if bootstrapArgs.sshHostname != "" { bootstrapOpts = append(bootstrapOpts, bootstrap.WithSSHHostname(bootstrapArgs.sshHostname)) diff --git a/cmd/flux/bootstrap_github.go b/cmd/flux/bootstrap_github.go index 904f6890..fd04ac6f 100644 --- a/cmd/flux/bootstrap_github.go +++ b/cmd/flux/bootstrap_github.go @@ -243,7 +243,6 @@ func bootstrapGitHubCmdRun(cmd *cobra.Command, args []string) error { bootstrap.WithKubeconfig(kubeconfigArgs), bootstrap.WithLogger(logger), bootstrap.WithCABundle(caBundle), - bootstrap.WithGitCommitSigning(bootstrapArgs.gpgKeyRingPath, bootstrapArgs.gpgPassphrase, bootstrapArgs.gpgKeyID), } if bootstrapArgs.sshHostname != "" { bootstrapOpts = append(bootstrapOpts, bootstrap.WithSSHHostname(bootstrapArgs.sshHostname)) diff --git a/cmd/flux/bootstrap_gitlab.go b/cmd/flux/bootstrap_gitlab.go index 6906a2a7..1e58834d 100644 --- a/cmd/flux/bootstrap_gitlab.go +++ b/cmd/flux/bootstrap_gitlab.go @@ -257,6 +257,7 @@ func bootstrapGitLabCmdRun(cmd *cobra.Command, args []string) error { bootstrap.WithKubeconfig(kubeconfigArgs), bootstrap.WithLogger(logger), bootstrap.WithCABundle(caBundle), + bootstrap.WithGitCommitSigning(bootstrapArgs.gpgKeyRingPath, bootstrapArgs.gpgPassphrase, bootstrapArgs.gpgKeyID), } if bootstrapArgs.sshHostname != "" { bootstrapOpts = append(bootstrapOpts, bootstrap.WithSSHHostname(bootstrapArgs.sshHostname))