Skip to content

Enable Horizontal Autoscaling configuration in marketplace offer #297

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

Merged
merged 43 commits into from
May 11, 2024
Merged

Enable Horizontal Autoscaling configuration in marketplace offer #297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
51c68ff
create UI elements.
galiacheng Jan 31, 2024
0056988
some scripts
galiacheng Feb 26, 2024
54a039f
script to enable hpa
galiacheng Feb 27, 2024
3a15cb6
Error BCP057: The name "hpaScaleType" does not exist in the current c…
galiacheng Feb 27, 2024
6f008c0
enable promethues metrics
galiacheng Feb 28, 2024
89b8262
export java metrics
galiacheng Feb 29, 2024
83b19b9
for build failure
galiacheng Feb 29, 2024
170195d
for build failure
galiacheng Feb 29, 2024
25810c6
add pids.
galiacheng Mar 1, 2024
0c86264
test 1.
galiacheng Mar 1, 2024
e9598eb
fix failure
galiacheng Mar 1, 2024
6b0e459
output kedaServerAddress
galiacheng Mar 1, 2024
b67829f
fix az cli version
galiacheng Mar 1, 2024
27aa603
deploy ama from template
galiacheng Mar 1, 2024
aeba876
fix aksClusterName
galiacheng Mar 1, 2024
5793cd4
add outputs
galiacheng Mar 1, 2024
805af78
fix uami name
galiacheng Mar 1, 2024
a6645d6
add pid for wme
galiacheng Mar 4, 2024
2c0ea5e
use API version place holder.
galiacheng Mar 4, 2024
35bdf90
az cli 2.53.0 uses gatewayIPConfigurations to get gateway vnet.
galiacheng Mar 4, 2024
77880cb
use correct UAMI api version
galiacheng Mar 4, 2024
a42a50e
enable aks auto scaler
galiacheng Mar 5, 2024
a126b55
move script for WME in a seperated file
galiacheng Mar 5, 2024
7a32fc1
use aka link
galiacheng Mar 6, 2024
9dd23a1
use aka link for wko hpa doc
galiacheng Mar 6, 2024
8db06e9
add metrics
galiacheng Mar 6, 2024
1c6ff26
fix appgw network peering issue
galiacheng Mar 6, 2024
e3fe241
remove test parameters
galiacheng Mar 7, 2024
537caa1
update copyright
galiacheng Mar 18, 2024
1088305
upload diagram
galiacheng Mar 28, 2024
ba6aa02
enhance ui content
galiacheng Mar 28, 2024
6ec982d
update ui text.
galiacheng Mar 28, 2024
4765c29
call out default cpu/mem request in ui
galiacheng Mar 28, 2024
124d3d8
fix dd-2012351
galiacheng Mar 28, 2024
7715ec0
work around "module 'azure.core.pipeline.policies' has no attribute '…
galiacheng Apr 1, 2024
f155d67
Add files via upload
galiacheng Apr 22, 2024
8c59234
On branch wls-autoscaling-0131 Point to corresponding guidance on how…
edburns May 4, 2024
402ff79
Fix typo in createUiDefinition.json
galiacheng May 6, 2024
08993f2
fix KEDA installation and Prometheus basic_auth. (#2)
galiacheng May 8, 2024
0bdb7b4
remove testing info
galiacheng May 8, 2024
a1173f6
On branch wls-autoscaling-0131 Improve wording.
edburns May 9, 2024
d05bba8
On branch wls-autoscaling-0131 Changes supplemental to comment below.
edburns May 9, 2024
005fb8d
create connect_aks as common function. (#3)
galiacheng May 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions .github/workflows/testWlsAksWithDependencyCreation.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,13 +326,14 @@ jobs:
az aks get-credentials --resource-group ${{ env.resourceGroupForWlsAks }} --name $aksClusterName
- name: Generate&Apply configmap
run: |
wlsDomainNS=sample-domain1-ns
wlsConfigmapName=sample-domain1-wdt-config-map
wlsConfigmapJson=cargo-tracker-db.json
modelFilePath=models
mkdir ${modelFilePath}
echo "create configmap"
echo "export exisiting configmap"
kubectl -n sample-domain1-ns get configmap ${wlsConfigmapName} -o json >${wlsConfigmapJson}
kubectl -n ${wlsDomainNS} get configmap ${wlsConfigmapName} -o json >${wlsConfigmapJson}

echo "query model keys"
keyList=$(cat ${wlsConfigmapJson} | jq '.data | keys[]' | tr -d "\"")
Expand All @@ -343,24 +344,25 @@ jobs:
done

# remove current configmap and create a new one
kubectl -n sample-domain1-ns delete configmap ${wlsConfigmapName}
kubectl -n ${wlsDomainNS} delete configmap ${wlsConfigmapName}

cp cargotracker/src/test/aks/cargo-tracker-jms.yaml ${modelFilePath}/cargo-tracker-jms.yaml

kubectl -n sample-domain1-ns create configmap ${wlsConfigmapName} \
kubectl -n ${wlsDomainNS} create configmap ${wlsConfigmapName} \
--from-file=${modelFilePath}

kubectl -n sample-domain1-ns label configmap ${wlsConfigmapName} \
kubectl -n ${wlsDomainNS} label configmap ${wlsConfigmapName} \
weblogic.domainUID=sample-domain1
restartVersion=$(kubectl -n sample-domain1-ns get domain sample-domain1 '-o=jsonpath={.spec.restartVersion}')
restartVersion=$(kubectl -n ${wlsDomainNS} get domain sample-domain1 '-o=jsonpath={.spec.restartVersion}')
# increase restart version
restartVersion=$((restartVersion + 1))
# record timestamp before apply changes
timestampBeforePatchingDomain=$(date +%s)
# get the replica number
replicas=$(kubectl -n sample-domain1-ns get domain sample-domain1 -o json | jq '. | .spec.clusters[] | .replicas')
# get the replica number
clusterName=$(kubectl get cluster -n ${wlsDomainNS} -o json | jq -r '.items[0].metadata.name')
replicas=$(kubectl -n ${wlsDomainNS} get cluster ${clusterName} -o json | jq '. | .spec.replicas')
echo "append configmap and update restart version"
kubectl -n sample-domain1-ns patch domain sample-domain1 \
kubectl -n ${wlsDomainNS} patch domain sample-domain1 \
--type=json \
'-p=[{"op": "replace", "path": "/spec/restartVersion", "value": "'${restartVersion}'" }, {"op": "add", "path": "/spec/configuration/model/configMap", "value": "'${wlsConfigmapName}'" }]'
echo "timestampBeforePatchingDomain=${timestampBeforePatchingDomain}" >> $GITHUB_ENV
Expand Down
18 changes: 10 additions & 8 deletions .github/workflows/testWlsAksWithoutDependencyCreation.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,13 +282,14 @@ jobs:
az aks get-credentials --resource-group ${{ needs.preflight.outputs.resourceGroupForWlsAks }} --name $aksClusterName
- name: Generate&Apply configmap
run: |
wlsDomainNS=sample-domain1-ns
wlsConfigmapName=sample-domain1-wdt-config-map
wlsConfigmapJson=cargo-tracker-db.json
modelFilePath=models
mkdir ${modelFilePath}
echo "create configmap"
echo "export exisiting configmap"
kubectl -n sample-domain1-ns get configmap ${wlsConfigmapName} -o json >${wlsConfigmapJson}
kubectl -n ${wlsDomainNS} get configmap ${wlsConfigmapName} -o json >${wlsConfigmapJson}

echo "query model keys"
keyList=$(cat ${wlsConfigmapJson} | jq '.data | keys[]' | tr -d "\"")
Expand All @@ -299,24 +300,25 @@ jobs:
done

# remove current configmap and create a new one
kubectl -n sample-domain1-ns delete configmap ${wlsConfigmapName}
kubectl -n ${wlsDomainNS} delete configmap ${wlsConfigmapName}

cp cargotracker/src/test/aks/cargo-tracker-jms.yaml ${modelFilePath}/cargo-tracker-jms.yaml

kubectl -n sample-domain1-ns create configmap ${wlsConfigmapName} \
kubectl -n ${wlsDomainNS} create configmap ${wlsConfigmapName} \
--from-file=${modelFilePath}

kubectl -n sample-domain1-ns label configmap ${wlsConfigmapName} \
kubectl -n ${wlsDomainNS} label configmap ${wlsConfigmapName} \
weblogic.domainUID=sample-domain1
restartVersion=$(kubectl -n sample-domain1-ns get domain sample-domain1 '-o=jsonpath={.spec.restartVersion}')
restartVersion=$(kubectl -n ${wlsDomainNS} get domain sample-domain1 '-o=jsonpath={.spec.restartVersion}')
# increase restart version
restartVersion=$((restartVersion + 1))
# record timestamp before apply changes
timestampBeforePatchingDomain=$(date +%s)
# get the replica number
replicas=$(kubectl -n sample-domain1-ns get domain sample-domain1 -o json | jq '. | .spec.clusters[] | .replicas')
# get the replica number
clusterName=$(kubectl get cluster -n ${wlsDomainNS} -o json | jq -r '.items[0].metadata.name')
replicas=$(kubectl -n ${wlsDomainNS} get cluster ${clusterName} -o json | jq '. | .spec.replicas')
echo "append configmap and update restart version"
kubectl -n sample-domain1-ns patch domain sample-domain1 \
kubectl -n ${wlsDomainNS} patch domain sample-domain1 \
--type=json \
'-p=[{"op": "replace", "path": "/spec/restartVersion", "value": "'${restartVersion}'" }, {"op": "add", "path": "/spec/configuration/model/configMap", "value": "'${wlsConfigmapName}'" }]'
echo "timestampBeforePatchingDomain=${timestampBeforePatchingDomain}" >> $GITHUB_ENV
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<properties>
<!-- versions start -->
<!-- weblogic azure aks versions -->
<version.wls-on-aks-azure-marketplace>1.0.74</version.wls-on-aks-azure-marketplace>
<version.wls-on-aks-azure-marketplace>1.0.75</version.wls-on-aks-azure-marketplace>
<!-- weblogic azure vm versions -->
<version.arm-oraclelinux-wls>1.0.27</version.arm-oraclelinux-wls>
<version.arm-oraclelinux-wls-admin>1.0.50</version.arm-oraclelinux-wls-admin>
Expand Down
2 changes: 2 additions & 0 deletions resources/azure-common.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ azure.apiVersionForTags=2023-07-01
azure.apiVersionForStorage=2023-01-01
# Microsoft.Storage/storageAccounts/fileServices
azure.apiVersionForStorageFileService=2023-01-01
# Microsoft.Monitor/accounts
azure.apiVersionForMonitorAccount=2023-04-03

# AzureAzCLI version
azure.cli.version=2.53.0
Expand Down
Loading