From 6b8cca0078a6ce8bf76fb848393be16ec84ff4e5 Mon Sep 17 00:00:00 2001 From: Tanmay Satam Date: Mon, 19 Feb 2024 09:15:44 -0500 Subject: [PATCH] PR nits --- pkg/api/v20230701preview/openshiftcluster_validatestatic.go | 4 +--- pkg/api/v20231122/openshiftcluster_validatestatic.go | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/pkg/api/v20230701preview/openshiftcluster_validatestatic.go b/pkg/api/v20230701preview/openshiftcluster_validatestatic.go index 212623d0747..74b39283cea 100644 --- a/pkg/api/v20230701preview/openshiftcluster_validatestatic.go +++ b/pkg/api/v20230701preview/openshiftcluster_validatestatic.go @@ -36,7 +36,7 @@ func (sv openShiftClusterStaticValidator) Static(_oc interface{}, _current *api. sv.domain = domain sv.requireD2sV3Workers = requireD2sV3Workers sv.resourceID = resourceID - var architectureVersion api.ArchitectureVersion + architectureVersion := version.InstallArchitectureVersion oc := _oc.(*OpenShiftCluster) @@ -44,8 +44,6 @@ func (sv openShiftClusterStaticValidator) Static(_oc interface{}, _current *api. if _current != nil { architectureVersion = _current.Properties.ArchitectureVersion current = (&openShiftClusterConverter{}).ToExternal(_current).(*OpenShiftCluster) - } else { - architectureVersion = version.InstallArchitectureVersion } var err error diff --git a/pkg/api/v20231122/openshiftcluster_validatestatic.go b/pkg/api/v20231122/openshiftcluster_validatestatic.go index 41c3f4630b5..1ce141cec2d 100644 --- a/pkg/api/v20231122/openshiftcluster_validatestatic.go +++ b/pkg/api/v20231122/openshiftcluster_validatestatic.go @@ -36,7 +36,7 @@ func (sv openShiftClusterStaticValidator) Static(_oc interface{}, _current *api. sv.domain = domain sv.requireD2sV3Workers = requireD2sV3Workers sv.resourceID = resourceID - var architectureVersion api.ArchitectureVersion + architectureVersion := version.InstallArchitectureVersion oc := _oc.(*OpenShiftCluster) @@ -44,8 +44,6 @@ func (sv openShiftClusterStaticValidator) Static(_oc interface{}, _current *api. if _current != nil { architectureVersion = _current.Properties.ArchitectureVersion current = (&openShiftClusterConverter{}).ToExternal(_current).(*OpenShiftCluster) - } else { - architectureVersion = version.InstallArchitectureVersion } var err error