From 2e17e55783c109e917d8b0f14c5de05632f44761 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Fri, 19 Aug 2022 23:12:06 +0200 Subject: kubernetes/decorations: replace '/' with '%' in stamp file names --- roles/kubernetes/decorations/tasks/annotations.yml | 10 +++++----- roles/kubernetes/decorations/tasks/labels.yml | 10 +++++----- roles/kubernetes/decorations/tasks/taints.yml | 8 ++++---- 3 files changed, 14 insertions(+), 14 deletions(-) (limited to 'roles/kubernetes') diff --git a/roles/kubernetes/decorations/tasks/annotations.yml b/roles/kubernetes/decorations/tasks/annotations.yml index 9b47ecbf..0c0438f6 100644 --- a/roles/kubernetes/decorations/tasks/annotations.yml +++ b/roles/kubernetes/decorations/tasks/annotations.yml @@ -7,7 +7,7 @@ register: kubectl_list_annotations - set_fact: - current_annotations: "{{ kubectl_list_annotations.stdout | from_json }}" + current_annotations: "{{ kubectl_list_annotations.stdout | ternary(kubectl_list_annotations.stdout, '[]') | from_json }}" - name: add annotations to node delegate_to: "{{ groups['_kubernetes_primary_controlplane_node_'] | first }}" @@ -22,7 +22,7 @@ loop_control: label: "{{ item.key }}={{ item.value }}" copy: - dest: "/etc/kubernetes/decorations/annotations/{{ item.key }}" + dest: "/etc/kubernetes/decorations/annotations/{{ item.key | replace('/', '%') }}" content: "{{ item.value }}" - name: get list of managed labels @@ -32,13 +32,13 @@ - name: remove superflous annotations from node delegate_to: "{{ groups['_kubernetes_primary_controlplane_node_'] | first }}" - loop: "{{ managed_annotations.files | map(attribute='path') | map('basename') }}" + loop: "{{ managed_annotations.files | map(attribute='path') | map('basename') | replace('%', '/') }}" when: "item not in kubernetes_node_annotations" command: kubectl --kubeconfig /etc/kubernetes/admin.conf annotate --overwrite node '{{ kubernetes_node_name }}' '{{ item }}-' - name: remove stamp files for superflous annotations - loop: "{{ managed_annotations.files | map(attribute='path') | map('basename') }}" + loop: "{{ managed_annotations.files | map(attribute='path') | map('basename') | replace('%', '/') }}" when: "item not in kubernetes_node_annotations" file: - path: "/etc/kubernetes/decorations/annotations/{{ item }}" + path: "/etc/kubernetes/decorations/annotations/{{ item | replace('/', '%') }}" state: absent diff --git a/roles/kubernetes/decorations/tasks/labels.yml b/roles/kubernetes/decorations/tasks/labels.yml index 1517616e..fdc5e5c1 100644 --- a/roles/kubernetes/decorations/tasks/labels.yml +++ b/roles/kubernetes/decorations/tasks/labels.yml @@ -7,7 +7,7 @@ register: kubectl_list_labels - set_fact: - current_labels: "{{ kubectl_list_labels.stdout | from_json }}" + current_labels: "{{ kubectl_list_labels.stdout | ternary(kubectl_list_labels.stdout, '[]') | from_json }}" - name: add labels to node delegate_to: "{{ groups['_kubernetes_primary_controlplane_node_'] | first }}" @@ -22,7 +22,7 @@ loop_control: label: "{{ item.key }}={{ item.value }}" copy: - dest: "/etc/kubernetes/decorations/labels/{{ item.key }}" + dest: "/etc/kubernetes/decorations/labels/{{ item.key | replace('/', '%') }}" content: "{{ item.value }}" - name: get list of managed labels @@ -32,13 +32,13 @@ - name: remove superflous labels from node delegate_to: "{{ groups['_kubernetes_primary_controlplane_node_'] | first }}" - loop: "{{ managed_labels.files | map(attribute='path') | map('basename') }}" + loop: "{{ managed_labels.files | map(attribute='path') | map('basename') | replace('%', '/') }}" when: "item not in kubernetes_node_labels" command: kubectl --kubeconfig /etc/kubernetes/admin.conf label --overwrite node '{{ kubernetes_node_name }}' '{{ item }}-' - name: remove stamp files for superflous labels - loop: "{{ managed_labels.files | map(attribute='path') | map('basename') }}" + loop: "{{ managed_labels.files | map(attribute='path') | map('basename') | replace('%', '/') }}" when: "item not in kubernetes_node_labels" file: - path: "/etc/kubernetes/decorations/labels/{{ item }}" + path: "/etc/kubernetes/decorations/labels/{{ item | replace('/', '%') }}" state: absent diff --git a/roles/kubernetes/decorations/tasks/taints.yml b/roles/kubernetes/decorations/tasks/taints.yml index fd60ef88..fd027942 100644 --- a/roles/kubernetes/decorations/tasks/taints.yml +++ b/roles/kubernetes/decorations/tasks/taints.yml @@ -22,7 +22,7 @@ loop_control: label: "{{ item.key }}={{ item.value }}" copy: - dest: "/etc/kubernetes/decorations/taints/{{ item.key }}" + dest: "/etc/kubernetes/decorations/taints/{{ item.key | replace('/', '%') }}" content: "{{ item.value }}" - name: get list of managed taints @@ -32,13 +32,13 @@ - name: remove superflous taints from node delegate_to: "{{ groups['_kubernetes_primary_controlplane_node_'] | first }}" - loop: "{{ managed_taints.files | map(attribute='path') | map('basename') }}" + loop: "{{ managed_taints.files | map(attribute='path') | map('basename') | replace('%', '/') }}" when: "item not in kubernetes_node_taints" command: kubectl --kubeconfig /etc/kubernetes/admin.conf taint --overwrite node '{{ kubernetes_node_name }}' '{{ item }}-' - name: remove stamp files for superflous taints - loop: "{{ managed_taints.files | map(attribute='path') | map('basename') }}" + loop: "{{ managed_taints.files | map(attribute='path') | map('basename') | replace('%', '/') }}" when: "item not in kubernetes_node_taints" file: - path: "/etc/kubernetes/decorations/taints/{{ item }}" + path: "/etc/kubernetes/decorations/taints/{{ item | replace('/', '%') }}" state: absent -- cgit v1.2.3