On branch edburns/em-7374-dns-public-notice #350
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
modified: weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/createUiDefinition.json modified: weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/createUiDefinition.json modified: weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/createUiDefinition.json Signed-off-by: Ed Burns <edburns@microsoft.com>
oracle-contributor-agreement
bot
added
the
OCA Verified
|
I tested the admin offer, it looked good. We should apply the change to the aks offer.
|
mriccell
approved these changes
Jun 4, 2025
Thanks @galiacheng . I'll do that as a separate PR. The article I'm working on pertains to VMs. |
edburns
pushed a commit
to azure-javaee/weblogic-azure
that referenced
this pull request
Aug 13, 2025
increase pom upgrade Microsoft.Resources/deployments API version add toolTip for tag control. fix artifact version admin offer: modify UI and templates guidance for tagging resource fix function error in admin/mainTemplate.json use aka link for maven download url fix mavn installation path use actions/upload-artifact: v4 modify UI and templates in cluster offer fix tag issue in _pswlessDbTemplate.json use download-artifact@v4 format mainTemplate.json in cluster offer fix variable reference issue fix template error in cluster offer On branch tags-for-resources Include a little text about Tags. modified: resources/doc/guidance-for-tagging-resource.md Signed-off-by: Ed Burns <edburns@microsoft.com> On branch tags-for-resources Reference the PR. modified: resources/doc/guidance-for-tagging-resource.md Signed-off-by: Ed Burns <edburns@microsoft.com> On branch tags-for-resources Explain why only some occurrences of the resource type identifiers are filtered. modified: resources/azure-common.properties Signed-off-by: Ed Burns <edburns@microsoft.com> On branch tags-for-resources Comment copy/pasted behavior. modified: weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/mainTemplate.json modified: weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/mainTemplate.json modified: weblogic-azure-vm/arm-oraclelinux-wls/src/main/arm/mainTemplate.json Signed-off-by: Ed Burns <edburns@microsoft.com> On branch tags-for-resources Fix DRY violation: define label in one place. modified: resources/azure-common.properties modified: weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/mainTemplate.json modified: weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/_dbTemplate.json modified: weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/_dnszones/_createDNSZonesTemplate.json modified: weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/_dnszones/_uamiAndRoleAssignment.json modified: weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/_dnszones/_updateDNSZonesTemplate.json modified: weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/_installJdbcLibsTemplate.json modified: weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/_keyVaultNestedTemplate.json modified: weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/_pswlessDbTemplate.json modified: weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/aadNestedTemplate.json modified: weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/adminTemplate.json modified: weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/adminTemplateForCustomSSL.json modified: weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/dbTemplate.json modified: weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/dnszonesTemplate.json modified: weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/elkNestedTemplate.json modified: weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/mainTemplate.json modified: weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_dbTemplate.json modified: weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_dnszones/_createDNSZonesTemplate.json modified: weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_dnszones/_uamiAndRoleAssignment.json modified: weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_dnszones/_updateDNSZonesTemplate.json modified: weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_installJdbcLibsTemplate.json modified: weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_keyvault/_keyvaultWithExistingCertTemplate.json modified: weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_keyvault/_keyvaultWithNewCertTemplate.json modified: weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_keyvaultAdapterTemplate.json modified: weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_keyvaultAppGatewayConnectorTemplate.json modified: weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_keyvaultSSLConfigTemplate.json modified: weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_pswlessDbTemplate.json modified: weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/aadNestedTemplate.json modified: weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/appGatewayNestedTemplate.json modified: weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/clusterCustomSSLTemplate.json modified: weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/clusterTemplate.json modified: weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/coherenceTemplate.json modified: weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/dbTemplate.json modified: weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/dnszonesTemplate.json modified: weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/elkNestedTemplate.json modified: weblogic-azure-vm/arm-oraclelinux-wls/src/main/arm/mainTemplate.json Signed-off-by: Ed Burns <edburns@microsoft.com> Support tagging resource in WLS AKS offer (#328) * modify aks offer to support tag * debug template * specify download path * add identifier.workspaces * tag vm and vm extension that are created with cli * test bicep 0.26.54 * fix empty vm tags * fix file share name * apply tags to agent pool * Tag for Microsoft.Monitor/accounts * doc for aks tag * clean up source code for tagging resources in aks offer. * increase pom version * add comment for bicep user defined function. modify ui definition to show the java option element (#332) increase pom On branch edburns-msft-dd-2321245-empty-resource-group apply the "allowExisting" property. modified: pom.xml modified: weblogic-azure-aks/src/main/arm/createUiDefinition.json Signed-off-by: Ed Burns <edburns@microsoft.com> use the properties Zhihao provided. On branch edburns-msft-dd-2321245-empty-resource-group @backwind1233 pointed out the property was in the incorrect place. modified: pom.xml modified: weblogic-azure-aks/src/main/arm/createUiDefinition.json Signed-off-by: Ed Burns <edburns@microsoft.com> enable deployment to non-empty resource groups fix file ending issue fix file ending issue Submit new ARM VM sizes and fix pipeline failure (#335) * fix pipeline. * increase pom * Update ARM VM sizes (#3) * Increment pom due to other outstanding PR. --------- Co-authored-by: Ed Burns <edburns@microsoft.com> On branch edburns-msft-dd-2321245-empty-resource-group @backwind1233 pointed out the property was in the incorrect place. modified: pom.xml modified: weblogic-azure-aks/src/main/arm/createUiDefinition.json Signed-off-by: Ed Burns <edburns@microsoft.com> Support re-deployment in the same resource group and remove external key vault integration (#338) * unique name for public ip. * use global resource name sufix. * remove var name_appGateway as there is a param for it. * define _globalResourceNameSufix: _globalResourceNameSufix in the scaling scripts * mitigate Bicep warning. * add location input parameter to workflow for resource creation * use java 11 to build cargotracker. * fix syntax issue * add sufix to the uami name. * ensure all the depoyment script deployments have unique name. * ensure key vault permission model is vault access policy. * enable global uami to access existing key vault. * create a seperate module to update access policy of key vault. * set enableRbacAuthorization with false. * specify location. * fix build error * Error BCP035: The specified "object" declaration is missing the following required properties: "tagsByResource" * set vault sku * rename key vault resource * remove key vault from ui. * remove key vault * remove key vault validation in fail fast stage. * update key vault API version * Fix "An invalid value was provided for 'accessPolicies[0].Permissions.secrets'" * Set key vault certificate permission. * upgrade jdk version * Code clean up. * No key vault info when the App Gateway certificate is uploaded. * validate existing aks networking configurations. * upgrade aks to 1.30.7. * On branch wls-aks-redeploy Update names to match what they are naming. modified: weblogic-azure-aks/src/main/arm/createUiDefinition.json Signed-off-by: Ed Burns <edburns@microsoft.com> * On branch wls-aks-redeploy Fix typo sufix -> suffix modified: weblogic-azure-aks/src/main/bicep/mainTemplate.bicep modified: weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_autoGeneratedPfxCertInKeyVault.bicep modified: weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-create-networking.bicep modified: weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-create-wls-cluster.bicep modified: weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-datasource-connection.bicep modified: weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-output-domain-configurations.bicep modified: weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-validate-applications.bicep modified: weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-validate-parameters.bicep modified: weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_enable_hpa.bicep modified: weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_enable_prometheus_metrics.bicep modified: weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_install_agic.bicep modified: weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds_validate_agic.bicep modified: weblogic-azure-aks/src/main/bicep/modules/_enableAutoScaling.bicep modified: weblogic-azure-aks/src/main/bicep/modules/_enablePromethuesKeda.bicep modified: weblogic-azure-aks/src/main/bicep/modules/_globalUamiAndRoles.bicep modified: weblogic-azure-aks/src/main/bicep/modules/_rolesAssignment/_roleAssignmentinRgScope.bicep modified: weblogic-azure-aks/src/main/bicep/modules/_setupDBConnection.bicep modified: weblogic-azure-aks/src/main/bicep/modules/_setupPasswordlessDBConnection.bicep modified: weblogic-azure-aks/src/main/bicep/modules/networking.bicep modified: weblogic-azure-aks/src/main/bicep/modules/setupDBConnection.bicep modified: weblogic-azure-aks/src/main/bicep/modules/setupWebLogicCluster.bicep Signed-off-by: Ed Burns <edburns@microsoft.com> --------- Signed-off-by: Ed Burns <edburns@microsoft.com> Co-authored-by: Ed Burns <edburns@microsoft.com> Support re-deployment in the same resource group for single node offer (#339) * add global unique suffix to resource name. * update API version for azure.apiVersionForStorage. * use unique vm name. * increase pom. Support re-deployment in the same resource group and remove external key vault integration for admin offer (#340) * update API version of Microsoft.Storage/storageAccounts. * remove external key vault integration. * remove external key vault support. * Unreferenced variable: const_currentSubscription. * fix json syntax * parameterize location in integration test. * rename the postgresql firewall rule. * debug pipeline. * add global unique suffix to resource name. * remove aad and elk related scripts. * remove elk from admin integration pipeline. * output admin vm name. * query admin vm name after deployment in the admin integration pipeline. * Unreferenced parameter: _globalResourceNameSuffix Line: 18, Column: 10 * remove aad parameter from the test scripts. * parameterize file share name. * define nsg name in the main template. * generate unique vnet default name. * query nsg name dynamically. * output admin vm name as env variables. * use `az vm run-command create` to execute test script. * no need to verify WLS installation, this is done while buiding base image. * use `az vm run-command invoke` to run test script. * verify-wls-path.sh has been removed. * fix pipeline error "Error: Process completed with exit code 1." * upgrade db driver version. * fix db connection string joiner. * update the script for new azure-identity-extension. * add step to query public IP of AdminServer VM in workflow. * bump version of arm-oraclelinux-wls-admin to 1.0.56 * add network security group configuration step to workflow * update connection string joiner to use variables instead of parameters * deploy db in the main deployment. * remove post deployment - db. * use unique vnet default name. * revert debug settings. * add array_paramJoiner for database connection string formatting. --------- Co-authored-by: Ed Burns <edburns@microsoft.com> Support redeployment in the same resource group and remove external key vault integration for configured cluster offer (#341) * remove elk related code. * remove aad related code. * remove elk and aad test data. * remove external key vault. * update ARM aPI version. * update deployment location from eastus to westus * fix arm-ttk errors. * remove external key vault from test scripts. * debug param verification. * fix tags in post deployment scripts. * add artifact download paths * add new parameters for WebLogic Azure VM deployment configuration * add global resource suffix. * remove obsolete parameters-test.json and update service verification scripts * remove obsolete _globalResourceNameSuffix parameter from pswlessDbTemplate.json * add global resource name suffix to clusterLinkedTemplate deployment * fix parameter issue. * fix "invalid skuUrnVersion" * fix: correct service principal name in Azure credential setup * update skuUrnVersion formatting * correct typo in admin service verification and remove unused parameters from main template * update resource dependencies in main template * update key vault references in main template * update domainNameLabel construction in cluster templates * update virtual network name formatting in UI definition and main template * correct formatting of azure subject name in main template * refactor key vault script parameters and output handling for improved readability * update naming conventions for network security group and availability set in ARM templates * fix syntax error near unexpected token `||' in testWlsVmCluster.yml * bump version for oraclelinux wls cluster to 1.0.720000 * update gatewayPublicIPAddressName to include resource name suffix in main template * rename parameter adminVMName with adminVMNamePrefix, the adminVMName will be output. * add managedVMNamePrefix parameter to various templates for consistent VM naming * update defaultValue for virtualNetworkName to use uniqueString for better name uniqueness * add managedVMNamePrefix to appGatewayNestedTemplate for consistent VM naming * fix typo * update default pidType to 'oracle' in workflow configuration files * update admin VM public IP retrieval logic in workflow * add appGatewayName parameter to templates for improved Application Gateway configuration * add WebLogic edit session header to curl commands in deploy-webapp.sh * add appGatewayName parameter * add WebLogic edit session header to curl commands in deploy-webapp.sh * appGatewayNestedTemplate.json: use array for backend trusted root certs * update mainTemplate.json to conditionally reference SSL certificate details based on appGatewayCertificateOption * set enableCoherence to false in gen-parameters-deploy.sh * add virtual network and subnet parameters to gen-parameters-deploy.sh * fix verify-webapp-deployment.sh: correct URL formatting for WebLogic Cafe REST API call * set enableCoherence to true in gen-parameters-deploy.sh * remove post deployments as those templates are not working currently. * remove elk steps in testWlsVmCluster.yml * fix verify-webapp-deployment.sh: improve URL formatting for WebLogic Cafe REST API call * refactor coherenceTemplate.json: rename keyVault parameters to ssl for clarity * remove unused output parameters from testWlsVmCluster.yml * add global resource name suffix and refactor VM naming conventions in coherence template * coherenceTemplate.json: make sure the dns name is unique. Update credential scripts to use default repository context for GitHub CLI commands (#343) * Update credential scripts to use default repository context for GitHub CLI commands * fix: change 'remove' to 'delete' for GitHub CLI secret teardown Support redeployment in the same resource group and remove external key vault integration (#342) * remove elk and aad from templates and scripts. * remove elk and aad from test pipelines. * remove keyvault inputs from UI. * remove external key vault. * fix arm-ttk errors * add a unique suffix to resource name. * update default virtual network name to include a unique identifier * prefix NIC and IP names with an underscore for consistency * add addressPrefixes and subnetPrefix to parameters script * update domainNameLabel construction for improved uniqueness in IP DNS settings * update pipeline. * add artifact path to download step in workflow * truncate domainNameLabel to 61 characters for consistency in DNS settings * update deployment workflow to include dependency deployment in job requirements * truncate domainNameLabel to 61 characters for consistency in DNS settings across templates * do not deploy ohs in integration test. * update workflow to add self-signed certificate generation for ohs. * correct self-signed certificate generation script parameter handling * move script location. * bump version for arm-oraclelinux-wls-dynamic-cluster to 1.0.54 * add nsgName parameter to mainTemplate and ohsNestedTemplate for network security group configuration * use JKS certificate for ohs. * update Java version to 11 and change keystore type to PKCS12 * update keystore file types to PKCS12 and adjust comments for JDK 11 compatibility * change keystore type from PKCS12 to JKS in deployment scripts * update generate-selfsigned-keystore.sh to clarify JDK version and keystore type * update managedServerVMNamePrefix to append 'VM' suffix in mainTemplate.json * add verification step for WebLogic Cafe deployment and script to check accessibility * add managedVMNamePrefix parameter to dbTemplate.json * add enableCustomSSL parameter to createUiDefinition.json * add error handling for cluster shutdown in createCoherenceClusterModel function * fix shutdown function to use clientClusterName in createCoherenceClusterModel * add managedVMNamePrefix parameter to _pswlessDbTemplate.json * update self-signed certificate generation to use wildcard domain name for Azure * add managedVMNamePrefix parameter to dbTemplate.json * update mainTemplate.json to use custom identity key store parameters * add _globalResourceNameSuffix parameter to mainTemplate.json and nested DNS zone templates * update arm-oraclelinux-wls-cluster version to 1.0.730000 * update GitHub Actions workflows to use azure-javaee/weblogic-on-azure repository * refactor DNS domainNameLabel construction in ARM templates for consistency * reduce domainNameLabel length in ARM templates for DNS settings * update domainNameLabel construction in coherenceTemplate.json for clarity Update actions/upload-artifact to version 4.6.2 across multiple YAML files Update actions/upload-artifact to version 4.6.2 in multiple YAML files Revert "Update actions/upload-artifact to version 4.6.2 in multiple YAML files" This reverts commit 7806c75e764cf76047a33597f94344662c2edef1. Edburns/em 6908 accommodate aks nodepool naming changes (#346) * Update node pool name to 'nodepool1' and adjust related parameters in Bicep templates * Update version.wls-on-aks-azure-marketplace to 1.0.88 in pom.xml * Fix string comparison in build_docker_image function for AKS node pool name * fix utility.sh: line 109: [: 1: unary operator expected * fix utility.sh: line 109: [: 1: unary operator expected --------- Co-authored-by: haiche_microsoft <haixia.cheng@microsoft.com> Assign the Network Contributor role to AGIC to allow access to the existing virtual network (#349) * Update WebLogic AKS version and add AGIC network contributor role assignment * Add scope to agicNetworkContributorRoleAssignment for resource group * Remove unused vnetRgName parameter from agicNetworkContributorRoleAssignment module --------- Co-authored-by: galiacheng <haixia.cheng@microsoft.com> On branch edburns/em-7374-dns-public-notice (#350) modified: weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/createUiDefinition.json modified: weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/createUiDefinition.json modified: weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/createUiDefinition.json Signed-off-by: Ed Burns <edburns@microsoft.com> Changes for upgrading wls-on-aks offer to support WLS 14.1.2 (#351) * changes to upgrade wls-on-aks to support 14.1.2 * changes done for local testing * Revert "changes done for local testing" This reverts commit 0cde0dfabbd96820e3d61428d92ba2bcdadd51d4. * update wls-on-aks-azure-marketplace version for 14.1.2 upgrade Update API version references in azure-common.properties and add usage instructions Update repository owner reference to use github.repository_owner in workflow files Update API version reference for existing identities in _pswlessDbTemplate.json Update API version reference for existing identities in _pswlessDbTemplate.json Update repoOwner reference to use github.repository_owner in workflow files Update default location in testWlsVmAdmin.yml to eastus2 Update azCliVersion to 2.72.0 in vm-dependencies.env Update default location in testWlsVmAdmin.yml to eastus Update default location in testWlsVmAdmin.yml to centralus and modify resource group prefix to include repository owner Update resource group naming to include repository owner in YAML files Refactor resource group naming in testWlsAksWithDependencyCreation.yml to exclude run identifiers for storage account Refactor resource group naming in testWlsVmCluster.yml to remove run identifiers and set default location to centralus Update Azure API versions and refactor repository owner usage in YAML files Update default location in testWlsVmDynamicCluster.yml to centralus Update default location in testWlsAksWithDependencyCreation.yml to centralus Refactor WebLogic deployment workflow to use environment variable for images and streamline resource group management Refactor WebLogic deployment workflows to use environment variables for images and streamline deployment steps Fix template file path in WebLogic Server Cluster and Dynamic Cluster deployment workflows Fix parameter syntax in deploy-weblogic-cluster job for template file path Refactor WebLogic deployment workflows to use matrix strategy for image handling and streamline resource group management Refactor deploy-weblogic-cluster job to use environment variable for images and streamline deployment process with improved error handling and cleanup steps Enhance WebLogic cluster deployment workflow with additional logging for template and parameters file paths, and improve notification formatting for deployment failures Enhance deployment script with error handling for parameter generation and ARM template validation, ensuring robust deployment process Add JSON format validation and enhanced logging for ARM template validation in deployment workflow Refactor WebLogic cluster deployment workflow to utilize matrix strategy for image handling, enhancing error handling and logging throughout the deployment process. Refactor WebLogic cluster deployment to streamline image handling and enhance error management, allowing for retries on image deployment failures. Fix template file path in WebLogic cluster deployment to correctly reference the artifact name from preflight job outputs Refactor deployment script for improved readability and consistency in command formatting Enhance WebLogic cluster deployment workflow with additional logging and tmate session setup for better debugging on failure Refactor WebLogic cluster deployment to utilize environment variables for image handling, enhancing error management and retry logic for failed deployments. Add logging for image usage in WebLogic cluster deployment workflow Refactor deployment script to use double quotes for variable expansion, improving readability and consistency in echo statements. Refactor YAML scripts to use single quotes for string literals, enhancing consistency and readability in deployment commands Add logging for artifact name in WebLogic Server Dynamic Cluster deployment Refactor integration test workflow to use environment variables for path handling, improving consistency and maintainability Refactor WebLogic cluster deployment workflow to use matrix strategy for image handling, enhancing maintainability and readability Refactor WebLogic cluster deployment to use environment variable for image handling, improving maintainability and flexibility Fix image URN handling in WebLogic deployment scripts for consistency Add TODO comment to check for existing self-signed certificate in dynamic cluster script Fix parameter file path syntax in testWlsVmCluster.yml for improved compatibility Enhance selfsigned certificate generation script to check for existing alias, preventing unnecessary regeneration Fix parameter handling in testWlsVmCluster.yml for improved script execution Fix missing newline at end of file in generate-selfsigned-keystore.sh Remove redundant alias check for selfsigned certificate generation in generate-selfsigned-keystore.sh Add check for existing self-signed certificates in generation script Fix syntax error in testWlsVmDynamicCluster.yml by removing unnecessary escape character Fix syntax error in testWlsVmDynamicCluster.yml by removing unnecessary escape character Add debug output for deployment parameters in testWlsVmDynamicCluster.yml Update testWlsVmDynamicCluster.yml to use env.wlsPassword for consistency in scripts Revert "Update testWlsVmDynamicCluster.yml to use env.wlsPassword for consistency in scripts" This reverts commit 7728ea0221e6012421f6fc772f6c3b00b255d268. Fix variable interpolation in testWlsVmDynamicCluster.yml for self-signed certificate generation Revert "Fix variable interpolation in testWlsVmDynamicCluster.yml for self-signed certificate generation" This reverts commit 8b75928ef019b67820b73aaf73bf9a76573c8753. Add GitHub Actions workflow for debugging with tmate remove Remove deprecated images from testWlsVmDynamicCluster.yml and add tmate session setup for debugging on failure Export sslIdentityData and log its length in testWlsVmDynamicCluster.yml Log current working directory in testWlsVmDynamicCluster.yml before generating self-signed certificate Use single quotes for echo statements in testWlsVmDynamicCluster.yml Add tmate session setup for debugging and fix sslIdentityData length calculation Log sslIdentityData value in testWlsVmDynamicCluster.yml Check for existence of identity.jks and log appropriate message in testWlsVmDynamicCluster.yml Add error handling for empty sslIdentityData in testWlsVmDynamicCluster.yml Fix variable assignment and quoting for sslIdentityData in testWlsVmDynamicCluster.yml Fix quoting for sslIdentityData assignment and check in testWlsVmDynamicCluster.yml Fix quoting for sslIdentityData and sslIdentityDataLength in testWlsVmDynamicCluster.yml Fix variable quoting for sslIdentityData in testWlsVmDynamicCluster.yml Fix quoting for sslIdentityData in deploy-weblogic-cluster job Remove tmate session setup from testWlsVmDynamicCluster.yml Add CI validation workflows and build plan Add scenarios for building various WLS VM artifacts in validation plan Add input placeholders for WLS VM artifact build scenarios in validation plan Refactor artifact build workflows to remove unnecessary Git ref input and streamline environment variable setup Fix resource reference for user-assigned identities in pswlessDbTemplate.json Add CI validation workflows for AKS, VM Admin, VM Cluster, and Dynamic Cluster Update CI validation workflows to use specific plan names for AKS, VM Admin, VM Cluster, and Dynamic Cluster Add integration tests report section to README with CI validation badges Add additional WebLogic image tags for dynamic cluster tests Remove debug echo statements from deployment parameter generation Add database provisioning and parameter retrieval actions Add database name input to action and update connection URLs Update database type references and add parameters deploy template Update checkout action to use v4 and clarify repository name Fix parameter file generation by using single quotes for variable expansion Add UAMI name input and database type options to workflow configurations Update action paths for database provisioning and parameter retrieval Add 'none' option for database type and improve parameter file handling Add resource group deletion step to workflow Add tmate session setup to workflow for debugging Change default database type to 'none' in workflow configuration Add resource group deletion step with prefix filtering to workflow Update parameter file paths in workflow for consistency Change default database type to 'mssqlserver' in workflow configuration Remove tmate session setup from workflow Add database type input and provision steps to workflow Update parameter file paths in testWlsVmAdmin.yml to use relative paths Add debug echo for parameter template path in testWlsVmAdmin.yml Remove deprecated WebLogic images from testWlsVmAdmin.yml and add tmate session setup Update parameter file paths in testWlsVmAdmin.yml to remove leading './' Add debug logging and file existence check for parameter template in testWlsVmAdmin.yml Add file existence check and debug output for parameter template in testWlsVmAdmin.yml Update parameter template path to include leading './' and add success message for file existence check in testWlsVmAdmin.yml Add 'none' option to choice and enhance debug output in testWlsVmAdmin.yml Fix echo statements formatting in testWlsVmAdmin.yml for consistency Fix variable interpolation in debug output for consistency in testWlsVmAdmin.yml Refactor parameter_template path and enhance debug output in testWlsVmAdmin.yml Add adminOfferPath echo statement and update parameter_template path in testWlsVmAdmin.yml Fix parameter_template path and echo statements in testWlsVmAdmin.yml for consistency Update echo statements and parameter_template path in testWlsVmAdmin.yml for clarity Refactor parameter file paths and improve echo statements in testWlsVmAdmin.yml Fix parameter path syntax in testWlsVmAdmin.yml for correct file referencing Fix variable syntax and update parameter paths in testWlsVmAdmin.yml for consistency Fix variable syntax in testWlsVmAdmin.yml for proper string interpolation Fix variable assignment in testWlsVmAdmin.yml for proper export syntax Fix variable assignment in testWlsVmAdmin.yml for correct syntax Fix variable syntax in testWlsVmAdmin.yml for correct string interpolation On branch edburns/o-647-update-identity-driver (#352) * On branch edburns/o-647-update-identity-driver modified: weblogic-azure-aks/src/main/arm/scripts/common.sh - Update MSSQLDriver to version that works with azure-identity 1.12.2. Signed-off-by: Ed Burns <edburns@microsoft.com> * On branch edburns/o-647-update-identity-driver modified: weblogic-azure-aks/src/main/resources/azure-identity-extensions.xml Cause dependency on `com.azure:azure-identity-extensions:jar:1.12.2:compile`. Signed-off-by: Ed Burns <edburns@microsoft.com> * On branch edburns/o-647-update-identity-driver modified: weblogic-azure-aks/src/main/arm/scripts/common.sh - Make it so the POM is resolvable during testing of the offer. Signed-off-by: Ed Burns <edburns@microsoft.com> * Update azure-identity-extensions.xml * Update common.sh to add azure-identity link. * Update common.sh to add constAzureIdentityForMSSQLJarName * Download azure-identity jar for MSSQL * On branch edburns/o-647-update-identity-driver modified: weblogic-azure-aks/src/main/arm/scripts/common.sh - Make it so the POM is resolvable during testing of the offer. Signed-off-by: Ed Burns <edburns@microsoft.com> * Update common.sh for variable name constAzureIdentityForMSSQLJarName * fix 'uri' expects its first argument to be a uri string * Use mssql 12.10 and azure-identity 1.15.3 * Update MSSQL driver version and remove azure-identity dependency * update the ubuntu base image * use SSO auth token * update description for Oracle SSO account password parameter to reflect auth token usage * use latest ubuntu 24 LTS * fix AMR64info condition * fix visibility condition for unsupported platform info in UI definition --------- Signed-off-by: Ed Burns <edburns@microsoft.com> Co-authored-by: Haixia Cheng <haixia.cheng@microsoft.com> Added 14.1.2.0.0 images and removed linux 7.6 references for SingleNode and Admin offer (#353) * Added pids for 14.1.2.0.0 base vm images * Added 14.1.2.0.0 images list and removed linux 7.6 references * Added 14.1.2.0.0 images and removed linux 7.6 references for admin offer * Updated JSON format for admin offer UiDefinition * Updating virtualNetworkResourceGroupName based on virtualNetwork new or existing Refactor variable declarations to use export for environment variable substitution in workflow Add additional WebLogic images for JDK 8 and 11 in testWlsVmAdmin.yml Improve parameter file generation in testWlsVmAdmin.yml with clearer echo statements and variable assignments Fix variable syntax in parameter file generation for correct interpolation Add new parameters for WebLogic cluster deployment and refactor parameter generation script Update dbServerName to include run_id and run_number for unique identification Export parameter file paths for improved accessibility in parameter generation Add parameters-deploy-template.json for deployment configuration and streamline parameter file generation Update parameter file generation paths to use offerPath variable Refactor parameter file paths to use offerPath variable for consistency in deployment scripts Add dynamic run-name to workflow files for database type identification Add parameters-deploy-template.json for deployment configuration Update run-name in CI validation workflows to include scheduled plan identification Add dbAdminUser input to database provisioning workflows Add new parameters for database configuration in deployment templates Reintroduce dbIdentity parameter in deployment template configuration Add tmate session setup to integration test workflow Update database parameters and outputs in deployment workflow Remove tmate session setup from integration test workflow Update environment images in integration test workflows Update parameter template to use dynamic enableDB value in deployment scripts Refactor action paths in integration test workflow for consistency Add tmate session setup to integration test workflow Add tmate session setup to integration test workflow Fix syntax in parameter file generation for consistency Fix formatting of dbIdentity value in parameter template for consistency Remove deprecated image entries from testWlsVmAdmin.yml for clarity Comment out resource group deletion for debugging purposes in testWlsVmAdmin.yml Fix dbIdentity value formatting in parameters-deploy-template.json Fix dbIdentity value formatting in parameters-deploy-template.json Fix dbIdentity value formatting in parameters-deploy-template.json Fix dbIdentity value formatting in testWlsVmAdmin.yml Fix dbIdentity value assignment in testWlsVmAdmin.yml Fix dbIdentity value assignment and formatting in testWlsVmAdmin.yml Add validation and formatting for dbIdentity in testWlsVmAdmin.yml Refactor dbIdentity handling in testWlsVmAdmin.yml for improved clarity and consistency Escape quotes in dbIdentity output for proper formatting in action.yaml Remove quotes from dbIdentity output in action.yaml for improved formatting Output dbIdentity to console for debugging in action.yaml Escape quotes in dbIdentity output for proper handling in action.yaml Refactor dbIdentity handling in testWlsVmAdmin.yml for improved clarity and consistency Simplify dbIdentity output handling in action.yaml by removing unnecessary escaping Add dbIdentity parameter to deployment templates and update image list in workflow files Add dbIdentity and enablePswlessConnection parameters to deployment templates and export in workflow Remove debug comment and enable resource group cleanup in testWlsVmAdmin.yml Remove 'none' option from database type choices in testWlsVmCluster.yml Add support for deploying with existing AKS clusters in workflow Add support for existing VNET configuration in deployment templates and CI workflow Add tmate session setup for debugging in AKS deployment workflow Add tmate session setup for debugging in dynamic cluster workflow Add step to echo outputs from deploy-db in AKS dependency creation workflow Refactor SSL identity data handling in dynamic cluster workflow Add echo statement for database type in action.yaml Add echo statements for database type in action.yaml Add echo statement for dsConnectionURL in action.yaml Add success message and echo dsConnectionURL in action.yaml Add echo statements for database parameters in testWlsAksWithDependencyCreation.yml Fix typo in echo statement for database parameters in action.yaml Add tmate session setup to testWlsAksWithDependencyCreation.yml and remove extra newline in action.yaml Fix escape character in dsConnectionURL for SQL Server connection in action.yaml Fix echo statement for database parameters and restore dsConnectionURL output in action.yaml Fix typo in echo statement for database parameters in action.yaml Fix escape character in dsConnectionURL for database connection in testWlsAksWithDependencyCreation.yml Remove tmate session setup from testWlsAksWithDependencyCreation.yml Add checkout action to testWlsAksWithDependencyCreation.yml Remove tmate session setup from testWlsAksWithDependencyCreation.yml Fix missing quotes around vnetForApplicationGateway value in parameters-deploy-template.json Refactor output echo statements in testWlsAksWithDependencyCreation.yml for clarity Add echo statement for serverHost in action.yaml Remove unused parameters for Application Gateway and clean up tmate session setup in workflow Add debug workflow for testing WLS on AKS with dependency creation Add testdb workflow for database provisioning and cleanup Refactor resource group creation step in testdb workflow to use 'run' instead of 'uses' Remove unused parameters from testdb workflow and clean up configuration Add location echo to resource group creation step in testdb workflow Refactor testdb workflow to remove unused AZ CLI version step and streamline resource group creation Remove unused parameters from testdb workflow and simplify cleanup condition Add dependency to cleanup step in testdb workflow Add echo step to display input parameters in Azure SQL Database deployment Update testdb workflow to use input location parameter for resource group creation Enhance testdb workflow by simplifying resource group creation command and adding resource group check step Fix resource group creation command to use input location parameter Add tmate session setup to testdb workflow for debugging Refactor resource group creation step in testdb workflow to streamline command execution Fix dbUser output echo in testdb workflow and remove unnecessary sleep command before resource group deletion Refactor output echo steps in testdb workflow for clarity and organization Remove dbUser output echo from test workflows and add dbIdentity echo step for clarity Add dbUser and dsConnectionURL to workflow parameters and echo steps for improved clarity Add dbUser and dbIdentity to workflow parameters for improved clarity Refactor output echo steps in testWlsAksWithDependencyCreation workflow for clarity Add integration test workflow for WLS on AKS with dependency creation Rename workflow for clarity in debugging WLS on AKS with dependency creation Update cleanup step dependencies in testWlsAksWithDependencyCreation workflow Refactor cleanup steps in testWlsAksWithDependencyCreation workflow for improved clarity Remove preflight job dependency from cleanup step in testWlsAksWithDependencyCreation workflow Update Azure CLI version in testWlsAksWithDependencyCreation workflow Remove AZ CLI version retrieval from testWlsAksWithDependencyCreation workflow Update Azure CLI version in testWlsAksWithDependencyCreation workflow Add output logging to files in testWlsAksWithDependencyCreation workflow Remove unused input parameters and output logging from testWlsAksWithDependencyCreation workflow Revert "Remove unused input parameters and output logging from testWlsAksWithDependencyCreation workflow" This reverts commit 86436799372be317a2d9c36decf51ec8a14db717. Remove tmate session setup from testWlsAksWithDependencyCreation workflow Remove unused input parameters from testWlsAksWithDependencyCreation workflow Add tmate session setup to testWlsAksWithDependencyCreation workflow Refactor output parameters in testWlsAksWithDependencyCreation workflow and remove tmate session setup Remove unused environment variables from testWlsAksWithDependencyCreation workflow Revert "Remove unused environment variables from testWlsAksWithDependencyCreation workflow" This reverts commit 711381473b2010b5e532b8e620533f40a58b85d6. Update dbServerName format in testdb.yml to remove hyphens Update dbServerName format in testWlsAksWithDependencyCreationdebug.yml to remove hyphens Update dbServerName format in testWlsAksWithDependencyCreationdebug.yml to simplify naming Update dbServerName format in testWlsAksWithDependencyCreation.yml to simplify naming Remove redundant output echo steps and add tmate session setup in testWlsAksWithDependencyCreation.yml Fix JSON formatting in parameters-deploy-template.json by adding missing comma Fix JDBC connection URL formatting in action.yaml by removing unnecessary escape character Add timeout to tmate session setup in YAML files Reorder tmate session setup in testWlsAksWithDependencyCreation.yml for clarity add vnetRGNameForApplicationGateway Refactor database user assignment in YAML files for consistency Update dbServerName format in testWlsVmDynamicCluster.yml for consistency Increase timeout for tmate session setup in testWlsAksWithDependencyCreation.yml Add dbAdminUser to database configuration in testWlsAksWithDependencyCreation.yml Replace Maven installation method with yum package manager for improved maintainability Add sleep step for debugging in testWlsAksWithDependencyCreation.yml Add debug output for dsConnectionURL and remove password setting in datasourceConfig-postgresql.sh Add debug comment for passwordless connection in datasourceConfig-postgresql.sh Add debug output for dsUser and enablePswlessConnection in datasourceConfig-postgresql.sh Remove sleep step for debugging in testWlsAksWithDependencyCreation.yml Add debug output for dbUser in action.yaml and testWlsAksWithDependencyCreation.yml Update dbAdminUser export to use output from database-parameters step Add dbPassword and dbName exports in deployment YAML files Refactor database provisioning steps in testWlsAksWithDependencyCreation.yml Update checkout action to v4 and remove duplicate tmate session setup Add enablePswlessConnection and dbIdentity parameters to deployment template Update database user export in parameter files and adjust variable assignments in workflow YAMLs Update resource group naming conventions in testWlsVmCluster.yml Increase tmate session timeout to 120 minutes and comment out resource group deletion in deployment error handling Refactor Maven installation to use package manager and remove legacy code Add artifact upload step for generated parameter file in AKS deployment workflow Update parameters-deploy-template.json to align with Azure schema and correct parameter structure Add firewall rule to allow all Azure services for PostgreSQL flexible server Remove debug comment and enable resource group deletion on WebLogic deployment failure Comment out resource group deletion on WebLogic deployment failure and add sleep step for resource cleanup Fix JSON formatting in parameters-deploy-template.json schema declaration Fix schema declaration in parameters-deploy-template.json and update dollar sign handling in deployment script Fix JSON formatting in parameters-deploy-template.json by correcting value syntax for enableDB, enablePswlessConnection, and dbIdentity Comment out resource group deletion command in WebLogic deployment failure handling for debugging Add debug echo statements for current path and artifact name in deployment script Fix JSON formatting and schema declaration in parameters-deploy-template.json; update deployment script for resource group cleanup managedServerPrefix's value with string Refactor managedServerPrefix variable to remove quotes for consistency Add images variable to testWlsVmDynamicCluster.yml and echo managedserverprefix in deployment steps Add echo statements for managedserverprefix and setup tmate session in deployment steps Add echo statements for managedserverprefix and setup tmate session in deployment steps Add echo statement for managedserverprefix in deployment steps Add additional echo statements for managedserverprefix in deployment steps Fix casing for managedServerPrefix in parameters and update related echo statements in deployment steps Add sleep step for 1 hour in integration test workflow Add sleep step for 60 minutes in integration test workflow to ensure resource cleanup Add wait step for managed server startup in JDBC driver installation script Add custom script extension for new user setup in VM configuration Add wlsDomainName parameter to mainTemplate.json Add wlsImageTag parameter to deployment templates for version flexibility Remove sleep step for 1 hour in dependency creation workflow Update Azure Identity Extensions URL to latest version in common.sh Change default database type to postgresql(flexible) in dependency creation workflow Remove unused parameters from dependency creation workflow and update validation plan to run in serial mode Add image configurations to deployment YAML files for WebLogic Remove sleep step for 1 hour in dependency creation workflow Add validation for createAKSCluster variable in CI workflow Add tmate session setup to dependency creation workflow Refactor deployment workflow to remove dynamic environment setup and streamline tmate session configuration Add scenarios for Admin Server tests with MSSQL and passwordless PostgreSQL Add validation scenarios for MSSQL and passwordless PostgreSQL in VM cluster tests Add scenario for deploying with passwordless PostgreSQL in validation plan Add backup validation plan for deploying with passwordless PostgreSQL Add support for provisioning Azure VNET in Admin Server deployment Add CI configuration support to testWlsVmAdmin.yml Add support for Azure VNET provisioning in VM cluster deployment Add subnet configuration for Azure VNET in VM cluster validation plan Add subnet configuration for existing cluster in VM cluster backup validation plan Fix subnet name parameter in Azure VNET subnet creation for VM cluster Add echo statement for Azure Subnet provisioning in testWlsVmCluster.yml Fix subnet and virtual network name parameters in Azure Subnet provisioning for App Gateway Update address prefix for Azure Subnet provisioning in testWlsVmCluster.yml Update address prefixes for Azure VNET and subnet creation in testWlsVmCluster.yml Disable Application Gateway Ingress Controller in AKS deployment scenarios Add echo statements to clarify deployment verification for existing VNet Remove redundant firewall rule creation for Azure PostgreSQL flexible server Refactor VNet parameter preparation in deployment script for clarity Update virtual network resource group name variable in testWlsVmAdmin.yml Refactor VNet parameter preparation in testWlsVmCluster.yml for improved clarity and consistency Remove tmate session setup from testWlsAksWithDependencyCreation.yml to streamline workflow Remove unnecessary sleep step from testWlsAksWithDependencyCreation.yml to optimize workflow Add scenarios for passwordless PostgreSQL and MSSQLServer in validation plans Add README.md for CI validation configuration and usage guidelines Add step to delete existing VNet in testWlsVmCluster.yml Comment out cleanup_vm call for debugging; will uncomment after stabilization Refactor datasource configuration to provide success message and ensure cleanup Rename CI to IT in workflows and configuration files for consistency Remove redundant text from README.md for clarity in IT validation configuration Add logging for data source validation execution in setupDBConnections.sh Refactor Bicep configuration to separate URL joiners for parameters and connections Enable VM cleanup in createVMAndBuildImage.sh for improved resource management Rename CI validation YAML files to IT validation and update README.md links accordingly Remove unnecessary call to delete_datasource in data source validation Add environment variable configuration for IT in testWlsVmCluster.yml Add echo statements for better clarity in PostgreSQL server setup Delete existing Vnet after deleting resource group Update WebLogic versions in pom.xml to latest releases Update cron schedules in integration test YAML files to run every Monday Add sleep delay before deleting virtual network in integration test workflow Enhance integration test workflow by deleting VMs, network interfaces, and security groups before virtual network deletion Rename resource group deletion step and add wait time before deleting virtual network On branch support_integration_test_workflow Your branch is up to date with 'origin/support_integration_test_workflow'. Changes not staged for commit: (use "git add <file>..." to update what will be committed) (use "git restore <file>..." to discard changes in working directory) modified: .github/it/README.md modified: README.md Untracked files: (use "git add <file>..." to include in what will be committed) .github/it/tmate-sshkey.png no changes added to commit (use "git add" and/or "git commit -a") Signed-off-by: Ed Burns <edburns@microsoft.com> On branch support_integration_test_workflow Pin to specific known-good commit. modified: weblogic-azure-aks/src/main/arm/scripts/common.sh Signed-off-by: Ed Burns <edburns@microsoft.com> On branch support_integration_test_workflow Pin to specific known-good commit. modified: weblogic-azure-aks/src/main/arm/scripts/common.sh Signed-off-by: Ed Burns <edburns@microsoft.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
modified: weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/createUiDefinition.json
modified: weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/createUiDefinition.json
modified: weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/createUiDefinition.json