Compare commits

..

9 Commits

Author SHA1 Message Date
TIP Automation User
32d5d8bb4b Chg: update image tag in helm values to v3.0.2-RC2 2024-04-05 21:16:54 +00:00
Jaspreet Sachdev
eb1bb37158 Changed release to 3.0.2-RC1
Signed-off-by: Jaspreet Sachdev <jaspreet.sachdev@kinarasystems.com>
2024-03-25 12:56:50 -04:00
Carsten Schafer
fa0d1268a0 Merge pull request #263 from Telecominfraproject/rel-v3.0.0
Rel v3.0.0
2024-03-22 15:44:20 -04:00
Carsten Schafer
2578d17605 Merge branch 'release/v3.0.0' into rel-v3.0.0 2024-03-22 15:44:06 -04:00
Jaspreet Sachdev
e2f99ae6e2 Changed the reg expression
Signed-off-by: Jaspreet Sachdev <jaspreet.sachdev@kinarasystems.com>
2024-02-01 12:30:51 -05:00
TIP Automation User
56e69f9339 Chg: update image tag in helm values to v3.0.0 2023-12-29 15:19:45 +00:00
TIP Automation User
ad93ba4a27 Chg: update image tag in helm values to v3.0.0-RC3 2023-12-20 18:24:30 +00:00
TIP Automation User
09dd14e0b2 Chg: update image tag in helm values to v3.0.0-RC2 2023-12-15 23:03:44 +00:00
TIP Automation User
0bfa6cd508 Chg: update image tag in helm values to v3.0.0-RC1 2023-11-27 17:38:37 +00:00
21 changed files with 110 additions and 256 deletions

View File

@@ -49,7 +49,7 @@ jobs:
needs: envs
steps:
- name: Checkout actions repo
uses: actions/checkout@v4
uses: actions/checkout@v3
with:
repository: Telecominfraproject/.github
path: github
@@ -72,7 +72,7 @@ jobs:
needs: envs
steps:
- name: Checkout actions repo
uses: actions/checkout@v4
uses: actions/checkout@v3
with:
repository: Telecominfraproject/.github
path: github
@@ -95,7 +95,7 @@ jobs:
needs: envs
steps:
- name: Checkout actions repo
uses: actions/checkout@v4
uses: actions/checkout@v3
with:
repository: Telecominfraproject/.github
path: github

View File

@@ -22,7 +22,7 @@ jobs:
DOCKER_REGISTRY_URL: tip-tip-wlan-cloud-ucentral.jfrog.io
DOCKER_REGISTRY_USERNAME: ucentral
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v3
- name: Build Docker image
working-directory: chart/docker

View File

@@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout actions repo
uses: actions/checkout@v4
uses: actions/checkout@v3
with:
repository: Telecominfraproject/.github
path: github

View File

@@ -28,7 +28,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repo
uses: actions/checkout@v4
uses: actions/checkout@v3
with:
path: wlan-cloud-ucentral-deploy
@@ -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 --version 0.16.0
helm plugin install https://github.com/aslafy-z/helm-git
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
@@ -54,6 +54,6 @@ jobs:
git config --global credential.helper store
git config --global user.email "tip-automation@telecominfraproject.com"
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

View File

@@ -11,13 +11,13 @@ defaults:
jobs:
helm-package:
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
env:
HELM_REPO_URL: https://tip.jfrog.io/artifactory/tip-wlan-cloud-ucentral-helm/
HELM_REPO_USERNAME: ucentral
steps:
- name: Checkout uCentral assembly chart repo
uses: actions/checkout@v4
uses: actions/checkout@v3
with:
path: wlan-cloud-ucentral-deploy
repository: Telecominfraproject/wlan-cloud-ucentral-deploy
@@ -42,9 +42,9 @@ jobs:
- name: Build package
working-directory: wlan-cloud-ucentral-deploy/chart
run: |
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 plugin install https://github.com/aslafy-z/helm-git --version 0.10.0
helm repo add bitnami https://charts.bitnami.com/bitnami
helm repo update
helm dependency update
mkdir dist
helm package . -d dist
@@ -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@v2
uses: softprops/action-gh-release@v1
with:
body_path: wlan-cloud-ucentral-deploy/chart/release.txt
files: wlan-cloud-ucentral-deploy/chart/dist/*
@@ -80,7 +80,7 @@ jobs:
needs: helm-package
steps:
- name: Trigger testing of release
uses: peter-evans/repository-dispatch@v3
uses: peter-evans/repository-dispatch@v1
with:
token: ${{ secrets.WLAN_TESTING_PAT }}
repository: Telecominfraproject/wlan-testing

View File

@@ -2,35 +2,39 @@ apiVersion: v2
name: openwifi
appVersion: "1.0"
description: A Helm chart for Kubernetes
version: 3.1.0
version: 3.0.2-RC2
dependencies:
- name: owgw
repository: "git+https://github.com/Telecominfraproject/wlan-cloud-ucentralgw@helm?ref=v3.1.0"
repository: "git+https://github.com/Telecominfraproject/wlan-cloud-ucentralgw@helm?ref=v3.0.2-RC1"
version: 0.1.0
- name: owsec
repository: "git+https://github.com/Telecominfraproject/wlan-cloud-ucentralsec@helm?ref=v3.1.0"
repository: "git+https://github.com/Telecominfraproject/wlan-cloud-ucentralsec@helm?ref=v3.0.2-RC1"
version: 0.1.0
- name: owfms
repository: "git+https://github.com/Telecominfraproject/wlan-cloud-ucentralfms@helm?ref=v3.1.0"
repository: "git+https://github.com/Telecominfraproject/wlan-cloud-ucentralfms@helm?ref=v3.0.2-RC1"
version: 0.1.0
- name: owprov
repository: "git+https://github.com/Telecominfraproject/wlan-cloud-owprov@helm?ref=v3.1.0"
repository: "git+https://github.com/Telecominfraproject/wlan-cloud-owprov@helm?ref=v3.0.2-RC1"
version: 0.1.0
- name: owanalytics
repository: "git+https://github.com/Telecominfraproject/wlan-cloud-analytics@helm?ref=v3.1.0"
repository: "git+https://github.com/Telecominfraproject/wlan-cloud-analytics@helm?ref=v3.0.2-RC1"
version: 0.1.0
- name: owgwui
repository: "git+https://github.com/Telecominfraproject/wlan-cloud-ucentralgw-ui@helm?ref=v3.1.0"
repository: "git+https://github.com/Telecominfraproject/wlan-cloud-ucentralgw-ui@helm?ref=v3.0.2-RC1"
version: 0.1.0
- name: owprovui
repository: "git+https://github.com/Telecominfraproject/wlan-cloud-owprov-ui@helm?ref=v3.1.0"
repository: "git+https://github.com/Telecominfraproject/wlan-cloud-owprov-ui@helm?ref=v3.0.2-RC2"
version: 0.1.0
- name: owsub
repository: "git+https://github.com/Telecominfraproject/wlan-cloud-userportal@helm?ref=v3.1.0"
repository: "git+https://github.com/Telecominfraproject/wlan-cloud-userportal@helm?ref=v3.0.2-RC1"
version: 0.1.0
- name: owrrm
repository: "git+https://github.com/Telecominfraproject/wlan-cloud-rrm@helm?ref=v2.8.0"
version: 0.1.0
- name: kafka
repository: https://tip.jfrog.io/artifactory/tip-wlan-cloud-ucentral-helm/
version: 13.0.2
condition: kafka.enabled
- name: owls
repository: "git+https://github.com/Telecominfraproject/wlan-cloud-owls@helm?ref=main"
version: 0.1.0
@@ -39,14 +43,14 @@ dependencies:
repository: "git+https://github.com/Telecominfraproject/wlan-cloud-owls-ui@helm?ref=master"
version: 0.1.0
condition: owlsui.enabled
- name: kafka
repository: oci://registry-1.docker.io/bitnamicharts
version: 28.2.3
condition: kafka.enabled
- name: haproxy
repository: oci://registry-1.docker.io/bitnamicharts
version: 0.13.3
condition: haproxy.enabled
#- name: postgresql-ha
# repository: https://tip.jfrog.io/artifactory/tip-wlan-cloud-ucentral-helm/
# version: 8.6.13
# condition: postgresql-ha.enabled
- name: postgresql
repository: oci://registry-1.docker.io/bitnamicharts
version: 13.4.3

View File

@@ -1,3 +0,0 @@
_values.custom-*.yaml
certs/
env_*

View File

@@ -1,15 +1,8 @@
#!/bin/bash
[ -z "$NAMESPACE" ] && echo "No NAMESPACE set" && exit 1
ns="openwifi-$NAMESPACE"
echo "Cleaning up namespace $ns in 10 seconds..."
sleep 10
echo "- delete tip-openwifi helm release in $ns"
helm -n "$ns" delete tip-openwifi
helm -n openwifi-"$NAMESPACE" delete tip-openwifi
if [[ "$1" == "full" ]] ; then
echo "- delete $ns namespace in 30 seconds..."
sleep 30
echo "- delete $ns namespace"
kubectl delete ns "$ns"
kubectl delete ns openwifi-"$NAMESPACE"
fi
echo "- cleaned up $ns namespace"
exit 0

View File

@@ -108,7 +108,7 @@ export OWRRM_VERSION_TAG=$(echo ${OWRRM_VERSION} | tr '/' '-')
# Check deployment method that's required for this environment
helm plugin install https://github.com/databus23/helm-diff || true
if [[ "$DEPLOY_METHOD" == "git" ]] ; then
helm plugin list | grep "^helm-git" || helm plugin install https://github.com/aslafy-z/helm-git || true
helm plugin install https://github.com/aslafy-z/helm-git --version 0.10.0 || true
rm -rf wlan-cloud-ucentral-deploy || true
git clone https://github.com/Telecominfraproject/wlan-cloud-ucentral-deploy.git
cd wlan-cloud-ucentral-deploy
@@ -125,7 +125,8 @@ if [[ "$DEPLOY_METHOD" == "git" ]] ; then
sed -i '/wlan-cloud-userportal@/s/ref=.*/ref='${OWSUB_VERSION}'\"/g' Chart.yaml
sed -i '/wlan-cloud-rrm@/s/ref=.*/ref='${OWRRM_VERSION}'\"/g' Chart.yaml
fi
#helm repo add bitnami https://charts.bitnami.com/bitnami && helm repo update
helm repo add bitnami https://charts.bitnami.com/bitnami
helm repo update
[ -z "$SKIP_DEPS" ] && helm dependency update
cd ../..
export DEPLOY_SOURCE="wlan-cloud-ucentral-deploy/chart"
@@ -161,13 +162,14 @@ else
export OWGW_SERVICE_DNS_RECORDS=""
fi
envsubst < values.custom.tpl.yaml > _values.custom-${NAMESPACE}.yaml
envsubst < values.custom.tpl.yaml > values.custom-${NAMESPACE}.yaml
set -x
helm upgrade --install --create-namespace --wait --timeout 60m \
--namespace openwifi-${NAMESPACE} \
${VALUES_FILES_FLAGS[*]} \
${EXTRA_VALUES_FLAGS[*]} \
-f _values.custom-${NAMESPACE}.yaml \
-f values.custom-${NAMESPACE}.yaml \
--set-file owgw.certs."restapi-cert\.pem"=$CERT_LOCATION \
--set-file owgw.certs."restapi-key\.pem"=$KEY_LOCATION \
--set-file owgw.certs."websocket-cert\.pem"=$CERT_LOCATION \

View File

@@ -77,33 +77,10 @@ owprovui:
REACT_APP_UCENTRALSEC_URL: http://localhost:16001
kafka:
volumePermissions:
enabled: true
commonAnnotations:
cluster-autoscaler.kubernetes.io/safe-to-evict: "false"
heapOpts: -Xmx512m -Xms512m
readinessProbe:
initialDelaySeconds: 45
livenessProbe:
initialDelaySeconds: 60
kraft:
enabled: true
heapOpts: -Xmx1024m -Xms1024m
zookeeper:
enabled: false
controller:
replicaCount: 1
extraConfig: |-
maxMessageBytes = 1048588
extraEnvVars:
- name: ALLOW_PLAINTEXT_LISTENER
value: "yes"
listeners:
client:
protocol: PLAINTEXT
containerPort: 9092
controller:
protocol: "PLAINTEXT"
broker:
persistence:
size: 20Gi
replicaCount: 2
heapSize: 256

View File

@@ -323,43 +323,13 @@ owprovui:
REACT_APP_UCENTRALSEC_URL: https://localhost:16001
kafka:
volumePermissions:
enabled: true
commonAnnotations:
cluster-autoscaler.kubernetes.io/safe-to-evict: "false"
#resources:
# requests:
# cpu: 100m
# memory: 512Mi
# limits:
# cpu: 500m
# memory: 1Gi
heapOpts: -Xmx512m -Xms512m
readinessProbe:
initialDelaySeconds: 45
livenessProbe:
initialDelaySeconds: 60
kraft:
enabled: true
heapOpts: -Xmx1024m -Xms1024m
zookeeper:
enabled: false
controller:
replicaCount: 1
extraConfig: |-
maxMessageBytes = 1048588
extraEnvVars:
- name: ALLOW_PLAINTEXT_LISTENER
value: "yes"
listeners:
client:
protocol: PLAINTEXT
containerPort: 9092
controller:
protocol: "PLAINTEXT"
broker:
persistence:
size: 20Gi
replicaCount: 2
heapSize: 256
restapiCerts:
enabled: true

View File

@@ -1,22 +0,0 @@
owgwui:
ingresses:
default:
annotations:
alb.ingress.kubernetes.io/certificate-arn: arn:aws:acm:us-east-2:289708231103:certificate/299d7444-acc4-46c2-ae83-40d2cd5f49be
owprovui:
ingresses:
default:
annotations:
alb.ingress.kubernetes.io/certificate-arn: arn:aws:acm:us-east-2:289708231103:certificate/299d7444-acc4-46c2-ae83-40d2cd5f49be
owrrm:
services:
owrrm:
annotations:
service.beta.kubernetes.io/aws-load-balancer-ssl-cert: arn:aws:acm:us-east-2:289708231103:certificate/299d7444-acc4-46c2-ae83-40d2cd5f49be
haproxy:
service:
annotations:
service.beta.kubernetes.io/aws-load-balancer-ssl-cert: arn:aws:acm:us-east-2:289708231103:certificate/299d7444-acc4-46c2-ae83-40d2cd5f49be

View File

@@ -1,7 +0,0 @@
owgw:
configProperties:
radius.proxy.enable: "false"
radius.proxy.accounting.port: 1813
radius.proxy.authentication.port: 1812
radius.proxy.coa.port: 3799
radsec.keepalive: 120

View File

@@ -12,43 +12,25 @@ owgw:
service.beta.kubernetes.io/aws-load-balancer-ssl-ports: "16002,16003,17002"
configProperties:
# done by default for owgw now:
#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
# 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
simulatorid: 53494D020202
storage.type: postgresql
storage.type.postgresql.host: owgw-pgsql
storage.type.postgresql.database: owgw
storage.type.postgresql.username: owgw
storage.type.postgresql.password: owgw
openwifi.certificates.allowmismatch: "true"
resources:
requests:
cpu: 2000m
memory: 3Gi
memory: 3000Mi
limits:
cpu: 2000m
memory: 5Gi
memory: 3000Mi
# 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
postgresql:
enabled: true
fullnameOverride: owgw-pgsql
postgresqlDatabase: owgw
postgresqlUsername: owgw
postgresqlPassword: owgw

View File

@@ -61,16 +61,12 @@ 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

View File

@@ -811,50 +811,31 @@ owrrm:
memory: 512Mi
kafka:
volumePermissions:
enabled: true
commonAnnotations:
cluster-autoscaler.kubernetes.io/safe-to-evict: "false"
heapOpts: -Xmx512m -Xms512m
resources:
requests:
cpu: 100m
memory: 512Mi
limits:
cpu: 500m
memory: 1Gi
readinessProbe:
initialDelaySeconds: 45
livenessProbe:
initialDelaySeconds: 60
heapOpts: -Xmx1024m -Xms1024m
kraft:
enabled: true
zookeeper:
enabled: false
controller:
replicaCount: 1
extraConfig: |-
maxMessageBytes = 1048588
extraEnvVars:
- name: ALLOW_PLAINTEXT_LISTENER
value: "yes"
commonAnnotations:
cluster-autoscaler.kubernetes.io/safe-to-evict: "false"
heapSize: 256
resources:
requests:
cpu: 500m
memory: 512Mi
cpu: 100m
memory: 256Mi
limits:
cpu: 750m
memory: 2Gi
listeners:
client:
protocol: PLAINTEXT
containerPort: 9092
controller:
protocol: "PLAINTEXT"
broker:
persistence:
size: 20Gi
replicaCount: 2
resources:
requests:
cpu: 500m
memory: 512Mi
limits:
cpu: 750m
memory: 2Gi
cpu: 200m
memory: 384Mi
clustersysteminfo:
enabled: true

View File

@@ -1,29 +0,0 @@
owgw:
services:
owgw:
annotations:
service.beta.kubernetes.io/aws-load-balancer-ssl-cert: arn:aws:acm:us-east-2:289708231103:certificate/299d7444-acc4-46c2-ae83-40d2cd5f49be
owgwui:
ingresses:
default:
annotations:
alb.ingress.kubernetes.io/certificate-arn: arn:aws:acm:us-east-2:289708231103:certificate/299d7444-acc4-46c2-ae83-40d2cd5f49be
owprovui:
ingresses:
default:
annotations:
alb.ingress.kubernetes.io/certificate-arn: arn:aws:acm:us-east-2:289708231103:certificate/299d7444-acc4-46c2-ae83-40d2cd5f49be
owrrm:
services:
owrrm:
annotations:
service.beta.kubernetes.io/aws-load-balancer-ssl-cert: arn:aws:acm:us-east-2:289708231103:certificate/299d7444-acc4-46c2-ae83-40d2cd5f49be
haproxy:
service:
annotations:
service.beta.kubernetes.io/aws-load-balancer-ssl-cert: arn:aws:acm:us-east-2:289708231103:certificate/299d7444-acc4-46c2-ae83-40d2cd5f49be

View File

@@ -58,6 +58,13 @@ owrrm:
kafka:
enabled: true
fullnameOverride: kafka
image:
registry: docker.io
repository: bitnami/kafka
tag: 2.8.0-debian-10-r43
minBrokerId: 100
zookeeper:
fullnameOverride: zookeeper
# clustersysteminfo check
clustersysteminfo:
@@ -66,7 +73,7 @@ clustersysteminfo:
images:
clustersysteminfo:
repository: tip-tip-wlan-cloud-ucentral.jfrog.io/clustersysteminfo
tag: v3.1.0
tag: v3.0.2-RC2
pullPolicy: Always
# regcred:
# registry: tip-tip-wlan-cloud-ucentral.jfrog.io

View File

@@ -1,13 +1,14 @@
# Image tags
COMPOSE_PROJECT_NAME=openwifi
OWGW_TAG=v3.1.0
OWGWUI_TAG=v3.1.0
OWSEC_TAG=v3.1.0
OWFMS_TAG=v3.1.0
OWPROV_TAG=v3.1.0
OWPROVUI_TAG=v3.1.0
OWANALYTICS_TAG=v3.1.0
OWSUB_TAG=v3.1.0
OWGW_TAG=v3.0.2-RC1
OWGWUI_TAG=v3.0.2-RC1
OWSEC_TAG=v3.0.2-RC1
OWFMS_TAG=v3.0.2-RC1
OWPROV_TAG=v3.0.2-RC1
OWPROVUI_TAG=v3.0.2-RC2
OWANALYTICS_TAG=v3.0.2-RC1
OWSUB_TAG=v3.0.2-RC1
KAFKA_TAG=2.8.0-debian-10-r43
ZOOKEEPER_TAG=3.8
POSTGRESQL_TAG=15.0

View File

@@ -1,13 +1,14 @@
# Image tags
COMPOSE_PROJECT_NAME=openwifi
OWGW_TAG=v3.1.0
OWGWUI_TAG=v3.1.0
OWSEC_TAG=v3.1.0
OWFMS_TAG=v3.1.0
OWPROV_TAG=v3.1.0
OWPROVUI_TAG=v3.1.0
OWANALYTICS_TAG=v3.1.0
OWSUB_TAG=v3.1.0
OWGW_TAG=v3.0.2-RC1
OWGWUI_TAG=v3.0.2-RC1
OWSEC_TAG=v3.0.2-RC1
OWFMS_TAG=v3.0.2-RC1
OWPROV_TAG=v3.0.2-RC1
OWPROVUI_TAG=v3.0.2-RC2
OWANALYTICS_TAG=v3.0.2-RC1
OWSUB_TAG=v3.0.2-RC1
OWRRM_TAG=v2.8.0
KAFKA_TAG=2.8.0-debian-10-r43
ZOOKEEPER_TAG=3.8

View File

@@ -1,13 +1,14 @@
# Image tags
COMPOSE_PROJECT_NAME=openwifi
OWGW_TAG=v3.1.0
OWGWUI_TAG=v3.1.0
OWSEC_TAG=v3.1.0
OWFMS_TAG=v3.1.0
OWPROV_TAG=v3.1.0
OWPROVUI_TAG=v3.1.0
OWANALYTICS_TAG=v3.1.0
OWSUB_TAG=v3.1.0
OWGW_TAG=v3.0.2-RC1
OWGWUI_TAG=v3.0.2-RC1
OWSEC_TAG=v3.0.2-RC1
OWFMS_TAG=v3.0.2-RC1
OWPROV_TAG=v3.0.2-RC1
OWPROVUI_TAG=v3.0.2-RC2
OWANALYTICS_TAG=v3.0.2-RC1
OWSUB_TAG=v3.0.2-RC1
OWRRM_TAG=v2.8.0
KAFKA_TAG=2.8.0-debian-10-r43
ZOOKEEPER_TAG=3.8