update integration tests

kubernetes · Sep 13, 2023 · dcc4d1f · dcc4d1f
1 parent 3b9feb2
commit dcc4d1f
Show file tree

Hide file tree

Showing 6 changed files with 59 additions and 23 deletions.
diff --git a/cmd/kops/integration_test.go b/cmd/kops/integration_test.go
@@ -1768,8 +1768,8 @@ func (i *integrationTest) runTestTerraformScaleway(t *testing.T) {
 		"aws_s3_object_"+i.clusterName+"-addons-kubelet-api.rbac.addons.k8s.io-k8s-1.9_content",
 		"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",
-		"scaleway_instance_server_control-plane-fr-par-1_user_data",
-		"scaleway_instance_server_nodes-fr-par-1_user_data",
+		"scaleway_instance_server_control-plane-fr-par-1-0_user_data",
+		"scaleway_instance_server_nodes-fr-par-1-0_user_data",
 	)
 
 	i.runTest(t, ctx, h, expectedFilenames, "", "", nil)

diff --git a/...e_server_control-plane-fr-par-1_user_data → ...server_control-plane-fr-par-1-0_user_data b/...e_server_control-plane-fr-par-1_user_data → ...server_control-plane-fr-par-1-0_user_data
diff --git a/..._instance_server_nodes-fr-par-1_user_data → ...nstance_server_nodes-fr-par-1-0_user_data b/..._instance_server_nodes-fr-par-1_user_data → ...nstance_server_nodes-fr-par-1-0_user_data
diff --git a/tests/integration/update_cluster/minimal_scaleway/kubernetes.tf b/tests/integration/update_cluster/minimal_scaleway/kubernetes.tf
@@ -1,6 +1,7 @@
 locals {
   cluster_name = "scw-minimal.k8s.local"
   region       = "fr-par"
+  zone         = "fr-par-1"
 }
 
 output "cluster_name" {
@@ -11,8 +12,13 @@ output "region" {
   value = "fr-par"
 }
 
+output "zone" {
+  value = "fr-par-1"
+}
+
 provider "scaleway" {
   region = "fr-par"
+  zone   = "fr-par-1"
 }
 
 provider "aws" {
@@ -169,31 +175,40 @@ 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" {
+resource "scaleway_instance_ip" "control-plane-fr-par-1-0" {
+  tags = ["noprefix=kops.k8s.io/cluster=scw-minimal.k8s.local"]
 }
 
-resource "scaleway_instance_ip" "nodes-fr-par-1" {
+resource "scaleway_instance_ip" "nodes-fr-par-1-0" {
+  tags = ["noprefix=kops.k8s.io/cluster=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.id
-  name  = "control-plane-fr-par-1"
-  tags  = ["noprefix=kops.k8s.io/cluster=scw-minimal.k8s.local", "noprefix=kops.k8s.io/instance-group=control-plane-fr-par-1", "noprefix=kops.k8s.io/role=ControlPlane"]
-  type  = "DEV1-M"
+resource "scaleway_instance_server" "control-plane-fr-par-1-0" {
+  enable_dynamic_ip = true
+  image             = "ubuntu_focal"
+  ip_id             = scaleway_instance_ip.control-plane-fr-par-1-0.id
+  lifecycle {
+    ignore_changes = [additional_volume_ids]
+  }
+  name                   = "control-plane-fr-par-1-0"
+  replace_on_type_change = false
+  tags                   = ["noprefix=kops.k8s.io/cluster=scw-minimal.k8s.local", "noprefix=kops.k8s.io/instance-group=control-plane-fr-par-1", "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_user_data")
+    "cloud-init" = file("${path.module}/data/scaleway_instance_server_control-plane-fr-par-1-0_user_data")
   }
 }
 
-resource "scaleway_instance_server" "nodes-fr-par-1" {
-  image = "ubuntu_focal"
-  ip_id = scaleway_instance_ip.nodes-fr-par-1.id
-  name  = "nodes-fr-par-1"
-  tags  = ["noprefix=kops.k8s.io/cluster=scw-minimal.k8s.local", "noprefix=kops.k8s.io/instance-group=nodes-fr-par-1"]
-  type  = "DEV1-M"
+resource "scaleway_instance_server" "nodes-fr-par-1-0" {
+  enable_dynamic_ip      = true
+  image                  = "ubuntu_focal"
+  ip_id                  = scaleway_instance_ip.nodes-fr-par-1-0.id
+  name                   = "nodes-fr-par-1-0"
+  replace_on_type_change = false
+  tags                   = ["noprefix=kops.k8s.io/cluster=scw-minimal.k8s.local", "noprefix=kops.k8s.io/instance-group=nodes-fr-par-1"]
+  type                   = "DEV1-M"
   user_data = {
-    "cloud-init" = filebase64("${path.module}/data/scaleway_instance_server_nodes-fr-par-1_user_data")
+    "cloud-init" = file("${path.module}/data/scaleway_instance_server_nodes-fr-par-1-0_user_data")
   }
 }
 
@@ -212,24 +227,29 @@ resource "scaleway_instance_volume" "etcd-1-etcd-main-scw-minimal-k8s-local" {
 }
 
 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  = ["noprefix=kops.k8s.io/cluster=scw-minimal.k8s.local", "noprefix=kops.k8s.io/role=ControlPlane"]
-  type  = "LB-S"
+  description = "Load-balancer for kops cluster scw-minimal.k8s.local"
+  ip_id       = scaleway_lb_ip.api-scw-minimal-k8s-local.id
+  name        = "api.scw-minimal.k8s.local"
+  tags        = ["noprefix=kops.k8s.io/cluster=scw-minimal.k8s.local", "noprefix=kops.k8s.io/role=ControlPlane"]
+  type        = "LB-S"
 }
 
 resource "scaleway_lb_backend" "lb-backend-https" {
   forward_port     = 443
   forward_protocol = "tcp"
   lb_id            = scaleway_lb.api-scw-minimal-k8s-local.id
   name             = "lb-backend-https"
+  proxy_protocol   = "none"
+  server_ips       = [scaleway_instance_server.control-plane-fr-par-1-0.private_ip]
 }
 
 resource "scaleway_lb_backend" "lb-backend-kops-controller" {
   forward_port     = 3988
   forward_protocol = "tcp"
   lb_id            = scaleway_lb.api-scw-minimal-k8s-local.id
   name             = "lb-backend-kops-controller"
+  proxy_protocol   = "none"
+  server_ips       = [scaleway_instance_server.control-plane-fr-par-1-0.private_ip]
 }
 
 resource "scaleway_lb_frontend" "lb-frontend-https" {

diff --git a/upup/pkg/fi/cloudup/scalewaytasks/instance.go b/upup/pkg/fi/cloudup/scalewaytasks/instance.go
@@ -369,7 +369,7 @@ func (_ *Instance) RenderTerraform(t *terraform.TerraformTarget, actual, expecte
 		// attach etcd volumes outside of Terraform
 		if scaleway.InstanceRoleFromTags(expected.Tags) == scaleway.TagRoleControlPlane {
 			tfInstance.Lifecycle = &terraform.Lifecycle{
-				IgnoreChanges: []*terraformWriter.Literal{&terraformWriter.Literal{String: "additional_volume_ids"}},
+				IgnoreChanges: []*terraformWriter.Literal{{String: "additional_volume_ids"}},
 			}
 		}
 

diff --git a/upup/pkg/fi/cloudup/scalewaytasks/instance_test.go b/upup/pkg/fi/cloudup/scalewaytasks/instance_test.go
@@ -1,3 +1,19 @@
+/*
+Copyright 2023 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
 package scalewaytasks
 
 import (