From 6baefa258633f0d2550a969bec6b34ecc106d0e1 Mon Sep 17 00:00:00 2001 From: Stefan Prodan Date: Mon, 6 May 2024 12:50:22 +0300 Subject: [PATCH] Mark `source helm` commands as GA Signed-off-by: Stefan Prodan --- cmd/flux/create_secret_helm.go | 2 +- cmd/flux/create_source_helm.go | 6 +++--- cmd/flux/delete_source_helm.go | 2 +- cmd/flux/export_source_helm.go | 2 +- cmd/flux/get_source_chart.go | 2 +- cmd/flux/get_source_helm.go | 2 +- cmd/flux/reconcile_helmrelease.go | 2 +- cmd/flux/reconcile_with_source.go | 3 ++- cmd/flux/stats.go | 12 ++++++------ 9 files changed, 17 insertions(+), 16 deletions(-) diff --git a/cmd/flux/create_secret_helm.go b/cmd/flux/create_secret_helm.go index bca4b5fd..2a809366 100644 --- a/cmd/flux/create_secret_helm.go +++ b/cmd/flux/create_secret_helm.go @@ -32,7 +32,7 @@ import ( var createSecretHelmCmd = &cobra.Command{ Use: "helm [name]", Short: "Create or update a Kubernetes secret for Helm repository authentication", - Long: withPreviewNote(`The create secret helm command generates a Kubernetes secret with basic authentication credentials.`), + Long: `The create secret helm command generates a Kubernetes secret with basic authentication credentials.`, Example: ` # Create a Helm authentication secret on disk and encrypt it with Mozilla SOPS flux create secret helm repo-auth \ --namespace=my-namespace \ diff --git a/cmd/flux/create_source_helm.go b/cmd/flux/create_source_helm.go index b4f61309..d299c43b 100644 --- a/cmd/flux/create_source_helm.go +++ b/cmd/flux/create_source_helm.go @@ -22,7 +22,6 @@ import ( "net/url" "os" - "github.com/fluxcd/pkg/apis/meta" "github.com/spf13/cobra" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" @@ -32,6 +31,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/yaml" + "github.com/fluxcd/pkg/apis/meta" sourcev1 "github.com/fluxcd/source-controller/api/v1" "github.com/fluxcd/flux2/v2/internal/utils" @@ -41,8 +41,8 @@ import ( var createSourceHelmCmd = &cobra.Command{ Use: "helm [name]", Short: "Create or update a HelmRepository source", - Long: withPreviewNote(`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.`), + Long: `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 for an HTTPS public Helm repository flux create source helm podinfo \ --url=https://stefanprodan.github.io/podinfo \ diff --git a/cmd/flux/delete_source_helm.go b/cmd/flux/delete_source_helm.go index bd057e8a..a5956d87 100644 --- a/cmd/flux/delete_source_helm.go +++ b/cmd/flux/delete_source_helm.go @@ -25,7 +25,7 @@ import ( var deleteSourceHelmCmd = &cobra.Command{ Use: "helm [name]", Short: "Delete a HelmRepository source", - Long: withPreviewNote("The delete source helm command deletes the given HelmRepository from the cluster."), + Long: "The delete source helm command deletes the given HelmRepository from the cluster.", Example: ` # Delete a Helm repository flux delete source helm podinfo`, ValidArgsFunction: resourceNamesCompletionFunc(sourcev1.GroupVersion.WithKind(sourcev1.HelmRepositoryKind)), diff --git a/cmd/flux/export_source_helm.go b/cmd/flux/export_source_helm.go index f15d7b54..2c8da3a1 100644 --- a/cmd/flux/export_source_helm.go +++ b/cmd/flux/export_source_helm.go @@ -27,7 +27,7 @@ import ( var exportSourceHelmCmd = &cobra.Command{ Use: "helm [name]", Short: "Export HelmRepository sources in YAML format", - Long: withPreviewNote("The export source git command exports one or all HelmRepository sources in YAML format."), + Long: "The export source git command exports one or all HelmRepository sources in YAML format.", Example: ` # Export all HelmRepository sources flux export source helm --all > sources.yaml diff --git a/cmd/flux/get_source_chart.go b/cmd/flux/get_source_chart.go index c4a455ef..4f078453 100644 --- a/cmd/flux/get_source_chart.go +++ b/cmd/flux/get_source_chart.go @@ -33,7 +33,7 @@ import ( var getSourceHelmChartCmd = &cobra.Command{ Use: "chart", Short: "Get HelmChart statuses", - Long: withPreviewNote("The get sources chart command prints the status of the HelmCharts."), + Long: "The get sources chart command prints the status of the HelmCharts.", Example: ` # List all Helm charts and their status flux get sources chart diff --git a/cmd/flux/get_source_helm.go b/cmd/flux/get_source_helm.go index 913276be..eef666d4 100644 --- a/cmd/flux/get_source_helm.go +++ b/cmd/flux/get_source_helm.go @@ -34,7 +34,7 @@ import ( var getSourceHelmCmd = &cobra.Command{ Use: "helm", Short: "Get HelmRepository source statuses", - Long: withPreviewNote("The get sources helm command prints the status of the HelmRepository sources."), + Long: "The get sources helm command prints the status of the HelmRepository sources.", Example: ` # List all Helm repositories and their status flux get sources helm diff --git a/cmd/flux/reconcile_helmrelease.go b/cmd/flux/reconcile_helmrelease.go index 7d4449e9..2d5586c2 100644 --- a/cmd/flux/reconcile_helmrelease.go +++ b/cmd/flux/reconcile_helmrelease.go @@ -19,11 +19,11 @@ package main import ( "fmt" - sourcev1 "github.com/fluxcd/source-controller/api/v1" "github.com/spf13/cobra" "k8s.io/apimachinery/pkg/types" helmv2 "github.com/fluxcd/helm-controller/api/v2beta2" + sourcev1 "github.com/fluxcd/source-controller/api/v1" ) var reconcileHrCmd = &cobra.Command{ diff --git a/cmd/flux/reconcile_with_source.go b/cmd/flux/reconcile_with_source.go index ac0a6f15..92d5b445 100644 --- a/cmd/flux/reconcile_with_source.go +++ b/cmd/flux/reconcile_with_source.go @@ -10,8 +10,9 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/wait" - "github.com/fluxcd/flux2/v2/internal/utils" "github.com/fluxcd/pkg/apis/meta" + + "github.com/fluxcd/flux2/v2/internal/utils" ) type reconcileWithSource interface { diff --git a/cmd/flux/stats.go b/cmd/flux/stats.go index fbb9a66f..caa24337 100644 --- a/cmd/flux/stats.go +++ b/cmd/flux/stats.go @@ -87,14 +87,14 @@ func runStatsCmd(cmd *cobra.Command, args []string) error { Group: sourcev1b2.GroupVersion.Group, }, { - Kind: sourcev1b2.HelmRepositoryKind, - Version: sourcev1b2.GroupVersion.Version, - Group: sourcev1b2.GroupVersion.Group, + Kind: sourcev1.HelmRepositoryKind, + Version: sourcev1.GroupVersion.Version, + Group: sourcev1.GroupVersion.Group, }, { - Kind: sourcev1b2.HelmChartKind, - Version: sourcev1b2.GroupVersion.Version, - Group: sourcev1b2.GroupVersion.Group, + Kind: sourcev1.HelmChartKind, + Version: sourcev1.GroupVersion.Version, + Group: sourcev1.GroupVersion.Group, }, { Kind: sourcev1b2.BucketKind,