diff --git a/cmd/gotk/reconcile_helmrelease.go b/cmd/gotk/reconcile_helmrelease.go index 7d733eb0..5bce49bf 100644 --- a/cmd/gotk/reconcile_helmrelease.go +++ b/cmd/gotk/reconcile_helmrelease.go @@ -21,7 +21,6 @@ import ( "fmt" "time" - sourcev1 "github.com/fluxcd/source-controller/api/v1alpha1" "github.com/spf13/cobra" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" @@ -29,6 +28,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" helmv2 "github.com/fluxcd/helm-controller/api/v2alpha1" + consts "github.com/fluxcd/pkg/runtime" + sourcev1 "github.com/fluxcd/source-controller/api/v1alpha1" ) var reconcileHrCmd = &cobra.Command{ @@ -95,10 +96,10 @@ func reconcileHrCmdRun(cmd *cobra.Command, args []string) error { logger.Actionf("annotating HelmRelease %s in %s namespace", name, namespace) if helmRelease.Annotations == nil { helmRelease.Annotations = map[string]string{ - helmv2.ReconcileAtAnnotation: time.Now().Format(time.RFC3339Nano), + consts.ReconcileAtAnnotation: time.Now().Format(time.RFC3339Nano), } } else { - helmRelease.Annotations[helmv2.ReconcileAtAnnotation] = time.Now().Format(time.RFC3339Nano) + helmRelease.Annotations[consts.ReconcileAtAnnotation] = time.Now().Format(time.RFC3339Nano) } if err := kubeClient.Update(ctx, &helmRelease); err != nil { return err diff --git a/cmd/gotk/reconcile_kustomization.go b/cmd/gotk/reconcile_kustomization.go index 8d6ab920..3dd5aa9b 100644 --- a/cmd/gotk/reconcile_kustomization.go +++ b/cmd/gotk/reconcile_kustomization.go @@ -21,10 +21,12 @@ import ( "fmt" "time" - kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1alpha1" "github.com/spf13/cobra" "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/wait" + + kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1alpha1" + consts "github.com/fluxcd/pkg/runtime" ) var reconcileKsCmd = &cobra.Command{ @@ -86,10 +88,10 @@ func reconcileKsCmdRun(cmd *cobra.Command, args []string) error { logger.Actionf("annotating kustomization %s in %s namespace", name, namespace) if kustomization.Annotations == nil { kustomization.Annotations = map[string]string{ - kustomizev1.ReconcileAtAnnotation: time.Now().Format(time.RFC3339Nano), + consts.ReconcileAtAnnotation: time.Now().Format(time.RFC3339Nano), } } else { - kustomization.Annotations[kustomizev1.ReconcileAtAnnotation] = time.Now().Format(time.RFC3339Nano) + kustomization.Annotations[consts.ReconcileAtAnnotation] = time.Now().Format(time.RFC3339Nano) } if err := kubeClient.Update(ctx, &kustomization); err != nil { return err diff --git a/cmd/gotk/reconcile_source_git.go b/cmd/gotk/reconcile_source_git.go index 04739f4d..934c6e1c 100644 --- a/cmd/gotk/reconcile_source_git.go +++ b/cmd/gotk/reconcile_source_git.go @@ -19,11 +19,15 @@ package main import ( "context" "fmt" - sourcev1 "github.com/fluxcd/source-controller/api/v1alpha1" + + "time" + "github.com/spf13/cobra" "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/wait" - "time" + + consts "github.com/fluxcd/pkg/runtime" + sourcev1 "github.com/fluxcd/source-controller/api/v1alpha1" ) var reconcileSourceGitCmd = &cobra.Command{ @@ -68,10 +72,10 @@ func syncSourceGitCmdRun(cmd *cobra.Command, args []string) error { if gitRepository.Annotations == nil { gitRepository.Annotations = map[string]string{ - sourcev1.ReconcileAtAnnotation: time.Now().Format(time.RFC3339Nano), + consts.ReconcileAtAnnotation: time.Now().Format(time.RFC3339Nano), } } else { - gitRepository.Annotations[sourcev1.ReconcileAtAnnotation] = time.Now().Format(time.RFC3339Nano) + gitRepository.Annotations[consts.ReconcileAtAnnotation] = time.Now().Format(time.RFC3339Nano) } if err := kubeClient.Update(ctx, &gitRepository); err != nil { return err diff --git a/cmd/gotk/reconcile_source_helm.go b/cmd/gotk/reconcile_source_helm.go index 0a2afea7..510da6f8 100644 --- a/cmd/gotk/reconcile_source_helm.go +++ b/cmd/gotk/reconcile_source_helm.go @@ -27,6 +27,7 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "sigs.k8s.io/controller-runtime/pkg/client" + consts "github.com/fluxcd/pkg/runtime" sourcev1 "github.com/fluxcd/source-controller/api/v1alpha1" ) @@ -72,10 +73,10 @@ func syncSourceHelmCmdRun(cmd *cobra.Command, args []string) error { if helmRepository.Annotations == nil { helmRepository.Annotations = map[string]string{ - sourcev1.ReconcileAtAnnotation: time.Now().Format(time.RFC3339Nano), + consts.ReconcileAtAnnotation: time.Now().Format(time.RFC3339Nano), } } else { - helmRepository.Annotations[sourcev1.ReconcileAtAnnotation] = time.Now().Format(time.RFC3339Nano) + helmRepository.Annotations[consts.ReconcileAtAnnotation] = time.Now().Format(time.RFC3339Nano) } if err := kubeClient.Update(ctx, &helmRepository); err != nil { return err diff --git a/go.mod b/go.mod index f11a5317..8c8b34b3 100644 --- a/go.mod +++ b/go.mod @@ -4,12 +4,13 @@ go 1.14 require ( github.com/blang/semver v3.5.1+incompatible - github.com/fluxcd/helm-controller/api v0.0.7 - github.com/fluxcd/kustomize-controller/api v0.0.10 + github.com/fluxcd/helm-controller/api v0.0.8 + github.com/fluxcd/kustomize-controller/api v0.0.11 github.com/fluxcd/pkg/git v0.0.7 + github.com/fluxcd/pkg/runtime v0.0.1 github.com/fluxcd/pkg/ssh v0.0.5 github.com/fluxcd/pkg/untar v0.0.5 - github.com/fluxcd/source-controller/api v0.0.14 + github.com/fluxcd/source-controller/api v0.0.16 github.com/manifoldco/promptui v0.7.0 github.com/spf13/cobra v1.0.0 golang.org/x/net v0.0.0-20200602114024-627f9648deb9 // indirect diff --git a/go.sum b/go.sum index c32b053a..2fdcd32b 100644 --- a/go.sum +++ b/go.sum @@ -111,18 +111,20 @@ github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLi github.com/evanphx/json-patch v4.5.0+incompatible h1:ouOWdg56aJriqS0huScTkVXPC5IcNrDCXZ6OoTAWu7M= github.com/evanphx/json-patch v4.5.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= -github.com/fluxcd/helm-controller/api v0.0.7 h1:aidjXvcklClH8omhYqiKswZ+MS6t8knOpUacsuESue8= -github.com/fluxcd/helm-controller/api v0.0.7/go.mod h1:KlzwTkpphQxulgWBwCl/uxfBU0QxK/X+w4YcJqGy/1c= -github.com/fluxcd/kustomize-controller/api v0.0.10 h1:dhkTOg3LzNQwRL+lO0YlzOP7AhdpZdghUQNXYhvfiYU= -github.com/fluxcd/kustomize-controller/api v0.0.10/go.mod h1:88m3p6xY3J2pjh5OsL3ANy7PkyA93KiqAJE58JMQyoc= +github.com/fluxcd/helm-controller/api v0.0.8 h1:Pf+hZjsUpRmoQJeCe178bGWOOm2/Bvg8/s0aafRa1wQ= +github.com/fluxcd/helm-controller/api v0.0.8/go.mod h1:KlzwTkpphQxulgWBwCl/uxfBU0QxK/X+w4YcJqGy/1c= +github.com/fluxcd/kustomize-controller/api v0.0.11 h1:uFL0FT0AP+NmHR8upy+Y7AhBqcWQh2Lvp1F9FXL22iQ= +github.com/fluxcd/kustomize-controller/api v0.0.11/go.mod h1:88m3p6xY3J2pjh5OsL3ANy7PkyA93KiqAJE58JMQyoc= github.com/fluxcd/pkg/git v0.0.7 h1:tFSYPy7tcIYfOt8H5EUERXIRz7fk0id302oQZde1NtU= github.com/fluxcd/pkg/git v0.0.7/go.mod h1:5Vu92x6Q3CpxDUllmB69kAkVY5jAtPpXcY2TSZ/oCJI= +github.com/fluxcd/pkg/runtime v0.0.1 h1:h8jztHVF9UMGD7XBQSfXDdw80bpT6BOkd0xe4kknPL0= +github.com/fluxcd/pkg/runtime v0.0.1/go.mod h1:cU1t0+Ld39pZjMyrrHukw1E++OZFNHxG2qAExfDWQ34= github.com/fluxcd/pkg/ssh v0.0.5 h1:rnbFZ7voy2JBlUfMbfyqArX2FYaLNpDhccGFC3qW83A= github.com/fluxcd/pkg/ssh v0.0.5/go.mod h1:7jXPdXZpc0ttMNz2kD9QuMi3RNn/e0DOFbj0Tij/+Hs= github.com/fluxcd/pkg/untar v0.0.5 h1:UGI3Ch1UIEIaqQvMicmImL1s9npQa64DJ/ozqHKB7gk= github.com/fluxcd/pkg/untar v0.0.5/go.mod h1:O6V9+rtl8c1mHBafgqFlJN6zkF1HS5SSYn7RpQJ/nfw= -github.com/fluxcd/source-controller/api v0.0.14 h1:iNG6AGnr44z4T6F0JC2M82ekyxzJ29c3m+DVC7FwSHQ= -github.com/fluxcd/source-controller/api v0.0.14/go.mod h1:PUe+EYQ/s+KPnz2iOCgdf+L6clM0SWkyvdXIpbfpkQE= +github.com/fluxcd/source-controller/api v0.0.16 h1:Mk+X2H+5CX7vfmrVhGT/TR8EnZ8UmZ20TpPyP3e8ZBs= +github.com/fluxcd/source-controller/api v0.0.16/go.mod h1:PUe+EYQ/s+KPnz2iOCgdf+L6clM0SWkyvdXIpbfpkQE= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 h1:BHsljHzVlRcyQhjrss6TZTdY2VfCqZPbv5k3iBFa2ZQ= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= diff --git a/manifests/bases/helm-controller/kustomization.yaml b/manifests/bases/helm-controller/kustomization.yaml index fc628d8e..9434b86e 100644 --- a/manifests/bases/helm-controller/kustomization.yaml +++ b/manifests/bases/helm-controller/kustomization.yaml @@ -1,8 +1,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: -- github.com/fluxcd/helm-controller/config//crd?ref=v0.0.7 -- github.com/fluxcd/helm-controller/config//manager?ref=v0.0.7 +- github.com/fluxcd/helm-controller/config//crd?ref=v0.0.8 +- github.com/fluxcd/helm-controller/config//manager?ref=v0.0.8 patchesJson6902: - target: group: apps diff --git a/manifests/bases/kustomize-controller/kustomization.yaml b/manifests/bases/kustomize-controller/kustomization.yaml index 2d8515a9..834eec50 100644 --- a/manifests/bases/kustomize-controller/kustomization.yaml +++ b/manifests/bases/kustomize-controller/kustomization.yaml @@ -1,8 +1,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: -- github.com/fluxcd/kustomize-controller/config//crd?ref=v0.0.10 -- github.com/fluxcd/kustomize-controller/config//manager?ref=v0.0.10 +- github.com/fluxcd/kustomize-controller/config//crd?ref=v0.0.11 +- github.com/fluxcd/kustomize-controller/config//manager?ref=v0.0.11 patchesJson6902: - target: group: apps diff --git a/manifests/bases/notification-controller/kustomization.yaml b/manifests/bases/notification-controller/kustomization.yaml index ae9c1a72..c11b6bba 100644 --- a/manifests/bases/notification-controller/kustomization.yaml +++ b/manifests/bases/notification-controller/kustomization.yaml @@ -1,5 +1,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: -- github.com/fluxcd/notification-controller/config//crd?ref=v0.0.8 -- github.com/fluxcd/notification-controller/config//manager?ref=v0.0.8 +- github.com/fluxcd/notification-controller/config//crd?ref=v0.0.10 +- github.com/fluxcd/notification-controller/config//manager?ref=v0.0.10 diff --git a/manifests/bases/source-controller/kustomization.yaml b/manifests/bases/source-controller/kustomization.yaml index 6b0c53a1..48b8de29 100644 --- a/manifests/bases/source-controller/kustomization.yaml +++ b/manifests/bases/source-controller/kustomization.yaml @@ -1,8 +1,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: -- github.com/fluxcd/source-controller/config//crd?ref=v0.0.14 -- github.com/fluxcd/source-controller/config//manager?ref=v0.0.14 +- github.com/fluxcd/source-controller/config//crd?ref=v0.0.16 +- github.com/fluxcd/source-controller/config//manager?ref=v0.0.16 patchesJson6902: - target: group: apps