*: update to v3_6_experimental spec

config/config.go

@@ -15,8 +15,8 @@
 package config
 
 import (
-	exp "github.com/coreos/ignition/v2/config/v3_5_experimental"
-	types_exp "github.com/coreos/ignition/v2/config/v3_5_experimental/types"
+	exp "github.com/coreos/ignition/v2/config/v3_6_experimental"
+	types_exp "github.com/coreos/ignition/v2/config/v3_6_experimental/types"
 
 	"github.com/coreos/vcontext/report"
 )

config/config_test.go

@@ -25,7 +25,8 @@ import (
 	v3_2 "github.com/coreos/ignition/v2/config/v3_2/types"
 	v3_3 "github.com/coreos/ignition/v2/config/v3_3/types"
 	v3_4 "github.com/coreos/ignition/v2/config/v3_4/types"
-	v3_5 "github.com/coreos/ignition/v2/config/v3_5_experimental/types"
+	v3_5 "github.com/coreos/ignition/v2/config/v3_5/types"
+	v3_6 "github.com/coreos/ignition/v2/config/v3_6_experimental/types"
 )
 
 type typeSet map[reflect.Type]struct{}
@@ -274,6 +275,7 @@ func TestConfigStructure(t *testing.T) {
 		reflect.TypeOf(v3_3.Config{}),
 		reflect.TypeOf(v3_4.Config{}),
 		reflect.TypeOf(v3_5.Config{}),
+		reflect.TypeOf(v3_6.Config{}),
 	}
 
 	for _, configType := range configs {

config/merge/merge_test.go

@@ -19,7 +19,7 @@ import (
 
 	"github.com/coreos/ignition/v2/config/util"
 	v3_2 "github.com/coreos/ignition/v2/config/v3_2/types"
-	"github.com/coreos/ignition/v2/config/v3_5_experimental/types"
+	"github.com/coreos/ignition/v2/config/v3_6_experimental/types"
 
 	"github.com/coreos/vcontext/path"
 	"github.com/stretchr/testify/assert"

internal/apply/apply.go

@@ -34,7 +34,7 @@ import (
 	"github.com/coreos/ignition/v2/internal/state"
 	"github.com/coreos/ignition/v2/internal/util"
 
-	"github.com/coreos/ignition/v2/config/v3_5_experimental/types"
+	"github.com/coreos/ignition/v2/config/v3_6_experimental/types"
 )
 
 type Flags struct {

internal/doc/main.go

@@ -31,7 +31,8 @@ import (
 	v32 "github.com/coreos/ignition/v2/config/v3_2/types"
 	v33 "github.com/coreos/ignition/v2/config/v3_3/types"
 	v34 "github.com/coreos/ignition/v2/config/v3_4/types"
-	v35 "github.com/coreos/ignition/v2/config/v3_5_experimental/types"
+	v35 "github.com/coreos/ignition/v2/config/v3_5/types"
+	v36 "github.com/coreos/ignition/v2/config/v3_6_experimental/types"
 )
 
 var (
@@ -46,12 +47,13 @@ func generate(dir string) error {
 		config  any
 	}{
 		// generate in inverse order of website navbar
-		{"3.5.0-experimental", v35.Config{}},
+		{"3.6.0-experimental", v36.Config{}},
 		{"3.0.0", v30.Config{}},
 		{"3.1.0", v31.Config{}},
 		{"3.2.0", v32.Config{}},
 		{"3.3.0", v33.Config{}},
 		{"3.4.0", v34.Config{}},
+		{"3.5.0", v35.Config{}},
 	}
 
 	if err := os.MkdirAll(dir, 0755); err != nil {

internal/exec/config_fetcher.go

@@ -27,8 +27,8 @@ import (
 	"github.com/coreos/ignition/v2/internal/state"
 	"github.com/coreos/ignition/v2/internal/util"
 
-	latest "github.com/coreos/ignition/v2/config/v3_5_experimental"
-	"github.com/coreos/ignition/v2/config/v3_5_experimental/types"
+	latest "github.com/coreos/ignition/v2/config/v3_6_experimental"
+	"github.com/coreos/ignition/v2/config/v3_6_experimental/types"
 )
 
 type ConfigFetcher struct {

internal/exec/engine.go

@@ -24,8 +24,8 @@ import (
 
 	"github.com/coreos/go-systemd/v22/journal"
 	"github.com/coreos/ignition/v2/config/shared/errors"
-	latest "github.com/coreos/ignition/v2/config/v3_5_experimental"
-	"github.com/coreos/ignition/v2/config/v3_5_experimental/types"
+	latest "github.com/coreos/ignition/v2/config/v3_6_experimental"
+	"github.com/coreos/ignition/v2/config/v3_6_experimental/types"
 	"github.com/coreos/ignition/v2/internal/exec/stages"
 	executil "github.com/coreos/ignition/v2/internal/exec/util"
 	"github.com/coreos/ignition/v2/internal/log"

internal/exec/stages/disks/disks.go

@@ -25,7 +25,7 @@ import (
 	"os/exec"
 	"path/filepath"
 
-	"github.com/coreos/ignition/v2/config/v3_5_experimental/types"
+	"github.com/coreos/ignition/v2/config/v3_6_experimental/types"
 	"github.com/coreos/ignition/v2/internal/distro"
 	"github.com/coreos/ignition/v2/internal/exec/stages"
 	"github.com/coreos/ignition/v2/internal/exec/util"

internal/exec/stages/disks/filesystems.go

@@ -26,7 +26,7 @@ import (
 	"strings"
 
 	cutil "github.com/coreos/ignition/v2/config/util"
-	"github.com/coreos/ignition/v2/config/v3_5_experimental/types"
+	"github.com/coreos/ignition/v2/config/v3_6_experimental/types"
 	"github.com/coreos/ignition/v2/internal/distro"
 	"github.com/coreos/ignition/v2/internal/exec/util"
 )

internal/exec/stages/disks/luks.go

@@ -30,7 +30,7 @@ import (
 	"strings"
 
 	"github.com/coreos/ignition/v2/config/util"
-	"github.com/coreos/ignition/v2/config/v3_5_experimental/types"
+	"github.com/coreos/ignition/v2/config/v3_6_experimental/types"
 	"github.com/coreos/ignition/v2/internal/distro"
 	execUtil "github.com/coreos/ignition/v2/internal/exec/util"
 	"github.com/coreos/ignition/v2/internal/log"

internal/exec/stages/disks/partitions.go

@@ -31,7 +31,7 @@ import (
 	"strings"
 
 	cutil "github.com/coreos/ignition/v2/config/util"
-	"github.com/coreos/ignition/v2/config/v3_5_experimental/types"
+	"github.com/coreos/ignition/v2/config/v3_6_experimental/types"
 	"github.com/coreos/ignition/v2/internal/distro"
 	"github.com/coreos/ignition/v2/internal/exec/util"
 	"github.com/coreos/ignition/v2/internal/sgdisk"

internal/exec/stages/disks/raid.go

@@ -24,7 +24,7 @@ import (
 	"os/exec"
 	"strings"
 
-	"github.com/coreos/ignition/v2/config/v3_5_experimental/types"
+	"github.com/coreos/ignition/v2/config/v3_6_experimental/types"
 	"github.com/coreos/ignition/v2/internal/distro"
 	"github.com/coreos/ignition/v2/internal/exec/util"
 )

internal/exec/stages/fetch/fetch.go

@@ -19,7 +19,7 @@
 package fetch
 
 import (
-	"github.com/coreos/ignition/v2/config/v3_5_experimental/types"
+	"github.com/coreos/ignition/v2/config/v3_6_experimental/types"
 	"github.com/coreos/ignition/v2/internal/exec/stages"
 	"github.com/coreos/ignition/v2/internal/exec/util"
 	"github.com/coreos/ignition/v2/internal/log"

internal/exec/stages/fetch_offline/fetch-offline.go

@@ -23,7 +23,7 @@ import (
 	"reflect"
 
 	cfgutil "github.com/coreos/ignition/v2/config/util"
-	"github.com/coreos/ignition/v2/config/v3_5_experimental/types"
+	"github.com/coreos/ignition/v2/config/v3_6_experimental/types"
 	"github.com/coreos/ignition/v2/internal/exec/stages"
 	executil "github.com/coreos/ignition/v2/internal/exec/util"
 	"github.com/coreos/ignition/v2/internal/log"

internal/exec/stages/fetch_offline/fetch_offline_test.go

@@ -18,7 +18,7 @@ import (
 	"testing"
 
 	"github.com/coreos/ignition/v2/config/util"
-	"github.com/coreos/ignition/v2/config/v3_5_experimental/types"
+	"github.com/coreos/ignition/v2/config/v3_6_experimental/types"
 
 	"github.com/stretchr/testify/assert"
 )

internal/exec/stages/files/files.go

@@ -20,7 +20,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/coreos/ignition/v2/config/v3_5_experimental/types"
+	"github.com/coreos/ignition/v2/config/v3_6_experimental/types"
 	"github.com/coreos/ignition/v2/internal/distro"
 	"github.com/coreos/ignition/v2/internal/exec/stages"
 	"github.com/coreos/ignition/v2/internal/exec/util"

internal/exec/stages/files/files_test.go

@@ -19,7 +19,7 @@ import (
 	"sort"
 	"testing"
 
-	"github.com/coreos/ignition/v2/config/v3_5_experimental/types"
+	"github.com/coreos/ignition/v2/config/v3_6_experimental/types"
 	"github.com/coreos/ignition/v2/internal/exec/util"
 )
 

internal/exec/stages/files/filesystemEntries.go

@@ -25,7 +25,7 @@ import (
 	"time"
 
 	cutil "github.com/coreos/ignition/v2/config/util"
-	"github.com/coreos/ignition/v2/config/v3_5_experimental/types"
+	"github.com/coreos/ignition/v2/config/v3_6_experimental/types"
 	"github.com/coreos/ignition/v2/internal/distro"
 	"github.com/coreos/ignition/v2/internal/exec/util"
 	"github.com/coreos/ignition/v2/internal/log"

internal/exec/stages/files/passwd.go

@@ -19,7 +19,7 @@ import (
 	"path/filepath"
 
 	"github.com/coreos/ignition/v2/config/util"
-	"github.com/coreos/ignition/v2/config/v3_5_experimental/types"
+	"github.com/coreos/ignition/v2/config/v3_6_experimental/types"
 )
 
 func (s *stage) expandGlobList(globs ...string) ([]string, error) {

internal/exec/stages/files/units.go

@@ -23,7 +23,7 @@ import (
 
 	"github.com/coreos/ignition/v2/config/shared/errors"
 	cutil "github.com/coreos/ignition/v2/config/util"
-	"github.com/coreos/ignition/v2/config/v3_5_experimental/types"
+	"github.com/coreos/ignition/v2/config/v3_6_experimental/types"
 	"github.com/coreos/ignition/v2/internal/exec/util"
 	"github.com/coreos/ignition/v2/internal/systemd"
 )

internal/exec/stages/files/units_test.go

@@ -19,7 +19,7 @@ import (
 	"testing"
 
 	"github.com/coreos/ignition/v2/config/shared/errors"
-	"github.com/coreos/ignition/v2/config/v3_5_experimental/types"
+	"github.com/coreos/ignition/v2/config/v3_6_experimental/types"
 )
 
 func TestParseInstanceUnit(t *testing.T) {

internal/exec/stages/kargs/kargs.go

@@ -19,7 +19,7 @@ import (
 	"fmt"
 	"os/exec"
 
-	"github.com/coreos/ignition/v2/config/v3_5_experimental/types"
+	"github.com/coreos/ignition/v2/config/v3_6_experimental/types"
 	"github.com/coreos/ignition/v2/internal/distro"
 	"github.com/coreos/ignition/v2/internal/exec/stages"
 	"github.com/coreos/ignition/v2/internal/exec/util"

internal/exec/stages/mount/mount.go

@@ -28,7 +28,7 @@ import (
 	"strings"
 
 	cutil "github.com/coreos/ignition/v2/config/util"
-	"github.com/coreos/ignition/v2/config/v3_5_experimental/types"
+	"github.com/coreos/ignition/v2/config/v3_6_experimental/types"
 	"github.com/coreos/ignition/v2/internal/distro"
 	"github.com/coreos/ignition/v2/internal/exec/stages"
 	"github.com/coreos/ignition/v2/internal/exec/util"

internal/exec/stages/stages.go

@@ -15,7 +15,7 @@
 package stages
 
 import (
-	"github.com/coreos/ignition/v2/config/v3_5_experimental/types"
+	"github.com/coreos/ignition/v2/config/v3_6_experimental/types"
 	"github.com/coreos/ignition/v2/internal/log"
 	"github.com/coreos/ignition/v2/internal/registry"
 	"github.com/coreos/ignition/v2/internal/resource"

internal/exec/stages/umount/umount.go

@@ -23,7 +23,7 @@ import (
 	"sort"
 
 	cutil "github.com/coreos/ignition/v2/config/util"
-	"github.com/coreos/ignition/v2/config/v3_5_experimental/types"
+	"github.com/coreos/ignition/v2/config/v3_6_experimental/types"
 	"github.com/coreos/ignition/v2/internal/exec/stages"
 	"github.com/coreos/ignition/v2/internal/exec/util"
 	"github.com/coreos/ignition/v2/internal/log"

internal/exec/util/file.go

@@ -27,7 +27,7 @@ import (
 	"syscall"
 
 	cutil "github.com/coreos/ignition/v2/config/util"
-	"github.com/coreos/ignition/v2/config/v3_5_experimental/types"
+	"github.com/coreos/ignition/v2/config/v3_6_experimental/types"
 	"github.com/coreos/ignition/v2/internal/log"
 	"github.com/coreos/ignition/v2/internal/resource"
 	"github.com/coreos/ignition/v2/internal/util"

internal/exec/util/passwd.go

@@ -25,7 +25,7 @@ import (
 
 	"github.com/coreos/go-systemd/v22/journal"
 	"github.com/coreos/ignition/v2/config/util"
-	"github.com/coreos/ignition/v2/config/v3_5_experimental/types"
+	"github.com/coreos/ignition/v2/config/v3_6_experimental/types"
 	"github.com/coreos/ignition/v2/internal/as_user"
 	"github.com/coreos/ignition/v2/internal/distro"
 	"golang.org/x/sys/unix"

internal/exec/util/unit.go

@@ -22,7 +22,7 @@ import (
 	"path/filepath"
 	"syscall"
 
-	"github.com/coreos/ignition/v2/config/v3_5_experimental/types"
+	"github.com/coreos/ignition/v2/config/v3_6_experimental/types"
 	"github.com/coreos/ignition/v2/internal/distro"
 
 	"github.com/vincent-petithory/dataurl"

internal/platform/platform.go

@@ -18,7 +18,7 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/coreos/ignition/v2/config/v3_5_experimental/types"
+	"github.com/coreos/ignition/v2/config/v3_6_experimental/types"
 	"github.com/coreos/ignition/v2/internal/log"
 	"github.com/coreos/ignition/v2/internal/registry"
 	"github.com/coreos/ignition/v2/internal/resource"

internal/providers/akamai/akamai.go

@@ -24,7 +24,7 @@ import (
 	"net/http"
 	"net/url"
 
-	"github.com/coreos/ignition/v2/config/v3_5_experimental/types"
+	"github.com/coreos/ignition/v2/config/v3_6_experimental/types"
 	"github.com/coreos/ignition/v2/internal/platform"
 	"github.com/coreos/ignition/v2/internal/providers/util"
 	"github.com/coreos/ignition/v2/internal/resource"

internal/providers/aliyun/aliyun.go

@@ -20,7 +20,7 @@ package aliyun
 import (
 	"net/url"
 
-	"github.com/coreos/ignition/v2/config/v3_5_experimental/types"
+	"github.com/coreos/ignition/v2/config/v3_6_experimental/types"
 	"github.com/coreos/ignition/v2/internal/platform"
 	"github.com/coreos/ignition/v2/internal/providers/util"
 	"github.com/coreos/ignition/v2/internal/resource"

internal/providers/applehv/applehv.go

@@ -22,7 +22,7 @@ import (
 	"net/http"
 	"os/exec"
 
-	"github.com/coreos/ignition/v2/config/v3_5_experimental/types"
+	"github.com/coreos/ignition/v2/config/v3_6_experimental/types"
 	"github.com/coreos/ignition/v2/internal/distro"
 	"github.com/coreos/ignition/v2/internal/platform"
 	"github.com/coreos/ignition/v2/internal/providers/util"

internal/providers/aws/aws.go

@@ -22,7 +22,7 @@ import (
 	"net/http"
 	"net/url"
 
-	"github.com/coreos/ignition/v2/config/v3_5_experimental/types"
+	"github.com/coreos/ignition/v2/config/v3_6_experimental/types"
 	"github.com/coreos/ignition/v2/internal/log"
 	"github.com/coreos/ignition/v2/internal/platform"
 	"github.com/coreos/ignition/v2/internal/providers/util"

internal/providers/azure/azure.go

@@ -26,7 +26,7 @@ import (
 	"time"
 
 	"github.com/coreos/ignition/v2/config/shared/errors"
-	"github.com/coreos/ignition/v2/config/v3_5_experimental/types"
+	"github.com/coreos/ignition/v2/config/v3_6_experimental/types"
 	execUtil "github.com/coreos/ignition/v2/internal/exec/util"
 	"github.com/coreos/ignition/v2/internal/log"
 	"github.com/coreos/ignition/v2/internal/platform"

internal/providers/azurestack/azurestack.go

@@ -18,7 +18,7 @@
 package azurestack
 
 import (
-	"github.com/coreos/ignition/v2/config/v3_5_experimental/types"
+	"github.com/coreos/ignition/v2/config/v3_6_experimental/types"
 	"github.com/coreos/ignition/v2/internal/platform"
 	"github.com/coreos/ignition/v2/internal/providers/azure"
 	"github.com/coreos/ignition/v2/internal/resource"

internal/providers/cloudstack/cloudstack.go

@@ -30,7 +30,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/coreos/ignition/v2/config/v3_5_experimental/types"
+	"github.com/coreos/ignition/v2/config/v3_6_experimental/types"
 	"github.com/coreos/ignition/v2/internal/distro"
 	"github.com/coreos/ignition/v2/internal/log"
 	"github.com/coreos/ignition/v2/internal/platform"

internal/providers/cmdline/cmdline.go

@@ -22,7 +22,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/coreos/ignition/v2/config/v3_5_experimental/types"
+	"github.com/coreos/ignition/v2/config/v3_6_experimental/types"
 	"github.com/coreos/ignition/v2/internal/distro"
 	"github.com/coreos/ignition/v2/internal/log"
 	"github.com/coreos/ignition/v2/internal/platform"

internal/providers/digitalocean/digitalocean.go

@@ -20,7 +20,7 @@ package digitalocean
 import (
 	"net/url"
 
-	"github.com/coreos/ignition/v2/config/v3_5_experimental/types"
+	"github.com/coreos/ignition/v2/config/v3_6_experimental/types"
 	"github.com/coreos/ignition/v2/internal/platform"
 	"github.com/coreos/ignition/v2/internal/providers/util"
 	"github.com/coreos/ignition/v2/internal/resource"

internal/providers/exoscale/exoscale.go

@@ -20,7 +20,7 @@ package exoscale
 import (
 	"net/url"
 
-	"github.com/coreos/ignition/v2/config/v3_5_experimental/types"
+	"github.com/coreos/ignition/v2/config/v3_6_experimental/types"
 	"github.com/coreos/ignition/v2/internal/platform"
 	"github.com/coreos/ignition/v2/internal/providers/util"
 	"github.com/coreos/ignition/v2/internal/resource"

internal/providers/file/file.go

@@ -17,7 +17,7 @@ package file
 import (
 	"os"
 
-	"github.com/coreos/ignition/v2/config/v3_5_experimental/types"
+	"github.com/coreos/ignition/v2/config/v3_6_experimental/types"
 	"github.com/coreos/ignition/v2/internal/platform"
 	"github.com/coreos/ignition/v2/internal/providers/util"
 	"github.com/coreos/ignition/v2/internal/resource"

internal/providers/gcp/gcp.go

@@ -21,7 +21,7 @@ import (
 	"net/http"
 	"net/url"
 
-	"github.com/coreos/ignition/v2/config/v3_5_experimental/types"
+	"github.com/coreos/ignition/v2/config/v3_6_experimental/types"
 	"github.com/coreos/ignition/v2/internal/platform"
 	"github.com/coreos/ignition/v2/internal/providers/util"
 	"github.com/coreos/ignition/v2/internal/resource"