Skip to content

Commit

Permalink
Merge pull request #90 from vania-pooh/master
Browse files Browse the repository at this point in the history
Bump Moon version to 1.6.0
  • Loading branch information
aandryashin authored Jun 23, 2020
2 parents 1a8a500 + d1913fd commit cd98544
Show file tree
Hide file tree
Showing 5 changed files with 88 additions and 20 deletions.
24 changes: 19 additions & 5 deletions helm/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ createRole: true
createRoleBinding: true

moon:
image: aerokube/moon:1.5.1
image: aerokube/moon:1.6.0
resources:
enabled: false
limits:
Expand All @@ -20,7 +20,7 @@ moon:
port: 4444

moonAPI:
image: aerokube/moon-api:1.5.1
image: aerokube/moon-api:1.6.0
resources:
enabled: false
limits:
Expand Down Expand Up @@ -66,8 +66,16 @@ affinity: {}
quota:
browsers:
firefox:
default: '75.0'
default: '77.0'
versions:
'77.0':
image: selenoid/vnc_firefox:77.0
port: '4444'
path: "/wd/hub"
'76.0':
image: selenoid/vnc_firefox:76.0
port: '4444'
path: "/wd/hub"
'75.0':
image: selenoid/vnc_firefox:75.0
port: '4444'
Expand Down Expand Up @@ -361,8 +369,11 @@ quota:
port: '4444'
path: "/wd/hub"
chrome:
default: '81.0'
default: '83.0'
versions:
'83.0':
image: selenoid/vnc_chrome:83.0
port: '4444'
'81.0':
image: selenoid/vnc_chrome:81.0
port: '4444'
Expand Down Expand Up @@ -529,8 +540,11 @@ quota:
cpu: '2'
memory: '4Gi'
opera:
default: '67.0'
default: '68.0'
versions:
'68.0':
image: selenoid/vnc_opera:68.0
port: '4444'
'67.0':
image: selenoid/vnc_opera:67.0
port: '4444'
Expand Down
28 changes: 23 additions & 5 deletions moon-local.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ spec:
serviceAccountName: moon
containers:
- name: moon
image: aerokube/moon:1.5.1
image: aerokube/moon:1.6.0
args: ["-namespace", "moon", "-license-file", "/license/license.key", "-disable-cpu-limits", "-disable-memory-limits", "-service-account-name", "moon"]
ports:
- containerPort: 4444
Expand All @@ -153,7 +153,7 @@ spec:
mountPath: /license
readOnly: true
- name: moon-api
image: aerokube/moon-api:1.5.1
image: aerokube/moon-api:1.6.0
args: ["-namespace", "moon", "-license-file", "/license/license.key", "-listen", ":8888"]
ports:
- containerPort: 8888
Expand Down Expand Up @@ -225,8 +225,18 @@ data:
browsers.json: |
{
"firefox": {
"default": "75.0",
"default": "77.0",
"versions": {
"77.0": {
"image": "selenoid/vnc_firefox:77.0",
"port": "4444",
"path": "/wd/hub"
},
"76.0": {
"image": "selenoid/vnc_firefox:76.0",
"port": "4444",
"path": "/wd/hub"
},
"75.0": {
"image": "selenoid/vnc_firefox:75.0",
"port": "4444",
Expand Down Expand Up @@ -595,8 +605,12 @@ data:
}
},
"chrome": {
"default": "81.0",
"default": "83.0",
"versions": {
"83.0": {
"image": "selenoid/vnc_chrome:83.0",
"port": "4444"
},
"81.0": {
"image": "selenoid/vnc_chrome:81.0",
"port": "4444"
Expand Down Expand Up @@ -736,8 +750,12 @@ data:
}
},
"opera": {
"default": "67.0",
"default": "68.0",
"versions": {
"68.0": {
"image": "selenoid/vnc_opera:68.0",
"port": "4444"
},
"67.0": {
"image": "selenoid/vnc_opera:67.0",
"port": "4444"
Expand Down
2 changes: 1 addition & 1 deletion moon-monitor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ spec:
serviceAccountName: moon-monitor
containers:
- name: moon-monitor
image: aerokube/moon-monitor:1.5.1
image: aerokube/moon-monitor:1.6.0
args:
- -namespace # -namespace flag specifies namespace where Moon is running
- moon
Expand Down
28 changes: 23 additions & 5 deletions moon-openshift.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -249,8 +249,18 @@ objects:
browsers.json: |
{
"firefox": {
"default": "75.0",
"default": "77.0",
"versions": {
"77.0": {
"image": "selenoid/vnc_firefox:77.0",
"port": "4444",
"path": "/wd/hub"
},
"76.0": {
"image": "selenoid/vnc_firefox:76.0",
"port": "4444",
"path": "/wd/hub"
},
"75.0": {
"image": "selenoid/vnc_firefox:75.0",
"port": "4444",
Expand Down Expand Up @@ -619,8 +629,12 @@ objects:
}
},
"chrome": {
"default": "81.0",
"default": "83.0",
"versions": {
"83.0": {
"image": "selenoid/vnc_chrome:83.0",
"port": "4444"
},
"81.0": {
"image": "selenoid/vnc_chrome:81.0",
"port": "4444"
Expand Down Expand Up @@ -760,8 +774,12 @@ objects:
}
},
"opera": {
"default": "67.0",
"default": "68.0",
"versions": {
"68.0": {
"image": "selenoid/vnc_opera:68.0",
"port": "4444"
},
"67.0": {
"image": "selenoid/vnc_opera:67.0",
"port": "4444"
Expand Down Expand Up @@ -928,13 +946,13 @@ parameters:
- name: MOON_IMAGE
displayName: Moon docker image
description: Name of the image to be used.
value: aerokube/moon:1.5.1
value: aerokube/moon:1.6.0
required: true

- name: MOON_API_IMAGE
displayName: Moon-API docker image
description: Name of the image to be used.
value: aerokube/moon-api:1.5.1
value: aerokube/moon-api:1.6.0
required: true

- name: MOON_UI_IMAGE
Expand Down
26 changes: 22 additions & 4 deletions moon.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ spec:
spec:
containers:
- name: moon
image: aerokube/moon:1.5.1
image: aerokube/moon:1.6.0
args: ["-namespace", "moon", "-license-file", "/license/license.key"]
resources:
limits:
Expand Down Expand Up @@ -220,8 +220,18 @@ data:
browsers.json: |
{
"firefox": {
"default": "75.0",
"default": "77.0",
"versions": {
"77.0": {
"image": "selenoid/vnc_firefox:77.0",
"port": "4444",
"path": "/wd/hub"
},
"76.0": {
"image": "selenoid/vnc_firefox:76.0",
"port": "4444",
"path": "/wd/hub"
},
"75.0": {
"image": "selenoid/vnc_firefox:75.0",
"port": "4444",
Expand Down Expand Up @@ -590,8 +600,12 @@ data:
}
},
"chrome": {
"default": "81.0",
"default": "83.0",
"versions": {
"83.0": {
"image": "selenoid/vnc_chrome:83.0",
"port": "4444"
},
"81.0": {
"image": "selenoid/vnc_chrome:81.0",
"port": "4444"
Expand Down Expand Up @@ -731,8 +745,12 @@ data:
}
},
"opera": {
"default": "67.0",
"default": "68.0",
"versions": {
"68.0": {
"image": "selenoid/vnc_opera:68.0",
"port": "4444"
},
"67.0": {
"image": "selenoid/vnc_opera:67.0",
"port": "4444"
Expand Down

0 comments on commit cd98544

Please sign in to comment.