From d391c50149bd13e1fb89bf69919d9c76f4181d2a Mon Sep 17 00:00:00 2001 From: Miroslav Novak Date: Wed, 4 Aug 2021 12:36:13 +0200 Subject: [PATCH] Fix - ignore openshift-service-ca.crt config map - needed for OCP 4.8+ to avoid failures during cleaning up of namespace - see issue https://github.com/xtf-cz/xtf/issues/449 --- core/src/main/java/cz/xtf/core/openshift/OpenShift.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/cz/xtf/core/openshift/OpenShift.java b/core/src/main/java/cz/xtf/core/openshift/OpenShift.java index b2e7f464..35875708 100644 --- a/core/src/main/java/cz/xtf/core/openshift/OpenShift.java +++ b/core/src/main/java/cz/xtf/core/openshift/OpenShift.java @@ -1096,13 +1096,14 @@ public List getConfigMaps() { } /** - * Retrieves all configmaps but "kube-root-ca.crt" which is created out of the box. + * Retrieves all configmaps but "kube-root-ca.crt" and "openshift-service-ca.crt" which are created out of the box. * * @return List of configmaps created by user */ public List getUserConfigMaps() { return configMaps().withLabelNotIn(OpenShift.KEEP_LABEL, "", "true").list().getItems().stream() .filter(cm -> !cm.getMetadata().getName().equals("kube-root-ca.crt")) + .filter(cm -> !cm.getMetadata().getName().equals("openshift-service-ca.crt")) .collect(Collectors.toList()); }