diff --git a/CHANGELOG.md b/CHANGELOG.md index 1d1a5901..f334d6ef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [2.0.0] - 2025-09-02 + ### Removed - Cleaned up all obsolete code and command that are not for the `Generalized Configuration System` (GSC). diff --git a/cmd/render/flag.go b/cmd/render/flag.go index 87e029d3..3fef1a8f 100644 --- a/cmd/render/flag.go +++ b/cmd/render/flag.go @@ -3,11 +3,11 @@ package render import ( "fmt" - "github.com/giantswarm/konfigure/pkg/model" + "github.com/giantswarm/konfigure/v2/pkg/model" "github.com/spf13/cobra" - "github.com/giantswarm/konfigure/pkg/sopsenv/key" + "github.com/giantswarm/konfigure/v2/pkg/sopsenv/key" ) const ( diff --git a/cmd/render/runner.go b/cmd/render/runner.go index 63344897..a9bd355f 100644 --- a/cmd/render/runner.go +++ b/cmd/render/runner.go @@ -5,10 +5,10 @@ import ( "fmt" "io" - "github.com/giantswarm/konfigure/pkg/sopsenv" + "github.com/giantswarm/konfigure/v2/pkg/sopsenv" - "github.com/giantswarm/konfigure/pkg/service" - "github.com/giantswarm/konfigure/pkg/utils" + "github.com/giantswarm/konfigure/v2/pkg/service" + "github.com/giantswarm/konfigure/v2/pkg/utils" "github.com/go-logr/logr" diff --git a/go.mod b/go.mod index 049674d0..80c3d3fd 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/giantswarm/konfigure +module github.com/giantswarm/konfigure/v2 go 1.25.0 diff --git a/main.go b/main.go index e5b46b21..df40dcfe 100644 --- a/main.go +++ b/main.go @@ -10,8 +10,8 @@ import ( "github.com/spf13/cobra" - "github.com/giantswarm/konfigure/cmd/render" - "github.com/giantswarm/konfigure/pkg/project" + "github.com/giantswarm/konfigure/v2/cmd/render" + "github.com/giantswarm/konfigure/v2/pkg/project" ) func main() { diff --git a/pkg/meta/annotation.go b/pkg/meta/annotation.go index f3c512df..10a31f62 100644 --- a/pkg/meta/annotation.go +++ b/pkg/meta/annotation.go @@ -6,7 +6,7 @@ import ( "github.com/giantswarm/k8smetadata/pkg/annotation" - "github.com/giantswarm/konfigure/pkg/project" + "github.com/giantswarm/konfigure/v2/pkg/project" ) var ( diff --git a/pkg/meta/label.go b/pkg/meta/label.go index 3efe2e11..63129de6 100644 --- a/pkg/meta/label.go +++ b/pkg/meta/label.go @@ -3,7 +3,7 @@ package meta import ( "github.com/giantswarm/k8smetadata/pkg/label" - "github.com/giantswarm/konfigure/pkg/project" + "github.com/giantswarm/konfigure/v2/pkg/project" ) var ( diff --git a/pkg/project/project.go b/pkg/project/project.go index ac18e3cd..9e6d1b52 100644 --- a/pkg/project/project.go +++ b/pkg/project/project.go @@ -5,7 +5,7 @@ var ( gitSHA = "n/a" name = "konfigure" source = "https://github.com/giantswarm/konfigure" - version = "1.2.1-dev" + version = "2.0.0" ) func Description() string { diff --git a/pkg/renderer/loader.go b/pkg/renderer/loader.go index dc5a9e13..effe9bf5 100644 --- a/pkg/renderer/loader.go +++ b/pkg/renderer/loader.go @@ -6,13 +6,13 @@ import ( "path/filepath" "strings" - "github.com/giantswarm/konfigure/pkg/utils" + "github.com/giantswarm/konfigure/v2/pkg/utils" sopsV3Decrypt "github.com/getsops/sops/v3/decrypt" "gopkg.in/yaml.v3" - "github.com/giantswarm/konfigure/pkg/model" + "github.com/giantswarm/konfigure/v2/pkg/model" ) func LoadSchema(path string) (*model.Schema, error) { diff --git a/pkg/renderer/order.go b/pkg/renderer/order.go index 5dae1a58..58896d06 100644 --- a/pkg/renderer/order.go +++ b/pkg/renderer/order.go @@ -1,6 +1,6 @@ package renderer -import "github.com/giantswarm/konfigure/pkg/model" +import "github.com/giantswarm/konfigure/v2/pkg/model" func GetLayerOrder(schema *model.Schema) []string { var result []string diff --git a/pkg/renderer/order_test.go b/pkg/renderer/order_test.go index 96784786..60294be7 100644 --- a/pkg/renderer/order_test.go +++ b/pkg/renderer/order_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - "github.com/giantswarm/konfigure/pkg/model" + "github.com/giantswarm/konfigure/v2/pkg/model" ) func TestGetLayerOrder(t *testing.T) { diff --git a/pkg/renderer/render.go b/pkg/renderer/render.go index 6fe33df8..014bda26 100644 --- a/pkg/renderer/render.go +++ b/pkg/renderer/render.go @@ -7,14 +7,14 @@ import ( "strings" "text/template" - "github.com/giantswarm/konfigure/pkg/utils" + "github.com/giantswarm/konfigure/v2/pkg/utils" "github.com/pkg/errors" "github.com/Masterminds/sprig/v3" "sigs.k8s.io/yaml" - "github.com/giantswarm/konfigure/pkg/model" + "github.com/giantswarm/konfigure/v2/pkg/model" jsonpatch "github.com/evanphx/json-patch" ) diff --git a/pkg/renderer/values.go b/pkg/renderer/values.go index b3ba08ec..06ac029c 100644 --- a/pkg/renderer/values.go +++ b/pkg/renderer/values.go @@ -5,7 +5,7 @@ import ( "github.com/pkg/errors" - "github.com/giantswarm/konfigure/pkg/model" + "github.com/giantswarm/konfigure/v2/pkg/model" ) func MergeValueFileReferences(schema *model.Schema, layer model.Layer, valueType model.ValueMergeReferenceType, valueFiles ValueFiles) (string, error) { diff --git a/pkg/service/dynamic.go b/pkg/service/dynamic.go index 712e4106..7d6ec337 100644 --- a/pkg/service/dynamic.go +++ b/pkg/service/dynamic.go @@ -4,7 +4,7 @@ import ( "github.com/go-logr/logr" corev1 "k8s.io/api/core/v1" - "github.com/giantswarm/konfigure/pkg/renderer" + "github.com/giantswarm/konfigure/v2/pkg/renderer" ) type DynamicServiceConfig struct { diff --git a/pkg/service/dynamic_test.go b/pkg/service/dynamic_test.go index d2eb879a..0d76dec9 100644 --- a/pkg/service/dynamic_test.go +++ b/pkg/service/dynamic_test.go @@ -5,13 +5,13 @@ import ( "strings" "testing" - "github.com/giantswarm/konfigure/pkg/sopsenv" + "github.com/giantswarm/konfigure/v2/pkg/sopsenv" corev1 "k8s.io/api/core/v1" "github.com/go-logr/logr" - "github.com/giantswarm/konfigure/pkg/testutils" + "github.com/giantswarm/konfigure/v2/pkg/testutils" ) type RenderRawTestCase struct { diff --git a/pkg/sopsenv/sopsenv.go b/pkg/sopsenv/sopsenv.go index a1fac3af..776a7233 100644 --- a/pkg/sopsenv/sopsenv.go +++ b/pkg/sopsenv/sopsenv.go @@ -16,7 +16,7 @@ import ( "k8s.io/client-go/kubernetes" ctrl "sigs.k8s.io/controller-runtime" - "github.com/giantswarm/konfigure/pkg/sopsenv/key" + "github.com/giantswarm/konfigure/v2/pkg/sopsenv/key" // GS stuff uses `kgs`-generated kubeconfigs that use // `oidc` auth provider. This import makes is possible to diff --git a/pkg/sopsenv/sopsenv_test.go b/pkg/sopsenv/sopsenv_test.go index b7f21bb7..0d9957e6 100644 --- a/pkg/sopsenv/sopsenv_test.go +++ b/pkg/sopsenv/sopsenv_test.go @@ -17,8 +17,8 @@ import ( "k8s.io/apimachinery/pkg/runtime" clientgofake "k8s.io/client-go/kubernetes/fake" - "github.com/giantswarm/konfigure/pkg/sopsenv/key" - "github.com/giantswarm/konfigure/pkg/testutils" + "github.com/giantswarm/konfigure/v2/pkg/sopsenv/key" + "github.com/giantswarm/konfigure/v2/pkg/testutils" ) func TestSetups(t *testing.T) { diff --git a/pkg/sopsenv/testutils.go b/pkg/sopsenv/testutils.go index 4a2004ff..b9d6fa90 100644 --- a/pkg/sopsenv/testutils.go +++ b/pkg/sopsenv/testutils.go @@ -8,7 +8,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" clientgofake "k8s.io/client-go/kubernetes/fake" - "github.com/giantswarm/konfigure/pkg/sopsenv/key" + "github.com/giantswarm/konfigure/v2/pkg/sopsenv/key" ) func SetupNewSopsEnvironmentFromFakeKubernetes(secrets []*corev1.Secret) (*SOPSEnv, error) {