Create Pull Request to apply delta between initial code and near-MVP

weblogic-azure-aks/src/main/README.md → weblogic-azure-aks/README.md

@@ -25,10 +25,7 @@ Issue related to Oracle WebLogic Server on Microsoft Azure implementation are tr
 This section tracks GitHub Actions configured for each offer repo, 'Build and Test' and 'New Tag' are two different workflows.
 |  Offer Repo  |   Build and Test | New Tag |
 |--- |--- |--- |
-| [Single Node] | [Build and Test]| [New Tag]|
-| [Admin]  | [Build and Test] | [New Tag] |
-| [Configured Cluster]  | [Build and Test]svg) | [New Tag]) |
-| [Dynamic Cluster] |  [Build and Test] | [New Tag] |
+| [WLS on AKS] | [Build and Test]| [New Tag]|
 
 ## Pull Requests
 

weblogic-azure-aks/pom.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2021, Oracle Corporation and/or its affiliates.
+    Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <!-- mvn -Pbicep -Passembly clean install -->
+
+  <groupId>com.oracle.weblogic.azure</groupId>
+  <artifactId>wls-on-aks-azure-marketplace</artifactId>
+  <version>1.0.15</version>
+
+  <parent>
+    <groupId>com.microsoft.azure.iaas</groupId>
+    <artifactId>azure-javaee-iaas-parent</artifactId>
+    <version>1.0.10</version>
+    <relativePath></relativePath>
+  </parent>
+
+  <packaging>jar</packaging>
+  <name>wls-on-aks-azure-marketplace</name>
+  <properties>
+    <test.parameters>-TestParameter '@{&quot;PasswordMinLength&quot;=6}'</test.parameters>
+  </properties>
+</project>

weblogic-azure-aks/src/main/arm/scripts/appgw-helm-config.yaml.template

@@ -0,0 +1,52 @@
+# Copyright (c) 2021, Oracle Corporation and/or its affiliates.
+# Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
+#
+# Based on https://raw.githubusercontent.com/Azure/application-gateway-kubernetes-ingress/master/docs/examples/sample-helm-config.yaml
+
+# This file contains the essential configs for the ingress controller Helm chart
+
+# Verbosity level of the App Gateway Ingress Controller
+verbosityLevel: 3
+
+################################################################################
+# Specify which application gateway the ingress controller will manage
+#
+appgw:
+    subscriptionId: @SUB_ID@
+    resourceGroup: @APPGW_RG_NAME@
+    name: @APPGW_NAME@
+    usePrivateIP: false
+
+    # Setting appgw.shared to "true" will create an AzureIngressProhibitedTarget CRD.
+    # This prohibits AGIC from applying config for any host/path.
+    # Use "kubectl get AzureIngressProhibitedTargets" to view and change this.
+    shared: false
+
+################################################################################
+# Specify which Kubernetes namespace the ingress controller will watch
+# Default value is "default"
+# Leaving this variable out or setting it to blank or empty string would
+# result in ingress controller observing all acessible namespaces.
+#
+kubernetes:
+  watchNamespace: @WATCH_NAMESPACE@
+
+################################################################################
+# Specify the authentication with Azure Resource Manager
+#
+# Two authentication methods are available:
+# - Option 1: AAD-Pod-Identity (https://github.com/Azure/aad-pod-identity)
+# armAuth:
+#    type: aadPodIdentity
+#    identityResourceID: 
+#    identityClientID: 
+
+armAuth:
+    type: servicePrincipal
+    secretJSON: @SP_ENCODING_CREDENTIALS@
+
+################################################################################
+# Specify if the cluster is RBAC enabled or not
+rbac:
+  # Specifies whether RBAC resources should be created
+  create: true

weblogic-azure-aks/src/main/arm/scripts/appgw-ingress-clusterAdmin-roleBinding.yaml

@@ -0,0 +1,15 @@
+# Copyright (c) 2021, Oracle Corporation and/or its affiliates.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: ingress-azure-admin
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: cluster-admin
+subjects:
+- kind: ServiceAccount
+  name: ingress-azure
+  namespace: default

weblogic-azure-aks/src/main/arm/scripts/buildWLSDockerImage.sh

@@ -1,6 +1,8 @@
 # Copyright (c) 2021, Oracle Corporation and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
+echo "Script  ${0} starts"
+
 #Function to output message to StdErr
 function echo_stderr() {
     echo "$@" >&2
@@ -13,7 +15,7 @@ function read_sensitive_parameters_from_stdin() {
 
 #Function to display usage message
 function usage() {
-    echo_stdout "<azureACRPassword> <ocrSSOPSW> ./buildWLSDockerImage.sh <wlsImagePath> <azureACRServer> <azureACRUserName> <imageTag> <appPackageUrls> <ocrSSOUser> <wlsClusterSize>"
+    echo "<azureACRPassword> <ocrSSOPSW> ./buildWLSDockerImage.sh ./buildWLSDockerImage.sh <wlsImagePath> <azureACRServer> <azureACRUserName> <imageTag> <appPackageUrls> <ocrSSOUser> <wlsClusterSize> <enableSSL>"
     if [ $1 -eq 1 ]; then
         exit 1
     fi
@@ -39,13 +41,13 @@ function validate_inputs() {
         usage 1
     fi
 
-    if [ -z "$azureACRPassword" ]; then
-        echo_stderr "azureACRPassword is required. "
+    if [ -z "$azureACRUserName" ]; then
+        echo_stderr "azureACRUserName is required. "
         usage 1
     fi
 
-    if [ -z "$azureACRUserName" ]; then
-        echo_stderr "azureACRUserName is required. "
+    if [ -z "$azureACRPassword" ]; then
+        echo_stderr "azureACRPassword is required. "
         usage 1
     fi
 
@@ -73,6 +75,11 @@ function validate_inputs() {
         echo_stderr "wlsClusterSize is required. "
         usage 1
     fi
+
+    if [ -z "$enableSSL" ]; then
+        echo_stderr "enableSSL is required. "
+        usage 1
+    fi
 }
 
 function initialize() {
@@ -87,6 +94,7 @@ function initialize() {
     mkdir wlsdeploy
     mkdir wlsdeploy/config
     mkdir wlsdeploy/applications
+    mkdir wlsdeploy/domainLibraries
 }
 
 # Install docker, zip, unzip and java
@@ -95,7 +103,7 @@ function install_utilities() {
     # Install docker
     sudo apt-get -q update
     sudo apt-get -y -q install apt-transport-https
-    curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg
+    curl -m ${curlMaxTime} -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg
     echo \
         "deb [arch=amd64 signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu \
     $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list >/dev/null
@@ -133,11 +141,17 @@ function install_utilities() {
     validate_status "Check status of unzip."
 
     # Download weblogic tools
-    curl -m 120 -fL ${wdtDownloadURL} -o weblogic-deploy.zip
+    curl -m ${curlMaxTime} -fL ${wdtDownloadURL} -o weblogic-deploy.zip
     validate_status "Check status of weblogic-deploy.zip."
 
-    curl -m 120 -fL ${witDownloadURL} -o imagetool.zip
+    curl -m ${curlMaxTime} -fL ${witDownloadURL} -o imagetool.zip
     validate_status "Check status of imagetool.zip."
+
+    curl -m ${curlMaxTime} -fL ${wlsPostgresqlDriverUrl} -o ${scriptDir}/model-images/wlsdeploy/domainLibraries/postgresql-42.2.8.jar
+    validate_status "Install postgresql driver."
+
+    curl -m ${curlMaxTime} -fL ${wlsMSSQLDriverUrl} -o ${scriptDir}/model-images/wlsdeploy/domainLibraries/mssql-jdbc-7.4.1.jre8.jar
+    validate_status "Install mssql driver."
 }
 
 # Login in OCR
@@ -158,35 +172,15 @@ function prepare_wls_models() {
 CLUSTER_SIZE=${wlsClusterSize}
 EOF
 
-    # Generate application deployment model in model.yaml
-    # Known issue: no support for package name that has comma.
-    # remove []
-    if [ "${appPackageUrls}" == "[]" ]; then
-        return
-    fi
+    echo "Starting generation of image model file..."
+    modelFilePath="$scriptDir/model.yaml"
 
-    cat <<EOF >>${scriptDir}/model.yaml
-appDeployments:
-  Application:
-EOF
-    appPackageUrls=$(echo "${appPackageUrls:1:${#appPackageUrls}-2}")
-    appUrlArray=$(echo $appPackageUrls | tr "," "\n")
-
-    index=1
-    for item in $appUrlArray; do
-        # e.g. https://wlsaksapp.blob.core.windows.net/japps/testwebapp.war?sp=r&se=2021-04-29T15:12:38Z&sv=2020-02-10&sr=b&sig=7grL4qP%2BcJ%2BLfDJgHXiDeQ2ZvlWosRLRQ1ciLk0Kl7M%3D
-        fileNamewithQueryString="${item##*/}"
-        fileName="${fileNamewithQueryString%\?*}"
-        fileExtension="${fileName##*.}"
-        curl -m 120 -fL "$item" -o wlsdeploy/applications/${fileName}
-        cat <<EOF >>${scriptDir}/model.yaml
-    app${index}:
-      SourcePath: 'wlsdeploy/applications/${fileName}'
-      ModuleType: ${fileExtension}
-      Target: 'cluster-1'
-EOF
-        index=$((index + 1))
-    done
+    chmod ugo+x $scriptDir/genImageModel.sh
+    bash $scriptDir/genImageModel.sh \
+        ${modelFilePath} \
+        ${appPackageUrls} \
+        ${enableSSL}
+    validate_status "Generate image model file."
 }
 
 # Build weblogic image
@@ -213,6 +207,7 @@ function build_wls_image() {
         --wdtModelOnly \
         --wdtDomainType WLS \
         --chown oracle:root
+    # --additionalBuildCommands ${scriptDir}/nodemanager.dockerfile
 
     validate_status "Check status of building WLS domain image."
 
@@ -231,18 +226,23 @@ function build_wls_image() {
 export script="${BASH_SOURCE[0]}"
 export scriptDir="$(cd "$(dirname "${script}")" && pwd)"
 
+source ${scriptDir}/common.sh
+
 export wlsImagePath=$1
 export azureACRServer=$2
 export azureACRUserName=$3
 export imageTag=$4
 export appPackageUrls=$5
 export ocrSSOUser=$6
 export wlsClusterSize=$7
+export enableSSL=$8
 
 export acrImagePath="$azureACRServer/aks-wls-images:${imageTag}"
 export ocrLoginServer="container-registry.oracle.com"
-export wdtDownloadURL="https://github.com/oracle/weblogic-deploy-tooling/releases/download/release-1.9.7/weblogic-deploy.zip"
-export witDownloadURL="https://github.com/oracle/weblogic-image-tool/releases/download/release-1.9.11/imagetool.zip"
+export wdtDownloadURL="https://github.com/oracle/weblogic-deploy-tooling/releases/download/release-1.9.14/weblogic-deploy.zip"
+export witDownloadURL="https://github.com/oracle/weblogic-image-tool/releases/download/release-1.9.12/imagetool.zip"
+export wlsPostgresqlDriverUrl="https://jdbc.postgresql.org/download/postgresql-42.2.8.jar"
+export wlsMSSQLDriverUrl="https://repo.maven.apache.org/maven2/com/microsoft/sqlserver/mssql-jdbc/7.4.1.jre8/mssql-jdbc-7.4.1.jre8.jar"
 
 read_sensitive_parameters_from_stdin
 

weblogic-azure-aks/src/main/arm/scripts/common.sh

@@ -0,0 +1,14 @@
+export checkPodStatusInterval=20 # interval of checking pod status.
+export checkPodStatusMaxAttemps=30 # max attempt to check pod status.
+export checkPVStateInterval=5 # interval of checking pvc status.
+export checkPVStateMaxAttempt=10 # max attempt to check pvc status.
+
+export constFalse="false"
+export constTrue="true"
+
+export curlMaxTime=120 # seconds
+export ocrLoginServer="container-registry.oracle.com"
+export optUninstallMaxTry=5 # Max attempts to wait for the operator uninstalled
+export optUninstallInterval=10
+
+export wlsContainerName="weblogic-server"