diff --git a/cmd/gotk/create.go b/cmd/gotk/create.go
index e36b51db450b42f6d3f6a9df6932174c630d4fab..0afef7e57c0da89559d67dc7623a896cdbf9bce3 100644
--- a/cmd/gotk/create.go
+++ b/cmd/gotk/create.go
@@ -17,6 +17,8 @@ limitations under the License.
package main
import (
+ "fmt"
+ "strings"
"time"
"github.com/spf13/cobra"
@@ -31,10 +33,26 @@ var createCmd = &cobra.Command{
var (
interval time.Duration
export bool
+ labels []string
)
func init() {
createCmd.PersistentFlags().DurationVarP(&interval, "interval", "", time.Minute, "source sync interval")
createCmd.PersistentFlags().BoolVar(&export, "export", false, "export in YAML format to stdout")
+ createCmd.PersistentFlags().StringSliceVar(&labels, "label", nil,
+ "set labels on the resource (can specify multiple labels with commas: label1=value1,label2=value2)")
rootCmd.AddCommand(createCmd)
}
+
+func parseLabels() (map[string]string, error) {
+ result := make(map[string]string)
+ for _, label := range labels {
+ parts := strings.Split(label, "=")
+ if len(parts) != 2 {
+ return nil, fmt.Errorf("invalid label format '%s', must be key=value", label)
+ }
+ result[parts[0]] = parts[1]
+ }
+
+ return result, nil
+}
diff --git a/cmd/gotk/create_helmrelease.go b/cmd/gotk/create_helmrelease.go
index 6012089073dcdd68b402c651571b7fc4cb4670a8..562b611564d858992b4d1db2b9ffc168182ac75e 100644
--- a/cmd/gotk/create_helmrelease.go
+++ b/cmd/gotk/create_helmrelease.go
@@ -126,10 +126,7 @@ func createHelmReleaseCmdRun(cmd *cobra.Command, args []string) error {
return fmt.Errorf("chart name or path is required")
}
- ctx, cancel := context.WithTimeout(context.Background(), timeout)
- defer cancel()
-
- kubeClient, err := utils.kubeClient(kubeconfig)
+ sourceLabels, err := parseLabels()
if err != nil {
return err
}
@@ -142,6 +139,7 @@ func createHelmReleaseCmdRun(cmd *cobra.Command, args []string) error {
ObjectMeta: metav1.ObjectMeta{
Name: name,
Namespace: namespace,
+ Labels: sourceLabels,
},
Spec: helmv2.HelmReleaseSpec{
ReleaseName: hrName,
@@ -182,6 +180,14 @@ func createHelmReleaseCmdRun(cmd *cobra.Command, args []string) error {
return exportHelmRelease(helmRelease)
}
+ ctx, cancel := context.WithTimeout(context.Background(), timeout)
+ defer cancel()
+
+ kubeClient, err := utils.kubeClient(kubeconfig)
+ if err != nil {
+ return err
+ }
+
logger.Actionf("applying release")
if err := upsertHelmRelease(ctx, kubeClient, helmRelease); err != nil {
return err
@@ -238,6 +244,7 @@ func upsertHelmRelease(ctx context.Context, kubeClient client.Client, helmReleas
return err
}
+ existing.Labels = helmRelease.Labels
existing.Spec = helmRelease.Spec
if err := kubeClient.Update(ctx, &existing); err != nil {
return err
diff --git a/cmd/gotk/create_kustomization.go b/cmd/gotk/create_kustomization.go
index d2eb02cb8966d14da11158a186f1d73d2c4b7ee3..2ef858fa78f849f5bf34e3990bb7c3ab9481cfd8 100644
--- a/cmd/gotk/create_kustomization.go
+++ b/cmd/gotk/create_kustomization.go
@@ -121,10 +121,16 @@ func createKsCmdRun(cmd *cobra.Command, args []string) error {
logger.Generatef("generating kustomization")
}
+ ksLabels, err := parseLabels()
+ if err != nil {
+ return err
+ }
+
kustomization := kustomizev1.Kustomization{
ObjectMeta: metav1.ObjectMeta{
Name: name,
Namespace: namespace,
+ Labels: ksLabels,
},
Spec: kustomizev1.KustomizationSpec{
DependsOn: ksDependsOn,
@@ -260,6 +266,7 @@ func upsertKustomization(ctx context.Context, kubeClient client.Client, kustomiz
return err
}
+ existing.Labels = kustomization.Labels
existing.Spec = kustomization.Spec
if err := kubeClient.Update(ctx, &existing); err != nil {
return err
diff --git a/cmd/gotk/create_source_git.go b/cmd/gotk/create_source_git.go
index bb08e2043b0bd32d516ef151f5891ffe83793de0..7db210fe5653c9d0203a73a8f99980ab331d4755 100644
--- a/cmd/gotk/create_source_git.go
+++ b/cmd/gotk/create_source_git.go
@@ -129,10 +129,16 @@ func createSourceGitCmdRun(cmd *cobra.Command, args []string) error {
return fmt.Errorf("git URL parse failed: %w", err)
}
+ sourceLabels, err := parseLabels()
+ if err != nil {
+ return err
+ }
+
gitRepository := sourcev1.GitRepository{
ObjectMeta: metav1.ObjectMeta{
Name: name,
Namespace: namespace,
+ Labels: sourceLabels,
},
Spec: sourcev1.GitRepositorySpec{
URL: sourceGitURL,
@@ -343,6 +349,7 @@ func upsertGitRepository(ctx context.Context, kubeClient client.Client, gitRepos
return err
}
+ existing.Labels = gitRepository.Labels
existing.Spec = gitRepository.Spec
if err := kubeClient.Update(ctx, &existing); err != nil {
return err
diff --git a/cmd/gotk/create_source_helm.go b/cmd/gotk/create_source_helm.go
index 4bbfbe720340861e9a4ab8b3bbcb34589205f9cf..2c4bbfd3e39c7b14dc12c01d030f0b27d5683c9e 100644
--- a/cmd/gotk/create_source_helm.go
+++ b/cmd/gotk/create_source_helm.go
@@ -19,18 +19,19 @@ package main
import (
"context"
"fmt"
- sourcev1 "github.com/fluxcd/source-controller/api/v1alpha1"
- "github.com/spf13/cobra"
"io/ioutil"
+ "net/url"
+ "os"
+
+ "github.com/spf13/cobra"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/wait"
- "net/url"
- "os"
"sigs.k8s.io/controller-runtime/pkg/client"
- "sigs.k8s.io/yaml"
+
+ sourcev1 "github.com/fluxcd/source-controller/api/v1alpha1"
)
var createSourceHelmCmd = &cobra.Command{
@@ -91,6 +92,11 @@ func createSourceHelmCmdRun(cmd *cobra.Command, args []string) error {
return fmt.Errorf("url is required")
}
+ sourceLabels, err := parseLabels()
+ if err != nil {
+ return err
+ }
+
tmpDir, err := ioutil.TempDir("", name)
if err != nil {
return err
@@ -105,6 +111,7 @@ func createSourceHelmCmdRun(cmd *cobra.Command, args []string) error {
ObjectMeta: metav1.ObjectMeta{
Name: name,
Namespace: namespace,
+ Labels: sourceLabels,
},
Spec: sourcev1.HelmRepositorySpec{
URL: sourceHelmURL,
@@ -225,6 +232,7 @@ func upsertHelmRepository(ctx context.Context, kubeClient client.Client, helmRep
return err
}
+ existing.Labels = helmRepository.Labels
existing.Spec = helmRepository.Spec
if err := kubeClient.Update(ctx, &existing); err != nil {
return err
@@ -233,27 +241,3 @@ func upsertHelmRepository(ctx context.Context, kubeClient client.Client, helmRep
logger.Successf("source updated")
return nil
}
-
-func exportHelmRepository(source sourcev1.HelmRepository) error {
- gvk := sourcev1.GroupVersion.WithKind(sourcev1.HelmRepositoryKind)
- export := sourcev1.HelmRepository{
- TypeMeta: metav1.TypeMeta{
- Kind: gvk.Kind,
- APIVersion: gvk.GroupVersion().String(),
- },
- ObjectMeta: metav1.ObjectMeta{
- Name: source.Name,
- Namespace: source.Namespace,
- },
- Spec: source.Spec,
- }
-
- data, err := yaml.Marshal(export)
- if err != nil {
- return err
- }
-
- fmt.Println("---")
- fmt.Println(string(data))
- return nil
-}
diff --git a/cmd/gotk/export_helmrelease.go b/cmd/gotk/export_helmrelease.go
index 6a5fdcdc560951afb213cf787d206847748d0c8b..583c271987dec29d59ea391b33b0702ec30f17b8 100644
--- a/cmd/gotk/export_helmrelease.go
+++ b/cmd/gotk/export_helmrelease.go
@@ -68,7 +68,7 @@ func exportHelmReleaseCmdRun(cmd *cobra.Command, args []string) error {
}
if len(list.Items) == 0 {
- logger.Failuref("no kustomizations found in %s namespace", namespace)
+ logger.Failuref("no helmrelease found in %s namespace", namespace)
return nil
}
@@ -101,8 +101,10 @@ func exportHelmRelease(helmRelease helmv2.HelmRelease) error {
APIVersion: gvk.GroupVersion().String(),
},
ObjectMeta: metav1.ObjectMeta{
- Name: helmRelease.Name,
- Namespace: helmRelease.Namespace,
+ Name: helmRelease.Name,
+ Namespace: helmRelease.Namespace,
+ Labels: helmRelease.Labels,
+ Annotations: helmRelease.Annotations,
},
Spec: helmRelease.Spec,
}
diff --git a/cmd/gotk/export_kustomization.go b/cmd/gotk/export_kustomization.go
index 205a4757d394fd39af0a677e7199cb6eb948c5c8..b3adcf6c21439d322a598ae6ead65d97d205b7fc 100644
--- a/cmd/gotk/export_kustomization.go
+++ b/cmd/gotk/export_kustomization.go
@@ -20,12 +20,13 @@ import (
"context"
"fmt"
- kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1alpha1"
"github.com/spf13/cobra"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/yaml"
+
+ kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1alpha1"
)
var exportKsCmd = &cobra.Command{
@@ -100,8 +101,10 @@ func exportKs(kustomization kustomizev1.Kustomization) error {
APIVersion: gvk.GroupVersion().String(),
},
ObjectMeta: metav1.ObjectMeta{
- Name: kustomization.Name,
- Namespace: kustomization.Namespace,
+ Name: kustomization.Name,
+ Namespace: kustomization.Namespace,
+ Labels: kustomization.Labels,
+ Annotations: kustomization.Annotations,
},
Spec: kustomization.Spec,
}
diff --git a/cmd/gotk/export_source_git.go b/cmd/gotk/export_source_git.go
index 7b08ac40c5503ef68e9f7b5acad44233615cf37e..01af0602c5c2a440bfdd62960450f79814bd4951 100644
--- a/cmd/gotk/export_source_git.go
+++ b/cmd/gotk/export_source_git.go
@@ -20,13 +20,14 @@ import (
"context"
"fmt"
- sourcev1 "github.com/fluxcd/source-controller/api/v1alpha1"
"github.com/spf13/cobra"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/yaml"
+
+ sourcev1 "github.com/fluxcd/source-controller/api/v1alpha1"
)
var exportSourceGitCmd = &cobra.Command{
@@ -110,8 +111,10 @@ func exportGit(source sourcev1.GitRepository) error {
APIVersion: gvk.GroupVersion().String(),
},
ObjectMeta: metav1.ObjectMeta{
- Name: source.Name,
- Namespace: source.Namespace,
+ Name: source.Name,
+ Namespace: source.Namespace,
+ Labels: source.Labels,
+ Annotations: source.Annotations,
},
Spec: source.Spec,
}
diff --git a/cmd/gotk/export_source_helm.go b/cmd/gotk/export_source_helm.go
index 7d2b34893c6c315490c792e72c3c6126a523bc8a..80dd67000553698a8b2ea2cd6daeb66cd283e885 100644
--- a/cmd/gotk/export_source_helm.go
+++ b/cmd/gotk/export_source_helm.go
@@ -20,13 +20,14 @@ import (
"context"
"fmt"
- sourcev1 "github.com/fluxcd/source-controller/api/v1alpha1"
"github.com/spf13/cobra"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/yaml"
+
+ sourcev1 "github.com/fluxcd/source-controller/api/v1alpha1"
)
var exportSourceHelmCmd = &cobra.Command{
@@ -102,6 +103,32 @@ func exportSourceHelmCmdRun(cmd *cobra.Command, args []string) error {
return nil
}
+func exportHelmRepository(source sourcev1.HelmRepository) error {
+ gvk := sourcev1.GroupVersion.WithKind(sourcev1.HelmRepositoryKind)
+ export := sourcev1.HelmRepository{
+ TypeMeta: metav1.TypeMeta{
+ Kind: gvk.Kind,
+ APIVersion: gvk.GroupVersion().String(),
+ },
+ ObjectMeta: metav1.ObjectMeta{
+ Name: source.Name,
+ Namespace: source.Namespace,
+ Labels: source.Labels,
+ Annotations: source.Annotations,
+ },
+ Spec: source.Spec,
+ }
+
+ data, err := yaml.Marshal(export)
+ if err != nil {
+ return err
+ }
+
+ fmt.Println("---")
+ fmt.Println(string(data))
+ return nil
+}
+
func exportHelmCredentials(ctx context.Context, kubeClient client.Client, source sourcev1.HelmRepository) error {
if source.Spec.SecretRef != nil {
namespacedName := types.NamespacedName{
diff --git a/docs/cmd/gotk_create.md b/docs/cmd/gotk_create.md
index c626eb4ed6c7d9d73a06b5e4cc0a3ed37358e50c..f16fe7d02d45929a244cc2efbbe8092297d88e2d 100644
--- a/docs/cmd/gotk_create.md
+++ b/docs/cmd/gotk_create.md
@@ -12,6 +12,7 @@ The create sub-commands generate sources and resources.
--export export in YAML format to stdout
-h, --help help for create
--interval duration source sync interval (default 1m0s)
+ --label strings set labels on the resource (can specify multiple labels with commas: label1=value1,label2=value2)
```
### Options inherited from parent commands
diff --git a/docs/cmd/gotk_create_helmrelease.md b/docs/cmd/gotk_create_helmrelease.md
index 6d70401ec28b84316705a00976a1c4c51f94ad93..d0115542f83acb7853b56c366a0733c2d2bd5cfe 100644
--- a/docs/cmd/gotk_create_helmrelease.md
+++ b/docs/cmd/gotk_create_helmrelease.md
@@ -72,6 +72,7 @@ gotk create helmrelease [name] [flags]
--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)
--namespace string the namespace scope for this operation (default "gitops-system")
--timeout duration timeout for this operation (default 5m0s)
--verbose print generated objects
diff --git a/docs/cmd/gotk_create_kustomization.md b/docs/cmd/gotk_create_kustomization.md
index 78893d7104460acbcbd71ab7d71d49121065e203..e87a9311fa89813d3d23e0aa5c77774642aad224 100644
--- a/docs/cmd/gotk_create_kustomization.md
+++ b/docs/cmd/gotk_create_kustomization.md
@@ -68,6 +68,7 @@ gotk create kustomization [name] [flags]
--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)
--namespace string the namespace scope for this operation (default "gitops-system")
--timeout duration timeout for this operation (default 5m0s)
--verbose print generated objects
diff --git a/docs/cmd/gotk_create_source.md b/docs/cmd/gotk_create_source.md
index d64c16b3b2650b6823a4fa4ce86502f8d2a5c7d5..3cc93193c6ce0a0bac6f6fe723633283c27a93a7 100644
--- a/docs/cmd/gotk_create_source.md
+++ b/docs/cmd/gotk_create_source.md
@@ -18,6 +18,7 @@ The create source sub-commands generate sources.
--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)
--namespace string the namespace scope for this operation (default "gitops-system")
--timeout duration timeout for this operation (default 5m0s)
--verbose print generated objects
diff --git a/docs/cmd/gotk_create_source_git.md b/docs/cmd/gotk_create_source_git.md
index cebd3d38c0737871a6df0312a70e91803f434dc3..bdf6f9be624269d535127a9db9bf938bf25130a8 100644
--- a/docs/cmd/gotk_create_source_git.md
+++ b/docs/cmd/gotk_create_source_git.md
@@ -73,6 +73,7 @@ gotk create source git [name] [flags]
--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)
--namespace string the namespace scope for this operation (default "gitops-system")
--timeout duration timeout for this operation (default 5m0s)
--verbose print generated objects
diff --git a/docs/cmd/gotk_create_source_helm.md b/docs/cmd/gotk_create_source_helm.md
index ebe2d17bdc840f4ce43ad7d1f159b9219f5495f4..5c9a3bbbb1ee4aa050ad49e9cbc56b83fb67b851 100644
--- a/docs/cmd/gotk_create_source_helm.md
+++ b/docs/cmd/gotk_create_source_helm.md
@@ -53,6 +53,7 @@ gotk create source helm [name] [flags]
--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)
--namespace string the namespace scope for this operation (default "gitops-system")
--timeout duration timeout for this operation (default 5m0s)
--verbose print generated objects