From d64ed9f7c249d8c34ff400a47ba1df1d992cc707 Mon Sep 17 00:00:00 2001
From: Ashley Dumaine <5779804+AshleyDumaine@users.noreply.github.com>
Date: Mon, 12 Feb 2024 16:27:29 -0500
Subject: [PATCH] update node selector for modern k8s versions

---
 deploy/ccm-linode-template.yaml | 4 ++--
 deploy/chart/values.yaml        | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/deploy/ccm-linode-template.yaml b/deploy/ccm-linode-template.yaml
index 2810840f..6d4c53ce 100644
--- a/deploy/ccm-linode-template.yaml
+++ b/deploy/ccm-linode-template.yaml
@@ -77,10 +77,10 @@ spec:
       serviceAccountName: ccm-linode
       nodeSelector:
         # The CCM will only run on a Node labelled as a master, you may want to change this
-        node-role.kubernetes.io/master: ""
+        node-role.kubernetes.io/control-plane: ""
       tolerations:
         # The CCM can run on Nodes tainted as masters
-        - key: "node-role.kubernetes.io/master"
+        - key: "node-role.kubernetes.io/control-plane"
           effect: "NoSchedule"
         # The CCM is a "critical addon"
         - key: "CriticalAddonsOnly"
diff --git a/deploy/chart/values.yaml b/deploy/chart/values.yaml
index 790458df..83d592cd 100644
--- a/deploy/chart/values.yaml
+++ b/deploy/chart/values.yaml
@@ -13,7 +13,7 @@ region: ""
 # node-role.kubernetes.io/master - if set true, it deploys the svc on the master node
 nodeSelector:
   # The CCM will only run on a Node labelled as a master, you may want to change this
-  node-role.kubernetes.io/master: ""
+  node-role.kubernetes.io/control-plane: ""
 
 # Image repository must be 'linode/linode-cloud-controller-manager'. The tag can be changed/set to various ccm versions.
 # The pullPolicy is set to Always but can be changed when it is not required to always pull the new image
@@ -28,7 +28,7 @@ namespace: "kube-system"
 # Set of default tolerations
 tolerations:
  # The CCM can run on Nodes tainted as masters
-  - key: "node-role.kubernetes.io/master"
+  - key: "node-role.kubernetes.io/control-plane"
     effect: "NoSchedule"
   # The CCM is a "critical addon"
   - key: "CriticalAddonsOnly"
@@ -48,4 +48,4 @@ tolerations:
 # LINODE_HOSTNAME_ONLY_INGRESS type bool is supported
 # env:
   # - name: EXAMPLE_ENV_VAR
-  #   value: "true"
\ No newline at end of file
+  #   value: "true"