From 927c36bb3883e841f4298547679c4a6fc2c4d8ff Mon Sep 17 00:00:00 2001 From: Gus Parvin Date: Fri, 7 Jun 2024 12:38:26 -0400 Subject: [PATCH] Adjust machine sets to work on ocp 4.16 The machineset no longer works on ocp 4.16. This pr adds in some filters which seem to be additional required configuration that resolves the issue. Refs: - https://issues.redhat.com/browse/OCPQE-22447 Signed-off-by: Gus Parvin --- .../community/openshift-plus-setup/machine-sets.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) 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 13cbe0d2..8093c48d 100644 --- a/policygenerator/policy-sets/community/openshift-plus-setup/machine-sets.yaml +++ b/policygenerator/policy-sets/community/openshift-plus-setup/machine-sets.yaml @@ -77,6 +77,17 @@ spec: - name: tag:Name values: - '{{ (lookup "config.openshift.io/v1" "Infrastructure" "" "cluster").status.infrastructureName }}-worker-sg' + {{- $ocpversion := semver (fromClusterClaim "version.openshift.io") }} + {{- if gt $ocpversion.Minor 15 }} + - filters: + - name: tag:Name + values: + - '{{ (lookup "config.openshift.io/v1" "Infrastructure" "" "cluster").status.infrastructureName }}-node' + - filters: + - name: tag:Name + values: + - '{{ (lookup "config.openshift.io/v1" "Infrastructure" "" "cluster").status.infrastructureName }}-lb' + {{- end }} subnet: filters: - name: tag:Name