Mercurial > code > home > repos > homeauto
changeset 1712:6ee9a1c5a991
update deps; code fixes; add skaffold
| author | drewp@bigasterisk.com |
|---|---|
| date | Sun, 12 Dec 2021 22:03:28 -0800 |
| parents | dc0a539c5dd4 |
| children | e9ac7f52849e |
| files | service/frontDoorLock/.style.yapf service/frontDoorLock/Dockerfile service/frontDoorLock/deploy.yaml service/frontDoorLock/front_door_lock.py service/frontDoorLock/requirements.txt service/frontDoorLock/skaffold.yaml service/frontDoorLock/tasks.py |
| diffstat | 7 files changed, 71 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/service/frontDoorLock/.style.yapf Sun Dec 12 22:03:28 2021 -0800 @@ -0,0 +1,4 @@ +# overwritten by /home/drewp/bin/setup_home_venv +[style] +based_on_style = google +column_limit = 130
--- a/service/frontDoorLock/Dockerfile Fri Dec 10 21:42:59 2021 -0800 +++ b/service/frontDoorLock/Dockerfile Sun Dec 12 22:03:28 2021 -0800 @@ -1,4 +1,4 @@ -FROM bang5:5000/base_x86 +FROM bang5:5000/base_basic WORKDIR /opt
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/service/frontDoorLock/deploy.yaml Sun Dec 12 22:03:28 2021 -0800 @@ -0,0 +1,40 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: front-door-lock +spec: + replicas: 1 + selector: + matchLabels: + app: front-door-lock + template: + metadata: + labels: + app: front-door-lock + annotations: + prometheus.io/scrape: "false" + spec: + containers: + - name: front-door-lock + image: bang5:5000/front_door_lock_image + imagePullPolicy: "Always" + ports: + - containerPort: 10011 + affinity: + nodeAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + nodeSelectorTerms: + - matchExpressions: + - key: "kubernetes.io/hostname" + operator: In + values: ["bang"] +--- +apiVersion: v1 +kind: Service +metadata: + name: front-door-lock +spec: + ports: + - {port: 10011, targetPort: 10011} + selector: + app: front-door-lock
--- a/service/frontDoorLock/front_door_lock.py Fri Dec 10 21:42:59 2021 -0800 +++ b/service/frontDoorLock/front_door_lock.py Sun Dec 12 22:03:28 2021 -0800 @@ -192,7 +192,7 @@ verboseLogging(arg['-v']) masterGraph = PatchableGraph() - mqtt = MqttClient(brokerPort=10210) + mqtt = MqttClient(brokerPort=10210, clientId='front-door-lock-service') autoclose = AutoLock(masterGraph, mqtt) def toGraph(payload): log.info('mqtt->graph %r', payload) @@ -229,6 +229,6 @@ autoLock=autoclose, debug=arg['-v']), interface='::') - log.warn('serving on %s', port) + log.warning('serving on %s', port) reactor.run()
--- a/service/frontDoorLock/requirements.txt Fri Dec 10 21:42:59 2021 -0800 +++ b/service/frontDoorLock/requirements.txt Sun Dec 12 22:03:28 2021 -0800 @@ -1,13 +1,12 @@ -cyclone -mypy -rdflib-jsonld==0.4.0 -rdflib==4.2.2 -rx==1.6.1 -twisted-mqtt==0.3.6 +cyclone==1.3 +docopt +rdflib-jsonld==0.6.2 +rdflib==6.0.2 +rx==3.2.0 +twisted-mqtt==0.3.9 cycloneerr -git+http://github.com/drewp/scales.git@448d59fb491b7631877528e7695a93553bfaaa93#egg=scales -mqtt_client==0.5.0 -patchablegraph==0.11.0 +mqtt_client==0.10.0 +patchablegraph==0.19.0 rdfdb==0.21.0 standardservice==0.6.0
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/service/frontDoorLock/skaffold.yaml Sun Dec 12 22:03:28 2021 -0800 @@ -0,0 +1,15 @@ +apiVersion: skaffold/v2beta5 +kind: Config +metadata: + name: front-door-lock +build: + tagPolicy: + dateTime: + format: "2006-01-02_15-04-05" + timezone: "Local" + artifacts: + - image: bang5:5000/front_door_lock_image +deploy: + kubectl: + manifests: + - deploy.yaml
--- a/service/frontDoorLock/tasks.py Fri Dec 10 21:42:59 2021 -0800 +++ b/service/frontDoorLock/tasks.py Sun Dec 12 22:03:28 2021 -0800 @@ -13,7 +13,7 @@ @task def tail_mqtt(ctx): - ctx.run(f'mosquitto_sub -h bang -p 10210 -d -v -t \#') + ctx.run(f'mosquitto_sub -h bang -p 10210 -d -v -t #') @task def mqtt_force_open(ctx):