Skip to content

Added workflow and updated setup scripts for cluster and admin #16

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 2 commits into from
Aug 30, 2021
Merged

Added workflow and updated setup scripts for cluster and admin #16

merged 2 commits into from
Aug 30, 2021

Conversation

sanjaymantoor
Copy link
Member

  • Added github workflow actions
  • Updated ARM templates and scripts for arguments as per STDIN

@gnsuryan
Copy link
Member

I have reviewed the changes done by Sanjay and the changes look fine.
I have also deployed the cluster offer using the changes done by Sanjay and the deployment went through successfully.
I also found that the CI/CD enabled in sanjay's repo also went through fine.

@sanjaymantoor sanjaymantoor changed the title Added workflow and updated setup scripts for cluster Added workflow and updated setup scripts for cluster and admin Aug 30, 2021
@gnsuryan
Copy link
Member

I have tested the Admin offer changes done on by Sanjay on his local github repository, w.r.t. enabling CI CD for Oracle Github repo.
I have also tested the Admin Offer, by deploying the offer using TLS/SSL Enabled and certificates picked up from KeyVault and found it working fine.

@rjeberhard rjeberhard merged commit a9ef332 into oracle:main Aug 30, 2021
edburns pushed a commit to azure-javaee/weblogic-azure that referenced this pull request Aug 13, 2025
@galiacheng @edburns
# This is a combination of 24 commits.
ce78bdf 
# 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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@rjeberhard rjeberhard Awaiting requested review from rjeberhard

Assignees

@rjeberhard rjeberhard

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@sanjaymantoor @gnsuryan @rjeberhard