Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/user/aws/customization.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/user/metal/install_upi.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion pkg/asset/installconfig/installconfig_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ func TestInstallConfigLoad(t *testing.T) {
{
name: "valid InstallConfig",
data: `
apiVersion: v1beta4
apiVersion: v1
metadata:
name: test-cluster
baseDomain: test-domain
Expand Down
2 changes: 1 addition & 1 deletion pkg/types/conversion/installconfig.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions pkg/types/installconfig.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion upi/vsphere/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down