Merge branch 'xc-123395' into 'main'

backport MR 4862 to main See merge request weblogic-cloud/weblogic-kubernetes-operator!4867
oracle · Nov 14, 2024 · 0ff4509 · 0ff4509
2 parents d8f3db9 + fe60ba8
commit 0ff4509
Show file tree

Hide file tree

Showing 79 changed files with 5,122 additions and 7 deletions.
diff --git a/Jenkinsfile.ocne b/Jenkinsfile.ocne
@@ -101,7 +101,6 @@ pipeline {
                description: 'oci image id for node pool, find image OCID for your region from https://docs.oracle.com/iaas/images/',
                //defaultValue7.6: 'ocid1.image.oc1.phx.aaaaaaaancucg25pze6m52agxwxmmfszvsdnhp3kvim53pts2tw6mik4xtha'
                defaultValue: 'ocid1.image.oc1.phx.aaaaaaaaaizmtmozeudeeuq7o5ir7dkl2bkxbbb3tgomshqbqn6jpomrsjza'
-
         )
         string(name: 'KUBECTL_VERSION',
                description: 'kubectl version',

diff --git a/Jenkinsfile.ocne19 b/Jenkinsfile.ocne19
diff --git a/...ration-tests/src/test/java/oracle/weblogic/kubernetes/extensions/InitializationTasks.java b/...ration-tests/src/test/java/oracle/weblogic/kubernetes/extensions/InitializationTasks.java
@@ -325,8 +325,7 @@ public void beforeAll(ExtensionContext context) {
 
         // set initialization success to true, not counting the istio installation as not all tests use istio
         isInitializationSuccessful = true;
-        if ((!OKD && !OCNE && !CRIO)
-            || (OCNE && !CRIO && !assertDoesNotThrow(() -> Namespace.exists("istio-system")))) {
+        if (!OKD && !CRIO) {
           logger.info("Installing istio before any test suites are run");
           installIstio();
         }
@@ -379,11 +378,11 @@ public void close() {
     if (SKIP_CLEANUP) {
       logger.info("Skipping RESULTS_ROOT clean up after test execution");
     } else {
-      if (!OKD && !OCNE && !CRIO) {
+      if (!OKD && !CRIO) {
         logger.info("Uninstall istio after all test suites are run");
         uninstallIstio();
       }
-      if (!OKD && !OKE_CLUSTER && !OCNE && !CRIO) {
+      if (!OKD && !OKE_CLUSTER && !CRIO) {
         logger.info("Delete istio-system namespace after all test suites are run");
         deleteNamespace("istio-system");
         deleteNamespace(ORACLE_OPERATOR_NS);

diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/utils/IstioUtils.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/utils/IstioUtils.java
@@ -104,6 +104,8 @@ public static void installIstio() {
       logger.info("replace istio installation hub in File {0}", installScript);
       assertDoesNotThrow(() -> replaceStringInFile(installScript, "gcr.io", ocneIstioRepo),
           String.format("Failed to replace string in File %s", installScript));
+      assertDoesNotThrow(() -> replaceStringInFile(installScript, "--auth=instance_principal", " "),
+          String.format("Failed to replace string in File %s", installScript));
     }
     String arch = "linux-amd64";
     if (ARM) {

diff --git a/integration-tests/src/test/resources/ocne/ocne.create.sh b/integration-tests/src/test/resources/ocne/ocne.create.sh
@@ -0,0 +1,241 @@
+#!/bin/bash
+# Copyright (c) 2024, Oracle and/or its affiliates.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+
+prop() {
+    grep "${1}" ${propsFile}| grep -v "#" | cut -d'=' -f2
+}
+
+generateTFVarFile() {
+    tfVarsFile=${terraformVarDir}/terraform.tfvars
+    rm -f ${tfVarsFile}
+    cp ${terraformVarDir}/terraform.tfvars.template $tfVarsFile
+    chmod 777 $tfVarsFile
+
+    sed -i -e "s:@OCI_TENANCY_ID@:${tenancy_id}:g" ${tfVarsFile}
+    sed -i -e "s:@OCI_COMPARTMENT_ID@:${compartment_id}:g" ${tfVarsFile}
+    sed -i -e "s:@OCI_USER_ID@:${user_id}:g" ${tfVarsFile}
+    sed -i -e "s/@OCI_FINGERPRINT@/"${fingerprint}"/g" ${tfVarsFile}
+    sed -i -e "s:@OCI_API_PRIVATE_KEY_PATH@:${api_private_key_path}:g" ${tfVarsFile}
+
+    sed -i -e "s:@OCI_REGION@:${region}:g" ${tfVarsFile}
+    sed -i -e "s/@OCI_AVAILABILITY_DOMAIN_ID@/"${availability_domain_id}"/g" ${tfVarsFile}
+    sed -i -e "s:@OCI_INSTANCE_PREFIX@:${prefix}:g" ${tfVarsFile}
+
+    sed -i -e "s:@OCI_DEPLOY_NETWORKING@:${deploy_networking}:g" ${tfVarsFile}
+    sed -i -e "s:@OCI_SUBNET_ID@:${subnet_id}:g" ${tfVarsFile}
+    sed -i -e "s:@OCI_VCN_ID@:${vcn_id}:g" ${tfVarsFile}
+
+    sed -i -e "s:@OCI_SSH_PUBLIC_KEY_PATH@:${ssh_public_key_path}:g" ${tfVarsFile}
+    sed -i -e "s:@OCI_SSH_PRIVATE_KEY_PATH@:${ssh_private_key_path}:g" ${tfVarsFile}
+
+    sed -i -e "s:@OCI_ENABLE_BASTION@:${enable_bastion}:g" ${tfVarsFile}
+
+    sed -i -e "s:@OCI_VIRTUAL_IP@:${virtual_ip}:g" ${tfVarsFile}
+
+    sed -i -e "s:@OCNE_CONTROL_PLANE_NODE_COUNT@:${control_plane_node_count}:g" ${tfVarsFile}
+    sed -i -e "s:@OCNE_WORKER_NODE_COUNT@:${worker_node_count}:g" ${tfVarsFile}
+    sed -i -e "s:@OCNE_ENVIRONMENT_NAME@:${environment_name}:g" ${tfVarsFile}
+    sed -i -e "s:@OCNE_K8S_CLUSTER_NAME@:${kubernetes_name}:g" ${tfVarsFile}
+
+    sed -i -e "s:@OCNE_VERSION@:${ocne_version}:g" ${tfVarsFile}
+
+    sed -i -e "s#@HTTP_PROXY@#${http_proxy}#g" ${tfVarsFile}
+    sed -i -e "s:@NO_PROXY@:${no_proxy}:g" ${tfVarsFile}
+
+    echo "Generated TFVars file [${tfVarsFile}]"
+    cat "${tfVarsFile}"
+}
+
+setupTerraform() {
+    mkdir ${terraformDir}
+    cd ${terraformDir}
+    if [[ "${OSTYPE}" == "darwin"* ]]; then
+      os_type="darwin"
+    elif [[ "${OSTYPE}" == "linux"* ]]; then
+       os_type="linux"
+    else
+       echo "Unsupported OS"
+    fi
+    curl -O https://releases.hashicorp.com/terraform/1.8.1/terraform_1.8.1_${os_type}_${platform}64.zip
+    unzip terraform_1.8.1_${os_type}_${platform}64.zip
+    chmod +x ${terraformDir}/terraform
+
+    # install yq
+    wget https://github.com/mikefarah/yq/releases/download/v4.35.2/yq_${os_type}_${platform}64.tar.gz
+    tar -zxvf  yq_${os_type}_${platform}64.tar.gz
+    mv yq_${os_type}_${platform}64 yq
+
+    export PATH=${terraformDir}:${PATH}
+}
+
+deleteOlderVersionTerraformOCIProvider() {
+    if [ -d ~/.terraform.d/plugins ]; then
+        echo "Deleting older version of terraform plugins dir"
+        rm -rf ~/.terraform.d/plugins
+    fi
+    if [ -d ${terraformVarDir}/.terraform ]; then
+        rm -rf ${terraformVarDir}/.terraform
+    fi
+    if [ -e ~/.terraformrc ]; then
+      rm ~/.terraformrc
+    fi
+}
+
+createCluster () {
+    cd ${terraformVarDir}
+    echo "terraform init -var-file=${terraformVarDir}/terraform.tfvars"
+    terraform init -var-file=${terraformVarDir}/terraform.tfvars
+    echo "terraform plan -var-file=${terraformVarDir}/terraform.tfvars"
+    terraform plan -var-file=${terraformVarDir}/terraform.tfvars
+    echo "terraform apply -auto-approve -var-file=${terraformVarDir}/terraform.tfvars"
+    terraform apply -auto-approve -var-file=${terraformVarDir}/terraform.tfvars
+}
+
+checkKubernetesCliConnection() {
+    echo "Confirming ${KUBERNETES_CLI:-kubectl} can connect to the server..."
+
+    # Get the OCNE cluster control node private IP
+    echo "command to get k8s_master_instance_id: oci compute instance list --compartment-id=${compartment_id} --display-name=${prefix}-control-plane-001 |jq -r '.data[] | select(."lifecycle-state" == "RUNNING") | ."id"'"
+    k8s_master_instance_id=`oci compute instance list --compartment-id=${compartment_id} --display-name=${prefix}-control-plane-001 |jq -r '.data[] | select(."lifecycle-state" == "RUNNING") | ."id"'`
+    echo "command to get k8s_master_instance_private_ip: oci compute instance list-vnics --compartment-id=${compartment_id} --instance-id=${k8s_master_instance_id} |jq -r '.data[]."private-ip"'"
+    k8s_master_instance_private_ips=`oci compute instance list-vnics --compartment-id=${compartment_id} --instance-id=${k8s_master_instance_id} |jq -r '.data[]."private-ip"'`
+
+    if [ -z "$k8s_master_instance_private_ips" ]; then
+        echo "[ERROR] No active cluster found with name ${kubernetes_name}."
+        exit 1
+    fi
+
+    echo "OCNE K8S cluster control node private ip: ### $k8s_master_instance_private_ips ###"
+    declare -a k8s_master_instance_private_ip=(${k8s_master_instance_private_ips//\n/ })
+
+    local local_no_proxy=${no_proxy}
+    for i in "${k8s_master_instance_private_ip[@]}"; do
+        local_no_proxy+=",$i"
+    done
+    export NO_PROXY="$local_no_proxy"
+    echo "NO_PROXY=$NO_PROXY"
+
+    export KUBECONFIG=${terraformVarDir}/kubeconfig
+    echo "KUBECONFIG=$KUBECONFIG"
+
+    local myline_output=$(${KUBERNETES_CLI:-kubectl} get nodes -o wide 2>&1)
+
+    if echo "$myline_output" | grep -q "Unable to connect to the server: net/http: TLS handshake timeout"; then
+        echo "[ERROR] Unable to connect to the server: net/http: TLS handshake timeout"
+        echo '- could not talk to OCNE cluster, aborting'
+
+        cd "${terraformVarDir}"
+        terraform destroy -auto-approve -var-file="${terraformVarDir}/terraform.tfvars"
+        exit 1
+    fi
+    if echo "$myline_output" | grep -q "couldn't get current server API group"; then
+        echo "[ERROR] Unable to connect to the server: couldn't get current server API group, connection refused"
+        echo '- check errors during OKE cluster creation'
+        echo '- could not talk to OCNE cluster, aborting'
+
+        cd "${terraformVarDir}"
+        terraform destroy -auto-approve -var-file="${terraformVarDir}/terraform.tfvars"
+        exit 1
+    fi
+}
+
+checkClusterRunning() {
+    checkKubernetesCliConnection
+
+    local prefix=${prefix}
+    declare -a myline=($(${KUBERNETES_CLI:-kubectl} get nodes -o wide | grep "${prefix}" | awk '{print $2}'))
+
+    local max=100
+    local count=1
+
+    for (( i = 0; i < ${#myline[@]} ; i++ )); do
+        while [ "${myline[i]}" != "Ready" ] && [ $count -le $max ]; do
+            echo "[ERROR] Some Nodes in the Cluster are not in the Ready Status, sleeping for 10s..."
+            sleep 10
+            myline=($(${KUBERNETES_CLI:-kubectl} get nodes -o wide | grep "${prefix}" | awk '{print $2}'))
+            echo "myline[i]: ${myline[i]}"
+            echo "Status is ${myline[i]} Iter [$count/$max]"
+            count=$((count + 1))
+        done
+    done
+
+    local NODES=$(${KUBERNETES_CLI:-kubectl} get nodes -o wide | grep "${prefix}" | wc -l)
+    local number_nodes=$(($control_plane_node_count + $worker_node_count))
+    if [ "$NODES" -eq "$number_nodes" ]; then
+        echo '- looks good'
+    else
+        echo '- could not talk to OCNE cluster, aborting'
+        cd "${terraformVarDir}"
+        terraform destroy -auto-approve -var-file="${terraformVarDir}/${clusterTFVarsFile}.tfvars"
+        exit 1
+    fi
+
+    if [ $count -gt $max ]; then
+        echo "[ERROR] Unable to start the nodes in the OCNE cluster after 200s"
+        cd "${terraformVarDir}"
+        terraform destroy -auto-approve -var-file="${terraformVarDir}/${clusterTFVarsFile}.tfvars"
+        exit 1
+    fi
+}
+
+
+#MAIN
+propsFile=${1:-$PWD/oci.props}
+terraformVarDir=${2:-$PWD}
+platform=${3:-amd}
+
+#grep props's values from oci.props file
+
+tenancy_id=$(prop 'tenancy_id')
+compartment_id=$(prop 'compartment_id')
+user_id=$(prop 'user_id')
+fingerprint=$(prop 'fingerprint')
+api_private_key_path=$(prop 'api_private_key_path')
+
+region=$(prop 'region')
+availability_domain_id=$(prop 'availability_domain_id')
+prefix=$(prop 'prefix')
+
+deploy_networking=$(prop 'deploy_networking')
+subnet_id=$(prop 'subnet_id')
+vcn_id=$(prop 'vcn_id')
+
+ssh_public_key_path=$(prop 'ssh_public_key_path')
+ssh_private_key_path=$(prop 'ssh_private_key_path')
+
+enable_bastion=$(prop 'enable_bastion')
+
+virtual_ip=$(prop 'virtual_ip')
+
+control_plane_node_count=$(prop 'control_plane_node_count')
+worker_node_count=$(prop 'worker_node_count')
+environment_name=$(prop 'environment_name')
+kubernetes_name=$(prop 'kubernetes_name')
+
+ocne_version=$(prop 'ocne_version')
+
+http_proxy=$(prop 'http_proxy')
+no_proxy=$(prop 'no_proxy')
+
+terraformDir=$(prop 'terraform.installdir')
+
+# generate terraform configuration file with name $(clusterTFVarsFile).tfvar
+generateTFVarFile
+
+# cleanup previously installed terraform binaries
+rm -rf ${terraformDir}
+
+# download terraform binaries into ${terraformDir}
+setupTerraform
+
+# clean previous versions of terraform oci provider
+deleteOlderVersionTerraformOCIProvider
+
+# run terraform init,plan,apply to create OCNE cluster based on the provided tfvar file ${tfVarsFile}
+createCluster
+
+#check status of OCNE cluster nodes, destroy if can not access them
+export KUBECONFIG=${terraformVarDir}/kubeconfig
+checkClusterRunning
+echo "${kubernetes_name} is up and running"
diff --git a/integration-tests/src/test/resources/ocne/ocne.delete.sh b/integration-tests/src/test/resources/ocne/ocne.delete.sh
@@ -0,0 +1,31 @@
+#!/bin/bash
+# Copyright (c) 2024, Oracle and/or its affiliates.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+#
+# This script deletes provisioned OKE Kubernetes cluster using terraform (https://www.terraform.io/)
+#
+
+set -o errexit
+set -o pipefail
+
+prop() {
+  grep "${1}" ${oci_property_file}| grep -v "#" | cut -d'=' -f2
+}
+
+deleteOCNECluster() {
+  cd ${terraform_script_dir}
+  terraform init -var-file=${terraform_script_dir}/terraform.tfvars
+  terraform plan -var-file=${terraform_script_dir}/terraform.tfvars
+  terraform destroy -auto-approve -var-file=${terraform_script_dir}/terraform.tfvars
+}
+
+
+#MAIN
+oci_property_file=${1:-$PWD/oci.props}
+terraform_script_dir=${2:-$PWD}
+
+terraformDir=$(prop 'terraform.installdir')
+export PATH=${terraformDir}:$PATH
+
+echo 'Deleting cluster'
+deleteOCNECluster || true
diff --git a/integration-tests/src/test/resources/ocne/terraform/1.9/locals.tf b/integration-tests/src/test/resources/ocne/terraform/1.9/locals.tf
@@ -0,0 +1,16 @@
+# Copyright (c) 2024 Oracle Corporation and/or affiliates.  All rights reserved.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl
+
+locals {
+  provision_modes_map = {
+    provision_mode_ocne           = "OCNE"
+    provision_mode_infrastucture  = "Infrastructure"
+  }
+
+  provision_modes_values_list = values(local.provision_modes_map)
+}
+
+locals {
+  secret_name       = "${var.prefix}-${var.secret_name}"
+  ocne_secret_name = "${var.prefix}-${var.ocne_secret_name}"
+}