1
0
mirror of https://github.com/openshift/installer.git synced 2026-02-06 00:48:45 +01:00

pkg/types/installconfig: Bump v1beta4 to v1

We're locking ourselves in for stability going forward.  Hopefully we
got this right ;).
This commit is contained in:
W. Trevor King
2019-04-10 13:25:25 -07:00
parent 9b2c5b9890
commit befde3c232
6 changed files with 7 additions and 7 deletions

View File

@@ -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

View File

@@ -127,7 +127,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:

View File

@@ -107,7 +107,7 @@ func TestInstallConfigLoad(t *testing.T) {
{
name: "valid InstallConfig",
data: `
apiVersion: v1beta4
apiVersion: v1
metadata:
name: test-cluster
baseDomain: test-domain

View File

@@ -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)

View File

@@ -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 (

View File

@@ -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