Skip to content

Commit

Permalink
Merge pull request #145 from vania-pooh/master
Browse files Browse the repository at this point in the history
Moon 1.9.3
  • Loading branch information
vania-pooh authored Nov 15, 2021
2 parents 36c42ae + bc12456 commit 4b5cc60
Show file tree
Hide file tree
Showing 4 changed files with 88 additions and 19 deletions.
35 changes: 29 additions & 6 deletions moon-local.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ spec:
serviceAccountName: moon
containers:
- name: moon
image: aerokube/moon:1.9.2
image: aerokube/moon:1.9.3
args: ["-namespace", "moon", "-license-file", "/license/license.key", "-disable-cpu-limits", "-disable-memory-limits", "-service-account-name", "moon"]
ports:
- containerPort: 4444
Expand All @@ -127,7 +127,7 @@ spec:
mountPath: /license
readOnly: true
- name: moon-api
image: aerokube/moon-api:1.9.2
image: aerokube/moon-api:1.9.3
args: ["-namespace", "moon", "-license-file", "/license/license.key", "-listen", ":8888"]
ports:
- containerPort: 8888
Expand Down Expand Up @@ -648,8 +648,13 @@ data:
browsers.json: |
{
"safari": {
"default": "14.0",
"default": "15.0",
"versions": {
"15.0": {
"image": "quay.io/browsers/safari:15.0",
"port": "4444",
"path": "/"
},
"14.0": {
"image": "quay.io/browsers/safari:14.0",
"port": "4444",
Expand Down Expand Up @@ -708,8 +713,18 @@ data:
}
},
"firefox": {
"default": "92.0",
"default": "94.0",
"versions": {
"94.0": {
"image": "quay.io/browsers/firefox:94.0",
"port": "4444",
"path": "/wd/hub"
},
"93.0": {
"image": "quay.io/browsers/firefox:93.0",
"port": "4444",
"path": "/wd/hub"
},
"92.0": {
"image": "quay.io/browsers/firefox:92.0",
"port": "4444",
Expand Down Expand Up @@ -1163,8 +1178,12 @@ data:
}
},
"chrome": {
"default": "94.0",
"default": "95.0",
"versions": {
"95.0": {
"image": "quay.io/browsers/chrome:95.0",
"port": "4444"
},
"94.0": {
"image": "quay.io/browsers/chrome:94.0",
"port": "4444"
Expand Down Expand Up @@ -1352,8 +1371,12 @@ data:
}
},
"opera": {
"default": "80.0",
"default": "81.0",
"versions": {
"81.0": {
"image": "quay.io/browsers/opera:81.0",
"port": "4444"
},
"80.0": {
"image": "quay.io/browsers/opera:80.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.9.2
image: aerokube/moon-monitor:1.9.3
args:
- -namespace # -namespace flag specifies namespace where Moon is running
- moon
Expand Down
35 changes: 29 additions & 6 deletions moon-openshift.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -722,8 +722,13 @@ objects:
browsers.json: |
{
"safari": {
"default": "14.0",
"default": "15.0",
"versions": {
"15.0": {
"image": "quay.io/browsers/safari:15.0",
"port": "4444",
"path": "/"
},
"14.0": {
"image": "quay.io/browsers/safari:14.0",
"port": "4444",
Expand Down Expand Up @@ -782,8 +787,18 @@ objects:
}
},
"firefox": {
"default": "92.0",
"default": "94.0",
"versions": {
"94.0": {
"image": "quay.io/browsers/firefox:94.0",
"port": "4444",
"path": "/wd/hub"
},
"93.0": {
"image": "quay.io/browsers/firefox:93.0",
"port": "4444",
"path": "/wd/hub"
},
"92.0": {
"image": "quay.io/browsers/firefox:92.0",
"port": "4444",
Expand Down Expand Up @@ -1232,8 +1247,12 @@ objects:
}
},
"chrome": {
"default": "94.0",
"default": "95.0",
"versions": {
"95.0": {
"image": "quay.io/browsers/chrome:95.0",
"port": "4444"
},
"94.0": {
"image": "quay.io/browsers/chrome:94.0",
"port": "4444"
Expand Down Expand Up @@ -1421,8 +1440,12 @@ objects:
}
},
"opera": {
"default": "80.0",
"default": "81.0",
"versions": {
"81.0": {
"image": "quay.io/browsers/opera:81.0",
"port": "4444"
},
"80.0": {
"image": "quay.io/browsers/opera:80.0",
"port": "4444"
Expand Down Expand Up @@ -1641,13 +1664,13 @@ parameters:
- name: MOON_IMAGE
displayName: Moon docker image
description: Name of the image to be used.
value: quay.io/aerokube/moon:1.9.2
value: quay.io/aerokube/moon:1.9.3
required: true

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

- name: MOON_UI_IMAGE
Expand Down
35 changes: 29 additions & 6 deletions moon.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ spec:
spec:
containers:
- name: moon
image: aerokube/moon:1.9.2
image: aerokube/moon:1.9.3
args: ["-namespace", "moon", "-license-file", "/license/license.key"]
resources:
limits:
Expand Down Expand Up @@ -167,7 +167,7 @@ spec:
mountPath: /license
readOnly: true
- name: moon-api
image: aerokube/moon-api:1.9.2
image: aerokube/moon-api:1.9.3
args: ["-namespace", "moon", "-license-file", "/license/license.key", "-listen", ":8888"]
resources:
limits:
Expand Down Expand Up @@ -703,8 +703,13 @@ data:
browsers.json: |
{
"safari": {
"default": "14.0",
"default": "15.0",
"versions": {
"15.0": {
"image": "quay.io/browsers/safari:15.0",
"port": "4444",
"path": "/"
},
"14.0": {
"image": "quay.io/browsers/safari:14.0",
"port": "4444",
Expand Down Expand Up @@ -763,8 +768,18 @@ data:
}
},
"firefox": {
"default": "92.0",
"default": "94.0",
"versions": {
"94.0": {
"image": "quay.io/browsers/firefox:94.0",
"port": "4444",
"path": "/wd/hub"
},
"93.0": {
"image": "quay.io/browsers/firefox:93.0",
"port": "4444",
"path": "/wd/hub"
},
"92.0": {
"image": "quay.io/browsers/firefox:92.0",
"port": "4444",
Expand Down Expand Up @@ -1218,8 +1233,12 @@ data:
}
},
"chrome": {
"default": "94.0",
"default": "95.0",
"versions": {
"95.0": {
"image": "quay.io/browsers/chrome:95.0",
"port": "4444"
},
"94.0": {
"image": "quay.io/browsers/chrome:94.0",
"port": "4444"
Expand Down Expand Up @@ -1407,8 +1426,12 @@ data:
}
},
"opera": {
"default": "80.0",
"default": "81.0",
"versions": {
"81.0": {
"image": "quay.io/browsers/opera:81.0",
"port": "4444"
},
"80.0": {
"image": "quay.io/browsers/opera:80.0",
"port": "4444"
Expand Down

0 comments on commit 4b5cc60

Please sign in to comment.