From feb5f2a5414878ddc026557c901e4c6ed32766cd Mon Sep 17 00:00:00 2001 From: Erickson Silva de Oliveira Date: Tue, 4 Jun 2024 07:39:37 -0300 Subject: [PATCH] Add label component=platform to pods Add the label "app.starlingx.io/component=platform" to pods to ensure kubernetes run it on the platform cores. Additionally, the review [1] introduced a problem when changing the chdir path in the trident install task. This resulted in the installer being unable to locate the custom templates. [1]: https://review.opendev.org/c/starlingx/ansible-playbooks/+/887424/13/playbookconfig/src/playbooks/roles/k8s-storage-backends/netapp/tasks/main.yml#86 Test Plan: PASS: Install trident PASS: Check if pods have the label 'app.starlingx.io/component' with the value 'platform' Story: 2010612 Task: 50258 Change-Id: I051c328edddf5b997c192e96f9be4ed34743b554 Signed-off-by: Erickson Silva de Oliveira --- .../playbooks/roles/k8s-storage-backends/netapp/tasks/main.yml | 2 +- .../netapp/templates/trident-daemonset.yaml.j2 | 2 ++ .../netapp/templates/trident-deployment.yaml.j2 | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/playbookconfig/src/playbooks/roles/k8s-storage-backends/netapp/tasks/main.yml b/playbookconfig/src/playbooks/roles/k8s-storage-backends/netapp/tasks/main.yml index e1f92bb4e..ff11feff0 100644 --- a/playbookconfig/src/playbooks/roles/k8s-storage-backends/netapp/tasks/main.yml +++ b/playbookconfig/src/playbooks/roles/k8s-storage-backends/netapp/tasks/main.yml @@ -83,7 +83,7 @@ - name: Install trident services command: tridentctl -n {{ trident_namespace }} install --use-custom-yaml {{ trident_install_extra_params }} args: - chdir: "{{ trident_setup_dir }}/setup" + chdir: "{{ trident_setup_dir }}" environment: KUBECONFIG: "/etc/kubernetes/admin.conf" when: (tridentctl_rest_response.rc is defined and diff --git a/playbookconfig/src/playbooks/roles/k8s-storage-backends/netapp/templates/trident-daemonset.yaml.j2 b/playbookconfig/src/playbooks/roles/k8s-storage-backends/netapp/templates/trident-daemonset.yaml.j2 index 585f3bb66..202e9069c 100644 --- a/playbookconfig/src/playbooks/roles/k8s-storage-backends/netapp/templates/trident-daemonset.yaml.j2 +++ b/playbookconfig/src/playbooks/roles/k8s-storage-backends/netapp/templates/trident-daemonset.yaml.j2 @@ -14,6 +14,8 @@ spec: metadata: labels: app: node.csi.trident.netapp.io + # STX_change: add label component + app.starlingx.io/component: platform spec: serviceAccount: trident-node-linux hostNetwork: true diff --git a/playbookconfig/src/playbooks/roles/k8s-storage-backends/netapp/templates/trident-deployment.yaml.j2 b/playbookconfig/src/playbooks/roles/k8s-storage-backends/netapp/templates/trident-deployment.yaml.j2 index 28ff572ae..921f5e1f8 100644 --- a/playbookconfig/src/playbooks/roles/k8s-storage-backends/netapp/templates/trident-deployment.yaml.j2 +++ b/playbookconfig/src/playbooks/roles/k8s-storage-backends/netapp/templates/trident-deployment.yaml.j2 @@ -17,6 +17,8 @@ spec: metadata: labels: app: controller.csi.trident.netapp.io + # STX_change: add label component + app.starlingx.io/component: platform spec: serviceAccount: trident-controller containers: