Skip to content

Commit

Permalink
Merge branch 'release/v3.1.0' into WIFI-13821
Browse files Browse the repository at this point in the history
  • Loading branch information
carsten989 authored Jun 10, 2024
2 parents bf38159 + 1052d57 commit a1d60ba
Show file tree
Hide file tree
Showing 4 changed files with 39 additions and 9 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/git-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
run: |
pip3 install yq
helm plugin install https://github.com/databus23/helm-diff
helm plugin install https://github.com/aslafy-z/helm-git
helm plugin install https://github.com/aslafy-z/helm-git --version 0.16.0
ls ~/.local/share/helm/plugins/helm-git/helm-git-plugin.sh || true
sed 's/--skip-refresh //' -i ~/.local/share/helm/plugins/helm-git/helm-git-plugin.sh
Expand All @@ -54,6 +54,6 @@ jobs:
git config --global credential.helper store
git config --global user.email "[email protected]"
git config --global user.name "TIP Automation User"
helm repo add bitnami https://charts.bitnami.com/bitnami
#helm repo add bitnami https://charts.bitnami.com/bitnami
helm repo update
./git-release-tool.sh
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ defaults:

jobs:
helm-package:
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
env:
HELM_REPO_URL: https://tip.jfrog.io/artifactory/tip-wlan-cloud-ucentral-helm/
HELM_REPO_USERNAME: ucentral
Expand Down Expand Up @@ -42,7 +42,7 @@ jobs:
- name: Build package
working-directory: wlan-cloud-ucentral-deploy/chart
run: |
helm plugin install https://github.com/aslafy-z/helm-git --version 0.10.0
helm plugin install https://github.com/aslafy-z/helm-git --version 0.16.0
#helm repo add bitnami https://charts.bitnami.com/bitnami
#helm repo update
helm dependency update
Expand Down Expand Up @@ -70,7 +70,7 @@ jobs:
cat Chart.yaml | yq -r '.dependencies[] | "\(.name) - \(.repository) v\(.version)"' >> release.txt
- name: Create GitHub release
uses: softprops/action-gh-release@v1
uses: softprops/action-gh-release@v2
with:
body_path: wlan-cloud-ucentral-deploy/chart/release.txt
files: wlan-cloud-ucentral-deploy/chart/dist/*
Expand All @@ -80,7 +80,7 @@ jobs:
needs: helm-package
steps:
- name: Trigger testing of release
uses: peter-evans/repository-dispatch@v1
uses: peter-evans/repository-dispatch@v3
with:
token: ${{ secrets.WLAN_TESTING_PAT }}
repository: Telecominfraproject/wlan-testing
Expand Down
30 changes: 28 additions & 2 deletions chart/environment-values/values.openwifi-qa.owls-external.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,17 @@ owgw:
#simulatorid: 53494D020202
# on a host with more CPUs you may need to bump this up from default of 64
storage.type.postgresql.maxsessions: 120
# this actually disables websocket logging
logging.websocket = true
# this actually disables websocket logging:
logging.websocket: true
# consider lowering the # of days to keep archives in the database
#archiver.db.0.name = healthchecks
#archiver.db.0.keep = 1
#archiver.db.1.name = statistics
#archiver.db.1.keep = 1
#archiver.db.2.name = devicelogs
#archiver.db.2.keep = 1
#archiver.db.3.name = commandlist
#archiver.db.3.keep = 1

resources:
requests:
Expand All @@ -26,3 +35,20 @@ owgw:
limits:
cpu: 2000m
memory: 5Gi

# Postgres tuning for larger # of APs
#postgresql:
# primary:
# resourcesPreset: large
# persistence:
# size: 120Gi

owprov:
# consider providing more memory to owprov
resources:
requests:
cpu: 10m
memory: 20Mi
limits:
cpu: 100m
memory: 4Gi
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,16 @@ postgresql:
auth:
postgresPassword: postgres
primary:
# Consider using this resource model for small installations
#resourcesPreset: medium
extendedConfiguration: |-
max_connections = 550
shared_buffers = 128MB
# log_error_verbosity = verbose
initdb:
scriptsSecret: tip-openwifi-initdb-scripts
# Consider using this disk size for small installations
#persistence:
# size: 30Gi

postgresql-ha:
enabled: false
Expand Down

0 comments on commit a1d60ba

Please sign in to comment.