Flatten

CHANGELOG.md

@@ -13,9 +13,20 @@ version directory, and  then changes are introduced.
 
 ## [Unreleased]
 
+### Changed
+
+- Flatten directory structure. Only the most recent version lives in this repo now.
+  Go module version becomes synonymous with cloudconfig version.
+
+### Removed
+
+- All cloudconfig versions prior to v6.0.0.
+
+
 ## [v6.0.2]
 
 ### Changed
+
 - Remove init limits from calico-node
 - Limit PV per node on AWS
 - Hardcode registry domain AWS

v_6_0_0/cloudconfig.go → pkg/template/cloudconfig.go

@@ -1,4 +1,4 @@
-package v_6_0_0
+package template
 
 import (
 	"bytes"
@@ -9,7 +9,7 @@ import (
 
 	"github.com/giantswarm/microerror"
 
-	ignition "github.com/giantswarm/k8scloudconfig/v6/ignition/v_2_2_0"
+	"github.com/giantswarm/k8scloudconfig/v6/pkg/ignition"
 )
 
 const (

v_4_0_0/cloudconfig_test.go → pkg/template/cloudconfig_test.go

@@ -1,11 +1,11 @@
-package v_4_0_0
+package template
 
 import (
 	"encoding/base64"
 	"path"
 	"testing"
 
-	ignition "github.com/giantswarm/k8scloudconfig/v6/ignition/v_2_2_0"
+	"github.com/giantswarm/k8scloudconfig/v6/pkg/ignition"
 )
 
 func TestCloudConfig(t *testing.T) {
@@ -50,7 +50,7 @@ func TestCloudConfig(t *testing.T) {
 		if err != nil {
 			t.Errorf("failed to retrieve package path, %v:", err)
 		}
-		filesPath := path.Join(packagePath, version, filesDir)
+		filesPath := path.Join(packagePath, filesDir)
 		files, err := RenderFiles(filesPath, tc.params)
 		if err != nil {
 			t.Errorf("failed to render ignition files, %v:", err)

v_3_6_0/common_template_test.go → pkg/template/common_template_test.go

@@ -1,4 +1,4 @@
-package v_3_6_0
+package template
 
 type nopWriter struct{}
 

v_4_9_1/error.go → pkg/template/error.go

@@ -1,4 +1,4 @@
-package v_4_9_1
+package template
 
 import "github.com/giantswarm/microerror"
 

v_4_1_1/filemanager.go → pkg/template/filemanager.go

@@ -1,4 +1,4 @@
-package v_4_1_1
+package template
 
 import (
 	"bytes"
@@ -12,7 +12,6 @@ import (
 )
 
 const (
-	version  = "v_4_1_1"
 	filesDir = "files"
 )
 
@@ -59,7 +58,7 @@ func RenderFiles(filesdir string, ctx interface{}) (Files, error) {
 // GetIgnitionPath returns path for the ignition assets based on
 // base ignition directory and package subdirectory with assets.
 func GetIgnitionPath(ignitionDir string) string {
-	return filepath.Join(ignitionDir, version, filesDir)
+	return filepath.Join(ignitionDir, filesDir)
 }
 
 // GetPackagePath returns top package path for the current runtime file.
@@ -72,5 +71,5 @@ func GetPackagePath() (string, error) {
 		return "", microerror.Mask(retrieveRuntimeError)
 	}
 
-	return filepath.Dir(filepath.Dir(filename)), nil
+	return filepath.Dir(filepath.Dir(filepath.Dir(filename))), nil
 }

v_4_0_1/filemanager_test.go → pkg/template/filemanager_test.go

@@ -1,4 +1,4 @@
-package v_4_0_1
+package template
 
 import (
 	"bytes"

v_6_0_0/master_template.go → pkg/template/master_template.go

@@ -1,4 +1,4 @@
-package v_6_0_0
+package template
 
 const MasterTemplate = `---
 ignition:

v_4_0_0/master_template_test.go → pkg/template/master_template_test.go

@@ -1,4 +1,4 @@
-package v_4_0_0
+package template
 
 import (
 	"testing"

v_6_0_0/release.go → pkg/template/release.go

@@ -1,4 +1,4 @@
-package v_6_0_0
+package template
 
 import (
 	"fmt"

v_4_0_0/render_asset_content.go → pkg/template/render_asset_content.go

@@ -1,4 +1,4 @@
-package v_4_0_0
+package template
 
 import (
 	"bytes"

v_4_0_0/render_asset_content_test.go → pkg/template/render_asset_content_test.go

@@ -1,4 +1,4 @@
-package v_4_0_0
+package template
 
 import (
 	"strings"

v_6_0_0/types.go → pkg/template/types.go

@@ -1,4 +1,4 @@
-package v_6_0_0
+package template
 
 import (
 	"github.com/giantswarm/apiextensions/pkg/apis/provider/v1alpha1"

v_6_0_0/worker_template.go → pkg/template/worker_template.go

@@ -1,4 +1,4 @@
-package v_6_0_0
+package template
 
 const WorkerTemplate = `---
 ignition:

v_4_10_0/worker_template_test.go → pkg/template/worker_template_test.go

@@ -1,4 +1,4 @@
-package v_4_10_0
+package template
 
 import (
 	"testing"