Merge pull request #37 from vania-pooh/master

Flag to enable authentication
aerokube · Nov 25, 2020 · a06a89e · a06a89e
2 parents 41b0af3 + ac01558
commit a06a89e
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 1 deletion.
diff --git a/moon/templates/moon.yaml b/moon/templates/moon.yaml
@@ -272,6 +272,14 @@ spec:
         - http://localhost:8888
         - -webdriver-uri
         - http://localhost:4444
+        {{- if .Values.moon.ui }}
+        {{- if .Values.moon.ui.auth }}
+        {{- if .Values.moon.ui.auth.enabled }}
+        - -users
+        - /users/users.htpasswd
+        {{- end }}
+        {{- end }}
+        {{- end }}
         {{- if .Values.moon.enabled.resources }}
         {{- if .Values.moon.ui }}
         {{- if .Values.moon.ui.resources }}
@@ -283,6 +291,16 @@ spec:
         ports:
         - name: moon-ui
           containerPort: 8080
+        {{- if .Values.moon.ui }}
+        {{- if .Values.moon.ui.auth }}
+        {{- if .Values.moon.ui.auth.enabled }}
+        volumeMounts:
+          - name: users
+            mountPath: /users
+            readOnly: true
+        {{- end }}
+        {{- end }}
+        {{- end }}
       volumes:
       - name: quota
         configMap:

diff --git a/moon/values.yaml b/moon/values.yaml
@@ -97,6 +97,12 @@ moon:
         cpu: "0.05"
         memory: 64Mi
 
+#  ##
+#  ## Enable authentication for moon-ui.
+#  ##
+#    auth:
+#      enabled: true
+
   ##
   ## Moon entrypoint.
   ##
@@ -852,8 +858,11 @@ moon:
                 cpu: "2"
                 memory: "4Gi"
       opera:
-        default: "71.0"
+        default: "72.0"
         versions:
+          "72.0":
+            image: selenoid/vnc_opera:72.0
+            port: "4444"
           "71.0":
             image: selenoid/vnc_opera:71.0
             port: "4444"