diff --git a/base/v0_6_exp/translate.go b/base/v0_6_exp/translate.go index 8cf2395f..b17f5a52 100644 --- a/base/v0_6_exp/translate.go +++ b/base/v0_6_exp/translate.go @@ -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" ) diff --git a/base/v0_6_exp/translate_test.go b/base/v0_6_exp/translate_test.go index cf718d4a..8b549055 100644 --- a/base/v0_6_exp/translate_test.go +++ b/base/v0_6_exp/translate_test.go @@ -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" @@ -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{ @@ -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{ @@ -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{ @@ -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{ @@ -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{ @@ -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{ @@ -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{ @@ -1744,7 +1744,7 @@ func TestTranslateIgnition(t *testing.T) { { Ignition{}, types.Ignition{ - Version: "3.5.0-experimental", + Version: "3.5.0", }, }, { @@ -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{ { @@ -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")}, @@ -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{ @@ -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{ @@ -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{ @@ -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", }, }, }, diff --git a/base/v0_6_exp/util.go b/base/v0_6_exp/util.go index bdabebd5..f92b73c6 100644 --- a/base/v0_6_exp/util.go +++ b/base/v0_6_exp/util.go @@ -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 { diff --git a/config/fcos/v1_6_exp/translate.go b/config/fcos/v1_6_exp/translate.go index e9a7ae2e..1428866d 100644 --- a/config/fcos/v1_6_exp/translate.go +++ b/config/fcos/v1_6_exp/translate.go @@ -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" ) diff --git a/config/fcos/v1_6_exp/translate_test.go b/config/fcos/v1_6_exp/translate_test.go index 87620a77..7e90d01d 100644 --- a/config/fcos/v1_6_exp/translate_test.go +++ b/config/fcos/v1_6_exp/translate_test.go @@ -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" @@ -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{ @@ -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{ @@ -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{ @@ -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{ @@ -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{ @@ -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{ @@ -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{ @@ -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{ @@ -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{ @@ -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{ @@ -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{ diff --git a/config/fiot/v1_1_exp/translate.go b/config/fiot/v1_1_exp/translate.go index 9ecac218..e10faf8e 100644 --- a/config/fiot/v1_1_exp/translate.go +++ b/config/fiot/v1_1_exp/translate.go @@ -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" ) diff --git a/config/flatcar/v1_2_exp/translate.go b/config/flatcar/v1_2_exp/translate.go index e712d00d..a9642e34 100644 --- a/config/flatcar/v1_2_exp/translate.go +++ b/config/flatcar/v1_2_exp/translate.go @@ -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" ) diff --git a/config/flatcar/v1_2_exp/translate_test.go b/config/flatcar/v1_2_exp/translate_test.go index e003dc69..d276a1af 100644 --- a/config/flatcar/v1_2_exp/translate_test.go +++ b/config/flatcar/v1_2_exp/translate_test.go @@ -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. }, } diff --git a/config/openshift/v4_18_exp/result/schema.go b/config/openshift/v4_18_exp/result/schema.go index c8d45b79..62bc2054 100644 --- a/config/openshift/v4_18_exp/result/schema.go +++ b/config/openshift/v4_18_exp/result/schema.go @@ -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 ( diff --git a/config/openshift/v4_18_exp/translate.go b/config/openshift/v4_18_exp/translate.go index 37612a76..09d22bb7 100644 --- a/config/openshift/v4_18_exp/translate.go +++ b/config/openshift/v4_18_exp/translate.go @@ -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" ) diff --git a/config/openshift/v4_18_exp/translate_test.go b/config/openshift/v4_18_exp/translate_test.go index 8057cc59..796814c4 100644 --- a/config/openshift/v4_18_exp/translate_test.go +++ b/config/openshift/v4_18_exp/translate_test.go @@ -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" @@ -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", }, }, }, @@ -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{ @@ -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{ diff --git a/config/r4e/v1_2_exp/translate.go b/config/r4e/v1_2_exp/translate.go index 1ca3ca79..cce6d222 100644 --- a/config/r4e/v1_2_exp/translate.go +++ b/config/r4e/v1_2_exp/translate.go @@ -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" ) diff --git a/docs/config-fcos-v1_6-exp.md b/docs/config-fcos-v1_6-exp.md index 41c695c2..4e3ad5cf 100644 --- a/docs/config-fcos-v1_6-exp.md +++ b/docs/config-fcos-v1_6-exp.md @@ -15,7 +15,7 @@ The Fedora CoreOS configuration is a YAML document conforming to the following s
* **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. @@ -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 `/`. diff --git a/docs/config-fiot-v1_1-exp.md b/docs/config-fiot-v1_1-exp.md index 8749b1e5..b220a976 100644 --- a/docs/config-fiot-v1_1-exp.md +++ b/docs/config-fiot-v1_1-exp.md @@ -15,7 +15,7 @@ The Fedora IoT configuration is a YAML document conforming to the following spec * **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. diff --git a/docs/config-flatcar-v1_2-exp.md b/docs/config-flatcar-v1_2-exp.md index 22a907e6..30089f8e 100644 --- a/docs/config-flatcar-v1_2-exp.md +++ b/docs/config-flatcar-v1_2-exp.md @@ -15,7 +15,7 @@ The Flatcar configuration is a YAML document conforming to the following specifi * **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. diff --git a/docs/config-openshift-v4_18-exp.md b/docs/config-openshift-v4_18-exp.md index 0da369aa..06955ad9 100644 --- a/docs/config-openshift-v4_18-exp.md +++ b/docs/config-openshift-v4_18-exp.md @@ -15,7 +15,7 @@ The OpenShift configuration is a YAML document conforming to the following speci * **variant** (string): used to differentiate configs for different operating systems. Must be `openshift` for this specification. -* **version** (string): the semantic version of the spec for this document. This document is for version `4.18.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 `4.18.0-experimental` and generates Ignition configs with version `3.5.0`. * **metadata** (object): metadata about the generated MachineConfig resource. Respected when rendering to a MachineConfig, ignored when rendering directly to an Ignition config. * **name** (string): a unique [name](https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names) for this MachineConfig resource. * **labels** (object): string key/value pairs to apply as [Kubernetes labels](https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/) to this MachineConfig resource. `machineconfiguration.openshift.io/role` is required. @@ -138,7 +138,7 @@ The OpenShift configuration is a YAML document conforming to the following speci * **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. Symlinks must not be present. Ownership is not preserved. File modes are set to 0755 if the local file is executable or 0644 otherwise. File attributes can be overridden by creating a corresponding entry in the `files` section; such entries must omit `contents`. * **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 `/`. diff --git a/docs/config-r4e-v1_2-exp.md b/docs/config-r4e-v1_2-exp.md index e6837b12..2913caf5 100644 --- a/docs/config-r4e-v1_2-exp.md +++ b/docs/config-r4e-v1_2-exp.md @@ -15,7 +15,7 @@ The RHEL for Edge configuration is a YAML document conforming to the following s * **variant** (string): used to differentiate configs for different operating systems. Must be `r4e` 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. diff --git a/docs/release-notes.md b/docs/release-notes.md index dd0f092a..1b60416d 100644 --- a/docs/release-notes.md +++ b/docs/release-notes.md @@ -16,6 +16,8 @@ nav_order: 9 ### Docs changes +- Re-vendor latest ignition release; 3.5.0-experimental becomes 3.5.0 + ## Butane 0.22.0 (2024-09-20) diff --git a/go.mod b/go.mod index a343b14a..7ae58278 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/clarketm/json v1.17.1 github.com/coreos/go-semver v0.3.1 github.com/coreos/go-systemd/v22 v22.5.0 - github.com/coreos/ignition/v2 v2.19.0 + github.com/coreos/ignition/v2 v2.20.0 github.com/coreos/vcontext v0.0.0-20230201181013-d72178a18687 github.com/spf13/pflag v1.0.6-0.20210604193023-d5e0c0615ace github.com/stretchr/testify v1.9.0 @@ -15,7 +15,7 @@ require ( ) require ( - github.com/aws/aws-sdk-go v1.53.5 // indirect + github.com/aws/aws-sdk-go v1.55.5 // indirect github.com/coreos/go-json v0.0.0-20230131223807-18775e0fb4fb // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/kr/pretty v0.3.1 // indirect diff --git a/go.sum b/go.sum index 3412ab2b..eab95cf3 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -github.com/aws/aws-sdk-go v1.53.5 h1:1OcVWMjGlwt7EU5OWmmEEXqaYfmX581EK317QJZXItM= -github.com/aws/aws-sdk-go v1.53.5/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk= +github.com/aws/aws-sdk-go v1.55.5 h1:KKUZBfBoyqy5d3swXyiC7Q76ic40rYcbqH7qjh59kzU= +github.com/aws/aws-sdk-go v1.55.5/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU= github.com/clarketm/json v1.17.1 h1:U1IxjqJkJ7bRK4L6dyphmoO840P6bdhPdbbLySourqI= github.com/clarketm/json v1.17.1/go.mod h1:ynr2LRfb0fQU34l07csRNBTcivjySLLiY1YzQqKVfdo= github.com/coreos/go-json v0.0.0-20230131223807-18775e0fb4fb h1:rmqyI19j3Z/74bIRhuC59RB442rXUazKNueVpfJPxg4= @@ -8,8 +8,8 @@ github.com/coreos/go-semver v0.3.1 h1:yi21YpKnrx1gt5R+la8n5WgS0kCrsPp33dmEyHReZr github.com/coreos/go-semver v0.3.1/go.mod h1:irMmmIw/7yzSRPWryHsK7EYSg09caPQL03VsM8rvUec= github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= -github.com/coreos/ignition/v2 v2.19.0 h1:ek200E31M1NCVyvL22Bd40kOJp7yt1gdHAb3xwqTi8Y= -github.com/coreos/ignition/v2 v2.19.0/go.mod h1:ydb815SaH9A4304wIUoCS5IHyKRHWEp7dfJH8cQW2gA= +github.com/coreos/ignition/v2 v2.20.0 h1:xQjrxhCbcSKpqrN2hOQavAc1rx0GOf6qh2QCauScwPU= +github.com/coreos/ignition/v2 v2.20.0/go.mod h1:l7EpXNWA7jBXmjUMvnVBlrrj+LX2wA/PAyD9kstwFDQ= github.com/coreos/vcontext v0.0.0-20230201181013-d72178a18687 h1:uSmlDgJGbUB0bwQBcZomBTottKwEDF5fF8UjSwKSzWM= github.com/coreos/vcontext v0.0.0-20230201181013-d72178a18687/go.mod h1:Salmysdw7DAVuobBW/LwsKKgpyCPHUhjyJoMJD+ZJiI= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= diff --git a/vendor/github.com/coreos/ignition/v2/config/doc/ignition.yaml b/vendor/github.com/coreos/ignition/v2/config/doc/ignition.yaml index 6f39c255..8c2841c2 100644 --- a/vendor/github.com/coreos/ignition/v2/config/doc/ignition.yaml +++ b/vendor/github.com/coreos/ignition/v2/config/doc/ignition.yaml @@ -384,7 +384,7 @@ root: desc: describes the IBM Crypto Express (CEX) card configuration for the luks device. children: - name: enabled - desc: whether or not to use a CEX secure key to encrypt the luks device. + desc: whether or not to enable cex compatibility for luks. If omitted, defaults to false. - name: systemd desc: describes the desired state of the systemd units. children: diff --git a/vendor/github.com/coreos/ignition/v2/config/v3_5_experimental/types/cex.go b/vendor/github.com/coreos/ignition/v2/config/v3_5/types/cex.go similarity index 100% rename from vendor/github.com/coreos/ignition/v2/config/v3_5_experimental/types/cex.go rename to vendor/github.com/coreos/ignition/v2/config/v3_5/types/cex.go diff --git a/vendor/github.com/coreos/ignition/v2/config/v3_5_experimental/types/clevis.go b/vendor/github.com/coreos/ignition/v2/config/v3_5/types/clevis.go similarity index 100% rename from vendor/github.com/coreos/ignition/v2/config/v3_5_experimental/types/clevis.go rename to vendor/github.com/coreos/ignition/v2/config/v3_5/types/clevis.go diff --git a/vendor/github.com/coreos/ignition/v2/config/v3_5_experimental/types/config.go b/vendor/github.com/coreos/ignition/v2/config/v3_5/types/config.go similarity index 96% rename from vendor/github.com/coreos/ignition/v2/config/v3_5_experimental/types/config.go rename to vendor/github.com/coreos/ignition/v2/config/v3_5/types/config.go index 40c27106..659657b6 100644 --- a/vendor/github.com/coreos/ignition/v2/config/v3_5_experimental/types/config.go +++ b/vendor/github.com/coreos/ignition/v2/config/v3_5/types/config.go @@ -25,9 +25,8 @@ import ( var ( MaxVersion = semver.Version{ - Major: 3, - Minor: 5, - PreRelease: "experimental", + Major: 3, + Minor: 5, } ) diff --git a/vendor/github.com/coreos/ignition/v2/config/v3_5_experimental/types/device.go b/vendor/github.com/coreos/ignition/v2/config/v3_5/types/device.go similarity index 100% rename from vendor/github.com/coreos/ignition/v2/config/v3_5_experimental/types/device.go rename to vendor/github.com/coreos/ignition/v2/config/v3_5/types/device.go diff --git a/vendor/github.com/coreos/ignition/v2/config/v3_5_experimental/types/directory.go b/vendor/github.com/coreos/ignition/v2/config/v3_5/types/directory.go similarity index 100% rename from vendor/github.com/coreos/ignition/v2/config/v3_5_experimental/types/directory.go rename to vendor/github.com/coreos/ignition/v2/config/v3_5/types/directory.go diff --git a/vendor/github.com/coreos/ignition/v2/config/v3_5_experimental/types/disk.go b/vendor/github.com/coreos/ignition/v2/config/v3_5/types/disk.go similarity index 100% rename from vendor/github.com/coreos/ignition/v2/config/v3_5_experimental/types/disk.go rename to vendor/github.com/coreos/ignition/v2/config/v3_5/types/disk.go diff --git a/vendor/github.com/coreos/ignition/v2/config/v3_5_experimental/types/file.go b/vendor/github.com/coreos/ignition/v2/config/v3_5/types/file.go similarity index 100% rename from vendor/github.com/coreos/ignition/v2/config/v3_5_experimental/types/file.go rename to vendor/github.com/coreos/ignition/v2/config/v3_5/types/file.go diff --git a/vendor/github.com/coreos/ignition/v2/config/v3_5_experimental/types/filesystem.go b/vendor/github.com/coreos/ignition/v2/config/v3_5/types/filesystem.go similarity index 100% rename from vendor/github.com/coreos/ignition/v2/config/v3_5_experimental/types/filesystem.go rename to vendor/github.com/coreos/ignition/v2/config/v3_5/types/filesystem.go diff --git a/vendor/github.com/coreos/ignition/v2/config/v3_5_experimental/types/headers.go b/vendor/github.com/coreos/ignition/v2/config/v3_5/types/headers.go similarity index 100% rename from vendor/github.com/coreos/ignition/v2/config/v3_5_experimental/types/headers.go rename to vendor/github.com/coreos/ignition/v2/config/v3_5/types/headers.go diff --git a/vendor/github.com/coreos/ignition/v2/config/v3_5_experimental/types/ignition.go b/vendor/github.com/coreos/ignition/v2/config/v3_5/types/ignition.go similarity index 100% rename from vendor/github.com/coreos/ignition/v2/config/v3_5_experimental/types/ignition.go rename to vendor/github.com/coreos/ignition/v2/config/v3_5/types/ignition.go diff --git a/vendor/github.com/coreos/ignition/v2/config/v3_5_experimental/types/kargs.go b/vendor/github.com/coreos/ignition/v2/config/v3_5/types/kargs.go similarity index 100% rename from vendor/github.com/coreos/ignition/v2/config/v3_5_experimental/types/kargs.go rename to vendor/github.com/coreos/ignition/v2/config/v3_5/types/kargs.go diff --git a/vendor/github.com/coreos/ignition/v2/config/v3_5_experimental/types/luks.go b/vendor/github.com/coreos/ignition/v2/config/v3_5/types/luks.go similarity index 100% rename from vendor/github.com/coreos/ignition/v2/config/v3_5_experimental/types/luks.go rename to vendor/github.com/coreos/ignition/v2/config/v3_5/types/luks.go diff --git a/vendor/github.com/coreos/ignition/v2/config/v3_5_experimental/types/mode.go b/vendor/github.com/coreos/ignition/v2/config/v3_5/types/mode.go similarity index 100% rename from vendor/github.com/coreos/ignition/v2/config/v3_5_experimental/types/mode.go rename to vendor/github.com/coreos/ignition/v2/config/v3_5/types/mode.go diff --git a/vendor/github.com/coreos/ignition/v2/config/v3_5_experimental/types/node.go b/vendor/github.com/coreos/ignition/v2/config/v3_5/types/node.go similarity index 100% rename from vendor/github.com/coreos/ignition/v2/config/v3_5_experimental/types/node.go rename to vendor/github.com/coreos/ignition/v2/config/v3_5/types/node.go diff --git a/vendor/github.com/coreos/ignition/v2/config/v3_5_experimental/types/partition.go b/vendor/github.com/coreos/ignition/v2/config/v3_5/types/partition.go similarity index 100% rename from vendor/github.com/coreos/ignition/v2/config/v3_5_experimental/types/partition.go rename to vendor/github.com/coreos/ignition/v2/config/v3_5/types/partition.go diff --git a/vendor/github.com/coreos/ignition/v2/config/v3_5_experimental/types/passwd.go b/vendor/github.com/coreos/ignition/v2/config/v3_5/types/passwd.go similarity index 100% rename from vendor/github.com/coreos/ignition/v2/config/v3_5_experimental/types/passwd.go rename to vendor/github.com/coreos/ignition/v2/config/v3_5/types/passwd.go diff --git a/vendor/github.com/coreos/ignition/v2/config/v3_5_experimental/types/path.go b/vendor/github.com/coreos/ignition/v2/config/v3_5/types/path.go similarity index 100% rename from vendor/github.com/coreos/ignition/v2/config/v3_5_experimental/types/path.go rename to vendor/github.com/coreos/ignition/v2/config/v3_5/types/path.go diff --git a/vendor/github.com/coreos/ignition/v2/config/v3_5_experimental/types/proxy.go b/vendor/github.com/coreos/ignition/v2/config/v3_5/types/proxy.go similarity index 100% rename from vendor/github.com/coreos/ignition/v2/config/v3_5_experimental/types/proxy.go rename to vendor/github.com/coreos/ignition/v2/config/v3_5/types/proxy.go diff --git a/vendor/github.com/coreos/ignition/v2/config/v3_5_experimental/types/raid.go b/vendor/github.com/coreos/ignition/v2/config/v3_5/types/raid.go similarity index 100% rename from vendor/github.com/coreos/ignition/v2/config/v3_5_experimental/types/raid.go rename to vendor/github.com/coreos/ignition/v2/config/v3_5/types/raid.go diff --git a/vendor/github.com/coreos/ignition/v2/config/v3_5_experimental/types/resource.go b/vendor/github.com/coreos/ignition/v2/config/v3_5/types/resource.go similarity index 100% rename from vendor/github.com/coreos/ignition/v2/config/v3_5_experimental/types/resource.go rename to vendor/github.com/coreos/ignition/v2/config/v3_5/types/resource.go diff --git a/vendor/github.com/coreos/ignition/v2/config/v3_5_experimental/types/schema.go b/vendor/github.com/coreos/ignition/v2/config/v3_5/types/schema.go similarity index 97% rename from vendor/github.com/coreos/ignition/v2/config/v3_5_experimental/types/schema.go rename to vendor/github.com/coreos/ignition/v2/config/v3_5/types/schema.go index 82957838..6c8c42f5 100644 --- a/vendor/github.com/coreos/ignition/v2/config/v3_5_experimental/types/schema.go +++ b/vendor/github.com/coreos/ignition/v2/config/v3_5/types/schema.go @@ -1,6 +1,6 @@ package types -// generated by "schematyper --package=types config/v3_5_experimental/schema/ignition.json -o config/v3_5_experimental/types/schema.go --root-type=Config" -- DO NOT EDIT +// generated by "schematyper --package=types config/v3_5/schema/ignition.json -o config/v3_5/types/schema.go --root-type=Config" -- DO NOT EDIT type Cex struct { Enabled *bool `json:"enabled,omitempty"` diff --git a/vendor/github.com/coreos/ignition/v2/config/v3_5_experimental/types/storage.go b/vendor/github.com/coreos/ignition/v2/config/v3_5/types/storage.go similarity index 100% rename from vendor/github.com/coreos/ignition/v2/config/v3_5_experimental/types/storage.go rename to vendor/github.com/coreos/ignition/v2/config/v3_5/types/storage.go diff --git a/vendor/github.com/coreos/ignition/v2/config/v3_5_experimental/types/systemd.go b/vendor/github.com/coreos/ignition/v2/config/v3_5/types/systemd.go similarity index 100% rename from vendor/github.com/coreos/ignition/v2/config/v3_5_experimental/types/systemd.go rename to vendor/github.com/coreos/ignition/v2/config/v3_5/types/systemd.go diff --git a/vendor/github.com/coreos/ignition/v2/config/v3_5_experimental/types/tang.go b/vendor/github.com/coreos/ignition/v2/config/v3_5/types/tang.go similarity index 100% rename from vendor/github.com/coreos/ignition/v2/config/v3_5_experimental/types/tang.go rename to vendor/github.com/coreos/ignition/v2/config/v3_5/types/tang.go diff --git a/vendor/github.com/coreos/ignition/v2/config/v3_5_experimental/types/tls.go b/vendor/github.com/coreos/ignition/v2/config/v3_5/types/tls.go similarity index 100% rename from vendor/github.com/coreos/ignition/v2/config/v3_5_experimental/types/tls.go rename to vendor/github.com/coreos/ignition/v2/config/v3_5/types/tls.go diff --git a/vendor/github.com/coreos/ignition/v2/config/v3_5_experimental/types/unit.go b/vendor/github.com/coreos/ignition/v2/config/v3_5/types/unit.go similarity index 100% rename from vendor/github.com/coreos/ignition/v2/config/v3_5_experimental/types/unit.go rename to vendor/github.com/coreos/ignition/v2/config/v3_5/types/unit.go diff --git a/vendor/github.com/coreos/ignition/v2/config/v3_5_experimental/types/url.go b/vendor/github.com/coreos/ignition/v2/config/v3_5/types/url.go similarity index 100% rename from vendor/github.com/coreos/ignition/v2/config/v3_5_experimental/types/url.go rename to vendor/github.com/coreos/ignition/v2/config/v3_5/types/url.go diff --git a/vendor/github.com/coreos/ignition/v2/config/v3_5_experimental/types/verification.go b/vendor/github.com/coreos/ignition/v2/config/v3_5/types/verification.go similarity index 100% rename from vendor/github.com/coreos/ignition/v2/config/v3_5_experimental/types/verification.go rename to vendor/github.com/coreos/ignition/v2/config/v3_5/types/verification.go diff --git a/vendor/modules.txt b/vendor/modules.txt index fe49a332..b0f0d9db 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1,4 +1,4 @@ -# github.com/aws/aws-sdk-go v1.53.5 +# github.com/aws/aws-sdk-go v1.55.5 ## explicit; go 1.19 github.com/aws/aws-sdk-go/aws/arn # github.com/clarketm/json v1.17.1 @@ -13,7 +13,7 @@ github.com/coreos/go-semver/semver # github.com/coreos/go-systemd/v22 v22.5.0 ## explicit; go 1.12 github.com/coreos/go-systemd/v22/unit -# github.com/coreos/ignition/v2 v2.19.0 +# github.com/coreos/ignition/v2 v2.20.0 ## explicit; go 1.20 github.com/coreos/ignition/v2/config/doc github.com/coreos/ignition/v2/config/merge @@ -26,7 +26,7 @@ github.com/coreos/ignition/v2/config/v3_1/types github.com/coreos/ignition/v2/config/v3_2/types github.com/coreos/ignition/v2/config/v3_3/types github.com/coreos/ignition/v2/config/v3_4/types -github.com/coreos/ignition/v2/config/v3_5_experimental/types +github.com/coreos/ignition/v2/config/v3_5/types github.com/coreos/ignition/v2/config/validate # github.com/coreos/vcontext v0.0.0-20230201181013-d72178a18687 ## explicit; go 1.18