From 2fb026a375fc997d0c51dd80d4c9ecd26617ad2d Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Thu, 14 Feb 2019 01:37:15 -0800 Subject: [PATCH] pkg/types/validation: Drop v1beta1 backwards compat hack I'd kept this in 3b393da8 (pkg/types/aws/machinepool: Drop IAM-role overrides, 2019-01-30, #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. --- pkg/types/validation/installconfig.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/types/validation/installconfig.go b/pkg/types/validation/installconfig.go index 8184af366b8..6b65d6a75ee 100644 --- a/pkg/types/validation/installconfig.go +++ b/pkg/types/validation/installconfig.go @@ -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))}