opensource/flux2
1
0
Fork 0
mirror of https://github.com/fluxcd/flux2.git synced 2025-11-04 03:46:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update source if exists

Browse Source
This commit is contained in:
stefanprodan
2020-04-28 11:51:22 +03:00
parent 57474fb274
commit 076aa09a99
1 changed files with 39 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
cmd/tk/create_source.go
View File

@ -22,10 +22,11 @@ import (
var createSourceCmd = &cobra.Command{ var createSourceCmd = &cobra.Command{
Use: "source [name]", Use: "source [name]",
Short: "Create source resource", Short: "Create or update a source resource",
Long: ` Long: `
The create source command generates a source.fluxcd.io resource and waits for it to sync. The create source command generates a source.fluxcd.io resource and waits for it to sync.
For Git over SSH, host and SSH keys are automatically generated.`, For Git over SSH, host and SSH keys are automatically generated and stored in a Kubernetes secret.
For private Git repositories, the basic authentication credentials are stored in a Kubernetes secret.`,
Example: ` # Create a source from a public Git repository master branch Example: ` # Create a source from a public Git repository master branch
create source podinfo --git-url https://github.com/stefanprodan/podinfo-deploy --git-branch master create source podinfo --git-url https://github.com/stefanprodan/podinfo-deploy --git-branch master
@ -131,20 +132,8 @@ func createSourceCmdRun(cmd *cobra.Command, args []string) error {
return err return err
} }
namespacedName := types.NamespacedName{ if err := upsertGitRepository(ctx, kubeClient, gitRepository); err != nil {
Namespace: namespace, return err
Name: name,
}
err = kubeClient.Get(ctx, namespacedName, &gitRepository)
if errors.IsNotFound(err) {
if err := kubeClient.Create(ctx, &gitRepository); err != nil {
return err
}
} else {
if err := kubeClient.Update(ctx, &gitRepository); err != nil {
return err
}
} }
logAction("waiting for source sync") logAction("waiting for source sync")
@ -155,13 +144,17 @@ func createSourceCmdRun(cmd *cobra.Command, args []string) error {
logSuccess("source %s is ready", name) logSuccess("source %s is ready", name)
namespacedName := types.NamespacedName{
Namespace: namespace,
Name: name,
}
err = kubeClient.Get(ctx, namespacedName, &gitRepository) err = kubeClient.Get(ctx, namespacedName, &gitRepository)
if err != nil { if err != nil {
return fmt.Errorf("source sync failed: %w", err) return fmt.Errorf("source sync failed: %w", err)
} }
if gitRepository.Status.Artifact != nil { if gitRepository.Status.Artifact != nil {
logSuccess("revision %s", gitRepository.Status.Artifact.Revision) logSuccess("fetched revision %s", gitRepository.Status.Artifact.Revision)
} else { } else {
return fmt.Errorf("source sync failed, artifact not found") return fmt.Errorf("source sync failed, artifact not found")
} }
@ -222,6 +215,35 @@ func generateSSH(ctx context.Context, name, host, tmpDir string) error {
return nil return nil
} }
func upsertGitRepository(ctx context.Context, kubeClient client.Client, gitRepository sourcev1.GitRepository) error {
namespacedName := types.NamespacedName{
Namespace: gitRepository.GetNamespace(),
Name: gitRepository.GetName(),
}
var existing sourcev1.GitRepository
err := kubeClient.Get(ctx, namespacedName, &existing)
if err != nil {
if errors.IsNotFound(err) {
if err := kubeClient.Create(ctx, &gitRepository); err != nil {
return err
} else {
logSuccess("source created")
return nil
}
}
return err
}
existing.Spec = gitRepository.Spec
if err := kubeClient.Update(ctx, &existing); err != nil {
return err
}
logSuccess("source updated")
return nil
}
func isGitRepositoryReady(ctx context.Context, kubeClient client.Client, name, namespace string) wait.ConditionFunc { func isGitRepositoryReady(ctx context.Context, kubeClient client.Client, name, namespace string) wait.ConditionFunc {
return func() (bool, error) { return func() (bool, error) {
var gitRepository sourcev1.GitRepository var gitRepository sourcev1.GitRepository