Compare commits

..

1 Commits

Author SHA1 Message Date
Akshay Jagadish
6c389d2395 WIFI-1669 TIP 1.0 Update image tags in release 1.0 branch 2021-02-26 19:34:20 -05:00
47 changed files with 102 additions and 681 deletions

View File

@@ -3,60 +3,28 @@ name: Helm CI - TIP WLAN Cloud Master
on:
push:
branches: [ master ]
tags: [ "v*" ]
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
ssh-key: ${{ secrets.GH_AUTOMATION_KEY }}
submodules: true
- name: Login to TIP Docker registry
uses: azure/docker-login@v1
with:
login-server: tip-tip-wlan-cloud-docker-repo.jfrog.io
username: build-pipeline
password: ${{ secrets.DOCKER_REPO_PASSWORD }}
- name: Login to TIP Helm chart registry
run: helm repo add tip-wlan-cloud-helm-virtual-repo https://tip.jfrog.io/artifactory/tip-wlan-cloud-helm-virtual-repo --username build-pipeline --password ${{ secrets.HELM_REPO_PASSWORD }}
- name: Build tip-wlan chart file
run: |
if [[ "${{ github.ref }}" == "refs/tags/"* ]]; then
PACKAGE_OPTS="--version ${GITHUB_REF#refs/tags/v}"
else
PACKAGE_OPTS=""
fi
helm package $PACKAGE_OPTS -u tip-wlan
- name: Store chart as artifact
uses: actions/upload-artifact@v2
with:
name: helm-chart
path: tip-wlan-*.tgz
run: tar -czf tip-wlan.tgz tip-wlan
- name: Upload tip-wlan chart to the TIP helm registry
run: curl -ubuild-pipeline:${{ secrets.HELM_REPO_PASSWORD }} -T tip-wlan.tgz "https://tip.jfrog.io/artifactory/tip-wlan-cloud-helm-repo/tip-wlan.tgz"
- name: Verify that chart was uploaded successfully
run: |
if [[ "${{ github.ref }}" == "refs/tags/"* ]]; then
curl -ubuild-pipeline:${{ secrets.HELM_REPO_PASSWORD }} -T tip-wlan-${GITHUB_REF#refs/tags/v}.tgz "https://tip.jfrog.io/artifactory/tip-wlan-cloud-helm-repo/tip-wlan-${GITHUB_REF#refs/tags/v}.tgz"
else
curl -ubuild-pipeline:${{ secrets.HELM_REPO_PASSWORD }} -T tip-wlan-*.tgz "https://tip.jfrog.io/artifactory/tip-wlan-cloud-helm-repo/tip-wlan-master.tgz"
fi
release:
runs-on: ubuntu-latest
needs: [ build ]
if: startsWith(github.ref, 'refs/tags/')
steps:
- uses: actions/checkout@v2
- name: setup Python
uses: actions/setup-python@v2
with:
python-version: "3.8"
- name: install keepachangelog
run: pip install keepachangelog
- name: create release description
continue-on-error: true
run: python .github/workflows/prepare-release-description.py ${GITHUB_REF#refs/tags/v} > RELEASE.md
- name: download Helm chart artifact
uses: actions/download-artifact@v2
with:
name: helm-chart
- name: create release
uses: softprops/action-gh-release@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
files: tip-wlan-*.tgz
body_path: RELEASE.md
prerelease: ${{ contains(github.ref, 'rc') }}
helm repo update
helm search repo tip

View File

@@ -1,24 +0,0 @@
import sys
import keepachangelog
CATEGORIES = ['added', 'changed', 'deprecated', 'removed', 'fixed', 'security']
version = sys.argv[1]
try:
changes = keepachangelog.to_dict("CHANGELOG.md")[version]
except KeyError:
print(f'No changelog entry for version {version}', file=sys.stderr)
exit(1)
print('## Changelog')
for category in CATEGORIES:
entries = changes.get(category, [])
if entries:
print(f'### {category.capitalize()}')
for entry in entries:
print(f'- {entry}')

View File

@@ -5,59 +5,29 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [Unreleased] - YYYY-MM-DD
## [Unreleased](xxx)
### Added
- export servo MBeans with JMX Prometheus exporter [#65](https://github.com/Telecominfraproject/wlan-cloud-helm/pull/65)
- render post-deployment message [#73](https://github.com/Telecominfraproject/wlan-cloud-helm/pull/73)
- Replaced cassandra, postgres and kafka with upstream charts [#49](https://github.com/Telecominfraproject/wlan-cloud-helm/pull/49)
- Centralized secrets to the parent chart [#54](https://github.com/Telecominfraproject/wlan-cloud-helm/pull/54)
### Changed
- migrate to networking.k8s.io/v1 API version for Ingress resources [#74](https://github.com/Telecominfraproject/wlan-cloud-helm/pull/74)
## [1.0.1] - 2021-04-12
### Changed
- bump cloud controller version to 1.0.1
### Fixed
- correct SQL and CQL schema URLs
### Changed
- make images for all init containers configurable [#67](https://github.com/Telecominfraproject/wlan-cloud-helm/pull/67)
## [1.0.0] - 2021-04-01
### Added
- replaced cassandra, postgres and kafka with upstream charts [#49](https://github.com/Telecominfraproject/wlan-cloud-helm/pull/49)
- centralized secrets to the parent chart [#54](https://github.com/Telecominfraproject/wlan-cloud-helm/pull/54)
### Changed
- improved kafka setup templating [#53](https://github.com/Telecominfraproject/wlan-cloud-helm/pull/53)
- improved values.yaml [#53](https://github.com/Telecominfraproject/wlan-cloud-helm/pull/53)
- improved default values and added yaml anchors [#54](https://github.com/Telecominfraproject/wlan-cloud-helm/pull/54)
- make SSC service able to reconnect to Cassandra [#70](https://github.com/Telecominfraproject/wlan-cloud-helm/pull/70)
- Improved kafka setup templating [#53](https://github.com/Telecominfraproject/wlan-cloud-helm/pull/53)
- Improved values.yaml [#53](https://github.com/Telecominfraproject/wlan-cloud-helm/pull/53)
- Improved default values and added yaml anchors [#54](https://github.com/Telecominfraproject/wlan-cloud-helm/pull/54)
### Removed
- removed hardcoded docker secret in favor of variables [#53](https://github.com/Telecominfraproject/wlan-cloud-helm/pull/53)
- various outdated sections in values.yaml and environment files
- various secrets in subcharts as they are now part of the parent chart
- Removed hardcoded docker secret in favor of variables [#53](https://github.com/Telecominfraproject/wlan-cloud-helm/pull/53)
- Various outdated sections in values.yaml and environment files
- Various secrets in subcharts as they are now part of the parent chart
- references to vendor specific values [#40](https://github.com/Telecominfraproject/wlan-cloud-helm/pull/40)
### Fixed
- make SSC service able to reconnect to Cassandra [#70](https://github.com/Telecominfraproject/wlan-cloud-helm/pull/70)
## [0.4.0] - 2021-01-28
## [0.4.0](https://github.com/Telecominfraproject/wlan-cloud-helm/compare/f7c67645736e3dac498e2caec8c267f04d08b7bc...v0.4) - 2021-01-28
### Added
- initial changelog entry. This is the first versioned release. Next releases will include a detailed overview of all the major changes introduced since the last version.
- [changes since first commit](https://github.com/Telecominfraproject/wlan-cloud-helm/compare/f7c67645736e3dac498e2caec8c267f04d08b7bc...v0.4)
- Initial changelog entry. This is the first versioned release. Next releases will include a detailed overview of all the major changes introduced since the last version.

View File

@@ -14,11 +14,11 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
version: 1.0.0
version: 0.4.0
# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application.
appVersion: 1.0.0
appVersion: 1.16.0
home: https://telecominfraproject.com/wifi/
sources:

View File

@@ -29,7 +29,7 @@ spec:
initContainers:
{{- include "jmxPrometheus.initContainer" . | nindent 8 }}
- name: wait-for-services
image: {{ .Values.waitForServicesImage.registry }}/{{ .Values.waitForServicesImage.repository }}:{{ .Values.waitForServicesImage.tag }}
image: opsfleet/depends-on:latest
args:
- "-service={{ .Release.Name }}-opensync-mqtt-broker"
- "-service={{ .Release.Name }}-wlan-prov-service"
@@ -37,7 +37,7 @@ spec:
- -check_interval=5
{{- if .Values.global.integratedDeployment }}
- name: {{ include "common.name" . }}-readiness-int-cloud
image: {{ .Values.intCloudReadiness.registry }}/{{ .Values.intCloudReadiness.repository }}:{{ .Values.intCloudReadiness.tag }}
image: alpine
imagePullPolicy: {{ .Values.pullPolicy | default .Values.global.pullPolicy }}
command:
- sh

View File

@@ -11,7 +11,7 @@ metadata:
spec:
containers:
- name: wget
image: {{ .Values.testConnectionImage.registry }}/{{ .Values.testConnectionImage.repository }}:{{ .Values.testConnectionImage.tag }}
image: busybox
command: ['wget']
args: ['{{ include "common.fullname" . }}:{{ .Values.service.port1 }}']
restartPolicy: Never

View File

@@ -11,22 +11,7 @@ replicaCount: 1
image:
name: opensync-gateway-cloud
tag: 1.3.0-SNAPSHOT
waitForServicesImage:
registry: tip-docker-cache-repo.jfrog.io
repository: opsfleet/depends-on
tag: v1.0.0
intCloudReadinessImage:
registry: tip-docker-cache-repo.jfrog.io
repository: library/alpine
tag: 3.13
testConnectionImage:
registry: tip-docker-cache-repo.jfrog.io
repository: library/alpine
tag: 3.13
tag: 1.0.0-SNAPSHOT
nameOverride: ""
fullnameOverride: ""

View File

@@ -11,7 +11,7 @@ metadata:
spec:
containers:
- name: wget
image: {{ .Values.testConnectionImage.registry }}/{{ .Values.testConnectionImage.repository }}:{{ .Values.testConnectionImage.tag }}
image: busybox
command: ['wget']
args: ['{{ include "common.fullname" . }}:{{ .Values.service.port1 }}']
restartPolicy: Never

View File

@@ -11,12 +11,7 @@ replicaCount: 1
image:
name: opensync-gateway-static
tag: 1.3.0-SNAPSHOT
testConnectionImage:
registry: tip-docker-cache-repo.jfrog.io
repository: library/alpine
tag: 3.13
tag: 1.0.0-SNAPSHOT
nameOverride: ""
fullnameOverride: ""

View File

@@ -45,7 +45,7 @@ spec:
{{- toYaml .Values.podSecurityContext | nindent 8 }}
initContainers:
- name: {{ include "common.name" . }}-init-dir-ownership-change
image: {{ .Values.alpine.registry }}/{{ .Values.alpine.repository }}:{{ .Values.alpine.tag }}
image: {{ .Values.alpine.image }}
imagePullPolicy: {{ .Values.pullPolicy | default .Values.global.pullPolicy }}
# Change ownership to `mosquitto` user for a mounted volume
command:
@@ -63,7 +63,7 @@ spec:
- name: {{ .Chart.Name }}
securityContext:
{{- toYaml .Values.securityContext | nindent 12 }}
image: {{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag }}
image: {{ .Values.image.name }}:{{ .Values.image.tag }}
imagePullPolicy: {{ .Values.pullPolicy | default .Values.global.pullPolicy }}
{{- if .Values.probes.enabled }}
livenessProbe:

View File

@@ -11,7 +11,7 @@ metadata:
spec:
containers:
- name: wget
image: {{ .Values.testConnectionImage.registry }}/{{ .Values.testConnectionImage.repository }}:{{ .Values.testConnectionImage.tag }}
image: busybox
command: ['wget']
args: ['{{ include "common.fullname" . }}:{{ .Values.service.port1 }}']
restartPolicy: Never

View File

@@ -5,19 +5,11 @@
replicaCount: 1
image:
registry: tip-docker-cache-repo.jfrog.io
repository: library/eclipse-mosquitto
name: eclipse-mosquitto
tag: 2.0.3
alpine:
registry: tip-docker-cache-repo.jfrog.io
repository: library/alpine
tag: 3.6
testConnectionImage:
registry: tip-docker-cache-repo.jfrog.io
repository: library/alpine
tag: 3.13
image: alpine:3.6
nameOverride: ""
fullnameOverride: ""

View File

@@ -1,9 +1,7 @@
{{- if .Values.ingress.enabled -}}
{{- $fullName := include "common.fullname" . -}}
{{- $svcPort := .Values.service.port -}}
{{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1" }}
apiVersion: networking.k8s.io/v1
{{- else if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1" }}
{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
apiVersion: networking.k8s.io/v1beta1
{{- else -}}
apiVersion: extensions/v1beta1
@@ -38,35 +36,15 @@ spec:
paths:
{{- if $.Values.ingress.lb_https_redirect }}
- path: /*
{{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1" }}
pathType: ImplementationSpecific
{{- end }}
backend:
{{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1" }}
service:
name: ssl-redirect
port:
name: use-annotation
{{- else -}}
serviceName: ssl-redirect
servicePort: use-annotation
{{- end }}
{{- end }}
{{- range .paths }}
- path: {{ . }}
{{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1" }}
pathType: ImplementationSpecific
{{- end }}
backend:
{{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1" }}
service:
name: {{ $fullName }}
port:
number: {{ $svcPort }}
{{- else -}}
serviceName: {{ $fullName }}
servicePort: {{ $svcPort }}
{{- end }}
{{- end }}
{{- end }}
{{- end }}

View File

@@ -11,7 +11,7 @@ metadata:
spec:
containers:
- name: wget
image: {{ .Values.testConnectionImage.registry }}/{{ .Values.testConnectionImage.repository }}:{{ .Values.testConnectionImage.tag }}
image: busybox
command: ['wget']
args: ['{{ include "common.fullname" . }}:{{ .Values.service.port }}']
restartPolicy: Never

View File

@@ -11,14 +11,9 @@ replicaCount: 1
image:
name: wlan-cloud-graphql-gw
tag: 1.3.0-SNAPSHOT
tag: 1.0.0-SNAPSHOT
pullPolicy: IfNotPresent
testConnectionImage:
registry: tip-docker-cache-repo.jfrog.io
repository: library/alpine
tag: 3.13
nameOverride: ""
fullnameOverride: ""

View File

@@ -1,9 +1,7 @@
{{- if .Values.ingress.enabled -}}
{{- $fullName := include "common.fullname" . -}}
{{- $svcPort := .Values.service.port -}}
{{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1" }}
apiVersion: networking.k8s.io/v1
{{- else if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1" }}
{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
apiVersion: networking.k8s.io/v1beta1
{{- else -}}
apiVersion: extensions/v1beta1
@@ -38,35 +36,15 @@ spec:
paths:
{{- if $.Values.ingress.lb_https_redirect }}
- path: /*
{{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1" }}
pathType: ImplementationSpecific
{{- end }}
backend:
{{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1" }}
service:
name: ssl-redirect
port:
name: use-annotation
{{- else -}}
serviceName: ssl-redirect
servicePort: use-annotation
{{- end }}
{{- end }}
{{- range .paths }}
- path: {{ . }}
{{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1" }}
pathType: ImplementationSpecific
{{- end }}
backend:
{{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1" }}
service:
name: {{ $fullName }}
port:
number: {{ $svcPort }}
{{- else -}}
serviceName: {{ $fullName }}
servicePort: {{ $svcPort }}
{{- end }}
{{- end }}
{{- end }}
{{- end }}

View File

@@ -11,7 +11,7 @@ metadata:
spec:
containers:
- name: wget
image: {{ .Values.testConnectionImage.registry }}/{{ .Values.testConnectionImage.repository }}:{{ .Values.testConnectionImage.tag }}
image: busybox
command: ['wget']
args: ['{{ include "common.fullname" . }}:{{ .Values.service.port }}']
restartPolicy: Never

View File

@@ -11,14 +11,9 @@ replicaCount: 1
image:
name: wlan-cloud-ui
tag: 1.3.0-SNAPSHOT
tag: 1.0.0-SNAPSHOT
pullPolicy: IfNotPresent
testConnectionImage:
registry: tip-docker-cache-repo.jfrog.io
repository: library/alpine
tag: 3.13
nameOverride: ""
fullnameOverride: ""

View File

@@ -26,7 +26,7 @@ spec:
{{- if .Values.integratedWithPersistence.enabled }}
initContainers:
- name: wait-for-services
image: {{ .Values.waitForServicesImage.registry }}/{{ .Values.waitForServicesImage.repository }}:{{ .Values.waitForServicesImage.tag }}
image: opsfleet/depends-on:latest
args:
- "-service={{ .Release.Name }}-postgresql"
- -check_interval=5
@@ -49,8 +49,7 @@ spec:
secretKeyRef:
name: {{ include "common.fullname" . }}-creds
key: schema-repo-password
image: {{ .Values.createDbSchemaImage.registry }}/{{ .Values.createDbSchemaImage.repository }}:{{ .Values.createDbSchemaImage.tag }}
args:
image: postgres:latest
imagePullPolicy: {{ .Values.pullPolicy | default .Values.global.pullPolicy }}
command:
- sh
@@ -59,7 +58,7 @@ spec:
apt update
apt -y install curl
echo "***** Fetching cloud-sdk-schema-postgresql.sql from JFrog *****"
curl -u$SCHEMA_REPO_USER:$SCHEMA_REPO_PASSWORD -O "https://tip-tip-wlan-cloud-docker-repo.jfrog.io/artifactory/tip-wlan-cloud-schemas/0.0.1-SNAPSHOT/sql/cloud-sdk-schema-postgresql.sql"
curl -u$SCHEMA_REPO_USER:$SCHEMA_REPO_PASSWORD -O "https://tip-tip-wlan-cloud-docker-repo.jfrog.io/artifactory/tip-wlan-cloud-schemas/1.0.0-SNAPSHOT/sql/cloud-sdk-schema-postgresql.sql"
echo "***** Now executing cloud-sdk-schema-postgresql.sql and creating/updating schema on Postgres instance *****"
PGPASSWORD=$POSTGRES_PASSWORD psql -h {{- include "postgresql.service" . -}} -U postgres -f cloud-sdk-schema-postgresql.sql
exit

View File

@@ -11,7 +11,7 @@ metadata:
spec:
containers:
- name: wget
image: {{ .Values.testConnectionImage.registry }}/{{ .Values.testConnectionImage.repository }}:{{ .Values.testConnectionImage.tag }}
image: busybox
command: ['wget']
args: ['{{ include "common.fullname" . }}:{{ .Values.service.port1 }}']
restartPolicy: Never

View File

@@ -11,22 +11,7 @@ replicaCount: 1
image:
name: wlan-integrated-cloud-component-service
tag: 1.3.0-SNAPSHOT
waitForServicesImage:
registry: tip-docker-cache-repo.jfrog.io
repository: opsfleet/depends-on
tag: v1.0.0
testConnectionImage:
registry: tip-docker-cache-repo.jfrog.io
repository: library/alpine
tag: 3.13
createDbSchemaImage:
registry: tip-docker-cache-repo.jfrog.io
repository: library/postgres
tag: 13.2-alpine
tag: 1.0.0-SNAPSHOT
nameOverride: ""
fullnameOverride: ""

View File

@@ -24,7 +24,7 @@ spec:
initContainers:
{{- include "jmxPrometheus.initContainer" . | nindent 8 }}
- name: {{ include "common.name" . }}-readiness-opensync-gw
image: {{ .Values.opensyncGwReadinessImage.registry }}/{{ .Values.opensyncGwReadinessImage.repository }}:{{ .Values.opensyncGwReadinessImage.tag }}
image: alpine
imagePullPolicy: {{ .Values.pullPolicy | default .Values.global.pullPolicy }}
command:
- sh

View File

@@ -11,7 +11,7 @@ metadata:
spec:
containers:
- name: wget
image: {{ .Values.testConnectionImage.registry }}/{{ .Values.testConnectionImage.repository }}:{{ .Values.testConnectionImage.tag }}
image: busybox
command: ['wget']
args: ['{{ include "common.fullname" . }}:{{ .Values.service.port1 }}']
restartPolicy: Never

View File

@@ -11,17 +11,7 @@ replicaCount: 1
image:
name: wlan-port-forwarding-gateway-service
tag: 1.3.0-SNAPSHOT
opensyncGwReadinessImage:
registry: tip-docker-cache-repo.jfrog.io
repository: library/alpine
tag: 3.13
testConnectionImage:
registry: tip-docker-cache-repo.jfrog.io
repository: library/alpine
tag: 3.13
tag: 1.0.0-SNAPSHOT
nameOverride: ""
fullnameOverride: ""

View File

@@ -1,9 +1,7 @@
{{- if .Values.ingress.enabled -}}
{{- $fullName := include "common.fullname" . -}}
{{- $svcPort := .Values.service.port1 -}}
{{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1" }}
apiVersion: networking.k8s.io/v1
{{- else if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1" }}
{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
apiVersion: networking.k8s.io/v1beta1
{{- else -}}
apiVersion: extensions/v1beta1
@@ -36,35 +34,15 @@ spec:
paths:
{{- if $.Values.ingress.lb_https_redirect }}
- path: /*
{{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1" }}
pathType: ImplementationSpecific
{{- end }}
backend:
{{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1" }}
service:
name: ssl-redirect
port:
name: use-annotation
{{- else -}}
serviceName: ssl-redirect
servicePort: use-annotation
{{- end }}
{{- end }}
{{- range .paths }}
- path: {{ . }}
{{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1" }}
pathType: ImplementationSpecific
{{- end }}
backend:
{{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1" }}
service:
name: {{ $fullName }}
port:
number: {{ $svcPort }}
{{- else -}}
serviceName: {{ $fullName }}
servicePort: {{ $svcPort }}
{{- end -}}
{{- end }}
{{- end }}
{{- end }}

View File

@@ -7,7 +7,6 @@ metadata:
labels:
{{- include "common.labels" . | nindent 4 }}
spec:
podManagementPolicy: Parallel
serviceName: {{ include "common.fullname" . }}
replicas: {{ .Values.replicaCount }}
selector:

View File

@@ -11,7 +11,8 @@ metadata:
spec:
containers:
- name: wget
image: {{ .Values.testConnectionImage.registry }}/{{ .Values.testConnectionImage.repository }}:{{ .Values.testConnectionImage.tag }}
image: busybox
command: ['wget']
args: ['{{ include "common.fullname" . }}:{{ .Values.service.port1 }}']
restartPolicy: Never
{{- end }}

View File

@@ -11,12 +11,7 @@ replicaCount: 1
image:
name: wlan-portal-service
tag: 1.3.0-SNAPSHOT
testConnectionImage:
registry: tip-docker-cache-repo.jfrog.io
repository: library/alpine
tag: 3.13
tag: 1.0.0-SNAPSHOT
nameOverride: ""
fullnameOverride: ""

View File

@@ -25,7 +25,7 @@ spec:
initContainers:
{{- include "jmxPrometheus.initContainer" . | nindent 8 }}
- name: wait-for-services
image: {{ .Values.waitForServicesImage.registry }}/{{ .Values.waitForServicesImage.repository }}:{{ .Values.waitForServicesImage.tag }}
image: opsfleet/depends-on:latest
args:
- "-service={{ .Release.Name }}-postgresql"
- -check_interval=5
@@ -53,7 +53,7 @@ spec:
secretKeyRef:
name: {{ include "common.fullname" . }}-creds
key: schema-repo-password
image: {{ .Values.postgresql.registry }}/{{ .Values.postgresql.repository }}:{{ .Values.postgresql.tag }}
image: {{ .Values.postgresql.image }}
imagePullPolicy: {{ .Values.pullPolicy | default .Values.global.pullPolicy }}
command:
- sh
@@ -62,8 +62,8 @@ spec:
apt update
apt -y install curl
echo "***** Fetching latest cloud-sdk-schema-postgresql for DB and Tables sql from JFrog *****"
curl --insecure -u$SCHEMA_REPO_USER:$SCHEMA_REPO_PASSWORD -O "https://tip-tip-wlan-cloud-docker-repo.jfrog.io/artifactory/tip-wlan-cloud-schemas/1.3.0-SNAPSHOT/sql/cloud-sdk-schema-postgresql-db-user.sql"
curl --insecure -u$SCHEMA_REPO_USER:$SCHEMA_REPO_PASSWORD -O "https://tip-tip-wlan-cloud-docker-repo.jfrog.io/artifactory/tip-wlan-cloud-schemas/1.3.0-SNAPSHOT/sql/cloud-sdk-schema-postgresql-tables.sql"
curl --insecure -u$SCHEMA_REPO_USER:$SCHEMA_REPO_PASSWORD -O "https://tip-tip-wlan-cloud-docker-repo.jfrog.io/artifactory/tip-wlan-cloud-schemas/1.0.0-SNAPSHOT/sql/cloud-sdk-schema-postgresql-db-user.sql"
curl --insecure -u$SCHEMA_REPO_USER:$SCHEMA_REPO_PASSWORD -O "https://tip-tip-wlan-cloud-docker-repo.jfrog.io/artifactory/tip-wlan-cloud-schemas/1.0.0-SNAPSHOT/sql/cloud-sdk-schema-postgresql-tables.sql"
echo "***** Now executing cloud-sdk-schema-postgresql-db-user.sql on host {{ $pg }} and creating db prov_db and user tip_user using User Postgres. This uses full client-cert authentication *****"
### Observed that PSQL was unable to resolve the Postgres-service host because the postgres service wasnt
### really ready when running Postgres in Master-Slave config... hence the below retry-logic

View File

@@ -11,7 +11,7 @@ metadata:
spec:
containers:
- name: wget
image: {{ .Values.testConnectionImage.registry }}/{{ .Values.testConnectionImage.repository }}:{{ .Values.testConnectionImage.tag }}
image: busybox
command: ['wget']
args: ['{{ include "common.fullname" . }}:{{ .Values.service.port1 }}']
restartPolicy: Never

View File

@@ -11,17 +11,7 @@ replicaCount: 1
image:
name: wlan-prov-service
tag: 1.3.0-SNAPSHOT
waitForServicesImage:
registry: tip-docker-cache-repo.jfrog.io
repository: opsfleet/depends-on
tag: v1.0.0
testConnectionImage:
registry: tip-docker-cache-repo.jfrog.io
repository: library/alpine
tag: 3.13
tag: 1.0.0-SNAPSHOT
nameOverride: ""
fullnameOverride: ""
@@ -125,10 +115,10 @@ ingress:
resources:
limits:
cpu: 500m
memory: 600Mi
memory: 320Mi
requests:
cpu: 10m
memory: 600Mi
memory: 300Mi
nodeSelector: {}
@@ -138,9 +128,7 @@ affinity: {}
postgresql:
url: postgresql
registry: tip-docker-cache-repo.jfrog.io
repository: library/postgres
tag: 11
image: postgres:11
env:
protocol: https

View File

@@ -25,7 +25,7 @@ spec:
initContainers:
{{- include "jmxPrometheus.initContainer" . | nindent 8 }}
- name: wait-for-services
image: {{ .Values.waitForServicesImage.registry }}/{{ .Values.waitForServicesImage.repository }}:{{ .Values.waitForServicesImage.tag }}
image: opsfleet/depends-on:latest
args:
- "-service={{ .Release.Name }}-kafka-headless"
- -check_interval=5

View File

@@ -11,7 +11,7 @@ metadata:
spec:
containers:
- name: wget
image: {{ .Values.testConnectionImage.registry }}/{{ .Values.testConnectionImage.repository }}:{{ .Values.testConnectionImage.tag }}
image: busybox
command: ['wget']
args: ['{{ include "common.fullname" . }}:{{ .Values.service.port1 }}']
restartPolicy: Never

View File

@@ -11,17 +11,7 @@ replicaCount: 1
image:
name: wlan-spc-service
tag: 1.3.0-SNAPSHOT
waitForServicesImage:
registry: tip-docker-cache-repo.jfrog.io
repository: opsfleet/depends-on
tag: v1.0.0
testConnectionImage:
registry: tip-docker-cache-repo.jfrog.io
repository: library/alpine
tag: 3.13
tag: 1.0.0-SNAPSHOT
nameOverride: ""
fullnameOverride: ""
@@ -117,10 +107,10 @@ ingress:
resources:
limits:
cpu: 500m
memory: 400Mi
memory: 370Mi
requests:
cpu: 10m
memory: 400Mi
memory: 350Mi
nodeSelector: {}

View File

@@ -11,10 +11,8 @@ data:
contact-points = [ "{{ include "cassandra.service" . }}:9042" ]
load-balancing-policy.local-datacenter = datacenter1
session-keyspace = tip_wlan_keyspace
request.consistency = LOCAL_QUORUM
}
advanced.resolve-contact-points = false
advanced.ssl-engine-factory {
class = DefaultSslEngineFactory
hostname-validation = false

View File

@@ -26,7 +26,7 @@ spec:
initContainers:
{{- include "jmxPrometheus.initContainer" . | nindent 8 }}
- name: wait-for-services
image: {{ .Values.waitForServicesImage.registry }}/{{ .Values.waitForServicesImage.repository }}:{{ .Values.waitForServicesImage.tag }}
image: opsfleet/depends-on:latest
args:
- "-service={{ .Release.Name }}-kafka-headless"
- "-service={{ .Release.Name }}-cassandra"
@@ -45,7 +45,7 @@ spec:
secretKeyRef:
name: {{ include "common.fullname" . }}-creds
key: schema-repo-password
image: {{ .Values.cassandra.registry }}/{{ .Values.cassandra.repository }}:{{ .Values.cassandra.tag }}
image: {{ .Values.cassandra.image }}
imagePullPolicy: {{ .Values.pullPolicy | default .Values.global.pullPolicy }}
command:
- sh
@@ -54,7 +54,7 @@ spec:
apt update
apt -y install curl
echo "***** Fetching cloud-sdk-schema-cassandra.cql from JFrog *****"
curl --insecure -u$SCHEMA_REPO_USER:$SCHEMA_REPO_PASSWORD -O "https://tip-tip-wlan-cloud-docker-repo.jfrog.io/artifactory/tip-wlan-cloud-schemas/1.3.0-SNAPSHOT/cql/cloud-sdk-schema-cassandra.cql"
curl --insecure -u$SCHEMA_REPO_USER:$SCHEMA_REPO_PASSWORD -O "https://tip-tip-wlan-cloud-docker-repo.jfrog.io/artifactory/tip-wlan-cloud-schemas/1.0.0-SNAPSHOT/cql/cloud-sdk-schema-cassandra.cql"
echo "***** Now executing cloud-sdk-schema-cassandra.cql and creating/updating schema on Cassandra instance *****"
counter=0
status=1

View File

@@ -11,7 +11,7 @@ metadata:
spec:
containers:
- name: wget
image: {{ .Values.testConnectionImage.registry }}/{{ .Values.testConnectionImage.repository }}:{{ .Values.testConnectionImage.tag }}
image: busybox
command: ['wget']
args: ['{{ include "common.fullname" . }}:{{ .Values.service.port1 }}']
restartPolicy: Never

View File

@@ -11,17 +11,7 @@ replicaCount: 1
image:
name: wlan-ssc-service
tag: 1.3.0-SNAPSHOT
waitForServicesImage:
registry: tip-docker-cache-repo.jfrog.io
repository: opsfleet/depends-on
tag: v1.0.0
testConnectionImage:
registry: tip-docker-cache-repo.jfrog.io
repository: library/alpine
tag: 3.13
tag: 1.0.0-SNAPSHOT
nameOverride: ""
fullnameOverride: ""
@@ -117,10 +107,10 @@ ingress:
resources:
limits:
cpu: 500m
memory: 450Mi
memory: 420Mi
requests:
cpu: 10m
memory: 450Mi
memory: 400Mi
nodeSelector: {}
@@ -134,9 +124,7 @@ kafka:
cassandra:
url: cassandra-headless
port: 9042
registry: tip-docker-cache-repo.jfrog.io
repository: library/cassandra
tag: 3.11.6
image: cassandra:3.11.6
env:
protocol: https

View File

@@ -1,5 +0,0 @@
# Helm values for deploying a cloud controller onto an AWS EKS cluster
[Detailed instructions](https://openwifi.tip.build/getting-started/controller-installation/aws-install)
[This Terraform module](https://github.com/Telecominfraproject/wlan-cloud-terraform/tree/master/aws-cloudsdk) can be used to set up the required EKS cluster including all necessary addons.

View File

@@ -1,128 +0,0 @@
shared:
service:
srv-https-annotations: &srv-https-annotations
kubernetes.io/ingress.class: alb
alb.ingress.kubernetes.io/scheme: internet-facing
alb.ingress.kubernetes.io/group.name: wlan-cloudsdk
alb.ingress.kubernetes.io/certificate-arn: "arn:aws:acm:eu-central-1:0123456789:certificate/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
alb.ingress.kubernetes.io/listen-ports: '[{"HTTP": 80}, {"HTTPS": 443}]'
alb.ingress.kubernetes.io/actions.ssl-redirect: '{"Type": "redirect", "RedirectConfig": { "Protocol": "HTTPS", "Port": "443", "StatusCode": "HTTP_302"}}'
# Annotations for namespace
annotations: {
"helm.sh/resource-policy": keep
}
opensync-gw-static:
enabled: false
opensync-gw-cloud:
service:
type: LoadBalancer
annotations:
external-dns.alpha.kubernetes.io/hostname: opensync-controller.cloudsdk.lab.wlan.tip.build,opensync-redirector.cloudsdk.lab.wlan.tip.build
service.beta.kubernetes.io/aws-load-balancer-type: "nlb-ip"
enabled: true
externalhost:
address:
ovsdb: opensync-controller.cloudsdk.lab.wlan.tip.build
mqtt: opensync-mqtt-broker.cloudsdk.lab.wlan.tip.build
persistence:
enabled: false
image:
name: opensync-gateway-cloud
opensync-mqtt-broker:
service:
type: LoadBalancer
annotations:
external-dns.alpha.kubernetes.io/hostname: opensync-mqtt-broker.cloudsdk.lab.wlan.tip.build
service.beta.kubernetes.io/aws-load-balancer-type: "nlb-ip"
enabled: true
persistence:
enabled: true
storageClass: "gp2"
wlan-cloud-graphql-gw:
enabled: true
ingress:
annotations:
<<: *srv-https-annotations
enabled: true
alb_https_redirect: true
hosts:
- host: wlan-graphql.cloudsdk.lab.wlan.tip.build
paths: [
/*
]
env:
portalsvc: wlan-portal-svc.cloudsdk.lab.wlan.tip.build
wlan-cloud-static-portal:
enabled: true
env:
graphql: https://wlan-graphql.cloudsdk.lab.wlan.tip.build
service:
type: NodePort
ingress:
annotations:
<<: *srv-https-annotations
alb_https_redirect: true
hosts:
- host: wlan-ui.cloudsdk.lab.wlan.tip.build
paths: [
/*
]
wlan-portal-service:
service:
type: NodePort
nodePortStatic: false
enabled: true
persistence:
enabled: true
storageClass: gp2
tsp:
host: wlan-portal-svc.cloudsdk.lab.wlan.tip.build
ingress:
enabled: true
alb_https_redirect: true
tls: []
annotations:
<<: *srv-https-annotations
alb.ingress.kubernetes.io/backend-protocol: HTTPS
alb.ingress.kubernetes.io/healthcheck-protocol: HTTPS
alb.ingress.kubernetes.io/healthcheck-port: traffic-port
alb.ingress.kubernetes.io/healthcheck-path: /ping
hosts:
- host: wlan-portal-svc.cloudsdk.lab.wlan.tip.build
paths: [
/*
]
wlan-prov-service:
enabled: true
wlan-ssc-service:
enabled: true
wlan-spc-service:
enabled: true
wlan-port-forwarding-gateway-service:
enabled: true
kafka:
enabled: true
persistence:
cassandra:
enabled: true
persistence:
enabled: true
storageClass: gp2
postgresql:
enabled: true
persistence:
enabled: true
storageClass: gp2

View File

@@ -1,8 +0,0 @@
# Helm values for deploying a cloud controller onto an AWS EKS cluster with internal accessibility
These values are almost the same as you can find in [aws-basic](../aws-basic) example values, but this case adds required annotations to make your installaion work in private mode without any endpoints exposed to the Internet.
[Detailed instructions](https://openwifi.tip.build/getting-started/controller-installation/aws-install)
[This Terraform module](https://github.com/Telecominfraproject/wlan-cloud-terraform/tree/master/aws-cloudsdk) can be used to set up the required EKS cluster including all necessary addons.

View File

@@ -1,130 +0,0 @@
shared:
service:
srv-https-annotations: &srv-https-annotations
kubernetes.io/ingress.class: alb
alb.ingress.kubernetes.io/scheme: internal
alb.ingress.kubernetes.io/group.name: wlan-cloudsdk
alb.ingress.kubernetes.io/certificate-arn: "arn:aws:acm:eu-central-1:0123456789:certificate/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
alb.ingress.kubernetes.io/listen-ports: '[{"HTTP": 80}, {"HTTPS": 443}]'
alb.ingress.kubernetes.io/actions.ssl-redirect: '{"Type": "redirect", "RedirectConfig": { "Protocol": "HTTPS", "Port": "443", "StatusCode": "HTTP_302"}}'
# Annotations for namespace
annotations: {
"helm.sh/resource-policy": keep
}
opensync-gw-static:
enabled: false
opensync-gw-cloud:
service:
type: LoadBalancer
annotations:
external-dns.alpha.kubernetes.io/hostname: opensync-controller.cloudsdk.lab.wlan.tip.build,opensync-redirector.cloudsdk.lab.wlan.tip.build
service.beta.kubernetes.io/aws-load-balancer-type: "nlb-ip"
service.beta.kubernetes.io/aws-load-balancer-internal: "true"
enabled: true
externalhost:
address:
ovsdb: opensync-controller.cloudsdk.lab.wlan.tip.build
mqtt: opensync-mqtt-broker.cloudsdk.lab.wlan.tip.build
persistence:
enabled: false
image:
name: opensync-gateway-cloud
opensync-mqtt-broker:
service:
type: LoadBalancer
annotations:
external-dns.alpha.kubernetes.io/hostname: opensync-mqtt-broker.cloudsdk.lab.wlan.tip.build
service.beta.kubernetes.io/aws-load-balancer-type: "nlb-ip"
service.beta.kubernetes.io/aws-load-balancer-internal: "true"
enabled: true
persistence:
enabled: true
storageClass: "gp2"
wlan-cloud-graphql-gw:
enabled: true
ingress:
annotations:
<<: *srv-https-annotations
enabled: true
alb_https_redirect: true
hosts:
- host: wlan-graphql.cloudsdk.lab.wlan.tip.build
paths: [
/*
]
env:
portalsvc: wlan-portal-svc.cloudsdk.lab.wlan.tip.build
wlan-cloud-static-portal:
enabled: true
env:
graphql: https://wlan-graphql.cloudsdk.lab.wlan.tip.build
service:
type: NodePort
ingress:
annotations:
<<: *srv-https-annotations
alb_https_redirect: true
hosts:
- host: wlan-ui.cloudsdk.lab.wlan.tip.build
paths: [
/*
]
wlan-portal-service:
service:
type: NodePort
nodePortStatic: false
enabled: true
persistence:
enabled: true
storageClass: gp2
tsp:
host: wlan-portal-svc.cloudsdk.lab.wlan.tip.build
ingress:
enabled: true
alb_https_redirect: true
tls: []
annotations:
<<: *srv-https-annotations
alb.ingress.kubernetes.io/backend-protocol: HTTPS
alb.ingress.kubernetes.io/healthcheck-protocol: HTTPS
alb.ingress.kubernetes.io/healthcheck-port: traffic-port
alb.ingress.kubernetes.io/healthcheck-path: /ping
hosts:
- host: wlan-portal-svc.cloudsdk.lab.wlan.tip.build
paths: [
/*
]
wlan-prov-service:
enabled: true
wlan-ssc-service:
enabled: true
wlan-spc-service:
enabled: true
wlan-port-forwarding-gateway-service:
enabled: true
kafka:
enabled: true
persistence:
cassandra:
enabled: true
persistence:
enabled: true
storageClass: gp2
postgresql:
enabled: true
persistence:
enabled: true
storageClass: gp2

View File

@@ -1,15 +1,13 @@
lowercaseOutputLabelNames: true
lowercaseOutputName: true
whitelistObjectNames:
- "java.lang:type=OperatingSystem"
- "com.netflix.servo:name=cassandra*,type=COUNTER"
- "com.netflix.servo:name=cassandra*,type=GAUGE"
- "com.netflix.servo:name=singleDataSource*,type=GAUGE"
- "com.netflix.servo:name=singleDataSource*,type=COUNTER"
- "com.netflix.servo:name=jdbc*,type=GAUGE"
- "com.netflix.servo:name=jdbc*,type=COUNTER"
- "com.netflix.servo:name=kafka*,type=GAUGE"
- "com.netflix.servo:name=kafka*,type=COUNTER"
- "com.netflix.servo:name=osgw*,type=GAUGE"
- "com.netflix.servo:name=osgw*,type=COUNTER"
whitelistObjectNames: ["java.lang:type=OperatingSystem"]
blacklistObjectNames: []
rules:
- pattern: 'java.lang<type=OperatingSystem><>(committed_virtual_memory|free_physical_memory|free_swap_space|total_physical_memory|total_swap_space)_size:'
name: os_$1_bytes
type: GAUGE
attrNameSnakeCase: true
- pattern: 'java.lang<type=OperatingSystem><>((?!process_cpu_time)\w+):'
name: os_$1
type: GAUGE
attrNameSnakeCase: true

View File

@@ -1,20 +0,0 @@
Your TIP WLAN cloud controller Helm deployment has been successful!
**************************************************************************************
*** PLEASE BE PATIENT: Some components may need up to 5 minutes to fully start up. ***
**************************************************************************************
You can check the status with the following command:
kubectl get pods -n {{ .Release.Namespace }} -w
{{ if gt (len (index .Values "wlan-cloud-static-portal").ingress.hosts) 0 }}
The dashboard should be available at:
http://{{ (index (index .Values "wlan-cloud-static-portal").ingress.hosts 0).host }}
Login with the following credentials:
Username: support@example.com
Password: support
{{ end }}

View File

@@ -16,13 +16,14 @@
{{- define "jmxPrometheus.initContainer" -}}
{{- if .Values.global.monitoring.enableJmxPrometheusMetrics -}}
- name: jmx-prometheus-exporter
image: {{ .Values.global.monitoring.jmxExporterAgent.registry }}/{{ .Values.global.monitoring.jmxExporterAgent.repository }}:{{ .Values.global.monitoring.jmxExporterAgent.tag }}
- name: download-jmx-prometheus-exporter
image: alpine:latest
command:
- cp
- wget
args:
- {{ .Values.global.monitoring.jmxExporterAgent.path }}
- -P
- {{ include "jmxPrometheus.agentDir" . }}
- https://repo1.maven.org/maven2/io/prometheus/jmx/jmx_prometheus_javaagent/0.14.0/jmx_prometheus_javaagent-0.14.0.jar
volumeMounts:
{{ include "jmxPrometheus.tmpVolumeMount" . | indent 2 }}
{{- end -}}
@@ -68,7 +69,7 @@
{{- define "jmxPrometheus.jvmOpts" -}}
{{- if .Values.global.monitoring.enableJmxPrometheusMetrics -}}
-javaagent:{{ include "jmxPrometheus.agentDir" . }}/{{ .Values.global.monitoring.jmxExporterAgent.path | base }}={{ include "jmxPrometheus.portNumber" . }}:{{ include "jmxPrometheus.configPath" . }}
-javaagent:{{ include "jmxPrometheus.agentDir" . }}/jmx_prometheus_javaagent-0.14.0.jar={{ include "jmxPrometheus.portNumber" . }}:{{ include "jmxPrometheus.configPath" . }}
{{- end -}}
{{- end -}}

View File

@@ -53,7 +53,7 @@ spec:
done
containers:
- name: kafka-config
image: {{ .Values.kafka.initJobConfig.image }}
image: confluentinc/cp-kafka:5.0.1
command:
- bash
- -c

View File

@@ -37,15 +37,12 @@ global:
nodePortPrefix: 302
nodePortPrefixExt: 304
imageRoot:
registry: tip-docker-cache-repo.jfrog.io
repository:
registry: tip-tip-wlan-cloud-docker-repo.jfrog.io
# username: username
# password: password
username: tip-read
password: tip-read
# image pull policy
pullPolicy: IfNotPresent
pullPolicy: Always
# flag to enable debugging - application support required
debugEnabled: false
@@ -78,15 +75,9 @@ global:
monitoring:
enableJmxPrometheusMetrics: false
enablePrometheusPodMonitors: false
# Docker image containing the JMX exporter Java agent
jmxExporterAgent:
registry: tip-docker-cache-repo.jfrog.io
repository: bitnami/jmx-exporter
tag: 0.15.0
path: /opt/bitnami/jmx-exporter/jmx_prometheus_javaagent.jar
# DockerRegistry Secret
createDockerRegistrySecret: false
createDockerRegistrySecret: true
# Enabling components under Tip-wlan
opensync-gw-static:
@@ -139,12 +130,6 @@ kafka:
- name: customer_events
partitions: 1
replicationFactor: 1
- name: location_metrics
partitions: 1
replicationFactor: 1
- name: location_events
partitions: 1
replicationFactor: 1
creds:
sslKeyPassword: *sslKeyPassword
sslKeystorePassword: *sslKeystorePassword
@@ -152,7 +137,6 @@ kafka:
enabled: false
replicaCount: 1
image:
registry: tip-docker-cache-repo.jfrog.io
debug: true
auth:
clientProtocol: mtls
@@ -180,31 +164,20 @@ kafka:
release: prometheus-operator
zookeeper:
enabled: true
image:
registry: tip-docker-cache-repo.jfrog.io
persistence:
enabled: true
resources:
limits:
cpu: 1
memory: 500Gi
requests:
cpu: 10m
memory: 400Mi
resources:
limits:
cpu: 1
memory: 2Gi
requests:
cpu: 10m
memory: 1100Mi
memory: 700Mi
cassandra:
enabled: false
tlsEncryptionSecretName: tip-common-cassandra-certs
image:
registry: tip-docker-cache-repo.jfrog.io
debug: true
persistence:
enabled: true
@@ -236,7 +209,6 @@ postgresql:
enabled: false
postgresqlDatabase: tip
image:
registry: tip-docker-cache-repo.jfrog.io
debug: true
metrics:
enabled: false
@@ -262,8 +234,6 @@ postgresql:
storageClass: glusterfs-storage
volumePermissions:
enabled: true
image:
registry: tip-docker-cache-repo.jfrog.io
livenessProbe:
enabled: false
readinessProbe:
@@ -285,7 +255,7 @@ postgresql:
primary:
extraInitContainers:
- command: [ "sh", "-c", "chmod 0600 /opt/bitnami/postgresql/certs/postgresclientkey_dec.pem" ]
image: tip-docker-cache-repo.jfrog.io/library/busybox:latest
image: busybox:latest
name: chmod-client-cert-additional
securityContext:
runAsUser: 0