[ST] Fix env vars in YAML installation of CO and create co-namespace correctly (#12186)

Signed-off-by: Lukas Kral <lukywill16@gmail.com>

Author: im-konge

systemtest/src/main/java/io/strimzi/systemtest/resources/operator/SetupClusterOperator.java

@@ -5,11 +5,11 @@
 package io.strimzi.systemtest.resources.operator;
 
 import io.fabric8.kubernetes.api.model.Namespace;
-import io.fabric8.kubernetes.api.model.NamespaceBuilder;
 import io.skodjob.testframe.enums.InstallType;
 import io.skodjob.testframe.installation.InstallationMethod;
 import io.skodjob.testframe.resources.KubeResourceManager;
 import io.strimzi.systemtest.Environment;
+import io.strimzi.systemtest.utils.kubeUtils.NamespaceUtils;
 
 /**
  * Class for handling the installation of ClusterOperator.
@@ -127,12 +127,7 @@ public void createClusterOperatorNamespace() {
             }
         }
 
-        KubeResourceManager.get().createResourceWithWait(new NamespaceBuilder()
-            .withNewMetadata()
-                .withName(clusterOperatorConfiguration.getNamespaceName())
-            .endMetadata()
-            .build()
-        );
+        NamespaceUtils.createNamespaceAndPrepare(clusterOperatorConfiguration.getNamespaceName());
     }
 
     /**

systemtest/src/main/java/io/strimzi/systemtest/resources/operator/YamlInstallation.java

@@ -42,6 +42,7 @@
 import java.io.File;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
@@ -397,7 +398,12 @@ public static void deployClusterOperator(ClusterOperatorConfiguration clusterOpe
 
         // Map the current envVars list to Map for easier manipulation
         Map<String, EnvVar> envVarMap = envVars.stream()
-            .collect(Collectors.toMap(EnvVar::getName, Function.identity()));
+            .collect(Collectors.toMap(
+                EnvVar::getName,
+                Function.identity(),
+                (existing, replacement) -> existing,
+                LinkedHashMap::new
+            ));
 
         // Adding custom evn vars specified by user in installation
         if (clusterOperatorConfiguration.getExtraEnvVars() != null) {