Skip to content

Commit a43d5b5

Browse files
Revert "Saas-7194 validate k8s version (#126)" (#127)
* Revert "Saas-7194 validate k8s version (#126)" This reverts commit 26995c7. * revert
1 parent 26995c7 commit a43d5b5

File tree

7 files changed

+6
-28
lines changed

7 files changed

+6
-28
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "venona",
3-
"version": "1.2.6",
3+
"version": "1.2.7",
44
"description": "Codefresh agent to run on Codefresh's runtime environment and execute pipeline",
55
"main": "index.js",
66
"scripts": {

venonactl/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.2.6
1+
1.2.7

venonactl/go.mod

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ require (
1010
github.com/codefresh-io/go-sdk v0.18.0
1111
github.com/dustin/go-humanize v1.0.0
1212
github.com/gophercloud/gophercloud v0.8.0 // indirect
13-
github.com/hashicorp/go-version v1.2.0
1413
github.com/huandu/xstrings v1.3.0 // indirect
1514
github.com/imdario/mergo v0.3.8 // indirect
1615
github.com/inconshreveable/log15 v0.0.0-20200109203555-b30bc20e4fd1

venonactl/go.sum

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -253,8 +253,6 @@ github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t
253253
github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
254254
github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
255255
github.com/hashicorp/go-multierror v0.0.0-20161216184304-ed905158d874/go.mod h1:JMRHfdO9jKNzS/+BTlxCjKNQHg/jZAft8U7LloJvN7I=
256-
github.com/hashicorp/go-version v1.2.0 h1:3vNe/fWF5CBgRIguda1meWhsZHy3m8gCJ5wx+dIzX/E=
257-
github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
258256
github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
259257
github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
260258
github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=

venonactl/pkg/plugins/helper.go

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -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

@@ -54,8 +52,6 @@ type (
5452
}
5553
)
5654

57-
var requiredK8sVersion, _ = ver.NewConstraint(">= 1.10")
58-
5955
func 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-
203184
func testNode(n v1.Node, req validationRequest) []string {
204185
result := []string{}
205186

venonactl/pkg/plugins/runtime-environment.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ func (u *runtimeEnvironmentPlugin) Install(opt *InstallOptions, v Values) (Value
8989
res, err := ensureClusterRequirements(cs, validationRequest{
9090
cpu: "1",
9191
momorySize: "1Gi",
92-
}, u.logger)
92+
})
9393
if err != nil {
9494
return nil, err
9595
}

venonactl/pkg/plugins/venona.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ func (u *venonaPlugin) Install(opt *InstallOptions, v Values) (Values, error) {
7878
res, err := ensureClusterRequirements(cs, validationRequest{
7979
cpu: "500m",
8080
momorySize: "1Gi",
81-
}, u.logger)
81+
})
8282
if err != nil {
8383
return nil, err
8484
}

0 commit comments

Comments
 (0)