Update Source APIs to v1.0.0-rc.1

Signed-off-by: Stefan Prodan <[email protected]>

config/default/kustomization.yaml

@@ -2,8 +2,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: kustomize-system
 resources:
-- https:/fluxcd/source-controller/releases/download/v0.36.0/source-controller.crds.yaml
-- https:/fluxcd/source-controller/releases/download/v0.36.0/source-controller.deployment.yaml
+- https:/fluxcd/source-controller/releases/download/v1.0.0-rc.1/source-controller.crds.yaml
+- https:/fluxcd/source-controller/releases/download/v1.0.0-rc.1/source-controller.deployment.yaml
 - ../crd
 - ../rbac
 - ../manager

config/samples/source_v1beta2_gitrepository.yaml → config/samples/source_v1_gitrepository.yaml

@@ -1,4 +1,4 @@
-apiVersion: source.toolkit.fluxcd.io/v1beta2
+apiVersion: source.toolkit.fluxcd.io/v1
 kind: GitRepository
 metadata:
  name: webapp-latest
@@ -8,7 +8,7 @@ spec:
  ref:
  branch: master
 ---
-apiVersion: source.toolkit.fluxcd.io/v1beta2
+apiVersion: source.toolkit.fluxcd.io/v1
 kind: GitRepository
 metadata:
  name: webapp-releases

config/testdata/crds-crs/cert-manager.yaml

@@ -1,4 +1,4 @@
-apiVersion: source.toolkit.fluxcd.io/v1beta1
+apiVersion: source.toolkit.fluxcd.io/v1
 kind: GitRepository
 metadata:
  name: certs

config/testdata/dependencies/source.yaml

@@ -1,4 +1,4 @@
-apiVersion: source.toolkit.fluxcd.io/v1beta1
+apiVersion: source.toolkit.fluxcd.io/v1
 kind: GitRepository
 metadata:
  name: webapp

config/testdata/status-defaults/empty-kustomization.yaml

@@ -1,4 +1,4 @@
-apiVersion: kustomize.toolkit.fluxcd.io/v1beta1
+apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
  name: status-defaults

go.mod

@@ -34,7 +34,7 @@ require (
  github.com/fluxcd/pkg/ssa v0.27.0
  github.com/fluxcd/pkg/tar v0.2.0
  github.com/fluxcd/pkg/testserver v0.4.0
- github.com/fluxcd/source-controller/api v0.36.1
+ github.com/fluxcd/source-controller/api v1.0.0-rc.1
  github.com/hashicorp/vault/api v1.9.0
  github.com/onsi/gomega v1.27.5
  github.com/opencontainers/go-digest v1.0.0

go.sum

@@ -232,8 +232,8 @@ github.com/fluxcd/pkg/tar v0.2.0 h1:HEUHgONQYsJGeZZ4x6h5nQU9Aox1I4T3bOp1faWTqf8=
 github.com/fluxcd/pkg/tar v0.2.0/go.mod h1:w0/TOC7kwBJhnSJn7TCABkc/I7ib1f2Yz6vOsbLBnhw=
 github.com/fluxcd/pkg/testserver v0.4.0 h1:pDZ3gistqYhwlf3sAjn1Q8NzN4Qe6I1BEmHMHi46lMg=
 github.com/fluxcd/pkg/testserver v0.4.0/go.mod h1:gjOKX41okmrGYOa4oOF2fiLedDAfPo1XaG/EzrUUGBI=
-github.com/fluxcd/source-controller/api v0.36.1 h1:/ul69kJNEwrFG1Cwk2P/GwgraIxOETCL+tP+zMtxTu8=
-github.com/fluxcd/source-controller/api v0.36.1/go.mod h1:GktZmd5Dfxo84vPFBdLDl0bBtiJRODfd47uugK0romU=
+github.com/fluxcd/source-controller/api v1.0.0-rc.1 h1:MZaP5utClMG95Aw/AVu1l05WEfmpEw/RIlCLnkCQl14=
+github.com/fluxcd/source-controller/api v1.0.0-rc.1/go.mod h1:CvGNdS8g/MqwpERUK6aJp4lndsrm+JBzGpoyyZ4u0c8=
 github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k=
 github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=
 github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw=

internal/controllers/kustomization_acl_test.go

@@ -25,7 +25,7 @@ import (
  apiacl "github.com/fluxcd/pkg/apis/acl"
  "github.com/fluxcd/pkg/apis/meta"
  "github.com/fluxcd/pkg/testserver"
- sourcev1 "github.com/fluxcd/source-controller/api/v1beta2"
+ sourcev1 "github.com/fluxcd/source-controller/api/v1"
  . "github.com/onsi/gomega"
  apimeta "k8s.io/apimachinery/pkg/api/meta"
  metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

internal/controllers/kustomization_controller.go

@@ -60,7 +60,8 @@ import (
  "github.com/fluxcd/pkg/runtime/predicates"
  "github.com/fluxcd/pkg/ssa"
  "github.com/fluxcd/pkg/tar"
- sourcev1 "github.com/fluxcd/source-controller/api/v1beta2"
+ sourcev1 "github.com/fluxcd/source-controller/api/v1"
+ sourcev1b2 "github.com/fluxcd/source-controller/api/v1beta2"
 
  kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1"
  "github.com/fluxcd/kustomize-controller/internal/decryptor"
@@ -110,7 +111,7 @@ func (r *KustomizationReconciler) SetupWithManager(mgr ctrl.Manager, opts Kustom
 
  // Index the Kustomizations by the OCIRepository references they (may) point at.
  if err := mgr.GetCache().IndexField(context.TODO(), &kustomizev1.Kustomization{}, ociRepositoryIndexKey,
- r.indexBy(sourcev1.OCIRepositoryKind)); err != nil {
+ r.indexBy(sourcev1b2.OCIRepositoryKind)); err != nil {
  return fmt.Errorf("failed setting index fields: %w", err)
  }
 
@@ -122,7 +123,7 @@ func (r *KustomizationReconciler) SetupWithManager(mgr ctrl.Manager, opts Kustom
 
  // Index the Kustomizations by the Bucket references they (may) point at.
  if err := mgr.GetCache().IndexField(context.TODO(), &kustomizev1.Kustomization{}, bucketIndexKey,
- r.indexBy(sourcev1.BucketKind)); err != nil {
+ r.indexBy(sourcev1b2.BucketKind)); err != nil {
  return fmt.Errorf("failed setting index fields: %w", err)
  }
 
@@ -141,7 +142,7 @@ func (r *KustomizationReconciler) SetupWithManager(mgr ctrl.Manager, opts Kustom
  predicate.Or(predicate.GenerationChangedPredicate{}, predicates.ReconcileRequestedPredicate{}),
  )).
  Watches(
- &source.Kind{Type: &sourcev1.OCIRepository{}},
+ &source.Kind{Type: &sourcev1b2.OCIRepository{}},
  handler.EnqueueRequestsFromMapFunc(r.requestsForRevisionChangeOf(ociRepositoryIndexKey)),
  builder.WithPredicates(SourceRevisionChangePredicate{}),
  ).
@@ -151,7 +152,7 @@ func (r *KustomizationReconciler) SetupWithManager(mgr ctrl.Manager, opts Kustom
  builder.WithPredicates(SourceRevisionChangePredicate{}),
  ).
  Watches(
- &source.Kind{Type: &sourcev1.Bucket{}},
+ &source.Kind{Type: &sourcev1b2.Bucket{}},
  handler.EnqueueRequestsFromMapFunc(r.requestsForRevisionChangeOf(bucketIndexKey)),
  builder.WithPredicates(SourceRevisionChangePredicate{}),
  ).
@@ -517,8 +518,8 @@ func (r *KustomizationReconciler) getSource(ctx context.Context,
  }
 
  switch obj.Spec.SourceRef.Kind {
- case sourcev1.OCIRepositoryKind:
- var repository sourcev1.OCIRepository
+ case sourcev1b2.OCIRepositoryKind:
+ var repository sourcev1b2.OCIRepository
  err := r.Client.Get(ctx, namespacedName, &repository)
  if err != nil {
  if apierrors.IsNotFound(err) {
@@ -537,8 +538,8 @@ func (r *KustomizationReconciler) getSource(ctx context.Context,
  return src, fmt.Errorf("unable to get source '%s': %w", namespacedName, err)
  }
  src = &repository
- case sourcev1.BucketKind:
- var bucket sourcev1.Bucket
+ case sourcev1b2.BucketKind:
+ var bucket sourcev1b2.Bucket
  err := r.Client.Get(ctx, namespacedName, &bucket)
  if err != nil {
  if apierrors.IsNotFound(err) {

internal/controllers/kustomization_decryptor_test.go

@@ -25,7 +25,7 @@ import (
  "time"
 
  "github.com/fluxcd/pkg/apis/meta"
- sourcev1 "github.com/fluxcd/source-controller/api/v1beta2"
+ sourcev1 "github.com/fluxcd/source-controller/api/v1"
  "github.com/hashicorp/vault/api"
  . "github.com/onsi/gomega"
  corev1 "k8s.io/api/core/v1"

internal/controllers/kustomization_dependson_test.go

@@ -24,7 +24,7 @@ import (
 
  "github.com/fluxcd/pkg/apis/meta"
  "github.com/fluxcd/pkg/testserver"
- sourcev1 "github.com/fluxcd/source-controller/api/v1beta2"
+ sourcev1 "github.com/fluxcd/source-controller/api/v1"
  . "github.com/onsi/gomega"
  apimeta "k8s.io/apimachinery/pkg/api/meta"
  metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

internal/controllers/kustomization_fetcher_test.go

@@ -25,7 +25,7 @@ import (
 
  "github.com/fluxcd/pkg/apis/meta"
  "github.com/fluxcd/pkg/testserver"
- sourcev1 "github.com/fluxcd/source-controller/api/v1beta2"
+ sourcev1 "github.com/fluxcd/source-controller/api/v1"
  . "github.com/onsi/gomega"
  apimeta "k8s.io/apimachinery/pkg/api/meta"
  metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

internal/controllers/kustomization_force_test.go

@@ -24,7 +24,7 @@ import (
 
  "github.com/fluxcd/pkg/apis/meta"
  "github.com/fluxcd/pkg/testserver"
- sourcev1 "github.com/fluxcd/source-controller/api/v1beta2"
+ sourcev1 "github.com/fluxcd/source-controller/api/v1"
  . "github.com/onsi/gomega"
  corev1 "k8s.io/api/core/v1"
  apimeta "k8s.io/apimachinery/pkg/api/meta"

internal/controllers/kustomization_fuzzer_test.go

@@ -57,7 +57,7 @@ import (
  "github.com/fluxcd/pkg/runtime/controller"
  "github.com/fluxcd/pkg/runtime/testenv"
  "github.com/fluxcd/pkg/testserver"
- sourcev1 "github.com/fluxcd/source-controller/api/v1beta2"
+ sourcev1 "github.com/fluxcd/source-controller/api/v1"
 
  fuzz "github.com/AdaLogics/go-fuzz-headers"
 

internal/controllers/kustomization_impersonation_test.go

@@ -24,7 +24,7 @@ import (
 
  "github.com/fluxcd/pkg/apis/meta"
  "github.com/fluxcd/pkg/testserver"
- sourcev1 "github.com/fluxcd/source-controller/api/v1beta2"
+ sourcev1 "github.com/fluxcd/source-controller/api/v1"
  . "github.com/onsi/gomega"
  corev1 "k8s.io/api/core/v1"
  rbacv1 "k8s.io/api/rbac/v1"

internal/controllers/kustomization_indexers.go

@@ -24,7 +24,7 @@ import (
  "sigs.k8s.io/controller-runtime/pkg/reconcile"
 
  "github.com/fluxcd/pkg/runtime/dependency"
- sourcev1 "github.com/fluxcd/source-controller/api/v1beta2"
+ sourcev1 "github.com/fluxcd/source-controller/api/v1"
 
  kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1"
 )

internal/controllers/kustomization_inventory_test.go

@@ -29,7 +29,7 @@ import (
 
  "github.com/fluxcd/pkg/apis/meta"
  "github.com/fluxcd/pkg/testserver"
- sourcev1 "github.com/fluxcd/source-controller/api/v1beta2"
+ sourcev1 "github.com/fluxcd/source-controller/api/v1"
  . "github.com/onsi/gomega"
  apimeta "k8s.io/apimachinery/pkg/api/meta"
  metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

internal/controllers/kustomization_prune_test.go

@@ -24,7 +24,7 @@ import (
 
  "github.com/fluxcd/pkg/apis/meta"
  "github.com/fluxcd/pkg/testserver"
- sourcev1 "github.com/fluxcd/source-controller/api/v1beta2"
+ sourcev1 "github.com/fluxcd/source-controller/api/v1"
  . "github.com/onsi/gomega"
  corev1 "k8s.io/api/core/v1"
  apierrors "k8s.io/apimachinery/pkg/api/errors"

internal/controllers/kustomization_transformer_test.go

@@ -26,7 +26,7 @@ import (
  "github.com/fluxcd/pkg/apis/kustomize"
  "github.com/fluxcd/pkg/apis/meta"
  "github.com/fluxcd/pkg/testserver"
- sourcev1 "github.com/fluxcd/source-controller/api/v1beta2"
+ sourcev1 "github.com/fluxcd/source-controller/api/v1"
  . "github.com/onsi/gomega"
  appsv1 "k8s.io/api/apps/v1"
  corev1 "k8s.io/api/core/v1"

internal/controllers/kustomization_validation_test.go

@@ -23,7 +23,7 @@ import (
  "time"
 
  "github.com/fluxcd/pkg/apis/meta"
- sourcev1 "github.com/fluxcd/source-controller/api/v1beta2"
+ sourcev1 "github.com/fluxcd/source-controller/api/v1"
  . "github.com/onsi/gomega"
  metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
  "k8s.io/apimachinery/pkg/types"

internal/controllers/kustomization_varsub_test.go

@@ -23,7 +23,7 @@ import (
 
  "github.com/fluxcd/pkg/apis/meta"
  "github.com/fluxcd/pkg/testserver"
- sourcev1 "github.com/fluxcd/source-controller/api/v1beta2"
+ sourcev1 "github.com/fluxcd/source-controller/api/v1"
  . "github.com/onsi/gomega"
  corev1 "k8s.io/api/core/v1"
  apimeta "k8s.io/apimachinery/pkg/api/meta"

internal/controllers/kustomization_wait_test.go

@@ -32,7 +32,7 @@ import (
  "github.com/fluxcd/pkg/apis/meta"
  "github.com/fluxcd/pkg/runtime/conditions"
  "github.com/fluxcd/pkg/testserver"
- sourcev1 "github.com/fluxcd/source-controller/api/v1beta2"
+ sourcev1 "github.com/fluxcd/source-controller/api/v1"
 
  kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1"
 )

internal/controllers/source_predicate.go

@@ -20,7 +20,7 @@ import (
  "sigs.k8s.io/controller-runtime/pkg/event"
  "sigs.k8s.io/controller-runtime/pkg/predicate"
 
- sourcev1 "github.com/fluxcd/source-controller/api/v1beta2"
+ sourcev1 "github.com/fluxcd/source-controller/api/v1"
 )
 
 type SourceRevisionChangePredicate struct {

internal/controllers/suite_test.go

@@ -45,7 +45,8 @@ import (
  "github.com/fluxcd/pkg/runtime/controller"
  "github.com/fluxcd/pkg/runtime/testenv"
  "github.com/fluxcd/pkg/testserver"
- sourcev1 "github.com/fluxcd/source-controller/api/v1beta2"
+ sourcev1 "github.com/fluxcd/source-controller/api/v1"
+ sourcev1b2 "github.com/fluxcd/source-controller/api/v1beta2"
 
  kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1"
 )
@@ -77,8 +78,9 @@ var (
 
 func runInContext(registerControllers func(*testenv.Environment), run func() error, crdPath string) error {
  var err error
- utilruntime.Must(sourcev1.AddToScheme(scheme.Scheme))
  utilruntime.Must(kustomizev1.AddToScheme(scheme.Scheme))
+ utilruntime.Must(sourcev1.AddToScheme(scheme.Scheme))
+ utilruntime.Must(sourcev1b2.AddToScheme(scheme.Scheme))
 
  if debugMode {
  controllerLog.SetLogger(zap.New(zap.WriteTo(os.Stderr), zap.UseDevMode(false)))

main.go

@@ -43,7 +43,7 @@ import (
  "github.com/fluxcd/pkg/runtime/logger"
  "github.com/fluxcd/pkg/runtime/pprof"
  "github.com/fluxcd/pkg/runtime/probes"
- sourcev1 "github.com/fluxcd/source-controller/api/v1beta2"
+ sourcev1 "github.com/fluxcd/source-controller/api/v1"
 
  kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1"
  "github.com/fluxcd/kustomize-controller/internal/controllers"