diff --git a/cmd/flux/create_helmrelease.go b/cmd/flux/create_helmrelease.go index 7e2bf3b3..5dedee92 100644 --- a/cmd/flux/create_helmrelease.go +++ b/cmd/flux/create_helmrelease.go @@ -37,7 +37,6 @@ import ( "github.com/fluxcd/pkg/apis/meta" "github.com/fluxcd/pkg/runtime/transform" sourcev1 "github.com/fluxcd/source-controller/api/v1" - sourcev1b2 "github.com/fluxcd/source-controller/api/v1beta2" "github.com/fluxcd/flux2/v2/internal/flags" "github.com/fluxcd/flux2/v2/internal/utils" @@ -142,7 +141,7 @@ var helmReleaseArgs helmReleaseFlags var supportedHelmReleaseValuesFromKinds = []string{"Secret", "ConfigMap"} -var supportedHelmReleaseReferenceKinds = []string{sourcev1b2.OCIRepositoryKind, sourcev1.HelmChartKind} +var supportedHelmReleaseReferenceKinds = []string{sourcev1.OCIRepositoryKind, sourcev1.HelmChartKind} func init() { createHelmReleaseCmd.Flags().StringVar(&helmReleaseArgs.name, "release-name", "", "name used for the Helm release, defaults to a composition of '[-]'") @@ -222,7 +221,7 @@ func createHelmReleaseCmdRun(cmd *cobra.Command, args []string) error { } case helmReleaseArgs.chartRef != "": kind, name, ns := utils.ParseObjectKindNameNamespace(helmReleaseArgs.chartRef) - if kind != sourcev1.HelmChartKind && kind != sourcev1b2.OCIRepositoryKind { + if kind != sourcev1.HelmChartKind && kind != sourcev1.OCIRepositoryKind { return fmt.Errorf("chart reference kind '%s' is not supported, must be one of: %s", kind, strings.Join(supportedHelmReleaseReferenceKinds, ", ")) } diff --git a/cmd/flux/create_source_oci.go b/cmd/flux/create_source_oci.go index 9cb5defc..4d563a38 100644 --- a/cmd/flux/create_source_oci.go +++ b/cmd/flux/create_source_oci.go @@ -29,9 +29,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "github.com/fluxcd/pkg/apis/meta" - sourcev1 "github.com/fluxcd/source-controller/api/v1" - sourcev1b2 "github.com/fluxcd/source-controller/api/v1beta2" "github.com/fluxcd/flux2/v2/internal/flags" "github.com/fluxcd/flux2/v2/internal/utils" @@ -81,7 +79,7 @@ var sourceOCIRepositoryArgs = newSourceOCIFlags() func newSourceOCIFlags() sourceOCIRepositoryFlags { return sourceOCIRepositoryFlags{ - provider: flags.SourceOCIProvider(sourcev1b2.GenericOCIProvider), + provider: flags.SourceOCIProvider(sourcev1.GenericOCIProvider), } } @@ -127,20 +125,20 @@ func createSourceOCIRepositoryCmdRun(cmd *cobra.Command, args []string) error { ignorePaths = &ignorePathsStr } - repository := &sourcev1b2.OCIRepository{ + repository := &sourcev1.OCIRepository{ ObjectMeta: metav1.ObjectMeta{ Name: name, Namespace: *kubeconfigArgs.Namespace, Labels: sourceLabels, }, - Spec: sourcev1b2.OCIRepositorySpec{ + Spec: sourcev1.OCIRepositorySpec{ Provider: sourceOCIRepositoryArgs.provider.String(), URL: sourceOCIRepositoryArgs.url, Insecure: sourceOCIRepositoryArgs.insecure, Interval: metav1.Duration{ Duration: createArgs.interval, }, - Reference: &sourcev1b2.OCIRepositoryRef{}, + Reference: &sourcev1.OCIRepositoryRef{}, Ignore: ignorePaths, }, } @@ -237,13 +235,13 @@ func createSourceOCIRepositoryCmdRun(cmd *cobra.Command, args []string) error { } func upsertOCIRepository(ctx context.Context, kubeClient client.Client, - ociRepository *sourcev1b2.OCIRepository) (types.NamespacedName, error) { + ociRepository *sourcev1.OCIRepository) (types.NamespacedName, error) { namespacedName := types.NamespacedName{ Namespace: ociRepository.GetNamespace(), Name: ociRepository.GetName(), } - var existing sourcev1b2.OCIRepository + var existing sourcev1.OCIRepository err := kubeClient.Get(ctx, namespacedName, &existing) if err != nil { if errors.IsNotFound(err) { diff --git a/cmd/flux/delete_source_chart.go b/cmd/flux/delete_source_chart.go index db8f2090..82a6b95f 100644 --- a/cmd/flux/delete_source_chart.go +++ b/cmd/flux/delete_source_chart.go @@ -19,7 +19,7 @@ package main import ( "github.com/spf13/cobra" - sourcev1 "github.com/fluxcd/source-controller/api/v1beta2" + sourcev1 "github.com/fluxcd/source-controller/api/v1" ) var deleteSourceChartCmd = &cobra.Command{ diff --git a/cmd/flux/delete_source_oci.go b/cmd/flux/delete_source_oci.go index c869be69..4fe0d54e 100644 --- a/cmd/flux/delete_source_oci.go +++ b/cmd/flux/delete_source_oci.go @@ -19,7 +19,7 @@ package main import ( "github.com/spf13/cobra" - sourcev1 "github.com/fluxcd/source-controller/api/v1beta2" + sourcev1 "github.com/fluxcd/source-controller/api/v1" ) var deleteSourceOCIRepositoryCmd = &cobra.Command{ diff --git a/cmd/flux/diff_artifact.go b/cmd/flux/diff_artifact.go index 836a3074..86b82e28 100644 --- a/cmd/flux/diff_artifact.go +++ b/cmd/flux/diff_artifact.go @@ -22,7 +22,7 @@ import ( "os" "github.com/fluxcd/pkg/oci" - sourcev1 "github.com/fluxcd/source-controller/api/v1beta2" + sourcev1 "github.com/fluxcd/source-controller/api/v1" "github.com/google/go-containerregistry/pkg/crane" "github.com/spf13/cobra" diff --git a/cmd/flux/events.go b/cmd/flux/events.go index ee77126b..bcaafae6 100644 --- a/cmd/flux/events.go +++ b/cmd/flux/events.go @@ -46,7 +46,6 @@ import ( notificationv1 "github.com/fluxcd/notification-controller/api/v1" notificationv1b3 "github.com/fluxcd/notification-controller/api/v1beta3" sourcev1 "github.com/fluxcd/source-controller/api/v1" - sourcev1b2 "github.com/fluxcd/source-controller/api/v1beta2" "github.com/fluxcd/flux2/v2/internal/utils" "github.com/fluxcd/flux2/v2/pkg/printers" @@ -446,7 +445,7 @@ var fluxKindMap = refMap{ field: []string{"spec", "sourceRef"}, }, sourcev1.GitRepositoryKind: {gvk: sourcev1.GroupVersion.WithKind(sourcev1.GitRepositoryKind)}, - sourcev1b2.OCIRepositoryKind: {gvk: sourcev1b2.GroupVersion.WithKind(sourcev1b2.OCIRepositoryKind)}, + sourcev1.OCIRepositoryKind: {gvk: sourcev1.GroupVersion.WithKind(sourcev1.OCIRepositoryKind)}, sourcev1.BucketKind: {gvk: sourcev1.GroupVersion.WithKind(sourcev1.BucketKind)}, sourcev1.HelmRepositoryKind: {gvk: sourcev1.GroupVersion.WithKind(sourcev1.HelmRepositoryKind)}, autov1.ImageUpdateAutomationKind: {gvk: autov1.GroupVersion.WithKind(autov1.ImageUpdateAutomationKind)}, diff --git a/cmd/flux/export_source_oci.go b/cmd/flux/export_source_oci.go index 66e942d9..ac94f2e4 100644 --- a/cmd/flux/export_source_oci.go +++ b/cmd/flux/export_source_oci.go @@ -21,7 +21,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - sourcev1 "github.com/fluxcd/source-controller/api/v1beta2" + sourcev1 "github.com/fluxcd/source-controller/api/v1" ) var exportSourceOCIRepositoryCmd = &cobra.Command{ diff --git a/cmd/flux/get_source_all.go b/cmd/flux/get_source_all.go index eec9dbff..c55e3bc1 100644 --- a/cmd/flux/get_source_all.go +++ b/cmd/flux/get_source_all.go @@ -21,7 +21,6 @@ import ( apimeta "k8s.io/apimachinery/pkg/api/meta" sourcev1 "github.com/fluxcd/source-controller/api/v1" - sourcev1b2 "github.com/fluxcd/source-controller/api/v1beta2" ) var getSourceAllCmd = &cobra.Command{ @@ -42,7 +41,7 @@ var getSourceAllCmd = &cobra.Command{ var allSourceCmd = []getCommand{ { apiType: ociRepositoryType, - list: &ociRepositoryListAdapter{&sourcev1b2.OCIRepositoryList{}}, + list: &ociRepositoryListAdapter{&sourcev1.OCIRepositoryList{}}, }, { apiType: bucketType, diff --git a/cmd/flux/get_source_oci.go b/cmd/flux/get_source_oci.go index e5bbe409..e5ea0735 100644 --- a/cmd/flux/get_source_oci.go +++ b/cmd/flux/get_source_oci.go @@ -25,7 +25,7 @@ import ( "golang.org/x/text/language" "k8s.io/apimachinery/pkg/runtime" - sourcev1 "github.com/fluxcd/source-controller/api/v1beta2" + sourcev1 "github.com/fluxcd/source-controller/api/v1" "github.com/fluxcd/flux2/v2/internal/utils" ) diff --git a/cmd/flux/list_artifact.go b/cmd/flux/list_artifact.go index 82f9e686..f5d37721 100644 --- a/cmd/flux/list_artifact.go +++ b/cmd/flux/list_artifact.go @@ -24,7 +24,7 @@ import ( "github.com/spf13/cobra" "github.com/fluxcd/pkg/oci" - sourcev1 "github.com/fluxcd/source-controller/api/v1beta2" + sourcev1 "github.com/fluxcd/source-controller/api/v1" "github.com/fluxcd/flux2/v2/internal/flags" "github.com/fluxcd/flux2/v2/pkg/printers" diff --git a/cmd/flux/pull_artifact.go b/cmd/flux/pull_artifact.go index 4f60adae..e24adf12 100644 --- a/cmd/flux/pull_artifact.go +++ b/cmd/flux/pull_artifact.go @@ -21,13 +21,13 @@ import ( "fmt" "os" - sourcev1 "github.com/fluxcd/source-controller/api/v1beta2" "github.com/google/go-containerregistry/pkg/crane" "github.com/spf13/cobra" - "github.com/fluxcd/flux2/v2/internal/flags" - "github.com/fluxcd/pkg/oci" + sourcev1 "github.com/fluxcd/source-controller/api/v1" + + "github.com/fluxcd/flux2/v2/internal/flags" ) var pullArtifactCmd = &cobra.Command{ diff --git a/cmd/flux/push_artifact.go b/cmd/flux/push_artifact.go index 7a0ddd3f..a03ea7ae 100644 --- a/cmd/flux/push_artifact.go +++ b/cmd/flux/push_artifact.go @@ -36,7 +36,7 @@ import ( authutils "github.com/fluxcd/pkg/auth/utils" "github.com/fluxcd/pkg/oci" - sourcev1 "github.com/fluxcd/source-controller/api/v1beta2" + sourcev1 "github.com/fluxcd/source-controller/api/v1" "github.com/fluxcd/flux2/v2/internal/flags" ) diff --git a/cmd/flux/reconcile_helmrelease.go b/cmd/flux/reconcile_helmrelease.go index 01bdfba8..fdcefdcb 100644 --- a/cmd/flux/reconcile_helmrelease.go +++ b/cmd/flux/reconcile_helmrelease.go @@ -24,7 +24,6 @@ import ( helmv2 "github.com/fluxcd/helm-controller/api/v2" sourcev1 "github.com/fluxcd/source-controller/api/v1" - sourcev1b2 "github.com/fluxcd/source-controller/api/v1beta2" ) var reconcileHrCmd = &cobra.Command{ @@ -92,7 +91,7 @@ func (obj helmReleaseAdapter) getSource() (reconcileSource, types.NamespacedName } return reconcileCommand{ apiType: ociRepositoryType, - object: ociRepositoryAdapter{&sourcev1b2.OCIRepository{}}, + object: ociRepositoryAdapter{&sourcev1.OCIRepository{}}, }, namespacedName default: // default case assumes the HelmRelease is using a HelmChartTemplate diff --git a/cmd/flux/reconcile_kustomization.go b/cmd/flux/reconcile_kustomization.go index 788f5375..2eaee5a8 100644 --- a/cmd/flux/reconcile_kustomization.go +++ b/cmd/flux/reconcile_kustomization.go @@ -22,7 +22,6 @@ import ( kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1" sourcev1 "github.com/fluxcd/source-controller/api/v1" - sourcev1b2 "github.com/fluxcd/source-controller/api/v1beta2" ) var reconcileKsCmd = &cobra.Command{ @@ -66,10 +65,10 @@ func (obj kustomizationAdapter) reconcileSource() bool { func (obj kustomizationAdapter) getSource() (reconcileSource, types.NamespacedName) { var cmd reconcileCommand switch obj.Spec.SourceRef.Kind { - case sourcev1b2.OCIRepositoryKind: + case sourcev1.OCIRepositoryKind: cmd = reconcileCommand{ apiType: ociRepositoryType, - object: ociRepositoryAdapter{&sourcev1b2.OCIRepository{}}, + object: ociRepositoryAdapter{&sourcev1.OCIRepository{}}, } case sourcev1.GitRepositoryKind: cmd = reconcileCommand{ diff --git a/cmd/flux/reconcile_source_oci.go b/cmd/flux/reconcile_source_oci.go index 52237f2f..2dbbcc1c 100644 --- a/cmd/flux/reconcile_source_oci.go +++ b/cmd/flux/reconcile_source_oci.go @@ -21,7 +21,7 @@ import ( "github.com/spf13/cobra" - sourcev1 "github.com/fluxcd/source-controller/api/v1beta2" + sourcev1 "github.com/fluxcd/source-controller/api/v1" ) var reconcileSourceOCIRepositoryCmd = &cobra.Command{ diff --git a/cmd/flux/resume_source_oci.go b/cmd/flux/resume_source_oci.go index 04b20a4b..d72d3da2 100644 --- a/cmd/flux/resume_source_oci.go +++ b/cmd/flux/resume_source_oci.go @@ -19,7 +19,7 @@ package main import ( "github.com/spf13/cobra" - sourcev1 "github.com/fluxcd/source-controller/api/v1beta2" + sourcev1 "github.com/fluxcd/source-controller/api/v1" ) var resumeSourceOCIRepositoryCmd = &cobra.Command{ diff --git a/cmd/flux/source.go b/cmd/flux/source.go index 3803045e..f0c69272 100644 --- a/cmd/flux/source.go +++ b/cmd/flux/source.go @@ -20,7 +20,6 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" sourcev1 "github.com/fluxcd/source-controller/api/v1" - sourcev1b2 "github.com/fluxcd/source-controller/api/v1beta2" ) // These are general-purpose adapters for attaching methods to, for @@ -30,13 +29,13 @@ import ( // sourcev1.ociRepository var ociRepositoryType = apiType{ - kind: sourcev1b2.OCIRepositoryKind, + kind: sourcev1.OCIRepositoryKind, humanKind: "source oci", - groupVersion: sourcev1b2.GroupVersion, + groupVersion: sourcev1.GroupVersion, } type ociRepositoryAdapter struct { - *sourcev1b2.OCIRepository + *sourcev1.OCIRepository } func (a ociRepositoryAdapter) asClientObject() client.Object { @@ -50,7 +49,7 @@ func (a ociRepositoryAdapter) deepCopyClientObject() client.Object { // sourcev1b2.OCIRepositoryList type ociRepositoryListAdapter struct { - *sourcev1b2.OCIRepositoryList + *sourcev1.OCIRepositoryList } func (a ociRepositoryListAdapter) asClientList() client.ObjectList { diff --git a/cmd/flux/stats.go b/cmd/flux/stats.go index 6b450fb4..156963a7 100644 --- a/cmd/flux/stats.go +++ b/cmd/flux/stats.go @@ -34,7 +34,6 @@ import ( notificationv1 "github.com/fluxcd/notification-controller/api/v1" notificationv1b3 "github.com/fluxcd/notification-controller/api/v1beta3" sourcev1 "github.com/fluxcd/source-controller/api/v1" - sourcev1b2 "github.com/fluxcd/source-controller/api/v1beta2" "github.com/fluxcd/flux2/v2/internal/utils" "github.com/fluxcd/flux2/v2/pkg/printers" @@ -82,9 +81,9 @@ func runStatsCmd(cmd *cobra.Command, args []string) error { Group: sourcev1.GroupVersion.Group, }, { - Kind: sourcev1b2.OCIRepositoryKind, - Version: sourcev1b2.GroupVersion.Version, - Group: sourcev1b2.GroupVersion.Group, + Kind: sourcev1.OCIRepositoryKind, + Version: sourcev1.GroupVersion.Version, + Group: sourcev1.GroupVersion.Group, }, { Kind: sourcev1.HelmRepositoryKind, diff --git a/cmd/flux/suspend_source_oci.go b/cmd/flux/suspend_source_oci.go index 3b8e36d6..8ee47ce6 100644 --- a/cmd/flux/suspend_source_oci.go +++ b/cmd/flux/suspend_source_oci.go @@ -19,7 +19,7 @@ package main import ( "github.com/spf13/cobra" - sourcev1 "github.com/fluxcd/source-controller/api/v1beta2" + sourcev1 "github.com/fluxcd/source-controller/api/v1" ) var suspendSourceOCIRepositoryCmd = &cobra.Command{ diff --git a/cmd/flux/tag_artifact.go b/cmd/flux/tag_artifact.go index aa65d85b..7ab8148e 100644 --- a/cmd/flux/tag_artifact.go +++ b/cmd/flux/tag_artifact.go @@ -23,7 +23,7 @@ import ( "github.com/spf13/cobra" "github.com/fluxcd/pkg/oci" - sourcev1 "github.com/fluxcd/source-controller/api/v1beta2" + sourcev1 "github.com/fluxcd/source-controller/api/v1" "github.com/fluxcd/flux2/v2/internal/flags" ) diff --git a/cmd/flux/testdata/create_hr/setup-source.yaml b/cmd/flux/testdata/create_hr/setup-source.yaml index 254024a0..39edb2d2 100644 --- a/cmd/flux/testdata/create_hr/setup-source.yaml +++ b/cmd/flux/testdata/create_hr/setup-source.yaml @@ -27,7 +27,7 @@ spec: kind: HelmRepository name: podinfo --- -apiVersion: source.toolkit.fluxcd.io/v1beta2 +apiVersion: source.toolkit.fluxcd.io/v1 kind: OCIRepository metadata: name: podinfo diff --git a/cmd/flux/testdata/oci/export.golden b/cmd/flux/testdata/oci/export.golden index 7a043b64..1e429e22 100644 --- a/cmd/flux/testdata/oci/export.golden +++ b/cmd/flux/testdata/oci/export.golden @@ -1,5 +1,5 @@ --- -apiVersion: source.toolkit.fluxcd.io/v1beta2 +apiVersion: source.toolkit.fluxcd.io/v1 kind: OCIRepository metadata: name: podinfo diff --git a/cmd/flux/testdata/oci/export_with_complete_verification.golden b/cmd/flux/testdata/oci/export_with_complete_verification.golden index 8b862a83..636241f1 100644 --- a/cmd/flux/testdata/oci/export_with_complete_verification.golden +++ b/cmd/flux/testdata/oci/export_with_complete_verification.golden @@ -1,5 +1,5 @@ --- -apiVersion: source.toolkit.fluxcd.io/v1beta2 +apiVersion: source.toolkit.fluxcd.io/v1 kind: OCIRepository metadata: name: podinfo diff --git a/cmd/flux/testdata/oci/export_with_issuer.golden b/cmd/flux/testdata/oci/export_with_issuer.golden index 3abaf36a..8f651b7a 100644 --- a/cmd/flux/testdata/oci/export_with_issuer.golden +++ b/cmd/flux/testdata/oci/export_with_issuer.golden @@ -1,5 +1,5 @@ --- -apiVersion: source.toolkit.fluxcd.io/v1beta2 +apiVersion: source.toolkit.fluxcd.io/v1 kind: OCIRepository metadata: name: podinfo diff --git a/cmd/flux/testdata/oci/export_with_secret.golden b/cmd/flux/testdata/oci/export_with_secret.golden index 0b41116f..acee22a9 100644 --- a/cmd/flux/testdata/oci/export_with_secret.golden +++ b/cmd/flux/testdata/oci/export_with_secret.golden @@ -1,5 +1,5 @@ --- -apiVersion: source.toolkit.fluxcd.io/v1beta2 +apiVersion: source.toolkit.fluxcd.io/v1 kind: OCIRepository metadata: name: podinfo diff --git a/cmd/flux/testdata/oci/export_with_subject.golden b/cmd/flux/testdata/oci/export_with_subject.golden index 93eca53b..92d66fc8 100644 --- a/cmd/flux/testdata/oci/export_with_subject.golden +++ b/cmd/flux/testdata/oci/export_with_subject.golden @@ -1,5 +1,5 @@ --- -apiVersion: source.toolkit.fluxcd.io/v1beta2 +apiVersion: source.toolkit.fluxcd.io/v1 kind: OCIRepository metadata: name: podinfo diff --git a/cmd/flux/testdata/oci/export_with_verify_secret.golden b/cmd/flux/testdata/oci/export_with_verify_secret.golden index d7e94aad..62b7f88c 100644 --- a/cmd/flux/testdata/oci/export_with_verify_secret.golden +++ b/cmd/flux/testdata/oci/export_with_verify_secret.golden @@ -1,5 +1,5 @@ --- -apiVersion: source.toolkit.fluxcd.io/v1beta2 +apiVersion: source.toolkit.fluxcd.io/v1 kind: OCIRepository metadata: name: podinfo diff --git a/cmd/flux/testdata/trace/deployment-hr-ocirepo.yaml b/cmd/flux/testdata/trace/deployment-hr-ocirepo.yaml index 29f0c1b5..81202e5f 100644 --- a/cmd/flux/testdata/trace/deployment-hr-ocirepo.yaml +++ b/cmd/flux/testdata/trace/deployment-hr-ocirepo.yaml @@ -54,7 +54,7 @@ status: type: Ready lastAttemptedRevision: 6.3.5 --- -apiVersion: source.toolkit.fluxcd.io/v1beta2 +apiVersion: source.toolkit.fluxcd.io/v1 kind: OCIRepository metadata: labels: diff --git a/cmd/flux/testdata/trace/helmrelease-oci.yaml b/cmd/flux/testdata/trace/helmrelease-oci.yaml index d4ac8f72..36c74340 100644 --- a/cmd/flux/testdata/trace/helmrelease-oci.yaml +++ b/cmd/flux/testdata/trace/helmrelease-oci.yaml @@ -59,7 +59,7 @@ status: type: Ready lastAppliedRevision: main@sha1:696f056df216eea4f9401adbee0ff744d4df390f --- -apiVersion: source.toolkit.fluxcd.io/v1beta2 +apiVersion: source.toolkit.fluxcd.io/v1 kind: OCIRepository metadata: labels: diff --git a/cmd/flux/trace.go b/cmd/flux/trace.go index 9946daae..7398c457 100644 --- a/cmd/flux/trace.go +++ b/cmd/flux/trace.go @@ -38,7 +38,6 @@ import ( fluxmeta "github.com/fluxcd/pkg/apis/meta" "github.com/fluxcd/pkg/oci" sourcev1 "github.com/fluxcd/source-controller/api/v1" - sourcev1b2 "github.com/fluxcd/source-controller/api/v1beta2" "github.com/fluxcd/flux2/v2/internal/utils" ) @@ -223,7 +222,7 @@ func traceKustomization(ctx context.Context, kubeClient client.Client, ksName ty ksReady := meta.FindStatusCondition(ks.Status.Conditions, fluxmeta.ReadyCondition) var gitRepository *sourcev1.GitRepository - var ociRepository *sourcev1b2.OCIRepository + var ociRepository *sourcev1.OCIRepository var ksRepositoryReady *metav1.Condition switch ks.Spec.SourceRef.Kind { case sourcev1.GitRepositoryKind: @@ -240,8 +239,8 @@ func traceKustomization(ctx context.Context, kubeClient client.Client, ksName ty return "", fmt.Errorf("failed to find GitRepository: %w", err) } ksRepositoryReady = meta.FindStatusCondition(gitRepository.Status.Conditions, fluxmeta.ReadyCondition) - case sourcev1b2.OCIRepositoryKind: - ociRepository = &sourcev1b2.OCIRepository{} + case sourcev1.OCIRepositoryKind: + ociRepository = &sourcev1.OCIRepository{} sourceNamespace := ks.Namespace if ks.Spec.SourceRef.Namespace != "" { sourceNamespace = ks.Spec.SourceRef.Namespace @@ -348,7 +347,7 @@ Status: Unknown Kustomization *kustomizev1.Kustomization KustomizationReady *metav1.Condition GitRepository *sourcev1.GitRepository - OCIRepository *sourcev1b2.OCIRepository + OCIRepository *sourcev1.OCIRepository RepositoryReady *metav1.Condition Annotations map[string]string }{ @@ -403,13 +402,13 @@ func traceHelm(ctx context.Context, kubeClient client.Client, hrName types.Names var hrGitRepositoryReady *metav1.Condition var hrHelmRepository *sourcev1.HelmRepository var hrHelmRepositoryReady *metav1.Condition - var hrOCIRepository *sourcev1b2.OCIRepository + var hrOCIRepository *sourcev1.OCIRepository var hrOCIRepositoryReady *metav1.Condition if hr.Spec.Chart == nil { if hr.Spec.ChartRef != nil { switch hr.Spec.ChartRef.Kind { - case sourcev1b2.OCIRepositoryKind: - hrOCIRepository = &sourcev1b2.OCIRepository{} + case sourcev1.OCIRepositoryKind: + hrOCIRepository = &sourcev1.OCIRepository{} sourceNamespace := hr.Namespace if hr.Spec.ChartRef.Namespace != "" { sourceNamespace = hr.Spec.ChartRef.Namespace @@ -583,7 +582,7 @@ Status: Unknown GitRepositoryReady *metav1.Condition HelmRepository *sourcev1.HelmRepository HelmRepositoryReady *metav1.Condition - OCIRepository *sourcev1b2.OCIRepository + OCIRepository *sourcev1.OCIRepository OCIRepositoryReady *metav1.Condition Annotations map[string]string }{ diff --git a/internal/flags/kustomization_source.go b/internal/flags/kustomization_source.go index 3f339585..51f3e7f5 100644 --- a/internal/flags/kustomization_source.go +++ b/internal/flags/kustomization_source.go @@ -21,12 +21,11 @@ import ( "strings" sourcev1 "github.com/fluxcd/source-controller/api/v1" - sourcev1b2 "github.com/fluxcd/source-controller/api/v1beta2" "github.com/fluxcd/flux2/v2/internal/utils" ) -var supportedKustomizationSourceKinds = []string{sourcev1b2.OCIRepositoryKind, sourcev1.GitRepositoryKind, sourcev1.BucketKind} +var supportedKustomizationSourceKinds = []string{sourcev1.OCIRepositoryKind, sourcev1.GitRepositoryKind, sourcev1.BucketKind} type KustomizationSource struct { Kind string diff --git a/internal/flags/source_oci_provider.go b/internal/flags/source_oci_provider.go index b0deeeca..7d440507 100644 --- a/internal/flags/source_oci_provider.go +++ b/internal/flags/source_oci_provider.go @@ -20,8 +20,9 @@ import ( "fmt" "strings" + sourcev1 "github.com/fluxcd/source-controller/api/v1" + "github.com/fluxcd/flux2/v2/internal/utils" - sourcev1 "github.com/fluxcd/source-controller/api/v1beta2" ) var supportedSourceOCIProviders = []string{ diff --git a/internal/utils/utils.go b/internal/utils/utils.go index 4a4787c2..712bb476 100644 --- a/internal/utils/utils.go +++ b/internal/utils/utils.go @@ -51,7 +51,6 @@ import ( runclient "github.com/fluxcd/pkg/runtime/client" "github.com/fluxcd/pkg/version" sourcev1 "github.com/fluxcd/source-controller/api/v1" - sourcev1b2 "github.com/fluxcd/source-controller/api/v1beta2" "github.com/fluxcd/flux2/v2/pkg/manifestgen/install" ) @@ -128,7 +127,6 @@ func NewScheme() *apiruntime.Scheme { _ = rbacv1.AddToScheme(scheme) _ = appsv1.AddToScheme(scheme) _ = networkingv1.AddToScheme(scheme) - _ = sourcev1b2.AddToScheme(scheme) _ = sourcev1.AddToScheme(scheme) _ = kustomizev1.AddToScheme(scheme) _ = helmv2.AddToScheme(scheme) diff --git a/pkg/bootstrap/bootstrap.go b/pkg/bootstrap/bootstrap.go index 43eabad0..b3a3a9ee 100644 --- a/pkg/bootstrap/bootstrap.go +++ b/pkg/bootstrap/bootstrap.go @@ -268,7 +268,7 @@ func objectReconciled(kube client.Client, objKey client.ObjectKey, clientObject func hasRevision(kind string, obj map[string]interface{}, expectedRev string) (bool, error) { var rev string switch kind { - case sourcev1.GitRepositoryKind, sourcev1b2.OCIRepositoryKind, sourcev1.BucketKind, sourcev1.HelmChartKind: + case sourcev1.GitRepositoryKind, sourcev1.OCIRepositoryKind, sourcev1.BucketKind, sourcev1.HelmChartKind: rev, _, _ = unstructured.NestedString(obj, "status", "artifact", "revision") case kustomizev1.KustomizationKind: rev, _, _ = unstructured.NestedString(obj, "status", "lastAttemptedRevision") diff --git a/pkg/bootstrap/bootstrap_test.go b/pkg/bootstrap/bootstrap_test.go index 47bf07f9..0d7f2ae5 100644 --- a/pkg/bootstrap/bootstrap_test.go +++ b/pkg/bootstrap/bootstrap_test.go @@ -27,11 +27,11 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/fake" - "github.com/fluxcd/flux2/v2/internal/utils" kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1" notificationv1 "github.com/fluxcd/notification-controller/api/v1beta2" sourcev1 "github.com/fluxcd/source-controller/api/v1" - sourcev1b2 "github.com/fluxcd/source-controller/api/v1beta2" + + "github.com/fluxcd/flux2/v2/internal/utils" ) func Test_hasRevision(t *testing.T) { @@ -98,11 +98,11 @@ func Test_hasRevision(t *testing.T) { }, { name: "OCIRepository revision", - obj: &sourcev1b2.OCIRepository{ + obj: &sourcev1.OCIRepository{ TypeMeta: metav1.TypeMeta{ - Kind: sourcev1b2.OCIRepositoryKind, + Kind: sourcev1.OCIRepositoryKind, }, - Status: sourcev1b2.OCIRepositoryStatus{ + Status: sourcev1.OCIRepositoryStatus{ Artifact: &sourcev1.Artifact{ Revision: "main@sha1:5bf3a8f9bb0aa5ae8afd6208f43757ab73fc033a", }, diff --git a/pkg/uninstall/uninstall.go b/pkg/uninstall/uninstall.go index a1e61eb7..2fd459f1 100644 --- a/pkg/uninstall/uninstall.go +++ b/pkg/uninstall/uninstall.go @@ -35,7 +35,6 @@ import ( notificationv1 "github.com/fluxcd/notification-controller/api/v1" notificationv1b3 "github.com/fluxcd/notification-controller/api/v1beta3" sourcev1 "github.com/fluxcd/source-controller/api/v1" - sourcev1b2 "github.com/fluxcd/source-controller/api/v1beta2" "github.com/fluxcd/flux2/v2/pkg/log" "github.com/fluxcd/flux2/v2/pkg/manifestgen" @@ -154,7 +153,7 @@ func Finalizers(ctx context.Context, logger log.Logger, kubeClient client.Client } } { - var list sourcev1b2.OCIRepositoryList + var list sourcev1.OCIRepositoryList if err := kubeClient.List(ctx, &list, client.InNamespace("")); err == nil { for i := range list.Items { r := list.Items[i] diff --git a/tests/integration/suite_test.go b/tests/integration/suite_test.go index 0b55c4c2..621ca21f 100644 --- a/tests/integration/suite_test.go +++ b/tests/integration/suite_test.go @@ -38,7 +38,6 @@ import ( notiv1beta3 "github.com/fluxcd/notification-controller/api/v1beta3" "github.com/fluxcd/pkg/git" sourcev1 "github.com/fluxcd/source-controller/api/v1" - sourcev1beta2 "github.com/fluxcd/source-controller/api/v1beta2" "github.com/fluxcd/test-infra/tftestenv" ) @@ -165,7 +164,6 @@ type providerConfig struct { func init() { utilruntime.Must(sourcev1.AddToScheme(scheme.Scheme)) - utilruntime.Must(sourcev1beta2.AddToScheme(scheme.Scheme)) utilruntime.Must(kustomizev1.AddToScheme(scheme.Scheme)) utilruntime.Must(helmv2.AddToScheme(scheme.Scheme)) utilruntime.Must(reflectorv1.AddToScheme(scheme.Scheme))