scaleway ccm/csi update

scaleway/deployments/scaleway-cloud-controller-manager.yaml

@@ -127,7 +127,7 @@ spec:
         app: scaleway-cloud-controller-manager
     spec:
       dnsPolicy: Default
-      hostNetwork: true
+      # hostNetwork: true
       serviceAccountName: cloud-controller-manager
       nodeSelector:
         node-role.kubernetes.io/control-plane: ""
@@ -140,7 +140,7 @@ spec:
           effect: NoSchedule
       containers:
         - name: scaleway-cloud-controller-manager
-          image: scaleway/scaleway-cloud-controller-manager:v0.21.6
+          image: scaleway/scaleway-cloud-controller-manager:v0.28.5
           # image: ghcr.io/sergelogvinov/scaleway-cloud-controller-manager:1fa94b15f6d87e1f951331a7dca148302fe7318b
           imagePullPolicy: IfNotPresent
           args:

scaleway/deployments/scaleway-csi-node.yaml

@@ -56,7 +56,7 @@ spec:
           operator: Exists
       containers:
         - name: scaleway-csi-plugin
-          image: scaleway/scaleway-csi:v0.1.7
+          image: scaleway/scaleway-csi:v0.2.3
           args :
             - "--endpoint=$(CSI_ENDPOINT)"
             - "--v=4"

scaleway/deployments/scaleway-csi.yaml

@@ -203,7 +203,7 @@ spec:
           effect: NoSchedule
       containers:
         - name: scaleway-csi-plugin
-          image: scaleway/scaleway-csi:v0.2.0
+          image: scaleway/scaleway-csi:v0.2.3
           args :
             - "--endpoint=$(CSI_ENDPOINT)"
             - "--mode=controller"

scaleway/instances-controlplane.tf

@@ -69,8 +69,8 @@ resource "local_sensitive_file" "controlplane" {
       access     = var.scaleway_access
       secret     = var.scaleway_secret
       project_id = var.scaleway_project_id
-      region     = substr(var.regions[0], 0, 6)
-      zone       = scaleway_vpc_private_network.main.region
+      region     = scaleway_vpc_private_network.main.region
+      zone       = scaleway_vpc_private_network.main.zone
       vpc_id     = split("/", scaleway_vpc_private_network.main.id)[1]
     })
   )

scaleway/templates/controlplane.yaml.tpl

@@ -121,6 +121,7 @@ cluster:
   externalCloudProvider:
     enabled: true
     manifests:
+      - https://raw.githubusercontent.com/sergelogvinov/terraform-talos/main/scaleway/deployments/scaleway-cloud-controller-manager.yaml
       - https://raw.githubusercontent.com/sergelogvinov/terraform-talos/main/_deployments/vars/local-path-storage-ns.yaml
       - https://raw.githubusercontent.com/sergelogvinov/terraform-talos/main/_deployments/vars/local-path-storage-result.yaml
       - https://raw.githubusercontent.com/sergelogvinov/terraform-talos/main/_deployments/vars/coredns-local.yaml

scaleway/variables.tf

@@ -61,7 +61,7 @@ variable "instances" {
       version = "v1.30.2"
     },
     "fr-par-2" = {
-      web_count    = 1,
+      web_count    = 0,
       web_type     = "DEV1-L",
       worker_count = 0,
       worker_type  = "COPARM1-2C-8G",

system_os/scaleway/Makefile

@@ -1,9 +0,0 @@
-
-init:
-	packer init -upgrade .
-
-release:
-	packer build -only=release.scaleway.talos .
-
-develop:
-	packer build -only=develop.scaleway.talos .

system_os/scaleway/scaleway.pkr.hcl

@@ -1,53 +0,0 @@
-
-packer {
-  required_plugins {
-    scaleway = {
-      version = "= 1.1.0"
-      source  = "github.com/hashicorp/scaleway"
-    }
-  }
-}
-
-source "scaleway" "talos" {
-  project_id = var.scaleway_project_id
-  access_key = var.scaleway_access_key
-  secret_key = var.scaleway_secret_key
-
-  image           = "debian_buster"
-  zone            = var.scaleway_zone
-  commercial_type = "DEV1-M"
-  boottype        = "rescue"
-  remove_volume   = true
-  ssh_username    = "root"
-
-  image_name    = "talos-system-disk"
-  snapshot_name = "talos system disk"
-}
-
-build {
-  name    = "release"
-  sources = ["source.scaleway.talos"]
-
-  provisioner "shell" {
-    inline = [
-      "apt-get install -y wget",
-      "wget -O /tmp/talos.raw.xz ${local.image}",
-      "xz -d -c /tmp/talos.raw.xz | dd of=/dev/vda && sync",
-    ]
-  }
-}
-
-build {
-  name    = "develop"
-  sources = ["source.scaleway.talos"]
-
-  provisioner "file" {
-    source      = "scaleway-amd64.raw.xz"
-    destination = "/tmp/talos.raw.xz"
-  }
-  provisioner "shell" {
-    inline = [
-      "xz -d -c /tmp/talos.raw.xz | dd of=/dev/vda && sync",
-    ]
-  }
-}

system_os/scaleway/variables.pkr.hcl

@@ -1,31 +0,0 @@
-
-variable "scaleway_project_id" {
-  type    = string
-  default = env("SCW_DEFAULT_PROJECT_ID")
-}
-
-variable "scaleway_access_key" {
-  type      = string
-  default   = env("SCW_ACCESS_KEY")
-  sensitive = true
-}
-
-variable "scaleway_secret_key" {
-  type      = string
-  default   = env("SCW_SECRET_KEY")
-  sensitive = true
-}
-
-variable "scaleway_zone" {
-  type    = string
-  default = "fr-par-2"
-}
-
-variable "talos_version" {
-  type    = string
-  default = "v1.3.6"
-}
-
-locals {
-  image = "https://github.com/talos-systems/talos/releases/download/${var.talos_version}/scaleway-amd64.raw.xz"
-}