aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBorislav Glozman <Borislav.Glozman@amdocs.com>2018-12-23 15:16:19 +0000
committerGerrit Code Review <gerrit@onap.org>2018-12-23 15:16:19 +0000
commit7b5466dbb6b76c39b7648b1014bc9ab9fe624ae1 (patch)
tree6ef84ee61a421f66bb965f7dfa214c75a0b901c0
parent84c242e22e45c8bf63c0bcde68e56fa6c4a2344d (diff)
parent60f72472a038a0bcb7440f6ff028a422de20edc3 (diff)
Merge "Reconfigure nodeport usage"
-rw-r--r--kubernetes/aaf/charts/aaf-sms/charts/aaf-sms-vault/values.yaml4
-rw-r--r--kubernetes/multicloud/charts/multicloud-prometheus/charts/prometheus-alertmanager/values.yaml4
-rw-r--r--kubernetes/multicloud/charts/multicloud-prometheus/charts/prometheus-grafana/values.yaml4
-rw-r--r--kubernetes/multicloud/charts/multicloud-prometheus/templates/configmap.yaml4
-rw-r--r--kubernetes/multicloud/charts/multicloud-prometheus/templates/deployment.yaml4
-rw-r--r--kubernetes/multicloud/charts/multicloud-prometheus/templates/pv.yaml4
-rw-r--r--kubernetes/multicloud/charts/multicloud-prometheus/templates/pvc.yaml4
-rw-r--r--kubernetes/multicloud/charts/multicloud-prometheus/templates/service.yaml6
-rw-r--r--kubernetes/multicloud/charts/multicloud-prometheus/values.yaml8
-rw-r--r--kubernetes/multicloud/values.yaml2
10 files changed, 33 insertions, 11 deletions
diff --git a/kubernetes/aaf/charts/aaf-sms/charts/aaf-sms-vault/values.yaml b/kubernetes/aaf/charts/aaf-sms/charts/aaf-sms-vault/values.yaml
index 58017bdf40..355cd608cb 100644
--- a/kubernetes/aaf/charts/aaf-sms/charts/aaf-sms-vault/values.yaml
+++ b/kubernetes/aaf/charts/aaf-sms/charts/aaf-sms-vault/values.yaml
@@ -81,11 +81,11 @@ persistence:
mountSubPath: sms/consul/data
service:
- type: NodePort
+ type: ClusterIP
name: aaf-sms-db
portName: aaf-sms-db
internalPort: 8200
- nodePort: 44
+ externalPort: 8200
ingress:
enabled: false
diff --git a/kubernetes/multicloud/charts/multicloud-prometheus/charts/prometheus-alertmanager/values.yaml b/kubernetes/multicloud/charts/multicloud-prometheus/charts/prometheus-alertmanager/values.yaml
index 883e9f4efa..ccd70b30cf 100644
--- a/kubernetes/multicloud/charts/multicloud-prometheus/charts/prometheus-alertmanager/values.yaml
+++ b/kubernetes/multicloud/charts/multicloud-prometheus/charts/prometheus-alertmanager/values.yaml
@@ -39,11 +39,11 @@ persistence:
#Service configuration for this chart
service:
- type: NodePort
+ type: ClusterIP
name: multicloud-prometheus-alertmanager
portName: prometheus-alertmanager
internalPort: 9093
- nodePort: 62
+ externalPort: 9093
meshpeer:
enabled: false
diff --git a/kubernetes/multicloud/charts/multicloud-prometheus/charts/prometheus-grafana/values.yaml b/kubernetes/multicloud/charts/multicloud-prometheus/charts/prometheus-grafana/values.yaml
index 4018a69d38..43f4e93a6f 100644
--- a/kubernetes/multicloud/charts/multicloud-prometheus/charts/prometheus-grafana/values.yaml
+++ b/kubernetes/multicloud/charts/multicloud-prometheus/charts/prometheus-grafana/values.yaml
@@ -43,11 +43,11 @@ persistence:
#Service configuration for this chart
service:
- type: NodePort
+ type: ClusterIP
name: multicloud-prometheus-grafana
portName: prometheus-grafana
internalPort: 3000
- nodePort: 63
+ externalPort: 3000
#Grafana Datasources
datasources:
diff --git a/kubernetes/multicloud/charts/multicloud-prometheus/templates/configmap.yaml b/kubernetes/multicloud/charts/multicloud-prometheus/templates/configmap.yaml
index 8b6da6a6c1..a5aff3480b 100644
--- a/kubernetes/multicloud/charts/multicloud-prometheus/templates/configmap.yaml
+++ b/kubernetes/multicloud/charts/multicloud-prometheus/templates/configmap.yaml
@@ -14,6 +14,8 @@
# limitations under the License.
*/}}
+{{- if .Values.global.prometheus.enabled -}}
+
apiVersion: v1
kind: ConfigMap
metadata:
@@ -26,3 +28,5 @@ metadata:
heritage: {{ .Release.Service }}
data:
{{ tpl (.Files.Glob "resources/config/*").AsConfig . | indent 2 }}
+
+{{- end -}} \ No newline at end of file
diff --git a/kubernetes/multicloud/charts/multicloud-prometheus/templates/deployment.yaml b/kubernetes/multicloud/charts/multicloud-prometheus/templates/deployment.yaml
index 00c6e21c5d..562755db91 100644
--- a/kubernetes/multicloud/charts/multicloud-prometheus/templates/deployment.yaml
+++ b/kubernetes/multicloud/charts/multicloud-prometheus/templates/deployment.yaml
@@ -14,6 +14,8 @@
# limitations under the License.
*/}}
+{{- if .Values.global.prometheus.enabled -}}
+
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
@@ -119,3 +121,5 @@ spec:
imagePullSecrets:
- name: "{{ include "common.namespace" . }}-docker-registry-key"
restartPolicy: Always
+
+{{- end -}} \ No newline at end of file
diff --git a/kubernetes/multicloud/charts/multicloud-prometheus/templates/pv.yaml b/kubernetes/multicloud/charts/multicloud-prometheus/templates/pv.yaml
index 37ed28ee9d..961b6bba63 100644
--- a/kubernetes/multicloud/charts/multicloud-prometheus/templates/pv.yaml
+++ b/kubernetes/multicloud/charts/multicloud-prometheus/templates/pv.yaml
@@ -14,6 +14,8 @@
# limitations under the License.
*/}}
+{{- if .Values.global.prometheus.enabled -}}
+
{{- if and .Values.persistence.enabled (not .Values.persistence.existingClaim) -}}
kind: PersistentVolume
apiVersion: v1
@@ -34,4 +36,6 @@ spec:
persistentVolumeReclaimPolicy: {{ .Values.persistence.volumeReclaimPolicy }}
hostPath:
path: {{ .Values.global.persistence.mountPath | default .Values.persistence.mountPath }}/{{ .Release.Name }}/{{ .Values.persistence.mountSubPath }}
+{{- end -}}
+
{{- end -}} \ No newline at end of file
diff --git a/kubernetes/multicloud/charts/multicloud-prometheus/templates/pvc.yaml b/kubernetes/multicloud/charts/multicloud-prometheus/templates/pvc.yaml
index e6aacd1b96..73fcc30ba6 100644
--- a/kubernetes/multicloud/charts/multicloud-prometheus/templates/pvc.yaml
+++ b/kubernetes/multicloud/charts/multicloud-prometheus/templates/pvc.yaml
@@ -14,6 +14,8 @@
# limitations under the License.
*/}}
+{{- if .Values.global.prometheus.enabled -}}
+
{{- if and .Values.persistence.enabled (not .Values.persistence.existingClaim) -}}
kind: PersistentVolumeClaim
apiVersion: v1
@@ -46,3 +48,5 @@ spec:
{{- end }}
{{- end }}
{{- end -}}
+
+{{- end -}} \ No newline at end of file
diff --git a/kubernetes/multicloud/charts/multicloud-prometheus/templates/service.yaml b/kubernetes/multicloud/charts/multicloud-prometheus/templates/service.yaml
index f736793d7b..88f5cac526 100644
--- a/kubernetes/multicloud/charts/multicloud-prometheus/templates/service.yaml
+++ b/kubernetes/multicloud/charts/multicloud-prometheus/templates/service.yaml
@@ -14,6 +14,8 @@
# limitations under the License.
*/}}
+{{- if .Values.global.prometheus.enabled -}}
+
apiVersion: v1
kind: Service
metadata:
@@ -39,4 +41,6 @@ spec:
protocol: TCP
selector:
app: {{ include "common.name" . }}
- release: {{ .Release.Name }} \ No newline at end of file
+ release: {{ .Release.Name }}
+
+{{- end -}} \ No newline at end of file
diff --git a/kubernetes/multicloud/charts/multicloud-prometheus/values.yaml b/kubernetes/multicloud/charts/multicloud-prometheus/values.yaml
index c107a55878..5065392214 100644
--- a/kubernetes/multicloud/charts/multicloud-prometheus/values.yaml
+++ b/kubernetes/multicloud/charts/multicloud-prometheus/values.yaml
@@ -24,9 +24,9 @@ global:
busyboxRepository: registry.hub.docker.com
busyboxImage: library/busybox:latest
alertmanager:
- enabled: true
+ enabled: false
grafana:
- enabled: true
+ enabled: false
configmapReload:
image:
repository: jimmidyson/configmap-reload
@@ -57,11 +57,11 @@ persistence:
#Service configuration for this chart
service:
- type: NodePort
+ type: ClusterIP
name: multicloud-prometheus
portName: multicloud-prometheus
internalPort: 9090
- nodePort: 45
+ externalPort: 9090
# probe configuration parameters
liveness:
diff --git a/kubernetes/multicloud/values.yaml b/kubernetes/multicloud/values.yaml
index 78f42ccbfb..8ebcb826ae 100644
--- a/kubernetes/multicloud/values.yaml
+++ b/kubernetes/multicloud/values.yaml
@@ -20,6 +20,8 @@ global:
nodePortPrefix: 302
loggingRepository: docker.elastic.co
loggingImage: beats/filebeat:5.5.0
+ prometheus:
+ enabled: false
#################################################################
# Application configuration defaults.