SDFAB-177 gui features can be controlled through Helm
Change-Id: I8f4c35a08f21a4abdb7228f59db09c4875abbdfb
diff --git a/aether-roc-gui/Chart.yaml b/aether-roc-gui/Chart.yaml
index bc1962d..b5c86fb 100644
--- a/aether-roc-gui/Chart.yaml
+++ b/aether-roc-gui/Chart.yaml
@@ -7,7 +7,7 @@
description: Aether ROC Graphical User Interface
kubeVersion: ">=1.15.0"
type: application
-version: 2.1.14
+version: 2.1.15
appVersion: 2.0.0
keywords:
- aether
diff --git a/aether-roc-gui/templates/deployment.yaml b/aether-roc-gui/templates/deployment.yaml
index cf07343..1eaa906 100644
--- a/aether-roc-gui/templates/deployment.yaml
+++ b/aether-roc-gui/templates/deployment.yaml
@@ -46,6 +46,10 @@
fieldPath: metadata.namespace
- name: OPENIDCISSUER
value: {{ .Values.openidc.issuer }}
+ - name: FEATUREAETHER
+ value: {{ .Values.feature.aether | quote }}
+ - name: FEATURESDNFABRIC
+ value: {{ .Values.feature.sdnfabric | quote }}
stdin : true
resources:
{{- toYaml .Values.resources | nindent 12 }}
diff --git a/aether-roc-gui/values.yaml b/aether-roc-gui/values.yaml
index e304c10..fe50b7d 100644
--- a/aether-roc-gui/values.yaml
+++ b/aether-roc-gui/values.yaml
@@ -10,7 +10,7 @@
image:
repository: onosproject/aether-roc-gui
- tag: v0.9.23
+ tag: v0.9.24
pullPolicy: IfNotPresent
pullSecrets: []
@@ -40,6 +40,10 @@
openidc:
issuer:
+feature:
+ aether: true
+ sdnfabric: true
+
resources: {}
# We usually recommend not to specify default resources and to leave this as a conscious
# choice for the user. This also increases chances charts run on environments with little
diff --git a/aether-roc-umbrella/Chart.yaml b/aether-roc-umbrella/Chart.yaml
index 54309ff..a4cba53 100644
--- a/aether-roc-umbrella/Chart.yaml
+++ b/aether-roc-umbrella/Chart.yaml
@@ -8,7 +8,7 @@
description: Aether ROC Umbrella chart to deploy all Aether ROC
kubeVersion: ">=1.18.0"
type: application
-version: 2.1.25
+version: 2.1.26
appVersion: v0.0.0
keywords:
- aether
@@ -41,7 +41,7 @@
- name: aether-roc-gui
condition: import.aether-roc-gui.v2-1.enabled
repository: "file://../aether-roc-gui"
- version: 2.1.14
+ version: 2.1.15
alias: aether-roc-gui-v2-1
- name: sdcore-adapter-v2
condition: import.sdcore-adapter.v2-0.enabled
diff --git a/aether-roc-umbrella/values.yaml b/aether-roc-umbrella/values.yaml
index 7d7e2f8..2f1330a 100644
--- a/aether-roc-umbrella/values.yaml
+++ b/aether-roc-umbrella/values.yaml
@@ -112,9 +112,12 @@
protocol: http
port: 80
-aether-roc-gui-v4:
- nameOverride: aether-roc-gui-v4
- fullnameOverride: aether-roc-gui-v4
+aether-roc-gui-v2-1:
+ nameOverride: aether-roc-gui-v2-1
+ fullnameOverride: aether-roc-gui-v2-1
+ feature:
+ aether: true
+ sdnfabric: false
grafana:
proxyEnabled: true
service: aether-roc-umbrella-grafana # the grafana hostname - use FQDN for other namespaces
diff --git a/fabric-umbrella/Chart.yaml b/fabric-umbrella/Chart.yaml
index be0fb54..b930a6b 100644
--- a/fabric-umbrella/Chart.yaml
+++ b/fabric-umbrella/Chart.yaml
@@ -7,7 +7,7 @@
description: Fabric ROC Umbrella chart to deploy all Fabric ROC
kubeVersion: ">=1.18.0"
type: application
-version: 0.1.9
+version: 0.1.10
appVersion: v0.0.0
keywords:
- aether
@@ -37,7 +37,7 @@
- name: aether-roc-gui
condition: import.fabric-roc-gui.v0-1.enabled
repository: "file://../aether-roc-gui"
- version: 2.1.14
+ version: 2.1.15
alias: fabric-roc-gui
- name: fabric-adapter
condition: import.fabric-adapter.v0-1.enabled
diff --git a/fabric-umbrella/values.yaml b/fabric-umbrella/values.yaml
index 3d5ccef..067f854 100644
--- a/fabric-umbrella/values.yaml
+++ b/fabric-umbrella/values.yaml
@@ -68,6 +68,13 @@
# Aether ROC API
fabric-roc-api: {}
+fabric-roc-gui:
+ nameOverride: fabric-roc-gui
+ fullnameOverride: fabric-roc-gui
+ feature:
+ aether: false
+ sdnfabric: true
+
# Fabric Adapter
fabric-adapter-v0-1:
fullnameOverride: fabric-adapter-v0-1