diff --git a/k8s/daemonsets/experiments/responsiveness.jsonnet b/k8s/daemonsets/experiments/responsiveness.jsonnet index 3445a521..0e772742 100644 --- a/k8s/daemonsets/experiments/responsiveness.jsonnet +++ b/k8s/daemonsets/experiments/responsiveness.jsonnet @@ -16,13 +16,13 @@ exp.ExperimentNoIndex(expName, 'pusher-' + std.extVar('PROJECT_ID'), "none", [], containers: [ { args: [ - '-config-port=443', + '-config-port=4043', '-config-name=$(MLAB_NODE_NAME)', '-public-port=443', '-public-name=$(MLAB_NODE_NAME)', '-cert-file=/certs/tls.crt', '-key-file=/certs/tls.key', - '-listen-addr=0.0.0.0', + '-listen-addr=localhost', ], env: [ { @@ -33,6 +33,14 @@ exp.ExperimentNoIndex(expName, 'pusher-' + std.extVar('PROJECT_ID'), "none", [], }, }, }, + { + name: 'PRIVATE_IP', + valueFrom: { + fieldRef: { + fieldPath: 'status.podIP', + }, + }, + }, ], image: 'soltesz/responsiveness-server:v0.1', name: 'responsiveness-server', @@ -47,6 +55,42 @@ exp.ExperimentNoIndex(expName, 'pusher-' + std.extVar('PROJECT_ID'), "none", [], }, ], }, + { + image: "soltesz/access-proxy:v0.0.3", + name: "access-proxy", + args: [ + '-forward=https://0.0.0.0:443@https://localhost:4043', + '-token.required=false', + '-txcontroller.device=net1', + '-txcontroller.max-rate=1000000000', + '-token.machine=$(NODE_NAME)', + '-token.verify-key=/verify/jwk_sig_EdDSA_locate_20200409.pub', + '-cert=/certs/tls.crt', + '-key=/certs/tls.key', + ], + env: [ + { + name: 'MLAB_NODE_NAME', + valueFrom: { + fieldRef: { + fieldPath: 'spec.nodeName', + }, + }, + }, + ], + volumeMounts: [ + { + mountPath: '/certs', + name: 'measurement-lab-org-tls', + readOnly: true, + }, + { + mountPath: '/verify', + name: 'locate-verify-keys', + readOnly: true, + }, + ], + }, ], // Use host network to listen on the machine IP address without // registering an experiment index yet. @@ -58,6 +102,12 @@ exp.ExperimentNoIndex(expName, 'pusher-' + std.extVar('PROJECT_ID'), "none", [], secretName: 'measurement-lab-org-tls', }, }, + { + name: 'locate-verify-keys', + secret: { + secretName: 'locate-verify-keys', + }, + }, ], }, },