diff --git a/config/config.go b/config/config.go index c4da31e7..5cad184f 100644 --- a/config/config.go +++ b/config/config.go @@ -35,7 +35,7 @@ import ( openshift4_12 "github.com/coreos/butane/config/openshift/v4_12" openshift4_13 "github.com/coreos/butane/config/openshift/v4_13" openshift4_14 "github.com/coreos/butane/config/openshift/v4_14" - openshift4_15_exp "github.com/coreos/butane/config/openshift/v4_15_exp" + openshift4_15 "github.com/coreos/butane/config/openshift/v4_15" openshift4_8 "github.com/coreos/butane/config/openshift/v4_8" openshift4_9 "github.com/coreos/butane/config/openshift/v4_9" r4e1_0 "github.com/coreos/butane/config/r4e/v1_0" @@ -75,7 +75,7 @@ func init() { RegisterTranslator("openshift", "4.12.0", openshift4_12.ToConfigBytes) RegisterTranslator("openshift", "4.13.0", openshift4_13.ToConfigBytes) RegisterTranslator("openshift", "4.14.0", openshift4_14.ToConfigBytes) - RegisterTranslator("openshift", "4.15.0-experimental", openshift4_15_exp.ToConfigBytes) + RegisterTranslator("openshift", "4.15.0", openshift4_15.ToConfigBytes) RegisterTranslator("r4e", "1.0.0", r4e1_0.ToIgn3_3Bytes) RegisterTranslator("r4e", "1.1.0", r4e1_1.ToIgn3_4Bytes) RegisterTranslator("r4e", "1.2.0-experimental", r4e1_2_exp.ToIgn3_5Bytes) diff --git a/config/openshift/v4_15_exp/result/schema.go b/config/openshift/v4_15/result/schema.go similarity index 100% rename from config/openshift/v4_15_exp/result/schema.go rename to config/openshift/v4_15/result/schema.go diff --git a/config/openshift/v4_15_exp/schema.go b/config/openshift/v4_15/schema.go similarity index 98% rename from config/openshift/v4_15_exp/schema.go rename to config/openshift/v4_15/schema.go index 5ed101e3..46885f72 100644 --- a/config/openshift/v4_15_exp/schema.go +++ b/config/openshift/v4_15/schema.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License.) -package v4_15_exp +package v4_15 import ( fcos "github.com/coreos/butane/config/fcos/v1_6_exp" diff --git a/config/openshift/v4_15_exp/translate.go b/config/openshift/v4_15/translate.go similarity index 99% rename from config/openshift/v4_15_exp/translate.go rename to config/openshift/v4_15/translate.go index 8ba7be9d..da43b719 100644 --- a/config/openshift/v4_15_exp/translate.go +++ b/config/openshift/v4_15/translate.go @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License.) -package v4_15_exp +package v4_15 import ( "net/url" "strings" "github.com/coreos/butane/config/common" - "github.com/coreos/butane/config/openshift/v4_15_exp/result" + "github.com/coreos/butane/config/openshift/v4_15/result" cutil "github.com/coreos/butane/config/util" "github.com/coreos/butane/translate" diff --git a/config/openshift/v4_15_exp/translate_test.go b/config/openshift/v4_15/translate_test.go similarity index 99% rename from config/openshift/v4_15_exp/translate_test.go rename to config/openshift/v4_15/translate_test.go index f9a10754..4981b142 100644 --- a/config/openshift/v4_15_exp/translate_test.go +++ b/config/openshift/v4_15/translate_test.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License.) -package v4_15_exp +package v4_15 import ( "fmt" @@ -22,7 +22,7 @@ import ( base "github.com/coreos/butane/base/v0_6_exp" "github.com/coreos/butane/config/common" fcos "github.com/coreos/butane/config/fcos/v1_6_exp" - "github.com/coreos/butane/config/openshift/v4_15_exp/result" + "github.com/coreos/butane/config/openshift/v4_15/result" confutil "github.com/coreos/butane/config/util" "github.com/coreos/butane/translate" diff --git a/config/openshift/v4_15_exp/validate.go b/config/openshift/v4_15/validate.go similarity index 98% rename from config/openshift/v4_15_exp/validate.go rename to config/openshift/v4_15/validate.go index 715797d3..703d90a6 100644 --- a/config/openshift/v4_15_exp/validate.go +++ b/config/openshift/v4_15/validate.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License.) -package v4_15_exp +package v4_15 import ( "github.com/coreos/butane/config/common" diff --git a/config/openshift/v4_15_exp/validate_test.go b/config/openshift/v4_15/validate_test.go similarity index 99% rename from config/openshift/v4_15_exp/validate_test.go rename to config/openshift/v4_15/validate_test.go index ce9db95f..61b49e32 100644 --- a/config/openshift/v4_15_exp/validate_test.go +++ b/config/openshift/v4_15/validate_test.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License.) -package v4_15_exp +package v4_15 import ( "fmt" diff --git a/docs/config-openshift-v4_10.md b/docs/config-openshift-v4_10.md index 1324c583..266e606d 100644 --- a/docs/config-openshift-v4_10.md +++ b/docs/config-openshift-v4_10.md @@ -3,7 +3,7 @@ # config/doc. Do not edit. title: OpenShift v4.10.0 parent: Configuration specifications -nav_order: 147 +nav_order: 148 --- # OpenShift Specification v4.10.0 diff --git a/docs/config-openshift-v4_11.md b/docs/config-openshift-v4_11.md index 830d6450..4fb6ff9e 100644 --- a/docs/config-openshift-v4_11.md +++ b/docs/config-openshift-v4_11.md @@ -3,7 +3,7 @@ # config/doc. Do not edit. title: OpenShift v4.11.0 parent: Configuration specifications -nav_order: 146 +nav_order: 147 --- # OpenShift Specification v4.11.0 diff --git a/docs/config-openshift-v4_12.md b/docs/config-openshift-v4_12.md index 1cd2b55f..08f40f79 100644 --- a/docs/config-openshift-v4_12.md +++ b/docs/config-openshift-v4_12.md @@ -3,7 +3,7 @@ # config/doc. Do not edit. title: OpenShift v4.12.0 parent: Configuration specifications -nav_order: 145 +nav_order: 146 --- # OpenShift Specification v4.12.0 diff --git a/docs/config-openshift-v4_13.md b/docs/config-openshift-v4_13.md index b4dfb000..b3e29708 100644 --- a/docs/config-openshift-v4_13.md +++ b/docs/config-openshift-v4_13.md @@ -3,7 +3,7 @@ # config/doc. Do not edit. title: OpenShift v4.13.0 parent: Configuration specifications -nav_order: 144 +nav_order: 145 --- # OpenShift Specification v4.13.0 diff --git a/docs/config-openshift-v4_14.md b/docs/config-openshift-v4_14.md index 4b97dbd2..27ac5f05 100644 --- a/docs/config-openshift-v4_14.md +++ b/docs/config-openshift-v4_14.md @@ -3,7 +3,7 @@ # config/doc. Do not edit. title: OpenShift v4.14.0 parent: Configuration specifications -nav_order: 143 +nav_order: 144 --- # OpenShift Specification v4.14.0 diff --git a/docs/config-openshift-v4_15-exp.md b/docs/config-openshift-v4_15.md similarity index 98% rename from docs/config-openshift-v4_15-exp.md rename to docs/config-openshift-v4_15.md index 23938dca..4e0018e5 100644 --- a/docs/config-openshift-v4_15-exp.md +++ b/docs/config-openshift-v4_15.md @@ -1,21 +1,19 @@ --- # This file is automatically generated from internal/doc and Ignition's # config/doc. Do not edit. -title: OpenShift v4.15.0-experimental +title: OpenShift v4.15.0 parent: Configuration specifications -nav_order: 150 +nav_order: 143 --- -# OpenShift Specification v4.15.0-experimental - -**Note: This configuration is experimental and has not been stabilized. It is subject to change without warning or announcement.** +# OpenShift Specification v4.15.0 The OpenShift configuration is a YAML document conforming to the following specification, with **_italicized_** entries being optional:
* **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.15.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.15.0` and generates Ignition configs with version `3.5.0-experimental`. * **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. diff --git a/docs/config-openshift-v4_8.md b/docs/config-openshift-v4_8.md index 40599839..d83166df 100644 --- a/docs/config-openshift-v4_8.md +++ b/docs/config-openshift-v4_8.md @@ -3,7 +3,7 @@ # config/doc. Do not edit. title: OpenShift v4.8.0 parent: Configuration specifications -nav_order: 149 +nav_order: 150 --- # OpenShift Specification v4.8.0 diff --git a/docs/config-openshift-v4_9.md b/docs/config-openshift-v4_9.md index 6655b500..c7c44c3f 100644 --- a/docs/config-openshift-v4_9.md +++ b/docs/config-openshift-v4_9.md @@ -3,7 +3,7 @@ # config/doc. Do not edit. title: OpenShift v4.9.0 parent: Configuration specifications -nav_order: 148 +nav_order: 149 --- # OpenShift Specification v4.9.0 diff --git a/internal/doc/main.go b/internal/doc/main.go index f6b98398..fa6169a3 100644 --- a/internal/doc/main.go +++ b/internal/doc/main.go @@ -52,7 +52,7 @@ import ( openshift4_12 "github.com/coreos/butane/config/openshift/v4_12" openshift4_13 "github.com/coreos/butane/config/openshift/v4_13" openshift4_14 "github.com/coreos/butane/config/openshift/v4_14" - openshift4_15_exp "github.com/coreos/butane/config/openshift/v4_15_exp" + openshift4_15 "github.com/coreos/butane/config/openshift/v4_15" openshift4_8 "github.com/coreos/butane/config/openshift/v4_8" openshift4_9 "github.com/coreos/butane/config/openshift/v4_9" r4e1_0 "github.com/coreos/butane/config/r4e/v1_0" @@ -123,7 +123,6 @@ func generate(dir string) error { "openshift", []version{ // inverse order of website navbar - {"4.15.0-experimental", openshift4_15_exp.Config{}}, {"4.8.0", openshift4_8.Config{}}, {"4.9.0", openshift4_9.Config{}}, {"4.10.0", openshift4_10.Config{}}, @@ -131,6 +130,7 @@ func generate(dir string) error { {"4.12.0", openshift4_12.Config{}}, {"4.13.0", openshift4_13.Config{}}, {"4.14.0", openshift4_14.Config{}}, + {"4.15.0", openshift4_15.Config{}}, }, }, {