quick fix for compilation after rebase

kubernetes · Apr 23, 2024 · 5d1815f · 5d1815f
1 parent aeb7660
commit 5d1815f
Show file tree

Hide file tree

Showing 4 changed files with 363 additions and 8 deletions.
diff --git a/pkg/apis/kops/validation/instancegroup.go b/pkg/apis/kops/validation/instancegroup.go
@@ -20,13 +20,11 @@ import (
  "fmt"
  "strings"
 
- "k8s.io/kops/pkg/nodeidentity/aws"
- "k8s.io/kops/upup/pkg/fi/cloudup/scaleway"
-
  "github.com/aws/aws-sdk-go-v2/aws/arn"
  ec2types "github.com/aws/aws-sdk-go-v2/service/ec2/types"
  "k8s.io/apimachinery/pkg/util/sets"
  "k8s.io/apimachinery/pkg/util/validation/field"
+ "k8s.io/kops/pkg/nodeidentity/aws"
 
  "k8s.io/kops/pkg/apis/kops"
  "k8s.io/kops/pkg/apis/kops/util"
@@ -170,8 +168,8 @@ func ValidateInstanceGroup(g *kops.InstanceGroup, cloud fi.Cloud, strict bool) f
  allErrs = append(allErrs, awsValidateInstanceGroup(g, cloud.(awsup.AWSCloud))...)
  case kops.CloudProviderGCE:
  allErrs = append(allErrs, gceValidateInstanceGroup(g, cloud.(gce.GCECloud))...)
- case kops.CloudProviderScaleway:
- allErrs = append(allErrs, scalewayValidateInstanceGroup(g, cloud.(scaleway.ScwCloud))...)
+  //case kops.CloudProviderScaleway:
+ // allErrs = append(allErrs, scalewayValidateInstanceGroup(g, cloud.(scaleway.ScwCloud))...)
  }
  }
 

diff --git a/pkg/apis/kops/validation/validation.go b/pkg/apis/kops/validation/validation.go
@@ -71,8 +71,8 @@ func newValidateCluster(cluster *kops.Cluster, strict bool) field.ErrorList {
  allErrs = append(allErrs, awsValidateCluster(cluster, strict)...)
  case kops.CloudProviderGCE:
  allErrs = append(allErrs, gceValidateCluster(cluster)...)
- case kops.CloudProviderScaleway:
- allErrs = append(allErrs, scalewayValidateCluster(cluster)...)
+  //case kops.CloudProviderScaleway:
+ // allErrs = append(allErrs, scalewayValidateCluster(cluster)...)
  }
 
  return allErrs

diff --git a/tests/e2e/go.mod b/tests/e2e/go.mod
@@ -13,7 +13,7 @@ require (
  github.com/blang/semver/v4 v4.0.0
  github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
  github.com/octago/sflags v0.2.0
- github.com/scaleway/scaleway-sdk-go v1.0.0-beta.24
+ github.com/scaleway/scaleway-sdk-go v1.0.0-beta.26
  github.com/spf13/pflag v1.0.5
  golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f
  k8s.io/api v0.30.0