Merge pull request projectcalico#942 from neiljerram/fix-node-name-var

Revert accidental change from KUBERNETES_NODE_NAME to NODENAME
cxsx · Sep 1, 2020 · 9cd0e42 · 9cd0e42
1 parent 5389d4a
commit 9cd0e42
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/pkg/install/install.go b/pkg/install/install.go
@@ -342,7 +342,7 @@ func writeCNIConfig(c config) {
  netconf = strings.Replace(netconf, "__LOG_FILE_MAX_AGE__", getEnv("LOG_FILE_MAX_AGE", "30"), -1)
  netconf = strings.Replace(netconf, "__LOG_FILE_MAX_COUNT__", getEnv("LOG_FILE_MAX_COUNT", "10"), -1)
  netconf = strings.Replace(netconf, "__DATASTORE_TYPE__", getEnv("DATASTORE_TYPE", "kubernetes"), -1)
- netconf = strings.Replace(netconf, "__KUBERNETES_NODE_NAME__", getEnv("NODENAME", nodename), -1)
+ netconf = strings.Replace(netconf, "__KUBERNETES_NODE_NAME__", getEnv("KUBERNETES_NODE_NAME", nodename), -1)
  netconf = strings.Replace(netconf, "__KUBECONFIG_FILEPATH__", kubeconfigPath, -1)
  netconf = strings.Replace(netconf, "__CNI_MTU__", getEnv("CNI_MTU", "1500"), -1)
 

diff --git a/pkg/install/install_test.go b/pkg/install/install_test.go
@@ -77,7 +77,7 @@ func runCniContainer(tempDir string, extraArgs ...string) error {
  "-e", "SLEEP=false",
  "-e", "KUBERNETES_SERVICE_HOST=127.0.0.1",
  "-e", "KUBERNETES_SERVICE_PORT=8080",
- "-e", "NODENAME=my-node",
+ "-e", "KUBERNETES_NODE_NAME=my-node",
  "-v", tempDir + "/bin:/host/opt/cni/bin",
  "-v", tempDir + "/net.d:/host/etc/cni/net.d",
  "-v", tempDir + "/serviceaccount:/var/run/secrets/kubernetes.io/serviceaccount",