chore!: remove v1beta2 source API usage

artem-nefedov · artem-nefedov · commit 8e7e779a89c9 · 2025-12-05T21:47:46.000+01:00
diff --git a/.github/workflows/helm-test.yaml b/.github/workflows/helm-test.yaml
@@ -72,7 +72,7 @@ jobs:
         if: steps.list-changed.outputs.changed == 'true'
 
       - name: Install Flux CLI
-        uses: fluxcd/flux2/action@8d5f40dca5aa5d3c0fc3414457dda15a0ac92fa4 # main
+        uses: fluxcd/flux2/action@8454b02a32e48d775b9f563cb51fdcb1787b5b93 # main
         if: steps.list-changed.outputs.changed == 'true'
 
       - name: Install Source controller
diff --git a/Makefile b/Makefile
@@ -16,7 +16,7 @@ BUILD_VERSION ?= $(shell git describe --tags $$(git rev-list --tags --max-count=
 LIBCRYPTO_VERSION ?= 3.5.4-r0
 
 # source controller version
-SOURCE_VER ?= v1.0.0-rc.1
+SOURCE_VER ?= v1.7.4
 
 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
 GOBIN=$(shell pwd)/bin
diff --git a/api/v1alpha1/terraform_types.go b/api/v1alpha1/terraform_types.go
@@ -24,7 +24,7 @@ import (
 	"unicode/utf8"
 
 	"github.com/fluxcd/pkg/apis/meta"
-	sourcev1 "github.com/fluxcd/source-controller/api/v1beta2"
+	sourcev1 "github.com/fluxcd/source-controller/api/v1"
 	corev1 "k8s.io/api/core/v1"
 	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	apimeta "k8s.io/apimachinery/pkg/api/meta"
diff --git a/charts/tofu-controller/templates/packages.yaml b/charts/tofu-controller/templates/packages.yaml
@@ -1,5 +1,5 @@
 {{ if .Values.awsPackage.install }}
-apiVersion: source.toolkit.fluxcd.io/v1beta2
+apiVersion: source.toolkit.fluxcd.io/v1
 kind: OCIRepository
 metadata:
   name: aws-package
diff --git a/cmd/branch-planner/main.go b/cmd/branch-planner/main.go
@@ -8,7 +8,6 @@ import (
 	infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2"
 	"github.com/fluxcd/pkg/runtime/logger"
 	sourcev1 "github.com/fluxcd/source-controller/api/v1"
-	sourcev1b2 "github.com/fluxcd/source-controller/api/v1beta2"
 	"github.com/go-logr/logr"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	"k8s.io/client-go/kubernetes/scheme"
@@ -18,7 +17,6 @@ import (
 func init() {
 	utilruntime.Must(cgoscheme.AddToScheme(scheme.Scheme))
 	utilruntime.Must(sourcev1.AddToScheme(scheme.Scheme))
-	utilruntime.Must(sourcev1b2.AddToScheme(scheme.Scheme))
 	utilruntime.Must(infrav1.AddToScheme(scheme.Scheme))
 }
 
diff --git a/cmd/manager/main.go b/cmd/manager/main.go
@@ -34,7 +34,6 @@ import (
 	"github.com/fluxcd/pkg/runtime/metrics"
 	"github.com/fluxcd/pkg/runtime/pprof"
 	sourcev1 "github.com/fluxcd/source-controller/api/v1"
-	sourcev1b2 "github.com/fluxcd/source-controller/api/v1beta2"
 	flag "github.com/spf13/pflag"
 	"k8s.io/apimachinery/pkg/runtime"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
@@ -72,7 +71,6 @@ var (
 func init() {
 	utilruntime.Must(clientgoscheme.AddToScheme(scheme))
 	utilruntime.Must(sourcev1.AddToScheme(scheme))
-	utilruntime.Must(sourcev1b2.AddToScheme(scheme))
 	utilruntime.Must(infrav1.AddToScheme(scheme))
 	//+kubebuilder:scaffold:scheme
 }
diff --git a/config/crd/bases/ocirepositories.yaml b/config/crd/bases/ocirepositories.yaml
diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml
@@ -2,8 +2,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: tofu-system
 resources:
-- https://github.com/fluxcd/source-controller/releases/download/v1.0.0-rc.1/source-controller.crds.yaml
-- https://github.com/fluxcd/source-controller/releases/download/v1.0.0-rc.1/source-controller.deployment.yaml
+- https://github.com/fluxcd/source-controller/releases/download/v1.7.4/source-controller.crds.yaml
+- https://github.com/fluxcd/source-controller/releases/download/v1.7.4/source-controller.deployment.yaml
 - ../crd
 - ../rbac
 - ../manager
diff --git a/config/package/aws-package.yaml b/config/package/aws-package.yaml
@@ -1,5 +1,5 @@
 ---
-apiVersion: source.toolkit.fluxcd.io/v1beta2
+apiVersion: source.toolkit.fluxcd.io/v1
 kind: OCIRepository
 metadata:
   name: aws-package
diff --git a/config/testdata/source/source.yaml b/config/testdata/source/source.yaml
@@ -1,5 +1,5 @@
 ---
-apiVersion: source.toolkit.fluxcd.io/v1beta2
+apiVersion: source.toolkit.fluxcd.io/v1
 kind: GitRepository
 metadata:
   name: helloworld
@@ -9,7 +9,7 @@ spec:
   ref:
     branch: main
 ---
-apiVersion: source.toolkit.fluxcd.io/v1beta2
+apiVersion: source.toolkit.fluxcd.io/v1
 kind: OCIRepository
 metadata:
   name: helloworld-oci
diff --git a/controllers/suite_test.go b/controllers/suite_test.go
@@ -41,7 +41,6 @@ import (
 
 	infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2"
 	sourcev1 "github.com/fluxcd/source-controller/api/v1"
-	sourcev1b2 "github.com/fluxcd/source-controller/api/v1beta2"
 	"k8s.io/client-go/rest"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
@@ -110,11 +109,6 @@ func TestMain(m *testing.M) {
 		panic(err.Error())
 	}
 
-	err = sourcev1b2.AddToScheme(scheme)
-	if err != nil {
-		panic(err.Error())
-	}
-
 	err = infrav1.AddToScheme(scheme)
 	if err != nil {
 		panic(err.Error())
diff --git a/controllers/tc000012_src_bucket_no_outputs_test.go b/controllers/tc000012_src_bucket_no_outputs_test.go
@@ -11,7 +11,7 @@ import (
 	. "github.com/onsi/gomega"
 
 	"github.com/fluxcd/pkg/apis/meta"
-	sourcev1b2 "github.com/fluxcd/source-controller/api/v1beta2"
+	sourcev1 "github.com/fluxcd/source-controller/api/v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
@@ -33,12 +33,12 @@ func Test_000012_src_bucket_no_outputs_test(t *testing.T) {
 
 	Given("a Bucket")
 	By("defining a new Bucket resource.")
-	testBucket := sourcev1b2.Bucket{
+	testBucket := sourcev1.Bucket{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      sourceName,
 			Namespace: "flux-system",
 		},
-		Spec: sourcev1b2.BucketSpec{
+		Spec: sourcev1.BucketSpec{
 			BucketName: "test-flux-tf-bucket",
 			Provider:   "generic",
 			Interval:   metav1.Duration{Duration: time.Second * 30},
@@ -53,7 +53,7 @@ func Test_000012_src_bucket_no_outputs_test(t *testing.T) {
 	Given("the Bucket's reconciled status.")
 	By("setting the Bucket's status, with the downloadable BLOB's URL, and the correct checksum.")
 	updatedTime := time.Now()
-	testBucket.Status = sourcev1b2.BucketStatus{
+	testBucket.Status = sourcev1.BucketStatus{
 		ObservedGeneration: int64(1),
 		Conditions: []metav1.Condition{
 			{
diff --git a/controllers/tc000012_src_ocirepository_no_outputs_test.go b/controllers/tc000012_src_ocirepository_no_outputs_test.go
@@ -11,7 +11,7 @@ import (
 	. "github.com/onsi/gomega"
 
 	"github.com/fluxcd/pkg/apis/meta"
-	sourcev1b2 "github.com/fluxcd/source-controller/api/v1beta2"
+	sourcev1 "github.com/fluxcd/source-controller/api/v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
@@ -33,15 +33,15 @@ func Test_000012_src_ocirepository_no_outputs_test(t *testing.T) {
 
 	Given("an OCIRepository")
 	By("defining a new OCIRepository resource.")
-	testOCIRepository := sourcev1b2.OCIRepository{
+	testOCIRepository := sourcev1.OCIRepository{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      sourceName,
 			Namespace: "flux-system",
 		},
-		Spec: sourcev1b2.OCIRepositorySpec{
+		Spec: sourcev1.OCIRepositorySpec{
 			URL:      "oci://ghcr.io/flux-iac/aws-primitive-modules",
 			Provider: "generic",
-			Reference: &sourcev1b2.OCIRepositoryRef{
+			Reference: &sourcev1.OCIRepositoryRef{
 				Tag: "v4.38.0-v1alpha11",
 			},
 			Interval: metav1.Duration{Duration: time.Second * 30},
@@ -56,7 +56,7 @@ func Test_000012_src_ocirepository_no_outputs_test(t *testing.T) {
 	Given("the OCIRepository's reconciled status.")
 	By("setting the OCIRepository's status, with the downloadable BLOB's URL, and the correct checksum.")
 	updatedTime := time.Now()
-	testOCIRepository.Status = sourcev1b2.OCIRepositoryStatus{
+	testOCIRepository.Status = sourcev1.OCIRepositoryStatus{
 		ObservedGeneration: int64(1),
 		Conditions: []metav1.Condition{
 			{
diff --git a/controllers/tf_controller.go b/controllers/tf_controller.go
@@ -36,7 +36,6 @@ import (
 	"github.com/fluxcd/pkg/runtime/patch"
 	"github.com/fluxcd/pkg/runtime/predicates"
 	sourcev1 "github.com/fluxcd/source-controller/api/v1"
-	sourcev1b2 "github.com/fluxcd/source-controller/api/v1beta2"
 	"github.com/google/uuid"
 	"github.com/hashicorp/go-retryablehttp"
 	corev1 "k8s.io/api/core/v1"
@@ -607,13 +606,13 @@ func (r *TerraformReconciler) SetupWithManager(mgr ctrl.Manager, maxConcurrentRe
 
 	// Index the Terraforms by the Bucket references they (may) point at.
 	if err := mgr.GetCache().IndexField(context.TODO(), &infrav1.Terraform{}, infrav1.BucketIndexKey,
-		r.IndexBy(sourcev1b2.BucketKind)); err != nil {
+		r.IndexBy(sourcev1.BucketKind)); err != nil {
 		return fmt.Errorf("failed setting index fields: %w", err)
 	}
 
 	// Index the Terraforms by the OCIRepository references they (may) point at.
 	if err := mgr.GetCache().IndexField(context.TODO(), &infrav1.Terraform{}, infrav1.OCIRepositoryIndexKey,
-		r.IndexBy(sourcev1b2.OCIRepositoryKind)); err != nil {
+		r.IndexBy(sourcev1.OCIRepositoryKind)); err != nil {
 		return fmt.Errorf("failed setting index fields: %w", err)
 	}
 
@@ -639,12 +638,12 @@ func (r *TerraformReconciler) SetupWithManager(mgr ctrl.Manager, maxConcurrentRe
 			builder.WithPredicates(SourceRevisionChangePredicate{}),
 		).
 		Watches(
-			&sourcev1b2.Bucket{},
+			&sourcev1.Bucket{},
 			handler.EnqueueRequestsFromMapFunc(r.requestsForRevisionChangeOf(infrav1.BucketIndexKey)),
 			builder.WithPredicates(SourceRevisionChangePredicate{}),
 		).
 		Watches(
-			&sourcev1b2.OCIRepository{},
+			&sourcev1.OCIRepository{},
 			handler.EnqueueRequestsFromMapFunc(r.requestsForRevisionChangeOf(infrav1.OCIRepositoryIndexKey)),
 			builder.WithPredicates(SourceRevisionChangePredicate{}),
 		).
@@ -802,8 +801,8 @@ func (r *TerraformReconciler) getSource(ctx context.Context, terraform *infrav1.
 			return sourceObj, fmt.Errorf("unable to get source '%s': %w", sourceReference, err)
 		}
 		sourceObj = &repository
-	case sourcev1b2.BucketKind:
-		var bucket sourcev1b2.Bucket
+	case sourcev1.BucketKind:
+		var bucket sourcev1.Bucket
 		err := r.Client.Get(ctx, sourceReference, &bucket)
 		if err != nil {
 			if apierrors.IsNotFound(err) {
@@ -812,8 +811,8 @@ func (r *TerraformReconciler) getSource(ctx context.Context, terraform *infrav1.
 			return sourceObj, fmt.Errorf("unable to get source '%s': %w", sourceReference, err)
 		}
 		sourceObj = &bucket
-	case sourcev1b2.OCIRepositoryKind:
-		var repository sourcev1b2.OCIRepository
+	case sourcev1.OCIRepositoryKind:
+		var repository sourcev1.OCIRepository
 		err := r.Client.Get(ctx, sourceReference, &repository)
 		if err != nil {
 			if apierrors.IsNotFound(err) {
diff --git a/docs/branch-planner/rc.yaml b/docs/branch-planner/rc.yaml
@@ -1,5 +1,5 @@
 ---
-apiVersion: source.toolkit.fluxcd.io/v1beta2
+apiVersion: source.toolkit.fluxcd.io/v1
 kind: HelmRepository
 metadata:
   name: tf-controller
diff --git a/docs/branch-planner/release.yaml b/docs/branch-planner/release.yaml
@@ -1,5 +1,5 @@
 ---
-apiVersion: source.toolkit.fluxcd.io/v1beta2
+apiVersion: source.toolkit.fluxcd.io/v1
 kind: HelmRepository
 metadata:
   name: tf-controller
diff --git a/docs/rc-gke.yaml b/docs/rc-gke.yaml
@@ -1,5 +1,5 @@
 ---
-apiVersion: source.toolkit.fluxcd.io/v1beta2
+apiVersion: source.toolkit.fluxcd.io/v1
 kind: HelmRepository
 metadata:
   name: tf-controller
@@ -46,4 +46,4 @@ spec:
       tag: v0.16.0-rc.7
     runner:
       image:
-        tag: v0.16.0-rc.7
+        tag: v0.16.0-rc.7
diff --git a/docs/rc.yaml b/docs/rc.yaml
@@ -1,5 +1,5 @@
 ---
-apiVersion: source.toolkit.fluxcd.io/v1beta2
+apiVersion: source.toolkit.fluxcd.io/v1
 kind: HelmRepository
 metadata:
   name: tofu-controller
diff --git a/docs/use-tf-controller/with-an-oci-artifact-as-source.md b/docs/use-tf-controller/with-an-oci-artifact-as-source.md
@@ -20,7 +20,7 @@ Then you define a source (`OCIRepository`), and use it as the `sourceRef` of you
 
 ```yaml hl_lines="5 20-22"
 ---
-apiVersion: source.toolkit.fluxcd.io/v1beta2
+apiVersion: source.toolkit.fluxcd.io/v1
 kind: OCIRepository
 metadata:
   name: helloworld-oci
diff --git a/docs/use-tf-controller/with-primitive-modules.md b/docs/use-tf-controller/with-primitive-modules.md
@@ -32,7 +32,7 @@ Finally, we need to set the `spec.approvePlan` field to `auto` to automatically
 
 ```yaml hl_lines="19-25"
 ---
-apiVersion: source.toolkit.fluxcd.io/v1beta2
+apiVersion: source.toolkit.fluxcd.io/v1
 kind: OCIRepository
 metadata:
   name: hello-package-v4.32.0
diff --git a/runner/suite_test.go b/runner/suite_test.go
@@ -26,7 +26,6 @@ import (
 	infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2"
 	"github.com/fluxcd/pkg/runtime/logger"
 	sourcev1 "github.com/fluxcd/source-controller/api/v1"
-	sourcev1b2 "github.com/fluxcd/source-controller/api/v1beta2"
 	"k8s.io/client-go/rest"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
@@ -98,11 +97,6 @@ func TestMain(m *testing.M) {
 		panic(err.Error())
 	}
 
-	err = sourcev1b2.AddToScheme(scheme)
-	if err != nil {
-		panic(err.Error())
-	}
-
 	err = infrav1.AddToScheme(scheme)
 	if err != nil {
 		panic(err.Error())
