-
Notifications
You must be signed in to change notification settings - Fork 16
Create Pull Request to apply delta between initial code and near-MVP #11
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
new file: pom.xml new file: src/main/arm/createUiDefinition.json new file: src/main/arm/mainTemplate.json Signed-off-by: Ed Burns <edburns@microsoft.com>
modified: src/main/arm/createUiDefinition.json https://dev.azure.com/devdiv/DevDiv/_workitems/edit/1310331 Signed-off-by: Ed Burns <edburns@microsoft.com>
modified: src/main/arm/createUiDefinition.json https://dev.azure.com/devdiv/DevDiv/_workitems/edit/1310331 Signed-off-by: Ed Burns <edburns@microsoft.com>
1. Put AKS cluster info, ACR info, Oracle WebLogic Image info to the second blade. 2. Remove context root from Java EE application blade. 3. Basics: add Oracle SSO account 4. ELK blade: add checkbox of operator logs
# build template `bicep build main.bicep` # deploy template `az deployment group create -f main.json -g <rg-name>`
mvn -Pbicep -Ddev -Passembly clean install https://dev.azure.com/devdiv/DevDiv/_workitems/edit/1311178 renamed: src/main/arm/main.bicep -> src/main/bicep/mainTemplate.bicep renamed: src/main/arm/modules/aks.bicep -> src/main/bicep/modules/aks.bicep modified: pom.xml deleted: src/main/arm/mainTemplate.json Signed-off-by: Ed Burns <edburns@microsoft.com>
Proposed pids module. - create pid.bicep for prod build - create pid-dev.bicep for deve build - put pids to the output of pid.bicep - use value from pid.bicep output for pid deployment Changes to be committed: modified: pom.xml modified: src/main/bicep/mainTemplate.bicep new file: src/main/bicep/modules/pids/empty.bicep new file: src/main/bicep/modules/pids/pid-dev.bicep new file: src/main/bicep/modules/pids/pid.bicep Related work items: #1314703
https://dev.azure.com/devdiv/DevDiv/_git/wls-on-aks-azure-marketplace/pullrequest/323147 Allow to create Azure resource: AKS ACR AKS monitoring Storage account for persistent volume Initialize a simple WLS cluster with One domain One cluster with name cluster-1 Support to deploy multiple applications Refactoring Update private bicep file name with prefix _ Depends on pr-to-azure-javaee-iaas-19 Offer for test https://portal.azure.com/#create/microsoft_javaeeonazure_test.20210108-galia-previewcluster Changes modified: pom.xml increase version number modified: src/main/arm/createUiDefinition.json APPROVED remove uncompleted feature from UI add option for aks pv/pvc creation new file: src/main/arm/scripts/buildWLSDockerImage.sh APPROVED run in vm extension, to build docker image new file: src/main/arm/scripts/domain.yaml.template APPROVED domain resource description template new file: src/main/arm/scripts/model.properties APPROVED model properties new file: src/main/arm/scripts/model.yaml APPROVED model configuration new file: src/main/arm/scripts/pv.yaml.template APPROVED pv template new file: src/main/arm/scripts/pvc.yaml.template APPROVED pvc template new file: src/main/arm/scripts/setupWLSDomain.sh APPROVED run in deployment script create vm resource to build docker image set up wls domain modified: src/main/bicep/mainTemplate.bicep APPROVED add deployment script module add acr module add storage module new file: src/main/bicep/modules/azure-resoruces/acr.bicep APPROVED script to deploy acr modified: src/main/bicep/modules/azure-resoruces/aks.bicep APPROVED add required parameters new file: src/main/bicep/modules/azure-resoruces/storage.bicep APPROVED script to deploy storage new file: src/main/bicep/modules/deployment-scripts/ds-create-wls-cluster.bicep APPROVED deployment script to set up WLS domain modified: src/main/bicep/modules/pids/empty.bicep APPROVED add comments modified: src/main/bicep/modules/pids/pid-dev.bicep APPROVED add comments modified: src/main/bicep/modules/pids/pid.bicep APPROVED add comments modified: src/main/bicep/modules/setupWebLogicCluster.bicep APPROVED modified: src/main/bicep/modules/mainTemplate.bicep APPROVED.
- Allow to set up public lv svc for admin server and cluster - Allow to set up Application Gateway ingress for admin server and cluster - Allow to create custom DNS - Resolve comment - apply meaningful script starting - use a unique ubuntu machine name - Known issue - HTTPS access is not available now. Related work items: #1326035, #1331317, #1333328, #1335576, #1336513
- Enable internal load balancer service - Update WDT version to 1.9.14 - Expose gateway HTTPS - E2E SSL to admin console and cluster Related work items: #1340864, #1355692, #1355738, #1355739
Post deployment: update applications. - use arm template, az cli to update applications - allow to use a new weblogic standard image - applications input via: - sas url - storage blob name Performance: - It took 15min to update 1 war (3.47KiB) and 1 ear (19.63KiB) Related work items: #1356173
…tring. - Parse sas url that has slash in query string. - Use curl global timeout in `genImageModel.sh` - Enhance comments of parameter `appPackageFromStorageBlob` Related work items: #1356173, #1361385
…and marketplace offer ### Description This pr is to enhance the templates to allow updating weblogic cluster using maintemplate and marketplace offer. Including - update an existing domain using maintemplate and marketplace offer - create multiple domains using maintemplate and marketplace offer ### What those scripts will do? - build a new image according new inputs - apply the new image to current cluster if the target domain exists - create new domain with one cluster using the image if the target domain does not exist ### Difference between using maintemplate and marketplace offer - use maintemplate - invoke maintamplate using AZ CLI in the existing resource group - be able to re-use existing key vault and storage account - use marketplace offer - invoke the marketplace offer in a new resource group, it's not allowed to deploy the offer in a non-empty resource group - be able to re-use the storage account - will create a new key vault for certificates if there are certificate inputs, the previous key vault will not be used any more (it will not cause cost). Related work items: #1361284, #1363463
Description: - Configure data source using offer - Configure data source using ARM - post deployment Support data source: - PostgreSQL - Oracle - Azure SQL Performance: - create/update/delete database: 6min - create/update with invalid database: 10 min Test: - PostgreSQL - Azure SQL Related work items: #1364822, #1364824, #1366287, #1367535, #1367537
Ignore VS Code files
… Add comment for how to bu... On branch master Update version for partner center. Add comment for how to build. modified: pom.xml Signed-off-by: Ed Burns <edburns@microsoft.com>
Fix MS SQL driver. Related work items: #1370810
- Support remote access - Read sensitive parameters from stdin ### Test: - Remote console - non-SSL is working - Remote console - SSL is working, see steps in #1370834 Logs: ``` 2021.08.13 14:34:26 INFO com.oracle.weblogic.console.backend.services.connection.ConnectionResource !thread!: POST data: {"domainUrl":"https://admin0813.wlseng-azuretest.org/console"} 2021.08.13 14:34:26 WARNING org.glassfish.jersey.message.internal.MessagingBinders !thread!: A class javax.activation.DataSource for a default provider MessageBodyWriter<javax.activation.DataSource> was not found. The provider is not available. 2021.08.13 14:34:28 INFO weblogic.console.backend.connection.ConnectionManager !thread!: Connection response from WebLogic Domain: InboundJaxrsResponse{context=ClientResponse{method=GET, uri=https://admin0813.wlseng-azuretest.org/console/management/weblogic/12.2.1.0.0/domainConfig?links=none&fields=name%2CdomainVersion&enableConsoleRestExtension=true, status=200, reason=OK}} 2021.08.13 14:34:28 INFO weblogic.console.backend.connection.ConnectionManager !thread!: >>>> Connected to the WebLogic Domain 'domain1' with version '12.2.1.4.0' <<<< ``` Related work items: #1365662, #1370834, #1370835, #1371638, #1373891
weblogic-azure-aks/pom.xml
Outdated
Copyright (c) 2019 Oracle and/or its affiliates. All rights reserved. | ||
Licensed to the Apache Software Foundation (ASF) under one |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The project is license using UPL as you used in other files in this PR. Why the Apache license here?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ah...I copied the file from original wls-vm offer, and forgot to fix it, thanks for your finding :)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed in galiacheng@6eeb6ca
# | ||
# 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 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
helm -> Helm
Capitalize proper nouns (in this case, a product name)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fix all product name of Helm in galiacheng@6d2890a
shared: false | ||
|
||
################################################################################ | ||
# Specify which kubernetes namespace the ingress controller will watch |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
kubernetes -> Kubernetes
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed in galiacheng@37f4036
# 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. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ingress Controller -> ingress controller (it's not a proper noun here because there is no product name)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fix in galiacheng@820c7e4
if [ "${appPackageUrls}" == "[]" ]; then | ||
return | ||
fi | ||
echo "Starting generating image model file..." |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Starting generation of image model file...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed in galiacheng@e599233
|
||
# MICROSOFT_INTERNAL | ||
# Specify tag 'SkipASMAzSecPack' to skip policy 'linuxazuresecuritypackautodeployiaas_1.6' | ||
# Specify tag 'SkipNRMS*' to skip Microsoft internal NRMS policy, which cause vm-redeployed issue |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
cause -> causes
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed in galiacheng@e599233
pvcName=${wlsDomainUID}-pvc-azurefile | ||
pvName=${wlsDomainUID}-pv-azurefile | ||
|
||
ret=$(kubectl -n ${wlsDomainNS} get pvc ${pvcName} | grep "Bound") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This doesn't have to be fixed now, but I've noticed the pattern several times in this PR or performing a kubectl get
and then doing a grep
on the results rather then using the JSONPath support to get the exact field that you want (https://kubernetes.io/docs/reference/kubectl/jsonpath/).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
How long before some unfortunate customer includes "Bound" in the name of the PVC? :)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
For the first comment, we used grep
in the older source code, and after them, we found JSONPath is more accurate.I will create another PR to enhance all of them. Azure DevOps task: AB#1377637
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
For the second comment, here, we would like to check if we need to create another Azure Storage Account for storage, we assume the PVC is bound.
You are right, we should check pvc status and wait for it bound when it is created.
Fixed in galiacheng@168bb49
|
||
if [ $index -eq 0 ];then | ||
secretStrings="${secretStrings}\"${item}\"," | ||
else |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
How are the branches different? Maybe it's just my eyes, but the if and else branches look identical.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is a bug. The branches are to generate the secret array string with/without comma for different cases. I found kubectl patch
works fine with values like ["secret1","secret2",]
, unfortunately, I didn't find this bug during e2e testing.
Fixed it in galiacheng@17537a0
echo "copy test script ${testDatasourceScript} to pod path /tmp/${dsScriptFileName}" | ||
targetDSFilePath=/tmp/${dsScriptFileName} | ||
kubectl cp ${testDatasourceScript} -n ${wlsDomainNS} ${podName}:${targetDSFilePath} | ||
kubectl exec -it ${podName} -n ${wlsDomainNS} -- bash -c "wlst.sh ${targetDSFilePath}" | grep "State is Running" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You should probably name the container "-c weblogic-server" just in case there are other containers in the pod for the server instance (e.g. fluentd or Istio proxy, etc.)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed it in galiacheng@17537a0
Changes to be committed: modified: pom.xml
Changes to be committed: modified: src/main/arm/scripts/appgw-helm-config.yaml.template modified: src/main/arm/scripts/setupNetworking.sh modified: src/main/arm/scripts/setupWLSDomain.sh
Changes to be committed: modified: src/main/arm/scripts/appgw-helm-config.yaml.template
Changes to be committed: modified: src/main/arm/scripts/buildWLSDockerImage.sh modified: src/main/arm/scripts/createVMAndBuildImage.sh
Hello @rjeberhard I have made changes to all the comments, please have a look. |
Changes to be committed: modified: src/main/arm/scripts/common.sh modified: src/main/arm/scripts/setupWLSDomain.sh modified: src/main/arm/scripts/utility.sh
… connection script. Specify weblogic container name in `kubectl exec` commands. Changes to be committed: modified: src/main/arm/scripts/common.sh modified: src/main/arm/scripts/setupDBConnections.sh
Sweet! Thanks @galiacheng and @rjeberhard . |
Create Pull Request to apply delta between initial code and near-MVP
merge oracle/weblogic-azure to gnsuryan:test repo
# This is the 1st commit message: single node: modify UI and template increase pom upgrade Microsoft.Resources/deployments API version add toolTip for tag control. fix artifact version # This is the commit message #2: admin offer: modify UI and templates # This is the commit message #3: guidance for tagging resource # This is the commit message oracle#4: fix function error in admin/mainTemplate.json # This is the commit message oracle#5: use aka link for maven download url # This is the commit message oracle#6: fix mavn installation path # This is the commit message oracle#7: use actions/upload-artifact: v4 # This is the commit message oracle#8: modify UI and templates in cluster offer # This is the commit message oracle#9: fix tag issue in _pswlessDbTemplate.json # This is the commit message oracle#10: use download-artifact@v4 # This is the commit message oracle#11: format mainTemplate.json in cluster offer # This is the commit message oracle#12: fix variable reference issue # This is the commit message oracle#13: fix template error in cluster offer # This is the commit message oracle#14: 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> # This is the commit message oracle#15: On branch tags-for-resources Reference the PR. modified: resources/doc/guidance-for-tagging-resource.md Signed-off-by: Ed Burns <edburns@microsoft.com> # This is the commit message oracle#16: 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> # This is the commit message oracle#17: 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> # This is the commit message oracle#18: 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> # This is the commit message oracle#19: Support tagging resource in WLS AKS offer (oracle#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. # This is the commit message oracle#20: modify ui definition to show the java option element (oracle#332) increase pom # This is the commit message oracle#21: 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> # This is the commit message oracle#22: use the properties Zhihao provided. # This is the commit message oracle#23: 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> # This is the commit message oracle#24: enable deployment to non-empty resource groups
Issue: #9
With features ready: