Add credentials export option for git sources
This commit is contained in:
@@ -16,6 +16,12 @@ var exportKsCmd = &cobra.Command{
|
|||||||
Use: "kustomization [name]",
|
Use: "kustomization [name]",
|
||||||
Aliases: []string{"ks"},
|
Aliases: []string{"ks"},
|
||||||
Short: "Export kustomization in YAML format",
|
Short: "Export kustomization in YAML format",
|
||||||
|
Example: ` # Export all kustomizations
|
||||||
|
export kustomization --all > kustomizations.yaml
|
||||||
|
|
||||||
|
# Export a kustomization
|
||||||
|
export kustomization my-app > kustomization.yaml
|
||||||
|
`,
|
||||||
RunE: exportKsCmdRun,
|
RunE: exportKsCmdRun,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -9,6 +9,12 @@ var exportSourceCmd = &cobra.Command{
|
|||||||
Short: "Export source commands",
|
Short: "Export source commands",
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var (
|
||||||
|
exportSourceWithCred bool
|
||||||
|
)
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
|
exportSourceCmd.PersistentFlags().BoolVar(&exportSourceWithCred, "with-credentials", false, "include credential secrets")
|
||||||
|
|
||||||
exportCmd.AddCommand(exportSourceCmd)
|
exportCmd.AddCommand(exportSourceCmd)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import (
|
|||||||
|
|
||||||
sourcev1 "github.com/fluxcd/source-controller/api/v1alpha1"
|
sourcev1 "github.com/fluxcd/source-controller/api/v1alpha1"
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
|
corev1 "k8s.io/api/core/v1"
|
||||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||||
"k8s.io/apimachinery/pkg/types"
|
"k8s.io/apimachinery/pkg/types"
|
||||||
"sigs.k8s.io/controller-runtime/pkg/client"
|
"sigs.k8s.io/controller-runtime/pkg/client"
|
||||||
@@ -14,7 +15,13 @@ import (
|
|||||||
|
|
||||||
var exportSourceGitCmd = &cobra.Command{
|
var exportSourceGitCmd = &cobra.Command{
|
||||||
Use: "git [name]",
|
Use: "git [name]",
|
||||||
Short: "Export git source in YAML format",
|
Short: "Export git sources in YAML format",
|
||||||
|
Example: ` # Export all git sources
|
||||||
|
export source git --all > sources.yaml
|
||||||
|
|
||||||
|
# Export a git source including the SSH keys or basic auth credentials
|
||||||
|
export source git my-private-repo --with-credentials > source.yaml
|
||||||
|
`,
|
||||||
RunE: exportSourceGitCmdRun,
|
RunE: exportSourceGitCmdRun,
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -51,6 +58,11 @@ func exportSourceGitCmdRun(cmd *cobra.Command, args []string) error {
|
|||||||
if err := exportGit(repository); err != nil {
|
if err := exportGit(repository); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
if exportSourceWithCred {
|
||||||
|
if err := exportGitCredentials(ctx, kubeClient, repository); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
name := args[0]
|
name := args[0]
|
||||||
@@ -63,7 +75,12 @@ func exportSourceGitCmdRun(cmd *cobra.Command, args []string) error {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
return exportGit(repository)
|
if err := exportGit(repository); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if exportSourceWithCred {
|
||||||
|
return exportGitCredentials(ctx, kubeClient, repository)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
@@ -91,3 +108,39 @@ func exportGit(source sourcev1.GitRepository) error {
|
|||||||
fmt.Println(string(data))
|
fmt.Println(string(data))
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func exportGitCredentials(ctx context.Context, kubeClinet client.Client, source sourcev1.GitRepository) error {
|
||||||
|
if source.Spec.SecretRef != nil {
|
||||||
|
namespacedName := types.NamespacedName{
|
||||||
|
Namespace: source.Namespace,
|
||||||
|
Name: source.Spec.SecretRef.Name,
|
||||||
|
}
|
||||||
|
var cred corev1.Secret
|
||||||
|
err := kubeClinet.Get(ctx, namespacedName, &cred)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("get secret failed: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
exported := corev1.Secret{
|
||||||
|
TypeMeta: metav1.TypeMeta{
|
||||||
|
APIVersion: "v1",
|
||||||
|
Kind: "Secret",
|
||||||
|
},
|
||||||
|
ObjectMeta: metav1.ObjectMeta{
|
||||||
|
Name: namespacedName.Name,
|
||||||
|
Namespace: namespacedName.Namespace,
|
||||||
|
},
|
||||||
|
Data: cred.Data,
|
||||||
|
Type: cred.Type,
|
||||||
|
}
|
||||||
|
|
||||||
|
data, err := yaml.Marshal(exported)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
fmt.Println("---")
|
||||||
|
fmt.Println(string(data))
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ import (
|
|||||||
|
|
||||||
kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1alpha1"
|
kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1alpha1"
|
||||||
sourcev1 "github.com/fluxcd/source-controller/api/v1alpha1"
|
sourcev1 "github.com/fluxcd/source-controller/api/v1alpha1"
|
||||||
|
corev1 "k8s.io/api/core/v1"
|
||||||
"k8s.io/apimachinery/pkg/runtime"
|
"k8s.io/apimachinery/pkg/runtime"
|
||||||
"k8s.io/client-go/tools/clientcmd"
|
"k8s.io/client-go/tools/clientcmd"
|
||||||
"sigs.k8s.io/controller-runtime/pkg/client"
|
"sigs.k8s.io/controller-runtime/pkg/client"
|
||||||
@@ -98,6 +99,7 @@ func (*Utils) kubeClient(config string) (client.Client, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
scheme := runtime.NewScheme()
|
scheme := runtime.NewScheme()
|
||||||
|
_ = corev1.AddToScheme(scheme)
|
||||||
_ = sourcev1.AddToScheme(scheme)
|
_ = sourcev1.AddToScheme(scheme)
|
||||||
_ = kustomizev1.AddToScheme(scheme)
|
_ = kustomizev1.AddToScheme(scheme)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user