diff --git a/cmd/flux/create_alert.go b/cmd/flux/create_alert.go index fb3d234b..8dbeb807 100644 --- a/cmd/flux/create_alert.go +++ b/cmd/flux/create_alert.go @@ -20,11 +20,7 @@ import ( "context" "fmt" - "github.com/fluxcd/flux2/internal/utils" - "github.com/fluxcd/pkg/apis/meta" - "github.com/spf13/cobra" - corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" apimeta "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -33,6 +29,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" notificationv1 "github.com/fluxcd/notification-controller/api/v1beta1" + "github.com/fluxcd/pkg/apis/meta" + + "github.com/fluxcd/flux2/internal/utils" ) var createAlertCmd = &cobra.Command{ @@ -107,7 +106,7 @@ func createAlertCmdRun(cmd *cobra.Command, args []string) error { Labels: sourceLabels, }, Spec: notificationv1.AlertSpec{ - ProviderRef: corev1.LocalObjectReference{ + ProviderRef: meta.LocalObjectReference{ Name: alertArgs.providerRef, }, EventSeverity: alertArgs.eventSeverity, diff --git a/cmd/flux/create_alertprovider.go b/cmd/flux/create_alertprovider.go index d5b79d8c..dc7164cf 100644 --- a/cmd/flux/create_alertprovider.go +++ b/cmd/flux/create_alertprovider.go @@ -21,7 +21,6 @@ import ( "fmt" "github.com/spf13/cobra" - corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" apimeta "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -29,9 +28,10 @@ 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/flux2/internal/utils" ) var createAlertProviderCmd = &cobra.Command{ @@ -107,7 +107,7 @@ func createAlertProviderCmdRun(cmd *cobra.Command, args []string) error { } if alertProviderArgs.secretRef != "" { - provider.Spec.SecretRef = &corev1.LocalObjectReference{ + provider.Spec.SecretRef = &meta.LocalObjectReference{ Name: alertProviderArgs.secretRef, } } diff --git a/cmd/flux/create_image_policy.go b/cmd/flux/create_image_policy.go index 3262c1e9..a53ac319 100644 --- a/cmd/flux/create_image_policy.go +++ b/cmd/flux/create_image_policy.go @@ -20,9 +20,10 @@ import ( "fmt" "github.com/spf13/cobra" - corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "github.com/fluxcd/pkg/apis/meta" + imagev1 "github.com/fluxcd/image-reflector-controller/api/v1alpha1" ) @@ -82,7 +83,7 @@ func createImagePolicyRun(cmd *cobra.Command, args []string) error { Labels: labels, }, Spec: imagev1.ImagePolicySpec{ - ImageRepositoryRef: corev1.LocalObjectReference{ + ImageRepositoryRef: meta.LocalObjectReference{ Name: imagePolicyArgs.imageRef, }, }, diff --git a/cmd/flux/create_image_repository.go b/cmd/flux/create_image_repository.go index e82aeb49..d7f32cbd 100644 --- a/cmd/flux/create_image_repository.go +++ b/cmd/flux/create_image_repository.go @@ -22,9 +22,10 @@ import ( "github.com/google/go-containerregistry/pkg/name" "github.com/spf13/cobra" - corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "github.com/fluxcd/pkg/apis/meta" + imagev1 "github.com/fluxcd/image-reflector-controller/api/v1alpha1" ) @@ -89,7 +90,7 @@ func createImageRepositoryRun(cmd *cobra.Command, args []string) error { repo.Spec.Timeout = &metav1.Duration{Duration: imageRepoArgs.timeout} } if imageRepoArgs.secretRef != "" { - repo.Spec.SecretRef = &corev1.LocalObjectReference{ + repo.Spec.SecretRef = &meta.LocalObjectReference{ Name: imageRepoArgs.secretRef, } } diff --git a/cmd/flux/create_image_updateauto.go b/cmd/flux/create_image_updateauto.go index 871b64f2..83a2ec2f 100644 --- a/cmd/flux/create_image_updateauto.go +++ b/cmd/flux/create_image_updateauto.go @@ -20,9 +20,10 @@ import ( "fmt" "github.com/spf13/cobra" - corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "github.com/fluxcd/pkg/apis/meta" + autov1 "github.com/fluxcd/image-automation-controller/api/v1alpha1" ) @@ -85,15 +86,12 @@ func createImageUpdateRun(cmd *cobra.Command, args []string) error { }, Spec: autov1.ImageUpdateAutomationSpec{ Checkout: autov1.GitCheckoutSpec{ - GitRepositoryRef: corev1.LocalObjectReference{ + GitRepositoryRef: meta.LocalObjectReference{ Name: imageUpdateArgs.gitRepoRef, }, Branch: imageUpdateArgs.branch, }, Interval: metav1.Duration{Duration: createArgs.interval}, - Update: autov1.UpdateStrategy{ - Setters: &autov1.SettersStrategy{}, - }, Commit: autov1.CommitSpec{ AuthorName: imageUpdateArgs.authorName, AuthorEmail: imageUpdateArgs.authorEmail, diff --git a/cmd/flux/create_kustomization.go b/cmd/flux/create_kustomization.go index a16d3787..3f53528a 100644 --- a/cmd/flux/create_kustomization.go +++ b/cmd/flux/create_kustomization.go @@ -23,7 +23,6 @@ import ( "time" "github.com/spf13/cobra" - corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" apimeta "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -31,11 +30,12 @@ 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/flux2/internal/flags" + "github.com/fluxcd/flux2/internal/utils" ) var createKsCmd = &cobra.Command{ @@ -155,7 +155,7 @@ func createKsCmdRun(cmd *cobra.Command, args []string) error { } if len(kustomizationArgs.healthCheck) > 0 { - healthChecks := make([]kustomizev1.CrossNamespaceObjectReference, 0) + healthChecks := make([]meta.NamespacedObjectKindReference, 0) for _, w := range kustomizationArgs.healthCheck { kindObj := strings.Split(w, "/") if len(kindObj) != 2 { @@ -178,7 +178,7 @@ func createKsCmdRun(cmd *cobra.Command, args []string) error { return fmt.Errorf("invalid health check '%s' must be in the format 'kind/name.namespace'", w) } - check := kustomizev1.CrossNamespaceObjectReference{ + check := meta.NamespacedObjectKindReference{ Kind: kind, Name: nameNs[0], Namespace: nameNs[1], @@ -205,7 +205,7 @@ func createKsCmdRun(cmd *cobra.Command, args []string) error { } if kustomizationArgs.decryptionSecret != "" { - kustomization.Spec.Decryption.SecretRef = &corev1.LocalObjectReference{Name: kustomizationArgs.decryptionSecret} + kustomization.Spec.Decryption.SecretRef = &meta.LocalObjectReference{Name: kustomizationArgs.decryptionSecret} } } diff --git a/cmd/flux/create_receiver.go b/cmd/flux/create_receiver.go index 62bba90c..49ab3b80 100644 --- a/cmd/flux/create_receiver.go +++ b/cmd/flux/create_receiver.go @@ -21,7 +21,6 @@ import ( "fmt" "github.com/spf13/cobra" - corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" apimeta "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -29,9 +28,10 @@ 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/flux2/internal/utils" ) var createReceiverCmd = &cobra.Command{ @@ -117,7 +117,7 @@ func createReceiverCmdRun(cmd *cobra.Command, args []string) error { Type: receiverArgs.receiverType, Events: receiverArgs.events, Resources: resources, - SecretRef: corev1.LocalObjectReference{ + SecretRef: meta.LocalObjectReference{ Name: receiverArgs.secretRef, }, Suspend: false, diff --git a/cmd/flux/create_source_bucket.go b/cmd/flux/create_source_bucket.go index f6bae667..212dc685 100644 --- a/cmd/flux/create_source_bucket.go +++ b/cmd/flux/create_source_bucket.go @@ -30,9 +30,11 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "sigs.k8s.io/controller-runtime/pkg/client" + "github.com/fluxcd/pkg/apis/meta" + sourcev1 "github.com/fluxcd/source-controller/api/v1beta1" + "github.com/fluxcd/flux2/internal/flags" "github.com/fluxcd/flux2/internal/utils" - sourcev1 "github.com/fluxcd/source-controller/api/v1beta1" ) var createSourceBucketCmd = &cobra.Command{ @@ -136,7 +138,7 @@ func createSourceBucketCmdRun(cmd *cobra.Command, args []string) error { }, } if sourceHelmArgs.secretRef != "" { - bucket.Spec.SecretRef = &corev1.LocalObjectReference{ + bucket.Spec.SecretRef = &meta.LocalObjectReference{ Name: sourceBucketArgs.secretRef, } } @@ -177,7 +179,7 @@ func createSourceBucketCmdRun(cmd *cobra.Command, args []string) error { if err := upsertSecret(ctx, kubeClient, secret); err != nil { return err } - bucket.Spec.SecretRef = &corev1.LocalObjectReference{ + bucket.Spec.SecretRef = &meta.LocalObjectReference{ Name: secretName, } logger.Successf("authentication configured") diff --git a/cmd/flux/create_source_git.go b/cmd/flux/create_source_git.go index 0243e206..4b63b2ba 100644 --- a/cmd/flux/create_source_git.go +++ b/cmd/flux/create_source_git.go @@ -34,10 +34,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" "github.com/fluxcd/pkg/apis/meta" sourcev1 "github.com/fluxcd/source-controller/api/v1beta1" + + "github.com/fluxcd/flux2/internal/flags" + "github.com/fluxcd/flux2/internal/utils" ) type SourceGitFlags struct { @@ -180,7 +181,7 @@ func createSourceGitCmdRun(cmd *cobra.Command, args []string) error { if createArgs.export { if sourceArgs.GitSecretRef != "" { - gitRepository.Spec.SecretRef = &corev1.LocalObjectReference{ + gitRepository.Spec.SecretRef = &meta.LocalObjectReference{ Name: sourceArgs.GitSecretRef, } } @@ -269,7 +270,7 @@ func createSourceGitCmdRun(cmd *cobra.Command, args []string) error { if sourceArgs.GitSecretRef != "" { secretName = sourceArgs.GitSecretRef } - gitRepository.Spec.SecretRef = &corev1.LocalObjectReference{ + gitRepository.Spec.SecretRef = &meta.LocalObjectReference{ Name: secretName, } } diff --git a/cmd/flux/create_source_helm.go b/cmd/flux/create_source_helm.go index 0570604d..4c22b985 100644 --- a/cmd/flux/create_source_helm.go +++ b/cmd/flux/create_source_helm.go @@ -33,8 +33,9 @@ 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/flux2/internal/utils" ) var createSourceHelmCmd = &cobra.Command{ @@ -128,7 +129,7 @@ func createSourceHelmCmdRun(cmd *cobra.Command, args []string) error { } if sourceHelmArgs.secretRef != "" { - helmRepository.Spec.SecretRef = &corev1.LocalObjectReference{ + helmRepository.Spec.SecretRef = &meta.LocalObjectReference{ Name: sourceHelmArgs.secretRef, } } @@ -190,7 +191,7 @@ func createSourceHelmCmdRun(cmd *cobra.Command, args []string) error { if err := upsertSecret(ctx, kubeClient, secret); err != nil { return err } - helmRepository.Spec.SecretRef = &corev1.LocalObjectReference{ + helmRepository.Spec.SecretRef = &meta.LocalObjectReference{ Name: secretName, } logger.Successf("authentication configured") diff --git a/pkg/manifestgen/sync/sync.go b/pkg/manifestgen/sync/sync.go index d112f6dd..e602b8b9 100644 --- a/pkg/manifestgen/sync/sync.go +++ b/pkg/manifestgen/sync/sync.go @@ -23,11 +23,11 @@ import ( "strings" "time" - corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/yaml" kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1beta1" + "github.com/fluxcd/pkg/apis/meta" sourcev1 "github.com/fluxcd/source-controller/api/v1beta1" "github.com/fluxcd/flux2/pkg/manifestgen" @@ -52,7 +52,7 @@ func Generate(options Options) (*manifestgen.Manifest, error) { Reference: &sourcev1.GitRepositoryRef{ Branch: options.Branch, }, - SecretRef: &corev1.LocalObjectReference{ + SecretRef: &meta.LocalObjectReference{ Name: options.Name, }, GitImplementation: options.GitImplementation,