pkg/types/installconfig: Bump v1beta4 to v1

We're locking ourselves in for stability going forward. Hopefully we got this right ;).
openshift · Apr 13, 2019 · 1874747 · 1874747
1 parent 19f88ee
commit 1874747
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/docs/user/aws/customization.md b/docs/user/aws/customization.md
@@ -15,7 +15,7 @@ The following options are available when using AWS:
 An example `install-config.yaml` is shown below. This configuration has been modified to show the customization that is possible via the install config.
 
 ```yaml
-apiVersion: v1beta4
+apiVersion: v1
 baseDomain: example.com
 controlPlane:
   name: master

diff --git a/docs/user/metal/install_upi.md b/docs/user/metal/install_upi.md
@@ -125,7 +125,7 @@ The OpenShift installer uses an [Install Config][install-config] to drive all in
 An example install config for bare-metal UPI is as follows:
 
 ```yaml
-apiVersion: v1beta3
+apiVersion: v1
 ## The base domain of the cluster. All DNS records will be sub-domains of this base and will also include the cluster name.
 baseDomain: example.com
 compute:

diff --git a/pkg/asset/installconfig/installconfig_test.go b/pkg/asset/installconfig/installconfig_test.go
@@ -107,7 +107,7 @@ func TestInstallConfigLoad(t *testing.T) {
 		{
 			name: "valid InstallConfig",
 			data: `
-apiVersion: v1beta4
+apiVersion: v1
 metadata:
   name: test-cluster
 baseDomain: test-domain

diff --git a/pkg/types/conversion/installconfig.go b/pkg/types/conversion/installconfig.go
@@ -13,7 +13,7 @@ import (
 func ConvertInstallConfig(config *types.InstallConfig) error {
 	// check that the version is convertible
 	switch config.APIVersion {
-	case types.InstallConfigVersion, "v1beta3":
+	case types.InstallConfigVersion, "v1beta3", "v1beta4":
 		// works
 	default:
 		return errors.Errorf("cannot upconvert from version %s", config.APIVersion)

diff --git a/pkg/types/installconfig.go b/pkg/types/installconfig.go
@@ -16,8 +16,8 @@ import (
 const (
 	// InstallConfigVersion is the version supported by this package.
 	// If you bump this, you must also update the list of convertable values in
-	// pkg/conversion/installconfig.go
-	InstallConfigVersion = "v1beta4"
+	// pkg/types/conversion/installconfig.go
+	InstallConfigVersion = "v1"
 )
 
 var (

diff --git a/upi/vsphere/README.md b/upi/vsphere/README.md
@@ -9,7 +9,7 @@
 The machine CIDR for the dev cluster is 139.178.89.192/26.
 
 ```
-apiVersion: v1beta4
+apiVersion: v1
 baseDomain: devcluster.openshift.com
 metadata:
   name: mstaeble