Merge pull request #48 from vania-pooh/master

Guest user support and new browser images
aerokube · Mar 29, 2021 · 72feb70 · 72feb70
2 parents 4777369 + d75810f
commit 72feb70
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 5 deletions.
diff --git a/moon/templates/moon.yaml b/moon/templates/moon.yaml
@@ -169,6 +169,10 @@ spec:
         - http://{{ .Release.Name }}:4444/wd/hub
         - -domain-name
         - {{ .Release.Name }}-browsers
+        {{- if .Values.moon.guestUser }}
+        - -guest-user
+        - {{ .Values.moon.guestUser }}
+        {{- end }}
         {{- if .Values.moon.timeouts }}
         {{- if .Values.moon.timeouts.sessionTimeout }}
         - -timeout
@@ -254,6 +258,10 @@ spec:
         - ":8888"
         - -domain-name
         - {{ .Release.Name }}-browsers
+        {{- if and .Values.moon.api .Values.moon.api.guestUser }}
+        - -guest-user
+        - {{ .Values.moon.api.guestUser }}
+        {{- end }}
         {{- if .Values.moon.enabled.resources }}
         {{- if .Values.moon.api }}
         {{- if .Values.moon.api.resources }}

diff --git a/moon/values.yaml b/moon/values.yaml
@@ -28,7 +28,7 @@ moon:
 ## If specified, the pod's security policies.
 ## ref: https://kubernetes.io/docs/concepts/policy/pod-security-policy/
 ##
-#  securityContext: 
+#  securityContext:
 #    runAsUser: 1000
 
 ## Assign custom affinity rules to the instance
@@ -75,6 +75,11 @@ moon:
 #  ##
 #  image: aerokube/moon:dev
 
+#  ##
+#  ## Override moon guest user
+#  ##
+#  guestUser: browsers
+
   ##
   ## Resources assigned to moon-api container.
   ##
@@ -91,6 +96,11 @@ moon:
 #    ##
 #    image: aerokube/moon-api:dev
 
+#    ##
+#    ## Override moon-api guest user
+#    ##
+#    guestUser: browsers
+
   ##
   ## Resources assigned to moon-ui container.
   ##
@@ -325,8 +335,12 @@ moon:
             port: "4444"
             path: "/"
       MicrosoftEdge:
-        default: "90.0"
+        default: "91.0"
         versions:
+          "91.0":
+            image: browsers/edge:91.0
+            port: "4444"
+            path: "/"
           "90.0":
             image: browsers/edge:90.0
             port: "4444"
@@ -340,8 +354,16 @@ moon:
             port: "4444"
             path: "/"
       firefox:
-        default: "85.0"
+        default: "87.0"
         versions:
+          "87.0":
+            image: selenoid/vnc_firefox:87.0
+            port: "4444"
+            path: "/wd/hub"
+          "86.0":
+            image: selenoid/vnc_firefox:86.0
+            port: "4444"
+            path: "/wd/hub"
           "85.0":
             image: selenoid/vnc_firefox:85.0
             port: "4444"
@@ -675,8 +697,11 @@ moon:
             port: "4444"
             path: "/wd/hub"
       chrome:
-        default: "88.0"
+        default: "89.0"
         versions:
+          "89.0":
+            image: selenoid/vnc_chrome:89.0
+            port: "4444"
           "88.0":
             image: selenoid/vnc_chrome:88.0
             port: "4444"
@@ -915,8 +940,11 @@ moon:
                 cpu: "2"
                 memory: "4Gi"
       opera:
-        default: "74.0"
+        default: "75.0"
         versions:
+          "75.0":
+            image: selenoid/vnc_opera:75.0
+            port: "4444"
           "74.0":
             image: selenoid/vnc_opera:74.0
             port: "4444"