Skip to content

Commit 36bc8b9

Browse files
Merge pull request #51418 from snarayan-redhat/OCPBUGS-2006_tags
OCPBUGS#2006: Added custom tags to example
2 parents 7567b5f + 9492cf2 commit 36bc8b9

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

modules/machineset-yaml-azure.adoc

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,14 +105,17 @@ endif::infra[]
105105
resourceGroup: <infrastructure_id>-rg <1>
106106
sshPrivateKey: ""
107107
sshPublicKey: ""
108+
tags:
109+
- name: <custom_tag_name> <9>
110+
value: <custom_tag_value> <9>
108111
subnet: <infrastructure_id>-<role>-subnet <1> <2>
109112
userDataSecret:
110113
name: worker-user-data <2>
111114
vmSize: Standard_D4s_v3
112115
vnet: <infrastructure_id>-vnet <1>
113116
zone: "1" <8>
114117
ifdef::infra[]
115-
taints: <9>
118+
taints: <10>
116119
- key: node-role.kubernetes.io/infra
117120
effect: NoSchedule
118121
endif::infra[]
@@ -153,11 +156,11 @@ endif::infra[]
153156
<6> Specify an image that is compatible with your instance type. The Hyper-V generation V2 images created by the installation program have a `-gen2` suffix, while V1 images have the same name without the suffix.
154157
<7> Specify the region to place machines on.
155158
<8> Specify the zone within your region to place machines on. Be sure that your region supports the zone that you specify.
159+
<9> Optional: Specify custom tags in your machine set. Provide the tag name in `<custom_tag_name>` field and the corresponding tag value in `<custom_tag_value>` field.
156160
ifdef::infra[]
157-
<9> Specify a taint to prevent user workloads from being scheduled on infra nodes.
161+
<10> Specify a taint to prevent user workloads from being scheduled on infra nodes.
158162
endif::infra[]
159163

160-
161164
ifeval::["{context}" == "creating-infrastructure-machinesets"]
162165
:!infra:
163166
endif::[]

storage/container_storage_interface/persistent-storage-csi-aws-efs.adoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ If you have problems setting up dynamic provisioning, see xref:../../storage/con
5353
.Additional resources
5454
* xref:../../storage/container_storage_interface/persistent-storage-csi-aws-efs.adoc#efs-create-volume_persistent-storage-csi-aws-efs[Creating and configuring access to AWS EFS volume(s)]
5555
* xref:../../storage/container_storage_interface/persistent-storage-csi-aws-efs.adoc#storage-create-storage-class_persistent-storage-csi-aws-efs[Creating the AWS EFS storage class]
56+
5657
// Undefine {StorageClass} attribute, so that any mistakes are easily spotted
5758
:!StorageClass:
5859

0 commit comments

Comments
 (0)