openshift/v4.15: Stabilize 4.15.0 spec

coreos · Feb 16, 2024 · b0b38e4 · b0b38e4
1 parent c77c623
commit b0b38e4
Show file tree

Hide file tree

Showing 16 changed files with 22 additions and 24 deletions.
diff --git 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 → config/openshift/v4_15/result/schema.go b/config/openshift/v4_15_exp/result/schema.go → config/openshift/v4_15/result/schema.go
diff --git a/config/openshift/v4_15_exp/schema.go → config/openshift/v4_15/schema.go b/config/openshift/v4_15_exp/schema.go → 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 → config/openshift/v4_15/translate.go b/config/openshift/v4_15_exp/translate.go → 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 → config/openshift/v4_15/translate_test.go b/config/openshift/v4_15_exp/translate_test.go → 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 → config/openshift/v4_15/validate.go b/config/openshift/v4_15_exp/validate.go → 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 → config/openshift/v4_15/validate_test.go b/config/openshift/v4_15_exp/validate_test.go → 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 → docs/config-openshift-v4_15.md b/docs/config-openshift-v4_15-exp.md → 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:
 
 <div id="spec-docs"></div>
 
 * **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
@@ -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
@@ -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
@@ -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,14 +123,14 @@ 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{}},
 				{"4.11.0", openshift4_11.Config{}},
 				{"4.12.0", openshift4_12.Config{}},
 				{"4.13.0", openshift4_13.Config{}},
 				{"4.14.0", openshift4_14.Config{}},
+				{"4.15.0", openshift4_15.Config{}},
 			},
 		},
 		{