Skip to content

Commit cad43f0

Browse files
committed
chore: remove k8s master label
Since talos now defaults to k8s 1.27, remove the handling of `master` label for controlplane nodes. Signed-off-by: Noel Georgi <git@frezbo.dev>
1 parent e296a56 commit cad43f0

File tree

6 files changed

+5
-19
lines changed

6 files changed

+5
-19
lines changed

internal/app/machined/internal/server/v1alpha1/v1alpha1_cluster.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -247,10 +247,6 @@ func getDiscoveryMemberList(ctx context.Context, runtime runtime.Runtime) ([]*cl
247247

248248
func isControlPlaneNode(node *corev1.Node) bool {
249249
for key := range node.Labels {
250-
if key == constants.LabelNodeRoleMaster {
251-
return true
252-
}
253-
254250
if key == constants.LabelNodeRoleControlPlane {
255251
return true
256252
}

internal/app/machined/pkg/controllers/k8s/templates.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -341,9 +341,6 @@ spec:
341341
serviceAccountName: coredns
342342
priorityClassName: system-cluster-critical
343343
tolerations:
344-
- key: node-role.kubernetes.io/master
345-
operator: Exists
346-
effect: NoSchedule
347344
- key: node-role.kubernetes.io/control-plane
348345
operator: Exists
349346
effect: NoSchedule

internal/integration/provision/upgrade.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -678,7 +678,7 @@ func (suite *UpgradeSuite) untaint(name string) {
678678
k := 0
679679

680680
for _, taint := range n.Spec.Taints {
681-
if taint.Key != constants.LabelNodeRoleMaster && taint.Key != constants.LabelNodeRoleControlPlane {
681+
if taint.Key != constants.LabelNodeRoleControlPlane {
682682
n.Spec.Taints[k] = taint
683683
k++
684684
}

pkg/cluster/check/kubernetes.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ func K8sFullControlPlaneAssertion(ctx context.Context, cl ClusterInfo) error {
9797

9898
for _, node := range nodes.Items {
9999
for label := range node.Labels {
100-
if label == constants.LabelNodeRoleMaster || label == constants.LabelNodeRoleControlPlane {
100+
if label == constants.LabelNodeRoleControlPlane {
101101
var internalIP netip.Addr
102102

103103
var ips []netip.Addr

pkg/kubernetes/kubernetes.go

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -152,16 +152,15 @@ func (h *Client) NodeIPs(ctx context.Context, machineType machine.Type) (addrs [
152152
addrs = []string{}
153153

154154
for _, node := range resp.Items {
155-
_, labelMaster := node.Labels[constants.LabelNodeRoleMaster]
156155
_, labelControlPlane := node.Labels[constants.LabelNodeRoleControlPlane]
157156

158157
var skip bool
159158

160159
switch machineType {
161160
case machine.TypeInit, machine.TypeControlPlane:
162-
skip = !(labelMaster || labelControlPlane)
161+
skip = !labelControlPlane
163162
case machine.TypeWorker:
164-
skip = labelMaster || labelControlPlane
163+
skip = labelControlPlane
165164
case machine.TypeUnknown:
166165
fallthrough
167166
default:
@@ -205,14 +204,11 @@ func (h *Client) LabelNodeAsControlPlane(ctx context.Context, name string, taint
205204
}
206205

207206
n.Labels[constants.LabelNodeRoleControlPlane] = ""
208-
// TODO: frezbo
209-
// remove all references to `constants.LabelNodeRoleMaster` when Talos supports k8s v1.27
210-
delete(n.Labels, constants.LabelNodeRoleMaster)
211207

212208
newTaints := make([]corev1.Taint, 0, len(n.Spec.Taints))
213209

214210
for _, taint := range n.Spec.Taints {
215-
if taint.Key == constants.LabelNodeRoleMaster || taint.Key == constants.LabelNodeRoleControlPlane {
211+
if taint.Key == constants.LabelNodeRoleControlPlane {
216212
continue
217213
}
218214

pkg/machinery/constants/constants.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -334,9 +334,6 @@ const (
334334
// renovate: datasource=github-releases depName=coredns/coredns
335335
DefaultCoreDNSVersion = "1.10.1"
336336

337-
// LabelNodeRoleMaster is the node label required by a control plane node.
338-
LabelNodeRoleMaster = "node-role.kubernetes.io/master"
339-
340337
// LabelNodeRoleControlPlane is the node label required by a control plane node.
341338
LabelNodeRoleControlPlane = "node-role.kubernetes.io/control-plane"
342339

0 commit comments

Comments
 (0)