[VOL-5506] Disable service monitor by default
Change-Id: Ia0d553fb428e859e320518ca6d58ad8b125ffe05
Signed-off-by: Abhay Kumar <abhay.kumar@radisys.com>
diff --git a/VERSION b/VERSION
index 1981190..f280719 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.8.0
+3.8.1
diff --git a/voltha-adapter-openolt/Chart.yaml b/voltha-adapter-openolt/Chart.yaml
index 6449e07..85abee2 100644
--- a/voltha-adapter-openolt/Chart.yaml
+++ b/voltha-adapter-openolt/Chart.yaml
@@ -17,7 +17,7 @@
## Chart version for package 'voltha-adapter-openolt'
## Increment when Chart.yaml changes
-version: "2.15.2"
+version: "2.15.3"
description: "A Helm chart for Voltha OpenOLT Adapter"
keywords:
- "onf"
@@ -35,6 +35,6 @@
url: "https://www.opennetworking.org"
# appVersion refers to release version of voltha-openolt-adapter
-appVersion: "4.6.2"
+appVersion: "4.6.4"
# [EOF]
diff --git a/voltha-adapter-openolt/templates/openolt-servicemonitor.yaml b/voltha-adapter-openolt/templates/openolt-servicemonitor.yaml
index 4f07f7a..d5e05ac 100644
--- a/voltha-adapter-openolt/templates/openolt-servicemonitor.yaml
+++ b/voltha-adapter-openolt/templates/openolt-servicemonitor.yaml
@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
---
+{{- if .Values.serviceMonitor.enable }}
apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:
@@ -39,4 +40,5 @@
matchLabels:
app: "{{ .Chart.Name }}"
release: "{{ .Release.Name }}"
+{{- end }}
diff --git a/voltha-adapter-openolt/values.yaml b/voltha-adapter-openolt/values.yaml
index d0cf273..10af85f 100644
--- a/voltha-adapter-openolt/values.yaml
+++ b/voltha-adapter-openolt/values.yaml
@@ -90,6 +90,9 @@
tracing_agent:
address: jaeger-agent:6831
+serviceMonitor:
+ enable: false
+
# Expose the golang pprof webserver, if enabled
profiler:
enabled: false
diff --git a/voltha-adapter-openonu/Chart.yaml b/voltha-adapter-openonu/Chart.yaml
index 7de8d2c..0eb4a84 100644
--- a/voltha-adapter-openonu/Chart.yaml
+++ b/voltha-adapter-openonu/Chart.yaml
@@ -14,7 +14,7 @@
---
apiVersion: "v1"
name: "voltha-adapter-openonu"
-version: "2.15.2"
+version: "2.15.3"
description: "A Helm chart for Voltha OpenONU Adapter"
keywords:
- "onf"
@@ -32,6 +32,6 @@
url: "https://www.opennetworking.org"
# appVersion refers to release version of voltha-openonu-adapter-go
-appVersion: "2.13.2"
+appVersion: "2.13.3"
# [EOF]
diff --git a/voltha-adapter-openonu/templates/openonu-servicemonitor.yaml b/voltha-adapter-openonu/templates/openonu-servicemonitor.yaml
index 4f07f7a..d5e05ac 100644
--- a/voltha-adapter-openonu/templates/openonu-servicemonitor.yaml
+++ b/voltha-adapter-openonu/templates/openonu-servicemonitor.yaml
@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
---
+{{- if .Values.serviceMonitor.enable }}
apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:
@@ -39,4 +40,5 @@
matchLabels:
app: "{{ .Chart.Name }}"
release: "{{ .Release.Name }}"
+{{- end }}
diff --git a/voltha-adapter-openonu/values.yaml b/voltha-adapter-openonu/values.yaml
index 692c554..7087809 100644
--- a/voltha-adapter-openonu/values.yaml
+++ b/voltha-adapter-openonu/values.yaml
@@ -102,6 +102,9 @@
tracing_agent:
address: jaeger-agent:6831
+serviceMonitor:
+ enable: false
+
allowed_onu_vendors:
- OPEN
- ALCL
diff --git a/voltha-go-controller/Chart.yaml b/voltha-go-controller/Chart.yaml
index 7c0e916..3369a7e 100644
--- a/voltha-go-controller/Chart.yaml
+++ b/voltha-go-controller/Chart.yaml
@@ -27,6 +27,6 @@
## Chart version for package voltha-go-controller
## Increment when Chart.yaml changes
-version: "2.15.1"
+version: "2.15.2"
# [EOF]
diff --git a/voltha-go-controller/templates/servicemonitor.yaml b/voltha-go-controller/templates/servicemonitor.yaml
index 4f07f7a..d5e05ac 100644
--- a/voltha-go-controller/templates/servicemonitor.yaml
+++ b/voltha-go-controller/templates/servicemonitor.yaml
@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
---
+{{- if .Values.serviceMonitor.enable }}
apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:
@@ -39,4 +40,5 @@
matchLabels:
app: "{{ .Chart.Name }}"
release: "{{ .Release.Name }}"
+{{- end }}
diff --git a/voltha-go-controller/values.yaml b/voltha-go-controller/values.yaml
index 0be450a..22b67d3 100644
--- a/voltha-go-controller/values.yaml
+++ b/voltha-go-controller/values.yaml
@@ -122,3 +122,6 @@
type: "etcd"
address: "voltha-infra-etcd-headless.infra.svc.cluster.local"
port: "2379"
+
+serviceMonitor:
+ enable: false
diff --git a/voltha-stack/Chart.yaml b/voltha-stack/Chart.yaml
index 2bebae3..3556a78 100644
--- a/voltha-stack/Chart.yaml
+++ b/voltha-stack/Chart.yaml
@@ -30,11 +30,11 @@
# app version is NOT used in this chart for application versions or image tags
# but represents the voltha release version itself
-appVersion : "2.16"
+appVersion : "2.17"
## Chart version for package voltha-stack
## Increment when Chart.yaml changes
-version : "2.15.3"
+version : "2.15.4"
# -----------------------------------------------------------------------
# NOTE: Dependencies are chart versions not component/repository version
@@ -43,19 +43,19 @@
dependencies:
- name : voltha
repository : file://../voltha
- version : "2.15.3"
+ version : "2.15.4"
condition : voltha.enabled
- name : "voltha-adapter-openonu"
repository : "file://../voltha-adapter-openonu"
- version : "2.15.2"
+ version : "2.15.3"
condition : "voltha-adapter-openonu.enabled"
- name : voltha-adapter-openolt
repository : file://../voltha-adapter-openolt
- version : "2.15.2"
+ version : "2.15.3"
condition : voltha-adapter-openolt.enabled
- name : voltha-go-controller
repository : file://../voltha-go-controller
- version : "2.15.1"
+ version : "2.15.2"
condition : voltha-go-controller.enabled
# [EOF]
diff --git a/voltha/Chart.yaml b/voltha/Chart.yaml
index 67d77ee..f4df7fa 100644
--- a/voltha/Chart.yaml
+++ b/voltha/Chart.yaml
@@ -17,7 +17,7 @@
## Chart version for package 'voltha'
## Increment when Chart.yaml changes
-version: "2.15.3"
+version: "2.15.4"
description: "A Helm chart for Voltha based on K8S resources in Voltha project"
keywords:
diff --git a/voltha/templates/core-servicemonitor.yaml b/voltha/templates/core-servicemonitor.yaml
index 9e06f4d..f4e6bfa 100644
--- a/voltha/templates/core-servicemonitor.yaml
+++ b/voltha/templates/core-servicemonitor.yaml
@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
---
+{{- if .Values.serviceMonitor.enable }}
apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:
@@ -39,4 +40,5 @@
matchLabels:
app: "rw-core"
release: "{{ .Release.Name }}"
+{{- end }}
diff --git a/voltha/values.yaml b/voltha/values.yaml
index 1514bfb..36055b3 100644
--- a/voltha/values.yaml
+++ b/voltha/values.yaml
@@ -77,6 +77,9 @@
controller: []
# - address: onos-openflow:6653
+serviceMonitor:
+ enable: false
+
# Expose the golang pprof webserver, if enabled
profiler:
enabled: false