Browse Source

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.
pull/6753/head
Mateusz Adamek 4 years ago
committed by GitHub
parent
commit
aba63f0f9a
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 0 deletions
  1. 1
      inventory/sample/group_vars/all/aws.yml
  2. 1
      inventory/sample/group_vars/all/azure.yml
  3. 3
      roles/kubernetes-apps/csi_driver/aws_ebs/templates/aws-ebs-csi-controllerservice.yml.j2
  4. 3
      roles/kubernetes-apps/csi_driver/aws_ebs/templates/aws-ebs-csi-nodeservice.yml.j2
  5. 3
      roles/kubernetes-apps/persistent_volumes/azuredisk-csi/templates/azure-csi-storage-class.yml.j2

1
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'

1
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

3
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:

3
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:

3
roles/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
Loading…
Cancel
Save