From b4828e00ad1255a63702ef386f12e9676d38a081 Mon Sep 17 00:00:00 2001 From: Luckysideburn Date: Sat, 22 Oct 2022 10:11:04 +0000 Subject: [PATCH 1/2] added new metrics for curron chaos job pod --- Dockerfile | 5 +- entrypoint.sh | 3 + .../kubeinvaders/templates/rbac-cluster.yaml | 6 +- html5/index.html | 4 +- html5/kubeinvaders.js | 6 +- scripts/metrics_loop/experiments.yaml | 53 +++++++++++ scripts/metrics_loop/requirements.txt | 4 + scripts/metrics_loop/start.py | 87 +++++++++++++++++++ scripts/metrics_loop/start.sh | 11 +++ scripts/metrics_loop/start_dev.sh | 6 ++ scripts/programming_mode/start.py | 2 +- scripts/programming_mode/start_dev.sh | 7 ++ 12 files changed, 184 insertions(+), 10 deletions(-) create mode 100644 scripts/metrics_loop/experiments.yaml create mode 100644 scripts/metrics_loop/requirements.txt create mode 100644 scripts/metrics_loop/start.py create mode 100755 scripts/metrics_loop/start.sh create mode 100644 scripts/metrics_loop/start_dev.sh create mode 100644 scripts/programming_mode/start_dev.sh diff --git a/Dockerfile b/Dockerfile index 1146e01..dcb5b23 100644 --- a/Dockerfile +++ b/Dockerfile @@ -41,7 +41,6 @@ RUN sed -i.bak 's/listen\(.*\)80;/listen 8081;/' /etc/nginx/conf.d/default.conf RUN mkdir /usr/local/openresty/nginx/conf/kubeinvaders COPY nginx/nginx.conf /etc/nginx/nginx.conf - COPY scripts/metrics.lua /usr/local/openresty/nginx/conf/kubeinvaders/metrics.lua COPY scripts/pod.lua /usr/local/openresty/nginx/conf/kubeinvaders/pod.lua COPY scripts/node.lua /usr/local/openresty/nginx/conf/kubeinvaders/node.lua @@ -51,7 +50,11 @@ COPY scripts/chaos-containers.lua /usr/local/openresty/nginx/conf/kubeinvaders/c COPY scripts/programming_mode.lua /usr/local/openresty/nginx/conf/kubeinvaders/programming_mode.lua COPY scripts/config_kubeinv.lua /usr/local/openresty/lualib/config_kubeinv.lua COPY scripts/programming_mode /opt/programming_mode/ +COPY scripts/metrics_loop /opt/metrics_loop/ + RUN pip3 install -r /opt/programming_mode/requirements.txt +RUN pip3 install -r /opt/programming_mode/requirements.txt + COPY nginx/KubeInvaders.conf /etc/nginx/conf.d/KubeInvaders.conf RUN chmod g+rwx /var/cache/nginx /var/run /var/log/nginx /var/www/html /etc/nginx/conf.d diff --git a/entrypoint.sh b/entrypoint.sh index b723569..02938f6 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -10,4 +10,7 @@ fi # TODO: use a sidecar redis-server /etc/redis/redis.conf & +# TODO: use a sidecar +bash /opt/metrics_loop/start.sh & + nginx -c /etc/nginx/nginx.conf -g 'daemon off;' diff --git a/helm-charts/kubeinvaders/templates/rbac-cluster.yaml b/helm-charts/kubeinvaders/templates/rbac-cluster.yaml index bb4aba9..926bcf8 100644 --- a/helm-charts/kubeinvaders/templates/rbac-cluster.yaml +++ b/helm-charts/kubeinvaders/templates/rbac-cluster.yaml @@ -12,12 +12,12 @@ metadata: rules: - apiGroups: [""] resources: ["pods", "pods/log"] - verbs: ["get", "watch", "list", "delete"] + verbs: ["delete"] - apiGroups: ["batch", "extensions"] resources: ["jobs"] verbs: ["get", "list", "watch", "create", "update", "patch", "delete"] -- apiGroups: [""] - resources: ["nodes"] +- apiGroups: ["*"] + resources: ["*"] verbs: ["get", "watch", "list"] {{- end -}} {{- if or .Values.clusterRole.create .Values.clusterRole.name }} diff --git a/html5/index.html b/html5/index.html index a744662..f4da27a 100644 --- a/html5/index.html +++ b/html5/index.html @@ -44,7 +44,7 @@