Skip to content

Commit

Permalink
pkg/types/validation: Drop v1beta1 backwards compat hack
Browse files Browse the repository at this point in the history
I'd kept this in 3b393da (pkg/types/aws/machinepool: Drop IAM-role
overrides, 2019-01-30, openshift#1154) to support CI.  But with
openshift/release@d31f601e (ci-operator/templates/openshift: Bump
install-config.yaml to v1beta2, 2019-02-02, openshift/release#2772)
and openshift/hive@ab7ee975 (*: Bump to install-config v0.12.0,
2019-02-14, openshift/hive#222) landed, we no longer need the
workaround.
  • Loading branch information
wking committed Feb 26, 2019
1 parent 1b13d68 commit 2fb026a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion pkg/types/validation/installconfig.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ func ValidateInstallConfig(c *types.InstallConfig, openStackValidValuesFetcher o
switch v := c.APIVersion; v {
case types.InstallConfigVersion:
// Current version
case "v1beta1", "v1beta2":
case "v1beta2":
logrus.Warnf("install-config.yaml is using a deprecated version %q. The expected version is %q.", v, types.InstallConfigVersion)
default:
return field.ErrorList{field.Invalid(field.NewPath("apiVersion"), c.TypeMeta.APIVersion, fmt.Sprintf("install-config version must be %q", types.InstallConfigVersion))}
Expand Down

0 comments on commit 2fb026a

Please sign in to comment.