Skip to content

Commit 485d227

Browse files
galiachengedburns
galiacheng
and
edburns
authored
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>
1 parent 465bd59 commit 485d227

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+270
-1276
lines changed

‎.github/actions/setupmaven/action.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,12 @@ inputs:
77
runs:
88
using: "composite"
99
steps:
10+
- uses: actions/checkout@v4
1011
- name: Set up Apache Maven and JDK
11-
uses: actions/setup-java@v1
12+
uses: actions/setup-java@v4
1213
with:
13-
java-version: 1.8
14+
distribution: 'microsoft'
15+
java-version: 21
1416
server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
1517
server-username: MAVEN_USERNAME # env variable for username
1618
server-password: MAVEN_TOKEN # env variable for token

‎.github/workflows/testWlsAksWithDependencyCreation.yml

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,17 @@ on:
1919
description: 'The VM size for the AKS pool'
2020
required: true
2121
default: Standard_D2s_v3
22+
location:
23+
description: 'The location for the resources'
24+
required: true
25+
default: eastus
2226
# sample cURL
2327
# curl --verbose -X POST https://api.github.com/repos/<github_user>/weblogic-azure/dispatches -H 'Accept: application/vnd.github.everest-preview+json' -H 'Authorization: token <personal_access_token>' --data '{"event_type": "aks-integration-test-with-dependency-creation", "client_payload": {"gitUserNameForArtifactsLocation": "<github_user>", "testBranchNameForArtifactsLocation": "<branch_name>", "isForDemo": "false"}}'
2428
repository_dispatch:
2529
types: [aks-integration-test-with-dependency-creation,integration-test-all]
2630

2731
env:
2832
azureCredentials: ${{ secrets.AZURE_CREDENTIALS }}
29-
location: eastus
3033
resourceGroupForWlsAks: wlsd-aks-${{ github.run_id }}-${{ github.run_number }}
3134
dbAdminUser: weblogic
3235
dbPassword: ${{ secrets.DB_PASSWORD }}
@@ -51,6 +54,7 @@ jobs:
5154
testBranchNameForArtifactsLocation: ${{ steps.setup-env-variables-based-on-dispatch-event.outputs.testBranchNameForArtifactsLocation }}
5255
azCliVersion: ${{steps.set-az-cli-version.outputs.azCliVersion}}
5356
vmSize: ${{ steps.setup-env-variables-based-on-dispatch-event.outputs.vmSize }}
57+
location: ${{ steps.setup-env-variables-based-on-dispatch-event.outputs.location }}
5458
runs-on: ubuntu-latest
5559
steps:
5660
- uses: actions/checkout@v2.3.4
@@ -72,27 +76,32 @@ jobs:
7276
- name: Setup environment variables
7377
id: setup-env-variables-based-on-dispatch-event
7478
run: |
79+
location=eastus # default value
7580
if [ ${{ github.event_name }} == 'workflow_dispatch' ]; then
7681
isForDemo=${{ github.event.inputs.isForDemo }}
7782
gitUserNameForArtifactsLocation=${{ github.event.inputs.gitUserNameForArtifactsLocation }}
7883
testBranchNameForArtifactsLocation=${{ github.event.inputs.testBranchNameForArtifactsLocation }}
7984
vmSize=${{ github.event.inputs.vmSize }}
85+
location=${{ github.event.inputs.location }}
8086
else
8187
isForDemo=${{ github.event.client_payload.isForDemo }}
8288
gitUserNameForArtifactsLocation=${{ github.event.client_payload.gitUserNameForArtifactsLocation }}
8389
testBranchNameForArtifactsLocation=${{ github.event.client_payload.testBranchNameForArtifactsLocation }}
8490
vmSize=${{ github.event.client_payload.vmSize }}
91+
location=${{ github.event.client_payload.location }}
8592
fi
8693
8794
echo "##[set-output name=isForDemo;]${isForDemo}"
8895
echo "##[set-output name=gitUserNameForArtifactsLocation;]${gitUserNameForArtifactsLocation}"
8996
echo "##[set-output name=testBranchNameForArtifactsLocation;]${testBranchNameForArtifactsLocation}"
9097
echo "##[set-output name=vmSize;]${vmSize}"
98+
echo "##[set-output name=location;]${location}"
9199
92100
echo "isForDemo=${isForDemo}" >> $GITHUB_ENV
93101
echo "gitUserNameForArtifactsLocation=${gitUserNameForArtifactsLocation}" >> $GITHUB_ENV
94102
echo "testBranchNameForArtifactsLocation=${testBranchNameForArtifactsLocation}" >> $GITHUB_ENV
95103
echo "vmSize=${vmSize}" >> $GITHUB_ENV
104+
echo "location=${location}" >> $GITHUB_ENV
96105
- uses: actions/checkout@v2.3.4
97106
- name: Set up Maven with GitHub token
98107
uses: ./.github/actions/setupmaven
@@ -137,6 +146,7 @@ jobs:
137146
- name: Get AZ CLI Version
138147
run: |
139148
echo "azCliVersion=${{needs.preflight.outputs.azCliVersion}}" >> $GITHUB_ENV
149+
echo "location=${{needs.preflight.outputs.location}}" >> $GITHUB_ENV
140150
- uses: azure/login@v1
141151
id: azure-login
142152
with:
@@ -147,7 +157,7 @@ jobs:
147157
azcliversion: ${{ env.azCliVersion }}
148158
inlineScript: |
149159
echo "create resource group" ${{ env.resourceGroupForDB }}
150-
az group create --verbose --name ${{ env.resourceGroupForDB }} --location ${{ env.location }}
160+
az group create --verbose --name ${{ env.resourceGroupForDB }} --location $location
151161
152162
- uses: actions/checkout@v2.3.4
153163
- name: Set up PostgreSQL Flexible Server that allows access from Azure services
@@ -157,7 +167,7 @@ jobs:
157167
dbName: ${{ env.dbName }}
158168
dbPassword: ${{ env.dbPassword }}
159169
dbServerName: ${{ env.dbServerName }}
160-
location: ${{ env.location }}
170+
location: $location
161171
resourceGroupName: ${{ env.resourceGroupForDB }}
162172

163173
deploy-storage-account:
@@ -167,14 +177,17 @@ jobs:
167177
- name: Get AZ CLI Version
168178
run: |
169179
echo "azCliVersion=${{needs.preflight.outputs.azCliVersion}}" >> $GITHUB_ENV
180+
echo "location=${{needs.preflight.outputs.location}}" >> $GITHUB_ENV
170181
- name: Checkout Azure-Samples/cargotracker-wls-aks
171182
uses: actions/checkout@v2
172183
with:
173184
repository: Azure-Samples/cargotracker-wls-aks
174185
path: cargotracker
175-
- name: Maven build web app
176-
run: |
177-
mvn clean install -PweblogicOnAks --file cargotracker/pom.xml
186+
- uses: actions/setup-java@v4
187+
with:
188+
distribution: 'microsoft'
189+
java-version: '11'
190+
- run: mvn clean install -PweblogicOnAks --file cargotracker/pom.xml
178191
- name: Query version string for deployment verification
179192
run: |
180193
PROPERTY_FILE="cargotracker/target/cargo-tracker/WEB-INF/classes/org/eclipse/cargotracker/messages.properties"
@@ -191,15 +204,15 @@ jobs:
191204
azcliversion: ${{ env.azCliVersion }}
192205
inlineScript: |
193206
echo "create resource group" ${{ env.resourceGroupForStorageAccount }}
194-
az group create --verbose --name ${{ env.resourceGroupForStorageAccount }} --location ${{ env.location }}
207+
az group create --verbose --name ${{ env.resourceGroupForStorageAccount }} --location $location
195208
- name: Create Storage Account
196209
uses: azure/CLI@v1
197210
with:
198211
azcliversion: ${{ env.azCliVersion }}
199212
inlineScript: |
200213
az storage account create --name ${{ env.storageAccountName }} \
201214
--resource-group ${{ env.resourceGroupForStorageAccount }} \
202-
--location ${{ env.location }} \
215+
--location $location \
203216
--sku Standard_LRS \
204217
--kind StorageV2
205218
- name: Create Storage Container
@@ -221,6 +234,7 @@ jobs:
221234
- name: Get AZ CLI Version
222235
run: |
223236
echo "azCliVersion=${{needs.preflight.outputs.azCliVersion}}" >> $GITHUB_ENV
237+
echo "location=${{needs.preflight.outputs.location}}" >> $GITHUB_ENV
224238
- name: Checkout weblogic-azure
225239
uses: actions/checkout@v2
226240
with:
@@ -261,7 +275,7 @@ jobs:
261275
azcliversion: ${{ env.azCliVersion }}
262276
inlineScript: |
263277
echo "create resource group" ${{ env.resourceGroupForWlsAks }}
264-
az group create --verbose --name ${{ env.resourceGroupForWlsAks }} --location ${{ env.location }}
278+
az group create --verbose --name ${{ env.resourceGroupForWlsAks }} --location $location
265279
- name: Checkout Azure-Samples/cargotracker-wls-aks
266280
uses: actions/checkout@v2
267281
with:

‎pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<properties>
4141
<!-- versions start -->
4242
<!-- weblogic azure aks versions -->
43-
<version.wls-on-aks-azure-marketplace>1.0.86</version.wls-on-aks-azure-marketplace>
43+
<version.wls-on-aks-azure-marketplace>1.0.87</version.wls-on-aks-azure-marketplace>
4444
<!-- weblogic azure vm versions -->
4545
<version.arm-oraclelinux-wls>1.0.30</version.arm-oraclelinux-wls>
4646
<version.arm-oraclelinux-wls-admin>1.0.55</version.arm-oraclelinux-wls-admin>

‎resources/azure-common.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ azure.apiVersionForAvailabilitySets=2023-07-01
1111
# Microsoft.Compute/virtualMachines
1212
azure.apiVersionForVirtualMachines=2023-07-01
1313
# Microsoft.KeyVault/vaults
14-
azure.apiVersionForKeyVault=2023-02-01
14+
azure.apiVersionForKeyVault=2024-11-01
1515
# Microsoft.KeyVault/vaults/secrets
16-
azure.apiVersionForKeyVaultSecrets=2023-02-01
16+
azure.apiVersionForKeyVaultSecrets=2024-11-01
1717
# Microsoft.ManagedIdentity/userAssignedIdentities
1818
azure.apiVersionForIdentity=2023-01-31
1919
# Microsoft.Network/networkInterfaces

0 commit comments

Comments
 (0)