diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index 622636daa1f9d62c66baddc4ce1005203365d021..0400754b7e1f12f255ad738d086bda551c9faba2 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -51,7 +51,9 @@ jobs:
./bin/tk install --manifests ./manifests/install/
- name: Run create source e2e tests
run: |
- ./bin/tk create source podinfo --git-url https://github.com/stefanprodan/podinfo-deploy --git-semver=">=0.0.1-rc.1 <0.1.0"
+ ./bin/tk create source git podinfo \
+ --git-url https://github.com/stefanprodan/podinfo-deploy \
+ --git-semver=">=0.0.1-rc.1 <0.1.0"
- name: Debug failure
if: failure()
run: |
diff --git a/cmd/tk/create_source.go b/cmd/tk/create_source.go
index 344ba02bf4365e114188f5f1fd0213c1aebbef38..9f4dc58d6cd7845538513603e5e84314eb530268 100644
--- a/cmd/tk/create_source.go
+++ b/cmd/tk/create_source.go
@@ -1,287 +1,14 @@
package main
import (
- "context"
- "fmt"
- "io/ioutil"
- "net/url"
- "os"
- "strings"
- "time"
-
- sourcev1 "github.com/fluxcd/source-controller/api/v1alpha1"
- "github.com/manifoldco/promptui"
"github.com/spf13/cobra"
- corev1 "k8s.io/api/core/v1"
- "k8s.io/apimachinery/pkg/api/errors"
- metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- "k8s.io/apimachinery/pkg/types"
- "k8s.io/apimachinery/pkg/util/wait"
- "sigs.k8s.io/controller-runtime/pkg/client"
)
var createSourceCmd = &cobra.Command{
- Use: "source [name]",
- Short: "Create or update a source resource",
- Long: `
-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 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
- create source podinfo \
- --git-url=https://github.com/stefanprodan/podinfo \
- --git-branch=master
-
- # Create a source from a Git repository pinned to specific git tag
- create source podinfo \
- --git-url=https://github.com/stefanprodan/podinfo \
- --git-tag="3.2.3"
-
- # Create a source from a public Git repository tag that matches a semver range
- create source podinfo \
- --git-url=https://github.com/stefanprodan/podinfo \
- --git-semver=">=3.2.0 <3.3.0"
-
- # Create a source from a Git repository using SSH authentication
- create source podinfo \
- --git-url=ssh://git@github.com/stefanprodan/podinfo \
- --git-branch=master
-
- # Create a source from a Git repository using basic authentication
- create source podinfo \
- --git-url=https://github.com/stefanprodan/podinfo \
- --username=username \
- --password=password
-`,
- RunE: createSourceCmdRun,
+ Use: "source",
+ Short: "Create source commands",
}
-var (
- sourceGitURL string
- sourceGitBranch string
- sourceGitTag string
- sourceGitSemver string
- sourceUsername string
- sourcePassword string
-)
-
func init() {
- createSourceCmd.Flags().StringVar(&sourceGitURL, "git-url", "", "git address, e.g. ssh://git@host/org/repository")
- createSourceCmd.Flags().StringVar(&sourceGitBranch, "git-branch", "master", "git branch")
- createSourceCmd.Flags().StringVar(&sourceGitTag, "git-tag", "", "git tag")
- createSourceCmd.Flags().StringVar(&sourceGitSemver, "git-semver", "", "git tag semver range")
- createSourceCmd.Flags().StringVarP(&sourceUsername, "username", "u", "", "basic authentication username")
- createSourceCmd.Flags().StringVarP(&sourcePassword, "password", "p", "", "basic authentication password")
-
createCmd.AddCommand(createSourceCmd)
}
-
-func createSourceCmdRun(cmd *cobra.Command, args []string) error {
- if len(args) < 1 {
- return fmt.Errorf("source name is required")
- }
- name := args[0]
-
- if sourceGitURL == "" {
- return fmt.Errorf("git-url is required")
- }
-
- tmpDir, err := ioutil.TempDir("", name)
- if err != nil {
- return err
- }
- defer os.RemoveAll(tmpDir)
-
- u, err := url.Parse(sourceGitURL)
- if err != nil {
- return fmt.Errorf("git URL parse failed: %w", err)
- }
-
- ctx, cancel := context.WithTimeout(context.Background(), timeout)
- defer cancel()
-
- withAuth := false
- if strings.HasPrefix(sourceGitURL, "ssh") {
- if err := generateSSH(ctx, name, u.Host, tmpDir); err != nil {
- return err
- }
- withAuth = true
- } else if sourceUsername != "" && sourcePassword != "" {
- if err := generateBasicAuth(ctx, name); err != nil {
- return err
- }
- withAuth = true
- }
-
- logAction("generating source %s in %s namespace", name, namespace)
-
- gitRepository := sourcev1.GitRepository{
- ObjectMeta: metav1.ObjectMeta{
- Name: name,
- Namespace: namespace,
- },
- Spec: sourcev1.GitRepositorySpec{
- URL: sourceGitURL,
- Interval: metav1.Duration{
- Duration: interval,
- },
- Reference: &sourcev1.GitRepositoryRef{},
- },
- }
-
- if withAuth {
- gitRepository.Spec.SecretRef = &corev1.LocalObjectReference{
- Name: name,
- }
- }
-
- if sourceGitSemver != "" {
- gitRepository.Spec.Reference.SemVer = sourceGitSemver
- } else if sourceGitTag != "" {
- gitRepository.Spec.Reference.Tag = sourceGitTag
- } else {
- gitRepository.Spec.Reference.Branch = sourceGitBranch
- }
-
- kubeClient, err := utils.kubeClient(kubeconfig)
- if err != nil {
- return err
- }
-
- if err := upsertGitRepository(ctx, kubeClient, gitRepository); err != nil {
- return err
- }
-
- logAction("waiting for source sync")
- if err := wait.PollImmediate(2*time.Second, timeout,
- isGitRepositoryReady(ctx, kubeClient, name, namespace)); err != nil {
- return err
- }
-
- logSuccess("source %s is ready", name)
-
- namespacedName := types.NamespacedName{
- Namespace: namespace,
- Name: name,
- }
- err = kubeClient.Get(ctx, namespacedName, &gitRepository)
- if err != nil {
- return fmt.Errorf("source sync failed: %w", err)
- }
-
- if gitRepository.Status.Artifact != nil {
- logSuccess("fetched revision %s", gitRepository.Status.Artifact.Revision)
- } else {
- return fmt.Errorf("source sync failed, artifact not found")
- }
-
- return nil
-}
-
-func generateBasicAuth(ctx context.Context, name string) error {
- logAction("saving credentials")
- credentials := fmt.Sprintf("--from-literal=username='%s' --from-literal=password='%s'",
- sourceUsername, sourcePassword)
- secret := fmt.Sprintf("kubectl -n %s create secret generic %s %s --dry-run=client -oyaml | kubectl apply -f-",
- namespace, name, credentials)
- if _, err := utils.execCommand(ctx, ModeOS, secret); err != nil {
- return fmt.Errorf("kubectl create secret failed")
- }
- return nil
-}
-
-func generateSSH(ctx context.Context, name, host, tmpDir string) error {
- logAction("generating host key for %s", host)
-
- command := fmt.Sprintf("ssh-keyscan %s > %s/known_hosts", host, tmpDir)
- if _, err := utils.execCommand(ctx, ModeStderrOS, command); err != nil {
- return fmt.Errorf("ssh-keyscan failed")
- }
-
- logAction("generating deploy key")
-
- command = fmt.Sprintf("ssh-keygen -b 2048 -t rsa -f %s/identity -q -N \"\"", tmpDir)
- if _, err := utils.execCommand(ctx, ModeStderrOS, command); err != nil {
- return fmt.Errorf("ssh-keygen failed")
- }
-
- command = fmt.Sprintf("cat %s/identity.pub", tmpDir)
- if deployKey, err := utils.execCommand(ctx, ModeCapture, command); err != nil {
- return fmt.Errorf("unable to read identity.pub: %w", err)
- } else {
- fmt.Print(deployKey)
- }
-
- prompt := promptui.Prompt{
- Label: "Have you added the deploy key to your repository",
- IsConfirm: true,
- }
- if _, err := prompt.Run(); err != nil {
- return fmt.Errorf("aborting")
- }
-
- logAction("saving deploy key")
- files := fmt.Sprintf("--from-file=%s/identity --from-file=%s/identity.pub --from-file=%s/known_hosts",
- tmpDir, tmpDir, tmpDir)
- secret := fmt.Sprintf("kubectl -n %s create secret generic %s %s --dry-run=client -oyaml | kubectl apply -f-",
- namespace, name, files)
- if _, err := utils.execCommand(ctx, ModeOS, secret); err != nil {
- return fmt.Errorf("create secret failed")
- }
- 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 {
- return func() (bool, error) {
- var gitRepository sourcev1.GitRepository
- namespacedName := types.NamespacedName{
- Namespace: namespace,
- Name: name,
- }
-
- err := kubeClient.Get(ctx, namespacedName, &gitRepository)
- if err != nil {
- return false, err
- }
-
- for _, condition := range gitRepository.Status.Conditions {
- if condition.Type == sourcev1.ReadyCondition {
- if condition.Status == corev1.ConditionTrue {
- return true, nil
- } else if condition.Status == corev1.ConditionFalse {
- return false, fmt.Errorf(condition.Message)
- }
- }
- }
- return false, nil
- }
-}
diff --git a/cmd/tk/create_source_git.go b/cmd/tk/create_source_git.go
new file mode 100644
index 0000000000000000000000000000000000000000..3dc1acb18693f9ad4bea85a76dcc50b795b59a23
--- /dev/null
+++ b/cmd/tk/create_source_git.go
@@ -0,0 +1,287 @@
+package main
+
+import (
+ "context"
+ "fmt"
+ "io/ioutil"
+ "net/url"
+ "os"
+ "strings"
+ "time"
+
+ sourcev1 "github.com/fluxcd/source-controller/api/v1alpha1"
+ "github.com/manifoldco/promptui"
+ "github.com/spf13/cobra"
+ corev1 "k8s.io/api/core/v1"
+ "k8s.io/apimachinery/pkg/api/errors"
+ metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+ "k8s.io/apimachinery/pkg/types"
+ "k8s.io/apimachinery/pkg/util/wait"
+ "sigs.k8s.io/controller-runtime/pkg/client"
+)
+
+var createSourceGitCmd = &cobra.Command{
+ Use: "git [name]",
+ Short: "Create or update a git source",
+ Long: `
+The create source command generates a GitRepository resource and waits for it to sync.
+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
+ create source git podinfo \
+ --url=https://github.com/stefanprodan/podinfo \
+ --branch=master
+
+ # Create a source from a Git repository pinned to specific git tag
+ create source git podinfo \
+ --url=https://github.com/stefanprodan/podinfo \
+ --tag="3.2.3"
+
+ # Create a source from a public Git repository tag that matches a semver range
+ create source git podinfo \
+ --url=https://github.com/stefanprodan/podinfo \
+ --tag-semver=">=3.2.0 <3.3.0"
+
+ # Create a source from a Git repository using SSH authentication
+ create source git podinfo \
+ --url=ssh://git@github.com/stefanprodan/podinfo \
+ --branch=master
+
+ # Create a source from a Git repository using basic authentication
+ create source git podinfo \
+ --url=https://github.com/stefanprodan/podinfo \
+ --username=username \
+ --password=password
+`,
+ RunE: createSourceGitCmdRun,
+}
+
+var (
+ sourceGitURL string
+ sourceGitBranch string
+ sourceGitTag string
+ sourceGitSemver string
+ sourceGitUsername string
+ sourceGitPassword string
+)
+
+func init() {
+ createSourceGitCmd.Flags().StringVar(&sourceGitURL, "url", "", "git address, e.g. ssh://git@host/org/repository")
+ createSourceGitCmd.Flags().StringVar(&sourceGitBranch, "branch", "master", "git branch")
+ createSourceGitCmd.Flags().StringVar(&sourceGitTag, "tag", "", "git tag")
+ createSourceGitCmd.Flags().StringVar(&sourceGitSemver, "tag-semver", "", "git tag semver range")
+ createSourceGitCmd.Flags().StringVarP(&sourceGitUsername, "username", "u", "", "basic authentication username")
+ createSourceGitCmd.Flags().StringVarP(&sourceGitPassword, "password", "p", "", "basic authentication password")
+
+ createSourceCmd.AddCommand(createSourceGitCmd)
+}
+
+func createSourceGitCmdRun(cmd *cobra.Command, args []string) error {
+ if len(args) < 1 {
+ return fmt.Errorf("source name is required")
+ }
+ name := args[0]
+
+ if sourceGitURL == "" {
+ return fmt.Errorf("git-url is required")
+ }
+
+ tmpDir, err := ioutil.TempDir("", name)
+ if err != nil {
+ return err
+ }
+ defer os.RemoveAll(tmpDir)
+
+ u, err := url.Parse(sourceGitURL)
+ if err != nil {
+ return fmt.Errorf("git URL parse failed: %w", err)
+ }
+
+ ctx, cancel := context.WithTimeout(context.Background(), timeout)
+ defer cancel()
+
+ withAuth := false
+ if strings.HasPrefix(sourceGitURL, "ssh") {
+ if err := generateSSH(ctx, name, u.Host, tmpDir); err != nil {
+ return err
+ }
+ withAuth = true
+ } else if sourceGitUsername != "" && sourceGitPassword != "" {
+ if err := generateBasicAuth(ctx, name); err != nil {
+ return err
+ }
+ withAuth = true
+ }
+
+ logAction("generating git source %s in %s namespace", name, namespace)
+
+ gitRepository := sourcev1.GitRepository{
+ ObjectMeta: metav1.ObjectMeta{
+ Name: name,
+ Namespace: namespace,
+ },
+ Spec: sourcev1.GitRepositorySpec{
+ URL: sourceGitURL,
+ Interval: metav1.Duration{
+ Duration: interval,
+ },
+ Reference: &sourcev1.GitRepositoryRef{},
+ },
+ }
+
+ if withAuth {
+ gitRepository.Spec.SecretRef = &corev1.LocalObjectReference{
+ Name: name,
+ }
+ }
+
+ if sourceGitSemver != "" {
+ gitRepository.Spec.Reference.SemVer = sourceGitSemver
+ } else if sourceGitTag != "" {
+ gitRepository.Spec.Reference.Tag = sourceGitTag
+ } else {
+ gitRepository.Spec.Reference.Branch = sourceGitBranch
+ }
+
+ kubeClient, err := utils.kubeClient(kubeconfig)
+ if err != nil {
+ return err
+ }
+
+ if err := upsertGitRepository(ctx, kubeClient, gitRepository); err != nil {
+ return err
+ }
+
+ logAction("waiting for git sync")
+ if err := wait.PollImmediate(2*time.Second, timeout,
+ isGitRepositoryReady(ctx, kubeClient, name, namespace)); err != nil {
+ return err
+ }
+
+ logSuccess("git sync completed")
+
+ namespacedName := types.NamespacedName{
+ Namespace: namespace,
+ Name: name,
+ }
+ err = kubeClient.Get(ctx, namespacedName, &gitRepository)
+ if err != nil {
+ return fmt.Errorf("git sync failed: %w", err)
+ }
+
+ if gitRepository.Status.Artifact != nil {
+ logSuccess("fetched revision %s", gitRepository.Status.Artifact.Revision)
+ } else {
+ return fmt.Errorf("git sync failed, artifact not found")
+ }
+
+ return nil
+}
+
+func generateBasicAuth(ctx context.Context, name string) error {
+ logAction("saving credentials")
+ credentials := fmt.Sprintf("--from-literal=username='%s' --from-literal=password='%s'",
+ sourceGitUsername, sourceGitPassword)
+ secret := fmt.Sprintf("kubectl -n %s create secret generic %s %s --dry-run=client -oyaml | kubectl apply -f-",
+ namespace, name, credentials)
+ if _, err := utils.execCommand(ctx, ModeOS, secret); err != nil {
+ return fmt.Errorf("kubectl create secret failed")
+ }
+ return nil
+}
+
+func generateSSH(ctx context.Context, name, host, tmpDir string) error {
+ logAction("generating host key for %s", host)
+
+ command := fmt.Sprintf("ssh-keyscan %s > %s/known_hosts", host, tmpDir)
+ if _, err := utils.execCommand(ctx, ModeStderrOS, command); err != nil {
+ return fmt.Errorf("ssh-keyscan failed")
+ }
+
+ logAction("generating deploy key")
+
+ command = fmt.Sprintf("ssh-keygen -b 2048 -t rsa -f %s/identity -q -N \"\"", tmpDir)
+ if _, err := utils.execCommand(ctx, ModeStderrOS, command); err != nil {
+ return fmt.Errorf("ssh-keygen failed")
+ }
+
+ command = fmt.Sprintf("cat %s/identity.pub", tmpDir)
+ if deployKey, err := utils.execCommand(ctx, ModeCapture, command); err != nil {
+ return fmt.Errorf("unable to read identity.pub: %w", err)
+ } else {
+ fmt.Print(deployKey)
+ }
+
+ prompt := promptui.Prompt{
+ Label: "Have you added the deploy key to your repository",
+ IsConfirm: true,
+ }
+ if _, err := prompt.Run(); err != nil {
+ return fmt.Errorf("aborting")
+ }
+
+ logAction("saving deploy key")
+ files := fmt.Sprintf("--from-file=%s/identity --from-file=%s/identity.pub --from-file=%s/known_hosts",
+ tmpDir, tmpDir, tmpDir)
+ secret := fmt.Sprintf("kubectl -n %s create secret generic %s %s --dry-run=client -oyaml | kubectl apply -f-",
+ namespace, name, files)
+ if _, err := utils.execCommand(ctx, ModeOS, secret); err != nil {
+ return fmt.Errorf("create secret failed")
+ }
+ 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 {
+ return func() (bool, error) {
+ var gitRepository sourcev1.GitRepository
+ namespacedName := types.NamespacedName{
+ Namespace: namespace,
+ Name: name,
+ }
+
+ err := kubeClient.Get(ctx, namespacedName, &gitRepository)
+ if err != nil {
+ return false, err
+ }
+
+ for _, condition := range gitRepository.Status.Conditions {
+ if condition.Type == sourcev1.ReadyCondition {
+ if condition.Status == corev1.ConditionTrue {
+ return true, nil
+ } else if condition.Status == corev1.ConditionFalse {
+ return false, fmt.Errorf(condition.Message)
+ }
+ }
+ }
+ return false, nil
+ }
+}
diff --git a/cmd/tk/main.go b/cmd/tk/main.go
index 4cde0e67bd85a0252f4b8bf94a1e0a641ac223a4..17660b7746cb3df025e1b15b00acf8a62ce6ecb2 100644
--- a/cmd/tk/main.go
+++ b/cmd/tk/main.go
@@ -28,9 +28,9 @@ var rootCmd = &cobra.Command{
tk install --version=master
# Create a source from a public Git repository
- tk create source webapp \
- --git-url=https://github.com/stefanprodan/podinfo \
- --git-branch=master \
+ tk create source git webapp \
+ --url=https://github.com/stefanprodan/podinfo \
+ --branch=master \
--interval=5m
# Create a kustomization for deploying a series of microservices