Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand Down
4 changes: 2 additions & 2 deletions cmd/render/flag.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
6 changes: 3 additions & 3 deletions cmd/render/runner.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/giantswarm/konfigure
module github.com/giantswarm/konfigure/v2

go 1.25.0

Expand Down
4 changes: 2 additions & 2 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion pkg/meta/annotation.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion pkg/meta/label.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion pkg/project/project.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions pkg/renderer/loader.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/renderer/order.go
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion pkg/renderer/order_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions pkg/renderer/render.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/renderer/values.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/service/dynamic.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions pkg/service/dynamic_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion pkg/sopsenv/sopsenv.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions pkg/sopsenv/sopsenv_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/sopsenv/testutils.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Loading