Merge pull request #422 from fluxcd/flux2-www-intro

Rework Flux2 website intro

.github/workflows/bootstrap.yaml

@@ -28,43 +28,43 @@ jobs:
         id: vars
         run: echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
       - name: Build
-        run: sudo go build -o ./bin/gotk ./cmd/gotk
+        run: sudo go build -o ./bin/flux ./cmd/flux
       - name: bootstrap init
         run: |
-          ./bin/gotk bootstrap github --manifests ./manifests/install/ \
+          ./bin/flux bootstrap github --manifests ./manifests/install/ \
           --owner=fluxcd-testing \
-          --repository=gotk-test-${{ steps.vars.outputs.sha_short }} \
+          --repository=flux-test-${{ steps.vars.outputs.sha_short }} \
           --branch=main \
           --path=test-cluster
         env:
           GITHUB_TOKEN: ${{ secrets.GITPROVIDER_BOT_TOKEN }}
       - name: bootstrap no-op
         run: |
-          ./bin/gotk bootstrap github --manifests ./manifests/install/ \
+          ./bin/flux bootstrap github --manifests ./manifests/install/ \
           --owner=fluxcd-testing \
-          --repository=gotk-test-${{ steps.vars.outputs.sha_short }} \
+          --repository=flux-test-${{ steps.vars.outputs.sha_short }} \
           --branch=main \
           --path=test-cluster
         env:
           GITHUB_TOKEN: ${{ secrets.GITPROVIDER_BOT_TOKEN }}
       - name: uninstall
         run: |
-          ./bin/gotk suspend kustomization gotk-system
+          ./bin/flux suspend kustomization flux-system
-          ./bin/gotk uninstall --resources --crds -s
+          ./bin/flux uninstall --resources --crds -s
       - name: bootstrap reinstall
         run: |
-          ./bin/gotk bootstrap github --manifests ./manifests/install/ \
+          ./bin/flux bootstrap github --manifests ./manifests/install/ \
           --owner=fluxcd-testing \
-          --repository=gotk-test-${{ steps.vars.outputs.sha_short }} \
+          --repository=flux-test-${{ steps.vars.outputs.sha_short }} \
           --branch=main \
           --path=test-cluster
         env:
           GITHUB_TOKEN: ${{ secrets.GITPROVIDER_BOT_TOKEN }}
       - name: delete repository
         run: |
-          ./bin/gotk bootstrap github --manifests ./manifests/install/ \
+          ./bin/flux bootstrap github --manifests ./manifests/install/ \
           --owner=fluxcd-testing \
-          --repository=gotk-test-${{ steps.vars.outputs.sha_short }} \
+          --repository=flux-test-${{ steps.vars.outputs.sha_short }} \
           --branch=main \
           --path=test-cluster \
           --delete
@@ -73,6 +73,6 @@ jobs:
       - name: Debug failure
         if: failure()
         run: |
-          kubectl -n gotk-system get all
+          kubectl -n flux-system get all
-          kubectl -n gotk-system logs deploy/source-controller
+          kubectl -n flux-system logs deploy/source-controller
-          kubectl -n gotk-system logs deploy/kustomize-controller
+          kubectl -n flux-system logs deploy/kustomize-controller

.github/workflows/docs.yaml

@@ -56,7 +56,7 @@ jobs:
 
           {
             # install script
-            cp install/gotk.sh docs/install.sh
+            cp install/flux.sh docs/install.sh
           }
       - name: Deploy docs
         uses: mhausenblas/mkdocs-deploy-gh-pages@master

.github/workflows/e2e.yaml

@@ -37,34 +37,34 @@ jobs:
             exit 1
           fi
       - name: Build
-        run: sudo go build -o ./bin/gotk ./cmd/gotk
+        run: sudo go build -o ./bin/flux ./cmd/flux
-      - name: gotk check --pre
+      - name: flux check --pre
         run: |
-          ./bin/gotk check --pre
+          ./bin/flux check --pre
-      - name: gotk install --manifests
+      - name: flux install --manifests
         run: |
-          ./bin/gotk install --manifests ./manifests/install/
+          ./bin/flux install --manifests ./manifests/install/
-      - name: gotk create source git
+      - name: flux create source git
         run: |
-          ./bin/gotk create source git podinfo \
+          ./bin/flux create source git podinfo \
             --url https://github.com/stefanprodan/podinfo  \
             --tag-semver=">=3.2.3"
-      - name: gotk create source git export apply
+      - name: flux create source git export apply
         run: |
-          ./bin/gotk create source git podinfo-export \
+          ./bin/flux create source git podinfo-export \
             --url https://github.com/stefanprodan/podinfo  \
             --tag-semver=">=3.2.3" \
             --export | kubectl apply -f -
-          ./bin/gotk delete source git podinfo-export --silent
+          ./bin/flux delete source git podinfo-export --silent
-      - name: gotk get sources git
+      - name: flux get sources git
         run: |
-          ./bin/gotk get sources git
+          ./bin/flux get sources git
-      - name: gotk get sources git --all-namespaces
+      - name: flux get sources git --all-namespaces
         run: |
-          ./bin/gotk get sources git --all-namespaces
+          ./bin/flux get sources git --all-namespaces
-      - name: gotk create kustomization
+      - name: flux create kustomization
         run: |
-          ./bin/gotk create kustomization podinfo \
+          ./bin/flux create kustomization podinfo \
             --source=podinfo \
             --path="./deploy/overlays/dev" \
             --prune=true \
@@ -73,80 +73,80 @@ jobs:
             --health-check="Deployment/frontend.dev" \
             --health-check="Deployment/backend.dev" \
             --health-check-timeout=3m
-      - name: gotk reconcile kustomization --with-source
+      - name: flux reconcile kustomization --with-source
         run: |
-          ./bin/gotk reconcile kustomization podinfo --with-source
+          ./bin/flux reconcile kustomization podinfo --with-source
-      - name: gotk get kustomizations
+      - name: flux get kustomizations
         run: |
-          ./bin/gotk get kustomizations
+          ./bin/flux get kustomizations
-      - name: gotk get kustomizations --all-namespaces
+      - name: flux get kustomizations --all-namespaces
         run: |
-          ./bin/gotk get kustomizations --all-namespaces
+          ./bin/flux get kustomizations --all-namespaces
-      - name: gotk suspend kustomization
+      - name: flux suspend kustomization
         run: |
-          ./bin/gotk suspend kustomization podinfo
+          ./bin/flux suspend kustomization podinfo
-      - name: gotk resume kustomization
+      - name: flux resume kustomization
         run: |
-          ./bin/gotk resume kustomization podinfo
+          ./bin/flux resume kustomization podinfo
-      - name: gotk export
+      - name: flux export
         run: |
-          ./bin/gotk export source git --all
+          ./bin/flux export source git --all
-          ./bin/gotk export kustomization --all
+          ./bin/flux export kustomization --all
-      - name: gotk delete kustomization
+      - name: flux delete kustomization
         run: |
-          ./bin/gotk delete kustomization podinfo --silent
+          ./bin/flux delete kustomization podinfo --silent
-      - name: gotk create source helm
+      - name: flux create source helm
         run: |
-          ./bin/gotk create source helm podinfo \
+          ./bin/flux create source helm podinfo \
             --url https://stefanprodan.github.io/podinfo
-      - name: gotk create helmrelease --source=HelmRepository/podinfo
+      - name: flux create helmrelease --source=HelmRepository/podinfo
         run: |
-          ./bin/gotk create hr podinfo-helm \
+          ./bin/flux create hr podinfo-helm \
             --target-namespace=default \
             --source=HelmRepository/podinfo \
             --chart=podinfo \
             --chart-version=">4.0.0 <5.0.0"
-      - name: gotk create helmrelease --source=GitRepository/podinfo
+      - name: flux create helmrelease --source=GitRepository/podinfo
         run: |
-          ./bin/gotk create hr podinfo-git \
+          ./bin/flux create hr podinfo-git \
             --target-namespace=default \
             --source=GitRepository/podinfo \
             --chart=./charts/podinfo
-      - name: gotk reconcile helmrelease --with-source
+      - name: flux reconcile helmrelease --with-source
         run: |
-          ./bin/gotk reconcile helmrelease podinfo-git --with-source
+          ./bin/flux reconcile helmrelease podinfo-git --with-source
-      - name: gotk get helmreleases
+      - name: flux get helmreleases
         run: |
-          ./bin/gotk get helmreleases
+          ./bin/flux get helmreleases
-      - name: gotk get helmreleases --all-namespaces
+      - name: flux get helmreleases --all-namespaces
         run: |
-          ./bin/gotk get helmreleases --all-namespaces
+          ./bin/flux get helmreleases --all-namespaces
-      - name: gotk export helmrelease
+      - name: flux export helmrelease
         run: |
-          ./bin/gotk export hr --all
+          ./bin/flux export hr --all
-      - name: gotk delete helmrelease podinfo-helm
+      - name: flux delete helmrelease podinfo-helm
         run: |
-          ./bin/gotk delete hr podinfo-helm --silent
+          ./bin/flux delete hr podinfo-helm --silent
-      - name: gotk delete helmrelease podinfo-git
+      - name: flux delete helmrelease podinfo-git
         run: |
-          ./bin/gotk delete hr podinfo-git --silent
+          ./bin/flux delete hr podinfo-git --silent
-      - name: gotk delete source helm
+      - name: flux delete source helm
         run: |
-          ./bin/gotk delete source helm podinfo --silent
+          ./bin/flux delete source helm podinfo --silent
-      - name: gotk delete source git
+      - name: flux delete source git
         run: |
-          ./bin/gotk delete source git podinfo --silent
+          ./bin/flux delete source git podinfo --silent
-      - name: gotk check
+      - name: flux check
         run: |
-          ./bin/gotk check
+          ./bin/flux check
-      - name: gotk uninstall
+      - name: flux uninstall
         run: |
-          ./bin/gotk uninstall --crds --silent
+          ./bin/flux uninstall --crds --silent
       - name: Debug failure
         if: failure()
         run: |
           kubectl version --client --short
-          kubectl -n gotk-system get all
+          kubectl -n flux-system get all
-          kubectl -n gotk-system get kustomizations -oyaml
+          kubectl -n flux-system get kustomizations -oyaml
-          kubectl -n gotk-system logs deploy/source-controller
+          kubectl -n flux-system logs deploy/source-controller
-          kubectl -n gotk-system logs deploy/kustomize-controller
+          kubectl -n flux-system logs deploy/kustomize-controller

.goreleaser.yml

@@ -1,35 +1,52 @@
 builds:
-  - main: ./cmd/gotk
+  - <<: &build_defaults
+      binary: flux
+      main: ./cmd/flux
       ldflags:
         - -s -w -X main.VERSION={{ .Version }}
-    binary: gotk
+      env:
+        - CGO_ENABLED=0
+    id: linux
     goos:
-      - darwin
       - linux
-      - windows
     goarch:
       - amd64
       - arm64
       - arm
     goarm:
       - 7
-    env:
+  - <<: *build_defaults
-      - CGO_ENABLED=0
+    id: darwin
+    goos:
+      - darwin
+  - <<: *build_defaults
+    id: windows
+    goos:
+      - windows
 archives:
   - name_template: "{{ .Binary }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}"
+    id: nix
+    builds: [linux, darwin]
+    format: tar.gz
+    files:
+      - none*
+  - name_template: "{{ .Binary }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}"
+    id: windows
+    builds: [windows]
+    format: zip
     files:
       - none*
 brews:
-  - name: gotk
+  - name: flux
     tap:
       owner: fluxcd
       name: homebrew-tap
       token: "{{ .Env.HOMEBREW_TAP_GITHUB_TOKEN }}"
     folder: Formula
     homepage: "https://toolkit.fluxcd.io/"
-    description: "GitOps Toolkit CLI"
+    description: "Flux CLI"
     dependencies:
       - name: kubectl
         type: optional
     test: |
-      system "#{bin}/gotk --version"
+      system "#{bin}/flux --version"

CONTRIBUTING.md

@@ -1,8 +1,10 @@
 # Contributing
 
-The GitOps Toolkit is [Apache 2.0 licensed](https://github.com/fluxcd/toolkit/blob/master/LICENSE)
+Flux is [Apache 2.0
-and accepts contributions via GitHub pull requests. This document outlines
+licensed](https://github.com/fluxcd/flux2/blob/main/LICENSE) and
-some of the conventions on to make it easier to get your contribution accepted.
+accepts contributions via GitHub pull requests. This document outlines
+some of the conventions on to make it easier to get your contribution
+accepted.
 
 We gratefully welcome improvements to issues and documentation as well as to
 code.
@@ -23,7 +25,7 @@ join the [CNCF](https://slack.cncf.io/) Slack workspace and use the
 [#flux-dev](https://cloud-native.slack.com/messages/flux-dev/) channel.
 
 To discuss ideas and specifications we use [Github
-Discussions](https://github.com/fluxcd/toolkit/discussions).
+Discussions](https://github.com/fluxcd/flux2/discussions).
 
 For announcements we use a mailing list as well. Simply subscribe to
 [flux-dev on cncf.io](https://lists.cncf.io/g/cncf-flux-dev)
@@ -31,14 +33,14 @@ to join the conversation (there you can also add calendar invites
 to your Google calendar for our [Flux
 meeting](https://docs.google.com/document/d/1l_M0om0qUEN_NNiGgpqJ2tvsF2iioHkaARDeh6b70B0/view)).
 
-## Understanding the GitOps Toolkit
+## Understanding Flux and the GitOps Toolkit
 
-If you are entirely new to the GitOps Toolkit,
+If you are entirely new to Flux and the GitOps Toolkit,
 you might want to take a look at the [introductory talk and demo](https://www.youtube.com/watch?v=qQBtSkgl7tI).
 
 This project is composed of:
 
-- [/f/toolkit](https://github.com/fluxcd/toolkit): The GitOps Toolkit CLI
+- [/f/flux2](https://github.com/fluxcd/flux2): The Flux CLI
 - [/f/source-manager](https://github.com/fluxcd/source-controller): Kubernetes operator for managing sources
 - [/f/kustomize-controller](https://github.com/fluxcd/kustomize-controller): Kubernetes operator for building GitOps pipelines with Kustomize
 - [/f/helm-controller](https://github.com/fluxcd/helm-controller): Kubernetes operator for building GitOps pipelines with Helm

Makefile

@@ -1,4 +1,4 @@
-VERSION?=$(shell grep 'VERSION' cmd/gotk/main.go | awk '{ print $$4 }' | tr -d '"')
+VERSION?=$(shell grep 'VERSION' cmd/flux/main.go | awk '{ print $$4 }' | tr -d '"')
 
 all: test build
 
@@ -15,14 +15,15 @@ test: tidy fmt vet docs
 	go test ./... -coverprofile cover.out
 
 build:
-	CGO_ENABLED=0 go build -o ./bin/gotk ./cmd/gotk
+	CGO_ENABLED=0 go build -o ./bin/flux ./cmd/flux
 
 install:
-	go install cmd/gotk
+	go install cmd/flux
 
 .PHONY: docs
 docs:
-	mkdir -p ./docs/cmd && go run ./cmd/gotk/ docgen
+	rm docs/cmd/*
+	mkdir -p ./docs/cmd && go run ./cmd/flux/ docgen
 
 install-dev:
-	CGO_ENABLED=0 go build -o /usr/local/bin ./cmd/gotk
+	CGO_ENABLED=0 go build -o /usr/local/bin ./cmd/flux

README.md

@@ -1,27 +1,30 @@
-# GitOps Toolkit
+# Flux version 2
 
-[![e2e](https://github.com/fluxcd/toolkit/workflows/e2e/badge.svg)](https://github.com/fluxcd/toolkit/actions)
+[![e2e](https://github.com/fluxcd/flux2/workflows/e2e/badge.svg)](https://github.com/fluxcd/flux2/actions)
-[![report](https://goreportcard.com/badge/github.com/fluxcd/toolkit)](https://goreportcard.com/report/github.com/fluxcd/toolkit)
+[![report](https://goreportcard.com/badge/github.com/fluxcd/flux2)](https://goreportcard.com/report/github.com/fluxcd/flux2)
-[![license](https://img.shields.io/github/license/fluxcd/toolkit.svg)](https://github.com/fluxcd/toolkit/blob/main/LICENSE)
+[![license](https://img.shields.io/github/license/fluxcd/flux2.svg)](https://github.com/fluxcd/flux2/blob/main/LICENSE)
-[![release](https://img.shields.io/github/release/fluxcd/toolkit/all.svg)](https://github.com/fluxcd/toolkit/releases)
+[![release](https://img.shields.io/github/release/fluxcd/flux2/all.svg)](https://github.com/fluxcd/flux2/releases)
-![overview](docs/diagrams/gitops-toolkit.png)
 
-The GitOps Toolkit is a set of composable APIs and specialized tools
+Flux is a tool for keeping Kubernetes clusters in sync with sources of
-that can be used to build a Continuous Delivery platform on top of Kubernetes.
+configuration (like Git repositories), and automating updates to
+configuration when there is new code to deploy.
 
-These tools are build with Kubernetes controller-runtime libraries, and they
+Flux version 2 ("v2") is built from the ground up to use Kubernetes'
-can be dynamically configured with Kubernetes custom resources either by
+API extension system, and to integrate with Prometheus and other core
-cluster admins or by other automated tools.
+components of the Kubernetes ecosystem. In version 2, Flux supports
-The GitOps Toolkit components interact with each other via Kubernetes
+multi-tenancy and support for syncing an arbitrary number of Git
-events and are responsible for the reconciliation of their designated API objects.
+repositories, among other long-requested features.
 
-## `gotk` installation
+Flux v2 is constructed with the [GitOps Toolkit](#gitops-toolkit), a
+set of composable APIs and specialized tools for building Continuous
+Delivery on top of Kubernetes.
+
+## Flux installation
 
 With Homebrew:
 
 ```sh
-brew tap fluxcd/tap
+brew install fluxcd/tap/flux
-brew install gotk
 ```
 
 With Bash:
@@ -30,32 +33,45 @@ With Bash:
 curl -s https://toolkit.fluxcd.io/install.sh | sudo bash
 
 # enable completions in ~/.bash_profile
-. <(gotk completion bash)
+. <(flux completion bash)
 ```
 
 Binaries for macOS, Windows and Linux AMD64/ARM are available to download on the
-[release page](https://github.com/fluxcd/toolkit/releases).
+[release page](https://github.com/fluxcd/flux2/releases).
 
 Verify that your cluster satisfies the prerequisites with:
 
 ```sh
-gotk check --pre
+flux check --pre
 ```
 
 ## Get started
 
-To get started with the GitOps Toolkit, start [browsing the documentation](https://toolkit.fluxcd.io)
+To get started with Flux, start [browsing the
-or get started with one of the following guides:
+documentation](https://toolkit.fluxcd.io) or get started with one of
+the following guides:
 
-- [Get started with GitOps Toolkit (deep dive)](https://toolkit.fluxcd.io/get-started/)
+- [Get started with Flux (deep dive)](https://toolkit.fluxcd.io/get-started/)
 - [Installation](https://toolkit.fluxcd.io/guides/installation/)
 - [Manage Helm Releases](https://toolkit.fluxcd.io/guides/helmreleases/)
 - [Setup Notifications](https://toolkit.fluxcd.io/guides/notifications/)
 - [Setup Webhook Receivers](https://toolkit.fluxcd.io/guides/webhook-receivers/)
 
-## Components
+## GitOps Toolkit
+
+The GitOps Toolkit is the set of APIs and controllers that make up the
+runtime for Flux v2. The APIs comprise Kubernetes custom resources,
+which can be created and updated by a cluster user, or by other
+automation tooling.
+
+![overview](docs/diagrams/gitops-toolkit.png)
+
+You can use the toolkit to extend Flux, or to build your own systems
+for continuous delivery -- see [the developer
+guides](https://toolkit.fluxcd.io/dev-guides/source-watcher/).
+
+### Components
 
-- [Toolkit CLI](https://toolkit.fluxcd.io/cmd/gotk/)
 - [Source Controller](https://toolkit.fluxcd.io/components/source/controller/)
     - [GitRepository CRD](https://toolkit.fluxcd.io/components/source/gitrepositories/)
     - [HelmRepository CRD](https://toolkit.fluxcd.io/components/source/helmrepositories/)
@@ -72,23 +88,29 @@ or get started with one of the following guides:
 
 ## Community
 
-The GitOps Toolkit is always looking for new contributors and there are a multitude of ways to get involved. Depending on what you want to do, some of the following bits might be your first steps:
+The Flux project is always looking for new contributors and there are a multitude of ways to get involved.
+Depending on what you want to do, some of the following bits might be your first steps:
 
 - Join our upcoming dev meetings ([meeting access and agenda](https://docs.google.com/document/d/1l_M0om0qUEN_NNiGgpqJ2tvsF2iioHkaARDeh6b70B0/view))
 - Talk to us in the #flux channel on [CNCF Slack](https://slack.cncf.io/)
-- Join the [planning discussions](https://github.com/fluxcd/toolkit/discussions)
+- Join the [planning discussions](https://github.com/fluxcd/flux2/discussions)
-- And if you are completely new to the GitOps Toolkit, take a look at our [Get Started guide](https://toolkit.fluxcd.io/get-started/) and give us feedback
+- And if you are completely new to Flux and the GitOps Toolkit, take a look at our [Get Started guide](https://toolkit.fluxcd.io/get-started/) and give us feedback
 - To be part of the conversation about Flux's development, [join the flux-dev mailing list](https://lists.cncf.io/g/cncf-flux-dev).
 - Check out [how to contribute](CONTRIBUTING.md) to the project
 
-## Featured Talks
+### Featured Talks
+
+- 28 Oct 2020 - [The Kubelist Podcast: Flux with Michael Bridgen](https://www.heavybit.com/library/podcasts/the-kubelist-podcast/ep-5-flux-with-michael-bridgen-of-weaveworks/)
+- 19 Oct 2020 - [The Power of GitOps with Flux & GitOps Toolkit - Part 1 with Leigh Capili](https://youtu.be/0v5bjysXTL8)
 - 12 Oct 2020 - [Rawkode Live: Introduction to GitOps Toolkit with Stefan Prodan](https://youtu.be/HqTzuOBP0eY)
-- 4 Sep 2020 - [KubeCon/CloudNativeCon Europe: The road to Flux v2 and Progressive Delivery with Stefan Prodan & Hidde Beydals](https://youtu.be/8v94nUkXsxU)
+- 4 Sep 2020 - [KubeCon Europe: The road to Flux v2 and Progressive Delivery with Stefan Prodan & Hidde Beydals](https://youtu.be/8v94nUkXsxU)
 - 25 June 2020 - [Cloud Native Nordics: Introduction to GitOps & GitOps Toolkit with Alexis Richardson & Stefan Prodan](https://youtu.be/qQBtSkgl7tI)
 - 7 May 2020 - [GitOps Days - Community Special: GitOps Toolkit Experimentation with Stefan Prodan](https://youtu.be/WHzxunv4DKk?t=6521)
 
-### Upcoming Meetups
+### Upcoming Events
-- 19 Oct 2020 - [The Power of GitOps with Flux & GitOps Toolkit - Part 1](https://www.meetup.com/GitOps-Community/events/273640196/)
+
-- 2 Nov 2020 - [The Power of GitOps with Flux & GitOps Toolkit - Part 2](https://www.meetup.com/GitOps-Community/events/273934676/)
+- 2 Nov 2020 - [The Power of GitOps with Flux & GitOps Toolkit - Part 2 with Leigh Capili](https://www.meetup.com/GitOps-Community/events/273934676/)
+- 12-13 Nov 2020 - [GitOps Days EMEA](https://www.gitopsdays.com/) with talks and workshops on migrating to Flux v2 and Helm Controller
+- 19 Nov 2020 - [KubeCon NA: Progressive Delivery Techniques with Flagger and Flux v2 with Stefan Prodan](https://kccncna20.sched.com/event/1b04f8408b49976b843a5d0019cb8112)
 
 We are looking forward to seeing you with us!

cmd/flux/bootstrap.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Flux CD contributors.
+Copyright 2020 The Flux authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -19,12 +19,8 @@ package main
 import (
 	"context"
 	"fmt"
-	"io/ioutil"
 	"net/url"
-	"os"
-	"path"
 	"path/filepath"
-	"strings"
 	"time"
 
 	"github.com/spf13/cobra"
@@ -33,14 +29,14 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/wait"
 	"sigs.k8s.io/controller-runtime/pkg/client"
-	"sigs.k8s.io/yaml"
 
 	kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1beta1"
 	sourcev1 "github.com/fluxcd/source-controller/api/v1beta1"
 
-	"github.com/fluxcd/toolkit/internal/flags"
+	"github.com/fluxcd/flux2/internal/flags"
-	"github.com/fluxcd/toolkit/internal/utils"
+	"github.com/fluxcd/flux2/internal/utils"
-	"github.com/fluxcd/toolkit/pkg/install"
+	"github.com/fluxcd/flux2/pkg/manifestgen/install"
+	"github.com/fluxcd/flux2/pkg/manifestgen/sync"
 )
 
 var bootstrapCmd = &cobra.Command{
@@ -54,26 +50,23 @@ var (
 	bootstrapComponents         []string
 	bootstrapRegistry           string
 	bootstrapImagePullSecret    string
-	bootstrapArch               flags.Arch = "amd64"
 	bootstrapBranch             string
 	bootstrapWatchAllNamespaces bool
 	bootstrapNetworkPolicy      bool
-	bootstrapLogLevel           flags.LogLevel = "info"
 	bootstrapManifestsPath      string
+	bootstrapArch               = flags.Arch(defaults.Arch)
+	bootstrapLogLevel           = flags.LogLevel(defaults.LogLevel)
 	bootstrapRequiredComponents = []string{"source-controller", "kustomize-controller"}
 )
 
 const (
 	bootstrapDefaultBranch = "main"
-	bootstrapInstallManifest       = "toolkit-components.yaml"
-	bootstrapSourceManifest        = "toolkit-source.yaml"
-	bootstrapKustomizationManifest = "toolkit-kustomization.yaml"
 )
 
 func init() {
-	bootstrapCmd.PersistentFlags().StringVarP(&bootstrapVersion, "version", "v", defaultVersion,
+	bootstrapCmd.PersistentFlags().StringVarP(&bootstrapVersion, "version", "v", defaults.Version,
 		"toolkit version")
-	bootstrapCmd.PersistentFlags().StringSliceVar(&bootstrapComponents, "components", defaultComponents,
+	bootstrapCmd.PersistentFlags().StringSliceVar(&bootstrapComponents, "components", defaults.Components,
 		"list of components, accepts comma-separated values")
 	bootstrapCmd.PersistentFlags().StringVar(&bootstrapRegistry, "registry", "ghcr.io/fluxcd",
 		"container registry where the toolkit images are published")
@@ -103,13 +96,6 @@ func bootstrapValidate() error {
 }
 
 func generateInstallManifests(targetPath, namespace, tmpDir string, localManifests string) (string, error) {
-	manifestsDir := path.Join(tmpDir, targetPath, namespace)
-	if err := os.MkdirAll(manifestsDir, os.ModePerm); err != nil {
-		return "", fmt.Errorf("creating manifests dir failed: %w", err)
-	}
-
-	manifest := path.Join(manifestsDir, bootstrapInstallManifest)
-
 	opts := install.Options{
 		BaseURL:                localManifests,
 		Version:                bootstrapVersion,
@@ -121,13 +107,14 @@ func generateInstallManifests(targetPath, namespace, tmpDir string, localManifes
 		WatchAllNamespaces:     bootstrapWatchAllNamespaces,
 		NetworkPolicy:          bootstrapNetworkPolicy,
 		LogLevel:               bootstrapLogLevel.String(),
-		NotificationController: defaultNotification,
+		NotificationController: defaults.NotificationController,
-		ManifestsFile:          fmt.Sprintf("%s.yaml", namespace),
+		ManifestFile:           defaults.ManifestFile,
 		Timeout:                timeout,
+		TargetPath:             targetPath,
 	}
 
 	if localManifests == "" {
-		opts.BaseURL = install.MakeDefaultOptions().BaseURL
+		opts.BaseURL = defaults.BaseURL
 	}
 
 	output, err := install.Generate(opts)
@@ -135,11 +122,12 @@ func generateInstallManifests(targetPath, namespace, tmpDir string, localManifes
 		return "", fmt.Errorf("generating install manifests failed: %w", err)
 	}
 
-	if err := ioutil.WriteFile(manifest, output, os.ModePerm); err != nil {
+	if filePath, err := output.WriteFile(tmpDir); err != nil {
 		return "", fmt.Errorf("generating install manifests failed: %w", err)
+	} else {
+		return filePath, nil
 	}
 
-	return manifest, nil
 }
 
 func applyInstallManifests(ctx context.Context, manifestPath string, components []string) error {
@@ -158,69 +146,22 @@ func applyInstallManifests(ctx context.Context, manifestPath string, components
 }
 
 func generateSyncManifests(url, branch, name, namespace, targetPath, tmpDir string, interval time.Duration) error {
-	gvk := sourcev1.GroupVersion.WithKind(sourcev1.GitRepositoryKind)
+	opts := sync.Options{
-	gitRepository := sourcev1.GitRepository{
-		TypeMeta: metav1.TypeMeta{
-			Kind:       gvk.Kind,
-			APIVersion: gvk.GroupVersion().String(),
-		},
-		ObjectMeta: metav1.ObjectMeta{
 		Name:         name,
 		Namespace:    namespace,
-		},
-		Spec: sourcev1.GitRepositorySpec{
 		URL:          url,
-			Interval: metav1.Duration{
-				Duration: interval,
-			},
-			Reference: &sourcev1.GitRepositoryRef{
 		Branch:       branch,
-			},
+		Interval:     interval,
-			SecretRef: &corev1.LocalObjectReference{
+		TargetPath:   targetPath,
-				Name: name,
+		ManifestFile: sync.MakeDefaultOptions().ManifestFile,
-			},
-		},
 	}
 
-	gitData, err := yaml.Marshal(gitRepository)
+	manifest, err := sync.Generate(opts)
 	if err != nil {
-		return err
+		return fmt.Errorf("generating install manifests failed: %w", err)
 	}
 
-	if err := utils.WriteFile(string(gitData), filepath.Join(tmpDir, targetPath, namespace, bootstrapSourceManifest)); err != nil {
+	if _, err := manifest.WriteFile(tmpDir); err != nil {
-		return err
-	}
-
-	gvk = kustomizev1.GroupVersion.WithKind(kustomizev1.KustomizationKind)
-	kustomization := kustomizev1.Kustomization{
-		TypeMeta: metav1.TypeMeta{
-			Kind:       gvk.Kind,
-			APIVersion: gvk.GroupVersion().String(),
-		},
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      name,
-			Namespace: namespace,
-		},
-		Spec: kustomizev1.KustomizationSpec{
-			Interval: metav1.Duration{
-				Duration: 10 * time.Minute,
-			},
-			Path:  fmt.Sprintf("./%s", strings.TrimPrefix(targetPath, "./")),
-			Prune: true,
-			SourceRef: kustomizev1.CrossNamespaceSourceReference{
-				Kind: sourcev1.GitRepositoryKind,
-				Name: name,
-			},
-			Validation: "client",
-		},
-	}
-
-	ksData, err := yaml.Marshal(kustomization)
-	if err != nil {
-		return err
-	}
-
-	if err := utils.WriteFile(string(ksData), filepath.Join(tmpDir, targetPath, namespace, bootstrapKustomizationManifest)); err != nil {
 		return err
 	}
 

cmd/flux/bootstrap_github.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Flux CD contributors.
+Copyright 2020 The Flux authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -27,8 +27,8 @@ import (
 
 	"github.com/spf13/cobra"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	"github.com/fluxcd/pkg/git"
-	"github.com/fluxcd/toolkit/internal/utils"
 )
 
 var bootstrapGitHubCmd = &cobra.Command{
@@ -43,22 +43,22 @@ the bootstrap command will perform an upgrade if needed.`,
   export GITHUB_TOKEN=<my-token>
 
   # Run bootstrap for a private repo owned by a GitHub organization
-  gotk bootstrap github --owner=<organization> --repository=<repo name>
+  flux bootstrap github --owner=<organization> --repository=<repo name>
 
   # Run bootstrap for a private repo and assign organization teams to it
-  gotk bootstrap github --owner=<organization> --repository=<repo name> --team=<team1 slug> --team=<team2 slug>
+  flux bootstrap github --owner=<organization> --repository=<repo name> --team=<team1 slug> --team=<team2 slug>
 
   # Run bootstrap for a repository path
-  gotk bootstrap github --owner=<organization> --repository=<repo name> --path=dev-cluster
+  flux bootstrap github --owner=<organization> --repository=<repo name> --path=dev-cluster
 
   # Run bootstrap for a public repository on a personal account
-  gotk bootstrap github --owner=<user> --repository=<repo name> --private=false --personal=true 
+  flux bootstrap github --owner=<user> --repository=<repo name> --private=false --personal=true 
 
   # Run bootstrap for a private repo hosted on GitHub Enterprise
-  gotk bootstrap github --owner=<organization> --repository=<repo name> --hostname=<domain>
+  flux bootstrap github --owner=<organization> --repository=<repo name> --hostname=<domain>
 
   # Run bootstrap for a an existing repository with a branch named main
-  gotk bootstrap github --owner=<organization> --repository=<repo name> --branch=main
+  flux bootstrap github --owner=<organization> --repository=<repo name> --branch=main
 `,
 	RunE: bootstrapGitHubCmdRun,
 }
@@ -105,7 +105,7 @@ func bootstrapGitHubCmdRun(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
-	repository, err := git.NewRepository(ghRepository, ghOwner, ghHostname, ghToken, "gotk", ghOwner+"@users.noreply.github.com")
+	repository, err := git.NewRepository(ghRepository, ghOwner, ghHostname, ghToken, "flux", ghOwner+"@users.noreply.github.com")
 	if err != nil {
 		return err
 	}
@@ -184,7 +184,7 @@ func bootstrapGitHubCmdRun(cmd *cobra.Command, args []string) error {
 		logger.Successf("components are up to date")
 	}
 
-	kubeClient, err := utils.KubeClient(kubeconfig)
+	kubeClient, err := utils.KubeClient(kubeconfig, kubecontext)
 	if err != nil {
 		return err
 	}
@@ -214,9 +214,9 @@ func bootstrapGitHubCmdRun(cmd *cobra.Command, args []string) error {
 			return fmt.Errorf("generating deploy key failed: %w", err)
 		}
 
-		keyName := "gotk"
+		keyName := "flux"
 		if ghPath != "" {
-			keyName = fmt.Sprintf("gotk-%s", ghPath)
+			keyName = fmt.Sprintf("flux-%s", ghPath)
 		}
 
 		if changed, err := provider.AddDeployKey(ctx, repository, key, keyName); err != nil {

cmd/flux/bootstrap_gitlab.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Flux CD contributors.
+Copyright 2020 The Flux authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -29,8 +29,8 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	"github.com/fluxcd/pkg/git"
-	"github.com/fluxcd/toolkit/internal/utils"
 )
 
 var bootstrapGitLabCmd = &cobra.Command{
@@ -45,22 +45,22 @@ the bootstrap command will perform an upgrade if needed.`,
   export GITLAB_TOKEN=<my-token>
 
   # Run bootstrap for a private repo using HTTPS token authentication 
-  gotk bootstrap gitlab --owner=<group> --repository=<repo name>
+  flux bootstrap gitlab --owner=<group> --repository=<repo name>
 
   # Run bootstrap for a private repo using SSH authentication
-  gotk bootstrap gitlab --owner=<group> --repository=<repo name> --ssh-hostname=gitlab.com
+  flux bootstrap gitlab --owner=<group> --repository=<repo name> --ssh-hostname=gitlab.com
 
   # Run bootstrap for a repository path
-  gotk bootstrap gitlab --owner=<group> --repository=<repo name> --path=dev-cluster
+  flux bootstrap gitlab --owner=<group> --repository=<repo name> --path=dev-cluster
 
   # Run bootstrap for a public repository on a personal account
-  gotk bootstrap gitlab --owner=<user> --repository=<repo name> --private=false --personal=true
+  flux bootstrap gitlab --owner=<user> --repository=<repo name> --private=false --personal=true
 
   # Run bootstrap for a private repo hosted on a GitLab server 
-  gotk bootstrap gitlab --owner=<group> --repository=<repo name> --hostname=<domain>
+  flux bootstrap gitlab --owner=<group> --repository=<repo name> --hostname=<domain>
 
   # Run bootstrap for a an existing repository with a branch named main
-  gotk bootstrap gitlab --owner=<organization> --repository=<repo name> --branch=main
+  flux bootstrap gitlab --owner=<organization> --repository=<repo name> --branch=main
 `,
 	RunE: bootstrapGitLabCmdRun,
 }
@@ -99,7 +99,7 @@ func bootstrapGitLabCmdRun(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
-	repository, err := git.NewRepository(glRepository, glOwner, glHostname, glToken, "gotk", glOwner+"@users.noreply.gitlab.com")
+	repository, err := git.NewRepository(glRepository, glOwner, glHostname, glToken, "flux", glOwner+"@users.noreply.gitlab.com")
 	if err != nil {
 		return err
 	}
@@ -113,7 +113,7 @@ func bootstrapGitLabCmdRun(cmd *cobra.Command, args []string) error {
 		IsPersonal: glPersonal,
 	}
 
-	kubeClient, err := utils.KubeClient(kubeconfig)
+	kubeClient, err := utils.KubeClient(kubeconfig, kubecontext)
 	if err != nil {
 		return err
 	}
@@ -195,9 +195,9 @@ func bootstrapGitLabCmdRun(cmd *cobra.Command, args []string) error {
 				return fmt.Errorf("generating deploy key failed: %w", err)
 			}
 
-			keyName := "gotk"
+			keyName := "flux"
 			if glPath != "" {
-				keyName = fmt.Sprintf("gotk-%s", glPath)
+				keyName = fmt.Sprintf("flux-%s", glPath)
 			}
 
 			if changed, err := provider.AddDeployKey(ctx, repository, key, keyName); err != nil {

cmd/flux/check.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Flux CD contributors.
+Copyright 2020 The Flux authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@ import (
 	"strings"
 
 	"github.com/blang/semver/v4"
-	"github.com/fluxcd/toolkit/internal/utils"
+	"github.com/fluxcd/flux2/internal/utils"
 	"github.com/spf13/cobra"
 	apimachineryversion "k8s.io/apimachinery/pkg/version"
 	"k8s.io/client-go/kubernetes"
@@ -37,10 +37,10 @@ var checkCmd = &cobra.Command{
 	Long: `The check command will perform a series of checks to validate that
 the local environment is configured correctly and if the installed components are healthy.`,
 	Example: `  # Run pre-installation checks
-  gotk check --pre
+  flux check --pre
 
   # Run installation checks
-  gotk check
+  flux check
 `,
 	RunE: runCheckCmd,
 }
@@ -57,7 +57,7 @@ type kubectlVersion struct {
 func init() {
 	checkCmd.Flags().BoolVarP(&checkPre, "pre", "", false,
 		"only run pre-installation checks")
-	checkCmd.Flags().StringSliceVar(&checkComponents, "components", defaultComponents,
+	checkCmd.Flags().StringSliceVar(&checkComponents, "components", defaults.Components,
 		"list of components, accepts comma-separated values")
 	rootCmd.AddCommand(checkCmd)
 }

cmd/flux/completion.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Flux CD contributors.
+Copyright 2020 The Flux authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

cmd/flux/completion_bash.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Flux CD contributors.
+Copyright 2020 The Flux authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -27,12 +27,12 @@ var completionBashCmd = &cobra.Command{
 	Short: "Generates bash completion scripts",
 	Example: `To load completion run
 
-. <(gotk completion bash)
+. <(flux completion bash)
 
 To configure your bash shell to load completions for each session add to your bashrc
 
 # ~/.bashrc or ~/.profile
-command -v gotk >/dev/null && . <(gotk completion bash)
+command -v flux >/dev/null && . <(flux completion bash)
 `,
 	Run: func(cmd *cobra.Command, args []string) {
 		rootCmd.GenBashCompletion(os.Stdout)

cmd/flux/completion_fish.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Flux CD contributors.
+Copyright 2020 The Flux authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -27,11 +27,11 @@ var completionFishCmd = &cobra.Command{
 	Short: "Generates fish completion scripts",
 	Example: `To load completion run
 
-. <(gotk completion fish)
+. <(flux completion fish)
 
 To configure your fish shell to load completions for each session write this script to your completions dir:
 
-gotk completion fish > ~/.config/fish/completions/gotk
+flux completion fish > ~/.config/fish/completions/flux
 
 See http://fishshell.com/docs/current/index.html#completion-own for more details
 `,

cmd/flux/completion_powershell.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Flux CD contributors.
+Copyright 2020 The Flux authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -27,19 +27,19 @@ var completionPowerShellCmd = &cobra.Command{
 	Short: "Generates powershell completion scripts",
 	Example: `To load completion run
 
-. <(gotk completion powershell)
+. <(flux completion powershell)
 
 To configure your powershell shell to load completions for each session add to your powershell profile
 
 Windows:
 
 cd "$env:USERPROFILE\Documents\WindowsPowerShell\Modules"
-gotk completion >> gotk-completion.ps1
+flux completion >> flux-completion.ps1
 
 Linux:
 
 cd "${XDG_CONFIG_HOME:-"$HOME/.config/"}/powershell/modules"
-gotk completion >> gotk-completions.ps1
+flux completion >> flux-completions.ps1
 `,
 	Run: func(cmd *cobra.Command, args []string) {
 		rootCmd.GenPowerShellCompletion(os.Stdout)

cmd/flux/completion_zsh.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Flux CD contributors.
+Copyright 2020 The Flux authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -27,20 +27,20 @@ var completionZshCmd = &cobra.Command{
 	Short: "Generates zsh completion scripts",
 	Example: `To load completion run
 
-. <(gotk completion zsh) && compdef _gotk gotk
+. <(flux completion zsh) && compdef _flux flux
 
 To configure your zsh shell to load completions for each session add to your zshrc
 
 # ~/.zshrc or ~/.profile
-command -v gotk >/dev/null && . <(gotk completion zsh) && compdef _gotk gotk
+command -v flux >/dev/null && . <(flux completion zsh) && compdef _flux flux
 
 or write a cached file in one of the completion directories in your ${fpath}:
 
 echo "${fpath// /\n}" | grep -i completion
-gotk completions zsh > _gotk
+flux completions zsh > _flux
 
-mv _gotk ~/.oh-my-zsh/completions  # oh-my-zsh
+mv _flux ~/.oh-my-zsh/completions  # oh-my-zsh
-mv _gotk ~/.zprezto/modules/completion/external/src/  # zprezto
+mv _flux ~/.zprezto/modules/completion/external/src/  # zprezto
 `,
 	Run: func(cmd *cobra.Command, args []string) {
 		rootCmd.GenZshCompletion(os.Stdout)

cmd/flux/create.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Flux CD contributors.
+Copyright 2020 The Flux authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

cmd/flux/create_alert.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Flux CD contributors.
+Copyright 2020 The Flux authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -20,8 +20,8 @@ import (
 	"context"
 	"fmt"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	"github.com/fluxcd/pkg/apis/meta"
-	"github.com/fluxcd/toolkit/internal/utils"
 
 	"github.com/spf13/cobra"
 	corev1 "k8s.io/api/core/v1"
@@ -39,11 +39,11 @@ var createAlertCmd = &cobra.Command{
 	Short: "Create or update a Alert resource",
 	Long:  "The create alert command generates a Alert resource.",
 	Example: `  # Create an Alert for kustomization events
-  gotk create alert \
+  flux create alert \
   --event-severity info \
-  --event-source Kustomization/gotk-system \
+  --event-source Kustomization/flux-system \
   --provider-ref slack \
-  gotk-system
+  flux-system
 `,
 	RunE: createAlertCmdRun,
 }
@@ -120,7 +120,7 @@ func createAlertCmdRun(cmd *cobra.Command, args []string) error {
 	ctx, cancel := context.WithTimeout(context.Background(), timeout)
 	defer cancel()
 
-	kubeClient, err := utils.KubeClient(kubeconfig)
+	kubeClient, err := utils.KubeClient(kubeconfig, kubecontext)
 	if err != nil {
 		return err
 	}

cmd/flux/create_alertprovider.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Flux CD contributors.
+Copyright 2020 The Flux authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -28,9 +28,9 @@ import (
 	"k8s.io/apimachinery/pkg/util/wait"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	notificationv1 "github.com/fluxcd/notification-controller/api/v1beta1"
 	"github.com/fluxcd/pkg/apis/meta"
-	"github.com/fluxcd/toolkit/internal/utils"
 )
 
 var createAlertProviderCmd = &cobra.Command{
@@ -38,14 +38,14 @@ var createAlertProviderCmd = &cobra.Command{
 	Short: "Create or update a Provider resource",
 	Long:  "The create alert-provider command generates a Provider resource.",
 	Example: `  # Create a Provider for a Slack channel
-  gotk create alert-provider slack \
+  flux create alert-provider slack \
   --type slack \
   --channel general \
   --address https://hooks.slack.com/services/YOUR/SLACK/WEBHOOK \
   --secret-ref webhook-url
 
   # Create a Provider for a Github repository
-  gotk create alert-provider github-podinfo \
+  flux create alert-provider github-podinfo \
   --type github \
   --address https://github.com/stefanprodan/podinfo \
   --secret-ref github-token
@@ -116,7 +116,7 @@ func createAlertProviderCmdRun(cmd *cobra.Command, args []string) error {
 	ctx, cancel := context.WithTimeout(context.Background(), timeout)
 	defer cancel()
 
-	kubeClient, err := utils.KubeClient(kubeconfig)
+	kubeClient, err := utils.KubeClient(kubeconfig, kubecontext)
 	if err != nil {
 		return err
 	}

cmd/flux/create_helmrelease.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Flux CD contributors.
+Copyright 2020 The Flux authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,9 +21,9 @@ import (
 	"fmt"
 	"io/ioutil"
 
+	"github.com/fluxcd/flux2/internal/flags"
+	"github.com/fluxcd/flux2/internal/utils"
 	"github.com/fluxcd/pkg/apis/meta"
-	"github.com/fluxcd/toolkit/internal/flags"
-	"github.com/fluxcd/toolkit/internal/utils"
 
 	"github.com/spf13/cobra"
 	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
@@ -43,44 +43,44 @@ var createHelmReleaseCmd = &cobra.Command{
 	Short:   "Create or update a HelmRelease resource",
 	Long:    "The helmrelease create command generates a HelmRelease resource for a given HelmRepository source.",
 	Example: `  # Create a HelmRelease with a chart from a HelmRepository source
-  gotk create hr podinfo \
+  flux create hr podinfo \
     --interval=10m \
     --source=HelmRepository/podinfo \
     --chart=podinfo \
     --chart-version=">4.0.0"
 
   # Create a HelmRelease with a chart from a GitRepository source
-  gotk create hr podinfo \
+  flux create hr podinfo \
     --interval=10m \
     --source=GitRepository/podinfo \
     --chart=./charts/podinfo
 
   # Create a HelmRelease with a chart from a Bucket source
-  gotk create hr podinfo \
+  flux create hr podinfo \
     --interval=10m \
     --source=Bucket/podinfo \
     --chart=./charts/podinfo
 
   # Create a HelmRelease with values from a local YAML file
-  gotk create hr podinfo \
+  flux create hr podinfo \
     --source=HelmRepository/podinfo \
     --chart=podinfo \
     --values=./my-values.yaml
 
   # Create a HelmRelease with a custom release name
-  gotk create hr podinfo \
+  flux create hr podinfo \
     --release-name=podinfo-dev
     --source=HelmRepository/podinfo \
     --chart=podinfo \
 
   # Create a HelmRelease targeting another namespace than the resource
-  gotk create hr podinfo \
+  flux create hr podinfo \
     --target-namespace=default \
     --source=HelmRepository/podinfo \
     --chart=podinfo
 
   # Create a HelmRelease definition on disk without applying it on the cluster
-  gotk create hr podinfo \
+  flux create hr podinfo \
     --source=HelmRepository/podinfo \
     --chart=podinfo \
     --values=./values.yaml \
@@ -177,7 +177,7 @@ func createHelmReleaseCmdRun(cmd *cobra.Command, args []string) error {
 	ctx, cancel := context.WithTimeout(context.Background(), timeout)
 	defer cancel()
 
-	kubeClient, err := utils.KubeClient(kubeconfig)
+	kubeClient, err := utils.KubeClient(kubeconfig, kubecontext)
 	if err != nil {
 		return err
 	}

cmd/flux/create_kustomization.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Flux CD contributors.
+Copyright 2020 The Flux authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -30,11 +30,11 @@ import (
 	"k8s.io/apimachinery/pkg/util/wait"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
+	"github.com/fluxcd/flux2/internal/flags"
+	"github.com/fluxcd/flux2/internal/utils"
 	helmv2 "github.com/fluxcd/helm-controller/api/v2beta1"
 	kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1beta1"
 	"github.com/fluxcd/pkg/apis/meta"
-	"github.com/fluxcd/toolkit/internal/flags"
-	"github.com/fluxcd/toolkit/internal/utils"
 )
 
 var createKsCmd = &cobra.Command{
@@ -43,7 +43,7 @@ var createKsCmd = &cobra.Command{
 	Short:   "Create or update a Kustomization resource",
 	Long:    "The kustomization source create command generates a Kustomize resource for a given source.",
 	Example: `  # Create a Kustomization resource from a source at a given path
-  gotk create kustomization contour \
+  flux create kustomization contour \
     --source=contour \
     --path="./examples/contour/" \
     --prune=true \
@@ -54,7 +54,7 @@ var createKsCmd = &cobra.Command{
     --health-check-timeout=3m
 
   # Create a Kustomization resource that depends on the previous one
-  gotk create kustomization webapp \
+  flux create kustomization webapp \
     --depends-on=contour \
     --source=webapp \
     --path="./deploy/overlays/dev" \
@@ -63,7 +63,7 @@ var createKsCmd = &cobra.Command{
     --validation=client
 
   # Create a Kustomization resource that references a Bucket
-  gotk create kustomization secrets \
+  flux create kustomization secrets \
     --source=Bucket/secrets \
     --prune=true \
     --interval=5m
@@ -209,7 +209,7 @@ func createKsCmdRun(cmd *cobra.Command, args []string) error {
 	ctx, cancel := context.WithTimeout(context.Background(), timeout)
 	defer cancel()
 
-	kubeClient, err := utils.KubeClient(kubeconfig)
+	kubeClient, err := utils.KubeClient(kubeconfig, kubecontext)
 	if err != nil {
 		return err
 	}

cmd/flux/create_receiver.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Flux CD contributors.
+Copyright 2020 The Flux authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -28,9 +28,9 @@ import (
 	"k8s.io/apimachinery/pkg/util/wait"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	notificationv1 "github.com/fluxcd/notification-controller/api/v1beta1"
 	"github.com/fluxcd/pkg/apis/meta"
-	"github.com/fluxcd/toolkit/internal/utils"
 )
 
 var createReceiverCmd = &cobra.Command{
@@ -38,7 +38,7 @@ var createReceiverCmd = &cobra.Command{
 	Short: "Create or update a Receiver resource",
 	Long:  "The create receiver command generates a Receiver resource.",
 	Example: `  # Create a Receiver
-  gotk create receiver github-receiver \
+  flux create receiver github-receiver \
 	--type github \
 	--event ping \
 	--event push \
@@ -128,7 +128,7 @@ func createReceiverCmdRun(cmd *cobra.Command, args []string) error {
 	ctx, cancel := context.WithTimeout(context.Background(), timeout)
 	defer cancel()
 
-	kubeClient, err := utils.KubeClient(kubeconfig)
+	kubeClient, err := utils.KubeClient(kubeconfig, kubecontext)
 	if err != nil {
 		return err
 	}

cmd/flux/create_source.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Flux CD contributors.
+Copyright 2020 The Flux authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

cmd/flux/create_source_bucket.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Flux CD contributors.
+Copyright 2020 The Flux authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -30,9 +30,9 @@ import (
 	"k8s.io/apimachinery/pkg/util/wait"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
+	"github.com/fluxcd/flux2/internal/flags"
+	"github.com/fluxcd/flux2/internal/utils"
 	sourcev1 "github.com/fluxcd/source-controller/api/v1beta1"
-	"github.com/fluxcd/toolkit/internal/flags"
-	"github.com/fluxcd/toolkit/internal/utils"
 )
 
 var createSourceBucketCmd = &cobra.Command{
@@ -42,7 +42,7 @@ var createSourceBucketCmd = &cobra.Command{
 The create source bucket command generates a Bucket resource and waits for it to be downloaded.
 For Buckets with static authentication, the credentials are stored in a Kubernetes secret.`,
 	Example: `  # Create a source from a Buckets using static authentication
-  gotk create source bucket podinfo \
+  flux create source bucket podinfo \
 	--bucket-name=podinfo \
     --endpoint=minio.minio.svc.cluster.local:9000 \
 	--insecure=true \
@@ -51,7 +51,7 @@ For Buckets with static authentication, the credentials are stored in a Kubernet
     --interval=10m
 
   # Create a source from an Amazon S3 Bucket using IAM authentication
-  gotk create source bucket podinfo \
+  flux create source bucket podinfo \
 	--bucket-name=podinfo \
 	--provider=aws \
     --endpoint=s3.amazonaws.com \
@@ -140,7 +140,7 @@ func createSourceBucketCmdRun(cmd *cobra.Command, args []string) error {
 	ctx, cancel := context.WithTimeout(context.Background(), timeout)
 	defer cancel()
 
-	kubeClient, err := utils.KubeClient(kubeconfig)
+	kubeClient, err := utils.KubeClient(kubeconfig, kubecontext)
 	if err != nil {
 		return err
 	}

cmd/flux/create_source_git.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Flux CD contributors.
+Copyright 2020 The Flux authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -25,9 +25,9 @@ import (
 	"os"
 	"time"
 
+	"github.com/fluxcd/flux2/internal/flags"
+	"github.com/fluxcd/flux2/internal/utils"
 	"github.com/fluxcd/pkg/apis/meta"
-	"github.com/fluxcd/toolkit/internal/flags"
-	"github.com/fluxcd/toolkit/internal/utils"
 
 	sourcev1 "github.com/fluxcd/source-controller/api/v1beta1"
 	"github.com/manifoldco/promptui"
@@ -50,35 +50,35 @@ The create source git command generates a GitRepository resource and waits for i
 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
-  gotk create source git podinfo \
+  flux create source git podinfo \
     --url=https://github.com/stefanprodan/podinfo \
     --branch=master
 
   # Create a source from a Git repository pinned to specific git tag
-  gotk create source git podinfo \
+  flux 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
-  gotk create source git podinfo \
+  flux 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
-  gotk create source git podinfo \
+  flux create source git podinfo \
     --url=ssh://git@github.com/stefanprodan/podinfo \
     --branch=master
 
   # Create a source from a Git repository using SSH authentication and an
   # ECDSA P-521 curve public key
-  gotk create source git podinfo \
+  flux create source git podinfo \
     --url=ssh://git@github.com/stefanprodan/podinfo \
     --branch=master \
     --ssh-key-algorithm=ecdsa \
     --ssh-ecdsa-curve=p521
 
   # Create a source from a Git repository using basic authentication
-  gotk create source git podinfo \
+  flux create source git podinfo \
     --url=https://github.com/stefanprodan/podinfo \
     --username=username \
     --password=password
@@ -176,7 +176,7 @@ func createSourceGitCmdRun(cmd *cobra.Command, args []string) error {
 	ctx, cancel := context.WithTimeout(context.Background(), timeout)
 	defer cancel()
 
-	kubeClient, err := utils.KubeClient(kubeconfig)
+	kubeClient, err := utils.KubeClient(kubeconfig, kubecontext)
 	if err != nil {
 		return err
 	}

cmd/flux/create_source_helm.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Flux CD contributors.
+Copyright 2020 The Flux authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -31,8 +31,8 @@ import (
 	"k8s.io/apimachinery/pkg/util/wait"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	sourcev1 "github.com/fluxcd/source-controller/api/v1beta1"
-	"github.com/fluxcd/toolkit/internal/utils"
 )
 
 var createSourceHelmCmd = &cobra.Command{
@@ -42,18 +42,18 @@ var createSourceHelmCmd = &cobra.Command{
 The create source helm command generates a HelmRepository resource and waits for it to fetch the index.
 For private Helm repositories, the basic authentication credentials are stored in a Kubernetes secret.`,
 	Example: `  # Create a source from a public Helm repository
-  gotk create source helm podinfo \
+  flux create source helm podinfo \
     --url=https://stefanprodan.github.io/podinfo \
     --interval=10m
 
   # Create a source from a Helm repository using basic authentication
-  gotk create source helm podinfo \
+  flux create source helm podinfo \
     --url=https://stefanprodan.github.io/podinfo \
     --username=username \
     --password=password
 
   # Create a source from a Helm repository using TLS authentication
-  gotk create source helm podinfo \
+  flux create source helm podinfo \
     --url=https://stefanprodan.github.io/podinfo \
     --cert-file=./cert.crt \
     --key-file=./key.crt \
@@ -136,7 +136,7 @@ func createSourceHelmCmdRun(cmd *cobra.Command, args []string) error {
 	ctx, cancel := context.WithTimeout(context.Background(), timeout)
 	defer cancel()
 
-	kubeClient, err := utils.KubeClient(kubeconfig)
+	kubeClient, err := utils.KubeClient(kubeconfig, kubecontext)
 	if err != nil {
 		return err
 	}

cmd/flux/create_tenant.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Flux CD contributors.
+Copyright 2020 The Flux authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/fluxcd/toolkit/internal/utils"
+	"github.com/fluxcd/flux2/internal/utils"
 	"github.com/spf13/cobra"
 	corev1 "k8s.io/api/core/v1"
 	rbacv1 "k8s.io/api/rbac/v1"
@@ -41,12 +41,12 @@ var createTenantCmd = &cobra.Command{
 The create tenant command generates namespaces and role bindings to limit the
 reconcilers scope to the tenant namespaces.`,
 	Example: `  # Create a tenant with access to a namespace 
-  gotk create tenant dev-team \
+  flux create tenant dev-team \
     --with-namespace=frontend \
     --label=environment=dev
 
   # Generate tenant namespaces and role bindings in YAML format
-  gotk create tenant dev-team \
+  flux create tenant dev-team \
     --with-namespace=frontend \
     --with-namespace=backend \
 	--export > dev-team.yaml
@@ -145,7 +145,7 @@ func createTenantCmdRun(cmd *cobra.Command, args []string) error {
 	ctx, cancel := context.WithTimeout(context.Background(), timeout)
 	defer cancel()
 
-	kubeClient, err := utils.KubeClient(kubeconfig)
+	kubeClient, err := utils.KubeClient(kubeconfig, kubecontext)
 	if err != nil {
 		return err
 	}

cmd/flux/delete.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Flux CD contributors.
+Copyright 2020 The Flux authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

cmd/flux/delete_alert.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Flux CD contributors.
+Copyright 2020 The Flux authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -24,8 +24,8 @@ import (
 	"github.com/spf13/cobra"
 	"k8s.io/apimachinery/pkg/types"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	notificationv1 "github.com/fluxcd/notification-controller/api/v1beta1"
-	"github.com/fluxcd/toolkit/internal/utils"
 )
 
 var deleteAlertCmd = &cobra.Command{
@@ -33,7 +33,7 @@ var deleteAlertCmd = &cobra.Command{
 	Short: "Delete a Alert resource",
 	Long:  "The delete alert command removes the given Alert from the cluster.",
 	Example: `  # Delete an Alert and the Kubernetes resources created by it
-  gotk delete alert main
+  flux delete alert main
 `,
 	RunE: deleteAlertCmdRun,
 }
@@ -51,7 +51,7 @@ func deleteAlertCmdRun(cmd *cobra.Command, args []string) error {
 	ctx, cancel := context.WithTimeout(context.Background(), timeout)
 	defer cancel()
 
-	kubeClient, err := utils.KubeClient(kubeconfig)
+	kubeClient, err := utils.KubeClient(kubeconfig, kubecontext)
 	if err != nil {
 		return err
 	}

cmd/flux/delete_alertprovider.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Flux CD contributors.
+Copyright 2020 The Flux authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -24,8 +24,8 @@ import (
 	"github.com/spf13/cobra"
 	"k8s.io/apimachinery/pkg/types"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	notificationv1 "github.com/fluxcd/notification-controller/api/v1beta1"
-	"github.com/fluxcd/toolkit/internal/utils"
 )
 
 var deleteAlertProviderCmd = &cobra.Command{
@@ -33,7 +33,7 @@ var deleteAlertProviderCmd = &cobra.Command{
 	Short: "Delete a Provider resource",
 	Long:  "The delete alert-provider command removes the given Provider from the cluster.",
 	Example: `  # Delete a Provider and the Kubernetes resources created by it
-  gotk delete alert-provider slack
+  flux delete alert-provider slack
 `,
 	RunE: deleteAlertProviderCmdRun,
 }
@@ -51,7 +51,7 @@ func deleteAlertProviderCmdRun(cmd *cobra.Command, args []string) error {
 	ctx, cancel := context.WithTimeout(context.Background(), timeout)
 	defer cancel()
 
-	kubeClient, err := utils.KubeClient(kubeconfig)
+	kubeClient, err := utils.KubeClient(kubeconfig, kubecontext)
 	if err != nil {
 		return err
 	}

cmd/flux/delete_helmrelease.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Flux CD contributors.
+Copyright 2020 The Flux authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -24,8 +24,8 @@ import (
 	"github.com/spf13/cobra"
 	"k8s.io/apimachinery/pkg/types"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	helmv2 "github.com/fluxcd/helm-controller/api/v2beta1"
-	"github.com/fluxcd/toolkit/internal/utils"
 )
 
 var deleteHelmReleaseCmd = &cobra.Command{
@@ -34,7 +34,7 @@ var deleteHelmReleaseCmd = &cobra.Command{
 	Short:   "Delete a HelmRelease resource",
 	Long:    "The delete helmrelease command removes the given HelmRelease from the cluster.",
 	Example: `  # Delete a Helm release and the Kubernetes resources created by it
-  gotk delete hr podinfo
+  flux delete hr podinfo
 `,
 	RunE: deleteHelmReleaseCmdRun,
 }
@@ -52,7 +52,7 @@ func deleteHelmReleaseCmdRun(cmd *cobra.Command, args []string) error {
 	ctx, cancel := context.WithTimeout(context.Background(), timeout)
 	defer cancel()
 
-	kubeClient, err := utils.KubeClient(kubeconfig)
+	kubeClient, err := utils.KubeClient(kubeconfig, kubecontext)
 	if err != nil {
 		return err
 	}

cmd/flux/delete_kustomization.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Flux CD contributors.
+Copyright 2020 The Flux authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -20,8 +20,8 @@ import (
 	"context"
 	"fmt"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1beta1"
-	"github.com/fluxcd/toolkit/internal/utils"
 	"github.com/manifoldco/promptui"
 	"github.com/spf13/cobra"
 	"k8s.io/apimachinery/pkg/types"
@@ -33,7 +33,7 @@ var deleteKsCmd = &cobra.Command{
 	Short:   "Delete a Kustomization resource",
 	Long:    "The delete kustomization command deletes the given Kustomization from the cluster.",
 	Example: `  # Delete a kustomization and the Kubernetes resources created by it
-  gotk delete kustomization podinfo
+  flux delete kustomization podinfo
 `,
 	RunE: deleteKsCmdRun,
 }
@@ -51,7 +51,7 @@ func deleteKsCmdRun(cmd *cobra.Command, args []string) error {
 	ctx, cancel := context.WithTimeout(context.Background(), timeout)
 	defer cancel()
 
-	kubeClient, err := utils.KubeClient(kubeconfig)
+	kubeClient, err := utils.KubeClient(kubeconfig, kubecontext)
 	if err != nil {
 		return err
 	}

cmd/flux/delete_receiver.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Flux CD contributors.
+Copyright 2020 The Flux authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -24,8 +24,8 @@ import (
 	"github.com/spf13/cobra"
 	"k8s.io/apimachinery/pkg/types"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	notificationv1 "github.com/fluxcd/notification-controller/api/v1beta1"
-	"github.com/fluxcd/toolkit/internal/utils"
 )
 
 var deleteReceiverCmd = &cobra.Command{
@@ -33,7 +33,7 @@ var deleteReceiverCmd = &cobra.Command{
 	Short: "Delete a Receiver resource",
 	Long:  "The delete receiver command removes the given Receiver from the cluster.",
 	Example: `  # Delete an Receiver and the Kubernetes resources created by it
-  gotk delete receiver main
+  flux delete receiver main
 `,
 	RunE: deleteReceiverCmdRun,
 }
@@ -51,7 +51,7 @@ func deleteReceiverCmdRun(cmd *cobra.Command, args []string) error {
 	ctx, cancel := context.WithTimeout(context.Background(), timeout)
 	defer cancel()
 
-	kubeClient, err := utils.KubeClient(kubeconfig)
+	kubeClient, err := utils.KubeClient(kubeconfig, kubecontext)
 	if err != nil {
 		return err
 	}

cmd/flux/delete_source.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Flux CD contributors.
+Copyright 2020 The Flux authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

cmd/flux/delete_source_bucket.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Flux CD contributors.
+Copyright 2020 The Flux authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -20,8 +20,8 @@ import (
 	"context"
 	"fmt"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	sourcev1 "github.com/fluxcd/source-controller/api/v1beta1"
-	"github.com/fluxcd/toolkit/internal/utils"
 	"github.com/manifoldco/promptui"
 	"github.com/spf13/cobra"
 	"k8s.io/apimachinery/pkg/types"
@@ -32,7 +32,7 @@ var deleteSourceBucketCmd = &cobra.Command{
 	Short: "Delete a Bucket source",
 	Long:  "The delete source bucket command deletes the given Bucket from the cluster.",
 	Example: `  # Delete a Bucket source
-  gotk delete source bucket podinfo
+  flux delete source bucket podinfo
 `,
 	RunE: deleteSourceBucketCmdRun,
 }
@@ -50,7 +50,7 @@ func deleteSourceBucketCmdRun(cmd *cobra.Command, args []string) error {
 	ctx, cancel := context.WithTimeout(context.Background(), timeout)
 	defer cancel()
 
-	kubeClient, err := utils.KubeClient(kubeconfig)
+	kubeClient, err := utils.KubeClient(kubeconfig, kubecontext)
 	if err != nil {
 		return err
 	}

cmd/flux/delete_source_git.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Flux CD contributors.
+Copyright 2020 The Flux authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -20,8 +20,8 @@ import (
 	"context"
 	"fmt"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	sourcev1 "github.com/fluxcd/source-controller/api/v1beta1"
-	"github.com/fluxcd/toolkit/internal/utils"
 	"github.com/manifoldco/promptui"
 	"github.com/spf13/cobra"
 	"k8s.io/apimachinery/pkg/types"
@@ -32,7 +32,7 @@ var deleteSourceGitCmd = &cobra.Command{
 	Short: "Delete a GitRepository source",
 	Long:  "The delete source git command deletes the given GitRepository from the cluster.",
 	Example: `  # Delete a Git repository
-  gotk delete source git podinfo
+  flux delete source git podinfo
 `,
 	RunE: deleteSourceGitCmdRun,
 }
@@ -50,7 +50,7 @@ func deleteSourceGitCmdRun(cmd *cobra.Command, args []string) error {
 	ctx, cancel := context.WithTimeout(context.Background(), timeout)
 	defer cancel()
 
-	kubeClient, err := utils.KubeClient(kubeconfig)
+	kubeClient, err := utils.KubeClient(kubeconfig, kubecontext)
 	if err != nil {
 		return err
 	}

cmd/flux/delete_source_helm.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Flux CD contributors.
+Copyright 2020 The Flux authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -20,8 +20,8 @@ import (
 	"context"
 	"fmt"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	sourcev1 "github.com/fluxcd/source-controller/api/v1beta1"
-	"github.com/fluxcd/toolkit/internal/utils"
 	"github.com/manifoldco/promptui"
 	"github.com/spf13/cobra"
 	"k8s.io/apimachinery/pkg/types"
@@ -32,7 +32,7 @@ var deleteSourceHelmCmd = &cobra.Command{
 	Short: "Delete a HelmRepository source",
 	Long:  "The delete source helm command deletes the given HelmRepository from the cluster.",
 	Example: `  # Delete a Helm repository
-  gotk delete source helm podinfo
+  flux delete source helm podinfo
 `,
 	RunE: deleteSourceHelmCmdRun,
 }
@@ -50,7 +50,7 @@ func deleteSourceHelmCmdRun(cmd *cobra.Command, args []string) error {
 	ctx, cancel := context.WithTimeout(context.Background(), timeout)
 	defer cancel()
 
-	kubeClient, err := utils.KubeClient(kubeconfig)
+	kubeClient, err := utils.KubeClient(kubeconfig, kubecontext)
 	if err != nil {
 		return err
 	}

cmd/flux/export.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Flux CD contributors.
+Copyright 2020 The Flux authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

cmd/flux/export_alert.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Flux CD contributors.
+Copyright 2020 The Flux authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -26,8 +26,8 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/yaml"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	notificationv1 "github.com/fluxcd/notification-controller/api/v1beta1"
-	"github.com/fluxcd/toolkit/internal/utils"
 )
 
 var exportAlertCmd = &cobra.Command{
@@ -35,10 +35,10 @@ var exportAlertCmd = &cobra.Command{
 	Short: "Export Alert resources in YAML format",
 	Long:  "The export alert command exports one or all Alert resources in YAML format.",
 	Example: `  # Export all Alert resources
-  gotk export alert --all > alerts.yaml
+  flux export alert --all > alerts.yaml
 
   # Export a Alert
-  gotk export alert main > main.yaml
+  flux export alert main > main.yaml
 `,
 	RunE: exportAlertCmdRun,
 }
@@ -55,7 +55,7 @@ func exportAlertCmdRun(cmd *cobra.Command, args []string) error {
 	ctx, cancel := context.WithTimeout(context.Background(), timeout)
 	defer cancel()
 
-	kubeClient, err := utils.KubeClient(kubeconfig)
+	kubeClient, err := utils.KubeClient(kubeconfig, kubecontext)
 	if err != nil {
 		return err
 	}

cmd/flux/export_alertprovider.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Flux CD contributors.
+Copyright 2020 The Flux authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -26,8 +26,8 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/yaml"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	notificationv1 "github.com/fluxcd/notification-controller/api/v1beta1"
-	"github.com/fluxcd/toolkit/internal/utils"
 )
 
 var exportAlertProviderCmd = &cobra.Command{
@@ -35,10 +35,10 @@ var exportAlertProviderCmd = &cobra.Command{
 	Short: "Export Provider resources in YAML format",
 	Long:  "The export alert-provider command exports one or all Provider resources in YAML format.",
 	Example: `  # Export all Provider resources
-  gotk export alert-provider --all > alert-providers.yaml
+  flux export alert-provider --all > alert-providers.yaml
 
   # Export a Provider
-  gotk export alert-provider slack > slack.yaml
+  flux export alert-provider slack > slack.yaml
 `,
 	RunE: exportAlertProviderCmdRun,
 }
@@ -55,7 +55,7 @@ func exportAlertProviderCmdRun(cmd *cobra.Command, args []string) error {
 	ctx, cancel := context.WithTimeout(context.Background(), timeout)
 	defer cancel()
 
-	kubeClient, err := utils.KubeClient(kubeconfig)
+	kubeClient, err := utils.KubeClient(kubeconfig, kubecontext)
 	if err != nil {
 		return err
 	}

cmd/flux/export_helmrelease.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Flux CD contributors.
+Copyright 2020 The Flux authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -26,8 +26,8 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/yaml"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	helmv2 "github.com/fluxcd/helm-controller/api/v2beta1"
-	"github.com/fluxcd/toolkit/internal/utils"
 )
 
 var exportHelmReleaseCmd = &cobra.Command{
@@ -36,10 +36,10 @@ var exportHelmReleaseCmd = &cobra.Command{
 	Short:   "Export HelmRelease resources in YAML format",
 	Long:    "The export helmrelease command exports one or all HelmRelease resources in YAML format.",
 	Example: `  # Export all HelmRelease resources
-  gotk export helmrelease --all > kustomizations.yaml
+  flux export helmrelease --all > kustomizations.yaml
 
   # Export a HelmRelease
-  gotk export hr my-app > app-release.yaml
+  flux export hr my-app > app-release.yaml
 `,
 	RunE: exportHelmReleaseCmdRun,
 }
@@ -56,7 +56,7 @@ func exportHelmReleaseCmdRun(cmd *cobra.Command, args []string) error {
 	ctx, cancel := context.WithTimeout(context.Background(), timeout)
 	defer cancel()
 
-	kubeClient, err := utils.KubeClient(kubeconfig)
+	kubeClient, err := utils.KubeClient(kubeconfig, kubecontext)
 	if err != nil {
 		return err
 	}

cmd/flux/export_kustomization.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Flux CD contributors.
+Copyright 2020 The Flux authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -26,8 +26,8 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/yaml"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1beta1"
-	"github.com/fluxcd/toolkit/internal/utils"
 )
 
 var exportKsCmd = &cobra.Command{
@@ -36,10 +36,10 @@ var exportKsCmd = &cobra.Command{
 	Short:   "Export Kustomization resources in YAML format",
 	Long:    "The export kustomization command exports one or all Kustomization resources in YAML format.",
 	Example: `  # Export all Kustomization resources
-  gotk export kustomization --all > kustomizations.yaml
+  flux export kustomization --all > kustomizations.yaml
 
   # Export a Kustomization
-  gotk export kustomization my-app > kustomization.yaml
+  flux export kustomization my-app > kustomization.yaml
 `,
 	RunE: exportKsCmdRun,
 }
@@ -56,7 +56,7 @@ func exportKsCmdRun(cmd *cobra.Command, args []string) error {
 	ctx, cancel := context.WithTimeout(context.Background(), timeout)
 	defer cancel()
 
-	kubeClient, err := utils.KubeClient(kubeconfig)
+	kubeClient, err := utils.KubeClient(kubeconfig, kubecontext)
 	if err != nil {
 		return err
 	}

cmd/flux/export_receiver.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Flux CD contributors.
+Copyright 2020 The Flux authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -26,8 +26,8 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/yaml"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	notificationv1 "github.com/fluxcd/notification-controller/api/v1beta1"
-	"github.com/fluxcd/toolkit/internal/utils"
 )
 
 var exportReceiverCmd = &cobra.Command{
@@ -35,10 +35,10 @@ var exportReceiverCmd = &cobra.Command{
 	Short: "Export Receiver resources in YAML format",
 	Long:  "The export receiver command exports one or all Receiver resources in YAML format.",
 	Example: `  # Export all Receiver resources
-  gotk export receiver --all > receivers.yaml
+  flux export receiver --all > receivers.yaml
 
   # Export a Receiver
-  gotk export receiver main > main.yaml
+  flux export receiver main > main.yaml
 `,
 	RunE: exportReceiverCmdRun,
 }
@@ -55,7 +55,7 @@ func exportReceiverCmdRun(cmd *cobra.Command, args []string) error {
 	ctx, cancel := context.WithTimeout(context.Background(), timeout)
 	defer cancel()
 
-	kubeClient, err := utils.KubeClient(kubeconfig)
+	kubeClient, err := utils.KubeClient(kubeconfig, kubecontext)
 	if err != nil {
 		return err
 	}

cmd/flux/export_source.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Flux CD contributors.
+Copyright 2020 The Flux authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

cmd/flux/export_source_bucket.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Flux CD contributors.
+Copyright 2020 The Flux authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -27,8 +27,8 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/yaml"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	sourcev1 "github.com/fluxcd/source-controller/api/v1beta1"
-	"github.com/fluxcd/toolkit/internal/utils"
 )
 
 var exportSourceBucketCmd = &cobra.Command{
@@ -36,10 +36,10 @@ var exportSourceBucketCmd = &cobra.Command{
 	Short: "Export Bucket sources in YAML format",
 	Long:  "The export source git command exports on or all Bucket sources in YAML format.",
 	Example: `  # Export all Bucket sources
-  gotk export source bucket --all > sources.yaml
+  flux export source bucket --all > sources.yaml
 
   # Export a Bucket source including the static credentials
-  gotk export source bucket my-bucket --with-credentials > source.yaml
+  flux export source bucket my-bucket --with-credentials > source.yaml
 `,
 	RunE: exportSourceBucketCmdRun,
 }
@@ -56,7 +56,7 @@ func exportSourceBucketCmdRun(cmd *cobra.Command, args []string) error {
 	ctx, cancel := context.WithTimeout(context.Background(), timeout)
 	defer cancel()
 
-	kubeClient, err := utils.KubeClient(kubeconfig)
+	kubeClient, err := utils.KubeClient(kubeconfig, kubecontext)
 	if err != nil {
 		return err
 	}

cmd/flux/export_source_git.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Flux CD contributors.
+Copyright 2020 The Flux authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -27,8 +27,8 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/yaml"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	sourcev1 "github.com/fluxcd/source-controller/api/v1beta1"
-	"github.com/fluxcd/toolkit/internal/utils"
 )
 
 var exportSourceGitCmd = &cobra.Command{
@@ -36,10 +36,10 @@ var exportSourceGitCmd = &cobra.Command{
 	Short: "Export GitRepository sources in YAML format",
 	Long:  "The export source git command exports on or all GitRepository sources in YAML format.",
 	Example: `  # Export all GitRepository sources
-  gotk export source git --all > sources.yaml
+  flux export source git --all > sources.yaml
 
   # Export a GitRepository source including the SSH key pair or basic auth credentials
-  gotk export source git my-private-repo --with-credentials > source.yaml
+  flux export source git my-private-repo --with-credentials > source.yaml
 `,
 	RunE: exportSourceGitCmdRun,
 }
@@ -56,7 +56,7 @@ func exportSourceGitCmdRun(cmd *cobra.Command, args []string) error {
 	ctx, cancel := context.WithTimeout(context.Background(), timeout)
 	defer cancel()
 
-	kubeClient, err := utils.KubeClient(kubeconfig)
+	kubeClient, err := utils.KubeClient(kubeconfig, kubecontext)
 	if err != nil {
 		return err
 	}

cmd/flux/export_source_helm.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Flux CD contributors.
+Copyright 2020 The Flux authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -27,8 +27,8 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/yaml"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	sourcev1 "github.com/fluxcd/source-controller/api/v1beta1"
-	"github.com/fluxcd/toolkit/internal/utils"
 )
 
 var exportSourceHelmCmd = &cobra.Command{
@@ -36,10 +36,10 @@ var exportSourceHelmCmd = &cobra.Command{
 	Short: "Export HelmRepository sources in YAML format",
 	Long:  "The export source git command exports on or all HelmRepository sources in YAML format.",
 	Example: `  # Export all HelmRepository sources
-  gotk export source helm --all > sources.yaml
+  flux export source helm --all > sources.yaml
 
   # Export a HelmRepository source including the basic auth credentials
-  gotk export source helm my-private-repo --with-credentials > source.yaml
+  flux export source helm my-private-repo --with-credentials > source.yaml
 `,
 	RunE: exportSourceHelmCmdRun,
 }
@@ -56,7 +56,7 @@ func exportSourceHelmCmdRun(cmd *cobra.Command, args []string) error {
 	ctx, cancel := context.WithTimeout(context.Background(), timeout)
 	defer cancel()
 
-	kubeClient, err := utils.KubeClient(kubeconfig)
+	kubeClient, err := utils.KubeClient(kubeconfig, kubecontext)
 	if err != nil {
 		return err
 	}

cmd/flux/get.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Flux CD contributors.
+Copyright 2020 The Flux authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

cmd/flux/get_alert.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Flux CD contributors.
+Copyright 2020 The Flux authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -26,9 +26,9 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	notificationv1 "github.com/fluxcd/notification-controller/api/v1beta1"
 	"github.com/fluxcd/pkg/apis/meta"
-	"github.com/fluxcd/toolkit/internal/utils"
 )
 
 var getAlertCmd = &cobra.Command{
@@ -36,7 +36,7 @@ var getAlertCmd = &cobra.Command{
 	Short: "Get Alert statuses",
 	Long:  "The get alert command prints the statuses of the resources.",
 	Example: `  # List all Alerts and their status
-  gotk get alerts
+  flux get alerts
 `,
 	RunE: getAlertCmdRun,
 }
@@ -49,7 +49,7 @@ func getAlertCmdRun(cmd *cobra.Command, args []string) error {
 	ctx, cancel := context.WithTimeout(context.Background(), timeout)
 	defer cancel()
 
-	kubeClient, err := utils.KubeClient(kubeconfig)
+	kubeClient, err := utils.KubeClient(kubeconfig, kubecontext)
 	if err != nil {
 		return err
 	}

cmd/flux/get_alertprovider.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Flux CD contributors.
+Copyright 2020 The Flux authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -24,9 +24,9 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	notificationv1 "github.com/fluxcd/notification-controller/api/v1beta1"
 	"github.com/fluxcd/pkg/apis/meta"
-	"github.com/fluxcd/toolkit/internal/utils"
 )
 
 var getAlertProviderCmd = &cobra.Command{
@@ -34,7 +34,7 @@ var getAlertProviderCmd = &cobra.Command{
 	Short: "Get Provider statuses",
 	Long:  "The get alert-provider command prints the statuses of the resources.",
 	Example: `  # List all Providers and their status
-  gotk get alert-providers
+  flux get alert-providers
 `,
 	RunE: getAlertProviderCmdRun,
 }
@@ -47,7 +47,7 @@ func getAlertProviderCmdRun(cmd *cobra.Command, args []string) error {
 	ctx, cancel := context.WithTimeout(context.Background(), timeout)
 	defer cancel()
 
-	kubeClient, err := utils.KubeClient(kubeconfig)
+	kubeClient, err := utils.KubeClient(kubeconfig, kubecontext)
 	if err != nil {
 		return err
 	}

cmd/flux/get_helmrelease.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Flux CD contributors.
+Copyright 2020 The Flux authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -22,8 +22,8 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	"github.com/fluxcd/pkg/apis/meta"
-	"github.com/fluxcd/toolkit/internal/utils"
 
 	"github.com/spf13/cobra"
 	corev1 "k8s.io/api/core/v1"
@@ -38,7 +38,7 @@ var getHelmReleaseCmd = &cobra.Command{
 	Short:   "Get HelmRelease statuses",
 	Long:    "The get helmreleases command prints the statuses of the resources.",
 	Example: `  # List all Helm releases and their status
-  gotk get helmreleases
+  flux get helmreleases
 `,
 	RunE: getHelmReleaseCmdRun,
 }
@@ -51,7 +51,7 @@ func getHelmReleaseCmdRun(cmd *cobra.Command, args []string) error {
 	ctx, cancel := context.WithTimeout(context.Background(), timeout)
 	defer cancel()
 
-	kubeClient, err := utils.KubeClient(kubeconfig)
+	kubeClient, err := utils.KubeClient(kubeconfig, kubecontext)
 	if err != nil {
 		return err
 	}

cmd/flux/get_kustomization.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Flux CD contributors.
+Copyright 2020 The Flux authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -22,8 +22,8 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	"github.com/fluxcd/pkg/apis/meta"
-	"github.com/fluxcd/toolkit/internal/utils"
 
 	kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1beta1"
 	"github.com/spf13/cobra"
@@ -37,7 +37,7 @@ var getKsCmd = &cobra.Command{
 	Short:   "Get Kustomization statuses",
 	Long:    "The get kustomizations command prints the statuses of the resources.",
 	Example: `  # List all kustomizations and their status
-  gotk get kustomizations
+  flux get kustomizations
 `,
 	RunE: getKsCmdRun,
 }
@@ -50,7 +50,7 @@ func getKsCmdRun(cmd *cobra.Command, args []string) error {
 	ctx, cancel := context.WithTimeout(context.Background(), timeout)
 	defer cancel()
 
-	kubeClient, err := utils.KubeClient(kubeconfig)
+	kubeClient, err := utils.KubeClient(kubeconfig, kubecontext)
 	if err != nil {
 		return err
 	}

cmd/flux/get_receiver.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Flux CD contributors.
+Copyright 2020 The Flux authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -26,9 +26,9 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	notificationv1 "github.com/fluxcd/notification-controller/api/v1beta1"
 	"github.com/fluxcd/pkg/apis/meta"
-	"github.com/fluxcd/toolkit/internal/utils"
 )
 
 var getReceiverCmd = &cobra.Command{
@@ -36,7 +36,7 @@ var getReceiverCmd = &cobra.Command{
 	Short: "Get Receiver statuses",
 	Long:  "The get receiver command prints the statuses of the resources.",
 	Example: `  # List all Receiver and their status
-  gotk get receivers
+  flux get receivers
 `,
 	RunE: getReceiverCmdRun,
 }
@@ -49,7 +49,7 @@ func getReceiverCmdRun(cmd *cobra.Command, args []string) error {
 	ctx, cancel := context.WithTimeout(context.Background(), timeout)
 	defer cancel()
 
-	kubeClient, err := utils.KubeClient(kubeconfig)
+	kubeClient, err := utils.KubeClient(kubeconfig, kubecontext)
 	if err != nil {
 		return err
 	}

cmd/flux/get_source.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Flux CD contributors.
+Copyright 2020 The Flux authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

cmd/flux/get_source_bucket.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Flux CD contributors.
+Copyright 2020 The Flux authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -20,8 +20,8 @@ import (
 	"context"
 	"os"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	"github.com/fluxcd/pkg/apis/meta"
-	"github.com/fluxcd/toolkit/internal/utils"
 
 	sourcev1 "github.com/fluxcd/source-controller/api/v1beta1"
 	"github.com/spf13/cobra"
@@ -34,7 +34,7 @@ var getSourceBucketCmd = &cobra.Command{
 	Short: "Get Bucket source statuses",
 	Long:  "The get sources bucket command prints the status of the Bucket sources.",
 	Example: `  # List all Buckets and their status
-  gotk get sources bucket
+  flux get sources bucket
 `,
 	RunE: getSourceBucketCmdRun,
 }
@@ -47,7 +47,7 @@ func getSourceBucketCmdRun(cmd *cobra.Command, args []string) error {
 	ctx, cancel := context.WithTimeout(context.Background(), timeout)
 	defer cancel()
 
-	kubeClient, err := utils.KubeClient(kubeconfig)
+	kubeClient, err := utils.KubeClient(kubeconfig, kubecontext)
 	if err != nil {
 		return err
 	}

cmd/flux/get_source_git.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Flux CD contributors.
+Copyright 2020 The Flux authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -20,8 +20,8 @@ import (
 	"context"
 	"os"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	"github.com/fluxcd/pkg/apis/meta"
-	"github.com/fluxcd/toolkit/internal/utils"
 
 	sourcev1 "github.com/fluxcd/source-controller/api/v1beta1"
 	"github.com/spf13/cobra"
@@ -34,7 +34,7 @@ var getSourceGitCmd = &cobra.Command{
 	Short: "Get GitRepository source statuses",
 	Long:  "The get sources git command prints the status of the GitRepository sources.",
 	Example: `  # List all Git repositories and their status
-  gotk get sources git
+  flux get sources git
 `,
 	RunE: getSourceGitCmdRun,
 }
@@ -47,7 +47,7 @@ func getSourceGitCmdRun(cmd *cobra.Command, args []string) error {
 	ctx, cancel := context.WithTimeout(context.Background(), timeout)
 	defer cancel()
 
-	kubeClient, err := utils.KubeClient(kubeconfig)
+	kubeClient, err := utils.KubeClient(kubeconfig, kubecontext)
 	if err != nil {
 		return err
 	}

cmd/flux/get_source_helm.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Flux CD contributors.
+Copyright 2020 The Flux authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -20,8 +20,8 @@ import (
 	"context"
 	"os"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	"github.com/fluxcd/pkg/apis/meta"
-	"github.com/fluxcd/toolkit/internal/utils"
 
 	sourcev1 "github.com/fluxcd/source-controller/api/v1beta1"
 	"github.com/spf13/cobra"
@@ -34,7 +34,7 @@ var getSourceHelmCmd = &cobra.Command{
 	Short: "Get HelmRepository source statuses",
 	Long:  "The get sources helm command prints the status of the HelmRepository sources.",
 	Example: `  # List all Helm repositories and their status
-  gotk get sources helm
+  flux get sources helm
 `,
 	RunE: getSourceHelmCmdRun,
 }
@@ -47,7 +47,7 @@ func getSourceHelmCmdRun(cmd *cobra.Command, args []string) error {
 	ctx, cancel := context.WithTimeout(context.Background(), timeout)
 	defer cancel()
 
-	kubeClient, err := utils.KubeClient(kubeconfig)
+	kubeClient, err := utils.KubeClient(kubeconfig, kubecontext)
 	if err != nil {
 		return err
 	}

cmd/flux/install.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Flux CD contributors.
+Copyright 2020 The Flux authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,14 +21,14 @@ import (
 	"fmt"
 	"io/ioutil"
 	"os"
-	"path"
+	"path/filepath"
 	"strings"
 
 	"github.com/spf13/cobra"
 
-	"github.com/fluxcd/toolkit/internal/flags"
+	"github.com/fluxcd/flux2/internal/flags"
-	"github.com/fluxcd/toolkit/internal/utils"
+	"github.com/fluxcd/flux2/internal/utils"
-	"github.com/fluxcd/toolkit/pkg/install"
+	"github.com/fluxcd/flux2/pkg/manifestgen/install"
 )
 
 var installCmd = &cobra.Command{
@@ -36,17 +36,17 @@ var installCmd = &cobra.Command{
 	Short: "Install the toolkit components",
 	Long: `The install command deploys the toolkit components in the specified namespace.
 If a previous version is installed, then an in-place upgrade will be performed.`,
-	Example: `  # Install the latest version in the gotk-system namespace
+	Example: `  # Install the latest version in the flux-system namespace
-  gotk install --version=latest --namespace=gotk-system
+  flux install --version=latest --namespace=flux-system
 
   # Dry-run install for a specific version and a series of components
-  gotk install --dry-run --version=v0.0.7 --components="source-controller,kustomize-controller"
+  flux install --dry-run --version=v0.0.7 --components="source-controller,kustomize-controller"
 
   # Dry-run install with manifests preview
-  gotk install --dry-run --verbose
+  flux install --dry-run --verbose
 
   # Write install manifests to file
-  gotk install --export > gotk-system.yaml
+  flux install --export > flux-system.yaml
 `,
 	RunE: installCmdRun,
 }
@@ -59,10 +59,10 @@ var (
 	installComponents         []string
 	installRegistry           string
 	installImagePullSecret    string
-	installArch               flags.Arch = "amd64"
 	installWatchAllNamespaces bool
 	installNetworkPolicy      bool
-	installLogLevel           flags.LogLevel = "info"
+	installArch               = flags.Arch(defaults.Arch)
+	installLogLevel           = flags.LogLevel(defaults.LogLevel)
 )
 
 func init() {
@@ -70,21 +70,21 @@ func init() {
 		"write the install manifests to stdout and exit")
 	installCmd.Flags().BoolVarP(&installDryRun, "dry-run", "", false,
 		"only print the object that would be applied")
-	installCmd.Flags().StringVarP(&installVersion, "version", "v", defaultVersion,
+	installCmd.Flags().StringVarP(&installVersion, "version", "v", defaults.Version,
 		"toolkit version")
-	installCmd.Flags().StringSliceVar(&installComponents, "components", defaultComponents,
+	installCmd.Flags().StringSliceVar(&installComponents, "components", defaults.Components,
 		"list of components, accepts comma-separated values")
 	installCmd.Flags().StringVar(&installManifestsPath, "manifests", "", "path to the manifest directory")
 	installCmd.Flags().MarkHidden("manifests")
-	installCmd.Flags().StringVar(&installRegistry, "registry", "ghcr.io/fluxcd",
+	installCmd.Flags().StringVar(&installRegistry, "registry", defaults.Registry,
 		"container registry where the toolkit images are published")
 	installCmd.Flags().StringVar(&installImagePullSecret, "image-pull-secret", "",
 		"Kubernetes secret name used for pulling the toolkit images from a private registry")
 	installCmd.Flags().Var(&installArch, "arch", installArch.Description())
-	installCmd.Flags().BoolVar(&installWatchAllNamespaces, "watch-all-namespaces", true,
+	installCmd.Flags().BoolVar(&installWatchAllNamespaces, "watch-all-namespaces", defaults.WatchAllNamespaces,
 		"watch for custom resources in all namespaces, if set to false it will only watch the namespace where the toolkit is installed")
 	installCmd.Flags().Var(&installLogLevel, "log-level", installLogLevel.Description())
-	installCmd.Flags().BoolVar(&installNetworkPolicy, "network-policy", true,
+	installCmd.Flags().BoolVar(&installNetworkPolicy, "network-policy", defaults.NetworkPolicy,
 		"deny ingress access to the toolkit controllers from other namespaces using network policies")
 	rootCmd.AddCommand(installCmd)
 }
@@ -114,8 +114,8 @@ func installCmdRun(cmd *cobra.Command, args []string) error {
 		WatchAllNamespaces:     installWatchAllNamespaces,
 		NetworkPolicy:          installNetworkPolicy,
 		LogLevel:               installLogLevel.String(),
-		NotificationController: defaultNotification,
+		NotificationController: defaults.NotificationController,
-		ManifestsFile:          fmt.Sprintf("%s.yaml", namespace),
+		ManifestFile:           fmt.Sprintf("%s.yaml", namespace),
 		Timeout:                timeout,
 	}
 
@@ -123,24 +123,22 @@ func installCmdRun(cmd *cobra.Command, args []string) error {
 		opts.BaseURL = install.MakeDefaultOptions().BaseURL
 	}
 
-	output, err := install.Generate(opts)
+	manifest, err := install.Generate(opts)
 	if err != nil {
 		return fmt.Errorf("install failed: %w", err)
 	}
 
-	manifest := path.Join(tmpDir, fmt.Sprintf("%s.yaml", namespace))
+	if _, err := manifest.WriteFile(tmpDir); err != nil {
-	if err := ioutil.WriteFile(manifest, output, os.ModePerm); err != nil {
 		return fmt.Errorf("install failed: %w", err)
 	}
 
-	yaml := string(output)
 	if verbose {
-		fmt.Print(yaml)
+		fmt.Print(manifest.Content)
 	} else if installExport {
 		fmt.Println("---")
 		fmt.Println("# GitOps Toolkit revision", installVersion)
 		fmt.Println("# Components:", strings.Join(installComponents, ","))
-		fmt.Print(yaml)
+		fmt.Print(manifest.Content)
 		fmt.Println("---")
 		return nil
 	}
@@ -152,7 +150,7 @@ func installCmdRun(cmd *cobra.Command, args []string) error {
 		applyOutput = utils.ModeOS
 	}
 
-	kubectlArgs := []string{"apply", "-f", manifest}
+	kubectlArgs := []string{"apply", "-f", filepath.Join(tmpDir, manifest.Path)}
 	if installDryRun {
 		args = append(args, "--dry-run=client")
 		applyOutput = utils.ModeOS

cmd/flux/log.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Flux CD contributors.
+Copyright 2020 The Flux authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

cmd/flux/main.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Flux CD contributors.
+Copyright 2020 The Flux authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -26,41 +26,42 @@ import (
 	"github.com/spf13/cobra/doc"
 	_ "k8s.io/client-go/plugin/pkg/client/auth"
 
-	gotklog "github.com/fluxcd/toolkit/pkg/log"
+	fluxlog "github.com/fluxcd/flux2/pkg/log"
+	"github.com/fluxcd/flux2/pkg/manifestgen/install"
 )
 
 var VERSION = "0.0.0-dev.0"
 
 var rootCmd = &cobra.Command{
-	Use:           "gotk",
+	Use:           "flux",
 	Version:       VERSION,
 	SilenceUsage:  true,
 	SilenceErrors: true,
 	Short:         "Command line utility for assembling Kubernetes CD pipelines",
 	Long:          `Command line utility for assembling Kubernetes CD pipelines the GitOps way.`,
 	Example: `  # Check prerequisites
-  gotk check --pre
+  flux check --pre
 
   # Install the latest version of the toolkit
-  gotk install --version=master
+  flux install --version=master
 
   # Create a source from a public Git repository
-  gotk create source git webapp-latest \
+  flux create source git webapp-latest \
     --url=https://github.com/stefanprodan/podinfo \
     --branch=master \
     --interval=3m
 
   # List GitRepository sources and their status
-  gotk get sources git
+  flux get sources git
 
   # Trigger a GitRepository source reconciliation
-  gotk reconcile source git gotk-system
+  flux reconcile source git flux-system
 
   # Export GitRepository sources in YAML format
-  gotk export source git --all > sources.yaml
+  flux export source git --all > sources.yaml
 
   # Create a Kustomization for deploying a series of microservices
-  gotk create kustomization webapp-dev \
+  flux create kustomization webapp-dev \
     --source=webapp-latest \
     --path="./deploy/webapp/" \
     --prune=true \
@@ -71,48 +72,44 @@ var rootCmd = &cobra.Command{
     --health-check-timeout=2m
 
   # Trigger a git sync of the Kustomization's source and apply changes
-  gotk reconcile kustomization webapp-dev --with-source
+  flux reconcile kustomization webapp-dev --with-source
 
   # Suspend a Kustomization reconciliation
-  gotk suspend kustomization webapp-dev
+  flux suspend kustomization webapp-dev
 
   # Export Kustomizations in YAML format
-  gotk export kustomization --all > kustomizations.yaml
+  flux export kustomization --all > kustomizations.yaml
 
   # Resume a Kustomization reconciliation
-  gotk resume kustomization webapp-dev
+  flux resume kustomization webapp-dev
 
   # Delete a Kustomization
-  gotk delete kustomization webapp-dev
+  flux delete kustomization webapp-dev
 
   # Delete a GitRepository source
-  gotk delete source git webapp-latest
+  flux delete source git webapp-latest
 
   # Uninstall the toolkit and delete CRDs
-  gotk uninstall --crds
+  flux uninstall --crds
 `,
 }
 
 var (
 	kubeconfig   string
+	kubecontext  string
 	namespace    string
 	timeout      time.Duration
 	verbose      bool
 	pollInterval                = 2 * time.Second
-	logger       gotklog.Logger = printLogger{}
+	logger       fluxlog.Logger = printLogger{}
-)
+	defaults                    = install.MakeDefaultOptions()
-
-var (
-	defaultComponents   = []string{"source-controller", "kustomize-controller", "helm-controller", "notification-controller"}
-	defaultVersion      = "latest"
-	defaultNamespace    = "gotk-system"
-	defaultNotification = "notification-controller"
 )
 
 func init() {
-	rootCmd.PersistentFlags().StringVarP(&namespace, "namespace", "n", defaultNamespace, "the namespace scope for this operation")
+	rootCmd.PersistentFlags().StringVarP(&namespace, "namespace", "n", defaults.Namespace, "the namespace scope for this operation")
 	rootCmd.PersistentFlags().DurationVar(&timeout, "timeout", 5*time.Minute, "timeout for this operation")
 	rootCmd.PersistentFlags().BoolVar(&verbose, "verbose", false, "print generated objects")
+	rootCmd.PersistentFlags().StringVarP(&kubecontext, "context", "", "", "kubernetes context to use")
 }
 
 func main() {

cmd/flux/reconcile.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Flux CD contributors.
+Copyright 2020 The Flux authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

cmd/flux/reconcile_alert.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Flux CD contributors.
+Copyright 2020 The Flux authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,8 +21,8 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	"github.com/fluxcd/pkg/apis/meta"
-	"github.com/fluxcd/toolkit/internal/utils"
 
 	"github.com/spf13/cobra"
 	"k8s.io/apimachinery/pkg/types"
@@ -36,7 +36,7 @@ var reconcileAlertCmd = &cobra.Command{
 	Short: "Reconcile an Alert",
 	Long:  `The reconcile alert command triggers a reconciliation of an Alert resource and waits for it to finish.`,
 	Example: `  # Trigger a reconciliation for an existing alert
-  gotk reconcile alert main
+  flux reconcile alert main
 `,
 	RunE: reconcileAlertCmdRun,
 }
@@ -54,7 +54,7 @@ func reconcileAlertCmdRun(cmd *cobra.Command, args []string) error {
 	ctx, cancel := context.WithTimeout(context.Background(), timeout)
 	defer cancel()
 
-	kubeClient, err := utils.KubeClient(kubeconfig)
+	kubeClient, err := utils.KubeClient(kubeconfig, kubecontext)
 	if err != nil {
 		return err
 	}

cmd/flux/reconcile_alertprovider.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Flux CD contributors.
+Copyright 2020 The Flux authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,8 +21,8 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	"github.com/fluxcd/pkg/apis/meta"
-	"github.com/fluxcd/toolkit/internal/utils"
 
 	"github.com/spf13/cobra"
 	"k8s.io/apimachinery/pkg/types"
@@ -36,7 +36,7 @@ var reconcileAlertProviderCmd = &cobra.Command{
 	Short: "Reconcile a Provider",
 	Long:  `The reconcile alert-provider command triggers a reconciliation of a Provider resource and waits for it to finish.`,
 	Example: `  # Trigger a reconciliation for an existing provider
-  gotk reconcile alert-provider slack
+  flux reconcile alert-provider slack
 `,
 	RunE: reconcileAlertProviderCmdRun,
 }
@@ -54,7 +54,7 @@ func reconcileAlertProviderCmdRun(cmd *cobra.Command, args []string) error {
 	ctx, cancel := context.WithTimeout(context.Background(), timeout)
 	defer cancel()
 
-	kubeClient, err := utils.KubeClient(kubeconfig)
+	kubeClient, err := utils.KubeClient(kubeconfig, kubecontext)
 	if err != nil {
 		return err
 	}

cmd/flux/reconcile_helmrelease.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Flux CD contributors.
+Copyright 2020 The Flux authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -28,8 +28,8 @@ import (
 	"k8s.io/client-go/util/retry"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	"github.com/fluxcd/pkg/apis/meta"
-	"github.com/fluxcd/toolkit/internal/utils"
 
 	helmv2 "github.com/fluxcd/helm-controller/api/v2beta1"
 	sourcev1 "github.com/fluxcd/source-controller/api/v1beta1"
@@ -42,10 +42,10 @@ var reconcileHrCmd = &cobra.Command{
 	Long: `
 The reconcile kustomization command triggers a reconciliation of a HelmRelease resource and waits for it to finish.`,
 	Example: `  # Trigger a HelmRelease apply outside of the reconciliation interval
-  gotk reconcile hr podinfo
+  flux reconcile hr podinfo
 
   # Trigger a reconciliation of the HelmRelease's source and apply changes
-  gotk reconcile hr podinfo --with-source
+  flux reconcile hr podinfo --with-source
 `,
 	RunE: reconcileHrCmdRun,
 }
@@ -69,7 +69,7 @@ func reconcileHrCmdRun(cmd *cobra.Command, args []string) error {
 	ctx, cancel := context.WithTimeout(context.Background(), timeout)
 	defer cancel()
 
-	kubeClient, err := utils.KubeClient(kubeconfig)
+	kubeClient, err := utils.KubeClient(kubeconfig, kubecontext)
 	if err != nil {
 		return err
 	}

cmd/flux/reconcile_kustomization.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Flux CD contributors.
+Copyright 2020 The Flux authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -25,8 +25,8 @@ import (
 	"k8s.io/client-go/util/retry"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	"github.com/fluxcd/pkg/apis/meta"
-	"github.com/fluxcd/toolkit/internal/utils"
 	"github.com/spf13/cobra"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/wait"
@@ -42,10 +42,10 @@ var reconcileKsCmd = &cobra.Command{
 	Long: `
 The reconcile kustomization command triggers a reconciliation of a Kustomization resource and waits for it to finish.`,
 	Example: `  # Trigger a Kustomization apply outside of the reconciliation interval
-  gotk reconcile kustomization podinfo
+  flux reconcile kustomization podinfo
 
   # Trigger a sync of the Kustomization's source and apply changes
-  gotk reconcile kustomization podinfo --with-source
+  flux reconcile kustomization podinfo --with-source
 `,
 	RunE: reconcileKsCmdRun,
 }
@@ -69,7 +69,7 @@ func reconcileKsCmdRun(cmd *cobra.Command, args []string) error {
 	ctx, cancel := context.WithTimeout(context.Background(), timeout)
 	defer cancel()
 
-	kubeClient, err := utils.KubeClient(kubeconfig)
+	kubeClient, err := utils.KubeClient(kubeconfig, kubecontext)
 	if err != nil {
 		return err
 	}

cmd/flux/reconcile_receiver.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Flux CD contributors.
+Copyright 2020 The Flux authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,8 +21,8 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	"github.com/fluxcd/pkg/apis/meta"
-	"github.com/fluxcd/toolkit/internal/utils"
 
 	"github.com/spf13/cobra"
 	"k8s.io/apimachinery/pkg/types"
@@ -36,7 +36,7 @@ var reconcileReceiverCmd = &cobra.Command{
 	Short: "Reconcile a Receiver",
 	Long:  `The reconcile receiver command triggers a reconciliation of a Receiver resource and waits for it to finish.`,
 	Example: `  # Trigger a reconciliation for an existing receiver
-  gotk reconcile receiver main
+  flux reconcile receiver main
 `,
 	RunE: reconcileReceiverCmdRun,
 }
@@ -54,7 +54,7 @@ func reconcileReceiverCmdRun(cmd *cobra.Command, args []string) error {
 	ctx, cancel := context.WithTimeout(context.Background(), timeout)
 	defer cancel()
 
-	kubeClient, err := utils.KubeClient(kubeconfig)
+	kubeClient, err := utils.KubeClient(kubeconfig, kubecontext)
 	if err != nil {
 		return err
 	}

cmd/flux/reconcile_source.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Flux CD contributors.
+Copyright 2020 The Flux authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

cmd/flux/reconcile_source_bucket.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Flux CD contributors.
+Copyright 2020 The Flux authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,8 +21,8 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	"github.com/fluxcd/pkg/apis/meta"
-	"github.com/fluxcd/toolkit/internal/utils"
 
 	"github.com/spf13/cobra"
 	corev1 "k8s.io/api/core/v1"
@@ -38,7 +38,7 @@ var reconcileSourceBucketCmd = &cobra.Command{
 	Short: "Reconcile a Bucket source",
 	Long:  `The reconcile source command triggers a reconciliation of a Bucket resource and waits for it to finish.`,
 	Example: `  # Trigger a reconciliation for an existing source
-  gotk reconcile source bucket podinfo
+  flux reconcile source bucket podinfo
 `,
 	RunE: reconcileSourceBucketCmdRun,
 }
@@ -56,7 +56,7 @@ func reconcileSourceBucketCmdRun(cmd *cobra.Command, args []string) error {
 	ctx, cancel := context.WithTimeout(context.Background(), timeout)
 	defer cancel()
 
-	kubeClient, err := utils.KubeClient(kubeconfig)
+	kubeClient, err := utils.KubeClient(kubeconfig, kubecontext)
 	if err != nil {
 		return err
 	}

cmd/flux/reconcile_source_git.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Flux CD contributors.
+Copyright 2020 The Flux authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,8 +21,8 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	"github.com/fluxcd/pkg/apis/meta"
-	"github.com/fluxcd/toolkit/internal/utils"
 
 	"github.com/spf13/cobra"
 	"k8s.io/apimachinery/pkg/types"
@@ -36,7 +36,7 @@ var reconcileSourceGitCmd = &cobra.Command{
 	Short: "Reconcile a GitRepository source",
 	Long:  `The reconcile source command triggers a reconciliation of a GitRepository resource and waits for it to finish.`,
 	Example: `  # Trigger a git pull for an existing source
-  gotk reconcile source git podinfo
+  flux reconcile source git podinfo
 `,
 	RunE: reconcileSourceGitCmdRun,
 }
@@ -54,7 +54,7 @@ func reconcileSourceGitCmdRun(cmd *cobra.Command, args []string) error {
 	ctx, cancel := context.WithTimeout(context.Background(), timeout)
 	defer cancel()
 
-	kubeClient, err := utils.KubeClient(kubeconfig)
+	kubeClient, err := utils.KubeClient(kubeconfig, kubecontext)
 	if err != nil {
 		return err
 	}

cmd/flux/reconcile_source_helm.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Flux CD contributors.
+Copyright 2020 The Flux authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,8 +21,8 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	"github.com/fluxcd/pkg/apis/meta"
-	"github.com/fluxcd/toolkit/internal/utils"
 
 	"github.com/spf13/cobra"
 	corev1 "k8s.io/api/core/v1"
@@ -38,7 +38,7 @@ var reconcileSourceHelmCmd = &cobra.Command{
 	Short: "Reconcile a HelmRepository source",
 	Long:  `The reconcile source command triggers a reconciliation of a HelmRepository resource and waits for it to finish.`,
 	Example: `  # Trigger a reconciliation for an existing source
-  gotk reconcile source helm podinfo
+  flux reconcile source helm podinfo
 `,
 	RunE: reconcileSourceHelmCmdRun,
 }
@@ -56,7 +56,7 @@ func reconcileSourceHelmCmdRun(cmd *cobra.Command, args []string) error {
 	ctx, cancel := context.WithTimeout(context.Background(), timeout)
 	defer cancel()
 
-	kubeClient, err := utils.KubeClient(kubeconfig)
+	kubeClient, err := utils.KubeClient(kubeconfig, kubecontext)
 	if err != nil {
 		return err
 	}

cmd/flux/resume.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Flux CD contributors.
+Copyright 2020 The Flux authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

cmd/flux/resume_alert.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Flux CD contributors.
+Copyright 2020 The Flux authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -20,8 +20,8 @@ import (
 	"context"
 	"fmt"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	"github.com/fluxcd/pkg/apis/meta"
-	"github.com/fluxcd/toolkit/internal/utils"
 
 	"github.com/spf13/cobra"
 	corev1 "k8s.io/api/core/v1"
@@ -38,7 +38,7 @@ var resumeAlertCmd = &cobra.Command{
 	Long: `The resume command marks a previously suspended Alert resource for reconciliation and waits for it to
 finish the apply.`,
 	Example: `  # Resume reconciliation for an existing Alert
-  gotk resume alert main
+  flux resume alert main
 `,
 	RunE: resumeAlertCmdRun,
 }
@@ -56,7 +56,7 @@ func resumeAlertCmdRun(cmd *cobra.Command, args []string) error {
 	ctx, cancel := context.WithTimeout(context.Background(), timeout)
 	defer cancel()
 
-	kubeClient, err := utils.KubeClient(kubeconfig)
+	kubeClient, err := utils.KubeClient(kubeconfig, kubecontext)
 	if err != nil {
 		return err
 	}

cmd/flux/resume_helmrelease.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Flux CD contributors.
+Copyright 2020 The Flux authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -20,8 +20,8 @@ import (
 	"context"
 	"fmt"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	"github.com/fluxcd/pkg/apis/meta"
-	"github.com/fluxcd/toolkit/internal/utils"
 
 	"github.com/spf13/cobra"
 	corev1 "k8s.io/api/core/v1"
@@ -39,7 +39,7 @@ var resumeHrCmd = &cobra.Command{
 	Long: `The resume command marks a previously suspended HelmRelease resource for reconciliation and waits for it to
 finish the apply.`,
 	Example: `  # Resume reconciliation for an existing Helm release
-  gotk resume hr podinfo
+  flux resume hr podinfo
 `,
 	RunE: resumeHrCmdRun,
 }
@@ -57,7 +57,7 @@ func resumeHrCmdRun(cmd *cobra.Command, args []string) error {
 	ctx, cancel := context.WithTimeout(context.Background(), timeout)
 	defer cancel()
 
-	kubeClient, err := utils.KubeClient(kubeconfig)
+	kubeClient, err := utils.KubeClient(kubeconfig, kubecontext)
 	if err != nil {
 		return err
 	}

cmd/flux/resume_kustomization.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Flux CD contributors.
+Copyright 2020 The Flux authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -20,8 +20,8 @@ import (
 	"context"
 	"fmt"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	"github.com/fluxcd/pkg/apis/meta"
-	"github.com/fluxcd/toolkit/internal/utils"
 
 	kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1beta1"
 	"github.com/spf13/cobra"
@@ -38,7 +38,7 @@ var resumeKsCmd = &cobra.Command{
 	Long: `The resume command marks a previously suspended Kustomization resource for reconciliation and waits for it to
 finish the apply.`,
 	Example: `  # Resume reconciliation for an existing Kustomization
-  gotk resume ks podinfo
+  flux resume ks podinfo
 `,
 	RunE: resumeKsCmdRun,
 }
@@ -56,7 +56,7 @@ func resumeKsCmdRun(cmd *cobra.Command, args []string) error {
 	ctx, cancel := context.WithTimeout(context.Background(), timeout)
 	defer cancel()
 
-	kubeClient, err := utils.KubeClient(kubeconfig)
+	kubeClient, err := utils.KubeClient(kubeconfig, kubecontext)
 	if err != nil {
 		return err
 	}

cmd/flux/resume_receiver.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Flux CD contributors.
+Copyright 2020 The Flux authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -20,8 +20,8 @@ import (
 	"context"
 	"fmt"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	"github.com/fluxcd/pkg/apis/meta"
-	"github.com/fluxcd/toolkit/internal/utils"
 
 	"github.com/spf13/cobra"
 	corev1 "k8s.io/api/core/v1"
@@ -38,7 +38,7 @@ var resumeReceiverCmd = &cobra.Command{
 	Long: `The resume command marks a previously suspended Receiver resource for reconciliation and waits for it to
 finish the apply.`,
 	Example: `  # Resume reconciliation for an existing Receiver
-  gotk resume receiver main
+  flux resume receiver main
 `,
 	RunE: resumeReceiverCmdRun,
 }
@@ -56,7 +56,7 @@ func resumeReceiverCmdRun(cmd *cobra.Command, args []string) error {
 	ctx, cancel := context.WithTimeout(context.Background(), timeout)
 	defer cancel()
 
-	kubeClient, err := utils.KubeClient(kubeconfig)
+	kubeClient, err := utils.KubeClient(kubeconfig, kubecontext)
 	if err != nil {
 		return err
 	}

cmd/flux/suspend.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Flux CD contributors.
+Copyright 2020 The Flux authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

cmd/flux/suspend_alert.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Flux CD contributors.
+Copyright 2020 The Flux authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -23,8 +23,8 @@ import (
 	"github.com/spf13/cobra"
 	"k8s.io/apimachinery/pkg/types"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	notificationv1 "github.com/fluxcd/notification-controller/api/v1beta1"
-	"github.com/fluxcd/toolkit/internal/utils"
 )
 
 var suspendAlertCmd = &cobra.Command{
@@ -32,7 +32,7 @@ var suspendAlertCmd = &cobra.Command{
 	Short: "Suspend reconciliation of Alert",
 	Long:  "The suspend command disables the reconciliation of a Alert resource.",
 	Example: `  # Suspend reconciliation for an existing Alert
-  gotk suspend alert main
+  flux suspend alert main
 `,
 	RunE: suspendAlertCmdRun,
 }
@@ -50,7 +50,7 @@ func suspendAlertCmdRun(cmd *cobra.Command, args []string) error {
 	ctx, cancel := context.WithTimeout(context.Background(), timeout)
 	defer cancel()
 
-	kubeClient, err := utils.KubeClient(kubeconfig)
+	kubeClient, err := utils.KubeClient(kubeconfig, kubecontext)
 	if err != nil {
 		return err
 	}

cmd/flux/suspend_helmrelease.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Flux CD contributors.
+Copyright 2020 The Flux authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -23,8 +23,8 @@ import (
 	"github.com/spf13/cobra"
 	"k8s.io/apimachinery/pkg/types"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	helmv2 "github.com/fluxcd/helm-controller/api/v2beta1"
-	"github.com/fluxcd/toolkit/internal/utils"
 )
 
 var suspendHrCmd = &cobra.Command{
@@ -33,7 +33,7 @@ var suspendHrCmd = &cobra.Command{
 	Short:   "Suspend reconciliation of HelmRelease",
 	Long:    "The suspend command disables the reconciliation of a HelmRelease resource.",
 	Example: `  # Suspend reconciliation for an existing Helm release
-  gotk suspend hr podinfo
+  flux suspend hr podinfo
 `,
 	RunE: suspendHrCmdRun,
 }
@@ -51,7 +51,7 @@ func suspendHrCmdRun(cmd *cobra.Command, args []string) error {
 	ctx, cancel := context.WithTimeout(context.Background(), timeout)
 	defer cancel()
 
-	kubeClient, err := utils.KubeClient(kubeconfig)
+	kubeClient, err := utils.KubeClient(kubeconfig, kubecontext)
 	if err != nil {
 		return err
 	}

cmd/flux/suspend_kustomization.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Flux CD contributors.
+Copyright 2020 The Flux authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -20,8 +20,8 @@ import (
 	"context"
 	"fmt"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1beta1"
-	"github.com/fluxcd/toolkit/internal/utils"
 	"github.com/spf13/cobra"
 	"k8s.io/apimachinery/pkg/types"
 )
@@ -32,7 +32,7 @@ var suspendKsCmd = &cobra.Command{
 	Short:   "Suspend reconciliation of Kustomization",
 	Long:    "The suspend command disables the reconciliation of a Kustomization resource.",
 	Example: `  # Suspend reconciliation for an existing Kustomization
-  gotk suspend ks podinfo
+  flux suspend ks podinfo
 `,
 	RunE: suspendKsCmdRun,
 }
@@ -50,7 +50,7 @@ func suspendKsCmdRun(cmd *cobra.Command, args []string) error {
 	ctx, cancel := context.WithTimeout(context.Background(), timeout)
 	defer cancel()
 
-	kubeClient, err := utils.KubeClient(kubeconfig)
+	kubeClient, err := utils.KubeClient(kubeconfig, kubecontext)
 	if err != nil {
 		return err
 	}

cmd/flux/suspend_receiver.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Flux CD contributors.
+Copyright 2020 The Flux authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -23,8 +23,8 @@ import (
 	"github.com/spf13/cobra"
 	"k8s.io/apimachinery/pkg/types"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	notificationv1 "github.com/fluxcd/notification-controller/api/v1beta1"
-	"github.com/fluxcd/toolkit/internal/utils"
 )
 
 var suspendReceiverCmd = &cobra.Command{
@@ -32,7 +32,7 @@ var suspendReceiverCmd = &cobra.Command{
 	Short: "Suspend reconciliation of Receiver",
 	Long:  "The suspend command disables the reconciliation of a Receiver resource.",
 	Example: `  # Suspend reconciliation for an existing Receiver
-  gotk suspend receiver main
+  flux suspend receiver main
 `,
 	RunE: suspendReceiverCmdRun,
 }
@@ -50,7 +50,7 @@ func suspendReceiverCmdRun(cmd *cobra.Command, args []string) error {
 	ctx, cancel := context.WithTimeout(context.Background(), timeout)
 	defer cancel()
 
-	kubeClient, err := utils.KubeClient(kubeconfig)
+	kubeClient, err := utils.KubeClient(kubeconfig, kubecontext)
 	if err != nil {
 		return err
 	}

cmd/flux/uninstall.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Flux CD contributors.
+Copyright 2020 The Flux authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -22,12 +22,14 @@ import (
 
 	"github.com/manifoldco/promptui"
 	"github.com/spf13/cobra"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/types"
+	"sigs.k8s.io/controller-runtime/pkg/client"
 
+	"github.com/fluxcd/flux2/internal/utils"
 	helmv2 "github.com/fluxcd/helm-controller/api/v2beta1"
 	kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1beta1"
 	sourcev1 "github.com/fluxcd/source-controller/api/v1beta1"
-	"github.com/fluxcd/toolkit/internal/utils"
 )
 
 var uninstallCmd = &cobra.Command{
@@ -35,10 +37,10 @@ var uninstallCmd = &cobra.Command{
 	Short: "Uninstall the toolkit components",
 	Long:  "The uninstall command removes the namespace, cluster roles, cluster role bindings and CRDs from the cluster.",
 	Example: `  # Dry-run uninstall of all components
-  gotk uninstall --dry-run --namespace=gotk-system
+  flux uninstall --dry-run --namespace=flux-system
 
   # Uninstall all components and delete custom resource definitions
-  gotk uninstall --resources --crds --namespace=gotk-system
+  flux uninstall --resources --crds --namespace=flux-system
 `,
 	RunE: uninstallCmdRun,
 }
@@ -67,12 +69,11 @@ func uninstallCmdRun(cmd *cobra.Command, args []string) error {
 	ctx, cancel := context.WithTimeout(context.Background(), timeout)
 	defer cancel()
 
-	kubeClient, err := utils.KubeClient(kubeconfig)
+	kubeClient, err := utils.KubeClient(kubeconfig, kubecontext)
 	if err != nil {
 		return err
 	}
 
-	dryRun := "--dry-run=server"
 	if !uninstallDryRun && !uninstallSilent {
 		prompt := promptui.Prompt{
 			Label:     fmt.Sprintf("Are you sure you want to delete the %s namespace", namespace),
@@ -83,37 +84,44 @@ func uninstallCmdRun(cmd *cobra.Command, args []string) error {
 		}
 	}
 
-	// suspend bootstrap kustomization if it exists
+	dryRun := "--dry-run=server"
+	deleteResources := uninstallResources || uninstallCRDs
+
+	// known kinds with finalizers
+	namespacedKinds := []string{
+		sourcev1.GitRepositoryKind,
+		sourcev1.HelmRepositoryKind,
+		sourcev1.BucketKind,
+	}
+
+	// suspend bootstrap kustomization to avoid finalizers deadlock
 	kustomizationName := types.NamespacedName{
 		Namespace: namespace,
 		Name:      namespace,
 	}
 	var kustomization kustomizev1.Kustomization
-	if err := kubeClient.Get(ctx, kustomizationName, &kustomization); err == nil {
+	err = kubeClient.Get(ctx, kustomizationName, &kustomization)
+	if err == nil {
 		kustomization.Spec.Suspend = true
 		if err := kubeClient.Update(ctx, &kustomization); err != nil {
 			return fmt.Errorf("unable to suspend kustomization '%s': %w", kustomizationName.String(), err)
 		}
 	}
+	if err == nil || apierrors.IsNotFound(err) {
+		namespacedKinds = append(namespacedKinds, kustomizev1.KustomizationKind)
+	}
 
-	if uninstallResources || uninstallCRDs {
+	// add HelmRelease kind to deletion list if exists
+	var list helmv2.HelmReleaseList
+	if err := kubeClient.List(ctx, &list, client.InNamespace(namespace)); err == nil {
+		namespacedKinds = append(namespacedKinds, helmv2.HelmReleaseKind)
+	}
+
+	if deleteResources {
 		logger.Actionf("uninstalling custom resources")
-		for _, kind := range []string{
+		for _, kind := range namespacedKinds {
-			kustomizev1.KustomizationKind,
+			if err := deleteAll(ctx, kind, uninstallDryRun); err != nil {
-			sourcev1.GitRepositoryKind,
+				logger.Failuref("kubectl: %s", err.Error())
-			sourcev1.HelmRepositoryKind,
-			helmv2.HelmReleaseKind,
-		} {
-			kubectlArgs := []string{
-				"-n", namespace,
-				"delete", kind, "--all", "--ignore-not-found",
-				"--timeout", timeout.String(),
-			}
-			if uninstallDryRun {
-				kubectlArgs = append(kubectlArgs, dryRun)
-			}
-			if _, err := utils.ExecKubectlCommand(ctx, utils.ModeOS, kubectlArgs...); err != nil {
-				return fmt.Errorf("uninstall failed: %w", err)
 			}
 		}
 	}
@@ -144,3 +152,18 @@ func uninstallCmdRun(cmd *cobra.Command, args []string) error {
 	logger.Successf("uninstall finished")
 	return nil
 }
+
+func deleteAll(ctx context.Context, kind string, dryRun bool) error {
+	kubectlArgs := []string{
+		"delete", kind, "--ignore-not-found",
+		"--all", "--all-namespaces",
+		"--timeout", timeout.String(),
+	}
+
+	if dryRun {
+		kubectlArgs = append(kubectlArgs, "--dry-run=server")
+	}
+
+	_, err := utils.ExecKubectlCommand(ctx, utils.ModeOS, kubectlArgs...)
+	return err
+}

docs/cmd/flux.md

@@ -1,4 +1,4 @@
-## gotk
+## flux
 
 Command line utility for assembling Kubernetes CD pipelines
 
@@ -10,28 +10,28 @@ Command line utility for assembling Kubernetes CD pipelines the GitOps way.
 
 ```
   # Check prerequisites
-  gotk check --pre
+  flux check --pre
 
   # Install the latest version of the toolkit
-  gotk install --version=master
+  flux install --version=master
 
   # Create a source from a public Git repository
-  gotk create source git webapp-latest \
+  flux create source git webapp-latest \
     --url=https://github.com/stefanprodan/podinfo \
     --branch=master \
     --interval=3m
 
   # List GitRepository sources and their status
-  gotk get sources git
+  flux get sources git
 
   # Trigger a GitRepository source reconciliation
-  gotk reconcile source git gotk-system
+  flux reconcile source git flux-system
 
   # Export GitRepository sources in YAML format
-  gotk export source git --all > sources.yaml
+  flux export source git --all > sources.yaml
 
   # Create a Kustomization for deploying a series of microservices
-  gotk create kustomization webapp-dev \
+  flux create kustomization webapp-dev \
     --source=webapp-latest \
     --path="./deploy/webapp/" \
     --prune=true \
@@ -42,50 +42,51 @@ Command line utility for assembling Kubernetes CD pipelines the GitOps way.
     --health-check-timeout=2m
 
   # Trigger a git sync of the Kustomization's source and apply changes
-  gotk reconcile kustomization webapp-dev --with-source
+  flux reconcile kustomization webapp-dev --with-source
 
   # Suspend a Kustomization reconciliation
-  gotk suspend kustomization webapp-dev
+  flux suspend kustomization webapp-dev
 
   # Export Kustomizations in YAML format
-  gotk export kustomization --all > kustomizations.yaml
+  flux export kustomization --all > kustomizations.yaml
 
   # Resume a Kustomization reconciliation
-  gotk resume kustomization webapp-dev
+  flux resume kustomization webapp-dev
 
   # Delete a Kustomization
-  gotk delete kustomization webapp-dev
+  flux delete kustomization webapp-dev
 
   # Delete a GitRepository source
-  gotk delete source git webapp-latest
+  flux delete source git webapp-latest
 
   # Uninstall the toolkit and delete CRDs
-  gotk uninstall --crds
+  flux uninstall --crds
 
 ```
 
 ### Options
 
 ```
-  -h, --help                help for gotk
+      --context string      kubernetes context to use
+  -h, --help                help for flux
       --kubeconfig string   path to the kubeconfig file (default "~/.kube/config")
-  -n, --namespace string    the namespace scope for this operation (default "gotk-system")
+  -n, --namespace string    the namespace scope for this operation (default "flux-system")
       --timeout duration    timeout for this operation (default 5m0s)
       --verbose             print generated objects
 ```
 
 ### SEE ALSO
 
-* [gotk bootstrap](gotk_bootstrap.md)	 - Bootstrap toolkit components
+* [flux bootstrap](flux_bootstrap.md)	 - Bootstrap toolkit components
-* [gotk check](gotk_check.md)	 - Check requirements and installation
+* [flux check](flux_check.md)	 - Check requirements and installation
-* [gotk completion](gotk_completion.md)	 - Generates completion scripts for various shells
+* [flux completion](flux_completion.md)	 - Generates completion scripts for various shells
-* [gotk create](gotk_create.md)	 - Create or update sources and resources
+* [flux create](flux_create.md)	 - Create or update sources and resources
-* [gotk delete](gotk_delete.md)	 - Delete sources and resources
+* [flux delete](flux_delete.md)	 - Delete sources and resources
-* [gotk export](gotk_export.md)	 - Export resources in YAML format
+* [flux export](flux_export.md)	 - Export resources in YAML format
-* [gotk get](gotk_get.md)	 - Get sources and resources
+* [flux get](flux_get.md)	 - Get sources and resources
-* [gotk install](gotk_install.md)	 - Install the toolkit components
+* [flux install](flux_install.md)	 - Install the toolkit components
-* [gotk reconcile](gotk_reconcile.md)	 - Reconcile sources and resources
+* [flux reconcile](flux_reconcile.md)	 - Reconcile sources and resources
-* [gotk resume](gotk_resume.md)	 - Resume suspended resources
+* [flux resume](flux_resume.md)	 - Resume suspended resources
-* [gotk suspend](gotk_suspend.md)	 - Suspend resources
+* [flux suspend](flux_suspend.md)	 - Suspend resources
-* [gotk uninstall](gotk_uninstall.md)	 - Uninstall the toolkit components
+* [flux uninstall](flux_uninstall.md)	 - Uninstall the toolkit components
 

docs/cmd/flux_bootstrap.md

@@ -1,4 +1,4 @@
-## gotk bootstrap
+## flux bootstrap
 
 Bootstrap toolkit components
 
@@ -24,15 +24,16 @@ The bootstrap sub-commands bootstrap the toolkit components on the targeted Git
 ### Options inherited from parent commands
 
 ```
+      --context string      kubernetes context to use
       --kubeconfig string   path to the kubeconfig file (default "~/.kube/config")
-  -n, --namespace string    the namespace scope for this operation (default "gotk-system")
+  -n, --namespace string    the namespace scope for this operation (default "flux-system")
       --timeout duration    timeout for this operation (default 5m0s)
       --verbose             print generated objects
 ```
 
 ### SEE ALSO
 
-* [gotk](gotk.md)	 - Command line utility for assembling Kubernetes CD pipelines
+* [flux](flux.md)	 - Command line utility for assembling Kubernetes CD pipelines
-* [gotk bootstrap github](gotk_bootstrap_github.md)	 - Bootstrap toolkit components in a GitHub repository
+* [flux bootstrap github](flux_bootstrap_github.md)	 - Bootstrap toolkit components in a GitHub repository
-* [gotk bootstrap gitlab](gotk_bootstrap_gitlab.md)	 - Bootstrap toolkit components in a GitLab repository
+* [flux bootstrap gitlab](flux_bootstrap_gitlab.md)	 - Bootstrap toolkit components in a GitLab repository
 

docs/cmd/flux_bootstrap_github.md

@@ -1,4 +1,4 @@
-## gotk bootstrap github
+## flux bootstrap github
 
 Bootstrap toolkit components in a GitHub repository
 
@@ -11,7 +11,7 @@ If the toolkit components are present on the cluster,
 the bootstrap command will perform an upgrade if needed.
 
 ```
-gotk bootstrap github [flags]
+flux bootstrap github [flags]
 ```
 
 ### Examples
@@ -21,22 +21,22 @@ gotk bootstrap github [flags]
   export GITHUB_TOKEN=<my-token>
 
   # Run bootstrap for a private repo owned by a GitHub organization
-  gotk bootstrap github --owner=<organization> --repository=<repo name>
+  flux bootstrap github --owner=<organization> --repository=<repo name>
 
   # Run bootstrap for a private repo and assign organization teams to it
-  gotk bootstrap github --owner=<organization> --repository=<repo name> --team=<team1 slug> --team=<team2 slug>
+  flux bootstrap github --owner=<organization> --repository=<repo name> --team=<team1 slug> --team=<team2 slug>
 
   # Run bootstrap for a repository path
-  gotk bootstrap github --owner=<organization> --repository=<repo name> --path=dev-cluster
+  flux bootstrap github --owner=<organization> --repository=<repo name> --path=dev-cluster
 
   # Run bootstrap for a public repository on a personal account
-  gotk bootstrap github --owner=<user> --repository=<repo name> --private=false --personal=true 
+  flux bootstrap github --owner=<user> --repository=<repo name> --private=false --personal=true 
 
   # Run bootstrap for a private repo hosted on GitHub Enterprise
-  gotk bootstrap github --owner=<organization> --repository=<repo name> --hostname=<domain>
+  flux bootstrap github --owner=<organization> --repository=<repo name> --hostname=<domain>
 
   # Run bootstrap for a an existing repository with a branch named main
-  gotk bootstrap github --owner=<organization> --repository=<repo name> --branch=main
+  flux bootstrap github --owner=<organization> --repository=<repo name> --branch=main
 
 ```
 
@@ -60,10 +60,11 @@ gotk bootstrap github [flags]
       --arch arch                  cluster architecture, available options are: (amd64, arm, arm64) (default amd64)
       --branch string              default branch (for GitHub this must match the default branch setting for the organization) (default "main")
       --components strings         list of components, accepts comma-separated values (default [source-controller,kustomize-controller,helm-controller,notification-controller])
+      --context string             kubernetes context to use
       --image-pull-secret string   Kubernetes secret name used for pulling the toolkit images from a private registry
       --kubeconfig string          path to the kubeconfig file (default "~/.kube/config")
       --log-level logLevel         log level, available options are: (debug, info, error) (default info)
-  -n, --namespace string           the namespace scope for this operation (default "gotk-system")
+  -n, --namespace string           the namespace scope for this operation (default "flux-system")
       --network-policy             deny ingress access to the toolkit controllers from other namespaces using network policies (default true)
       --registry string            container registry where the toolkit images are published (default "ghcr.io/fluxcd")
       --timeout duration           timeout for this operation (default 5m0s)
@@ -74,5 +75,5 @@ gotk bootstrap github [flags]
 
 ### SEE ALSO
 
-* [gotk bootstrap](gotk_bootstrap.md)	 - Bootstrap toolkit components
+* [flux bootstrap](flux_bootstrap.md)	 - Bootstrap toolkit components
 

docs/cmd/flux_bootstrap_gitlab.md

@@ -1,4 +1,4 @@
-## gotk bootstrap gitlab
+## flux bootstrap gitlab
 
 Bootstrap toolkit components in a GitLab repository
 
@@ -11,7 +11,7 @@ If the toolkit components are present on the cluster,
 the bootstrap command will perform an upgrade if needed.
 
 ```
-gotk bootstrap gitlab [flags]
+flux bootstrap gitlab [flags]
 ```
 
 ### Examples
@@ -21,22 +21,22 @@ gotk bootstrap gitlab [flags]
   export GITLAB_TOKEN=<my-token>
 
   # Run bootstrap for a private repo using HTTPS token authentication 
-  gotk bootstrap gitlab --owner=<group> --repository=<repo name>
+  flux bootstrap gitlab --owner=<group> --repository=<repo name>
 
   # Run bootstrap for a private repo using SSH authentication
-  gotk bootstrap gitlab --owner=<group> --repository=<repo name> --ssh-hostname=gitlab.com
+  flux bootstrap gitlab --owner=<group> --repository=<repo name> --ssh-hostname=gitlab.com
 
   # Run bootstrap for a repository path
-  gotk bootstrap gitlab --owner=<group> --repository=<repo name> --path=dev-cluster
+  flux bootstrap gitlab --owner=<group> --repository=<repo name> --path=dev-cluster
 
   # Run bootstrap for a public repository on a personal account
-  gotk bootstrap gitlab --owner=<user> --repository=<repo name> --private=false --personal=true
+  flux bootstrap gitlab --owner=<user> --repository=<repo name> --private=false --personal=true
 
   # Run bootstrap for a private repo hosted on a GitLab server 
-  gotk bootstrap gitlab --owner=<group> --repository=<repo name> --hostname=<domain>
+  flux bootstrap gitlab --owner=<group> --repository=<repo name> --hostname=<domain>
 
   # Run bootstrap for a an existing repository with a branch named main
-  gotk bootstrap gitlab --owner=<organization> --repository=<repo name> --branch=main
+  flux bootstrap gitlab --owner=<organization> --repository=<repo name> --branch=main
 
 ```
 
@@ -60,10 +60,11 @@ gotk bootstrap gitlab [flags]
       --arch arch                  cluster architecture, available options are: (amd64, arm, arm64) (default amd64)
       --branch string              default branch (for GitHub this must match the default branch setting for the organization) (default "main")
       --components strings         list of components, accepts comma-separated values (default [source-controller,kustomize-controller,helm-controller,notification-controller])
+      --context string             kubernetes context to use
       --image-pull-secret string   Kubernetes secret name used for pulling the toolkit images from a private registry
       --kubeconfig string          path to the kubeconfig file (default "~/.kube/config")
       --log-level logLevel         log level, available options are: (debug, info, error) (default info)
-  -n, --namespace string           the namespace scope for this operation (default "gotk-system")
+  -n, --namespace string           the namespace scope for this operation (default "flux-system")
       --network-policy             deny ingress access to the toolkit controllers from other namespaces using network policies (default true)
       --registry string            container registry where the toolkit images are published (default "ghcr.io/fluxcd")
       --timeout duration           timeout for this operation (default 5m0s)
@@ -74,5 +75,5 @@ gotk bootstrap gitlab [flags]
 
 ### SEE ALSO
 
-* [gotk bootstrap](gotk_bootstrap.md)	 - Bootstrap toolkit components
+* [flux bootstrap](flux_bootstrap.md)	 - Bootstrap toolkit components
 

docs/cmd/flux_check.md

@@ -1,4 +1,4 @@
-## gotk check
+## flux check
 
 Check requirements and installation
 
@@ -8,17 +8,17 @@ The check command will perform a series of checks to validate that
 the local environment is configured correctly and if the installed components are healthy.
 
 ```
-gotk check [flags]
+flux check [flags]
 ```
 
 ### Examples
 
 ```
   # Run pre-installation checks
-  gotk check --pre
+  flux check --pre
 
   # Run installation checks
-  gotk check
+  flux check
 
 ```
 
@@ -33,13 +33,14 @@ gotk check [flags]
 ### Options inherited from parent commands
 
 ```
+      --context string      kubernetes context to use
       --kubeconfig string   path to the kubeconfig file (default "~/.kube/config")
-  -n, --namespace string    the namespace scope for this operation (default "gotk-system")
+  -n, --namespace string    the namespace scope for this operation (default "flux-system")
       --timeout duration    timeout for this operation (default 5m0s)
       --verbose             print generated objects
 ```
 
 ### SEE ALSO
 
-* [gotk](gotk.md)	 - Command line utility for assembling Kubernetes CD pipelines
+* [flux](flux.md)	 - Command line utility for assembling Kubernetes CD pipelines
 

docs/cmd/flux_completion.md

@@ -1,4 +1,4 @@
-## gotk completion
+## flux completion
 
 Generates completion scripts for various shells
 
@@ -15,17 +15,18 @@ The completion sub-command generates completion scripts for various shells
 ### Options inherited from parent commands
 
 ```
+      --context string      kubernetes context to use
       --kubeconfig string   path to the kubeconfig file (default "~/.kube/config")
-  -n, --namespace string    the namespace scope for this operation (default "gotk-system")
+  -n, --namespace string    the namespace scope for this operation (default "flux-system")
       --timeout duration    timeout for this operation (default 5m0s)
       --verbose             print generated objects
 ```
 
 ### SEE ALSO
 
-* [gotk](gotk.md)	 - Command line utility for assembling Kubernetes CD pipelines
+* [flux](flux.md)	 - Command line utility for assembling Kubernetes CD pipelines
-* [gotk completion bash](gotk_completion_bash.md)	 - Generates bash completion scripts
+* [flux completion bash](flux_completion_bash.md)	 - Generates bash completion scripts
-* [gotk completion fish](gotk_completion_fish.md)	 - Generates fish completion scripts
+* [flux completion fish](flux_completion_fish.md)	 - Generates fish completion scripts
-* [gotk completion powershell](gotk_completion_powershell.md)	 - Generates powershell completion scripts
+* [flux completion powershell](flux_completion_powershell.md)	 - Generates powershell completion scripts
-* [gotk completion zsh](gotk_completion_zsh.md)	 - Generates zsh completion scripts
+* [flux completion zsh](flux_completion_zsh.md)	 - Generates zsh completion scripts
 

docs/cmd/flux_completion_bash.md

@@ -1,4 +1,4 @@
-## gotk completion bash
+## flux completion bash
 
 Generates bash completion scripts
 
@@ -7,7 +7,7 @@ Generates bash completion scripts
 Generates bash completion scripts
 
 ```
-gotk completion bash [flags]
+flux completion bash [flags]
 ```
 
 ### Examples
@@ -15,12 +15,12 @@ gotk completion bash [flags]
 ```
 To load completion run
 
-. <(gotk completion bash)
+. <(flux completion bash)
 
 To configure your bash shell to load completions for each session add to your bashrc
 
 # ~/.bashrc or ~/.profile
-command -v gotk >/dev/null && . <(gotk completion bash)
+command -v flux >/dev/null && . <(flux completion bash)
 
 ```
 
@@ -33,13 +33,14 @@ command -v gotk >/dev/null && . <(gotk completion bash)
 ### Options inherited from parent commands
 
 ```
+      --context string      kubernetes context to use
       --kubeconfig string   path to the kubeconfig file (default "~/.kube/config")
-  -n, --namespace string    the namespace scope for this operation (default "gotk-system")
+  -n, --namespace string    the namespace scope for this operation (default "flux-system")
       --timeout duration    timeout for this operation (default 5m0s)
       --verbose             print generated objects
 ```
 
 ### SEE ALSO
 
-* [gotk completion](gotk_completion.md)	 - Generates completion scripts for various shells
+* [flux completion](flux_completion.md)	 - Generates completion scripts for various shells
 

docs/cmd/flux_completion_fish.md

@@ -1,4 +1,4 @@
-## gotk completion fish
+## flux completion fish
 
 Generates fish completion scripts
 
@@ -7,7 +7,7 @@ Generates fish completion scripts
 Generates fish completion scripts
 
 ```
-gotk completion fish [flags]
+flux completion fish [flags]
 ```
 
 ### Examples
@@ -15,11 +15,11 @@ gotk completion fish [flags]
 ```
 To load completion run
 
-. <(gotk completion fish)
+. <(flux completion fish)
 
 To configure your fish shell to load completions for each session write this script to your completions dir:
 
-gotk completion fish > ~/.config/fish/completions/gotk
+flux completion fish > ~/.config/fish/completions/flux
 
 See http://fishshell.com/docs/current/index.html#completion-own for more details
 
@@ -34,13 +34,14 @@ See http://fishshell.com/docs/current/index.html#completion-own for more details
 ### Options inherited from parent commands
 
 ```
+      --context string      kubernetes context to use
       --kubeconfig string   path to the kubeconfig file (default "~/.kube/config")
-  -n, --namespace string    the namespace scope for this operation (default "gotk-system")
+  -n, --namespace string    the namespace scope for this operation (default "flux-system")
       --timeout duration    timeout for this operation (default 5m0s)
       --verbose             print generated objects
 ```
 
 ### SEE ALSO
 
-* [gotk completion](gotk_completion.md)	 - Generates completion scripts for various shells
+* [flux completion](flux_completion.md)	 - Generates completion scripts for various shells
 

docs/cmd/flux_completion_powershell.md

@@ -1,4 +1,4 @@
-## gotk completion powershell
+## flux completion powershell
 
 Generates powershell completion scripts
 
@@ -7,7 +7,7 @@ Generates powershell completion scripts
 Generates powershell completion scripts
 
 ```
-gotk completion powershell [flags]
+flux completion powershell [flags]
 ```
 
 ### Examples
@@ -15,19 +15,19 @@ gotk completion powershell [flags]
 ```
 To load completion run
 
-. <(gotk completion powershell)
+. <(flux completion powershell)
 
 To configure your powershell shell to load completions for each session add to your powershell profile
 
 Windows:
 
 cd "$env:USERPROFILE\Documents\WindowsPowerShell\Modules"
-gotk completion >> gotk-completion.ps1
+flux completion >> flux-completion.ps1
 
 Linux:
 
 cd "${XDG_CONFIG_HOME:-"$HOME/.config/"}/powershell/modules"
-gotk completion >> gotk-completions.ps1
+flux completion >> flux-completions.ps1
 
 ```
 
@@ -40,13 +40,14 @@ gotk completion >> gotk-completions.ps1
 ### Options inherited from parent commands
 
 ```
+      --context string      kubernetes context to use
       --kubeconfig string   path to the kubeconfig file (default "~/.kube/config")
-  -n, --namespace string    the namespace scope for this operation (default "gotk-system")
+  -n, --namespace string    the namespace scope for this operation (default "flux-system")
       --timeout duration    timeout for this operation (default 5m0s)
       --verbose             print generated objects
 ```
 
 ### SEE ALSO
 
-* [gotk completion](gotk_completion.md)	 - Generates completion scripts for various shells
+* [flux completion](flux_completion.md)	 - Generates completion scripts for various shells
 

docs/cmd/flux_completion_zsh.md

@@ -1,4 +1,4 @@
-## gotk completion zsh
+## flux completion zsh
 
 Generates zsh completion scripts
 
@@ -7,7 +7,7 @@ Generates zsh completion scripts
 Generates zsh completion scripts
 
 ```
-gotk completion zsh [flags]
+flux completion zsh [flags]
 ```
 
 ### Examples
@@ -15,20 +15,20 @@ gotk completion zsh [flags]
 ```
 To load completion run
 
-. <(gotk completion zsh) && compdef _gotk gotk
+. <(flux completion zsh) && compdef _flux flux
 
 To configure your zsh shell to load completions for each session add to your zshrc
 
 # ~/.zshrc or ~/.profile
-command -v gotk >/dev/null && . <(gotk completion zsh) && compdef _gotk gotk
+command -v flux >/dev/null && . <(flux completion zsh) && compdef _flux flux
 
 or write a cached file in one of the completion directories in your ${fpath}:
 
 echo "${fpath// /\n}" | grep -i completion
-gotk completions zsh > _gotk
+flux completions zsh > _flux
 
-mv _gotk ~/.oh-my-zsh/completions  # oh-my-zsh
+mv _flux ~/.oh-my-zsh/completions  # oh-my-zsh
-mv _gotk ~/.zprezto/modules/completion/external/src/  # zprezto
+mv _flux ~/.zprezto/modules/completion/external/src/  # zprezto
 
 ```
 
@@ -41,13 +41,14 @@ mv _gotk ~/.zprezto/modules/completion/external/src/  # zprezto
 ### Options inherited from parent commands
 
 ```
+      --context string      kubernetes context to use
       --kubeconfig string   path to the kubeconfig file (default "~/.kube/config")
-  -n, --namespace string    the namespace scope for this operation (default "gotk-system")
+  -n, --namespace string    the namespace scope for this operation (default "flux-system")
       --timeout duration    timeout for this operation (default 5m0s)
       --verbose             print generated objects
 ```
 
 ### SEE ALSO
 
-* [gotk completion](gotk_completion.md)	 - Generates completion scripts for various shells
+* [flux completion](flux_completion.md)	 - Generates completion scripts for various shells
 

docs/cmd/flux_create.md

@@ -1,4 +1,4 @@
-## gotk create
+## flux create
 
 Create or update sources and resources
 
@@ -18,19 +18,20 @@ The create sub-commands generate sources and resources.
 ### Options inherited from parent commands
 
 ```
+      --context string      kubernetes context to use
       --kubeconfig string   path to the kubeconfig file (default "~/.kube/config")
-  -n, --namespace string    the namespace scope for this operation (default "gotk-system")
+  -n, --namespace string    the namespace scope for this operation (default "flux-system")
       --timeout duration    timeout for this operation (default 5m0s)
       --verbose             print generated objects
 ```
 
 ### SEE ALSO
 
-* [gotk](gotk.md)	 - Command line utility for assembling Kubernetes CD pipelines
+* [flux](flux.md)	 - Command line utility for assembling Kubernetes CD pipelines
-* [gotk create alert](gotk_create_alert.md)	 - Create or update a Alert resource
+* [flux create alert](flux_create_alert.md)	 - Create or update a Alert resource
-* [gotk create alert-provider](gotk_create_alert-provider.md)	 - Create or update a Provider resource
+* [flux create alert-provider](flux_create_alert-provider.md)	 - Create or update a Provider resource
-* [gotk create helmrelease](gotk_create_helmrelease.md)	 - Create or update a HelmRelease resource
+* [flux create helmrelease](flux_create_helmrelease.md)	 - Create or update a HelmRelease resource
-* [gotk create kustomization](gotk_create_kustomization.md)	 - Create or update a Kustomization resource
+* [flux create kustomization](flux_create_kustomization.md)	 - Create or update a Kustomization resource
-* [gotk create receiver](gotk_create_receiver.md)	 - Create or update a Receiver resource
+* [flux create receiver](flux_create_receiver.md)	 - Create or update a Receiver resource
-* [gotk create source](gotk_create_source.md)	 - Create or update sources
+* [flux create source](flux_create_source.md)	 - Create or update sources
 

docs/cmd/flux_create_alert-provider.md

@@ -1,4 +1,4 @@
-## gotk create alert-provider
+## flux create alert-provider
 
 Create or update a Provider resource
 
@@ -7,21 +7,21 @@ Create or update a Provider resource
 The create alert-provider command generates a Provider resource.
 
 ```
-gotk create alert-provider [name] [flags]
+flux create alert-provider [name] [flags]
 ```
 
 ### Examples
 
 ```
   # Create a Provider for a Slack channel
-  gotk create alert-provider slack \
+  flux create alert-provider slack \
   --type slack \
   --channel general \
   --address https://hooks.slack.com/services/YOUR/SLACK/WEBHOOK \
   --secret-ref webhook-url
 
   # Create a Provider for a Github repository
-  gotk create alert-provider github-podinfo \
+  flux create alert-provider github-podinfo \
   --type github \
   --address https://github.com/stefanprodan/podinfo \
   --secret-ref github-token
@@ -42,16 +42,17 @@ gotk create alert-provider [name] [flags]
 ### Options inherited from parent commands
 
 ```
+      --context string      kubernetes context to use
       --export              export in YAML format to stdout
       --interval duration   source sync interval (default 1m0s)
       --kubeconfig string   path to the kubeconfig file (default "~/.kube/config")
       --label strings       set labels on the resource (can specify multiple labels with commas: label1=value1,label2=value2)
-  -n, --namespace string    the namespace scope for this operation (default "gotk-system")
+  -n, --namespace string    the namespace scope for this operation (default "flux-system")
       --timeout duration    timeout for this operation (default 5m0s)
       --verbose             print generated objects
 ```
 
 ### SEE ALSO
 
-* [gotk create](gotk_create.md)	 - Create or update sources and resources
+* [flux create](flux_create.md)	 - Create or update sources and resources
 

docs/cmd/flux_create_alert.md

@@ -1,4 +1,4 @@
-## gotk create alert
+## flux create alert
 
 Create or update a Alert resource
 
@@ -7,18 +7,18 @@ Create or update a Alert resource
 The create alert command generates a Alert resource.
 
 ```
-gotk create alert [name] [flags]
+flux create alert [name] [flags]
 ```
 
 ### Examples
 
 ```
   # Create an Alert for kustomization events
-  gotk create alert \
+  flux create alert \
   --event-severity info \
-  --event-source Kustomization/gotk-system \
+  --event-source Kustomization/flux-system \
   --provider-ref slack \
-  gotk-system
+  flux-system
 
 ```
 
@@ -34,16 +34,17 @@ gotk create alert [name] [flags]
 ### Options inherited from parent commands
 
 ```
+      --context string      kubernetes context to use
       --export              export in YAML format to stdout
       --interval duration   source sync interval (default 1m0s)
       --kubeconfig string   path to the kubeconfig file (default "~/.kube/config")
       --label strings       set labels on the resource (can specify multiple labels with commas: label1=value1,label2=value2)
-  -n, --namespace string    the namespace scope for this operation (default "gotk-system")
+  -n, --namespace string    the namespace scope for this operation (default "flux-system")
       --timeout duration    timeout for this operation (default 5m0s)
       --verbose             print generated objects
 ```
 
 ### SEE ALSO
 
-* [gotk create](gotk_create.md)	 - Create or update sources and resources
+* [flux create](flux_create.md)	 - Create or update sources and resources
 

docs/cmd/flux_create_helmrelease.md

@@ -1,4 +1,4 @@
-## gotk create helmrelease
+## flux create helmrelease
 
 Create or update a HelmRelease resource
 
@@ -7,51 +7,51 @@ Create or update a HelmRelease resource
 The helmrelease create command generates a HelmRelease resource for a given HelmRepository source.
 
 ```
-gotk create helmrelease [name] [flags]
+flux create helmrelease [name] [flags]
 ```
 
 ### Examples
 
 ```
   # Create a HelmRelease with a chart from a HelmRepository source
-  gotk create hr podinfo \
+  flux create hr podinfo \
     --interval=10m \
     --source=HelmRepository/podinfo \
     --chart=podinfo \
     --chart-version=">4.0.0"
 
   # Create a HelmRelease with a chart from a GitRepository source
-  gotk create hr podinfo \
+  flux create hr podinfo \
     --interval=10m \
     --source=GitRepository/podinfo \
     --chart=./charts/podinfo
 
   # Create a HelmRelease with a chart from a Bucket source
-  gotk create hr podinfo \
+  flux create hr podinfo \
     --interval=10m \
     --source=Bucket/podinfo \
     --chart=./charts/podinfo
 
   # Create a HelmRelease with values from a local YAML file
-  gotk create hr podinfo \
+  flux create hr podinfo \
     --source=HelmRepository/podinfo \
     --chart=podinfo \
     --values=./my-values.yaml
 
   # Create a HelmRelease with a custom release name
-  gotk create hr podinfo \
+  flux create hr podinfo \
     --release-name=podinfo-dev
     --source=HelmRepository/podinfo \
     --chart=podinfo \
 
   # Create a HelmRelease targeting another namespace than the resource
-  gotk create hr podinfo \
+  flux create hr podinfo \
     --target-namespace=default \
     --source=HelmRepository/podinfo \
     --chart=podinfo
 
   # Create a HelmRelease definition on disk without applying it on the cluster
-  gotk create hr podinfo \
+  flux create hr podinfo \
     --source=HelmRepository/podinfo \
     --chart=podinfo \
     --values=./values.yaml \
@@ -75,16 +75,17 @@ gotk create helmrelease [name] [flags]
 ### Options inherited from parent commands
 
 ```
+      --context string      kubernetes context to use
       --export              export in YAML format to stdout
       --interval duration   source sync interval (default 1m0s)
       --kubeconfig string   path to the kubeconfig file (default "~/.kube/config")
       --label strings       set labels on the resource (can specify multiple labels with commas: label1=value1,label2=value2)
-  -n, --namespace string    the namespace scope for this operation (default "gotk-system")
+  -n, --namespace string    the namespace scope for this operation (default "flux-system")
       --timeout duration    timeout for this operation (default 5m0s)
       --verbose             print generated objects
 ```
 
 ### SEE ALSO
 
-* [gotk create](gotk_create.md)	 - Create or update sources and resources
+* [flux create](flux_create.md)	 - Create or update sources and resources
 

docs/cmd/flux_create_kustomization.md

@@ -1,4 +1,4 @@
-## gotk create kustomization
+## flux create kustomization
 
 Create or update a Kustomization resource
 
@@ -7,14 +7,14 @@ Create or update a Kustomization resource
 The kustomization source create command generates a Kustomize resource for a given source.
 
 ```
-gotk create kustomization [name] [flags]
+flux create kustomization [name] [flags]
 ```
 
 ### Examples
 
 ```
   # Create a Kustomization resource from a source at a given path
-  gotk create kustomization contour \
+  flux create kustomization contour \
     --source=contour \
     --path="./examples/contour/" \
     --prune=true \
@@ -25,7 +25,7 @@ gotk create kustomization [name] [flags]
     --health-check-timeout=3m
 
   # Create a Kustomization resource that depends on the previous one
-  gotk create kustomization webapp \
+  flux create kustomization webapp \
     --depends-on=contour \
     --source=webapp \
     --path="./deploy/overlays/dev" \
@@ -34,7 +34,7 @@ gotk create kustomization [name] [flags]
     --validation=client
 
   # Create a Kustomization resource that references a Bucket
-  gotk create kustomization secrets \
+  flux create kustomization secrets \
     --source=Bucket/secrets \
     --prune=true \
     --interval=5m
@@ -61,16 +61,17 @@ gotk create kustomization [name] [flags]
 ### Options inherited from parent commands
 
 ```
+      --context string      kubernetes context to use
       --export              export in YAML format to stdout
       --interval duration   source sync interval (default 1m0s)
       --kubeconfig string   path to the kubeconfig file (default "~/.kube/config")
       --label strings       set labels on the resource (can specify multiple labels with commas: label1=value1,label2=value2)
-  -n, --namespace string    the namespace scope for this operation (default "gotk-system")
+  -n, --namespace string    the namespace scope for this operation (default "flux-system")
       --timeout duration    timeout for this operation (default 5m0s)
       --verbose             print generated objects
 ```
 
 ### SEE ALSO
 
-* [gotk create](gotk_create.md)	 - Create or update sources and resources
+* [flux create](flux_create.md)	 - Create or update sources and resources
 

docs/cmd/flux_create_receiver.md

@@ -1,4 +1,4 @@
-## gotk create receiver
+## flux create receiver
 
 Create or update a Receiver resource
 
@@ -7,14 +7,14 @@ Create or update a Receiver resource
 The create receiver command generates a Receiver resource.
 
 ```
-gotk create receiver [name] [flags]
+flux create receiver [name] [flags]
 ```
 
 ### Examples
 
 ```
   # Create a Receiver
-  gotk create receiver github-receiver \
+  flux create receiver github-receiver \
 	--type github \
 	--event ping \
 	--event push \
@@ -37,16 +37,17 @@ gotk create receiver [name] [flags]
 ### Options inherited from parent commands
 
 ```
+      --context string      kubernetes context to use
       --export              export in YAML format to stdout
       --interval duration   source sync interval (default 1m0s)
       --kubeconfig string   path to the kubeconfig file (default "~/.kube/config")
       --label strings       set labels on the resource (can specify multiple labels with commas: label1=value1,label2=value2)
-  -n, --namespace string    the namespace scope for this operation (default "gotk-system")
+  -n, --namespace string    the namespace scope for this operation (default "flux-system")
       --timeout duration    timeout for this operation (default 5m0s)
       --verbose             print generated objects
 ```
 
 ### SEE ALSO
 
-* [gotk create](gotk_create.md)	 - Create or update sources and resources
+* [flux create](flux_create.md)	 - Create or update sources and resources
 

docs/cmd/flux_create_source.md

@@ -1,4 +1,4 @@
-## gotk create source
+## flux create source
 
 Create or update sources
 
@@ -15,19 +15,20 @@ The create source sub-commands generate sources.
 ### Options inherited from parent commands
 
 ```
+      --context string      kubernetes context to use
       --export              export in YAML format to stdout
       --interval duration   source sync interval (default 1m0s)
       --kubeconfig string   path to the kubeconfig file (default "~/.kube/config")
       --label strings       set labels on the resource (can specify multiple labels with commas: label1=value1,label2=value2)
-  -n, --namespace string    the namespace scope for this operation (default "gotk-system")
+  -n, --namespace string    the namespace scope for this operation (default "flux-system")
       --timeout duration    timeout for this operation (default 5m0s)
       --verbose             print generated objects
 ```
 
 ### SEE ALSO
 
-* [gotk create](gotk_create.md)	 - Create or update sources and resources
+* [flux create](flux_create.md)	 - Create or update sources and resources
-* [gotk create source bucket](gotk_create_source_bucket.md)	 - Create or update a Bucket source
+* [flux create source bucket](flux_create_source_bucket.md)	 - Create or update a Bucket source
-* [gotk create source git](gotk_create_source_git.md)	 - Create or update a GitRepository source
+* [flux create source git](flux_create_source_git.md)	 - Create or update a GitRepository source
-* [gotk create source helm](gotk_create_source_helm.md)	 - Create or update a HelmRepository source
+* [flux create source helm](flux_create_source_helm.md)	 - Create or update a HelmRepository source
 

docs/cmd/flux_create_source_bucket.md

@@ -1,4 +1,4 @@
-## gotk create source bucket
+## flux create source bucket
 
 Create or update a Bucket source
 
@@ -9,14 +9,14 @@ The create source bucket command generates a Bucket resource and waits for it to
 For Buckets with static authentication, the credentials are stored in a Kubernetes secret.
 
 ```
-gotk create source bucket [name] [flags]
+flux create source bucket [name] [flags]
 ```
 
 ### Examples
 
 ```
   # Create a source from a Buckets using static authentication
-  gotk create source bucket podinfo \
+  flux create source bucket podinfo \
 	--bucket-name=podinfo \
     --endpoint=minio.minio.svc.cluster.local:9000 \
 	--insecure=true \
@@ -25,7 +25,7 @@ gotk create source bucket [name] [flags]
     --interval=10m
 
   # Create a source from an Amazon S3 Bucket using IAM authentication
-  gotk create source bucket podinfo \
+  flux create source bucket podinfo \
 	--bucket-name=podinfo \
 	--provider=aws \
     --endpoint=s3.amazonaws.com \
@@ -51,16 +51,17 @@ gotk create source bucket [name] [flags]
 ### Options inherited from parent commands
 
 ```
+      --context string      kubernetes context to use
       --export              export in YAML format to stdout
       --interval duration   source sync interval (default 1m0s)
       --kubeconfig string   path to the kubeconfig file (default "~/.kube/config")
       --label strings       set labels on the resource (can specify multiple labels with commas: label1=value1,label2=value2)
-  -n, --namespace string    the namespace scope for this operation (default "gotk-system")
+  -n, --namespace string    the namespace scope for this operation (default "flux-system")
       --timeout duration    timeout for this operation (default 5m0s)
       --verbose             print generated objects
 ```
 
 ### SEE ALSO
 
-* [gotk create source](gotk_create_source.md)	 - Create or update sources
+* [flux create source](flux_create_source.md)	 - Create or update sources
 

docs/cmd/flux_create_source_git.md

@@ -1,4 +1,4 @@
-## gotk create source git
+## flux create source git
 
 Create or update a GitRepository source
 
@@ -10,42 +10,42 @@ For Git over SSH, host and SSH keys are automatically generated and stored in a
 For private Git repositories, the basic authentication credentials are stored in a Kubernetes secret.
 
 ```
-gotk create source git [name] [flags]
+flux create source git [name] [flags]
 ```
 
 ### Examples
 
 ```
   # Create a source from a public Git repository master branch
-  gotk create source git podinfo \
+  flux create source git podinfo \
     --url=https://github.com/stefanprodan/podinfo \
     --branch=master
 
   # Create a source from a Git repository pinned to specific git tag
-  gotk create source git podinfo \
+  flux 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
-  gotk create source git podinfo \
+  flux 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
-  gotk create source git podinfo \
+  flux create source git podinfo \
     --url=ssh://git@github.com/stefanprodan/podinfo \
     --branch=master
 
   # Create a source from a Git repository using SSH authentication and an
   # ECDSA P-521 curve public key
-  gotk create source git podinfo \
+  flux create source git podinfo \
     --url=ssh://git@github.com/stefanprodan/podinfo \
     --branch=master \
     --ssh-key-algorithm=ecdsa \
     --ssh-ecdsa-curve=p521
 
   # Create a source from a Git repository using basic authentication
-  gotk create source git podinfo \
+  flux create source git podinfo \
     --url=https://github.com/stefanprodan/podinfo \
     --username=username \
     --password=password
@@ -71,16 +71,17 @@ gotk create source git [name] [flags]
 ### Options inherited from parent commands
 
 ```
+      --context string      kubernetes context to use
       --export              export in YAML format to stdout
       --interval duration   source sync interval (default 1m0s)
       --kubeconfig string   path to the kubeconfig file (default "~/.kube/config")
       --label strings       set labels on the resource (can specify multiple labels with commas: label1=value1,label2=value2)
-  -n, --namespace string    the namespace scope for this operation (default "gotk-system")
+  -n, --namespace string    the namespace scope for this operation (default "flux-system")
       --timeout duration    timeout for this operation (default 5m0s)
       --verbose             print generated objects
 ```
 
 ### SEE ALSO
 
-* [gotk create source](gotk_create_source.md)	 - Create or update sources
+* [flux create source](flux_create_source.md)	 - Create or update sources