Adding extension class to build and push Operator image and more (#1589)

* script to build and push operator image to ocir for jenkins to work

* Revert "script to build and push operator image to ocir for jenkins to work"

This reverts commit a83f700.

* script to build and push operator image to ocir for jenkins to work

* Synchronization for one-time initialization logic

* Add try finally

* moving constants to a interface

* Adding imagebuilder

* adding imagebuilder class

* build and push operator image in extension

* fix command run

* use BRANCH env var for JENKINS

* fix image name for Jenkins

* remove double REPO_NAME

* remove double REPO_NAME

* fix domain image name

* fix domain image name

* fix domain image name

* checking operator helm release status

* workaround for image check

* adding assertions for checking docker image and helm release status

* address review comments

Co-authored-by: Ryan Eberhard <[email protected]>

Author: vanajamukkara

new-integration-tests/pom.xml

@@ -176,17 +176,6 @@
                             <skip>${skipITs}</skip>
                         </configuration>
                     </execution>
-                    <execution>
-                        <id>buildoperator</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>exec</goal>
-                        </goals>
-                        <configuration>
-                            <skip>${skipITs}</skip>
-                            <executable>../buildDockerImage.sh</executable>
-                        </configuration>
-                    </execution>
                 </executions>
             </plugin>
             <plugin>

new-integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiDomain.java

@@ -6,7 +6,6 @@
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Arrays;
-import java.util.Base64;
 import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
@@ -48,11 +47,21 @@
 
 import static java.util.concurrent.TimeUnit.MINUTES;
 import static java.util.concurrent.TimeUnit.SECONDS;
+import static oracle.weblogic.kubernetes.TestConstants.OPERATOR_CHART_DIR;
+import static oracle.weblogic.kubernetes.TestConstants.OPERATOR_RELEASE_NAME;
+import static oracle.weblogic.kubernetes.TestConstants.REPO_DUMMY_VALUE;
+import static oracle.weblogic.kubernetes.TestConstants.REPO_EMAIL;
+import static oracle.weblogic.kubernetes.TestConstants.REPO_NAME;
+import static oracle.weblogic.kubernetes.TestConstants.REPO_PASSWORD;
+import static oracle.weblogic.kubernetes.TestConstants.REPO_REGISTRY;
+import static oracle.weblogic.kubernetes.TestConstants.REPO_SECRET_NAME;
+import static oracle.weblogic.kubernetes.TestConstants.REPO_USERNAME;
 import static oracle.weblogic.kubernetes.actions.ActionConstants.ARCHIVE_DIR;
 import static oracle.weblogic.kubernetes.actions.ActionConstants.MODEL_DIR;
 import static oracle.weblogic.kubernetes.actions.ActionConstants.WDT_VERSION;
 import static oracle.weblogic.kubernetes.actions.ActionConstants.WIT_BUILD_DIR;
 import static oracle.weblogic.kubernetes.actions.TestActions.buildAppArchive;
+import static oracle.weblogic.kubernetes.actions.TestActions.createDockerConfigJson;
 import static oracle.weblogic.kubernetes.actions.TestActions.createDomainCustomResource;
 import static oracle.weblogic.kubernetes.actions.TestActions.createMiiImage;
 import static oracle.weblogic.kubernetes.actions.TestActions.createSecret;
@@ -65,18 +74,20 @@
 import static oracle.weblogic.kubernetes.actions.TestActions.deleteServiceAccount;
 import static oracle.weblogic.kubernetes.actions.TestActions.dockerLogin;
 import static oracle.weblogic.kubernetes.actions.TestActions.dockerPush;
-import static oracle.weblogic.kubernetes.actions.TestActions.helmList;
+import static oracle.weblogic.kubernetes.actions.TestActions.getOperatorImageName;
 import static oracle.weblogic.kubernetes.actions.TestActions.installOperator;
 import static oracle.weblogic.kubernetes.actions.TestActions.uninstallOperator;
-import static oracle.weblogic.kubernetes.assertions.TestAssertions.dockerImageExists;
+import static oracle.weblogic.kubernetes.assertions.TestAssertions.doesImageExist;
 import static oracle.weblogic.kubernetes.assertions.TestAssertions.domainExists;
+import static oracle.weblogic.kubernetes.assertions.TestAssertions.isHelmReleaseDeployed;
 import static oracle.weblogic.kubernetes.assertions.TestAssertions.operatorIsRunning;
 import static oracle.weblogic.kubernetes.assertions.TestAssertions.podExists;
 import static oracle.weblogic.kubernetes.assertions.TestAssertions.podReady;
 import static oracle.weblogic.kubernetes.assertions.TestAssertions.serviceExists;
 import static oracle.weblogic.kubernetes.utils.FileUtils.checkDirectory;
 import static org.awaitility.Awaitility.with;
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
@@ -86,14 +97,6 @@
 @IntegrationTest
 class ItMiiDomain implements LoggedTest {
 
-  // operator constants
-  private static final String OPERATOR_RELEASE_NAME = "weblogic-operator";
-  private static final String OPERATOR_CHART_DIR =
-      "../kubernetes/charts/weblogic-operator";
-  private static final String OPERATOR_IMAGE =
-      "oracle/weblogic-kubernetes-operator:3.0.0";
-  //"phx.ocir.io/weblogick8s/weblogic-kubernetes-operator:develop";
-
   // mii constants
   private static final String WDT_MODEL_FILE = "model1-wls.yaml";
   private static final String MII_IMAGE_NAME = "mii-image";
@@ -108,14 +111,10 @@ class ItMiiDomain implements LoggedTest {
   private static String opNamespace = null;
   private static String domainNamespace = null;
   private static ConditionFactory withStandardRetryPolicy = null;
+  private static String dockerConfigJson = "";
 
   private String domainUid = "domain1";
-  private String repoSecretName = "reposecret";
   private String miiImage = null;
-  private String repoRegistry = "dummy";
-  private String repoUserName = "dummy";
-  private String repoPassword = "dummy";
-  private String repoEmail = "dummy";
 
   /**
    * Install Operator.
@@ -148,6 +147,33 @@ public static void initAll(@Namespaces(2) List<String> namespaces) {
                 .name(serviceAccountName))));
     logger.info("Created service account: {0}", serviceAccountName);
 
+    // get Operator image name
+    String operatorImage = getOperatorImageName();
+    assertFalse(operatorImage.isEmpty(), "Operator image name can not be empty");
+    logger.info("Operator image name {0}", operatorImage);
+
+    // Create docker registry secret in the operator namespace to pull the image from repository
+    logger.info("Creating docker registry secret in namespace {0}", opNamespace);
+    JsonObject dockerConfigJsonObject = createDockerConfigJson(
+        REPO_USERNAME, REPO_PASSWORD, REPO_EMAIL, REPO_REGISTRY);
+    dockerConfigJson = dockerConfigJsonObject.toString();
+
+    // Create the V1Secret configuration
+    V1Secret repoSecret = new V1Secret()
+        .metadata(new V1ObjectMeta()
+            .name(REPO_SECRET_NAME)
+            .namespace(opNamespace))
+        .type("kubernetes.io/dockerconfigjson")
+        .putDataItem(".dockerconfigjson", dockerConfigJson.getBytes());
+
+    boolean secretCreated = assertDoesNotThrow(() -> createSecret(repoSecret),
+        String.format("createSecret failed for %s", REPO_SECRET_NAME));
+    assertTrue(secretCreated, String.format("createSecret failed while creating secret %s in namespace",
+                  REPO_SECRET_NAME, opNamespace));
+
+    // map with secret
+    Map<String, Object> secretNameMap = new HashMap<String, Object>();
+    secretNameMap.put("name", REPO_SECRET_NAME);
     // helm install parameters
     opHelmParams = new HelmParams()
         .releaseName(OPERATOR_RELEASE_NAME)
@@ -158,7 +184,8 @@ public static void initAll(@Namespaces(2) List<String> namespaces) {
     OperatorParams opParams =
         new OperatorParams()
             .helmParams(opHelmParams)
-            .image(OPERATOR_IMAGE)
+            .image(operatorImage)
+            .imagePullSecrets(secretNameMap)
             .domainNamespaces(Arrays.asList(domainNamespace))
             .serviceAccount(serviceAccountName);
 
@@ -168,9 +195,14 @@ public static void initAll(@Namespaces(2) List<String> namespaces) {
         String.format("Operator install failed in namespace %s", opNamespace));
     logger.info("Operator installed in namespace {0}", opNamespace);
 
-    // list helm releases
-    logger.info("List helm releases in namespace {0}", opNamespace);
-    helmList(opHelmParams);
+    // list helm releases matching Operator release name in operator namespace
+    logger.info("Checking Operator release {0} status in namespace {1}",
+        OPERATOR_RELEASE_NAME, opNamespace);
+    assertTrue(isHelmReleaseDeployed(OPERATOR_RELEASE_NAME, opNamespace),
+        String.format("Operator release %s is not in deployed status in namespace %s",
+            OPERATOR_RELEASE_NAME, opNamespace));
+    logger.info("Operator release {0} status is deployed in namespace {1}",
+        OPERATOR_RELEASE_NAME, opNamespace);
 
     // check operator is running
     logger.info("Check Operator pod is running in namespace {0}", opNamespace);
@@ -200,36 +232,25 @@ public void testCreateMiiDomain() {
     miiImage = createImageAndVerify();
 
     // push the image to OCIR to make the test work in multi node cluster
-    if (System.getenv("REPO_REGISTRY") != null && System.getenv("REPO_USERNAME") != null
-        && System.getenv("REPO_PASSWORD") != null && System.getenv("REPO_EMAIL") != null) {
-      repoRegistry = System.getenv("REPO_REGISTRY");
-      repoUserName = System.getenv("REPO_USERNAME");
-      repoPassword = System.getenv("REPO_PASSWORD");
-      repoEmail = System.getenv("REPO_EMAIL");
-
+    if (!REPO_USERNAME.equals(REPO_DUMMY_VALUE)) {
       logger.info("docker login");
-      assertTrue(dockerLogin(repoRegistry, repoUserName, repoPassword), "docker login failed");
+      assertTrue(dockerLogin(REPO_REGISTRY, REPO_USERNAME, REPO_PASSWORD), "docker login failed");
 
       logger.info("docker push image {0} to OCIR", miiImage);
       assertTrue(dockerPush(miiImage), String.format("docker push failed for image %s", miiImage));
     }
 
-    // create docker registry secret in the domain namespace to pull the image from OCIR
-    JsonObject dockerConfigJsonObject = getDockerConfigJson(
-        repoUserName, repoPassword, repoEmail, repoRegistry);
-    String dockerConfigJson = dockerConfigJsonObject.toString();
-
     // Create the V1Secret configuration
     V1Secret repoSecret = new V1Secret()
         .metadata(new V1ObjectMeta()
-            .name(repoSecretName)
+            .name(REPO_SECRET_NAME)
             .namespace(domainNamespace))
         .type("kubernetes.io/dockerconfigjson")
         .putDataItem(".dockerconfigjson", dockerConfigJson.getBytes());
 
     boolean secretCreated = assertDoesNotThrow(() -> createSecret(repoSecret),
-        String.format("createSecret failed for %s", repoSecretName));
-    assertTrue(secretCreated, String.format("createSecret failed while creating secret %s", repoSecretName));
+        String.format("createSecret failed for %s", REPO_SECRET_NAME));
+    assertTrue(secretCreated, String.format("createSecret failed while creating secret %s", REPO_SECRET_NAME));
 
     // create secret for admin credentials
     logger.info("Create secret for admin credentials");
@@ -269,7 +290,7 @@ public void testCreateMiiDomain() {
             .domainHomeSourceType("FromModel")
             .image(miiImage)
             .addImagePullSecretsItem(new V1LocalObjectReference()
-                .name(repoSecretName))
+                .name(REPO_SECRET_NAME))
             .webLogicCredentialsSecret(new V1SecretReference()
                 .name(adminSecretName)
                 .namespace(domainNamespace))
@@ -287,7 +308,7 @@ public void testCreateMiiDomain() {
                 .adminService(new AdminService()
                     .addChannelsItem(new Channel()
                         .channelName("default")
-                        .nodePort(30711))))
+                        .nodePort(0))))
             .addClustersItem(new Cluster()
                 .clusterName("cluster-1")
                 .replicas(replicaCount)
@@ -413,6 +434,9 @@ private String createImageAndVerify() {
     DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
     Date date = new Date();
     final String imageTag = dateFormat.format(date) + "-" + System.currentTimeMillis();
+    // Add repository name in image name for Jenkins runs
+    final String imageName = REPO_USERNAME.equals(REPO_DUMMY_VALUE) ? MII_IMAGE_NAME : REPO_NAME + MII_IMAGE_NAME;
+    final String image = imageName + ":" + imageTag;
 
     // build the model file list
     final List<String> modelList = Collections.singletonList(MODEL_DIR + "/" + WDT_MODEL_FILE);
@@ -431,25 +455,29 @@ private String createImageAndVerify() {
     env.put("WLSIMG_BLDDIR", WIT_BUILD_DIR);
 
     // build an image using WebLogic Image Tool
-    logger.info("Create image {0}:{1} using model directory {2}",
-        MII_IMAGE_NAME, imageTag, MODEL_DIR);
+    logger.info("Create image {0} using model directory {1}", image, MODEL_DIR);
     boolean result = createMiiImage(
         defaultWitParams()
-            .modelImageName(MII_IMAGE_NAME)
+            .modelImageName(imageName)
             .modelImageTag(imageTag)
             .modelFiles(modelList)
             .modelArchiveFiles(archiveList)
             .wdtVersion(WDT_VERSION)
             .env(env)
             .redirect(true));
 
-    assertTrue(result, String.format("Failed to create the image %s using WebLogic Image Tool", MII_IMAGE_NAME));
+    assertTrue(result, String.format("Failed to create the image %s using WebLogic Image Tool", image));
 
-    // check image exists
-    assertTrue(dockerImageExists(MII_IMAGE_NAME, imageTag),
-        String.format("Image %s doesn't exist", MII_IMAGE_NAME + ":" + imageTag));
+    /* Check image exists using docker images | grep image tag.
+     * Tag name is unique as it contains date and timestamp.
+     * This is a workaround for the issue on Jenkins machine
+     * as docker images imagename:imagetag is not working and
+     * the test fails even though the image exists.
+     */
+    assertTrue(doesImageExist(imageTag),
+        String.format("Image %s doesn't exist", image));
 
-    return MII_IMAGE_NAME + ":" + imageTag;
+    return image;
   }
 
 
@@ -498,19 +526,4 @@ private void checkServiceCreated(String serviceName) {
 
   }
 
-  private static JsonObject getDockerConfigJson(String username, String password, String email, String registry) {
-    JsonObject authObject = new JsonObject();
-    authObject.addProperty("username", username);
-    authObject.addProperty("password", password);
-    authObject.addProperty("email", email);
-    String auth = username + ":" + password;
-    String authEncoded = Base64.getEncoder().encodeToString(auth.getBytes());
-    System.out.println("auth encoded: " + authEncoded);
-    authObject.addProperty("auth", authEncoded);
-    JsonObject registryObject = new JsonObject();
-    registryObject.add(registry, authObject);
-    JsonObject configJsonObject = new JsonObject();
-    configJsonObject.add("auths", registryObject);
-    return configJsonObject;
-  }
 }