@@ -33,11 +33,9 @@ import (
3333 "github.com/codefresh-io/venona/venonactl/pkg/logger"
3434 templates "github.com/codefresh-io/venona/venonactl/pkg/templates/kubernetes"
3535
36- ver "github.com/hashicorp/go-version"
3736 "k8s.io/apimachinery/pkg/api/resource"
3837 metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3938 "k8s.io/apimachinery/pkg/runtime"
40- "k8s.io/apimachinery/pkg/version"
4139 "k8s.io/client-go/kubernetes/scheme"
4240)
4341
5452 }
5553)
5654
57- var requiredK8sVersion , _ = ver .NewConstraint (">= 1.10" )
58-
5955func unescape (s string ) template.HTML {
6056 return template .HTML (s )
6157}
@@ -153,19 +149,8 @@ func getKubeObjectsFromTempalte(values map[string]interface{}, pattern string, l
153149 return KubeObjectsFromTemplates (templatesMap , values , pattern , logger )
154150}
155151
156- func ensureClusterRequirements (client * kubernetes.Clientset , req validationRequest , logger logger. Logger ) (validationResult , error ) {
152+ func ensureClusterRequirements (client * kubernetes.Clientset , req validationRequest ) (validationResult , error ) {
157153 result := validationResult {}
158- result .isValid = true
159-
160- v , err := client .ServerVersion ()
161- if err != nil {
162- // should not fail if can't validate version
163- logger .Warn ("Failed to validate kubernetes version" , "cause" , err )
164- } else if res := testKubernetesVersion (v ); ! res {
165- result .isValid = false
166- result .message = append (result .message , "Cluster does not meet the kubernetes version requirements" )
167- }
168-
169154 nodes , err := client .CoreV1 ().Nodes ().List (metav1.ListOptions {})
170155 if err != nil {
171156 return result , err
@@ -174,6 +159,7 @@ func ensureClusterRequirements(client *kubernetes.Clientset, req validationReque
174159 return result , errors .New ("Nodes not found" )
175160 }
176161
162+ result .isValid = true
177163 if len (nodes .Items ) == 0 {
178164 result .message = append (result .message , "No nodes in cluster" )
179165 result .isValid = false
@@ -195,11 +181,6 @@ func ensureClusterRequirements(client *kubernetes.Clientset, req validationReque
195181 return result , nil
196182}
197183
198- func testKubernetesVersion (version * version.Info ) bool {
199- v , _ := ver .NewVersion (version .String ())
200- return requiredK8sVersion .Check (v )
201- }
202-
203184func testNode (n v1.Node , req validationRequest ) []string {
204185 result := []string {}
205186
0 commit comments