summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kubernetes/aaf/templates/aaf-cs-deployment.yaml2
-rw-r--r--kubernetes/aaf/templates/aaf-deployment.yaml1
-rw-r--r--kubernetes/aaf/values.yaml2
-rw-r--r--kubernetes/clamp/templates/clamp-deployment.yaml1
-rw-r--r--kubernetes/clamp/templates/clamp-mariadb-deployment.yaml2
-rw-r--r--kubernetes/clamp/values.yaml2
-rw-r--r--kubernetes/common/common-templates/templates/_namespace.tpl4
-rw-r--r--kubernetes/consul/templates/consul-agent-deployment.yaml1
-rw-r--r--kubernetes/consul/templates/consul-server-deployment.yaml2
-rw-r--r--kubernetes/consul/values.yaml2
-rw-r--r--kubernetes/log/templates/elasticsearch-deployment.yaml1
-rw-r--r--kubernetes/log/templates/kibana-deployment.yaml1
-rw-r--r--kubernetes/log/templates/logstash-deployment.yaml1
-rw-r--r--kubernetes/log/values.yaml3
-rw-r--r--kubernetes/multicloud/templates/framework-deployment.yaml1
-rw-r--r--kubernetes/multicloud/templates/multicloud-ocata-deployment.yaml1
-rw-r--r--kubernetes/multicloud/templates/multicloud-vio-deployment.yaml1
-rw-r--r--kubernetes/multicloud/templates/multicloud-windriver-deployment.yaml1
-rw-r--r--kubernetes/multicloud/values.yaml4
-rw-r--r--kubernetes/so/charts/mariadb/Chart.yaml2
-rw-r--r--kubernetes/so/charts/mariadb/templates/NOTES.txt6
-rw-r--r--kubernetes/so/charts/mariadb/templates/clusterrolebinding.yaml2
-rw-r--r--kubernetes/so/charts/mariadb/templates/deployment.yaml6
-rw-r--r--kubernetes/so/charts/mariadb/templates/pv.yaml4
-rw-r--r--kubernetes/so/charts/mariadb/templates/pvc.yaml4
-rw-r--r--kubernetes/so/charts/mariadb/templates/secrets.yaml6
-rw-r--r--kubernetes/so/charts/mariadb/templates/service.yaml2
-rw-r--r--kubernetes/so/templates/NOTES.txt6
-rw-r--r--kubernetes/so/templates/clusterrolebinding.yaml2
-rw-r--r--kubernetes/so/templates/deployment.yaml6
-rw-r--r--kubernetes/so/templates/secrets.yaml2
-rw-r--r--kubernetes/so/templates/service.yaml2
-rw-r--r--kubernetes/uui/templates/all-services.yaml3
-rw-r--r--kubernetes/uui/templates/uui-deployment.yaml1
-rw-r--r--kubernetes/uui/templates/uui-server-deployment.yaml1
-rw-r--r--kubernetes/uui/values.yaml2
36 files changed, 58 insertions, 32 deletions
diff --git a/kubernetes/aaf/templates/aaf-cs-deployment.yaml b/kubernetes/aaf/templates/aaf-cs-deployment.yaml
index be5f6c1c54..817f876f6f 100644
--- a/kubernetes/aaf/templates/aaf-cs-deployment.yaml
+++ b/kubernetes/aaf/templates/aaf-cs-deployment.yaml
@@ -5,7 +5,7 @@ metadata:
name: aaf-cs
namespace: "{{ .Values.nsPrefix }}"
spec:
- replicas: 1
+ replicas: {{ .Values.aafcsReplicas }}
selector:
matchLabels:
app: aaf-cs
diff --git a/kubernetes/aaf/templates/aaf-deployment.yaml b/kubernetes/aaf/templates/aaf-deployment.yaml
index 50c3e5ad94..c084cd36b6 100644
--- a/kubernetes/aaf/templates/aaf-deployment.yaml
+++ b/kubernetes/aaf/templates/aaf-deployment.yaml
@@ -7,6 +7,7 @@ metadata:
name: aaf
namespace: "{{ .Values.nsPrefix }}"
spec:
+ replicas: {{ .Values.aafReplicas }}
selector:
matchLabels:
app: aaf
diff --git a/kubernetes/aaf/values.yaml b/kubernetes/aaf/values.yaml
index 7a3f6c6114..eac5d00e19 100644
--- a/kubernetes/aaf/values.yaml
+++ b/kubernetes/aaf/values.yaml
@@ -1,6 +1,8 @@
nsPrefix: onap
pullPolicy: Always
nodePortPrefix: 302
+aafcsReplicas: 1
+aafReplicas: 1
image:
readiness: oomk8s/readiness-check:1.1.0
aafImage: nexus3.onap.org:10001/onap/aaf/authz-service
diff --git a/kubernetes/clamp/templates/clamp-deployment.yaml b/kubernetes/clamp/templates/clamp-deployment.yaml
index f5dbdd1cf9..2c2e13f994 100644
--- a/kubernetes/clamp/templates/clamp-deployment.yaml
+++ b/kubernetes/clamp/templates/clamp-deployment.yaml
@@ -7,6 +7,7 @@ metadata:
name: clamp
namespace: "{{ .Values.nsPrefix }}"
spec:
+ replicas: {{ .Values.clampReplicas }}
selector:
matchLabels:
app: clamp
diff --git a/kubernetes/clamp/templates/clamp-mariadb-deployment.yaml b/kubernetes/clamp/templates/clamp-mariadb-deployment.yaml
index 762aa807e2..a12489ef63 100644
--- a/kubernetes/clamp/templates/clamp-mariadb-deployment.yaml
+++ b/kubernetes/clamp/templates/clamp-mariadb-deployment.yaml
@@ -5,7 +5,7 @@ metadata:
name: clamp-mariadb
namespace: "{{ .Values.nsPrefix }}"
spec:
- replicas: 1
+ replicas: {{ .Values.clampMariaDbReplicas }}
selector:
matchLabels:
app: clamp-mariadb
diff --git a/kubernetes/clamp/values.yaml b/kubernetes/clamp/values.yaml
index fd75dc4f1a..103472afd9 100644
--- a/kubernetes/clamp/values.yaml
+++ b/kubernetes/clamp/values.yaml
@@ -3,6 +3,8 @@ pullPolicy: Always
nodePortPrefix: 302
mysqlPassword: strong_pitchou
dataRootDir: /dockerdata-nfs
+clampReplicas: 1
+clampMariaDbReplicas: 1
image:
readiness: oomk8s/readiness-check:1.1.0
clampImage: nexus3.onap.org:10001/onap/clamp
diff --git a/kubernetes/common/common-templates/templates/_namespace.tpl b/kubernetes/common/common-templates/templates/_namespace.tpl
index 076fd53f7a..2964a0f207 100644
--- a/kubernetes/common/common-templates/templates/_namespace.tpl
+++ b/kubernetes/common/common-templates/templates/_namespace.tpl
@@ -7,7 +7,5 @@
- .Values.nsSuffix : override namespace suffix
*/}}
{{- define "common.namespace" -}}
- {{- $prefix := default .Release.Name .Values.nsPrefix -}}
- {{- $suffix := default .Chart.Name .Values.nsSuffix -}}
- {{- printf "%s-%s" $prefix $suffix -}}
+ {{- default .Release.Name .Values.nsPrefix -}}
{{- end -}}
diff --git a/kubernetes/consul/templates/consul-agent-deployment.yaml b/kubernetes/consul/templates/consul-agent-deployment.yaml
index 81b16b54ca..a2bbe6636f 100644
--- a/kubernetes/consul/templates/consul-agent-deployment.yaml
+++ b/kubernetes/consul/templates/consul-agent-deployment.yaml
@@ -7,6 +7,7 @@ metadata:
name: consul-agent
namespace: "{{ .Values.nsPrefix }}"
spec:
+ replicas: {{ .Values.consulAgentReplicas }}
selector:
matchLabels:
app: consul-agent
diff --git a/kubernetes/consul/templates/consul-server-deployment.yaml b/kubernetes/consul/templates/consul-server-deployment.yaml
index c9f2cfb372..6aafee4cb2 100644
--- a/kubernetes/consul/templates/consul-server-deployment.yaml
+++ b/kubernetes/consul/templates/consul-server-deployment.yaml
@@ -7,7 +7,7 @@ metadata:
name: consul-server
namespace: "{{ .Values.nsPrefix }}"
spec:
- replicas: 3
+ replicas: {{ .Values.consulServerReplicas }}
selector:
matchLabels:
app: consul-server
diff --git a/kubernetes/consul/values.yaml b/kubernetes/consul/values.yaml
index 89f3ecd0a7..a6909d7d21 100644
--- a/kubernetes/consul/values.yaml
+++ b/kubernetes/consul/values.yaml
@@ -3,5 +3,7 @@ nodePortPrefix: 302
consuldockerTag: "latest"
rootHostPath: "/dockerdata-nfs"
consulimageRegistry: "docker.io/consul"
+consulAgentReplicas: 1
+consulServerReplicas: 3
service:
type: NodePort
diff --git a/kubernetes/log/templates/elasticsearch-deployment.yaml b/kubernetes/log/templates/elasticsearch-deployment.yaml
index 2b596d263a..cbc19a8591 100644
--- a/kubernetes/log/templates/elasticsearch-deployment.yaml
+++ b/kubernetes/log/templates/elasticsearch-deployment.yaml
@@ -7,6 +7,7 @@ metadata:
name: log-elasticsearch
namespace: {{ .Values.nsPrefix }}
spec:
+ replicas: {{ .Values.elasticsearchReplicas }}
selector:
matchLabels:
app: elasticsearch
diff --git a/kubernetes/log/templates/kibana-deployment.yaml b/kubernetes/log/templates/kibana-deployment.yaml
index f627a3c729..6e5c36c993 100644
--- a/kubernetes/log/templates/kibana-deployment.yaml
+++ b/kubernetes/log/templates/kibana-deployment.yaml
@@ -7,6 +7,7 @@ metadata:
name: log-kibana
namespace: {{ .Values.nsPrefix }}
spec:
+ replicas: {{ .Values.kibanaReplicas }}
selector:
matchLabels:
app: kibana
diff --git a/kubernetes/log/templates/logstash-deployment.yaml b/kubernetes/log/templates/logstash-deployment.yaml
index 743108124c..1d3b945711 100644
--- a/kubernetes/log/templates/logstash-deployment.yaml
+++ b/kubernetes/log/templates/logstash-deployment.yaml
@@ -7,6 +7,7 @@ metadata:
name: log-logstash
namespace: {{ .Values.nsPrefix }}
spec:
+ replicas: {{ .Values.logstashReplicas }}
selector:
matchLabels:
app: logstash
diff --git a/kubernetes/log/values.yaml b/kubernetes/log/values.yaml
index af53915d27..69efa27b3d 100644
--- a/kubernetes/log/values.yaml
+++ b/kubernetes/log/values.yaml
@@ -2,6 +2,9 @@ nsPrefix: onap
pullPolicy: Always
nodePortPrefix: 302
dataRootDir: /dockerdata-nfs
+elasticsearchReplicas: 1
+kibanaReplicas: 1
+logstashReplicas: 1
image:
readiness: oomk8s/readiness-check:1.1.0
logstash: docker.elastic.co/logstash/logstash:5.4.3
diff --git a/kubernetes/multicloud/templates/framework-deployment.yaml b/kubernetes/multicloud/templates/framework-deployment.yaml
index dcdf0a2d75..4f96fbf457 100644
--- a/kubernetes/multicloud/templates/framework-deployment.yaml
+++ b/kubernetes/multicloud/templates/framework-deployment.yaml
@@ -5,6 +5,7 @@ metadata:
name: multicloud-framework
namespace: "{{ .Values.nsPrefix }}"
spec:
+ replicas: {{ .Values.frameworkReplicas }}
selector:
matchLabels:
app: framework
diff --git a/kubernetes/multicloud/templates/multicloud-ocata-deployment.yaml b/kubernetes/multicloud/templates/multicloud-ocata-deployment.yaml
index a8bc983d11..072b3d9e7e 100644
--- a/kubernetes/multicloud/templates/multicloud-ocata-deployment.yaml
+++ b/kubernetes/multicloud/templates/multicloud-ocata-deployment.yaml
@@ -5,6 +5,7 @@ metadata:
name: multicloud-ocata
namespace: "{{ .Values.nsPrefix }}"
spec:
+ replicas: {{ .Values.ocataReplicas }}
selector:
matchLabels:
app: multicloud-ocata
diff --git a/kubernetes/multicloud/templates/multicloud-vio-deployment.yaml b/kubernetes/multicloud/templates/multicloud-vio-deployment.yaml
index df99542051..7919bc89f5 100644
--- a/kubernetes/multicloud/templates/multicloud-vio-deployment.yaml
+++ b/kubernetes/multicloud/templates/multicloud-vio-deployment.yaml
@@ -5,6 +5,7 @@ metadata:
name: multicloud-vio
namespace: "{{ .Values.nsPrefix }}"
spec:
+ replicas: {{ .Values.vioReplicas }}
selector:
matchLabels:
app: multicloud-vio
diff --git a/kubernetes/multicloud/templates/multicloud-windriver-deployment.yaml b/kubernetes/multicloud/templates/multicloud-windriver-deployment.yaml
index 2298bee2f2..168d1d611e 100644
--- a/kubernetes/multicloud/templates/multicloud-windriver-deployment.yaml
+++ b/kubernetes/multicloud/templates/multicloud-windriver-deployment.yaml
@@ -5,6 +5,7 @@ metadata:
name: multicloud-windriver
namespace: "{{ .Values.nsPrefix }}"
spec:
+ replicas: {{ .Values.windRiverReplicas }}
selector:
matchLabels:
app: multicloud-windriver
diff --git a/kubernetes/multicloud/values.yaml b/kubernetes/multicloud/values.yaml
index 2dc24b24fe..a903bae1c3 100644
--- a/kubernetes/multicloud/values.yaml
+++ b/kubernetes/multicloud/values.yaml
@@ -2,6 +2,10 @@ nsPrefix: onap
pullPolicy: Always
nodePortPrefix: 302
dataRootDir: /dockerdata-nfs
+frameworkReplicas: 1
+ocataReplicas: 1
+vioReplicas: 1
+windRiverReplicas: 1
image:
readiness: oomk8s/readiness-check:1.1.0
framework: nexus3.onap.org:10001/onap/multicloud/framework:v1.0.0
diff --git a/kubernetes/so/charts/mariadb/Chart.yaml b/kubernetes/so/charts/mariadb/Chart.yaml
index da9cab3175..1b3b5ffb23 100644
--- a/kubernetes/so/charts/mariadb/Chart.yaml
+++ b/kubernetes/so/charts/mariadb/Chart.yaml
@@ -1,4 +1,4 @@
apiVersion: v1
description: MariaDB Service
-name: mariadb
+name: so-mariadb
version: 2.0.0
diff --git a/kubernetes/so/charts/mariadb/templates/NOTES.txt b/kubernetes/so/charts/mariadb/templates/NOTES.txt
index c1f5d13859..87565ada20 100644
--- a/kubernetes/so/charts/mariadb/templates/NOTES.txt
+++ b/kubernetes/so/charts/mariadb/templates/NOTES.txt
@@ -4,13 +4,13 @@
http://{{ . }}
{{- end }}
{{- else if contains "NodePort" .Values.service.type }}
- export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "common.fullname" . }})
+ export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "common.name" . }})
export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
echo http://$NODE_IP:$NODE_PORT
{{- else if contains "LoadBalancer" .Values.service.type }}
NOTE: It may take a few minutes for the LoadBalancer IP to be available.
- You can watch the status of by running 'kubectl get svc -w {{ include "common.fullname" . }}'
- export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "common.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
+ You can watch the status of by running 'kubectl get svc -w {{ include "common.name" . }}'
+ export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "common.name" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
echo http://$SERVICE_IP:{{ .Values.service.externalPort }}
{{- else if contains "ClusterIP" .Values.service.type }}
export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ include "common.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
diff --git a/kubernetes/so/charts/mariadb/templates/clusterrolebinding.yaml b/kubernetes/so/charts/mariadb/templates/clusterrolebinding.yaml
index a1ff116614..df270f55e5 100644
--- a/kubernetes/so/charts/mariadb/templates/clusterrolebinding.yaml
+++ b/kubernetes/so/charts/mariadb/templates/clusterrolebinding.yaml
@@ -2,7 +2,7 @@
apiVersion: rbac.authorization.k8s.io/v1beta1
kind: ClusterRoleBinding
metadata:
- name: {{ include "common.fullname" . }}
+ name: {{ include "common.name" . }}
namespace: {{ include "common.namespace" . }}
labels:
app: {{ include "common.name" . }}
diff --git a/kubernetes/so/charts/mariadb/templates/deployment.yaml b/kubernetes/so/charts/mariadb/templates/deployment.yaml
index 14654dc24a..9c9cf09004 100644
--- a/kubernetes/so/charts/mariadb/templates/deployment.yaml
+++ b/kubernetes/so/charts/mariadb/templates/deployment.yaml
@@ -1,7 +1,7 @@
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
- name: {{ include "common.fullname" . }}
+ name: {{ include "common.name" . }}
namespace: {{ include "common.namespace" . }}
labels:
app: {{ include "common.name" . }}
@@ -41,7 +41,7 @@ spec:
- name: MYSQL_ROOT_PASSWORD
valueFrom:
secretKeyRef:
- name: {{ template "common.fullname" . }}
+ name: {{ template "common.name" . }}
key: db-root-password
volumeMounts:
- mountPath: /var/lib/mysql
@@ -83,7 +83,7 @@ spec:
{{- if .Values.persistence.enabled }}
- name: mariadb-data
persistentVolumeClaim:
- claimName: {{ include "common.fullname" . }}
+ claimName: {{ include "common.name" . }}
{{- else }}
emptyDir: {}
{{- end }}
diff --git a/kubernetes/so/charts/mariadb/templates/pv.yaml b/kubernetes/so/charts/mariadb/templates/pv.yaml
index e03879f119..d60e075ca5 100644
--- a/kubernetes/so/charts/mariadb/templates/pv.yaml
+++ b/kubernetes/so/charts/mariadb/templates/pv.yaml
@@ -2,10 +2,10 @@
kind: PersistentVolume
apiVersion: v1
metadata:
- name: {{ include "common.fullname" . }}
+ name: {{ include "common.name" . }}
namespace: {{ include "common.namespace" . }}
labels:
- app: {{ include "common.fullname" . }}
+ app: {{ include "common.name" . }}
chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
release: "{{ .Release.Name }}"
heritage: "{{ .Release.Service }}"
diff --git a/kubernetes/so/charts/mariadb/templates/pvc.yaml b/kubernetes/so/charts/mariadb/templates/pvc.yaml
index 4a15577687..2271d3c37a 100644
--- a/kubernetes/so/charts/mariadb/templates/pvc.yaml
+++ b/kubernetes/so/charts/mariadb/templates/pvc.yaml
@@ -2,10 +2,10 @@
kind: PersistentVolumeClaim
apiVersion: v1
metadata:
- name: {{ include "common.fullname" . }}
+ name: {{ include "common.name" . }}
namespace: {{ include "common.namespace" . }}
labels:
- app: {{ include "common.fullname" . }}
+ app: {{ include "common.name" . }}
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
release: "{{ .Release.Name }}"
heritage: "{{ .Release.Service }}"
diff --git a/kubernetes/so/charts/mariadb/templates/secrets.yaml b/kubernetes/so/charts/mariadb/templates/secrets.yaml
index 2d2d33547a..dc9761091a 100644
--- a/kubernetes/so/charts/mariadb/templates/secrets.yaml
+++ b/kubernetes/so/charts/mariadb/templates/secrets.yaml
@@ -1,10 +1,10 @@
apiVersion: v1
kind: Secret
metadata:
- name: {{ include "common.fullname" . }}
+ name: {{ include "common.name" . }}
namespace: {{ include "common.namespace" . }}
labels:
- app: {{ include "common.fullname" . }}
+ app: {{ include "common.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
@@ -18,7 +18,7 @@ metadata:
name: {{ include "common.name" . }}-docker-registry-key
namespace: {{ include "common.namespace" . }}
labels:
- app: {{ include "common.fullname" . }}
+ app: {{ include "common.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
diff --git a/kubernetes/so/charts/mariadb/templates/service.yaml b/kubernetes/so/charts/mariadb/templates/service.yaml
index 0a040bcab5..5c133b77d1 100644
--- a/kubernetes/so/charts/mariadb/templates/service.yaml
+++ b/kubernetes/so/charts/mariadb/templates/service.yaml
@@ -1,7 +1,7 @@
apiVersion: v1
kind: Service
metadata:
- name: {{ include "common.fullname" . }}
+ name: {{ include "common.name" . }}
namespace: {{ include "common.namespace" . }}
labels:
app: {{ include "common.name" . }}
diff --git a/kubernetes/so/templates/NOTES.txt b/kubernetes/so/templates/NOTES.txt
index 24371d08ab..0fa17a6a36 100644
--- a/kubernetes/so/templates/NOTES.txt
+++ b/kubernetes/so/templates/NOTES.txt
@@ -4,13 +4,13 @@
http://{{ . }}
{{- end }}
{{- else if contains "NodePort" .Values.service.type }}
- export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "common.fullname" . }})
+ export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "common.name" . }})
export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
echo http://$NODE_IP:$NODE_PORT
{{- else if contains "LoadBalancer" .Values.service.type }}
NOTE: It may take a few minutes for the LoadBalancer IP to be available.
- You can watch the status of by running 'kubectl get svc -w {{ include "common.fullname" . }}'
- export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "common.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
+ You can watch the status of by running 'kubectl get svc -w {{ include "common.name" . }}'
+ export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "common.name" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
echo http://$SERVICE_IP:{{ .Values.service.externalPort }}
{{- else if contains "ClusterIP" .Values.service.type }}
export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "so.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
diff --git a/kubernetes/so/templates/clusterrolebinding.yaml b/kubernetes/so/templates/clusterrolebinding.yaml
index a1ff116614..df270f55e5 100644
--- a/kubernetes/so/templates/clusterrolebinding.yaml
+++ b/kubernetes/so/templates/clusterrolebinding.yaml
@@ -2,7 +2,7 @@
apiVersion: rbac.authorization.k8s.io/v1beta1
kind: ClusterRoleBinding
metadata:
- name: {{ include "common.fullname" . }}
+ name: {{ include "common.name" . }}
namespace: {{ include "common.namespace" . }}
labels:
app: {{ include "common.name" . }}
diff --git a/kubernetes/so/templates/deployment.yaml b/kubernetes/so/templates/deployment.yaml
index 67718ad522..2d25a46722 100644
--- a/kubernetes/so/templates/deployment.yaml
+++ b/kubernetes/so/templates/deployment.yaml
@@ -1,7 +1,7 @@
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
- name: {{ include "common.fullname" . }}
+ name: {{ include "common.name" . }}
namespace: {{ include "common.namespace" . }}
labels:
app: {{ include "common.name" . }}
@@ -21,7 +21,7 @@ spec:
- /root/ready.py
args:
- --container-name
- - mariadb
+ - so-mariadb
env:
- name: NAMESPACE
valueFrom:
@@ -174,4 +174,4 @@ spec:
path: start-jboss-server.sh
mode: 0755
imagePullSecrets:
- - name: "{{ include "common.name" . }}-docker-registry-key" \ No newline at end of file
+ - name: "{{ include "common.name" . }}-docker-registry-key"
diff --git a/kubernetes/so/templates/secrets.yaml b/kubernetes/so/templates/secrets.yaml
index 3bdef26165..269d40649d 100644
--- a/kubernetes/so/templates/secrets.yaml
+++ b/kubernetes/so/templates/secrets.yaml
@@ -4,7 +4,7 @@ metadata:
name: {{ include "common.name" . }}-docker-registry-key
namespace: {{ include "common.namespace" . }}
labels:
- app: {{ include "common.fullname" . }}
+ app: {{ include "common.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
diff --git a/kubernetes/so/templates/service.yaml b/kubernetes/so/templates/service.yaml
index e3e4d48018..f1b5322d9a 100644
--- a/kubernetes/so/templates/service.yaml
+++ b/kubernetes/so/templates/service.yaml
@@ -1,7 +1,7 @@
apiVersion: v1
kind: Service
metadata:
- name: {{ include "common.fullname" . }}
+ name: {{ include "common.name" . }}
namespace: {{ include "common.namespace" . }}
labels:
app: {{ include "common.name" . }}
diff --git a/kubernetes/uui/templates/all-services.yaml b/kubernetes/uui/templates/all-services.yaml
index 173fc77ab4..d66a22fd2e 100644
--- a/kubernetes/uui/templates/all-services.yaml
+++ b/kubernetes/uui/templates/all-services.yaml
@@ -11,7 +11,8 @@ metadata:
{
"serviceName": "usecaseui-gui",
"version": "v1",
- "url": "/iui/usecaseui",
+ "url": "/usecase-ui",
+ "path":"/iui/usecaseui",
"protocol": "UI"
"port": "8080",
"visualRange":"1|0"
diff --git a/kubernetes/uui/templates/uui-deployment.yaml b/kubernetes/uui/templates/uui-deployment.yaml
index 1e18009be5..668574918b 100644
--- a/kubernetes/uui/templates/uui-deployment.yaml
+++ b/kubernetes/uui/templates/uui-deployment.yaml
@@ -7,6 +7,7 @@ metadata:
name: uui
namespace: "{{ .Values.nsPrefix }}"
spec:
+ replicas: {{ .Values.uuiReplicas }}
selector:
matchLabels:
app: uui
diff --git a/kubernetes/uui/templates/uui-server-deployment.yaml b/kubernetes/uui/templates/uui-server-deployment.yaml
index e3c58a87e6..01c87e9450 100644
--- a/kubernetes/uui/templates/uui-server-deployment.yaml
+++ b/kubernetes/uui/templates/uui-server-deployment.yaml
@@ -7,6 +7,7 @@ metadata:
name: uui-server
namespace: "{{ .Values.nsPrefix }}"
spec:
+ replicas: {{ .Values.uuiServerReplicas }}
selector:
matchLabels:
app: uui-server
diff --git a/kubernetes/uui/values.yaml b/kubernetes/uui/values.yaml
index f9e23b0f98..391e338b67 100644
--- a/kubernetes/uui/values.yaml
+++ b/kubernetes/uui/values.yaml
@@ -3,6 +3,8 @@ pullPolicy: Always
uuiPortPrefix: 303
msbaddr: msb-iag.{{ .Values.nsPrefix }}:80
mraddr: dmaap.{{ .Values.nsPrefix }}:3904
+uuiReplicas: 1
+uuiServerReplicas: 1
image:
uuiImage: nexus3.onap.org:10001/onap/usecase-ui
uuiVersion: v1.0.1