Added Rsa public key to onos-topo (#129)

* Added Rsa public key to onos-topo * Auth: onos-topo env var * Added newline at end of file
onosproject · Jul 13, 2020 · df0acc9 · df0acc9
1 parent f98803e
commit df0acc9
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 5 deletions.
diff --git a/dex/values.yaml b/dex/values.yaml
@@ -1,6 +1,8 @@
 # Default values for dex.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
+# See https://hub.helm.sh/charts/stable/dex for values that can be overridden
+
+# See https://github.com/helm/charts/blob/master/stable/dex/values.yaml
+# for the file that this overrides
 
 ports:
   grpc:
@@ -40,6 +42,7 @@ config:
 
   frontend:
     issuer: Aether
+    logoURL: https://www.opennetworking.org/wp-content/uploads/2020/02/aether-logo.png
 
   grpc:
     address: 0.0.0.0
diff --git a/onos-gui/Chart.yaml b/onos-gui/Chart.yaml
@@ -3,7 +3,7 @@ name: onos-gui
 description: ONOS Graphical User Interface
 kubeVersion: ">=1.15.0"
 type: application
-version: 0.0.6
+version: 0.0.7
 appVersion: v0.6.8
 keywords:
   - onos

diff --git a/onos-gui/templates/deployment.yaml b/onos-gui/templates/deployment.yaml
@@ -40,6 +40,8 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
+            - name: OPENIDCISSUER
+              value: {{ .Values.openidc.issuer }}
           stdin : true
           resources:
             {{- toYaml .Values.resources | nindent 12 }}

diff --git a/onos-gui/values.yaml b/onos-gui/values.yaml
@@ -31,6 +31,11 @@ ports:
     containerPort: 80
     protocol: TCP
 
+# Enable by giving a value like http://dex:32000
+# make sure this is reachable at http://dex:32000/.well-known/openid-configuration
+openidc:
+  issuer:
+
 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/onos-topo/Chart.yaml b/onos-topo/Chart.yaml
@@ -3,7 +3,7 @@ name: onos-topo
 description: ONOS Topology service
 kubeVersion: ">=1.17.0"
 type: application
-version: 0.0.6
+version: 0.0.7
 appVersion: v0.6.10
 keywords:
   - onos

diff --git a/onos-topo/templates/deployment.yaml b/onos-topo/templates/deployment.yaml
@@ -50,6 +50,8 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
+            - name: OIDC_SERVER_URL
+              value: {{ .Values.openidc.issuer }}
             - name: SERVICE_NAME
               value: {{ template "onos-topo.fullname" . }}
             - name: NODE_NAME

diff --git a/onos-topo/templates/secret.yaml b/onos-topo/templates/secret.yaml
@@ -11,4 +11,4 @@ data:
   {{ range $path, $bytes := .Files.Glob "files/certs/tls.*" }}
   {{ base $path }}: '{{ $root.Files.Get $path | b64enc }}'
   {{ end }}
-type: Opaque
+type: Opaque
diff --git a/onos-topo/values.yaml b/onos-topo/values.yaml
@@ -48,3 +48,8 @@ tolerations: []
 affinity: {}
 
 logging: {}
+
+# Enable by giving a value like http://dex:32000
+# make sure this is reachable at http://dex:32000/.well-known/openid-configuration
+openidc:
+  issuer: http://dex:32000