Skip to content

Commit

Permalink
Remove HOST_IP
Browse files Browse the repository at this point in the history
  • Loading branch information
Thomas Eckert committed Nov 29, 2022
1 parent d486e02 commit c6bf305
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 33 deletions.
4 changes: 0 additions & 4 deletions charts/consul/templates/api-gateway-controller-deployment.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,6 @@ spec:
value: /consul/tls/ca/tls.crt
{{- end }}
{{- end }}
- name: HOST_IP
valueFrom:
fieldRef:
fieldPath: status.hostIP
{{- if .Values.global.acls.manageSystemACLs }}
- name: CONSUL_HTTP_TOKEN_FILE
value: "/consul/login/acl-token"
Expand Down
42 changes: 13 additions & 29 deletions charts/consul/test/unit/api-gateway-controller-deployment.bats
View file
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ load _helpers
--set 'apiGateway.image=foo' \
--set 'global.acls.manageSystemACLs=true' \
. | tee /dev/stderr |
yq '[.spec.template.spec.containers[0].env[1].name] | any(contains("CONSUL_HTTP_TOKEN_FILE"))' | tee /dev/stderr)
yq '[.spec.template.spec.containers[0].env[0].name] | any(contains("CONSUL_HTTP_TOKEN_FILE"))' | tee /dev/stderr)
[ "${actual}" = "true" ]
}

Expand All @@ -307,7 +307,7 @@ load _helpers
--set 'apiGateway.image=foo' \
--set 'global.acls.manageSystemACLs=true' \
. | tee /dev/stderr |
yq '[.spec.template.spec.containers[0].env[2].name] | any(contains("CONSUL_LOGIN_DATACENTER"))' | tee /dev/stderr)
yq '[.spec.template.spec.containers[0].env[1].name] | any(contains("CONSUL_LOGIN_DATACENTER"))' | tee /dev/stderr)
[ "${actual}" = "true" ]
}

Expand All @@ -329,10 +329,6 @@ load _helpers
yq -r '.command | any(contains("consul-k8s-control-plane acl-init"))' | tee /dev/stderr)
[ "${actual}" = "true" ]

local actual=$(echo $object |
yq '[.env[0].name] | any(contains("HOST_IP"))' | tee /dev/stderr)
[ "${actual}" = "true" ]

local actual=$(echo $object |
yq '[.env[1].name] | any(contains("NAMESPACE"))' | tee /dev/stderr)
[ "${actual}" = "true" ]
Expand Down Expand Up @@ -370,10 +366,6 @@ load _helpers
yq -r '.command | any(contains("consul-k8s-control-plane acl-init"))' | tee /dev/stderr)
[ "${actual}" = "true" ]

local actual=$(echo $object |
yq '[.env[0].name] | any(contains("HOST_IP"))' | tee /dev/stderr)
[ "${actual}" = "true" ]

local actual=$(echo $object |
yq '[.env[1].name] | any(contains("NAMESPACE"))' | tee /dev/stderr)
[ "${actual}" = "true" ]
Expand Down Expand Up @@ -425,10 +417,6 @@ load _helpers
yq -r '.command | any(contains("-partition=default"))' | tee /dev/stderr)
[ "${actual}" = "true" ]

local actual=$(echo $object |
yq '[.env[0].name] | any(contains("HOST_IP"))' | tee /dev/stderr)
[ "${actual}" = "true" ]

local actual=$(echo $object |
yq '[.env[1].name] | any(contains("NAMESPACE"))' | tee /dev/stderr)
[ "${actual}" = "true" ]
Expand Down Expand Up @@ -526,10 +514,6 @@ load _helpers
yq -r '.command | any(contains("consul-k8s-control-plane acl-init"))' | tee /dev/stderr)
[ "${actual}" = "true" ]

local actual=$(echo $object |
yq '[.env[0].name] | any(contains("HOST_IP"))' | tee /dev/stderr)
[ "${actual}" = "true" ]

local actual=$(echo $object |
yq '[.env[1].name] | any(contains("NAMESPACE"))' | tee /dev/stderr)
[ "${actual}" = "true" ]
Expand Down Expand Up @@ -1205,7 +1189,7 @@ load _helpers
--set 'apiGateway.image=bar' \
--set 'global.tls.enabled=false' \
. | tee /dev/stderr |
yq '.spec.template.spec.containers[0].env[2].value' | tee /dev/stderr)
yq '.spec.template.spec.containers[0].env[1].value' | tee /dev/stderr)
[ "${actual}" = "\"false\"" ]
}

Expand Down Expand Up @@ -1237,7 +1221,7 @@ load _helpers
--set 'server.enabled=false' \
--set 'client.enabled=false' \
. | tee /dev/stderr |
yq '[.spec.template.spec.containers[0].env[2].value] | any(contains("external-consul.host:8501"))' | tee /dev/stderr)
yq '[.spec.template.spec.containers[0].env[1].value] | any(contains("external-consul.host:8501"))' | tee /dev/stderr)
[ "${actual}" = "true" ]
}

Expand All @@ -1254,7 +1238,7 @@ load _helpers
--set 'server.enabled=false' \
--set 'client.enabled=false' \
. | tee /dev/stderr |
yq '[.spec.template.spec.containers[0].env[1].value] | any(contains("external-consul.host:8500"))' | tee /dev/stderr)
yq '[.spec.template.spec.containers[0].env[0].value] | any(contains("external-consul.host:8500"))' | tee /dev/stderr)
[ "${actual}" = "true" ]
}

Expand All @@ -1267,7 +1251,7 @@ load _helpers
--set 'global.tls.enabled=true' \
--set 'client.enabled=true' \
. | tee /dev/stderr |
yq '[.spec.template.spec.containers[0].env[2].value] | any(contains("$(HOST_IP):8501"))' | tee /dev/stderr)
yq '[.spec.template.spec.containers[0].env[1].value] | any(contains("$(HOST_IP):8501"))' | tee /dev/stderr)
[ "${actual}" = "true" ]
}

Expand All @@ -1280,7 +1264,7 @@ load _helpers
--set 'global.tls.enabled=false' \
--set 'client.enabled=true' \
. | tee /dev/stderr |
yq '[.spec.template.spec.containers[0].env[1].value] | any(contains("$(HOST_IP):8500"))' | tee /dev/stderr)
yq '[.spec.template.spec.containers[0].env[0].value] | any(contains("$(HOST_IP):8500"))' | tee /dev/stderr)
[ "${actual}" = "true" ]
}

Expand All @@ -1293,7 +1277,7 @@ load _helpers
--set 'global.tls.enabled=true' \
--set 'client.enabled=false' \
. | tee /dev/stderr |
yq '[.spec.template.spec.containers[0].env[2].value] | any(contains("release-name-consul-server:8501"))' | tee /dev/stderr)
yq '[.spec.template.spec.containers[0].env[1].value] | any(contains("release-name-consul-server:8501"))' | tee /dev/stderr)
[ "${actual}" = "true" ]
}

Expand All @@ -1306,7 +1290,7 @@ load _helpers
--set 'global.tls.enabled=false' \
--set 'client.enabled=false' \
. | tee /dev/stderr |
yq '[.spec.template.spec.containers[0].env[1].value] | any(contains("release-name-consul-server:8500"))' | tee /dev/stderr)
yq '[.spec.template.spec.containers[0].env[0].value] | any(contains("release-name-consul-server:8500"))' | tee /dev/stderr)
[ "${actual}" = "true" ]
}

Expand All @@ -1326,7 +1310,7 @@ load _helpers
--set 'externalServers.tlsServerName=hashi' \
--set 'server.enabled=false' \
. | tee /dev/stderr |
yq '.spec.template.spec.containers[0].env[4].value == "hashi"' | tee /dev/stderr)
yq '.spec.template.spec.containers[0].env[3].value == "hashi"' | tee /dev/stderr)
[ "${actual}" = "true" ]
}

Expand All @@ -1343,7 +1327,7 @@ load _helpers
--set 'global.adminPartitions.enabled=true' \
--set 'global.adminPartitions.name=hashi' \
. | tee /dev/stderr |
yq '.spec.template.spec.containers[0].env[3].value == "hashi"' | tee /dev/stderr)
yq '.spec.template.spec.containers[0].env[2].value == "hashi"' | tee /dev/stderr)
[ "${actual}" = "true" ]
}

Expand All @@ -1358,7 +1342,7 @@ load _helpers
--set 'global.adminPartitions.name=hashi' \
--set 'global.acls.manageSystemACLs=true' \
. | tee /dev/stderr |
yq '.spec.template.spec.containers[0].env[6].value == "hashi"' | tee /dev/stderr)
yq '.spec.template.spec.containers[0].env[5].value == "hashi"' | tee /dev/stderr)
[ "${actual}" = "true" ]
}

Expand All @@ -1370,7 +1354,7 @@ load _helpers
--set 'apiGateway.image=bar' \
--set 'client.enabled=false' \
. | tee /dev/stderr |
yq '.spec.template.spec.containers[0].env[3].value == "true"' | tee /dev/stderr)
yq '.spec.template.spec.containers[0].env[2].value == "true"' | tee /dev/stderr)
[ "${actual}" = "true" ]
}

Expand Down

0 comments on commit c6bf305

Please sign in to comment.