From 1600fd9082bfb7099a3069124468429ca9b96fcb Mon Sep 17 00:00:00 2001 From: Samuel Liu Date: Tue, 31 May 2022 22:52:53 +0800 Subject: [PATCH] clean up tags (#8880) --- roles/kubernetes-apps/cloud_controller/oci/tasks/main.yml | 5 ----- roles/kubernetes-apps/csi_driver/aws_ebs/tasks/main.yml | 2 -- roles/kubernetes-apps/csi_driver/azuredisk/tasks/main.yml | 5 ----- .../csi_driver/cinder/tasks/cinder-write-cacert.yml | 1 - roles/kubernetes-apps/csi_driver/cinder/tasks/main.yml | 6 ------ roles/kubernetes-apps/csi_driver/csi_crd/tasks/main.yml | 2 -- roles/kubernetes-apps/csi_driver/gcp_pd/tasks/main.yml | 5 ----- roles/kubernetes-apps/csi_driver/upcloud/tasks/main.yml | 4 ---- roles/kubernetes-apps/csi_driver/vsphere/tasks/main.yml | 6 ------ .../external_cloud_controller/vsphere/tasks/main.yml | 6 ------ 10 files changed, 42 deletions(-) diff --git a/roles/kubernetes-apps/cloud_controller/oci/tasks/main.yml b/roles/kubernetes-apps/cloud_controller/oci/tasks/main.yml index 05d5c6930..2224ae5f1 100644 --- a/roles/kubernetes-apps/cloud_controller/oci/tasks/main.yml +++ b/roles/kubernetes-apps/cloud_controller/oci/tasks/main.yml @@ -1,7 +1,6 @@ --- - include: credentials-check.yml - tags: oci - name: "OCI Cloud Controller | Generate Cloud Provider Configuration" template: @@ -9,7 +8,6 @@ dest: "{{ kube_config_dir }}/controller-manager-config.yml" mode: 0644 when: inventory_hostname == groups['kube_control_plane'][0] - tags: oci - name: "OCI Cloud Controller | Slurp Configuration" slurp: @@ -20,7 +18,6 @@ set_fact: controller_manager_config_base64: "{{ controller_manager_config.content }}" when: inventory_hostname == groups['kube_control_plane'][0] - tags: oci - name: "OCI Cloud Controller | Generate Manifests" template: @@ -28,7 +25,6 @@ dest: "{{ kube_config_dir }}/oci-cloud-provider.yml" mode: 0644 when: inventory_hostname == groups['kube_control_plane'][0] - tags: oci - name: "OCI Cloud Controller | Apply Manifests" kube: @@ -36,4 +32,3 @@ filename: "{{ kube_config_dir }}/oci-cloud-provider.yml" state: latest when: inventory_hostname == groups['kube_control_plane'][0] - tags: oci diff --git a/roles/kubernetes-apps/csi_driver/aws_ebs/tasks/main.yml b/roles/kubernetes-apps/csi_driver/aws_ebs/tasks/main.yml index 066009661..5570dccfd 100644 --- a/roles/kubernetes-apps/csi_driver/aws_ebs/tasks/main.yml +++ b/roles/kubernetes-apps/csi_driver/aws_ebs/tasks/main.yml @@ -11,7 +11,6 @@ - {name: aws-ebs-csi-nodeservice, file: aws-ebs-csi-nodeservice.yml} register: aws_csi_manifests when: inventory_hostname == groups['kube_control_plane'][0] - tags: aws-ebs-csi-driver - name: AWS CSI Driver | Apply Manifests kube: @@ -25,4 +24,3 @@ - not item is skipped loop_control: label: "{{ item.item.file }}" - tags: aws-ebs-csi-driver diff --git a/roles/kubernetes-apps/csi_driver/azuredisk/tasks/main.yml b/roles/kubernetes-apps/csi_driver/azuredisk/tasks/main.yml index 96abe3990..478e1e71e 100644 --- a/roles/kubernetes-apps/csi_driver/azuredisk/tasks/main.yml +++ b/roles/kubernetes-apps/csi_driver/azuredisk/tasks/main.yml @@ -1,6 +1,5 @@ --- - include_tasks: azure-credential-check.yml - tags: azure-csi-driver - name: Azure CSI Driver | Write Azure CSI cloud-config template: @@ -9,14 +8,12 @@ group: "{{ kube_cert_group }}" mode: 0640 when: inventory_hostname == groups['kube_control_plane'][0] - tags: azure-csi-driver - name: Azure CSI Driver | Get base64 cloud-config slurp: src: "{{ kube_config_dir }}/azure_csi_cloud_config" register: cloud_config_secret when: inventory_hostname == groups['kube_control_plane'][0] - tags: azure-csi-driver - name: Azure CSI Driver | Generate Manifests template: @@ -32,7 +29,6 @@ - {name: azure-csi-node-info-crd.yml.j2, file: azure-csi-node-info-crd.yml} register: azure_csi_manifests when: inventory_hostname == groups['kube_control_plane'][0] - tags: azure-csi-driver - name: Azure CSI Driver | Apply Manifests kube: @@ -46,4 +42,3 @@ - not item is skipped loop_control: label: "{{ item.item.file }}" - tags: azure-csi-driver diff --git a/roles/kubernetes-apps/csi_driver/cinder/tasks/cinder-write-cacert.yml b/roles/kubernetes-apps/csi_driver/cinder/tasks/cinder-write-cacert.yml index 2e997647c..c6d14a2aa 100644 --- a/roles/kubernetes-apps/csi_driver/cinder/tasks/cinder-write-cacert.yml +++ b/roles/kubernetes-apps/csi_driver/cinder/tasks/cinder-write-cacert.yml @@ -8,5 +8,4 @@ dest: "{{ kube_config_dir }}/cinder-cacert.pem" group: "{{ kube_cert_group }}" mode: 0640 - tags: cinder-csi-driver delegate_to: "{{ delegate_host_to_write_cacert }}" diff --git a/roles/kubernetes-apps/csi_driver/cinder/tasks/main.yml b/roles/kubernetes-apps/csi_driver/cinder/tasks/main.yml index 6590f6d03..7d5affe61 100644 --- a/roles/kubernetes-apps/csi_driver/cinder/tasks/main.yml +++ b/roles/kubernetes-apps/csi_driver/cinder/tasks/main.yml @@ -1,6 +1,5 @@ --- - include_tasks: cinder-credential-check.yml - tags: cinder-csi-driver - name: Cinder CSI Driver | Write cacert file include_tasks: cinder-write-cacert.yml @@ -12,7 +11,6 @@ - inventory_hostname in groups['k8s_cluster'] - cinder_cacert is defined - cinder_cacert | length > 0 - tags: cinder-csi-driver - name: Cinder CSI Driver | Write Cinder cloud-config template: @@ -21,14 +19,12 @@ group: "{{ kube_cert_group }}" mode: 0640 when: inventory_hostname == groups['kube_control_plane'][0] - tags: cinder-csi-driver - name: Cinder CSI Driver | Get base64 cloud-config slurp: src: "{{ kube_config_dir }}/cinder_cloud_config" register: cloud_config_secret when: inventory_hostname == groups['kube_control_plane'][0] - tags: cinder-csi-driver - name: Cinder CSI Driver | Generate Manifests template: @@ -45,7 +41,6 @@ - {name: cinder-csi-poddisruptionbudget, file: cinder-csi-poddisruptionbudget.yml} register: cinder_csi_manifests when: inventory_hostname == groups['kube_control_plane'][0] - tags: cinder-csi-driver - name: Cinder CSI Driver | Apply Manifests kube: @@ -59,4 +54,3 @@ - not item is skipped loop_control: label: "{{ item.item.file }}" - tags: cinder-csi-driver diff --git a/roles/kubernetes-apps/csi_driver/csi_crd/tasks/main.yml b/roles/kubernetes-apps/csi_driver/csi_crd/tasks/main.yml index 7329d49e6..479093120 100644 --- a/roles/kubernetes-apps/csi_driver/csi_crd/tasks/main.yml +++ b/roles/kubernetes-apps/csi_driver/csi_crd/tasks/main.yml @@ -10,7 +10,6 @@ - {name: volumesnapshots, file: volumesnapshots.yml} register: csi_crd_manifests when: inventory_hostname == groups['kube_control_plane'][0] - tags: csi-driver - name: CSI CRD | Apply Manifests kube: @@ -25,4 +24,3 @@ - not item is skipped loop_control: label: "{{ item.item.file }}" - tags: csi-driver diff --git a/roles/kubernetes-apps/csi_driver/gcp_pd/tasks/main.yml b/roles/kubernetes-apps/csi_driver/gcp_pd/tasks/main.yml index ebaa86f2b..59a99f74e 100644 --- a/roles/kubernetes-apps/csi_driver/gcp_pd/tasks/main.yml +++ b/roles/kubernetes-apps/csi_driver/gcp_pd/tasks/main.yml @@ -3,7 +3,6 @@ fail: msg: "Credentials file cloud-sa.json is mandatory" when: gcp_pd_csi_sa_cred_file is not defined or not gcp_pd_csi_sa_cred_file - tags: gcp-pd-csi-driver - name: GCP PD CSI Driver | Copy GCP credentials file copy: @@ -12,14 +11,12 @@ group: "{{ kube_cert_group }}" mode: 0640 when: inventory_hostname == groups['kube_control_plane'][0] - tags: gcp-pd-csi-driver - name: GCP PD CSI Driver | Get base64 cloud-sa.json slurp: src: "{{ kube_config_dir }}/cloud-sa.json" register: gcp_cred_secret when: inventory_hostname == groups['kube_control_plane'][0] - tags: gcp-pd-csi-driver - name: GCP PD CSI Driver | Generate Manifests template: @@ -33,7 +30,6 @@ - {name: gcp-pd-csi-node, file: gcp-pd-csi-node.yml} register: gcp_pd_csi_manifests when: inventory_hostname == groups['kube_control_plane'][0] - tags: gcp-pd-csi-driver - name: GCP PD CSI Driver | Apply Manifests kube: @@ -47,4 +43,3 @@ - not item is skipped loop_control: label: "{{ item.item.file }}" - tags: gcp-pd-csi-driver diff --git a/roles/kubernetes-apps/csi_driver/upcloud/tasks/main.yml b/roles/kubernetes-apps/csi_driver/upcloud/tasks/main.yml index 011731503..63e37bcf5 100644 --- a/roles/kubernetes-apps/csi_driver/upcloud/tasks/main.yml +++ b/roles/kubernetes-apps/csi_driver/upcloud/tasks/main.yml @@ -3,7 +3,6 @@ fail: msg: "UpCloud username is missing. Env UPCLOUD_USERNAME is mandatory" when: upcloud_username is not defined or not upcloud_username - tags: upcloud-csi-driver - name: UpCloud CSI Driver | Check if UPCLOUD_PASSWORD exists fail: @@ -12,7 +11,6 @@ - upcloud_username is defined - upcloud_username|length > 0 - upcloud_password is not defined or not upcloud_password - tags: upcloud-csi-driver - name: UpCloud CSI Driver | Generate Manifests template: @@ -27,7 +25,6 @@ - {name: upcloud-csi-driver, file: upcloud-csi-driver.yml} register: upcloud_csi_manifests when: inventory_hostname == groups['kube_control_plane'][0] - tags: upcloud-csi-driver - name: UpCloud CSI Driver | Apply Manifests kube: @@ -41,4 +38,3 @@ - not item is skipped loop_control: label: "{{ item.item.file }}" - tags: upcloud-csi-driver diff --git a/roles/kubernetes-apps/csi_driver/vsphere/tasks/main.yml b/roles/kubernetes-apps/csi_driver/vsphere/tasks/main.yml index 7dec480ea..ea711ebaf 100644 --- a/roles/kubernetes-apps/csi_driver/vsphere/tasks/main.yml +++ b/roles/kubernetes-apps/csi_driver/vsphere/tasks/main.yml @@ -1,6 +1,5 @@ --- - include_tasks: vsphere-credentials-check.yml - tags: vsphere-csi-driver - name: vSphere CSI Driver | Generate CSI cloud-config template: @@ -10,7 +9,6 @@ with_items: - vsphere-csi-cloud-config when: inventory_hostname == groups['kube_control_plane'][0] - tags: vsphere-csi-driver - name: vSphere CSI Driver | Generate Manifests template: @@ -27,14 +25,12 @@ - vsphere-csi-node.yml register: vsphere_csi_manifests when: inventory_hostname == groups['kube_control_plane'][0] - tags: vsphere-csi-driver - name: vSphere CSI Driver | Generate a CSI secret manifest command: "{{ kubectl }} create secret generic vsphere-config-secret --from-file=csi-vsphere.conf={{ kube_config_dir }}/vsphere-csi-cloud-config -n kube-system --dry-run --save-config -o yaml" register: vsphere_csi_secret_manifest when: inventory_hostname == groups['kube_control_plane'][0] no_log: true - tags: vsphere-csi-driver - name: vSphere CSI Driver | Apply a CSI secret manifest command: @@ -42,7 +38,6 @@ stdin: "{{ vsphere_csi_secret_manifest.stdout }}" when: inventory_hostname == groups['kube_control_plane'][0] no_log: true - tags: vsphere-csi-driver - name: vSphere CSI Driver | Apply Manifests kube: @@ -56,4 +51,3 @@ - not item is skipped loop_control: label: "{{ item.item }}" - tags: vsphere-csi-driver diff --git a/roles/kubernetes-apps/external_cloud_controller/vsphere/tasks/main.yml b/roles/kubernetes-apps/external_cloud_controller/vsphere/tasks/main.yml index 57fd47e23..9c25c729f 100644 --- a/roles/kubernetes-apps/external_cloud_controller/vsphere/tasks/main.yml +++ b/roles/kubernetes-apps/external_cloud_controller/vsphere/tasks/main.yml @@ -1,6 +1,5 @@ --- - include_tasks: vsphere-credentials-check.yml - tags: external-vsphere - name: External vSphere Cloud Controller | Generate CPI cloud-config template: @@ -10,7 +9,6 @@ with_items: - external-vsphere-cpi-cloud-config when: inventory_hostname == groups['kube_control_plane'][0] - tags: external-vsphere - name: External vSphere Cloud Controller | Generate Manifests template: @@ -24,20 +22,17 @@ - external-vsphere-cloud-controller-manager-ds.yml register: external_vsphere_manifests when: inventory_hostname == groups['kube_control_plane'][0] - tags: external-vsphere - name: External vSphere Cloud Provider Interface | Create a CPI configMap manifest command: "{{ bin_dir }}/kubectl create configmap cloud-config --from-file=vsphere.conf={{ kube_config_dir }}/external-vsphere-cpi-cloud-config -n kube-system --dry-run --save-config -o yaml" register: external_vsphere_configmap_manifest when: inventory_hostname == groups['kube_control_plane'][0] - tags: external-vsphere - name: External vSphere Cloud Provider Interface | Apply a CPI configMap manifest command: cmd: "{{ bin_dir }}/kubectl apply -f -" stdin: "{{ external_vsphere_configmap_manifest.stdout }}" when: inventory_hostname == groups['kube_control_plane'][0] - tags: external-vsphere - name: External vSphere Cloud Controller | Apply Manifests kube: @@ -51,4 +46,3 @@ - not item is skipped loop_control: label: "{{ item.item }}" - tags: external-vsphere