move to src/main/arm/scripts

Signed-off-by: Jianguo Ma <jiangma@microsoft.com>
majguo · Jul 16, 2024 · 0c95223 · 0c95223
1 parent 42ef46a
commit 0c95223
Show file tree

Hide file tree

Showing 18 changed files with 6 additions and 6 deletions.
diff --git a/docs/howto-update-offer-in-partner-center.md b/docs/howto-update-offer-in-partner-center.md
@@ -31,7 +31,7 @@ If you make any changes for files located in the following path:
 
 * `src/main/arm`
 * `src/main/bicep`
-* `src/main/scripts`
+* `src/main/arm/scripts`
 
 ## Update the version of the solution template
 

diff --git a/docs/update-olo-wlo-version.md b/docs/update-olo-wlo-version.md
@@ -7,13 +7,13 @@ If there are no breaking changes in the new version of Open Liberty Operator / W
 
 Update the version of Open Liberty Operator:
 
-1. Open https://github.com/WASdev/azure.liberty.aks/blob/main/src/main/scripts/install.sh
+1. Open https://github.com/WASdev/azure.liberty.aks/blob/main/src/main/arm/scripts/install.sh
 1. Search `OLO_VERSION=`
 1. Update its value with new version. For example, if you want to update to version `1.2.0`, specify it as `OLO_VERSION=1.2.0`
 
 Update the version of WebSphere Liberty Operator:
 
-1. Open https://github.com/WASdev/azure.liberty.aks/blob/main/src/main/scripts/install.sh
+1. Open https://github.com/WASdev/azure.liberty.aks/blob/main/src/main/arm/scripts/install.sh
 1. Search `WLO_VERSION=`
 1. Update its value with new version. For example, if you want to update to version `1.2.0`, specify it as `WLO_VERSION=1.2.0`
 

diff --git a/src/main/arm/parameters.json b/src/main/arm/parameters.json
@@ -3,7 +3,7 @@
     "contentVersion": "1.0.0.0",
     "parameters": {
         "_artifactsLocation": {
-            "value": "${artifactsLocationBase}/src/main/"
+            "value": "${artifactsLocationBase}/src/main/arm"
         },
         "createCluster": {
             "value": "${createCluster}"

diff --git a/src/main/scripts/createAppGatewayIngress.sh → ...in/arm/scripts/createAppGatewayIngress.sh b/src/main/scripts/createAppGatewayIngress.sh → ...in/arm/scripts/createAppGatewayIngress.sh
diff --git a/src/main/scripts/enableAgic.sh → src/main/arm/scripts/enableAgic.sh b/src/main/scripts/enableAgic.sh → src/main/arm/scripts/enableAgic.sh
diff --git a/src/main/scripts/install.sh → src/main/arm/scripts/install.sh b/src/main/scripts/install.sh → src/main/arm/scripts/install.sh
diff --git a/...pplication-agic-autoscaling.yaml.template → ...pplication-agic-autoscaling.yaml.template b/...pplication-agic-autoscaling.yaml.template → ...pplication-agic-autoscaling.yaml.template
diff --git a/...en-liberty-application-agic.yaml.template → ...en-liberty-application-agic.yaml.template b/...en-liberty-application-agic.yaml.template → ...en-liberty-application-agic.yaml.template
diff --git a/...rty-application-autoscaling.yaml.template → ...rty-application-autoscaling.yaml.template b/...rty-application-autoscaling.yaml.template → ...rty-application-autoscaling.yaml.template
diff --git a/...ts/open-liberty-application.yaml.template → ...ts/open-liberty-application.yaml.template b/...ts/open-liberty-application.yaml.template → ...ts/open-liberty-application.yaml.template
diff --git a/src/main/scripts/preflight.sh → src/main/arm/scripts/preflight.sh b/src/main/scripts/preflight.sh → src/main/arm/scripts/preflight.sh
diff --git a/...in/scripts/queryPrivateIPForAppGateway.sh → ...rm/scripts/queryPrivateIPForAppGateway.sh b/...in/scripts/queryPrivateIPForAppGateway.sh → ...rm/scripts/queryPrivateIPForAppGateway.sh
diff --git a/src/main/scripts/utility.sh → src/main/arm/scripts/utility.sh b/src/main/scripts/utility.sh → src/main/arm/scripts/utility.sh
diff --git a/...pplication-agic-autoscaling.yaml.template → ...pplication-agic-autoscaling.yaml.template b/...pplication-agic-autoscaling.yaml.template → ...pplication-agic-autoscaling.yaml.template
diff --git a/...re-liberty-application-agic.yaml.template → ...re-liberty-application-agic.yaml.template b/...re-liberty-application-agic.yaml.template → ...re-liberty-application-agic.yaml.template
diff --git a/...rty-application-autoscaling.yaml.template → ...rty-application-autoscaling.yaml.template b/...rty-application-autoscaling.yaml.template → ...rty-application-autoscaling.yaml.template
diff --git a/...bsphere-liberty-application.yaml.template → ...bsphere-liberty-application.yaml.template b/...bsphere-liberty-application.yaml.template → ...bsphere-liberty-application.yaml.template
diff --git a/src/main/bicep/modules/_deployment-scripts/_ds-preflight.bicep b/src/main/bicep/modules/_deployment-scripts/_ds-preflight.bicep
@@ -38,8 +38,8 @@ param sourceImagePath string
 
 param utcValue string = utcNow()
 
-var base64_utility = loadFileAsBase64('../../../scripts/utility.sh')
-var base64_preflight = loadFileAsBase64('../../../scripts/preflight.sh')
+var base64_utility = loadFileAsBase64('../../../arm/scripts/utility.sh')
+var base64_preflight = loadFileAsBase64('../../../arm/scripts/preflight.sh')
 
 resource deploymentScript 'Microsoft.Resources/deploymentScripts@${azure.apiVersionForDeploymentScript}' = {
   name: name