Added support for dynamic tags in AWS and Azure. (#6752)

* Added support for dynamic tags in AWS and Azure. * Added examples of dynamic tags configuration.
kubernetes-sigs · Sep 26, 2020 · aba63f0 · aba63f0
1 parent e67886b
commit aba63f0
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 0 deletions.
diff --git a/inventory/sample/group_vars/all/aws.yml b/inventory/sample/group_vars/all/aws.yml
@@ -6,3 +6,4 @@
 # aws_ebs_csi_enable_volume_resizing: false
 # aws_ebs_csi_controller_replicas: 1
 # aws_ebs_csi_plugin_image_tag: latest
+# aws_ebs_csi_extra_volume_tags: "Owner=owner,Team=team,Environment=environment'
diff --git a/inventory/sample/group_vars/all/azure.yml b/inventory/sample/group_vars/all/azure.yml
@@ -30,6 +30,7 @@
 # azure_csi_subnet_name:
 # azure_csi_security_group_name:
 # azure_csi_use_instance_metadata:
+# azure_csi_tags: "Owner=owner,Team=team,Environment=environment'
 
 ## To enable Azure Disk CSI, uncomment below
 # azure_csi_enabled: true

diff --git a/roles/kubernetes-apps/csi_driver/aws_ebs/templates/aws-ebs-csi-controllerservice.yml.j2 b/roles/kubernetes-apps/csi_driver/aws_ebs/templates/aws-ebs-csi-controllerservice.yml.j2
@@ -25,6 +25,9 @@ spec:
           image: {{ aws_ebs_csi_plugin_image_repo }}:{{ aws_ebs_csi_plugin_image_tag }}
           args:
             - --endpoint=$(CSI_ENDPOINT)
+{% if aws_ebs_csi_extra_volume_tags is defined %}
+            - --extra-volume-tags={{ aws_ebs_csi_extra_volume_tags }}
+{% endif %}
             - --logtostderr
             - --v=5
           env:

diff --git a/roles/kubernetes-apps/csi_driver/aws_ebs/templates/aws-ebs-csi-nodeservice.yml.j2 b/roles/kubernetes-apps/csi_driver/aws_ebs/templates/aws-ebs-csi-nodeservice.yml.j2
@@ -27,6 +27,9 @@ spec:
           image: {{ aws_ebs_csi_plugin_image_repo }}:{{ aws_ebs_csi_plugin_image_tag }}
           args:
             - --endpoint=$(CSI_ENDPOINT)
+{% if aws_ebs_csi_extra_volume_tags is defined %}
+            - --extra-volume-tags={{ aws_ebs_csi_extra_volume_tags }}
+{% endif %}
             - --logtostderr
             - --v=5
           env:

diff --git a/...kubernetes-apps/persistent_volumes/azuredisk-csi/templates/azure-csi-storage-class.yml.j2 b/...kubernetes-apps/persistent_volumes/azuredisk-csi/templates/azure-csi-storage-class.yml.j2
@@ -6,6 +6,9 @@ metadata:
 provisioner: disk.csi.azure.com
 parameters:
   skuname: {{ storage_account_type }}
+{% if azure_csi_tags is defined %}
+  tags: {{ azure_csi_tags }}
+{% endif %}
 reclaimPolicy: Delete
 volumeBindingMode: Immediate
 allowVolumeExpansion: true