diff --git a/molecule/rocky9/converge.yml b/molecule/rocky9/converge.yml index 57cdd3c..09c4d35 100644 --- a/molecule/rocky9/converge.yml +++ b/molecule/rocky9/converge.yml @@ -11,7 +11,7 @@ k3s_server_manifests_templates: - "calico-installation.yaml.j2" 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 # - url: https://github.com/hetznercloud/hcloud-cloud-controller-manager/releases/latest/download/ccm.yaml # dest: hcloud-ccm.yaml diff --git a/tasks/setup.yml b/tasks/setup.yml index 957dfca..c4b5dec 100644 --- a/tasks/setup.yml +++ b/tasks/setup.yml @@ -63,9 +63,9 @@ - name: Add node role label k8s: kind: "Node" - name: "{{ ansible_hostname }}" + name: "{{ k3s_node_name }}" kubeconfig: "{{ __k3s_config_dir }}/k3s.yaml" - state: present + state: patched definition: metadata: labels: "{{ (__k3s_node_lables['control'] if k3s_server | bool else __k3s_node_lables['worker']) | combine(__k3s_node_lables['general']) }}"