Skip to content

Commit 56a634f

Browse files
bgilbertbgilbert
authored
Merge pull request #1558 from bgilbert/stabilize
Stabilize spec 3.4.0; create spec 3.5.0-experimental
2 parents 0fd3a9e + c47043f commit 56a634f

File tree

173 files changed

+5690
-96
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

173 files changed

+5690
-96
lines changed

‎config/config.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
package config
1616

1717
import (
18-
exp "github.com/coreos/ignition/v2/config/v3_4_experimental"
19-
types_exp "github.com/coreos/ignition/v2/config/v3_4_experimental/types"
18+
exp "github.com/coreos/ignition/v2/config/v3_5_experimental"
19+
types_exp "github.com/coreos/ignition/v2/config/v3_5_experimental/types"
2020

2121
"github.com/coreos/vcontext/report"
2222
)

‎config/config_test.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ import (
2424
v3_1 "github.com/coreos/ignition/v2/config/v3_1/types"
2525
v3_2 "github.com/coreos/ignition/v2/config/v3_2/types"
2626
v3_3 "github.com/coreos/ignition/v2/config/v3_3/types"
27-
v3_4 "github.com/coreos/ignition/v2/config/v3_4_experimental/types"
27+
v3_4 "github.com/coreos/ignition/v2/config/v3_4/types"
28+
v3_5 "github.com/coreos/ignition/v2/config/v3_5_experimental/types"
2829
)
2930

3031
type typeSet map[reflect.Type]struct{}
@@ -272,6 +273,7 @@ func TestConfigStructure(t *testing.T) {
272273
reflect.TypeOf(v3_2.Config{}),
273274
reflect.TypeOf(v3_3.Config{}),
274275
reflect.TypeOf(v3_4.Config{}),
276+
reflect.TypeOf(v3_5.Config{}),
275277
}
276278

277279
for _, configType := range configs {

‎config/merge/merge_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919

2020
"github.com/coreos/ignition/v2/config/util"
2121
v3_2 "github.com/coreos/ignition/v2/config/v3_2/types"
22-
"github.com/coreos/ignition/v2/config/v3_4_experimental/types"
22+
"github.com/coreos/ignition/v2/config/v3_5_experimental/types"
2323

2424
"github.com/coreos/vcontext/path"
2525
"github.com/stretchr/testify/assert"

‎config/v3_4_experimental/config.go renamed to ‎config/v3_4/config.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
package v3_4_experimental
15+
package v3_4
1616

1717
import (
1818
"github.com/coreos/ignition/v2/config/merge"
1919
"github.com/coreos/ignition/v2/config/shared/errors"
2020
"github.com/coreos/ignition/v2/config/util"
2121
prev "github.com/coreos/ignition/v2/config/v3_3"
22-
"github.com/coreos/ignition/v2/config/v3_4_experimental/translate"
23-
"github.com/coreos/ignition/v2/config/v3_4_experimental/types"
22+
"github.com/coreos/ignition/v2/config/v3_4/translate"
23+
"github.com/coreos/ignition/v2/config/v3_4/types"
2424
"github.com/coreos/ignition/v2/config/validate"
2525

2626
"github.com/coreos/go-semver/semver"
@@ -58,8 +58,8 @@ func Parse(rawConfig []byte) (types.Config, report.Report, error) {
5858
return config, rpt, nil
5959
}
6060

61-
// ParseCompatibleVersion parses the raw config of version 3.4.0-experimental or
62-
// lesser into a 3.4-exp types.Config struct and generates a report of any errors,
61+
// ParseCompatibleVersion parses the raw config of version 3.4.0 or
62+
// lesser into a 3.4 types.Config struct and generates a report of any errors,
6363
// warnings, info, and deprecations it encountered
6464
func ParseCompatibleVersion(raw []byte) (types.Config, report.Report, error) {
6565
version, rpt, err := util.GetConfigVersion(raw)

‎config/v3_4_experimental/config_test.go renamed to ‎config/v3_4/config_test.go

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
package v3_4_experimental
15+
package v3_4
1616

1717
import (
1818
"testing"
1919

2020
"github.com/coreos/ignition/v2/config/shared/errors"
21-
"github.com/coreos/ignition/v2/config/v3_4_experimental/types"
21+
"github.com/coreos/ignition/v2/config/v3_4/types"
2222
"github.com/stretchr/testify/assert"
2323
)
2424

@@ -79,6 +79,10 @@ func TestParse(t *testing.T) {
7979
in: in{config: []byte(`{"ignition": {"version": "3.3.0"}}`)},
8080
out: out{err: errors.ErrUnknownVersion},
8181
},
82+
{
83+
in: in{config: []byte(`{"ignition": {"version": "3.4.0"}}`)},
84+
out: out{config: types.Config{Ignition: types.Ignition{Version: types.MaxVersion.String()}}},
85+
},
8286
{
8387
in: in{config: []byte(`{"ignition": {"version": "2.0.0-experimental"}}`)},
8488
out: out{err: errors.ErrUnknownVersion},
@@ -121,7 +125,7 @@ func TestParse(t *testing.T) {
121125
},
122126
{
123127
in: in{config: []byte(`{"ignition": {"version": "3.4.0-experimental"}}`)},
124-
out: out{config: types.Config{Ignition: types.Ignition{Version: types.MaxVersion.String()}}},
128+
out: out{err: errors.ErrUnknownVersion},
125129
},
126130
{
127131
in: in{config: []byte(`{"ignition": {"version": "2.0.0"},}`)},
@@ -140,7 +144,7 @@ func TestParse(t *testing.T) {
140144
out: out{err: errors.ErrEmpty},
141145
},
142146
{
143-
in: in{config: []byte(`{"ignition": {"version": "3.4.0-experimental"}, "storage": {"filesystems": [{"format": "ext4", "label": "zzzzzzzzzzzzzzzzzzzzzzzzzzz"}]}}`)},
147+
in: in{config: []byte(`{"ignition": {"version": "3.4.0"}, "storage": {"filesystems": [{"format": "ext4", "label": "zzzzzzzzzzzzzzzzzzzzzzzzzzz"}]}}`)},
144148
out: out{err: errors.ErrInvalid},
145149
},
146150
}
@@ -166,9 +170,13 @@ func TestParse(t *testing.T) {
166170
out: out{config: types.Config{Ignition: types.Ignition{Version: types.MaxVersion.String()}}},
167171
},
168172
{
169-
in: in{config: []byte(`{"ignition": {"version": "3.4.0-experimental"}}`)},
173+
in: in{config: []byte(`{"ignition": {"version": "3.4.0"}}`)},
170174
out: out{config: types.Config{Ignition: types.Ignition{Version: types.MaxVersion.String()}}},
171175
},
176+
{
177+
in: in{config: []byte(`{"ignition": {"version": "3.4.0-experimental"}}`)},
178+
out: out{err: errors.ErrUnknownVersion},
179+
},
172180
{
173181
in: in{config: []byte(`{"ignition": {"version": "3.5.0"}}`)},
174182
out: out{err: errors.ErrUnknownVersion},
@@ -182,7 +190,7 @@ func TestParse(t *testing.T) {
182190
out: out{err: errors.ErrInvalid},
183191
},
184192
{
185-
in: in{config: []byte(`{"ignition": {"version": "3.4.0-experimental"}, "storage": {"filesystems": [{"format": "ext4", "label": "zzzzzzzzzzzzzzzzzzzzzzzzzzz"}]}}`)},
193+
in: in{config: []byte(`{"ignition": {"version": "3.4.0"}, "storage": {"filesystems": [{"format": "ext4", "label": "zzzzzzzzzzzzzzzzzzzzzzzzzzz"}]}}`)},
186194
out: out{err: errors.ErrInvalid},
187195
},
188196
}

‎config/v3_4_experimental/schema/ignition.json renamed to ‎config/v3_4/schema/ignition.json

File renamed without changes.

‎config/v3_4_experimental/translate/translate.go renamed to ‎config/v3_4/translate/translate.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"github.com/coreos/ignition/v2/config/translate"
1919
"github.com/coreos/ignition/v2/config/util"
2020
old_types "github.com/coreos/ignition/v2/config/v3_3/types"
21-
"github.com/coreos/ignition/v2/config/v3_4_experimental/types"
21+
"github.com/coreos/ignition/v2/config/v3_4/types"
2222
)
2323

2424
func translateIgnition(old old_types.Ignition) (ret types.Ignition) {

‎config/v3_4_experimental/translate/translate_test.go renamed to ‎config/v3_4/translate/translate_test.go

File renamed without changes.

‎config/v3_4_experimental/types/clevis.go renamed to ‎config/v3_4/types/clevis.go

File renamed without changes.

‎config/v3_4_experimental/types/clevis_test.go renamed to ‎config/v3_4/types/clevis_test.go

File renamed without changes.

0 commit comments

Comments
 (0)