Add ccm by default

scaleway/deployments/kubelet-serving-cert-approver.yaml

@@ -200,7 +200,7 @@ spec:
             fieldRef:
               fieldPath: metadata.namespace
         image: ghcr.io/alex1989hu/kubelet-serving-cert-approver:main
-        imagePullPolicy: Always
+        imagePullPolicy: IfNotPresent
         livenessProbe:
           httpGet:
             path: /healthz

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

@@ -129,6 +129,8 @@ spec:
       dnsPolicy: Default
       hostNetwork: true
       serviceAccountName: cloud-controller-manager
+      nodeSelector:
+        node-role.kubernetes.io/master: ""
       tolerations:
         - key: "node.cloudprovider.kubernetes.io/uninitialized"
           value: "true"
@@ -139,17 +141,20 @@ spec:
           effect: NoSchedule
       containers:
         - name: scaleway-cloud-controller-manager
-          image: scaleway/scaleway-cloud-controller-manager:v0.21.4
-          imagePullPolicy: Always
+          image: ghcr.io/sergelogvinov/scaleway-cloud-controller-manager:1fa94b15f6d87e1f951331a7dca148302fe7318b
+          imagePullPolicy: IfNotPresent
           args:
             - --cloud-provider=scaleway
             - --leader-elect=true
             - --allow-untagged-cloud
             - --controllers=cloud-node,cloud-node-lifecycle
           resources:
+            limits:
+              cpu: 500m
+              memory: 512Mi
             requests:
               cpu: 100m
-              memory: 50Mi
+              memory: 64Mi
           envFrom:
             - secretRef:
                 name: scaleway-secret

scaleway/instances-master.tf

@@ -33,8 +33,9 @@ resource "scaleway_instance_server" "controlplane" {
         labels     = "${local.controlplane_labels},node.kubernetes.io/instance-type=${lookup(var.controlplane, "type", "DEV1-M")}"
         access     = var.scaleway_access
         secret     = var.scaleway_secret
-        region     = "fr-par"
         project_id = var.scaleway_project_id
+        region     = "fr-par"
+        vpc_id     = split("/", scaleway_vpc_private_network.main.id)[1]
       })
     )
   }

scaleway/templates/controlplane.yaml.tpl

@@ -104,9 +104,11 @@ cluster:
           SCW_SECRET_KEY: ${base64encode(secret)}
           SCW_DEFAULT_PROJECT_ID:  ${base64encode(project_id)}
           SCW_DEFAULT_REGION: ${base64encode(region)}
+          SCW_VPC_ID: ${base64encode(vpc_id)}
   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/scaleway/deployments/kubelet-serving-cert-approver.yaml
       - https://raw.githubusercontent.com/sergelogvinov/terraform-talos/main/scaleway/deployments/metrics-server.yaml
       - https://raw.githubusercontent.com/sergelogvinov/terraform-talos/main/scaleway/deployments/local-path-storage.yaml

scaleway/variables.tf

@@ -39,6 +39,7 @@ variable "kubernetes" {
     token          = ""
     ca             = ""
   }
+  sensitive = true
 }
 
 variable "vpc_main_cidr" {