From 11a9bc51bdb74796dbdfe362d1cb64be9958985f Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Tue, 26 Feb 2019 11:44:47 -0800 Subject: [PATCH] pkg/types/validation/installconfig: Drop nominal v1beta2 support When we pivoted to v1beta3 in ccdc32e3 (installconfig: separate control plane and compute machine pools, 2019-01-29, #1157), we dropped support for the old 'machines' JSON property. Instead of silently ignoring that property in v1beta2 configs, error out to avoid surprising users later when they notice us not picking up their machines configuration. Or internal consumers pivoted to v1beta3 in openshift/release@e1d729c6 (Modify install-config.yaml to use controlPlane and compute instead of machines, 2019-02-05, openshift/release#2787) and openshift/hive@3eda6d12 (Bump to installer master branch, 2019-02-21, openshift/hive#228). --- pkg/types/validation/installconfig.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkg/types/validation/installconfig.go b/pkg/types/validation/installconfig.go index 6b65d6a75ee..7636b3c791b 100644 --- a/pkg/types/validation/installconfig.go +++ b/pkg/types/validation/installconfig.go @@ -38,8 +38,6 @@ func ValidateInstallConfig(c *types.InstallConfig, openStackValidValuesFetcher o switch v := c.APIVersion; v { case types.InstallConfigVersion: // Current version - 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))} }