diff --git a/cmd/flux/create_helmrelease.go b/cmd/flux/create_helmrelease.go index 9a7e08cd..b08db59b 100644 --- a/cmd/flux/create_helmrelease.go +++ b/cmd/flux/create_helmrelease.go @@ -218,7 +218,7 @@ func createHelmReleaseCmdRun(cmd *cobra.Command, args []string) error { } if len(helmReleaseArgs.dependsOn) > 0 { - ls := utils.MakeDependsOn(helmReleaseArgs.dependsOn) + ls := meta.MakeDependsOn(helmReleaseArgs.dependsOn) hrDependsOn := make([]helmv2.DependencyReference, 0, len(ls)) for _, d := range ls { hrDependsOn = append(hrDependsOn, helmv2.DependencyReference{ diff --git a/cmd/flux/create_kustomization.go b/cmd/flux/create_kustomization.go index 45740c34..aaca5ce4 100644 --- a/cmd/flux/create_kustomization.go +++ b/cmd/flux/create_kustomization.go @@ -172,7 +172,7 @@ func createKsCmdRun(cmd *cobra.Command, args []string) error { } if len(kustomizationArgs.dependsOn) > 0 { - ls := utils.MakeDependsOn(kustomizationArgs.dependsOn) + ls := meta.MakeDependsOn(kustomizationArgs.dependsOn) ksDependsOn := make([]kustomizev1.DependencyReference, 0, len(ls)) for _, d := range ls { ksDependsOn = append(ksDependsOn, kustomizev1.DependencyReference{ diff --git a/go.mod b/go.mod index 7d4e9411..5cfafb7d 100644 --- a/go.mod +++ b/go.mod @@ -5,6 +5,10 @@ go 1.26.0 // Fix CVE-2022-28948. replace gopkg.in/yaml.v3 => gopkg.in/yaml.v3 v3.0.1 +// TODO: Remove after DependencyReference type centralization is merged into `apis/meta`. +// xref: https://github.com/fluxcd/pkg/pull/1212 +replace github.com/fluxcd/pkg/apis/meta => github.com/vecil/fluxcd-pkg/apis/meta v0.0.0-20260522050545-a9bfbcef0a28 + require ( github.com/Masterminds/semver/v3 v3.4.0 github.com/ProtonMail/go-crypto v1.4.1 diff --git a/go.sum b/go.sum index 0e7e4c70..e667b277 100644 --- a/go.sum +++ b/go.sum @@ -194,8 +194,6 @@ github.com/fluxcd/pkg/apis/event v0.26.0 h1:QzBRz9Qy91jzJmLlOhd4ecp6OWDpMVFvm311 github.com/fluxcd/pkg/apis/event v0.26.0/go.mod h1:0yy7FMJABzq8PP5/VEi1Gro6ssPaPlH9xuPIoF+Rm6M= github.com/fluxcd/pkg/apis/kustomize v1.18.0 h1:FCNjViCLyKYj6lddpnjXybKBTC2eK6eXK9YOaNwLVTM= github.com/fluxcd/pkg/apis/kustomize v1.18.0/go.mod h1:mvtMtM4NNLipdCna6DYPC6Bd42xeaF15N+tNO+F6kxY= -github.com/fluxcd/pkg/apis/meta v1.27.0 h1:EspByEk5j8w3rs1cGbEh9AjSmpDwQIz7DFG/zzqf6uI= -github.com/fluxcd/pkg/apis/meta v1.27.0/go.mod h1:2t6JyrRfvIBhx6EBnXfFh/6sCCJ1db9WGaqko0JmNOE= github.com/fluxcd/pkg/auth v0.45.0 h1:3p/CMdFJ1c8LevdLd2cikackaTW1Tw8JB2xg4YqpP8A= github.com/fluxcd/pkg/auth v0.45.0/go.mod h1:/ijjR9G/l6URmEo/zWzpJ3XIMIXWP1Ad7AXTCqmWioY= github.com/fluxcd/pkg/cache v0.14.0 h1:wEwJA8NhYj+nH9P6ifcsglDZARWlcbxbmwngGOzfU4c= @@ -553,6 +551,8 @@ github.com/tidwall/sjson v1.2.5 h1:kLy8mja+1c9jlljvWTlSazM7cKDRfJuR/bOJhcY5NcY= github.com/tidwall/sjson v1.2.5/go.mod h1:Fvgq9kS/6ociJEDnK0Fk1cpYF4FIW6ZF7LAe+6jwd28= github.com/vbatts/tar-split v0.12.2 h1:w/Y6tjxpeiFMR47yzZPlPj/FcPLpXbTUi/9H7d3CPa4= github.com/vbatts/tar-split v0.12.2/go.mod h1:eF6B6i6ftWQcDqEn3/iGFRFRo8cBIMSJVOpnNdfTMFA= +github.com/vecil/fluxcd-pkg/apis/meta v0.0.0-20260522050545-a9bfbcef0a28 h1:8rQbopfdhsLXIv7qNeJzujGWc6zs1D4zhp1GvAopzGA= +github.com/vecil/fluxcd-pkg/apis/meta v0.0.0-20260522050545-a9bfbcef0a28/go.mod h1:3DmYMnyH3XdY8/g2gXfsVIGEd/zpcB2PEkuurv2vgHU= github.com/virtuald/go-ordered-json v0.0.0-20170621173500-b18e6e673d74 h1:JwtAtbp7r/7QSyGz8mKUbYJBg2+6Cd7OjM8o/GNOcVo= github.com/virtuald/go-ordered-json v0.0.0-20170621173500-b18e6e673d74/go.mod h1:RmMWU37GKR2s6pgrIEB4ixgpVCt/cf7dnJv3fuH1J1c= github.com/wI2L/jsondiff v0.6.1 h1:ISZb9oNWbP64LHnu4AUhsMF5W0FIj5Ok3Krip9Shqpw= diff --git a/internal/utils/utils.go b/internal/utils/utils.go index 815e04fe..287c1424 100644 --- a/internal/utils/utils.go +++ b/internal/utils/utils.go @@ -47,7 +47,6 @@ import ( kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1" notificationv1 "github.com/fluxcd/notification-controller/api/v1" notificationv1b3 "github.com/fluxcd/notification-controller/api/v1beta3" - "github.com/fluxcd/pkg/apis/meta" runclient "github.com/fluxcd/pkg/runtime/client" "github.com/fluxcd/pkg/version" sourcev1 "github.com/fluxcd/source-controller/api/v1" @@ -231,26 +230,6 @@ func ParseObjectKindNameNamespace(input string) (kind, name, namespace string) { return kind, name, namespace } -func MakeDependsOn(deps []string) []meta.NamespacedObjectReference { - refs := []meta.NamespacedObjectReference{} - for _, dep := range deps { - parts := strings.Split(dep, "/") - depNamespace := "" - depName := "" - if len(parts) > 1 { - depNamespace = parts[0] - depName = parts[1] - } else { - depName = parts[0] - } - refs = append(refs, meta.NamespacedObjectReference{ - Namespace: depNamespace, - Name: depName, - }) - } - return refs -} - func ValidateComponents(components []string) error { defaults := install.MakeDefaultOptions() bootstrapAllComponents := append(defaults.Components, defaults.ComponentsExtra...) diff --git a/internal/utils/utils_test.go b/internal/utils/utils_test.go index 2cec902c..4832487e 100644 --- a/internal/utils/utils_test.go +++ b/internal/utils/utils_test.go @@ -87,7 +87,7 @@ func TestMakeDependsOn(t *testing.T) { "someNSD/", "", } - want := []meta.NamespacedObjectReference{ + want := []meta.DependencyReference{ {Namespace: "someNSA", Name: "someNameA"}, {Namespace: "someNSB", Name: "someNameB"}, {Namespace: "", Name: "someNameC"}, @@ -95,7 +95,7 @@ func TestMakeDependsOn(t *testing.T) { {Namespace: "", Name: ""}, } - got := MakeDependsOn(input) + got := meta.MakeDependsOn(input) if !reflect.DeepEqual(got, want) { t.Errorf("MakeDependsOn() = %v, want %v", got, want) }