[utilities] secrets creation for registry.redhat.io

utilities/src/main/java/cz/xtf/XTFConfiguration.java

@@ -72,6 +72,9 @@ public class XTFConfiguration {
 	private static final String TEMPLATE_REPO = "xtf.config.template.repo";
 	private static final String TEMPLATE_BRANCH = "xtf.config.template.branch";
 
+	private static final String OREG_AUTH = "xtf.config.oreg.auth";
+	private static final String OREG_REGISTRY = "xtf.config.oreg.registry";
+
 	private static final String OPENSTACK_URL = "xtf.config.openstack.url";
 	private static final String OPENSTACK_TENANT = "xtf.config.openstack.tenant";
 	private static final String OPENSTACK_OPEN_SECURITY_GROUP = "xtf.config.openstack.security.group.open";
@@ -174,6 +177,14 @@ public static String routeDomain() {
 		return result;
 	}
 
+	public static String oregAuth() {
+		return get().readValue(OREG_AUTH);
+	}
+
+	public static String oregRegistry() {
+		return get().readValue(OREG_REGISTRY);
+	}
+
 	public static String proxyHost() {
 		return get().readValue(PROXY_HOST);
 	}
@@ -628,6 +639,12 @@ protected static Properties fromEnvironment() {
 				case "FUSE_DISABLE_JOLOKIA":
 					props.setProperty(FUSE_DISABLE_JOLOKIA, entry.getValue());
 					break;
+				case "OREG_AUTH":
+					props.setProperty(OREG_AUTH, entry.getValue());
+					break;
+				case "OREG_REGISTRY":
+					props.setProperty(OREG_REGISTRY, entry.getValue());
+					break;
 				case "OPENSTACK_URL":
 					props.setProperty(OPENSTACK_URL, entry.getValue());
 					break;

utilities/src/main/java/cz/xtf/build/BuildManagerV2.java

@@ -42,6 +42,7 @@ private BuildManagerV2() {
 		if (!TestConfiguration.buildNamespace().equals(TestConfiguration.masterNamespace())) {
 			if (master.getProject(buildNamespace) == null) {
 				master.createProjectRequest();
+				master.createORegSecret();
 			}
 
 			master.addRoleToGroup("system:image-puller", "system:authenticated");

utilities/src/main/java/cz/xtf/manipulation/ProjectHandler.java

@@ -16,6 +16,7 @@
 import static cz.xtf.TestConfiguration.masterNamespace;
 import static cz.xtf.TestConfiguration.masterPassword;
 import static cz.xtf.TestConfiguration.masterUsername;
+
 import static org.apache.commons.lang3.StringUtils.isNotBlank;
 
 /**
@@ -78,6 +79,8 @@ private static void createProject(String project) {
 		// restore original context
 		openshift.setOpenShiftContext(originalContext);
 
+		OpenShiftUtils.master().createORegSecret();
+
 		log.info("action=create-project status=FINISH project={} recreate=true", project);
 	}
 

utilities/src/main/java/cz/xtf/openshift/OpenShiftUtil.java

@@ -10,15 +10,16 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 import java.util.Random;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.BooleanSupplier;
-import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
+import cz.xtf.TestConfiguration;
+import cz.xtf.openshift.builder.SecretBuilder;
+import cz.xtf.openshift.builder.secret.SecretType;
 import cz.xtf.wait.SimpleWaiter;
 import cz.xtf.wait.Waiters;
 import io.fabric8.kubernetes.api.model.ConfigMap;
@@ -29,6 +30,7 @@
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.fabric8.kubernetes.api.model.HorizontalPodAutoscaler;
 import io.fabric8.kubernetes.api.model.KubernetesList;
+import io.fabric8.kubernetes.api.model.LocalObjectReference;
 import io.fabric8.kubernetes.api.model.Node;
 import io.fabric8.kubernetes.api.model.ObjectReference;
 import io.fabric8.kubernetes.api.model.ObjectReferenceBuilder;
@@ -359,6 +361,37 @@ public boolean deleteSecret(Secret secret) {
 		return client.secrets().delete(secret);
 	}
 
+	/**
+	 * Creates the secret needed for an authenticated external registry (e.g. registry.redhat.io ) and adds it to the default and builder service accounts
+	 * Uses the TestConfiguration.oregRegistry and TestConfiguration.oregAuth properties
+	 * @return
+	 */
+	public Secret createORegSecret() {
+		if (TestConfiguration.oregRegistry() != null && !TestConfiguration.oregRegistry().trim().isEmpty()) {
+
+			final String secretName = TestConfiguration.oregRegistry();
+
+			Secret oregSecret = getSecret(secretName);
+			if (oregSecret != null) {
+				deleteSecret(oregSecret);
+			}
+
+			Secret dockerCfg = new SecretBuilder(secretName)
+					.setType(SecretType.DOCKERCFG)
+					.addData(".dockerconfigjson", ("{\"auths\":{\"" + TestConfiguration.oregRegistry() + "\":{\"auth\":\"" + TestConfiguration.oregAuth() + "\"}}}").getBytes())
+					.build();
+			dockerCfg.getMetadata().setLabels(Collections.singletonMap(KEEP_LABEL, "keep"));
+			dockerCfg = createSecret(dockerCfg);
+
+			client().serviceAccounts().withName("builder").edit().addToSecrets(new ObjectReferenceBuilder().withKind("Secret").withName(secretName).build()).done();
+			client().serviceAccounts().withName("default").edit().addToSecrets(new ObjectReferenceBuilder().withKind("Secret").withName(secretName).build()).addToImagePullSecrets(new LocalObjectReference(secretName)).done();
+
+			return dockerCfg;
+		}
+
+		return null;
+	}
+
 	// Services
 	public Service createService(Service service) {
 		return client.services().create(service);

utilities/src/main/java/cz/xtf/openshift/builder/secret/SecretType.java

@@ -7,7 +7,7 @@ public enum SecretType {
 
 	OPAQUE("Opaque"),
 	SERVICE_ACCOUNT("kubernetes.io/service-account-token"),
-	DOCKERCFG("kubernetes.io/dockercfg");
+	DOCKERCFG("kubernetes.io/dockerconfigjson");
 
 	private final String text;