scottk/wlan-cloud-helm
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-cloud-helm.git synced 2025-11-01 19:17:51 +00:00
Code Issues Packages Projects Releases 3 Wiki Activity

Remove CloudDeployment flag from Helm charts.

Browse Source 
Not needed if pods(running in local env) can reach Jfrog to retrieve schema.
This commit is contained in:
Rahul Sharma
2020-11-04 18:54:41 -05:00
parent 2adf0ae0ef
commit dfa6bfc728
10 changed files with 17 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tip-wlan/charts/opensync-gw-cloud/templates/deployment.yaml
View File

@@ -4,7 +4,6 @@
{{- $mqtt := include "mqtt.service" . -}}
{{- $ns := include "common.namespace" . -}}
{{- $file_store_path := include "filestore.dir.name" . -}}
{{- $cloudeployment := .Values.global.isCloudDeployment -}}
apiVersion: apps/v1
kind: Deployment
metadata:
@@ -73,11 +72,6 @@ spec:
- sh
- -c
- |
if [ {{ $cloudeployment }} = false ]
then
echo "151.101.112.249 dl-cdn.alpinelinux.org" >> /etc/hosts
echo "Added name-resolution for local deployments"
fi
apk add curl
url=https://{{ $icc }}/ping
counter=0
@@ -105,11 +99,6 @@ spec:
- sh
- -c
- |
if [ {{ $cloudeployment }} = false ]
then
echo "151.101.112.249 dl-cdn.alpinelinux.org" >> /etc/hosts
echo "Added name-resolution for local deployments"
fi
apk add curl
url=https://{{ $prov }}/ping
counter=0
@@ -136,11 +125,6 @@ spec:
- sh
- -c
- |
if [ {{ $cloudeployment }} = false ]
then
echo "151.101.112.249 dl-cdn.alpinelinux.org" >> /etc/hosts
echo "Added name-resolution for local deployments"
fi
apk add curl
url=https://{{ $ssc }}/ping
counter=0

10
tip-wlan/charts/wlan-integrated-cloud-component-service/templates/deployment.yaml
View File

@@ -1,7 +1,6 @@
{{- if .Values.global.integratedDeployment }}
{{- $pg := include "postgresql.service" . -}}
{{- $ns := include "common.namespace" . -}}
{{- $cloudeployment := .Values.global.isCloudDeployment -}}
apiVersion: apps/v1
kind: Deployment
metadata:
@@ -55,15 +54,6 @@ spec:
- sh
- -c
- |
if [ {{ $cloudeployment }} = false ]
then
echo "151.101.112.249 dl-cdn.alpinelinux.org" >> /etc/hosts
echo "34.215.47.158 tip-tip-wlan-cloud-docker-repo.jfrog.io" >> /etc/hosts
echo "151.101.128.204 security.debian.org" >> /etc/hosts
echo "151.101.126.133 deb.debian.org" >> /etc/hosts
echo "147.75.85.69 apt.postgresql.org" >> /etc/hosts
echo "Added name-resolution for local deployments"
fi
apt update
apt -y install curl
echo "***** Fetching cloud-sdk-schema-postgresql.sql from JFrog *****"

6
tip-wlan/charts/wlan-port-forwarding-gateway-service/templates/deployment.yaml
View File

@@ -1,4 +1,3 @@
{{- $cloudeployment := .Values.global.isCloudDeployment -}}
{{- $opensyncgw := include "opensyncgw.service" . -}}
apiVersion: apps/v1
kind: Deployment
@@ -30,11 +29,6 @@ spec:
- sh
- -c
- |
if [ {{ $cloudeployment }} = false ]
then
echo "151.101.112.249 dl-cdn.alpinelinux.org" >> /etc/hosts
echo "Added name-resolution for local deployments"
fi
apk add curl
url=https://{{ $opensyncgw }}/ping
counter=0

12
tip-wlan/charts/wlan-prov-service/templates/deployment.yaml
View File

@@ -1,6 +1,5 @@
{{- $pg := include "postgresql.service" . -}}
{{- $ns := include "common.namespace" . -}}
{{- $cloudeployment := .Values.global.isCloudDeployment -}}
apiVersion: apps/v1
kind: Deployment
metadata:
@@ -57,16 +56,7 @@ spec:
command:
- sh
- -c
- |
if [ {{ $cloudeployment }} = false ]
then
echo "151.101.2.133 dl-cdn.alpinelinux.org" >> /etc/hosts
echo "52.35.62.28 tip-tip-wlan-cloud-docker-repo.jfrog.io" >> /etc/hosts
echo "151.101.192.204 security.debian.org" >> /etc/hosts
echo "199.232.38.133 deb.debian.org" >> /etc/hosts
echo "147.75.85.69 apt.postgresql.org" >> /etc/hosts
echo "Added name-resolution for local deployments"
fi
- |
apt update
apt -y install curl
echo "***** Fetching latest cloud-sdk-schema-postgresql for DB and Tables sql from JFrog *****"

8
tip-wlan/charts/wlan-ssc-service/templates/deployment.yaml
View File

@@ -1,7 +1,6 @@
{{- $kafka := include "kafka.service" . -}}
{{- $cassandra := include "cassandra.service" . -}}
{{- $ns := include "common.namespace" . -}}
{{- $cloudeployment := .Values.global.isCloudDeployment -}}
apiVersion: apps/v1
kind: Deployment
metadata:
@@ -53,13 +52,6 @@ spec:
- sh
- -c
- |
if [ {{ $cloudeployment }} = false ]
then
echo "52.35.62.28 tip-tip-wlan-cloud-docker-repo.jfrog.io" >> /etc/hosts
echo "91.189.88.152 security.ubuntu.com" >> /etc/hosts
echo "91.189.88.142 archive.ubuntu.com" >> /etc/hosts
echo "Added name-resolution for local deployments"
fi
apt update
apt -y install curl
echo "***** Fetching cloud-sdk-schema-cassandra.cql from JFrog *****"

2
tip-wlan/resources/environments/dev-integrated.yaml
View File

@@ -30,8 +30,6 @@ global:
# Integrated Deployment which deploys Prov Service, Portal Service and
# SSC Service in a single docker image
integratedDeployment: true
# Is the Cluster deployed in Cloud
isCloudDeployment: false
# Annotations for namespace
annotations: {
"helm.sh/resource-policy": keep

3
tip-wlan/resources/environments/dev-no-gluster.yaml
View File

@@ -26,9 +26,6 @@ global:
# flag to enable debugging - application support required
debugEnabled: true
# Is the Cluster deployed in Cloud
isCloudDeployment: false
# Annotations for namespace
annotations: {
"helm.sh/resource-policy": keep

20
tip-wlan/resources/environments/dev.yaml
View File

@@ -28,9 +28,6 @@ global:
# flag to enable debugging - application support required
debugEnabled: true
# Is the Cluster deployed in Cloud
isCloudDeployment: false
# Annotations for namespace
annotations: {
"helm.sh/resource-policy": keep
@@ -82,6 +79,10 @@ wlan-prov-service:
schema_repo:
username: tip-read
password: tip-read
postgres:
singleDataSourceUsername: tip_user
singleDataSourcePassword: tip_password
singleDataSourceSslKeyPassword: mypassword
wlan-ssc-service:
enabled: true
creds:
@@ -127,6 +128,10 @@ kafka:
persistence:
enabled: true
storageClass: "glusterfs-storage"
creds:
sslKeystorePassword: mypassword
sslTruststorePassword: mypassword
sslKeyPassword: mypassword
cassandra:
enabled: true
cluster:
@@ -139,6 +144,9 @@ cassandra:
persistence:
enabled: true
storageClass: "glusterfs-storage"
creds:
sslKeystorePassword: mypassword
sslTruststorePassword: mypassword
postgresql:
enabled: true
postgresqlPassword: postgres
@@ -152,4 +160,8 @@ postgresql:
slaveReplicas: 1
persistence:
enabled: true
storageClass: "glusterfs-storage"
storageClass: "glusterfs-storage"
readinessProbe:
initialDelaySeconds: 30
livenessProbe:
initialDelaySeconds: 30

3
tip-wlan/resources/environments/disable-allcharts.yaml
View File

@@ -30,9 +30,6 @@ global:
# flag to enable debugging - application support required
debugEnabled: true
# Is the Cluster deployed in Cloud
isCloudDeployment: false
createReleaseNamespace: false
createDockerRegistrySecret: false

3
tip-wlan/values.yaml
View File

@@ -34,9 +34,6 @@ global:
# SSC Service in a single docker image
integratedDeployment: false
# Is the Cluster deployed in Cloud
isCloudDeployment: true
testingEnabled: false
testingTimestamp: