kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15333 from scaleway/scw_refactoring_tags 

scaleway: downgrade CCM + refactoring tags
This commit is contained in:
Kubernetes Prow Robot 2023-04-25 11:12:17 -07:00 committed by GitHub
parent 5d9ce2716a 1e20a4c629
commit 53d6be3e4f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 49 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/kops/integration_test.go
View File

@ -1798,8 +1798,8 @@ func (i *integrationTest) runTestTerraformScaleway(t *testing.T) {
"aws_s3_object_"+i.clusterName+"-addons-limit-range.addons.k8s.io_content",
"aws_s3_object_"+i.clusterName+"-addons-networking.cilium.io-k8s-1.16_content",
"aws_s3_object_"+i.clusterName+"-addons-rbac.addons.k8s.io-k8s-1.8_content",
"scaleway_instance_server_control-plane-fr-par-1-masters-scw-minimal-k8s-local_user_data",
"scaleway_instance_server_nodes-fr-par-1-scw-minimal-k8s-local_user_data",
"scaleway_instance_server_control-plane-fr-par-1_user_data",
"scaleway_instance_server_nodes-fr-par-1_user_data",
)
i.runTest(t, ctx, h, expectedFilenames, "", "", nil)

2
pkg/model/scalewaymodel/instances.go
View File

@ -38,7 +38,7 @@ var _ fi.CloudupModelBuilder = &InstanceModelBuilder{}
func (d *InstanceModelBuilder) Build(c *fi.CloudupModelBuilderContext) error {
for _, ig := range d.InstanceGroups {
name := d.AutoscalingGroupName(ig)
name := ig.Name
zone, err := scw.ParseZone(ig.Spec.Subnets[0])
if err != nil {
return fmt.Errorf("error building instance task for %q: %w", name, err)

5
tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_manifests-etcdmanager-events-control-plane-fr-par-1_content
View File

@ -15,8 +15,9 @@ spec:
--backup-store=memfs://tests/scw-minimal.k8s.local/backups/etcd/events --client-urls=https://__name__:4002
--cluster-name=etcd-events --containerized=true --dns-suffix=.internal.scw-minimal.k8s.local
--grpc-port=3997 --peer-urls=https://__name__:2381 --quarantine-client-urls=https://__name__:3995
--v=6 --volume-name-tag=instance-group=control-plane-fr-par-1 --volume-provider=scaleway
--volume-tag=k8s.io/etcd=events --volume-tag=k8s.io/role=control-plane --volume-tag=kops.k8s.io/cluster=scw-minimal.k8s.local
--v=6 --volume-name-tag=noprefix=kops.k8s.io/instance-group=control-plane-fr-par-1
--volume-provider=scaleway --volume-tag=noprefix=kops.k8s.io/cluster=scw-minimal.k8s.local
--volume-tag=noprefix=kops.k8s.io/etcd=events --volume-tag=noprefix=kops.k8s.io/role=ControlPlane
> /tmp/pipe 2>&1
env:
- name: SCW_ACCESS_KEY

5
tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_manifests-etcdmanager-main-control-plane-fr-par-1_content
View File

@ -15,8 +15,9 @@ spec:
--backup-store=memfs://tests/scw-minimal.k8s.local/backups/etcd/main --client-urls=https://__name__:4001
--cluster-name=etcd --containerized=true --dns-suffix=.internal.scw-minimal.k8s.local
--grpc-port=3996 --peer-urls=https://__name__:2380 --quarantine-client-urls=https://__name__:3994
--v=6 --volume-name-tag=instance-group=control-plane-fr-par-1 --volume-provider=scaleway
--volume-tag=k8s.io/etcd=main --volume-tag=k8s.io/role=control-plane --volume-tag=kops.k8s.io/cluster=scw-minimal.k8s.local
--v=6 --volume-name-tag=noprefix=kops.k8s.io/instance-group=control-plane-fr-par-1
--volume-provider=scaleway --volume-tag=noprefix=kops.k8s.io/cluster=scw-minimal.k8s.local
--volume-tag=noprefix=kops.k8s.io/etcd=main --volume-tag=noprefix=kops.k8s.io/role=ControlPlane
> /tmp/pipe 2>&1
env:
- name: SCW_ACCESS_KEY

2
tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_scw-minimal.k8s.local-addons-bootstrap_content
View File

@ -48,7 +48,7 @@ spec:
version: 9.99.0
- id: k8s-1.24
manifest: scaleway-cloud-controller.addons.k8s.io/k8s-1.24.yaml
manifestHash: 62cf06c0ba8f17ad6a877108c1f4bb26a167791aac8c3c6f04804c9e2f61ddab
manifestHash: f6c221c3faf7d34d12c58776592cf36a6c46ba28948d19b4ca5f0d34148065d2
name: scaleway-cloud-controller.addons.k8s.io
selector:
k8s-addon: scaleway-cloud-controller.addons.k8s.io

2
tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_scw-minimal.k8s.local-addons-scaleway-cloud-controller.addons.k8s.io-k8s-1.24_content
View File

@ -51,7 +51,7 @@ spec:
envFrom:
- secretRef:
name: scaleway-secret
image: scaleway/scaleway-cloud-controller-manager:latest
image: scaleway/scaleway-cloud-controller-manager:v0.24.3
imagePullPolicy: Always
name: scaleway-cloud-controller-manager
resources:

0
tests/integration/update_cluster/minimal_scaleway/data/scaleway_instance_server_control-plane-fr-par-1-masters-scw-minimal-k8s-local_user_data → tests/integration/update_cluster/minimal_scaleway/data/scaleway_instance_server_control-plane-fr-par-1_user_data
View File

0
tests/integration/update_cluster/minimal_scaleway/data/scaleway_instance_server_nodes-fr-par-1-scw-minimal-k8s-local_user_data → tests/integration/update_cluster/minimal_scaleway/data/scaleway_instance_server_nodes-fr-par-1_user_data
View File

30
tests/integration/update_cluster/minimal_scaleway/kubernetes.tf
View File

@ -177,52 +177,52 @@ resource "scaleway_iam_ssh_key" "kubernetes-scw-minimal-k8s-local-be_9e_c3_eb_cb
public_key = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDKqbVEozfAqng0gx8HTUu69EppcE5SWet6MpwrGShqMVUC4wkoiuVtJDPhMmWmdt7B7Ttc5pvnAZAZaQ6TKMguyBoAyS7qOTLU9/hM803XtSiwQUftOXiJfmsqAXEc8yDyb7UnrF8X7aA3gQJsnQBGJGdp+C88dPHNZenw4PnQc8BNYTCXG9d8F5vJ3xQ5qbiG4HVNoQ2CZh2ht+GedZJ3hl9lMJ24kE/cbMCLKxabMP4ROetECG6PU251jnm84NA8rm0Av/JMmn/c9CFAe0D0D1dGDlHWPsk4mbhGKJ0yU0YliatmPfmgSasismbYzIFf7VPq91ARzRUbavd1fYMBmkMsce0YR/5FdtrpzRhqDzuvwQgQRsoTcttdvp0puFcrtNefMfk8NCbBedIlkzOFxfGiBbe6jde4wqsqEnSrNHwZ2b+Er8z7vjcDPBqYk3gubmMBCrYxg6o1lOS6tTN0kJDUlyKO2AN1ZDr3mpkbhkvZV/N7gLglcClM0X5X7iM= leila@leila-ThinkPad-T14s-Gen-2i"
}
resource "scaleway_instance_ip" "control-plane-fr-par-1-masters-scw-minimal-k8s-local" {
resource "scaleway_instance_ip" "control-plane-fr-par-1" {
}
resource "scaleway_instance_ip" "nodes-fr-par-1-scw-minimal-k8s-local" {
resource "scaleway_instance_ip" "nodes-fr-par-1" {
}
resource "scaleway_instance_server" "control-plane-fr-par-1-masters-scw-minimal-k8s-local" {
resource "scaleway_instance_server" "control-plane-fr-par-1" {
image = "ubuntu_focal"
ip_id = scaleway_instance_ip.control-plane-fr-par-1-masters-scw-minimal-k8s-local.id
name = "control-plane-fr-par-1.masters.scw-minimal.k8s.local"
tags = ["instance-group=control-plane-fr-par-1", "kops.k8s.io/cluster=scw-minimal.k8s.local", "k8s.io/role=control-plane"]
ip_id = scaleway_instance_ip.control-plane-fr-par-1.id
name = "control-plane-fr-par-1"
tags = ["noprefix=kops.k8s.io/instance-group=control-plane-fr-par-1", "noprefix=kops.k8s.io/cluster=scw-minimal.k8s.local", "noprefix=kops.k8s.io/role=ControlPlane"]
type = "DEV1-M"
user_data = {
"cloud-init" = filebase64("${path.module}/data/scaleway_instance_server_control-plane-fr-par-1-masters-scw-minimal-k8s-local_user_data")
"cloud-init" = filebase64("${path.module}/data/scaleway_instance_server_control-plane-fr-par-1_user_data")
}
}
resource "scaleway_instance_server" "nodes-fr-par-1-scw-minimal-k8s-local" {
resource "scaleway_instance_server" "nodes-fr-par-1" {
image = "ubuntu_focal"
ip_id = scaleway_instance_ip.nodes-fr-par-1-scw-minimal-k8s-local.id
name = "nodes-fr-par-1.scw-minimal.k8s.local"
tags = ["instance-group=nodes-fr-par-1", "kops.k8s.io/cluster=scw-minimal.k8s.local"]
ip_id = scaleway_instance_ip.nodes-fr-par-1.id
name = "nodes-fr-par-1"
tags = ["noprefix=kops.k8s.io/instance-group=nodes-fr-par-1", "noprefix=kops.k8s.io/cluster=scw-minimal.k8s.local"]
type = "DEV1-M"
user_data = {
"cloud-init" = filebase64("${path.module}/data/scaleway_instance_server_nodes-fr-par-1-scw-minimal-k8s-local_user_data")
"cloud-init" = filebase64("${path.module}/data/scaleway_instance_server_nodes-fr-par-1_user_data")
}
}
resource "scaleway_instance_volume" "etcd-1-etcd-events-scw-minimal-k8s-local" {
name = "etcd-1.etcd-events.scw-minimal.k8s.local"
size_in_gb = 20
tags = ["kops.k8s.io/cluster=scw-minimal.k8s.local", "k8s.io/etcd=events", "k8s.io/role=control-plane", "instance-group=control-plane-fr-par-1"]
tags = ["noprefix=kops.k8s.io/cluster=scw-minimal.k8s.local", "noprefix=kops.k8s.io/etcd=events", "noprefix=kops.k8s.io/role=ControlPlane", "noprefix=kops.k8s.io/instance-group=control-plane-fr-par-1"]
type = "b_ssd"
}
resource "scaleway_instance_volume" "etcd-1-etcd-main-scw-minimal-k8s-local" {
name = "etcd-1.etcd-main.scw-minimal.k8s.local"
size_in_gb = 20
tags = ["kops.k8s.io/cluster=scw-minimal.k8s.local", "k8s.io/etcd=main", "k8s.io/role=control-plane", "instance-group=control-plane-fr-par-1"]
tags = ["noprefix=kops.k8s.io/cluster=scw-minimal.k8s.local", "noprefix=kops.k8s.io/etcd=main", "noprefix=kops.k8s.io/role=ControlPlane", "noprefix=kops.k8s.io/instance-group=control-plane-fr-par-1"]
type = "b_ssd"
}
resource "scaleway_lb" "api-scw-minimal-k8s-local" {
ip_id = scaleway_lb_ip.api-scw-minimal-k8s-local.id
name = "api.scw-minimal.k8s.local"
tags = ["k8s.io/role=control-plane"]
tags = ["noprefix=kops.k8s.io/role=ControlPlane"]
type = "LB-S"
}

2
upup/models/cloudup/resources/addons/scaleway-cloud-controller.addons.k8s.io/k8s-1.24.yaml.template
View File

@ -58,7 +58,7 @@ spec:
tolerationSeconds: 300
containers:
- name: scaleway-cloud-controller-manager
image: scaleway/scaleway-cloud-controller-manager:latest
image: scaleway/scaleway-cloud-controller-manager:v0.24.3
imagePullPolicy: Always
args:
- --cloud-provider=scaleway

14
upup/pkg/fi/cloudup/scaleway/cloud.go
View File

@ -35,13 +35,13 @@ import (
)
const (
TagClusterName = "kops.k8s.io/cluster"
TagClusterName = "noprefix=kops.k8s.io/cluster"
TagInstanceGroup = "noprefix=kops.k8s.io/instance-group"
TagNameRolePrefix = "noprefix=kops.k8s.io/role"
TagNameEtcdClusterPrefix = "noprefix=kops.k8s.io/etcd"
TagRoleControlPlane = "ControlPlane"
TagRoleWorker = "Node"
KopsUserAgentPrefix = "kubernetes-kops/"
TagInstanceGroup = "instance-group"
TagNameRolePrefix = "k8s.io/role"
TagNameEtcdClusterPrefix = "k8s.io/etcd"
TagRoleControlPlane = "control-plane"
TagRoleWorker = "worker"
)
// ScwCloud exposes all the interfaces required to operate on Scaleway resources
@ -476,7 +476,7 @@ func (s *scwCloudImplementation) DeleteServer(server *instance.Server) error {
})
if err != nil {
if is404Error(err) {
klog.V(4).Infof("delete server %s: instance was already deleted", server.ID)
klog.V(4).Infof("delete server %s: instance %q was already deleted", server.ID, server.Name)
return nil
}
return err

17
upup/pkg/fi/cloudup/scalewaytasks/instance.go
View File

@ -65,6 +65,13 @@ func (s *Instance) Find(c *fi.CloudupContext) (*Instance, error) {
}
server := servers[0]
igName := ""
for _, tag := range server.Tags {
if strings.HasPrefix(tag, scaleway.TagInstanceGroup) {
igName = strings.TrimPrefix(tag, scaleway.TagInstanceGroup+"_")
}
}
role := scaleway.TagRoleWorker
for _, tag := range server.Tags {
if tag == scaleway.TagNameRolePrefix+"="+scaleway.TagRoleControlPlane {
@ -73,7 +80,7 @@ func (s *Instance) Find(c *fi.CloudupContext) (*Instance, error) {
}
return &Instance{
Name: fi.PtrTo(server.Name),
Name: fi.PtrTo(igName),
Count: len(servers),
Zone: fi.PtrTo(server.Zone.String()),
Role: fi.PtrTo(role),
@ -141,11 +148,17 @@ func (_ *Instance) RenderScw(t *scaleway.ScwAPITarget, actual, expected, changes
// If newInstanceCount > 0, we need to create new instances for this group
for i := 0; i < newInstanceCount; i++ {
// We create a unique name for each server
actualCount := 0
if actual != nil {
actualCount = actual.Count
}
uniqueName := fmt.Sprintf("%s-%d", fi.ValueOf(expected.Name), i+actualCount)
// We create the instance
srv, err := instanceService.CreateServer(&instance.CreateServerRequest{
Zone: zone,
Name: fi.ValueOf(expected.Name),
Name: uniqueName,
CommercialType: fi.ValueOf(expected.CommercialType),
Image: fi.ValueOf(expected.Image),
Tags: expected.Tags,