Use unique subnet name for OCP 4.16 machinesets

This is required to work with 4.16 clusters. It was missed or not required for some reason in the first attempt. Signed-off-by: Gus Parvin <[email protected]> (cherry picked from commit 912c4e9)
stolostron · Jun 21, 2024 · e9e7512 · e9e7512
1 parent b77de12
commit e9e7512
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/policygenerator/policy-sets/community/openshift-plus-setup/machine-sets.yaml b/policygenerator/policy-sets/community/openshift-plus-setup/machine-sets.yaml
@@ -92,7 +92,10 @@ spec:
                     filters:
                     - name: tag:Name
                       values:
-                      - {{ (lookup "config.openshift.io/v1" "Infrastructure" "" "cluster").status.infrastructureName }}-private-{{ list (lookup "config.openshift.io/v1" "Infrastructure" "" "cluster").status.platformStatus.aws.region $zone | join "" }}
+                      - '{{ (lookup "config.openshift.io/v1" "Infrastructure" "" "cluster").status.infrastructureName }}-private-{{ list (lookup "config.openshift.io/v1" "Infrastructure" "" "cluster").status.platformStatus.aws.region $zone | join "" }}'
+                  {{- if gt $ocpversion.Minor 15 }}
+                      - '{{ (lookup "config.openshift.io/v1" "Infrastructure" "" "cluster").status.infrastructureName }}-subnet-private-{{ list (lookup "config.openshift.io/v1" "Infrastructure" "" "cluster").status.platformStatus.aws.region $zone | join "" }}'
+                  {{- end }}
                   tags:
                   - name: 'kubernetes.io/cluster/{{ (lookup "config.openshift.io/v1" "Infrastructure" "" "cluster").status.infrastructureName }}'
                     value: owned