Simplification Web-Gateway

web-gateway/chart/rdp-web-gateway/templates/NOTES.txt

@@ -33,5 +33,6 @@
 Configuration:
 - RDP Broker: {{ .Values.config.rdpBroker.host }}:{{ .Values.config.rdpBroker.port }}
 - Server Port: {{ .Values.config.server.port }}
-- Log Level: {{ .Values.config.server.logLevel }}
 - Replicas: {{ if .Values.autoscaling.enabled }}{{ .Values.autoscaling.minReplicas }}-{{ .Values.autoscaling.maxReplicas }} (autoscaling){{ else }}{{ .Values.replicaCount }}{{ end }}
+
+Note: Authentication is handled by RdpBroker. Logs are sent to stdout for Kubernetes.

web-gateway/chart/rdp-web-gateway/templates/configmap.yaml

@@ -12,10 +12,6 @@ data:
         "port": {{ .Values.config.rdpBroker.port }}
       },
       "server": {
-        "port": {{ .Values.config.server.port }},
-        "logLevel": "{{ .Values.config.server.logLevel }}"
-      },
-      "session": {
-        "timeout": {{ .Values.config.session.timeout }}
+        "port": {{ .Values.config.server.port }}
       }
     }

web-gateway/chart/rdp-web-gateway/templates/deployment.yaml

@@ -41,23 +41,16 @@ spec:
           value: {{ .Values.config.rdpBroker.host | quote }}
         - name: RDP_BROKER_PORT
           value: {{ .Values.config.rdpBroker.port | quote }}
-        - name: LOG_LEVEL
-          value: {{ .Values.config.server.logLevel | quote }}
-        - name: SESSION_TIMEOUT
-          value: {{ .Values.config.session.timeout | quote }}
+        {{- if .Values.config.rdpTargets }}
+        - name: RDP_TARGETS
+          value: {{ .Values.config.rdpTargets | toJson | quote }}
+        {{- end }}
         - name: NODE_ENV
           value: "production"
         {{- range .Values.env }}
         - name: {{ .name }}
           value: {{ .value | quote }}
         {{- end }}
-        {{- if .Values.secrets.sessionSecret }}
-        - name: SESSION_SECRET
-          valueFrom:
-            secretKeyRef:
-              name: {{ include "rdp-web-gateway.fullname" . }}-secrets
-              key: sessionSecret
-        {{- end }}
         ports:
         - name: http
           containerPort: {{ .Values.config.server.port }}
@@ -68,17 +61,6 @@ spec:
           {{- toYaml .Values.readinessProbe | nindent 12 }}
         resources:
           {{- toYaml .Values.resources | nindent 12 }}
-        {{- if .Values.persistence.enabled }}
-        volumeMounts:
-        - name: logs
-          mountPath: {{ .Values.persistence.mountPath }}
-        {{- end }}
-      {{- if .Values.persistence.enabled }}
-      volumes:
-      - name: logs
-        persistentVolumeClaim:
-          claimName: {{ include "rdp-web-gateway.fullname" . }}-logs
-      {{- end }}
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}

web-gateway/chart/rdp-web-gateway/templates/pvc.yaml

@@ -1,17 +0,0 @@
-{{- if .Values.persistence.enabled }}
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: {{ include "rdp-web-gateway.fullname" . }}-logs
-  labels:
-    {{- include "rdp-web-gateway.labels" . | nindent 4 }}
-spec:
-  accessModes:
-    - {{ .Values.persistence.accessMode }}
-  resources:
-    requests:
-      storage: {{ .Values.persistence.size }}
-  {{- if .Values.persistence.storageClass }}
-  storageClassName: {{ .Values.persistence.storageClass }}
-  {{- end }}
-{{- end }}

web-gateway/chart/rdp-web-gateway/templates/secret.yaml

@@ -1,13 +0,0 @@
-{{- if .Values.secrets }}
-apiVersion: v1
-kind: Secret
-metadata:
-  name: {{ include "rdp-web-gateway.fullname" . }}-secrets
-  labels:
-    {{- include "rdp-web-gateway.labels" . | nindent 4 }}
-type: Opaque
-data:
-  {{- if .Values.secrets.sessionSecret }}
-  sessionSecret: {{ .Values.secrets.sessionSecret | b64enc | quote }}
-  {{- end }}
-{{- end }}