rewording

kubernetes · Dec 5, 2022 · 7247fdc · 7247fdc
1 parent af20182
commit 7247fdc
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/pkg/model/master_volumes.go b/pkg/model/master_volumes.go
@@ -402,7 +402,6 @@ func (b *MasterVolumeBuilder) addScalewayVolume(c *fi.ModelBuilderContext, name
 		fmt.Sprintf("%s=%s", scaleway.TagClusterName, b.Cluster.ObjectMeta.Name),
 		fmt.Sprintf("%s=%s", scaleway.TagNameEtcdClusterPrefix, etcd.Name),
 		fmt.Sprintf("%s=%s", scaleway.TagNameRolePrefix, scaleway.TagRoleMaster),
-		fmt.Sprintf("%s=%s", scaleway.TagRoleVolume, etcd.Name),
 		fmt.Sprintf("%s=%s", scaleway.TagInstanceGroup, fi.ValueOf(m.InstanceGroup)),
 	}
 

diff --git a/upup/pkg/fi/cloudup/new_cluster.go b/upup/pkg/fi/cloudup/new_cluster.go
@@ -734,7 +734,7 @@ func setupZones(opt *NewClusterOptions, cluster *api.Cluster, allZones sets.Stri
 
 	case api.CloudProviderScaleway:
 		if len(opt.Zones) > 1 {
-			return nil, fmt.Errorf("scaleway cloud provider currently supports only one zone (location)")
+			return nil, fmt.Errorf("scaleway cloud provider currently supports only one availability zone")
 		}
 	}
 

diff --git a/upup/pkg/fi/cloudup/scaleway/cloud.go b/upup/pkg/fi/cloudup/scaleway/cloud.go
@@ -221,12 +221,12 @@ func (s *scwCloudImplementation) FindClusterStatus(cluster *kops.Cluster) (*kops
 
 // FindVPCInfo is not implemented yet, it's only here to satisfy the fi.Cloud interface
 func (s *scwCloudImplementation) FindVPCInfo(id string) (*fi.VPCInfo, error) {
-	klog.V(8).Info("Scaleway doesn't have a VPC yet so FindVPCInfo is not implemented")
+	klog.V(8).Info("Scaleway clusters don't have a VPC yet so FindVPCInfo is not implemented")
 	return nil, fmt.Errorf("FindVPCInfo is not implemented yet for Scaleway")
 }
 
 func (s *scwCloudImplementation) GetApiIngressStatus(cluster *kops.Cluster) ([]fi.ApiIngressStatus, error) {
-	klog.V(8).Info("Scaleway doesn't have load-balancers yet so GetApiIngressStatus is not implemented")
+	klog.V(8).Info("Scaleway clusters don't have load-balancers yet so GetApiIngressStatus is not implemented")
 	return nil, nil
 }
 

diff --git a/upup/pkg/fi/cloudup/scalewaytasks/sshkey.go b/upup/pkg/fi/cloudup/scalewaytasks/sshkey.go
@@ -108,8 +108,8 @@ func (s *SSHKey) CheckChanges(actual, expected, changes *SSHKey) error {
 }
 
 func (*SSHKey) RenderScw(c *fi.Context, actual, expected, changes *SSHKey) error {
-	// Scaleway does not support changes to ssh keys for the moment
 	if actual != nil {
+		klog.Infof("Scaleway does not support changes to ssh keys for the moment")
 		return nil
 	}
 

diff --git a/upup/pkg/fi/cloudup/scalewaytasks/volume.go b/upup/pkg/fi/cloudup/scalewaytasks/volume.go
@@ -19,6 +19,7 @@ package scalewaytasks
 import (
 	"github.com/scaleway/scaleway-sdk-go/api/instance/v1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
+	"k8s.io/klog/v2"
 	"k8s.io/kops/upup/pkg/fi"
 	"k8s.io/kops/upup/pkg/fi/cloudup/scaleway"
 )
@@ -100,8 +101,8 @@ func (_ *Volume) CheckChanges(a, e, changes *Volume) error {
 }
 
 func (_ *Volume) RenderScw(t *scaleway.ScwAPITarget, a, e, changes *Volume) error {
-	// Scaleway does not support changes to volumes for the moment
 	if a != nil {
+		klog.Infof("Scaleway does not support changes to volumes for the moment")
 		return nil
 	}