Merge remote-tracking branch 'origin/main' into release/4.0

Author: rjeberhard

Jenkinsfile.oke

@@ -31,7 +31,8 @@ pipeline {
         weblogick8s_tenancy_ocid = 'WK8_TENANCY_OCID'
         weblogick8s_qa_compartment_ocid = 'WK8_QA_COMP_OCID'
         wkobuild_user_ocid = 'WKOBUILD_USER_OCID'
-        wkobuild_public_cert = 'WKOBUILD_PUBLIC_CERT'
+        wko_oke_test_sshpubcert = 'OKE_PUB_CERT'
+        oke_test_ssh_pk = 'oke_test_ssh_pk'
 
         OKE_CLUSTER='true'
 
@@ -205,7 +206,7 @@ pipeline {
                         TENANCY_OCID = credentials("${weblogick8s_tenancy_ocid}")
                         COMPARTMENT_OCID = credentials("${weblogick8s_qa_compartment_ocid}")
                         USER_OCID = credentials("${wkobuild_user_ocid}")
-                        WKOBUILD_PUBLIC_CERT = credentials("${wkobuild_public_cert}")
+                        WKOBUILD_PUBLIC_CERT = credentials("${wko_oke_test_sshpubcert}")
                     }
                     steps {
                         withCredentials([file(credentialsId: 'oci_pk_file', variable: 'oci_private_key')]) {
@@ -239,6 +240,7 @@ pipeline {
 
                         #export IMAGE_TAG_WEBLOGIC="12.2.1.4"
                         #export IMAGE_TAG_FMWINFRA="12.2.1.4"
+                        ssh_pubkey=`cat ${WKOBUILD_PUBLIC_CERT}`
 
                         #################
                         echo "Generating property file oci.prop for terraform scripts"
@@ -259,7 +261,7 @@ pipeline {
                         nodepool.shape=${NODE_SHAPE}
                         nodepool.imagename=${IMAGE_ID}
                         k8s.version=v${KUBE_VERSION}
-                        nodepool.ssh.pubkey=${WKOBUILD_PUBLIC_CERT}
+                        nodepool.ssh.pubkey=${ssh_pubkey}
                         terraform.installdir=${WORKSPACE}/terraform/terraforminstall
 EOF
 
@@ -424,6 +426,7 @@ EOF
                         OCIR_USERNAME = credentials("${ocir_username_creds}")
                         OCIR_PASSWORD = credentials("${ocir_password_creds}")
                         OCIR_EMAIL = credentials("${ocir_email_creds}")
+                        OKE_SSH_PRIVATE_KEY = credentials("${oke_test_ssh_pk}")
                         BASE_IMAGES_REPO_USERNAME = credentials("${ocir_username_creds}")
                         BASE_IMAGES_REPO_PASSWORD = credentials("${ocir_password_creds}")
                         BASE_IMAGES_REPO_EMAIL = credentials("${ocir_email_creds}")
@@ -444,6 +447,8 @@ EOF
                             export OCI_CLI_CONFIG_FILE=${WORKSPACE}/oci/config
                             export OCI_CLI_PROFILE=WKOBUILD
                             mkdir -m777 -p "${WORKSPACE}/.mvn"
+                            cp ${OKE_SSH_PRIVATE_KEY} ${WORKSPACE}/rsaokepk
+                            chmod 600 ${WORKSPACE}/rsaokepk
                             touch ${WORKSPACE}/.mvn/maven.config
                             export KUBECONFIG=${kubeconfig_file}
                             NODE_IP=`kubectl get nodes -o wide| awk '{print $7}'| tail -n+3`
@@ -457,6 +462,9 @@ EOF
                             NODE_IP=`kubectl get nodes -o wide| awk '{print $7}'| head -n2 | tail -n1`
                             echo "second node external IP ${NODE_IP}"
                             export NODE_IP=${NODE_IP}
+                            echo "expand disk volume for nodes"
+                            ssh -o StrictHostKeyChecking=no -i ${WORKSPACE}/rsaokepk opc@${K8S_NODEPORT_HOST} 'sudo /usr/libexec/oci-growfs -y'
+                            ssh -o StrictHostKeyChecking=no -i ${WORKSPACE}/rsaokepk opc@${NODE_IP} 'sudo /usr/libexec/oci-growfs -y'
                             mt_privateip_id=`oci fs mount-target  list --compartment-id=${compartment_ocid}  --display-name=${clusterName}-mt --availability-domain=${availability_domain} | jq -r '.data[] | ."private-ip-ids"[]'`
 
                             mt_private_ip=`oci network private-ip get --private-ip-id "${mt_privateip_id}" | jq -r '.data | ."ip-address"'`

integration-tests/src/test/java/oracle/weblogic/kubernetes/actions/impl/Operator.java

@@ -19,6 +19,7 @@
 import static oracle.weblogic.kubernetes.TestConstants.OPERATOR_RELEASE_NAME;
 import static oracle.weblogic.kubernetes.actions.impl.primitive.Kubernetes.getContainerImage;
 import static oracle.weblogic.kubernetes.actions.impl.primitive.Kubernetes.patchDeployment;
+import static oracle.weblogic.kubernetes.utils.CommonTestUtils.getImageBuilderExtraArgs;
 import static oracle.weblogic.kubernetes.utils.ThreadSafeLogger.getLogger;
 
 /**
@@ -94,7 +95,7 @@ public static String getImageName() {
    * @return true on success
    */
   public static boolean buildImage(String image) {
-    return Image.createImage("..", image, "");
+    return Image.createImage("..", image, getImageBuilderExtraArgs());
   }
 
   /**

integration-tests/src/test/resources/oke/terraform/node-pool.tf

@@ -27,6 +27,7 @@ resource "oci_containerengine_node_pool" "tfsample_node_pool" {
   node_source_details {
        image_id = var.node_pool_node_image_name
        source_type = "image"
+       boot_volume_size_in_gbs = "200"
   }
 
   # Optional