fix: fix node label patching
All checks were successful
continuous-integration/drone/push Build is passing

This commit is contained in:
Robert Kaussow 2022-11-18 10:12:48 +01:00
parent e3ec4758bb
commit 23c4f370df
Signed by: xoxys
GPG Key ID: 4E692A2EAECC03C0
2 changed files with 3 additions and 3 deletions

View File

@ -11,7 +11,7 @@
k3s_server_manifests_templates: k3s_server_manifests_templates:
- "calico-installation.yaml.j2" - "calico-installation.yaml.j2"
k3s_server_manifests_urls: k3s_server_manifests_urls:
- url: https://docs.projectcalico.org/archive/v3.24/manifests/tigera-operator.yaml - url: https://raw.githubusercontent.com/projectcalico/calico/v3.24.2/manifests/tigera-operator.yaml
dest: tigera-operator.yaml dest: tigera-operator.yaml
# - url: https://github.com/hetznercloud/hcloud-cloud-controller-manager/releases/latest/download/ccm.yaml # - url: https://github.com/hetznercloud/hcloud-cloud-controller-manager/releases/latest/download/ccm.yaml
# dest: hcloud-ccm.yaml # dest: hcloud-ccm.yaml

View File

@ -63,9 +63,9 @@
- name: Add node role label - name: Add node role label
k8s: k8s:
kind: "Node" kind: "Node"
name: "{{ ansible_hostname }}" name: "{{ k3s_node_name }}"
kubeconfig: "{{ __k3s_config_dir }}/k3s.yaml" kubeconfig: "{{ __k3s_config_dir }}/k3s.yaml"
state: present state: patched
definition: definition:
metadata: metadata:
labels: "{{ (__k3s_node_lables['control'] if k3s_server | bool else __k3s_node_lables['worker']) | combine(__k3s_node_lables['general']) }}" labels: "{{ (__k3s_node_lables['control'] if k3s_server | bool else __k3s_node_lables['worker']) | combine(__k3s_node_lables['general']) }}"