Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ignition spec bump #562

Merged
merged 2 commits into from
Nov 26, 2024
Merged

Ignition spec bump #562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e37ee9c
mod: revendor latest ignition, stabilize 3.5
prestist Nov 21, 2024
72550e5
docs: run generate with new ignition import
prestist Nov 25, 2024
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: 1 addition & 1 deletion base/v0_6_exp/translate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import (

"github.com/coreos/go-systemd/v22/unit"
"github.com/coreos/ignition/v2/config/util"
"github.com/coreos/ignition/v2/config/v3_5_experimental/types"
"github.com/coreos/ignition/v2/config/v3_5/types"
"github.com/coreos/vcontext/path"
"github.com/coreos/vcontext/report"
)
Expand Down
30 changes: 15 additions & 15 deletions base/v0_6_exp/translate_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
"github.com/coreos/butane/translate"

"github.com/coreos/ignition/v2/config/util"
"github.com/coreos/ignition/v2/config/v3_5_experimental/types"
"github.com/coreos/ignition/v2/config/v3_5/types"
"github.com/coreos/vcontext/path"
"github.com/coreos/vcontext/report"
"github.com/stretchr/testify/assert"
Expand Down Expand Up @@ -816,7 +816,7 @@ func TestTranslateMountUnit(t *testing.T) {
},
types.Config{
Ignition: types.Ignition{
Version: "3.5.0-experimental",
Version: "3.5.0",
},
Storage: types.Storage{
Filesystems: []types.Filesystem{
Expand Down Expand Up @@ -881,7 +881,7 @@ RequiredBy=local-fs.target`),
},
types.Config{
Ignition: types.Ignition{
Version: "3.5.0-experimental",
Version: "3.5.0",
},
Storage: types.Storage{
Filesystems: []types.Filesystem{
Expand Down Expand Up @@ -945,7 +945,7 @@ RequiredBy=remote-fs.target`),
},
types.Config{
Ignition: types.Ignition{
Version: "3.5.0-experimental",
Version: "3.5.0",
},
Storage: types.Storage{
Filesystems: []types.Filesystem{
Expand Down Expand Up @@ -1007,7 +1007,7 @@ RequiredBy=local-fs.target`),
},
types.Config{
Ignition: types.Ignition{
Version: "3.5.0-experimental",
Version: "3.5.0",
},
Storage: types.Storage{
Filesystems: []types.Filesystem{
Expand Down Expand Up @@ -1078,7 +1078,7 @@ RequiredBy=remote-fs.target`),
},
types.Config{
Ignition: types.Ignition{
Version: "3.5.0-experimental",
Version: "3.5.0",
},
Storage: types.Storage{
Filesystems: []types.Filesystem{
Expand Down Expand Up @@ -1115,7 +1115,7 @@ RequiredBy=remote-fs.target`),
},
types.Config{
Ignition: types.Ignition{
Version: "3.5.0-experimental",
Version: "3.5.0",
},
Storage: types.Storage{
Filesystems: []types.Filesystem{
Expand Down Expand Up @@ -1157,7 +1157,7 @@ RequiredBy=swap.target`),
},
types.Config{
Ignition: types.Ignition{
Version: "3.5.0-experimental",
Version: "3.5.0",
},
Storage: types.Storage{
Filesystems: []types.Filesystem{
Expand Down Expand Up @@ -1744,7 +1744,7 @@ func TestTranslateIgnition(t *testing.T) {
{
Ignition{},
types.Ignition{
Version: "3.5.0-experimental",
Version: "3.5.0",
},
},
{
Expand All @@ -1761,7 +1761,7 @@ func TestTranslateIgnition(t *testing.T) {
},
},
types.Ignition{
Version: "3.5.0-experimental",
Version: "3.5.0",
Config: types.IgnitionConfig{
Merge: []types.Resource{
{
Expand All @@ -1784,7 +1784,7 @@ func TestTranslateIgnition(t *testing.T) {
},
},
types.Ignition{
Version: "3.5.0-experimental",
Version: "3.5.0",
Proxy: types.Proxy{
HTTPProxy: util.StrToPtr("https://example.com:8080"),
NoProxy: []types.NoProxyItem{types.NoProxyItem("example.com")},
Expand All @@ -1804,7 +1804,7 @@ func TestTranslateIgnition(t *testing.T) {
},
},
types.Ignition{
Version: "3.5.0-experimental",
Version: "3.5.0",
Security: types.Security{
TLS: types.TLS{
CertificateAuthorities: []types.Resource{
Expand Down Expand Up @@ -1856,7 +1856,7 @@ func TestTranslateKernelArguments(t *testing.T) {
},
types.Config{
Ignition: types.Ignition{
Version: "3.5.0-experimental",
Version: "3.5.0",
},
KernelArguments: types.KernelArguments{
ShouldExist: []types.KernelArgument{
Expand Down Expand Up @@ -1916,7 +1916,7 @@ func TestTranslateTang(t *testing.T) {
},
types.Config{
Ignition: types.Ignition{
Version: "3.5.0-experimental",
Version: "3.5.0",
},
Storage: types.Storage{
Filesystems: []types.Filesystem{
Expand Down Expand Up @@ -2346,7 +2346,7 @@ func TestToIgn3_5(t *testing.T) {
Config{},
types.Config{
Ignition: types.Ignition{
Version: "3.5.0-experimental",
Version: "3.5.0",
},
},
},
Expand Down
2 changes: 1 addition & 1 deletion base/v0_6_exp/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
package v0_6_exp

import (
"github.com/coreos/ignition/v2/config/v3_5_experimental/types"
"github.com/coreos/ignition/v2/config/v3_5/types"
)

type nodeTracker struct {
Expand Down
2 changes: 1 addition & 1 deletion config/fcos/v1_6_exp/translate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"github.com/coreos/butane/translate"

"github.com/coreos/ignition/v2/config/util"
"github.com/coreos/ignition/v2/config/v3_5_experimental/types"
"github.com/coreos/ignition/v2/config/v3_5/types"
"github.com/coreos/vcontext/path"
"github.com/coreos/vcontext/report"
)
Expand Down
24 changes: 12 additions & 12 deletions config/fcos/v1_6_exp/translate_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"github.com/coreos/butane/translate"

"github.com/coreos/ignition/v2/config/util"
"github.com/coreos/ignition/v2/config/v3_5_experimental/types"
"github.com/coreos/ignition/v2/config/v3_5/types"
"github.com/coreos/vcontext/path"
"github.com/coreos/vcontext/report"
"github.com/stretchr/testify/assert"
Expand All @@ -46,7 +46,7 @@ func TestTranslateBootDevice(t *testing.T) {
Config{},
types.Config{
Ignition: types.Ignition{
Version: "3.5.0-experimental",
Version: "3.5.0",
},
},
[]translate.Translation{
Expand Down Expand Up @@ -89,7 +89,7 @@ func TestTranslateBootDevice(t *testing.T) {
},
types.Config{
Ignition: types.Ignition{
Version: "3.5.0-experimental",
Version: "3.5.0",
},
Storage: types.Storage{
Disks: []types.Disk{
Expand Down Expand Up @@ -164,7 +164,7 @@ func TestTranslateBootDevice(t *testing.T) {
},
types.Config{
Ignition: types.Ignition{
Version: "3.5.0-experimental",
Version: "3.5.0",
},
Storage: types.Storage{
Luks: []types.Luks{
Expand Down Expand Up @@ -235,7 +235,7 @@ func TestTranslateBootDevice(t *testing.T) {
},
types.Config{
Ignition: types.Ignition{
Version: "3.5.0-experimental",
Version: "3.5.0",
},
Storage: types.Storage{
Luks: []types.Luks{
Expand Down Expand Up @@ -298,7 +298,7 @@ func TestTranslateBootDevice(t *testing.T) {
},
types.Config{
Ignition: types.Ignition{
Version: "3.5.0-experimental",
Version: "3.5.0",
},
Storage: types.Storage{
Disks: []types.Disk{
Expand Down Expand Up @@ -544,7 +544,7 @@ func TestTranslateBootDevice(t *testing.T) {
},
types.Config{
Ignition: types.Ignition{
Version: "3.5.0-experimental",
Version: "3.5.0",
},
Storage: types.Storage{
Disks: []types.Disk{
Expand Down Expand Up @@ -822,7 +822,7 @@ func TestTranslateBootDevice(t *testing.T) {
},
types.Config{
Ignition: types.Ignition{
Version: "3.5.0-experimental",
Version: "3.5.0",
},
Storage: types.Storage{
Disks: []types.Disk{
Expand Down Expand Up @@ -1046,7 +1046,7 @@ func TestTranslateBootDevice(t *testing.T) {
},
types.Config{
Ignition: types.Ignition{
Version: "3.5.0-experimental",
Version: "3.5.0",
},
Storage: types.Storage{
Disks: []types.Disk{
Expand Down Expand Up @@ -1280,7 +1280,7 @@ func TestTranslateBootDevice(t *testing.T) {
},
types.Config{
Ignition: types.Ignition{
Version: "3.5.0-experimental",
Version: "3.5.0",
},
Storage: types.Storage{
Disks: []types.Disk{
Expand Down Expand Up @@ -1545,7 +1545,7 @@ func TestTranslateGrub(t *testing.T) {
},
types.Config{
Ignition: types.Ignition{
Version: "3.5.0-experimental",
Version: "3.5.0",
},
Storage: types.Storage{
Filesystems: []types.Filesystem{
Expand Down Expand Up @@ -1593,7 +1593,7 @@ func TestTranslateGrub(t *testing.T) {
},
types.Config{
Ignition: types.Ignition{
Version: "3.5.0-experimental",
Version: "3.5.0",
},
Storage: types.Storage{
Filesystems: []types.Filesystem{
Expand Down
2 changes: 1 addition & 1 deletion config/fiot/v1_1_exp/translate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"github.com/coreos/butane/config/common"
cutil "github.com/coreos/butane/config/util"

"github.com/coreos/ignition/v2/config/v3_5_experimental/types"
"github.com/coreos/ignition/v2/config/v3_5/types"
"github.com/coreos/vcontext/report"
)

Expand Down
2 changes: 1 addition & 1 deletion config/flatcar/v1_2_exp/translate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"github.com/coreos/butane/config/common"
cutil "github.com/coreos/butane/config/util"

"github.com/coreos/ignition/v2/config/v3_5_experimental/types"
"github.com/coreos/ignition/v2/config/v3_5/types"
"github.com/coreos/vcontext/report"
)

Expand Down
2 changes: 1 addition & 1 deletion config/flatcar/v1_2_exp/translate_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ func TestTranslation(t *testing.T) {
},
},
},
[]entry{}, // Clevis support was added in 1_2_experimental and we therefore expect no errors.
[]entry{}, // Clevis support was added in 1_2 and we therefore expect no errors.
},
}

Expand Down
2 changes: 1 addition & 1 deletion config/openshift/v4_18_exp/result/schema.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
package result

import (
"github.com/coreos/ignition/v2/config/v3_5_experimental/types"
"github.com/coreos/ignition/v2/config/v3_5/types"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion config/openshift/v4_18_exp/translate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"github.com/coreos/butane/translate"

"github.com/coreos/ignition/v2/config/util"
"github.com/coreos/ignition/v2/config/v3_5_experimental/types"
"github.com/coreos/ignition/v2/config/v3_5/types"
"github.com/coreos/vcontext/path"
"github.com/coreos/vcontext/report"
)
Expand Down
8 changes: 4 additions & 4 deletions config/openshift/v4_18_exp/translate_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
"github.com/coreos/butane/translate"

"github.com/coreos/ignition/v2/config/util"
"github.com/coreos/ignition/v2/config/v3_5_experimental/types"
"github.com/coreos/ignition/v2/config/v3_5/types"
"github.com/coreos/vcontext/path"
"github.com/coreos/vcontext/report"
"github.com/stretchr/testify/assert"
Expand Down Expand Up @@ -84,7 +84,7 @@ func TestTranslateConfig(t *testing.T) {
Spec: result.Spec{
Config: types.Config{
Ignition: types.Ignition{
Version: "3.5.0-experimental",
Version: "3.5.0",
},
},
},
Expand Down Expand Up @@ -159,7 +159,7 @@ func TestTranslateConfig(t *testing.T) {
Spec: result.Spec{
Config: types.Config{
Ignition: types.Ignition{
Version: "3.5.0-experimental",
Version: "3.5.0",
},
Storage: types.Storage{
Filesystems: []types.Filesystem{
Expand Down Expand Up @@ -304,7 +304,7 @@ func TestTranslateConfig(t *testing.T) {
Spec: result.Spec{
Config: types.Config{
Ignition: types.Ignition{
Version: "3.5.0-experimental",
Version: "3.5.0",
},
Storage: types.Storage{
Filesystems: []types.Filesystem{
Expand Down
2 changes: 1 addition & 1 deletion config/r4e/v1_2_exp/translate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"github.com/coreos/butane/config/common"
cutil "github.com/coreos/butane/config/util"

"github.com/coreos/ignition/v2/config/v3_5_experimental/types"
"github.com/coreos/ignition/v2/config/v3_5/types"
"github.com/coreos/vcontext/report"
)

Expand Down
4 changes: 2 additions & 2 deletions docs/config-fcos-v1_6-exp.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ The Fedora CoreOS configuration is a YAML document conforming to the following s
<div id="spec-docs"></div>

* **variant** (string): used to differentiate configs for different operating systems. Must be `fcos` for this specification.
* **version** (string): the semantic version of the spec for this document. This document is for version `1.6.0-experimental` and generates Ignition configs with version `3.5.0-experimental`.
* **version** (string): the semantic version of the spec for this document. This document is for version `1.6.0-experimental` and generates Ignition configs with version `3.5.0`.
* **_ignition_** (object): metadata about the configuration itself.
* **_config_** (object): options related to the configuration.
* **_merge_** (list of objects): a list of the configs to be merged to the current config.
Expand Down Expand Up @@ -169,7 +169,7 @@ The Fedora CoreOS configuration is a YAML document conforming to the following s
* **config** (string): the clevis configuration JSON.
* **_needs_network_** (boolean): whether or not the device requires networking.
* **_cex_** (object): describes the IBM Crypto Express (CEX) card configuration for the luks device.
* **_enabled_** (boolean): whether or not to use a CEX secure key to encrypt the luks device.
* **_enabled_** (boolean): whether or not to enable cex compatibility for luks. If omitted, defaults to false.
* **_trees_** (list of objects): a list of local directory trees to be embedded in the config. Ownership is not preserved. File modes are set to 0755 if the local file is executable or 0644 otherwise. Attributes of files, directories, and symlinks can be overridden by creating a corresponding entry in the `files`, `directories`, or `links` section; such `files` entries must omit `contents` and such `links` entries must omit `target`.
* **local** (string): the base of the local directory tree, relative to the directory specified by the `--files-dir` command-line argument.
* **_path_** (string): the path of the tree within the target system. Defaults to `/`.
Expand Down
2 changes: 1 addition & 1 deletion docs/config-fiot-v1_1-exp.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ The Fedora IoT configuration is a YAML document conforming to the following spec
<div id="spec-docs"></div>

* **variant** (string): used to differentiate configs for different operating systems. Must be `%VARIANT%` for this specification.
* **version** (string): the semantic version of the spec for this document. This document is for version `%VERSION%` and generates Ignition configs with version `3.5.0-experimental`.
* **version** (string): the semantic version of the spec for this document. This document is for version `%VERSION%` and generates Ignition configs with version `3.5.0`.
* **_ignition_** (object): metadata about the configuration itself.
* **_config_** (object): options related to the configuration.
* **_merge_** (list of objects): a list of the configs to be merged to the current config.
Expand Down
2 changes: 1 addition & 1 deletion docs/config-flatcar-v1_2-exp.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ The Flatcar configuration is a YAML document conforming to the following specifi
<div id="spec-docs"></div>

* **variant** (string): used to differentiate configs for different operating systems. Must be `flatcar` for this specification.
* **version** (string): the semantic version of the spec for this document. This document is for version `1.2.0-experimental` and generates Ignition configs with version `3.5.0-experimental`.
* **version** (string): the semantic version of the spec for this document. This document is for version `1.2.0-experimental` and generates Ignition configs with version `3.5.0`.
* **_ignition_** (object): metadata about the configuration itself.
* **_config_** (object): options related to the configuration.
* **_merge_** (list of objects): a list of the configs to be merged to the current config.
Expand Down
Loading
Loading