From 912c4e91ab69b72d3973723eae49af4d56e12f4d Mon Sep 17 00:00:00 2001 From: Gus Parvin Date: Thu, 13 Jun 2024 17:11:09 -0400 Subject: [PATCH] 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 --- .../community/openshift-plus-setup/machine-sets.yaml | 5 ++++- 1 file changed, 4 insertions(+), 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 index 8093c48d..9e87cd0e 100644 --- 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