Merge pull request #772 from ajeddeloh/stablize

Stablize spec 3.0.0
coreos · Mar 26, 2019 · b79a5f1 · b79a5f1
2 parents 0fac334 + 9bd1f0f
commit b79a5f1
Show file tree

Hide file tree

Showing 115 changed files with 227 additions and 241 deletions.
diff --git a/config/config.go b/config/config.go
@@ -17,8 +17,8 @@ package config
 import (
 	"github.com/coreos/ignition/config/shared/errors"
 	"github.com/coreos/ignition/config/util"
-	"github.com/coreos/ignition/config/v3_0_experimental"
-	"github.com/coreos/ignition/config/v3_0_experimental/types"
+	"github.com/coreos/ignition/config/v3_0"
+	"github.com/coreos/ignition/config/v3_0/types"
 	"github.com/coreos/ignition/config/validate/report"
 
 	"github.com/coreos/go-semver/semver"
@@ -50,7 +50,7 @@ func Parse(raw []byte) (types.Config, report.Report, error) {
 
 	switch *version {
 	case types.MaxVersion:
-		return v3_0_experimental.Parse(raw)
+		return v3_0.Parse(raw)
 	default:
 		return types.Config{}, report.Report{}, errors.ErrUnknownVersion
 	}

diff --git a/config/config_test.go b/config/config_test.go
@@ -20,7 +20,7 @@ import (
 	"testing"
 
 	"github.com/coreos/ignition/config/util"
-	v3_0_experimental "github.com/coreos/ignition/config/v3_0_experimental/types"
+	v3_0 "github.com/coreos/ignition/config/v3_0/types"
 )
 
 func testConfigType(t reflect.Type) error {
@@ -83,7 +83,7 @@ func testConfigType(t reflect.Type) error {
 // anything the merge, translation, or validation logic doesn't know how to handle
 func TestConfigStructure(t *testing.T) {
 	configs := []reflect.Type{
-		reflect.TypeOf(v3_0_experimental.Config{}),
+		reflect.TypeOf(v3_0.Config{}),
 	}
 
 	for _, configType := range configs {

diff --git a/config/merge/merge_test.go b/config/merge/merge_test.go
@@ -19,7 +19,7 @@ import (
 	"testing"
 
 	"github.com/coreos/ignition/config/util"
-	"github.com/coreos/ignition/config/v3_0_experimental/types"
+	"github.com/coreos/ignition/config/v3_0/types"
 
 	"github.com/stretchr/testify/assert"
 )

diff --git a/config/v3_0_experimental/config.go → config/v3_0/config.go b/config/v3_0_experimental/config.go → config/v3_0/config.go
@@ -12,15 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package v3_0_experimental
+package v3_0
 
 import (
 	"reflect"
 
 	"github.com/coreos/ignition/config/merge"
 	"github.com/coreos/ignition/config/shared/errors"
 	"github.com/coreos/ignition/config/util"
-	"github.com/coreos/ignition/config/v3_0_experimental/types"
+	"github.com/coreos/ignition/config/v3_0/types"
 	"github.com/coreos/ignition/config/validate"
 	"github.com/coreos/ignition/config/validate/report"
 

diff --git a/config/v3_0_experimental/config_test.go → config/v3_0/config_test.go b/config/v3_0_experimental/config_test.go → config/v3_0/config_test.go
@@ -12,13 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package v3_0_experimental
+package v3_0
 
 import (
 	"testing"
 
 	"github.com/coreos/ignition/config/shared/errors"
-	"github.com/coreos/ignition/config/v3_0_experimental/types"
+	"github.com/coreos/ignition/config/v3_0/types"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -81,7 +81,7 @@ func TestParse(t *testing.T) {
 			out: out{err: errors.ErrUnknownVersion},
 		},
 		{
-			in:  in{config: []byte(`{"ignition": {"version": "3.0.0-experimental"}}`)},
+			in:  in{config: []byte(`{"ignition": {"version": "3.0.0"}}`)},
 			out: out{config: types.Config{Ignition: types.Ignition{Version: types.MaxVersion.String()}}},
 		},
 		{

diff --git a/...ig/v3_0_experimental/schema/ignition.json → config/v3_0/schema/ignition.json b/...ig/v3_0_experimental/schema/ignition.json → config/v3_0/schema/ignition.json
diff --git a/config/v3_0_experimental/types/ca.go → config/v3_0/types/ca.go b/config/v3_0_experimental/types/ca.go → config/v3_0/types/ca.go
diff --git a/config/v3_0_experimental/types/config.go → config/v3_0/types/config.go b/config/v3_0_experimental/types/config.go → config/v3_0/types/config.go
@@ -22,9 +22,8 @@ import (
 
 var (
 	MaxVersion = semver.Version{
-		Major:      3,
-		Minor:      0,
-		PreRelease: "experimental",
+		Major: 3,
+		Minor: 0,
 	}
 )
 

diff --git a/config/v3_0_experimental/types/directory.go → config/v3_0/types/directory.go b/config/v3_0_experimental/types/directory.go → config/v3_0/types/directory.go
diff --git a/config/v3_0_experimental/types/disk.go → config/v3_0/types/disk.go b/config/v3_0_experimental/types/disk.go → config/v3_0/types/disk.go
diff --git a/config/v3_0_experimental/types/file.go → config/v3_0/types/file.go b/config/v3_0_experimental/types/file.go → config/v3_0/types/file.go
diff --git a/config/v3_0_experimental/types/filesystem.go → config/v3_0/types/filesystem.go b/config/v3_0_experimental/types/filesystem.go → config/v3_0/types/filesystem.go
diff --git a/...3_0_experimental/types/filesystem_test.go → config/v3_0/types/filesystem_test.go b/...3_0_experimental/types/filesystem_test.go → config/v3_0/types/filesystem_test.go
diff --git a/config/v3_0_experimental/types/ignition.go → config/v3_0/types/ignition.go b/config/v3_0_experimental/types/ignition.go → config/v3_0/types/ignition.go
diff --git a/config/v3_0_experimental/types/mode.go → config/v3_0/types/mode.go b/config/v3_0_experimental/types/mode.go → config/v3_0/types/mode.go
diff --git a/config/v3_0_experimental/types/mode_test.go → config/v3_0/types/mode_test.go b/config/v3_0_experimental/types/mode_test.go → config/v3_0/types/mode_test.go
diff --git a/config/v3_0_experimental/types/node.go → config/v3_0/types/node.go b/config/v3_0_experimental/types/node.go → config/v3_0/types/node.go
diff --git a/config/v3_0_experimental/types/node_test.go → config/v3_0/types/node_test.go b/config/v3_0_experimental/types/node_test.go → config/v3_0/types/node_test.go
diff --git a/config/v3_0_experimental/types/partition.go → config/v3_0/types/partition.go b/config/v3_0_experimental/types/partition.go → config/v3_0/types/partition.go
diff --git a/...v3_0_experimental/types/partition_test.go → config/v3_0/types/partition_test.go b/...v3_0_experimental/types/partition_test.go → config/v3_0/types/partition_test.go
diff --git a/config/v3_0_experimental/types/passwd.go → config/v3_0/types/passwd.go b/config/v3_0_experimental/types/passwd.go → config/v3_0/types/passwd.go
diff --git a/config/v3_0_experimental/types/path.go → config/v3_0/types/path.go b/config/v3_0_experimental/types/path.go → config/v3_0/types/path.go
diff --git a/config/v3_0_experimental/types/path_test.go → config/v3_0/types/path_test.go b/config/v3_0_experimental/types/path_test.go → config/v3_0/types/path_test.go
diff --git a/config/v3_0_experimental/types/raid.go → config/v3_0/types/raid.go b/config/v3_0_experimental/types/raid.go → config/v3_0/types/raid.go
diff --git a/config/v3_0_experimental/types/schema.go → config/v3_0/types/schema.go b/config/v3_0_experimental/types/schema.go → config/v3_0/types/schema.go
@@ -1,6 +1,6 @@
 package types
 
-// generated by "schematyper --package=types config/v3_0_experimental/schema/ignition.json -o config/v3_0_experimental/types/schema.go --root-type=Config" -- DO NOT EDIT
+// generated by "schematyper --package=types config/v3_0/schema/ignition.json -o config/v3_0/types/schema.go --root-type=Config" -- DO NOT EDIT
 
 type CaReference struct {
 	Source       string       `json:"source"`

diff --git a/config/v3_0_experimental/types/storage.go → config/v3_0/types/storage.go b/config/v3_0_experimental/types/storage.go → config/v3_0/types/storage.go
diff --git a/config/v3_0_experimental/types/unit.go → config/v3_0/types/unit.go b/config/v3_0_experimental/types/unit.go → config/v3_0/types/unit.go
diff --git a/config/v3_0_experimental/types/unit_test.go → config/v3_0/types/unit_test.go b/config/v3_0_experimental/types/unit_test.go → config/v3_0/types/unit_test.go
diff --git a/config/v3_0_experimental/types/url.go → config/v3_0/types/url.go b/config/v3_0_experimental/types/url.go → config/v3_0/types/url.go
diff --git a/config/v3_0_experimental/types/url_test.go → config/v3_0/types/url_test.go b/config/v3_0_experimental/types/url_test.go → config/v3_0/types/url_test.go
diff --git a/...g/v3_0_experimental/types/verification.go → config/v3_0/types/verification.go b/...g/v3_0_experimental/types/verification.go → config/v3_0/types/verification.go
diff --git a/...0_experimental/types/verification_test.go → config/v3_0/types/verification_test.go b/...0_experimental/types/verification_test.go → config/v3_0/types/verification_test.go
diff --git a/config/validate/validate_test.go b/config/validate/validate_test.go
@@ -28,7 +28,7 @@ import (
 	"github.com/coreos/ignition/config/validate/astjson"
 	"github.com/coreos/ignition/config/validate/report"
 	// Import into the same namespace to keep config definitions clean
-	. "github.com/coreos/ignition/config/v3_0_experimental/types"
+	. "github.com/coreos/ignition/config/v3_0/types"
 )
 
 func TestValidate(t *testing.T) {
@@ -61,7 +61,7 @@ func TestValidate(t *testing.T) {
 			out: out{err: errors.ErrUnknownVersion},
 		},
 		{
-			in:  in{cfg: Config{Ignition: Ignition{Version: "3.0.0"}}},
+			in:  in{cfg: Config{Ignition: Ignition{Version: "2.0.0"}}},
 			out: out{err: errors.ErrUnknownVersion},
 		},
 		{
@@ -71,7 +71,7 @@ func TestValidate(t *testing.T) {
 		{
 			in: in{cfg: Config{
 				Ignition: Ignition{
-					Version: "3.0.0-experimental",
+					Version: "3.0.0",
 					Config: IgnitionConfig{
 						Replace: ConfigReference{
 							Verification: Verification{
@@ -85,7 +85,7 @@ func TestValidate(t *testing.T) {
 		},
 		{
 			in: in{cfg: Config{
-				Ignition: Ignition{Version: "3.0.0-experimental"},
+				Ignition: Ignition{Version: "3.0.0"},
 				Storage: Storage{
 					Filesystems: []Filesystem{
 						{
@@ -100,7 +100,7 @@ func TestValidate(t *testing.T) {
 		},
 		{
 			in: in{cfg: Config{
-				Ignition: Ignition{Version: "3.0.0-experimental"},
+				Ignition: Ignition{Version: "3.0.0"},
 				Storage: Storage{
 					Filesystems: []Filesystem{
 						{
@@ -120,7 +120,7 @@ func TestValidate(t *testing.T) {
 		},
 		{
 			in: in{cfg: Config{
-				Ignition: Ignition{Version: "3.0.0-experimental"},
+				Ignition: Ignition{Version: "3.0.0"},
 				Storage: Storage{
 					Files: []File{
 						{
@@ -148,7 +148,7 @@ func TestValidate(t *testing.T) {
 		},
 		{
 			in: in{cfg: Config{
-				Ignition: Ignition{Version: "3.0.0-experimental"},
+				Ignition: Ignition{Version: "3.0.0"},
 				Storage: Storage{
 					Files: []File{
 						{
@@ -174,14 +174,14 @@ func TestValidate(t *testing.T) {
 		},
 		{
 			in: in{cfg: Config{
-				Ignition: Ignition{Version: "3.0.0-experimental"},
+				Ignition: Ignition{Version: "3.0.0"},
 				Systemd:  Systemd{Units: []Unit{{Name: "foo.bar", Contents: util.StrToPtr("[Foo]\nfoo=qux")}}},
 			}},
 			out: out{err: fmt.Errorf("invalid systemd unit extension")},
 		},
 		{
 			in: in{cfg: Config{
-				Ignition: Ignition{Version: "3.0.0-experimental"},
+				Ignition: Ignition{Version: "3.0.0"},
 				Systemd:  Systemd{Units: []Unit{{Name: "enable-but-no-install.service", Enabled: util.BoolToPtr(true), Contents: util.StrToPtr("[Foo]\nlemon=lime")}}},
 			}},
 			out: out{warning: errors.NewNoInstallSectionError("enable-but-no-install.service")},

diff --git a/generate b/generate
@@ -12,7 +12,7 @@ hash schematyper 2>/dev/null || {
     exit 1
 }
 
-specs="v3_0_experimental"
+specs="v3_0"
 
 for spec in $specs
 do

diff --git a/internal/exec/engine.go b/internal/exec/engine.go
@@ -26,8 +26,8 @@ import (
 	"time"
 
 	"github.com/coreos/ignition/config/shared/errors"
-	config "github.com/coreos/ignition/config/v3_0_experimental"
-	"github.com/coreos/ignition/config/v3_0_experimental/types"
+	config "github.com/coreos/ignition/config/v3_0"
+	"github.com/coreos/ignition/config/v3_0/types"
 	"github.com/coreos/ignition/config/validate"
 	"github.com/coreos/ignition/config/validate/report"
 	"github.com/coreos/ignition/internal/exec/stages"

diff --git a/internal/exec/stages/disks/disks.go b/internal/exec/stages/disks/disks.go
@@ -22,7 +22,7 @@ import (
 	"fmt"
 	"os/exec"
 
-	"github.com/coreos/ignition/config/v3_0_experimental/types"
+	"github.com/coreos/ignition/config/v3_0/types"
 	"github.com/coreos/ignition/internal/distro"
 	"github.com/coreos/ignition/internal/exec/stages"
 	"github.com/coreos/ignition/internal/exec/util"

diff --git a/internal/exec/stages/disks/filesystems.go b/internal/exec/stages/disks/filesystems.go
@@ -25,7 +25,7 @@ import (
 	"runtime"
 	"strings"
 
-	"github.com/coreos/ignition/config/v3_0_experimental/types"
+	"github.com/coreos/ignition/config/v3_0/types"
 	"github.com/coreos/ignition/internal/distro"
 	"github.com/coreos/ignition/internal/exec/util"
 )

diff --git a/internal/exec/stages/disks/partitions.go b/internal/exec/stages/disks/partitions.go
@@ -26,7 +26,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/coreos/ignition/config/v3_0_experimental/types"
+	"github.com/coreos/ignition/config/v3_0/types"
 	"github.com/coreos/ignition/internal/exec/util"
 	"github.com/coreos/ignition/internal/sgdisk"
 )

diff --git a/internal/exec/stages/disks/raid.go b/internal/exec/stages/disks/raid.go
@@ -23,7 +23,7 @@ import (
 	"fmt"
 	"os/exec"
 
-	"github.com/coreos/ignition/config/v3_0_experimental/types"
+	"github.com/coreos/ignition/config/v3_0/types"
 	"github.com/coreos/ignition/internal/distro"
 	"github.com/coreos/ignition/internal/exec/util"
 )

diff --git a/internal/exec/stages/files/files.go b/internal/exec/stages/files/files.go
@@ -20,7 +20,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/coreos/ignition/config/v3_0_experimental/types"
+	"github.com/coreos/ignition/config/v3_0/types"
 	"github.com/coreos/ignition/internal/distro"
 	"github.com/coreos/ignition/internal/exec/stages"
 	"github.com/coreos/ignition/internal/exec/util"

diff --git a/internal/exec/stages/files/filesystemEntries.go b/internal/exec/stages/files/filesystemEntries.go
@@ -22,7 +22,7 @@ import (
 	"strings"
 
 	configUtil "github.com/coreos/ignition/config/util"
-	"github.com/coreos/ignition/config/v3_0_experimental/types"
+	"github.com/coreos/ignition/config/v3_0/types"
 	"github.com/coreos/ignition/internal/exec/util"
 	"github.com/coreos/ignition/internal/log"
 )

diff --git a/internal/exec/stages/files/passwd.go b/internal/exec/stages/files/passwd.go
@@ -17,7 +17,7 @@ package files
 import (
 	"fmt"
 
-	"github.com/coreos/ignition/config/v3_0_experimental/types"
+	"github.com/coreos/ignition/config/v3_0/types"
 )
 
 // createPasswd creates the users and groups as described in config.Passwd.

diff --git a/internal/exec/stages/files/units.go b/internal/exec/stages/files/units.go
@@ -17,7 +17,7 @@ package files
 import (
 	"path/filepath"
 
-	"github.com/coreos/ignition/config/v3_0_experimental/types"
+	"github.com/coreos/ignition/config/v3_0/types"
 	"github.com/coreos/ignition/internal/distro"
 	"github.com/coreos/ignition/internal/exec/util"
 )

diff --git a/internal/exec/stages/mount/mount.go b/internal/exec/stages/mount/mount.go
@@ -25,7 +25,7 @@ import (
 	"sort"
 	"syscall"
 
-	"github.com/coreos/ignition/config/v3_0_experimental/types"
+	"github.com/coreos/ignition/config/v3_0/types"
 	"github.com/coreos/ignition/internal/exec/stages"
 	"github.com/coreos/ignition/internal/exec/util"
 	"github.com/coreos/ignition/internal/log"

diff --git a/internal/exec/stages/stages.go b/internal/exec/stages/stages.go
@@ -15,7 +15,7 @@
 package stages
 
 import (
-	"github.com/coreos/ignition/config/v3_0_experimental/types"
+	"github.com/coreos/ignition/config/v3_0/types"
 	"github.com/coreos/ignition/internal/log"
 	"github.com/coreos/ignition/internal/registry"
 	"github.com/coreos/ignition/internal/resource"

diff --git a/internal/exec/stages/umount/umount.go b/internal/exec/stages/umount/umount.go
@@ -22,7 +22,7 @@ import (
 	"sort"
 	"syscall"
 
-	"github.com/coreos/ignition/config/v3_0_experimental/types"
+	"github.com/coreos/ignition/config/v3_0/types"
 	"github.com/coreos/ignition/internal/exec/stages"
 	"github.com/coreos/ignition/internal/exec/util"
 	"github.com/coreos/ignition/internal/log"

diff --git a/internal/exec/util/blkid.go b/internal/exec/util/blkid.go
@@ -32,7 +32,7 @@ import (
 	"unsafe"
 
 	"github.com/coreos/ignition/config/util"
-	"github.com/coreos/ignition/config/v3_0_experimental/types"
+	"github.com/coreos/ignition/config/v3_0/types"
 )
 
 const (

diff --git a/internal/exec/util/file.go b/internal/exec/util/file.go
@@ -26,7 +26,7 @@ import (
 	"strconv"
 	"syscall"
 
-	"github.com/coreos/ignition/config/v3_0_experimental/types"
+	"github.com/coreos/ignition/config/v3_0/types"
 	"github.com/coreos/ignition/internal/log"
 	"github.com/coreos/ignition/internal/resource"
 	"github.com/coreos/ignition/internal/util"

diff --git a/internal/exec/util/passwd.go b/internal/exec/util/passwd.go
@@ -23,7 +23,7 @@ import (
 	"strings"
 	"syscall"
 
-	"github.com/coreos/ignition/config/v3_0_experimental/types"
+	"github.com/coreos/ignition/config/v3_0/types"
 	"github.com/coreos/ignition/internal/as_user"
 	"github.com/coreos/ignition/internal/distro"
 	"github.com/coreos/ignition/internal/log"

diff --git a/internal/exec/util/unit.go b/internal/exec/util/unit.go
@@ -19,7 +19,7 @@ import (
 	"net/url"
 	"os"
 
-	"github.com/coreos/ignition/config/v3_0_experimental/types"
+	"github.com/coreos/ignition/config/v3_0/types"
 	"github.com/coreos/ignition/internal/distro"
 
 	"github.com/vincent-petithory/dataurl"

diff --git a/internal/exec/validate.go b/internal/exec/validate.go
@@ -18,7 +18,7 @@ import (
 	"io/ioutil"
 	"os"
 
-	config "github.com/coreos/ignition/config/v3_0_experimental"
+	config "github.com/coreos/ignition/config/v3_0"
 	"github.com/coreos/ignition/config/validate/report"
 )
 

diff --git a/internal/providers/aws/aws.go b/internal/providers/aws/aws.go
@@ -20,7 +20,7 @@ package aws
 import (
 	"net/url"
 
-	"github.com/coreos/ignition/config/v3_0_experimental/types"
+	"github.com/coreos/ignition/config/v3_0/types"
 	"github.com/coreos/ignition/config/validate/report"
 	"github.com/coreos/ignition/internal/log"
 	"github.com/coreos/ignition/internal/providers/util"

diff --git a/internal/providers/azure/azure.go b/internal/providers/azure/azure.go
@@ -24,7 +24,7 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/coreos/ignition/config/v3_0_experimental/types"
+	"github.com/coreos/ignition/config/v3_0/types"
 	"github.com/coreos/ignition/config/validate/report"
 	"github.com/coreos/ignition/internal/distro"
 	"github.com/coreos/ignition/internal/log"

diff --git a/internal/providers/cloudstack/cloudstack.go b/internal/providers/cloudstack/cloudstack.go
@@ -32,7 +32,7 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/coreos/ignition/config/v3_0_experimental/types"
+	"github.com/coreos/ignition/config/v3_0/types"
 	"github.com/coreos/ignition/config/validate/report"
 	"github.com/coreos/ignition/internal/distro"
 	"github.com/coreos/ignition/internal/log"

diff --git a/internal/providers/cmdline/cmdline.go b/internal/providers/cmdline/cmdline.go
@@ -22,7 +22,7 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/coreos/ignition/config/v3_0_experimental/types"
+	"github.com/coreos/ignition/config/v3_0/types"
 	"github.com/coreos/ignition/config/validate/report"
 	"github.com/coreos/ignition/internal/distro"
 	"github.com/coreos/ignition/internal/log"

diff --git a/internal/providers/digitalocean/digitalocean.go b/internal/providers/digitalocean/digitalocean.go
@@ -20,7 +20,7 @@ package digitalocean
 import (
 	"net/url"
 
-	"github.com/coreos/ignition/config/v3_0_experimental/types"
+	"github.com/coreos/ignition/config/v3_0/types"
 	"github.com/coreos/ignition/config/validate/report"
 	"github.com/coreos/ignition/internal/providers/util"
 	"github.com/coreos/ignition/internal/resource"