Skip to content

Commit a69456f

Browse files
authored
Fix CNI integration test (linkerd#7660)
Reverts the change made to `env_vars.sh` in linkerd#7541 That file is consumed by `docker run --env-file` which requires the old format, as documented [here](https://docs.docker.com/engine/reference/commandline/run/#set-environment-variables--e---env---env-file). Also renamed it to `env_vars.list` to have it not mistaken to be a shell target. This broke the `ARM64 integration test` as seen here: https://github.com/linkerd/linkerd2/runs/4887813913?check_suite_focus=true#step:7:34
1 parent af4a686 commit a69456f

File tree

3 files changed

+22
-23
lines changed

3 files changed

+22
-23
lines changed

cni-plugin/test/data/env_vars.list

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
KUBE_DNS_SERVICE_PORT=53
2+
KUBE_DNS_PORT_53_TCP_PROTO=tcp
3+
KUBE_DNS_PORT_53_UDP=udp://10.110.0.10:53
4+
KUBE_DNS_PORT_53_UDP_PROTO=udp
5+
KUBERNETES_PORT_443_TCP_PROTO=tcp
6+
KUBERNETES_PORT_443_TCP_ADDR=10.110.0.1
7+
KUBE_DNS_PORT_53_UDP_ADDR=10.110.0.10
8+
KUBERNETES_PORT=tcp://10.110.0.1:443
9+
KUBE_DNS_PORT_53_TCP_ADDR=10.110.0.10
10+
KUBE_DNS_PORT=udp://10.110.0.10:53
11+
KUBERNETES_SERVICE_PORT_HTTPS=443
12+
KUBERNETES_PORT_443_TCP_PORT=443
13+
KUBERNETES_PORT_443_TCP=tcp://10.110.0.1:443
14+
KUBE_DNS_PORT_53_TCP_PORT=53
15+
KUBE_DNS_PORT_53_TCP=tcp://10.110.0.10:53
16+
KUBERNETES_SERVICE_PORT=443
17+
KUBE_DNS_SERVICE_PORT_DNS=53
18+
KUBE_DNS_SERVICE_PORT_DNS_TCP=53
19+
KUBERNETES_SERVICE_HOST=10.110.0.1
20+
KUBE_DNS_PORT_53_UDP_PORT=53
21+
KUBE_DNS_SERVICE_HOST=10.110.0.10

cni-plugin/test/data/env_vars.sh

Lines changed: 0 additions & 22 deletions
This file was deleted.

cni-plugin/test/install-cni_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ func startDocker(testNum int, wd string, testWorkRootDir string, tempCNINetDir s
141141
"-v", tempCNINetDir + ":" + hostCniNetDir,
142142
"-v", tempCNIBinDir + ":/host/opt/cni/bin",
143143
"-v", tempK8sSvcAcctDir + ":/var/run/secrets/kubernetes.io/serviceaccount",
144-
"--env-file", wd + "/data/env_vars.sh",
144+
"--env-file", wd + "/data/env_vars.list",
145145
"-e", cniNetworkConfigName,
146146
"-e", "SLEEP=true",
147147
}

0 commit comments

Comments
 (0)