Merge pull request #162 from fluxcd/components-upgrade

- source-controller to v0.0.10
- kustomize-controller to v0.0.8
- helm-controller to v0.0.3

.github/workflows/docs.yaml

@@ -14,10 +14,10 @@ jobs:
         uses: actions/checkout@v1
       - name: Copy assets
         env:
-          SOURCE_VER: ${{ 'v0.0.8' }}
-          KUSTOMIZE_VER: ${{ 'v0.0.7' }}
-          HELM_VER: ${{ 'v0.0.2' }}
-          NOTIFICATION_VER: ${{ 'v0.0.6' }}
+          SOURCE_VER: ${{ 'v0.0.10' }}
+          KUSTOMIZE_VER: ${{ 'v0.0.8' }}
+          HELM_VER: ${{ 'v0.0.3' }}
+          NOTIFICATION_VER: ${{ 'v0.0.7' }}
         run: |
           # source-controller CRDs
           curl "https://raw.githubusercontent.com/fluxcd/source-controller/$SOURCE_VER/docs/api/source.md" > docs/components/source/api.md

cmd/tk/create_kustomization.go

@@ -113,14 +113,6 @@ func createKsCmdRun(cmd *cobra.Command, args []string) error {
 		return fmt.Errorf("path must begin with ./")
 	}
 
-	ctx, cancel := context.WithTimeout(context.Background(), timeout)
-	defer cancel()
-
-	kubeClient, err := utils.kubeClient(kubeconfig)
-	if err != nil {
-		return err
-	}
-
 	if !export {
 		logger.Generatef("generating kustomization")
 	}
@@ -190,6 +182,14 @@ func createKsCmdRun(cmd *cobra.Command, args []string) error {
 		return exportKs(kustomization)
 	}
 
+	ctx, cancel := context.WithTimeout(context.Background(), timeout)
+	defer cancel()
+
+	kubeClient, err := utils.kubeClient(kubeconfig)
+	if err != nil {
+		return err
+	}
+
 	logger.Actionf("applying kustomization")
 	if err := upsertKustomization(ctx, kubeClient, kustomization); err != nil {
 		return err

cmd/tk/create_source_git.go

@@ -129,14 +129,6 @@ func createSourceGitCmdRun(cmd *cobra.Command, args []string) error {
 		return fmt.Errorf("git URL parse failed: %w", err)
 	}
 
-	ctx, cancel := context.WithTimeout(context.Background(), timeout)
-	defer cancel()
-
-	kubeClient, err := utils.kubeClient(kubeconfig)
-	if err != nil {
-		return err
-	}
-
 	gitRepository := sourcev1.GitRepository{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      name,
@@ -163,6 +155,14 @@ func createSourceGitCmdRun(cmd *cobra.Command, args []string) error {
 		return exportGit(gitRepository)
 	}
 
+	ctx, cancel := context.WithTimeout(context.Background(), timeout)
+	defer cancel()
+
+	kubeClient, err := utils.kubeClient(kubeconfig)
+	if err != nil {
+		return err
+	}
+
 	withAuth := false
 	// TODO(hidde): move all auth prep to separate func?
 	if u.Scheme == "ssh" {

cmd/tk/create_source_helm.go

@@ -101,14 +101,6 @@ func createSourceHelmCmdRun(cmd *cobra.Command, args []string) error {
 		return fmt.Errorf("url parse failed: %w", err)
 	}
 
-	ctx, cancel := context.WithTimeout(context.Background(), timeout)
-	defer cancel()
-
-	kubeClient, err := utils.kubeClient(kubeconfig)
-	if err != nil {
-		return err
-	}
-
 	helmRepository := sourcev1.HelmRepository{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      name,
@@ -126,6 +118,14 @@ func createSourceHelmCmdRun(cmd *cobra.Command, args []string) error {
 		return exportHelmRepository(helmRepository)
 	}
 
+	ctx, cancel := context.WithTimeout(context.Background(), timeout)
+	defer cancel()
+
+	kubeClient, err := utils.kubeClient(kubeconfig)
+	if err != nil {
+		return err
+	}
+
 	logger.Generatef("generating source")
 
 	secret := corev1.Secret{

docs/roadmap/index.md

@@ -38,6 +38,7 @@ Tasks
 - [ ]  Review the git source and kustomize APIs
 - [ ]  Implement the migration command in tk
 - [ ]  Create a migration guide for `flux.yaml` kustomize users
+- [ ]  Include [support for SOPS](https://github.com/fluxcd/toolkit/discussions/156)
 
 ### Flux image update feature parity
 

go.mod

@@ -4,10 +4,12 @@ go 1.14
 
 require (
 	github.com/blang/semver v3.5.1+incompatible
-	github.com/fluxcd/helm-controller v0.0.2
-	github.com/fluxcd/kustomize-controller v0.0.7
-	github.com/fluxcd/pkg v0.0.3
-	github.com/fluxcd/source-controller v0.0.8
+	github.com/fluxcd/helm-controller/api v0.0.3
+	github.com/fluxcd/kustomize-controller/api v0.0.8
+	github.com/fluxcd/pkg/git v0.0.5
+	github.com/fluxcd/pkg/ssh v0.0.5
+	github.com/fluxcd/pkg/untar v0.0.5
+	github.com/fluxcd/source-controller/api v0.0.10
 	github.com/manifoldco/promptui v0.7.0
 	github.com/spf13/cobra v1.0.0
 	golang.org/x/net v0.0.0-20200602114024-627f9648deb9 // indirect
@@ -23,6 +25,3 @@ require (
 	sigs.k8s.io/kustomize/api v0.5.1
 	sigs.k8s.io/yaml v1.2.0
 )
-
-// fix AKS auth
-replace github.com/Azure/go-autorest => github.com/Azure/go-autorest v14.0.1+incompatible

manifests/bases/helm-controller/kustomization.yaml

@@ -1,8 +1,8 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-- github.com/fluxcd/helm-controller/config//crd?ref=v0.0.2
-- github.com/fluxcd/helm-controller/config//manager?ref=v0.0.2
+- github.com/fluxcd/helm-controller/config//crd?ref=v0.0.3
+- github.com/fluxcd/helm-controller/config//manager?ref=v0.0.3
 patchesJson6902:
 - target:
     group: apps

manifests/bases/kustomize-controller/kustomization.yaml

@@ -1,8 +1,8 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-- github.com/fluxcd/kustomize-controller/config//crd?ref=v0.0.7
-- github.com/fluxcd/kustomize-controller/config//manager?ref=v0.0.7
+- github.com/fluxcd/kustomize-controller/config//crd?ref=v0.0.8
+- github.com/fluxcd/kustomize-controller/config//manager?ref=v0.0.8
 patchesJson6902:
 - target:
     group: apps

manifests/bases/source-controller/kustomization.yaml

@@ -1,8 +1,8 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-- github.com/fluxcd/source-controller/config//crd?ref=v0.0.8
-- github.com/fluxcd/source-controller/config//manager?ref=v0.0.8
+- github.com/fluxcd/source-controller/config//crd?ref=v0.0.10
+- github.com/fluxcd/source-controller/config//manager?ref=v0.0.10
 patchesJson6902:
 - target:
     group: apps