diff --git a/cmd/flux/create_tenant.go b/cmd/flux/create_tenant.go
index 7c600329cafa83e3bbfcebce9f43bf558fcdcfeb..22bb978f6f221fa4e55e5fe8a451a810e96928ad 100644
--- a/cmd/flux/create_tenant.go
+++ b/cmd/flux/create_tenant.go
@@ -148,7 +148,7 @@ func createTenantCmdRun(cmd *cobra.Command, args []string) error {
}
if createArgs.export {
- for i, _ := range tenantArgs.namespaces {
+ for i := range tenantArgs.namespaces {
if err := exportTenant(namespaces[i], accounts[i], roleBindings[i]); err != nil {
return err
}
@@ -164,7 +164,7 @@ func createTenantCmdRun(cmd *cobra.Command, args []string) error {
return err
}
- for i, _ := range tenantArgs.namespaces {
+ for i := range tenantArgs.namespaces {
logger.Actionf("applying namespace %s", namespaces[i].Name)
if err := upsertNamespace(ctx, kubeClient, namespaces[i]); err != nil {
return err
diff --git a/cmd/flux/get.go b/cmd/flux/get.go
index 37c267a634f60272295257c6d2a83798807b27d3..d1745b390cafba94cb720ad4b858793a30f26f56 100644
--- a/cmd/flux/get.go
+++ b/cmd/flux/get.go
@@ -25,6 +25,9 @@ import (
"github.com/spf13/cobra"
apimeta "k8s.io/apimachinery/pkg/api/meta"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+ "k8s.io/apimachinery/pkg/runtime"
+ "k8s.io/apimachinery/pkg/watch"
+ watchtools "k8s.io/client-go/tools/watch"
"sigs.k8s.io/controller-runtime/pkg/client"
"github.com/fluxcd/pkg/apis/meta"
@@ -32,6 +35,26 @@ import (
"github.com/fluxcd/flux2/internal/utils"
)
+type deriveType func(runtime.Object) (summarisable, error)
+
+type typeMap map[string]deriveType
+
+func (m typeMap) registerCommand(t string, f deriveType) error {
+ if _, ok := m[t]; ok {
+ return fmt.Errorf("duplicate type function %s", t)
+ }
+ m[t] = f
+ return nil
+}
+
+func (m typeMap) execute(t string, obj runtime.Object) (summarisable, error) {
+ f, ok := m[t]
+ if !ok {
+ return nil, fmt.Errorf("unsupported type %s", t)
+ }
+ return f(obj)
+}
+
var getCmd = &cobra.Command{
Use: "get",
Short: "Get the resources and their status",
@@ -42,6 +65,7 @@ type GetFlags struct {
allNamespaces bool
noHeader bool
statusSelector string
+ watch bool
}
var getArgs GetFlags
@@ -50,6 +74,7 @@ func init() {
getCmd.PersistentFlags().BoolVarP(&getArgs.allNamespaces, "all-namespaces", "A", false,
"list the requested object(s) across all namespaces")
getCmd.PersistentFlags().BoolVarP(&getArgs.noHeader, "no-header", "", false, "skip the header when printing the results")
+ getCmd.PersistentFlags().BoolVarP(&getArgs.watch, "watch", "w", false, "After listing/getting the requested object, watch for changes.")
getCmd.PersistentFlags().StringVar(&getArgs.statusSelector, "status-selector", "",
"specify the status condition name and the desired state to filter the get result, e.g. ready=false")
rootCmd.AddCommand(getCmd)
@@ -102,7 +127,8 @@ var namespaceHeader = []string{"Namespace"}
type getCommand struct {
apiType
- list summarisable
+ list summarisable
+ funcMap typeMap
}
func (get getCommand) run(cmd *cobra.Command, args []string) error {
@@ -123,13 +149,17 @@ func (get getCommand) run(cmd *cobra.Command, args []string) error {
listOpts = append(listOpts, client.MatchingFields{"metadata.name": args[0]})
}
+ getAll := cmd.Use == "all"
+
+ if getArgs.watch {
+ return get.watch(ctx, kubeClient, cmd, args, listOpts)
+ }
+
err = kubeClient.List(ctx, get.list.asClientList(), listOpts...)
if err != nil {
return err
}
- getAll := cmd.Use == "all"
-
if get.list.len() == 0 {
if !getAll {
logger.Failuref("no %s objects found in %s namespace", get.kind, rootArgs.namespace)
@@ -141,28 +171,93 @@ func (get getCommand) run(cmd *cobra.Command, args []string) error {
if !getArgs.noHeader {
header = get.list.headers(getArgs.allNamespaces)
}
+
+ rows, err := getRowsToPrint(getAll, get.list)
+ if err != nil {
+ return err
+ }
+
+ utils.PrintTable(os.Stdout, header, rows)
+
+ if getAll {
+ fmt.Println()
+ }
+
+ return nil
+}
+
+func getRowsToPrint(getAll bool, list summarisable) ([][]string, error) {
noFilter := true
var conditionType, conditionStatus string
if getArgs.statusSelector != "" {
parts := strings.SplitN(getArgs.statusSelector, "=", 2)
if len(parts) != 2 {
- return fmt.Errorf("expected status selector in type=status format, but found: %s", getArgs.statusSelector)
+ return nil, fmt.Errorf("expected status selector in type=status format, but found: %s", getArgs.statusSelector)
}
conditionType = parts[0]
conditionStatus = parts[1]
noFilter = false
}
var rows [][]string
- for i := 0; i < get.list.len(); i++ {
- if noFilter || get.list.statusSelectorMatches(i, conditionType, conditionStatus) {
- row := get.list.summariseItem(i, getArgs.allNamespaces, getAll)
+ for i := 0; i < list.len(); i++ {
+ if noFilter || list.statusSelectorMatches(i, conditionType, conditionStatus) {
+ row := list.summariseItem(i, getArgs.allNamespaces, getAll)
rows = append(rows, row)
}
}
- utils.PrintTable(os.Stdout, header, rows)
+ return rows, nil
+}
- if getAll {
- fmt.Println()
+//
+// watch starts a client-side watch of one or more resources.
+func (get *getCommand) watch(ctx context.Context, kubeClient client.WithWatch, cmd *cobra.Command, args []string, listOpts []client.ListOption) error {
+ w, err := kubeClient.Watch(ctx, get.list.asClientList(), listOpts...)
+ if err != nil {
+ return err
+ }
+
+ _, err = watchUntil(ctx, w, get)
+ if err != nil {
+ return err
+ }
+
+ return nil
+}
+
+func watchUntil(ctx context.Context, w watch.Interface, get *getCommand) (bool, error) {
+ firstIteration := true
+ _, error := watchtools.UntilWithoutRetry(ctx, w, func(e watch.Event) (bool, error) {
+ objToPrint := e.Object
+ sink, err := get.funcMap.execute(get.apiType.kind, objToPrint)
+ if err != nil {
+ return false, err
+ }
+
+ var header []string
+ if !getArgs.noHeader {
+ header = sink.headers(getArgs.allNamespaces)
+ }
+ rows, err := getRowsToPrint(false, sink)
+ if err != nil {
+ return false, err
+ }
+ if firstIteration {
+ utils.PrintTable(os.Stdout, header, rows)
+ firstIteration = false
+ } else {
+ utils.PrintTable(os.Stdout, []string{}, rows)
+ }
+
+ return false, nil
+ })
+
+ return false, error
+}
+
+func validateWatchOption(cmd *cobra.Command, toMatch string) error {
+ w, _ := cmd.Flags().GetBool("watch")
+ if cmd.Use == toMatch && w {
+ return fmt.Errorf("expected a single resource type, but found %s", cmd.Use)
}
return nil
}
diff --git a/cmd/flux/get_alert.go b/cmd/flux/get_alert.go
index 9167196709e6b78e435d53af2c6560a5a09c9780..122d1bc6dee85b336736dec78dff7408bf322da1 100644
--- a/cmd/flux/get_alert.go
+++ b/cmd/flux/get_alert.go
@@ -17,10 +17,12 @@ limitations under the License.
package main
import (
+ "fmt"
"strconv"
"strings"
"github.com/spf13/cobra"
+ "k8s.io/apimachinery/pkg/runtime"
notificationv1 "github.com/fluxcd/notification-controller/api/v1beta1"
)
@@ -32,10 +34,39 @@ var getAlertCmd = &cobra.Command{
Long: "The get alert command prints the statuses of the resources.",
Example: ` # List all Alerts and their status
flux get alerts`,
- RunE: getCommand{
- apiType: alertType,
- list: &alertListAdapter{¬ificationv1.AlertList{}},
- }.run,
+ RunE: func(cmd *cobra.Command, args []string) error {
+ get := getCommand{
+ apiType: alertType,
+ list: &alertListAdapter{¬ificationv1.AlertList{}},
+ funcMap: make(typeMap),
+ }
+
+ err := get.funcMap.registerCommand(get.apiType.kind, func(obj runtime.Object) (summarisable, error) {
+ o, ok := obj.(*notificationv1.Alert)
+ if !ok {
+ return nil, fmt.Errorf("Impossible to cast type %#v alert", obj)
+ }
+
+ sink := alertListAdapter{
+ ¬ificationv1.AlertList{
+ Items: []notificationv1.Alert{
+ *o,
+ },
+ },
+ }
+ return sink, nil
+ })
+
+ if err != nil {
+ return err
+ }
+
+ if err := get.run(cmd, args); err != nil {
+ return err
+ }
+
+ return nil
+ },
}
func init() {
diff --git a/cmd/flux/get_alertprovider.go b/cmd/flux/get_alertprovider.go
index 917a0d999bbd9c22bf314a2cd6bc002490975971..4c7f6105232faf6238d7560319cf419fffbc6de2 100644
--- a/cmd/flux/get_alertprovider.go
+++ b/cmd/flux/get_alertprovider.go
@@ -17,7 +17,10 @@ limitations under the License.
package main
import (
+ "fmt"
+
"github.com/spf13/cobra"
+ "k8s.io/apimachinery/pkg/runtime"
notificationv1 "github.com/fluxcd/notification-controller/api/v1beta1"
)
@@ -29,10 +32,39 @@ var getAlertProviderCmd = &cobra.Command{
Long: "The get alert-provider command prints the statuses of the resources.",
Example: ` # List all Providers and their status
flux get alert-providers`,
- RunE: getCommand{
- apiType: alertProviderType,
- list: alertProviderListAdapter{¬ificationv1.ProviderList{}},
- }.run,
+ RunE: func(cmd *cobra.Command, args []string) error {
+ get := getCommand{
+ apiType: alertProviderType,
+ list: alertProviderListAdapter{¬ificationv1.ProviderList{}},
+ funcMap: make(typeMap),
+ }
+
+ err := get.funcMap.registerCommand(get.apiType.kind, func(obj runtime.Object) (summarisable, error) {
+ o, ok := obj.(*notificationv1.Provider)
+ if !ok {
+ return nil, fmt.Errorf("Impossible to cast type %#v alert-provider", obj)
+ }
+
+ sink := alertProviderListAdapter{
+ ¬ificationv1.ProviderList{
+ Items: []notificationv1.Provider{
+ *o,
+ },
+ },
+ }
+ return sink, nil
+ })
+
+ if err != nil {
+ return err
+ }
+
+ if err := get.run(cmd, args); err != nil {
+ return err
+ }
+
+ return nil
+ },
}
func init() {
diff --git a/cmd/flux/get_all.go b/cmd/flux/get_all.go
index 9da709d3872cca35c6e73c3f83c4eb9e9fa7ef4c..75d2216a075f8fd8ac20956a230b323c91adb242 100644
--- a/cmd/flux/get_all.go
+++ b/cmd/flux/get_all.go
@@ -36,7 +36,12 @@ var getAllCmd = &cobra.Command{
# List all resources in all namespaces
flux get all --all-namespaces`,
RunE: func(cmd *cobra.Command, args []string) error {
- err := getSourceAllCmd.RunE(cmd, args)
+ err := validateWatchOption(cmd, "all")
+ if err != nil {
+ return err
+ }
+
+ err = getSourceAllCmd.RunE(cmd, args)
if err != nil {
logError(err)
}
diff --git a/cmd/flux/get_helmrelease.go b/cmd/flux/get_helmrelease.go
index 04822afa6171850e4718868b6127db0af84decb2..f489aa8761472d4ed75c3f41c2a2b26608a5c982 100644
--- a/cmd/flux/get_helmrelease.go
+++ b/cmd/flux/get_helmrelease.go
@@ -17,11 +17,13 @@ limitations under the License.
package main
import (
+ "fmt"
"strconv"
"strings"
helmv2 "github.com/fluxcd/helm-controller/api/v2beta1"
"github.com/spf13/cobra"
+ "k8s.io/apimachinery/pkg/runtime"
)
var getHelmReleaseCmd = &cobra.Command{
@@ -31,10 +33,36 @@ var getHelmReleaseCmd = &cobra.Command{
Long: "The get helmreleases command prints the statuses of the resources.",
Example: ` # List all Helm releases and their status
flux get helmreleases`,
- RunE: getCommand{
- apiType: helmReleaseType,
- list: &helmReleaseListAdapter{&helmv2.HelmReleaseList{}},
- }.run,
+ RunE: func(cmd *cobra.Command, args []string) error {
+ get := getCommand{
+ apiType: helmReleaseType,
+ list: &helmReleaseListAdapter{&helmv2.HelmReleaseList{}},
+ funcMap: make(typeMap),
+ }
+
+ err := get.funcMap.registerCommand(get.apiType.kind, func(obj runtime.Object) (summarisable, error) {
+ o, ok := obj.(*helmv2.HelmRelease)
+ if !ok {
+ return nil, fmt.Errorf("Impossible to cast type %#v helmrelease", obj)
+ }
+
+ sink := helmReleaseListAdapter{&helmv2.HelmReleaseList{
+ Items: []helmv2.HelmRelease{
+ *o,
+ }}}
+ return sink, nil
+ })
+
+ if err != nil {
+ return err
+ }
+
+ if err := get.run(cmd, args); err != nil {
+ return err
+ }
+
+ return nil
+ },
}
func init() {
diff --git a/cmd/flux/get_image.go b/cmd/flux/get_image.go
index 41181189dbe3621b537c862f057baedd80b03c80..5cde4c2416a1890e3a6b8375cfbc89b00a5ce5fa 100644
--- a/cmd/flux/get_image.go
+++ b/cmd/flux/get_image.go
@@ -25,6 +25,9 @@ var getImageCmd = &cobra.Command{
Aliases: []string{"image"},
Short: "Get image automation object status",
Long: "The get image sub-commands print the status of image automation objects.",
+ RunE: func(cmd *cobra.Command, args []string) error {
+ return validateWatchOption(cmd, "images")
+ },
}
func init() {
diff --git a/cmd/flux/get_image_all.go b/cmd/flux/get_image_all.go
index 88c93ce050d20ea52cebcd2e13f5e3d980690a64..f554232e6a3a89095d0dd4c783a85d69a9f82d96 100644
--- a/cmd/flux/get_image_all.go
+++ b/cmd/flux/get_image_all.go
@@ -35,6 +35,11 @@ var getImageAllCmd = &cobra.Command{
# List all image objects in all namespaces
flux get images all --all-namespaces`,
RunE: func(cmd *cobra.Command, args []string) error {
+ err := validateWatchOption(cmd, "all")
+ if err != nil {
+ return err
+ }
+
var allImageCmd = []getCommand{
{
apiType: imageRepositoryType,
diff --git a/cmd/flux/get_image_policy.go b/cmd/flux/get_image_policy.go
index d1a8f1948964d8103a291abffab1488dcc8c9c98..fe73118d8af821974a6be781740a52ab76faa95f 100644
--- a/cmd/flux/get_image_policy.go
+++ b/cmd/flux/get_image_policy.go
@@ -17,7 +17,10 @@ limitations under the License.
package main
import (
+ "fmt"
+
"github.com/spf13/cobra"
+ "k8s.io/apimachinery/pkg/runtime"
imagev1 "github.com/fluxcd/image-reflector-controller/api/v1beta1"
)
@@ -31,10 +34,36 @@ var getImagePolicyCmd = &cobra.Command{
# List image policies from all namespaces
flux get image policy --all-namespaces`,
- RunE: getCommand{
- apiType: imagePolicyType,
- list: &imagePolicyListAdapter{&imagev1.ImagePolicyList{}},
- }.run,
+ RunE: func(cmd *cobra.Command, args []string) error {
+ get := getCommand{
+ apiType: imagePolicyType,
+ list: &imagePolicyListAdapter{&imagev1.ImagePolicyList{}},
+ funcMap: make(typeMap),
+ }
+
+ err := get.funcMap.registerCommand(get.apiType.kind, func(obj runtime.Object) (summarisable, error) {
+ o, ok := obj.(*imagev1.ImagePolicy)
+ if !ok {
+ return nil, fmt.Errorf("Impossible to cast type %#v policy", obj)
+ }
+
+ sink := imagePolicyListAdapter{&imagev1.ImagePolicyList{
+ Items: []imagev1.ImagePolicy{
+ *o,
+ }}}
+ return sink, nil
+ })
+
+ if err != nil {
+ return err
+ }
+
+ if err := get.run(cmd, args); err != nil {
+ return err
+ }
+
+ return nil
+ },
}
func init() {
diff --git a/cmd/flux/get_image_repository.go b/cmd/flux/get_image_repository.go
index 2ffe2dc9205e60fc15b5afb223202a917d01b5ee..a5b55feaa1967698b29b459ece7848c98fc70977 100644
--- a/cmd/flux/get_image_repository.go
+++ b/cmd/flux/get_image_repository.go
@@ -17,11 +17,13 @@ limitations under the License.
package main
import (
+ "fmt"
"strconv"
"strings"
"time"
"github.com/spf13/cobra"
+ "k8s.io/apimachinery/pkg/runtime"
imagev1 "github.com/fluxcd/image-reflector-controller/api/v1beta1"
)
@@ -35,10 +37,36 @@ var getImageRepositoryCmd = &cobra.Command{
# List image repositories from all namespaces
flux get image repository --all-namespaces`,
- RunE: getCommand{
- apiType: imageRepositoryType,
- list: imageRepositoryListAdapter{&imagev1.ImageRepositoryList{}},
- }.run,
+ RunE: func(cmd *cobra.Command, args []string) error {
+ get := getCommand{
+ apiType: imageRepositoryType,
+ list: imageRepositoryListAdapter{&imagev1.ImageRepositoryList{}},
+ funcMap: make(typeMap),
+ }
+
+ err := get.funcMap.registerCommand(get.apiType.kind, func(obj runtime.Object) (summarisable, error) {
+ o, ok := obj.(*imagev1.ImageRepository)
+ if !ok {
+ return nil, fmt.Errorf("Impossible to cast type %#v repository", obj)
+ }
+
+ sink := imageRepositoryListAdapter{&imagev1.ImageRepositoryList{
+ Items: []imagev1.ImageRepository{
+ *o,
+ }}}
+ return sink, nil
+ })
+
+ if err != nil {
+ return err
+ }
+
+ if err := get.run(cmd, args); err != nil {
+ return err
+ }
+
+ return nil
+ },
}
func init() {
diff --git a/cmd/flux/get_image_update.go b/cmd/flux/get_image_update.go
index 2232b419a4a31379ae1bc7ed2b5c74bc896611fb..9c34f95d1cfb234cededa545b8f863898a2badde 100644
--- a/cmd/flux/get_image_update.go
+++ b/cmd/flux/get_image_update.go
@@ -17,11 +17,13 @@ limitations under the License.
package main
import (
+ "fmt"
"strconv"
"strings"
"time"
"github.com/spf13/cobra"
+ "k8s.io/apimachinery/pkg/runtime"
autov1 "github.com/fluxcd/image-automation-controller/api/v1beta1"
)
@@ -35,10 +37,36 @@ var getImageUpdateCmd = &cobra.Command{
# List image update automations from all namespaces
flux get image update --all-namespaces`,
- RunE: getCommand{
- apiType: imageUpdateAutomationType,
- list: &imageUpdateAutomationListAdapter{&autov1.ImageUpdateAutomationList{}},
- }.run,
+ RunE: func(cmd *cobra.Command, args []string) error {
+ get := getCommand{
+ apiType: imageUpdateAutomationType,
+ list: &imageUpdateAutomationListAdapter{&autov1.ImageUpdateAutomationList{}},
+ funcMap: make(typeMap),
+ }
+
+ err := get.funcMap.registerCommand(get.apiType.kind, func(obj runtime.Object) (summarisable, error) {
+ o, ok := obj.(*autov1.ImageUpdateAutomation)
+ if !ok {
+ return nil, fmt.Errorf("Impossible to cast type %#v update", obj)
+ }
+
+ sink := imageUpdateAutomationListAdapter{&autov1.ImageUpdateAutomationList{
+ Items: []autov1.ImageUpdateAutomation{
+ *o,
+ }}}
+ return sink, nil
+ })
+
+ if err != nil {
+ return err
+ }
+
+ if err := get.run(cmd, args); err != nil {
+ return err
+ }
+
+ return nil
+ },
}
func init() {
diff --git a/cmd/flux/get_kustomization.go b/cmd/flux/get_kustomization.go
index f697fd9cae4d9569849d378b8093d2374a6c3412..d507b2a5cb091b80f405052a80797ea4681ae4c8 100644
--- a/cmd/flux/get_kustomization.go
+++ b/cmd/flux/get_kustomization.go
@@ -17,10 +17,12 @@ limitations under the License.
package main
import (
+ "fmt"
"strconv"
"strings"
"github.com/spf13/cobra"
+ "k8s.io/apimachinery/pkg/runtime"
kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1beta1"
)
@@ -32,10 +34,39 @@ var getKsCmd = &cobra.Command{
Long: "The get kustomizations command prints the statuses of the resources.",
Example: ` # List all kustomizations and their status
flux get kustomizations`,
- RunE: getCommand{
- apiType: kustomizationType,
- list: &kustomizationListAdapter{&kustomizev1.KustomizationList{}},
- }.run,
+ RunE: func(cmd *cobra.Command, args []string) error {
+ get := getCommand{
+ apiType: kustomizationType,
+ list: &kustomizationListAdapter{&kustomizev1.KustomizationList{}},
+ funcMap: make(typeMap),
+ }
+
+ err := get.funcMap.registerCommand(get.apiType.kind, func(obj runtime.Object) (summarisable, error) {
+ o, ok := obj.(*kustomizev1.Kustomization)
+ if !ok {
+ return nil, fmt.Errorf("Impossible to cast type %#v kustomization", obj)
+ }
+
+ sink := kustomizationListAdapter{
+ &kustomizev1.KustomizationList{
+ Items: []kustomizev1.Kustomization{
+ *o,
+ },
+ },
+ }
+ return sink, nil
+ })
+
+ if err != nil {
+ return err
+ }
+
+ if err := get.run(cmd, args); err != nil {
+ return err
+ }
+
+ return nil
+ },
}
func init() {
diff --git a/cmd/flux/get_receiver.go b/cmd/flux/get_receiver.go
index f66af1ba91e97891659080ee8936c50e22aad022..f3da4bb4747b5f466123734bd0d04baafc58440c 100644
--- a/cmd/flux/get_receiver.go
+++ b/cmd/flux/get_receiver.go
@@ -17,10 +17,12 @@ limitations under the License.
package main
import (
+ "fmt"
"strconv"
"strings"
"github.com/spf13/cobra"
+ "k8s.io/apimachinery/pkg/runtime"
notificationv1 "github.com/fluxcd/notification-controller/api/v1beta1"
)
@@ -32,10 +34,36 @@ var getReceiverCmd = &cobra.Command{
Long: "The get receiver command prints the statuses of the resources.",
Example: ` # List all Receiver and their status
flux get receivers`,
- RunE: getCommand{
- apiType: receiverType,
- list: receiverListAdapter{¬ificationv1.ReceiverList{}},
- }.run,
+ RunE: func(cmd *cobra.Command, args []string) error {
+ get := getCommand{
+ apiType: receiverType,
+ list: receiverListAdapter{¬ificationv1.ReceiverList{}},
+ funcMap: make(typeMap),
+ }
+
+ err := get.funcMap.registerCommand(get.apiType.kind, func(obj runtime.Object) (summarisable, error) {
+ o, ok := obj.(*notificationv1.Receiver)
+ if !ok {
+ return nil, fmt.Errorf("Impossible to cast type %#v receiver", obj)
+ }
+
+ sink := receiverListAdapter{¬ificationv1.ReceiverList{
+ Items: []notificationv1.Receiver{
+ *o,
+ }}}
+ return sink, nil
+ })
+
+ if err != nil {
+ return err
+ }
+
+ if err := get.run(cmd, args); err != nil {
+ return err
+ }
+
+ return nil
+ },
}
func init() {
diff --git a/cmd/flux/get_source.go b/cmd/flux/get_source.go
index 0be7acf0661b48dffd0d0b24b3b7131f87ada189..0e3cd5e53a5352436d42dabec635e721edf1a920 100644
--- a/cmd/flux/get_source.go
+++ b/cmd/flux/get_source.go
@@ -25,6 +25,10 @@ var getSourceCmd = &cobra.Command{
Aliases: []string{"source"},
Short: "Get source statuses",
Long: "The get source sub-commands print the statuses of the sources.",
+ RunE: func(cmd *cobra.Command, args []string) error {
+
+ return validateWatchOption(cmd, "sources")
+ },
}
func init() {
diff --git a/cmd/flux/get_source_all.go b/cmd/flux/get_source_all.go
index a36bb50c4493c38a930bdcbba0f37c9993561f38..08c12de1d6c5ae83225c0cfc70de0dccf416c46b 100644
--- a/cmd/flux/get_source_all.go
+++ b/cmd/flux/get_source_all.go
@@ -34,6 +34,11 @@ var getSourceAllCmd = &cobra.Command{
# List all sources in all namespaces
flux get sources all --all-namespaces`,
RunE: func(cmd *cobra.Command, args []string) error {
+ err := validateWatchOption(cmd, "all")
+ if err != nil {
+ return err
+ }
+
var allSourceCmd = []getCommand{
{
apiType: bucketType,
diff --git a/cmd/flux/get_source_bucket.go b/cmd/flux/get_source_bucket.go
index dd0c767d9bc72543e313c21d11ec976a0d3ca3e8..c34ef8c271cd567ef49a619b173ffe3b3f89a5a6 100644
--- a/cmd/flux/get_source_bucket.go
+++ b/cmd/flux/get_source_bucket.go
@@ -17,10 +17,12 @@ limitations under the License.
package main
import (
+ "fmt"
"strconv"
"strings"
"github.com/spf13/cobra"
+ "k8s.io/apimachinery/pkg/runtime"
sourcev1 "github.com/fluxcd/source-controller/api/v1beta1"
)
@@ -34,10 +36,36 @@ var getSourceBucketCmd = &cobra.Command{
# List buckets from all namespaces
flux get sources helm --all-namespaces`,
- RunE: getCommand{
- apiType: bucketType,
- list: &bucketListAdapter{&sourcev1.BucketList{}},
- }.run,
+ RunE: func(cmd *cobra.Command, args []string) error {
+ get := getCommand{
+ apiType: bucketType,
+ list: &bucketListAdapter{&sourcev1.BucketList{}},
+ funcMap: make(typeMap),
+ }
+
+ err := get.funcMap.registerCommand(get.apiType.kind, func(obj runtime.Object) (summarisable, error) {
+ o, ok := obj.(*sourcev1.Bucket)
+ if !ok {
+ return nil, fmt.Errorf("Impossible to cast type %#v bucket", obj)
+ }
+
+ sink := &bucketListAdapter{&sourcev1.BucketList{
+ Items: []sourcev1.Bucket{
+ *o,
+ }}}
+ return sink, nil
+ })
+
+ if err != nil {
+ return err
+ }
+
+ if err := get.run(cmd, args); err != nil {
+ return err
+ }
+
+ return nil
+ },
}
func init() {
diff --git a/cmd/flux/get_source_chart.go b/cmd/flux/get_source_chart.go
index 476bb22f2ce82ac5ed074c3afacf286336227595..3e890a5faca7a58352942a5acde4397319783141 100644
--- a/cmd/flux/get_source_chart.go
+++ b/cmd/flux/get_source_chart.go
@@ -17,10 +17,12 @@ limitations under the License.
package main
import (
+ "fmt"
"strconv"
"strings"
"github.com/spf13/cobra"
+ "k8s.io/apimachinery/pkg/runtime"
sourcev1 "github.com/fluxcd/source-controller/api/v1beta1"
)
@@ -34,10 +36,36 @@ var getSourceHelmChartCmd = &cobra.Command{
# List Helm charts from all namespaces
flux get sources chart --all-namespaces`,
- RunE: getCommand{
- apiType: helmChartType,
- list: &helmChartListAdapter{&sourcev1.HelmChartList{}},
- }.run,
+ RunE: func(cmd *cobra.Command, args []string) error {
+ get := getCommand{
+ apiType: helmChartType,
+ list: &helmChartListAdapter{&sourcev1.HelmChartList{}},
+ funcMap: make(typeMap),
+ }
+
+ err := get.funcMap.registerCommand(get.apiType.kind, func(obj runtime.Object) (summarisable, error) {
+ o, ok := obj.(*sourcev1.HelmChart)
+ if !ok {
+ return nil, fmt.Errorf("Impossible to cast type %#v chart", obj)
+ }
+
+ sink := &helmChartListAdapter{&sourcev1.HelmChartList{
+ Items: []sourcev1.HelmChart{
+ *o,
+ }}}
+ return sink, nil
+ })
+
+ if err != nil {
+ return err
+ }
+
+ if err := get.run(cmd, args); err != nil {
+ return err
+ }
+
+ return nil
+ },
}
func init() {
diff --git a/cmd/flux/get_source_git.go b/cmd/flux/get_source_git.go
index c236680687c1fbbe23c46f7bf873d82e9a5f4459..75639903ef020775da17753386da9a98c4b34376 100644
--- a/cmd/flux/get_source_git.go
+++ b/cmd/flux/get_source_git.go
@@ -17,10 +17,12 @@ limitations under the License.
package main
import (
+ "fmt"
"strconv"
"strings"
"github.com/spf13/cobra"
+ "k8s.io/apimachinery/pkg/runtime"
sourcev1 "github.com/fluxcd/source-controller/api/v1beta1"
)
@@ -34,10 +36,36 @@ var getSourceGitCmd = &cobra.Command{
# List Git repositories from all namespaces
flux get sources git --all-namespaces`,
- RunE: getCommand{
- apiType: gitRepositoryType,
- list: &gitRepositoryListAdapter{&sourcev1.GitRepositoryList{}},
- }.run,
+ RunE: func(cmd *cobra.Command, args []string) error {
+ get := getCommand{
+ apiType: gitRepositoryType,
+ list: &gitRepositoryListAdapter{&sourcev1.GitRepositoryList{}},
+ funcMap: make(typeMap),
+ }
+
+ err := get.funcMap.registerCommand(get.apiType.kind, func(obj runtime.Object) (summarisable, error) {
+ o, ok := obj.(*sourcev1.GitRepository)
+ if !ok {
+ return nil, fmt.Errorf("Impossible to cast type %#v git", obj)
+ }
+
+ sink := &gitRepositoryListAdapter{&sourcev1.GitRepositoryList{
+ Items: []sourcev1.GitRepository{
+ *o,
+ }}}
+ return sink, nil
+ })
+
+ if err != nil {
+ return err
+ }
+
+ if err := get.run(cmd, args); err != nil {
+ return err
+ }
+
+ return nil
+ },
}
func init() {
diff --git a/cmd/flux/get_source_helm.go b/cmd/flux/get_source_helm.go
index 9bbb8522b89a1132fdfcf2099f0806b2c9b13107..e0d0bb4d437a9dd646ae824b3b81f488bd62a322 100644
--- a/cmd/flux/get_source_helm.go
+++ b/cmd/flux/get_source_helm.go
@@ -17,10 +17,12 @@ limitations under the License.
package main
import (
+ "fmt"
"strconv"
"strings"
"github.com/spf13/cobra"
+ "k8s.io/apimachinery/pkg/runtime"
sourcev1 "github.com/fluxcd/source-controller/api/v1beta1"
)
@@ -34,10 +36,36 @@ var getSourceHelmCmd = &cobra.Command{
# List Helm repositories from all namespaces
flux get sources helm --all-namespaces`,
- RunE: getCommand{
- apiType: helmRepositoryType,
- list: &helmRepositoryListAdapter{&sourcev1.HelmRepositoryList{}},
- }.run,
+ RunE: func(cmd *cobra.Command, args []string) error {
+ get := getCommand{
+ apiType: helmRepositoryType,
+ list: &helmRepositoryListAdapter{&sourcev1.HelmRepositoryList{}},
+ funcMap: make(typeMap),
+ }
+
+ err := get.funcMap.registerCommand(get.apiType.kind, func(obj runtime.Object) (summarisable, error) {
+ o, ok := obj.(*sourcev1.HelmRepository)
+ if !ok {
+ return nil, fmt.Errorf("Impossible to cast type %#v helm", obj)
+ }
+
+ sink := &helmRepositoryListAdapter{&sourcev1.HelmRepositoryList{
+ Items: []sourcev1.HelmRepository{
+ *o,
+ }}}
+ return sink, nil
+ })
+
+ if err != nil {
+ return err
+ }
+
+ if err := get.run(cmd, args); err != nil {
+ return err
+ }
+
+ return nil
+ },
}
func init() {
diff --git a/cmd/flux/main_test.go b/cmd/flux/main_test.go
index ee0c676d736e294725181434f5029195b706b568..832fb84b95e1173d769d3ae156ba9957d8bf2603 100644
--- a/cmd/flux/main_test.go
+++ b/cmd/flux/main_test.go
@@ -50,10 +50,10 @@ func readYamlObjects(objectFile string) ([]client.Object, error) {
// A KubeManager that can create objects that are subject to a test.
type fakeKubeManager struct {
- fakeClient client.Client
+ fakeClient client.WithWatch
}
-func (m *fakeKubeManager) NewClient(kubeconfig string, kubecontext string) (client.Client, error) {
+func (m *fakeKubeManager) NewClient(kubeconfig string, kubecontext string) (client.WithWatch, error) {
return m.fakeClient, nil
}
diff --git a/go.sum b/go.sum
index f24b4a0c919389df406a4db40818b92805e6b6d1..994c9974725be295cadbc443c5ef9b100d6014a0 100644
--- a/go.sum
+++ b/go.sum
@@ -336,6 +336,7 @@ github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4er
github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e h1:1r7pUrabqp18hOBcwBwiTsbnFeTZHV9eER/QT5JVZxY=
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
@@ -398,6 +399,7 @@ github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3
github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.2.0 h1:qJYtXnJRWmpe7m/3XlyhrsLrEURqHRM2kxzoxXqyUDs=
github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
@@ -449,6 +451,7 @@ github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA
github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
github.com/hashicorp/golang-lru v0.5.3/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
+github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc=
github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64=
diff --git a/internal/utils/utils.go b/internal/utils/utils.go
index b6e1ec9024abc11660c992b451175379f6e12880..db323b4c90a48001d883e144be90522b73fce110 100644
--- a/internal/utils/utils.go
+++ b/internal/utils/utils.go
@@ -134,7 +134,7 @@ func KubeConfig(kubeConfigPath string, kubeContext string) (*rest.Config, error)
// KubeManger creates a Kubernetes client.Client. This interface exists to
// facilitate unit testing and provide a fake client.
type KubeManager interface {
- NewClient(string, string) (client.Client, error)
+ NewClient(string, string) (client.WithWatch, error)
}
type defaultKubeManager struct{}
@@ -144,14 +144,14 @@ func DefaultKubeManager() KubeManager {
return manager
}
-func (m defaultKubeManager) NewClient(kubeConfigPath string, kubeContext string) (client.Client, error) {
+func (m defaultKubeManager) NewClient(kubeConfigPath string, kubeContext string) (client.WithWatch, error) {
cfg, err := KubeConfig(kubeConfigPath, kubeContext)
if err != nil {
return nil, fmt.Errorf("kubernetes client initialization failed: %w", err)
}
scheme := NewScheme()
- kubeClient, err := client.New(cfg, client.Options{
+ kubeClient, err := client.NewWithWatch(cfg, client.Options{
Scheme: scheme,
})
if err != nil {
@@ -179,7 +179,7 @@ func NewScheme() *apiruntime.Scheme {
return scheme
}
-func KubeClient(kubeConfigPath string, kubeContext string) (client.Client, error) {
+func KubeClient(kubeConfigPath string, kubeContext string) (client.WithWatch, error) {
m := DefaultKubeManager()
kubeClient, err := m.NewClient(kubeConfigPath, kubeContext)
return kubeClient, err