diff --git a/packages/core/kubeovn/Makefile b/packages/core/kubeovn/Makefile index e6eb0957..84b241ac 100644 --- a/packages/core/kubeovn/Makefile +++ b/packages/core/kubeovn/Makefile @@ -5,10 +5,6 @@ show: helm template --dry-run=server -n $(NAMESPACE) $(NAME) . apply: - kubectl label node -lnode-role.kubernetes.io/control-plane kube-ovn/role=master --overwrite && \ - MASTER_NODES=$$(kubectl get nodes -lkube-ovn/role=master -o jsonpath='{.items[*].status.addresses[?(@.type=="InternalIP")].address}' | tr ' ' ',') && \ - MASTER_COUNT=$$(echo "$$MASTER_NODES" | awk -F, '{ print NF }') && \ - set -x && \ helm upgrade -i -n $(NAMESPACE) $(NAME) . diff: @@ -19,3 +15,4 @@ update: curl -sSL https://github.com/kubeovn/kube-ovn/archive/refs/heads/master.tar.gz | \ tar -C charts/kube-ovn -xzvf - --strip 2 kube-ovn-master/charts cd charts/kube-ovn && patch -p2 < ../../patches/talos.patch + sed -i '/kube-ovn\/role.*master/ s|kube-ovn/role\(.*\)master|node-role.kubernetes.io/control-plane\1|g' $$(grep -rl 'kube-ovn/role' charts/kube-ovn/templates) diff --git a/packages/core/kubeovn/charts/kube-ovn/templates/_helpers.tpl b/packages/core/kubeovn/charts/kube-ovn/templates/_helpers.tpl index 1341e99f..45da50c7 100644 --- a/packages/core/kubeovn/charts/kube-ovn/templates/_helpers.tpl +++ b/packages/core/kubeovn/charts/kube-ovn/templates/_helpers.tpl @@ -5,7 +5,7 @@ Get IP-addresses of master nodes {{- $nodes := lookup "v1" "Node" "" "" -}} {{- $ips := list -}} {{- range $node := $nodes.items -}} - {{- if eq (index $node.metadata.labels "kube-ovn/role") "master" -}} + {{- if eq (index $node.metadata.labels "node-role.kubernetes.io/control-plane") "" -}} {{- range $address := $node.status.addresses -}} {{- if eq $address.type "InternalIP" -}} {{- $ips = append $ips $address.address -}} diff --git a/packages/core/kubeovn/charts/kube-ovn/templates/central-deploy.yaml b/packages/core/kubeovn/charts/kube-ovn/templates/central-deploy.yaml index cbdf87b7..1380e30e 100644 --- a/packages/core/kubeovn/charts/kube-ovn/templates/central-deploy.yaml +++ b/packages/core/kubeovn/charts/kube-ovn/templates/central-deploy.yaml @@ -126,7 +126,7 @@ spec: timeoutSeconds: 45 nodeSelector: kubernetes.io/os: "linux" - kube-ovn/role: "master" + node-role.kubernetes.io/control-plane: "" volumes: - name: host-run-ovs hostPath: diff --git a/packages/core/kubeovn/charts/kube-ovn/templates/monitor-deploy.yaml b/packages/core/kubeovn/charts/kube-ovn/templates/monitor-deploy.yaml index d28999b4..7b679ca9 100644 --- a/packages/core/kubeovn/charts/kube-ovn/templates/monitor-deploy.yaml +++ b/packages/core/kubeovn/charts/kube-ovn/templates/monitor-deploy.yaml @@ -108,7 +108,7 @@ spec: timeoutSeconds: 3 nodeSelector: kubernetes.io/os: "linux" - kube-ovn/role: "master" + node-role.kubernetes.io/control-plane: "" volumes: - name: host-run-ovs hostPath: