Skip to content

Commit f4c992d

Browse files
author
Gabriel Monroy
committed
refactor(scheduler): switch to fleet http api
1 parent a97cdc3 commit f4c992d

7 files changed

Lines changed: 269 additions & 242 deletions

File tree

contrib/coreos/user-data

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,16 @@ coreos:
2222
command: start
2323
- name: fleet.service
2424
command: start
25+
- name: fleet.socket
26+
command: start
27+
content: |
28+
[Socket]
29+
# Talk to the API over a Unix domain socket (default)
30+
ListenStream=/var/run/fleet.sock
31+
Service=fleet.service
32+
33+
[Install]
34+
WantedBy=sockets.target
2535
- name: stop-update-engine.service
2636
command: start
2737
content: |

controller/api/models.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@ def _command_announceable(self):
402402

403403
@transition(field=state, source=INITIALIZED, target=CREATED)
404404
def create(self):
405-
image = self.release.image
405+
image = self.release.image + ':v' + str(self.release.version)
406406
kwargs = {'memory': self.release.config.memory,
407407
'cpu': self.release.config.cpu,
408408
'tags': self.release.config.tags}
@@ -427,7 +427,7 @@ def deploy(self, new_release):
427427
self.release = new_release
428428
# deploy new container
429429
new_job_id = self._job_id
430-
image = self.release.image
430+
image = self.release.image + ':v' + str(self.release.version)
431431
c_type = self.type
432432
kwargs = {'memory': self.release.config.memory,
433433
'cpu': self.release.config.cpu,
@@ -453,7 +453,8 @@ def destroy(self):
453453

454454
def run(self, command):
455455
"""Run a one-off command"""
456-
rc, output = self._scheduler.run(self._job_id, self.release.image, command)
456+
image = self.release.image + ':v' + str(self.release.version)
457+
rc, output = self._scheduler.run(self._job_id, image, command)
457458
return rc, output
458459

459460

controller/requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ django-yamlfield==0.5
1414
djangorestframework==2.3.14
1515
docker-py==0.4.0
1616
gunicorn==18.0
17+
paramiko==1.14.1
1718
psycopg2==2.5.2
1819
python-etcd==0.3.0
1920
PyYAML==3.11

0 commit comments

Comments
 (0)