Skip to content

Commit 2aea6dd

Browse files
gianlucam76gianlucam76
authored
Merge pull request #1654 from aamoyel/flux-source-version-deprecation
chore: remove deprecated flux sources api versions (v1beta2)
2 parents 29ce199 + b4c0c2f commit 2aea6dd

6 files changed

Lines changed: 110 additions & 69 deletions

File tree

‎controllers/clustersummary_controller.go‎

Lines changed: 52 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ import (
2727
"time"
2828

2929
sourcev1 "github.com/fluxcd/source-controller/api/v1"
30-
sourcev1b2 "github.com/fluxcd/source-controller/api/v1beta2"
3130
"github.com/go-logr/logr"
3231
corev1 "k8s.io/api/core/v1"
3332
apierrors "k8s.io/apimachinery/pkg/api/errors"
@@ -616,19 +615,19 @@ func (r *ClusterSummaryReconciler) WatchForFlux(mgr ctrl.Manager, c controller.C
616615
return err
617616
}
618617

619-
sourceOCIRepository := source.Kind[*sourcev1b2.OCIRepository](
618+
sourceOCIRepository := source.Kind[*sourcev1.OCIRepository](
620619
mgr.GetCache(),
621-
&sourcev1b2.OCIRepository{},
620+
&sourcev1.OCIRepository{},
622621
handler.TypedEnqueueRequestsFromMapFunc(r.requeueClusterSummaryForFluxOCIRepository),
623622
FluxOCIRepositoryPredicate{Logger: mgr.GetLogger().WithValues("predicate", "fluxsourcepredicate")},
624623
)
625624
if err := c.Watch(sourceOCIRepository); err != nil {
626625
return err
627626
}
628627

629-
sourceBucket := source.Kind[*sourcev1b2.Bucket](
628+
sourceBucket := source.Kind[*sourcev1.Bucket](
630629
mgr.GetCache(),
631-
&sourcev1b2.Bucket{},
630+
&sourcev1.Bucket{},
632631
handler.TypedEnqueueRequestsFromMapFunc(r.requeueClusterSummaryForFluxBucket),
633632
FluxBucketPredicate{Logger: mgr.GetLogger().WithValues("predicate", "fluxsourcepredicate")},
634633
)
@@ -684,7 +683,12 @@ func (r *ClusterSummaryReconciler) deploy(ctx context.Context, clusterSummarySco
684683
return nil
685684
}
686685

687-
func (r *ClusterSummaryReconciler) deployKustomizeRefs(ctx context.Context, clusterSummaryScope *scope.ClusterSummaryScope, logger logr.Logger) error {
686+
func (r *ClusterSummaryReconciler) deployKustomizeRefs(
687+
ctx context.Context,
688+
clusterSummaryScope *scope.ClusterSummaryScope,
689+
logger logr.Logger,
690+
) error {
691+
688692
if clusterSummaryScope.ClusterSummary.Spec.ClusterProfileSpec.KustomizationRefs == nil {
689693
logger.V(logs.LogDebug).Info("no kustomize policy configuration")
690694
if !r.isFeatureStatusPresent(clusterSummaryScope.ClusterSummary, libsveltosv1beta1.FeatureKustomize) {
@@ -698,7 +702,12 @@ func (r *ClusterSummaryReconciler) deployKustomizeRefs(ctx context.Context, clus
698702
return r.deployFeature(ctx, clusterSummaryScope, f, logger)
699703
}
700704

701-
func (r *ClusterSummaryReconciler) deployResources(ctx context.Context, clusterSummaryScope *scope.ClusterSummaryScope, logger logr.Logger) error {
705+
func (r *ClusterSummaryReconciler) deployResources(
706+
ctx context.Context,
707+
clusterSummaryScope *scope.ClusterSummaryScope,
708+
logger logr.Logger,
709+
) error {
710+
702711
if clusterSummaryScope.ClusterSummary.Spec.ClusterProfileSpec.PolicyRefs == nil {
703712
logger.V(logs.LogDebug).Info("no policy configuration")
704713
if !r.isFeatureStatusPresent(clusterSummaryScope.ClusterSummary, libsveltosv1beta1.FeatureResources) {
@@ -712,7 +721,12 @@ func (r *ClusterSummaryReconciler) deployResources(ctx context.Context, clusterS
712721
return r.deployFeature(ctx, clusterSummaryScope, f, logger)
713722
}
714723

715-
func (r *ClusterSummaryReconciler) deployHelm(ctx context.Context, clusterSummaryScope *scope.ClusterSummaryScope, logger logr.Logger) error {
724+
func (r *ClusterSummaryReconciler) deployHelm(
725+
ctx context.Context,
726+
clusterSummaryScope *scope.ClusterSummaryScope,
727+
logger logr.Logger,
728+
) error {
729+
716730
if clusterSummaryScope.ClusterSummary.Spec.ClusterProfileSpec.HelmCharts == nil {
717731
logger.V(logs.LogDebug).Info("no helm configuration")
718732
if !r.isFeatureStatusPresent(clusterSummaryScope.ClusterSummary, libsveltosv1beta1.FeatureHelm) {
@@ -766,17 +780,32 @@ func (r *ClusterSummaryReconciler) undeploy(ctx context.Context, clusterSummaryS
766780
return nil
767781
}
768782

769-
func (r *ClusterSummaryReconciler) undeployResources(ctx context.Context, clusterSummaryScope *scope.ClusterSummaryScope, logger logr.Logger) error {
783+
func (r *ClusterSummaryReconciler) undeployResources(
784+
ctx context.Context,
785+
clusterSummaryScope *scope.ClusterSummaryScope,
786+
logger logr.Logger,
787+
) error {
788+
770789
f := getHandlersForFeature(libsveltosv1beta1.FeatureResources)
771790
return r.undeployFeature(ctx, clusterSummaryScope, f, logger)
772791
}
773792

774-
func (r *ClusterSummaryReconciler) undeployKustomizeResources(ctx context.Context, clusterSummaryScope *scope.ClusterSummaryScope, logger logr.Logger) error {
793+
func (r *ClusterSummaryReconciler) undeployKustomizeResources(
794+
ctx context.Context,
795+
clusterSummaryScope *scope.ClusterSummaryScope,
796+
logger logr.Logger,
797+
) error {
798+
775799
f := getHandlersForFeature(libsveltosv1beta1.FeatureKustomize)
776800
return r.undeployFeature(ctx, clusterSummaryScope, f, logger)
777801
}
778802

779-
func (r *ClusterSummaryReconciler) undeployHelm(ctx context.Context, clusterSummaryScope *scope.ClusterSummaryScope, logger logr.Logger) error {
803+
func (r *ClusterSummaryReconciler) undeployHelm(
804+
ctx context.Context,
805+
clusterSummaryScope *scope.ClusterSummaryScope,
806+
logger logr.Logger,
807+
) error {
808+
780809
f := getHandlersForFeature(libsveltosv1beta1.FeatureHelm)
781810
return r.undeployFeature(ctx, clusterSummaryScope, f, logger)
782811
}
@@ -1058,9 +1087,9 @@ func getPolicyRefGroupVersionKind(ref *configv1beta1.PolicyRef) *schema.GroupVer
10581087
case sourcev1.GitRepositoryKind:
10591088
return &schema.GroupVersionKind{Group: sourcev1.GroupVersion.Group,
10601089
Version: sourcev1.GroupVersion.Version, Kind: ref.Kind}
1061-
case sourcev1b2.BucketKind, sourcev1b2.OCIRepositoryKind:
1062-
return &schema.GroupVersionKind{Group: sourcev1b2.GroupVersion.Group,
1063-
Version: sourcev1b2.GroupVersion.Version, Kind: ref.Kind}
1090+
case sourcev1.BucketKind, sourcev1.OCIRepositoryKind:
1091+
return &schema.GroupVersionKind{Group: sourcev1.GroupVersion.Group,
1092+
Version: sourcev1.GroupVersion.Version, Kind: ref.Kind}
10641093
}
10651094

10661095
return nil
@@ -1093,10 +1122,10 @@ func (r *ClusterSummaryReconciler) getKustomizationRefReferences(ctx context.Con
10931122
switch kr.Kind {
10941123
case sourcev1.GitRepositoryKind:
10951124
apiVersion = sourcev1.GroupVersion.String()
1096-
case sourcev1b2.OCIRepositoryKind:
1097-
apiVersion = sourcev1b2.GroupVersion.String()
1098-
case sourcev1b2.BucketKind:
1099-
apiVersion = sourcev1b2.GroupVersion.String()
1125+
case sourcev1.OCIRepositoryKind:
1126+
apiVersion = sourcev1.GroupVersion.String()
1127+
case sourcev1.BucketKind:
1128+
apiVersion = sourcev1.GroupVersion.String()
11001129
default:
11011130
apiVersion = corev1.SchemeGroupVersion.String()
11021131
}
@@ -1536,7 +1565,11 @@ func (r *ClusterSummaryReconciler) setFailureMessage(clusterSummaryScope *scope.
15361565
}
15371566
}
15381567

1539-
func (r *ClusterSummaryReconciler) resetFeatureStatus(clusterSummaryScope *scope.ClusterSummaryScope, status libsveltosv1beta1.FeatureStatus) {
1568+
func (r *ClusterSummaryReconciler) resetFeatureStatus(
1569+
clusterSummaryScope *scope.ClusterSummaryScope,
1570+
status libsveltosv1beta1.FeatureStatus,
1571+
) {
1572+
15401573
if clusterSummaryScope.ClusterSummary.Spec.ClusterProfileSpec.HelmCharts != nil {
15411574
clusterSummaryScope.SetFeatureStatus(libsveltosv1beta1.FeatureHelm, status, nil, nil)
15421575
}

‎controllers/clustersummary_predicates.go‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import (
2222

2323
"github.com/fluxcd/pkg/apis/meta"
2424
sourcev1 "github.com/fluxcd/source-controller/api/v1"
25-
sourcev1b2 "github.com/fluxcd/source-controller/api/v1beta2"
2625
"github.com/go-logr/logr"
2726
corev1 "k8s.io/api/core/v1"
2827
"sigs.k8s.io/controller-runtime/pkg/client"
@@ -198,39 +197,39 @@ type FluxOCIRepositoryPredicate struct {
198197
Logger logr.Logger
199198
}
200199

201-
func (p FluxOCIRepositoryPredicate) Create(obj event.TypedCreateEvent[*sourcev1b2.OCIRepository]) bool {
200+
func (p FluxOCIRepositoryPredicate) Create(obj event.TypedCreateEvent[*sourcev1.OCIRepository]) bool {
202201
return fluxCreatePredicate(obj.Object, p.Logger)
203202
}
204203

205-
func (p FluxOCIRepositoryPredicate) Update(obj event.TypedUpdateEvent[*sourcev1b2.OCIRepository]) bool {
204+
func (p FluxOCIRepositoryPredicate) Update(obj event.TypedUpdateEvent[*sourcev1.OCIRepository]) bool {
206205
return fluxUpdatePredicate(obj.ObjectNew, obj.ObjectOld, p.Logger)
207206
}
208207

209-
func (p FluxOCIRepositoryPredicate) Delete(obj event.TypedDeleteEvent[*sourcev1b2.OCIRepository]) bool {
208+
func (p FluxOCIRepositoryPredicate) Delete(obj event.TypedDeleteEvent[*sourcev1.OCIRepository]) bool {
210209
return fluxDeletePredicate(obj.Object, p.Logger)
211210
}
212211

213-
func (p FluxOCIRepositoryPredicate) Generic(obj event.TypedGenericEvent[*sourcev1b2.OCIRepository]) bool {
212+
func (p FluxOCIRepositoryPredicate) Generic(obj event.TypedGenericEvent[*sourcev1.OCIRepository]) bool {
214213
return fluxGenericPredicate(obj.Object, p.Logger)
215214
}
216215

217216
type FluxBucketPredicate struct {
218217
Logger logr.Logger
219218
}
220219

221-
func (p FluxBucketPredicate) Create(obj event.TypedCreateEvent[*sourcev1b2.Bucket]) bool {
220+
func (p FluxBucketPredicate) Create(obj event.TypedCreateEvent[*sourcev1.Bucket]) bool {
222221
return fluxCreatePredicate(obj.Object, p.Logger)
223222
}
224223

225-
func (p FluxBucketPredicate) Update(obj event.TypedUpdateEvent[*sourcev1b2.Bucket]) bool {
224+
func (p FluxBucketPredicate) Update(obj event.TypedUpdateEvent[*sourcev1.Bucket]) bool {
226225
return fluxUpdatePredicate(obj.ObjectNew, obj.ObjectOld, p.Logger)
227226
}
228227

229-
func (p FluxBucketPredicate) Delete(obj event.TypedDeleteEvent[*sourcev1b2.Bucket]) bool {
228+
func (p FluxBucketPredicate) Delete(obj event.TypedDeleteEvent[*sourcev1.Bucket]) bool {
230229
return fluxDeletePredicate(obj.Object, p.Logger)
231230
}
232231

233-
func (p FluxBucketPredicate) Generic(obj event.TypedGenericEvent[*sourcev1b2.Bucket]) bool {
232+
func (p FluxBucketPredicate) Generic(obj event.TypedGenericEvent[*sourcev1.Bucket]) bool {
234233
return fluxGenericPredicate(obj.Object, p.Logger)
235234
}
236235

@@ -294,17 +293,17 @@ func hasArtifactChanged(objNew, objOld client.Object) bool {
294293

295294
return true
296295
}
297-
case sourcev1b2.BucketKind:
298-
newBucket := objNew.(*sourcev1b2.Bucket)
299-
oldBucket := objOld.(*sourcev1b2.Bucket)
296+
case sourcev1.BucketKind:
297+
newBucket := objNew.(*sourcev1.Bucket)
298+
oldBucket := objOld.(*sourcev1.Bucket)
300299
if oldBucket == nil ||
301300
!isArtifactSame(oldBucket.Status.Artifact, newBucket.Status.Artifact) {
302301

303302
return true
304303
}
305-
case sourcev1b2.OCIRepositoryKind:
306-
newOCIRepo := objNew.(*sourcev1b2.OCIRepository)
307-
oldOCIRepo := objOld.(*sourcev1b2.OCIRepository)
304+
case sourcev1.OCIRepositoryKind:
305+
newOCIRepo := objNew.(*sourcev1.OCIRepository)
306+
oldOCIRepo := objOld.(*sourcev1.OCIRepository)
308307
if oldOCIRepo == nil ||
309308
!isArtifactSame(oldOCIRepo.Status.Artifact, newOCIRepo.Status.Artifact) {
310309

‎controllers/clustersummary_transformations.go‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ import (
2727
"sigs.k8s.io/controller-runtime/pkg/reconcile"
2828

2929
sourcev1 "github.com/fluxcd/source-controller/api/v1"
30-
sourcev1b2 "github.com/fluxcd/source-controller/api/v1beta2"
3130

3231
"github.com/projectsveltos/addon-controller/controllers/clustercache"
3332
libsveltosv1beta1 "github.com/projectsveltos/libsveltos/api/v1beta1"
@@ -43,14 +42,14 @@ func (r *ClusterSummaryReconciler) requeueClusterSummaryForFluxGitRepository(
4342
}
4443

4544
func (r *ClusterSummaryReconciler) requeueClusterSummaryForFluxOCIRepository(
46-
ctx context.Context, o *sourcev1b2.OCIRepository,
45+
ctx context.Context, o *sourcev1.OCIRepository,
4746
) []reconcile.Request {
4847

4948
return r.requeueClusterSummaryForFluxSource(ctx, o)
5049
}
5150

5251
func (r *ClusterSummaryReconciler) requeueClusterSummaryForFluxBucket(
53-
ctx context.Context, o *sourcev1b2.Bucket,
52+
ctx context.Context, o *sourcev1.Bucket,
5453
) []reconcile.Request {
5554

5655
return r.requeueClusterSummaryForFluxSource(ctx, o)
@@ -82,17 +81,17 @@ func (r *ClusterSummaryReconciler) requeueClusterSummaryForFluxSource(
8281
Namespace: o.GetNamespace(),
8382
Name: o.GetName(),
8483
}
85-
case *sourcev1b2.OCIRepository:
84+
case *sourcev1.OCIRepository:
8685
key = corev1.ObjectReference{
87-
APIVersion: sourcev1b2.GroupVersion.String(),
88-
Kind: sourcev1b2.OCIRepositoryKind,
86+
APIVersion: sourcev1.GroupVersion.String(),
87+
Kind: sourcev1.OCIRepositoryKind,
8988
Namespace: o.GetNamespace(),
9089
Name: o.GetName(),
9190
}
92-
case *sourcev1b2.Bucket:
91+
case *sourcev1.Bucket:
9392
key = corev1.ObjectReference{
94-
APIVersion: sourcev1b2.GroupVersion.String(),
95-
Kind: sourcev1b2.BucketKind,
93+
APIVersion: sourcev1.GroupVersion.String(),
94+
Kind: sourcev1.BucketKind,
9695
Namespace: o.GetNamespace(),
9796
Name: o.GetName(),
9897
}

‎controllers/flux_source.go‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import (
2525
"github.com/fluxcd/pkg/http/fetch"
2626
"github.com/fluxcd/pkg/tar"
2727
sourcev1 "github.com/fluxcd/source-controller/api/v1"
28-
sourcev1b2 "github.com/fluxcd/source-controller/api/v1beta2"
2928
"github.com/go-logr/logr"
3029
corev1 "k8s.io/api/core/v1"
3130
apierrors "k8s.io/apimachinery/pkg/api/errors"
@@ -97,8 +96,8 @@ func getSource(ctx context.Context, c client.Client, namespace, sourceName, sour
9796
return nil, fmt.Errorf("unable to get source '%s': %w", namespacedName, err)
9897
}
9998
return &repository, nil
100-
case sourcev1b2.OCIRepositoryKind:
101-
var repository sourcev1b2.OCIRepository
99+
case sourcev1.OCIRepositoryKind:
100+
var repository sourcev1.OCIRepository
102101
err := c.Get(ctx, namespacedName, &repository)
103102
if err != nil {
104103
if apierrors.IsNotFound(err) {
@@ -107,8 +106,8 @@ func getSource(ctx context.Context, c client.Client, namespace, sourceName, sour
107106
return nil, fmt.Errorf("unable to get source '%s': %w", namespacedName, err)
108107
}
109108
return &repository, nil
110-
case sourcev1b2.BucketKind:
111-
var bucket sourcev1b2.Bucket
109+
case sourcev1.BucketKind:
110+
var bucket sourcev1.Bucket
112111
err := c.Get(ctx, namespacedName, &bucket)
113112
if err != nil {
114113
if apierrors.IsNotFound(err) {
@@ -162,12 +161,12 @@ func getReferencedFluxSourceFromURL(hc *configv1beta1.HelmChart) (*corev1.Object
162161
case strings.ToLower(sourcev1.GitRepositoryKind):
163162
sourceRef.Kind = sourcev1.GitRepositoryKind
164163
sourceRef.APIVersion = sourcev1.GroupVersion.String()
165-
case strings.ToLower(sourcev1b2.OCIRepositoryKind):
166-
sourceRef.Kind = sourcev1b2.OCIRepositoryKind
167-
sourceRef.APIVersion = sourcev1b2.GroupVersion.String()
168-
case strings.ToLower(sourcev1b2.BucketKind):
169-
sourceRef.Kind = sourcev1b2.BucketKind
170-
sourceRef.APIVersion = sourcev1b2.GroupVersion.String()
164+
case strings.ToLower(sourcev1.OCIRepositoryKind):
165+
sourceRef.Kind = sourcev1.OCIRepositoryKind
166+
sourceRef.APIVersion = sourcev1.GroupVersion.String()
167+
case strings.ToLower(sourcev1.BucketKind):
168+
sourceRef.Kind = sourcev1.BucketKind
169+
sourceRef.APIVersion = sourcev1.GroupVersion.String()
171170
}
172171
return sourceRef, sourcePath, nil
173172
}

0 commit comments

Comments
 (0)