From 03c6152940d6614fd2f69bdf9c96058a703d7894 Mon Sep 17 00:00:00 2001
From: Rahul Sharma <rahsharm@akamai.com>
Date: Thu, 14 Mar 2024 21:09:55 +0000
Subject: [PATCH] use updated version of linode-ccm

---
 templates/addons/provider-linode/linode-ccm.yaml  | 5 ++---
 templates/flavors/base/linodeMachineTemplate.yaml | 4 ++--
 templates/flavors/k3s/secret.yaml                 | 6 +++++-
 templates/flavors/rke2/secret.yaml                | 6 +++++-
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/templates/addons/provider-linode/linode-ccm.yaml b/templates/addons/provider-linode/linode-ccm.yaml
index 5e4715390..8849f0b53 100644
--- a/templates/addons/provider-linode/linode-ccm.yaml
+++ b/templates/addons/provider-linode/linode-ccm.yaml
@@ -9,7 +9,7 @@ spec:
   repoURL: https://linode.github.io/linode-cloud-controller-manager/
   chartName: ccm-linode
   namespace: kube-system
-  version: ${LINODE_CCM_VERSION:=v0.3.24}
+  version: ${LINODE_CCM_VERSION:=v0.4.1}
   options:
     waitForJobs: true
     wait: true
@@ -17,9 +17,8 @@ spec:
   valuesTemplate: |
     routeController:
       vpcName: ${VPC_NAME:=${CLUSTER_NAME}}
-      linodeNodePrivateSubnet: 10.0.0.0/8
+      clusterCIDR: 10.0.0.0/8
       configureCloudRoutes: true
-      routeReconciliationPeriod: 1m
     secretRef:
       name: "linode-token-region"
     image:
diff --git a/templates/flavors/base/linodeMachineTemplate.yaml b/templates/flavors/base/linodeMachineTemplate.yaml
index 81731faca..b2ee8f19d 100644
--- a/templates/flavors/base/linodeMachineTemplate.yaml
+++ b/templates/flavors/base/linodeMachineTemplate.yaml
@@ -11,7 +11,7 @@ spec:
       region: ${LINODE_REGION}
       authorizedKeys:
       # uncomment to include your ssh key in linode provisioning
-      - ${LINODE_SSH_PUBKEY:=""}
+      # - ${LINODE_SSH_PUBKEY:=""}
 ---
 apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
 kind: LinodeMachineTemplate
@@ -25,4 +25,4 @@ spec:
       region: ${LINODE_REGION}
       authorizedKeys:
       # uncomment to include your ssh key in linode provisioning
-      - ${LINODE_SSH_PUBKEY:=""}
+      # - ${LINODE_SSH_PUBKEY:=""}
diff --git a/templates/flavors/k3s/secret.yaml b/templates/flavors/k3s/secret.yaml
index d6f8f02b4..47ff1bd25 100644
--- a/templates/flavors/k3s/secret.yaml
+++ b/templates/flavors/k3s/secret.yaml
@@ -39,11 +39,15 @@ stringData:
      name: ccm-linode
     spec:
      targetNamespace: kube-system
-     version: ${LINODE_CCM_VERSION:=v0.3.24}
+     version: ${LINODE_CCM_VERSION:=v0.4.1}
      chart: ccm-linode
      repo: https://linode.github.io/linode-cloud-controller-manager/
      bootstrap: true
      valuesContent: |-
+       routeController:
+         vpcName: ${VPC_NAME:=${CLUSTER_NAME}}
+         clusterCIDR: 10.0.0.0/8
+         configureCloudRoutes: true
        secretRef:
          name: "linode-token-region"
        nodeSelector:
diff --git a/templates/flavors/rke2/secret.yaml b/templates/flavors/rke2/secret.yaml
index d50cde02c..fc40a421f 100644
--- a/templates/flavors/rke2/secret.yaml
+++ b/templates/flavors/rke2/secret.yaml
@@ -21,11 +21,15 @@ stringData:
      name: ccm-linode
     spec:
      targetNamespace: kube-system
-     version: ${LINODE_CCM_VERSION:=v0.3.24}
+     version: ${LINODE_CCM_VERSION:=v0.4.1}
      chart: ccm-linode
      repo: https://linode.github.io/linode-cloud-controller-manager/
      bootstrap: true
      valuesContent: |-
+       routeController:
+         vpcName: ${VPC_NAME:=${CLUSTER_NAME}}
+         clusterCIDR: 10.0.0.0/8
+         configureCloudRoutes: true
        secretRef:
          name: "linode-token-region"
        nodeSelector: