fix disable_chaos_to_nodes

This commit is contained in:
Eugenio Marzo
2021-04-25 16:30:04 +02:00
parent 69fed2e384
commit 65d70206f3
4 changed files with 14 additions and 36 deletions
@@ -8,7 +8,7 @@ metadata:
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
spec:
replicas: {{ .Values.replicaCount }}
replicas: 1
selector:
matchLabels:
app.kubernetes.io/name: kubeinvaders
@@ -28,11 +28,6 @@ spec:
value: "{{ .Values.ingress.hostName }}"
- name: NAMESPACE
value: {{ .Values.target_namespace }}
- name: TOKEN
valueFrom:
secretKeyRef:
key: token
name: kubeinvaders-token
name: {{ .Chart.Name }}
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
@@ -1,13 +0,0 @@
kind: Secret
apiVersion: v1
metadata:
labels:
app: kubeinvaders
chart: kubeinvaders
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
name: kubeinvaders-token
namespace: {{ .Release.Namespace }}
annotations:
kubernetes.io/service-account.name: kubeinvaders
type: kubernetes.io/service-account-token
+10 -10
View File
@@ -123,7 +123,7 @@ function deletePods(pod_name){
function getPods(){
var oReq = new XMLHttpRequest();
oReq.onload = function () {
json_parsed = JSON.parse(this.responseText)
json_parsed = JSON.parse(this.responseText);
if (nodes && nodes.length > 0){
pods = json_parsed["items"].concat(nodes);
} else {
@@ -135,18 +135,18 @@ function getPods(){
}
function getNodes(){
var oReq = new XMLHttpRequest();
oReq.onload = function () {
json_parsed = JSON.parse(this.responseText)
nodes = json_parsed["items"];
};;
oReq.open("GET", "https://ENDPOINT_PLACEHOLDER/kube/nodes");
if (chaos_nodes) {
var oReq = new XMLHttpRequest();
oReq.onload = function () {
json_parsed = JSON.parse(this.responseText);
nodes = json_parsed["items"];
};;
oReq.open("GET", "https://ENDPOINT_PLACEHOLDER/kube/nodes");
oReq.send();
} else {
nodes = [];
}
oReq.send();
else {
nodes = []
}
}
window.setInterval(function getKubeItems() {
+3 -7
View File
@@ -55,8 +55,7 @@ ngx.header['Access-Control-Allow-Methods'] = 'GET, POST, OPTIONS'
ngx.header['Access-Control-Allow-Headers'] = 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range'
ngx.header['Access-Control-Expose-Headers'] = 'Content-Length,Content-Range';
--ngx.log(ngx.ERR, "token: " .. token)
ngx.log(ngx.ERR, "url: " .. url)
ngx.log(ngx.ERR, "Requesting nodes using this url: " .. url)
local headers = {
["Accept"] = "application/json",
@@ -78,21 +77,18 @@ ngx.log(ngx.ERR, ok)
ngx.log(ngx.ERR, statusCode)
ngx.log(ngx.ERR, statusText)
local i = 0
nodes["items"] = {}
for k,v in ipairs(resp) do
ngx.log(ngx.ERR, k)
decoded = json.decode(v)
if decoded["kind"] == "NodeList" then
for k2,v2 in ipairs(decoded["items"]) do
-- TODO: masters should be included?
-- if not v2["metadata"]["labels"]["node-role.kubernetes.io/master"] then
ngx.log(ngx.ERR, "found node " .. v2["metadata"]["name"])
nodes["items"][i] = v2["metadata"]["name"]
i = i + 1
table.insert(nodes["items"], v2["metadata"]["name"])
--end
end
end
end
ngx.say(json.encode(nodes))