Skip to content

Commit 54783b8

Browse files
authored
[ST] Fix FIPS check in case that ConfigMap is missing (strimzi#12546)
Signed-off-by: Lukas Kral <lukywill16@gmail.com>
1 parent 34b967b commit 54783b8

1 file changed

Lines changed: 10 additions & 2 deletions

File tree

systemtest/src/main/java/io/strimzi/test/k8s/KubeClusterResource.java

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
*/
55
package io.strimzi.test.k8s;
66

7+
import io.fabric8.kubernetes.api.model.ConfigMap;
78
import io.skodjob.kubetest4j.resources.KubeResourceManager;
89
import io.strimzi.test.k8s.cluster.Kind;
910
import io.strimzi.test.k8s.cluster.KubeCluster;
@@ -99,8 +100,15 @@ public boolean isMinikube() {
99100

100101
public boolean fipsEnabled() {
101102
if (isOpenShift()) {
102-
return KubeResourceManager.get().kubeClient().getClient().configMaps()
103-
.inNamespace("kube-system").withName("cluster-config-v1").get().getData().get("install-config").contains("fips: true");
103+
ConfigMap configMap = KubeResourceManager.get().kubeClient().getClient().configMaps()
104+
.inNamespace("kube-system").withName("cluster-config-v1").get();
105+
106+
if (configMap != null) {
107+
return configMap.getData().get("install-config").contains("fips: true");
108+
} else {
109+
LOGGER.warn("No 'cluster-config-v1' ConfigMap found in 'kube-system' Namespace, going to assume it's not FIPS enabled cluster");
110+
return false;
111+
}
104112
}
105113
return false;
106114
}

0 commit comments

Comments
 (0)