From 7282308883b1a11a76279b1b505263fe66eb867f Mon Sep 17 00:00:00 2001 From: Stefan Prodan Date: Sun, 10 Oct 2021 15:28:12 +0300 Subject: [PATCH] Fix SSA upstream bugs for Kubernetes < 1.22 Signed-off-by: Stefan Prodan --- controllers/kustomization_controller.go | 3 +++ go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/controllers/kustomization_controller.go b/controllers/kustomization_controller.go index 3c3b8494..3b9d1cee 100644 --- a/controllers/kustomization_controller.go +++ b/controllers/kustomization_controller.go @@ -651,6 +651,9 @@ func (r *KustomizationReconciler) apply(ctx context.Context, manager *ssa.Resour // sort by kind, validate and apply all the others objects sort.Sort(ssa.SortableUnstructureds(stageTwo)) if len(stageTwo) > 0 { + if err := ssa.SetNativeKindsDefaults(stageTwo); err != nil { + return false, err + } changeSet, err := manager.ApplyAll(ctx, stageTwo, kustomization.Spec.Force) if err != nil { return false, fmt.Errorf("%w\n%s", err, changeSetLog.String()) diff --git a/go.mod b/go.mod index 28ef9756..e13b0f0a 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,7 @@ require ( github.com/fluxcd/pkg/apis/kustomize v0.2.0 github.com/fluxcd/pkg/apis/meta v0.10.1 github.com/fluxcd/pkg/runtime v0.12.2 - github.com/fluxcd/pkg/ssa v0.0.2 + github.com/fluxcd/pkg/ssa v0.0.3 github.com/fluxcd/pkg/testserver v0.1.0 github.com/fluxcd/pkg/untar v0.1.0 github.com/fluxcd/source-controller/api v0.16.0 diff --git a/go.sum b/go.sum index 270955b7..34a27cab 100644 --- a/go.sum +++ b/go.sum @@ -218,8 +218,8 @@ github.com/fluxcd/pkg/apis/meta v0.10.1/go.mod h1:yUblM2vg+X8TE3A2VvJfdhkGmg+uqB github.com/fluxcd/pkg/runtime v0.12.0/go.mod h1:EyaTR2TOYcjL5U//C4yH3bt2tvTgIOSXpVRbWxUn/C4= github.com/fluxcd/pkg/runtime v0.12.2 h1:4iOpx2j/w15kNemDOnZrF6ugJ/rhSmRu7aI+xn23+BI= github.com/fluxcd/pkg/runtime v0.12.2/go.mod h1:tuWdqpWPhgjQvYrSnojdZ4plyU8DRU1NDzsfOhnzl2g= -github.com/fluxcd/pkg/ssa v0.0.2 h1:ATIPgo7YxPfI2anLkBYDavbtTlpuvvHgqk8dKxthH4Y= -github.com/fluxcd/pkg/ssa v0.0.2/go.mod h1:QisgqnXXnHKNfdnrpJ3wQrwuto111mvdNcKkfe9Cwvk= +github.com/fluxcd/pkg/ssa v0.0.3 h1:5s/dZIaJGtI/46w5VRmr5sy/jNJGpxPnSad8oSzAbkc= +github.com/fluxcd/pkg/ssa v0.0.3/go.mod h1:B/6V2gF3zq3P6EstM/qTmOEUf3YgOh1ybFfAAmG4Shw= github.com/fluxcd/pkg/testserver v0.1.0 h1:nOYgM1HYFZNNSUFykuWDmrsxj4jQxUCvmLHWOQeqmyA= github.com/fluxcd/pkg/testserver v0.1.0/go.mod h1:fvt8BHhXw6c1+CLw1QFZxcQprlcXzsrL4rzXaiGM+Iw= github.com/fluxcd/pkg/untar v0.1.0 h1:k97V/xV5hFrAkIkVPuv5AVhyxh1ZzzAKba/lbDfGo6o=