[AETHER-3278] Exposing various parameters in the aether-roc-api charts
Change-Id: I5b7897e84336ac79e6aeac9894408b7b1e79d5b5
diff --git a/aether-roc-api/Chart.yaml b/aether-roc-api/Chart.yaml
index 4e1ca69..3a7998e 100644
--- a/aether-roc-api/Chart.yaml
+++ b/aether-roc-api/Chart.yaml
@@ -7,8 +7,8 @@
description: Aether ROC API
kubeVersion: ">=1.15.0"
type: application
-version: 1.4.8
-appVersion: v0.9.9
+version: 1.5.0
+appVersion: v0.10.0
keywords:
- aether
- config
diff --git a/aether-roc-api/templates/deployment.yaml b/aether-roc-api/templates/deployment.yaml
index cbe2c43..f925dc4 100644
--- a/aether-roc-api/templates/deployment.yaml
+++ b/aether-roc-api/templates/deployment.yaml
@@ -36,7 +36,7 @@
{{- end }}
containers:
- name: {{ .Chart.Name }}
- image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+ image: "{{ .Values.image.repository }}:{{ tpl .Values.image.tag . }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
env:
- name: NAMESPACE
@@ -46,8 +46,14 @@
- name: OIDC_SERVER_URL
value: {{ .Values.openidc.issuer }}
args:
+ - "-gnmiEndpoint={{ .Values.gnmiEndpoint }}"
+ # TODO add support for certificates
+ - "-gnmiTimeout={{ .Values.gnmiTimeout }}"
+ - "-port={{ .Values.port }}"
+ - "-logLevel={{ .Values.logging.loggers.root.level }}"
{{- range $key, $corsorigin := .Values.corsOrigins }}
- - {{ printf "-allowCorsOrigin=%s" $corsorigin }}{{end}}
+ - {{ printf "-allowCorsOrigin=%s" $corsorigin }}
+ {{end}}
ports:
- name: http
containerPort: 8181
diff --git a/aether-roc-api/values.yaml b/aether-roc-api/values.yaml
index d2dab6f..93cbfcd 100644
--- a/aether-roc-api/values.yaml
+++ b/aether-roc-api/values.yaml
@@ -10,7 +10,7 @@
image:
repository: onosproject/aether-roc-api
- tag: v0.9.9
+ tag: "{{ .Chart.AppVersion }}"
pullPolicy: IfNotPresent
pullSecrets: []
@@ -18,6 +18,10 @@
nameOverride: ""
fullnameOverride: "aether-roc-api"
+gnmiEndpoint: onos-config:5150
+gnmiTimeout: 10s
+port: 8181
+
# Needed for development only - set to blank otherwise
corsOrigins:
- http://localhost:4200
diff --git a/aether-roc-gui-v2/Chart.yaml b/aether-roc-gui-v2/Chart.yaml
index 9f776cb..0d6a725 100644
--- a/aether-roc-gui-v2/Chart.yaml
+++ b/aether-roc-gui-v2/Chart.yaml
@@ -7,7 +7,7 @@
description: Aether ROC Graphical User Interface
kubeVersion: ">=1.15.0"
type: application
-version: 2.0.5
+version: 2.0.6
appVersion: 2.0.0
keywords:
- aether
diff --git a/aether-roc-gui-v2/values.yaml b/aether-roc-gui-v2/values.yaml
index 58e8b54..1a53b0d 100644
--- a/aether-roc-gui-v2/values.yaml
+++ b/aether-roc-gui-v2/values.yaml
@@ -10,7 +10,7 @@
image:
repository: onosproject/aether-roc-gui
- tag: v0.9.6
+ tag: v0.9.7
pullPolicy: IfNotPresent
pullSecrets: []
diff --git a/aether-roc-umbrella/Chart.yaml b/aether-roc-umbrella/Chart.yaml
index 540edc7..b94a3b5 100644
--- a/aether-roc-umbrella/Chart.yaml
+++ b/aether-roc-umbrella/Chart.yaml
@@ -7,7 +7,7 @@
description: Aether ROC Umbrella chart to deploy all Aether ROC
kubeVersion: ">=1.18.0"
type: application
-version: 2.0.32
+version: 2.0.33
appVersion: v0.0.0
keywords:
- aether
@@ -32,7 +32,7 @@
- name: aether-roc-api
condition: import.aether-roc-api.enabled
repository: "file://../aether-roc-api"
- version: 1.4.8
+ version: 1.5.0
- name: aether-roc-websocket
condition: import.aether-roc-websocket.enabled
repository: "file://../aether-roc-websocket"
@@ -44,7 +44,7 @@
- name: aether-roc-gui-v2
condition: import.aether-roc-gui.v2.enabled
repository: "file://../aether-roc-gui-v2"
- version: 2.0.5
+ version: 2.0.6
- name: sdcore-adapter-v2
condition: import.sdcore-adapter.v2.enabled
repository: "file://../sdcore-adapter-v2"