Merge pull request #7772 from zadowsmash/fix-rhel-yum-config

fixed yum proxy configuration
kubernetes · Jan 5, 2020 · be1eea3 · be1eea3
2 parents e4da659 + 6150ebe
commit be1eea3
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/pkg/model/bootstrapscript.go b/pkg/model/bootstrapscript.go
@@ -404,7 +404,7 @@ func (b *BootstrapScript) createProxyEnv(ps *kops.EgressProxySpec) string {
 		buffer.WriteString("*[Uu]buntu*)\n")
 		buffer.WriteString(`  echo "Acquire::http::Proxy \"${http_proxy}\";" > /etc/apt/apt.conf.d/30proxy ;;` + "\n")
 		buffer.WriteString("*[Rr]ed[Hh]at*)\n")
-		buffer.WriteString(`  echo "http_proxy=${http_proxy}" >> /etc/yum.conf ;;` + "\n")
+		buffer.WriteString(`  echo "proxy=${http_proxy}" >> /etc/yum.conf ;;` + "\n")
 		buffer.WriteString("esac\n")
 
 		// Set env variables for systemd

diff --git a/pkg/model/tests/data/bootstrapscript_0.txt b/pkg/model/tests/data/bootstrapscript_0.txt
@@ -34,7 +34,7 @@ case `cat /proc/version` in
 *[Uu]buntu*)
   echo "Acquire::http::Proxy \"${http_proxy}\";" > /etc/apt/apt.conf.d/30proxy ;;
 *[Rr]ed[Hh]at*)
-  echo "http_proxy=${http_proxy}" >> /etc/yum.conf ;;
+  echo "proxy=${http_proxy}" >> /etc/yum.conf ;;
 esac
 echo "DefaultEnvironment=\"http_proxy=${http_proxy}\" \"https_proxy=${http_proxy}\" \"NO_PROXY=${no_proxy}\" \"no_proxy=${no_proxy}\"" >> /etc/systemd/system.conf
 systemctl daemon-reload

diff --git a/pkg/model/tests/data/bootstrapscript_1.txt b/pkg/model/tests/data/bootstrapscript_1.txt
@@ -34,7 +34,7 @@ case `cat /proc/version` in
 *[Uu]buntu*)
   echo "Acquire::http::Proxy \"${http_proxy}\";" > /etc/apt/apt.conf.d/30proxy ;;
 *[Rr]ed[Hh]at*)
-  echo "http_proxy=${http_proxy}" >> /etc/yum.conf ;;
+  echo "proxy=${http_proxy}" >> /etc/yum.conf ;;
 esac
 echo "DefaultEnvironment=\"http_proxy=${http_proxy}\" \"https_proxy=${http_proxy}\" \"NO_PROXY=${no_proxy}\" \"no_proxy=${no_proxy}\"" >> /etc/systemd/system.conf
 systemctl daemon-reload

diff --git a/pkg/model/tests/data/bootstrapscript_2.txt b/pkg/model/tests/data/bootstrapscript_2.txt
@@ -34,7 +34,7 @@ case `cat /proc/version` in
 *[Uu]buntu*)
   echo "Acquire::http::Proxy \"${http_proxy}\";" > /etc/apt/apt.conf.d/30proxy ;;
 *[Rr]ed[Hh]at*)
-  echo "http_proxy=${http_proxy}" >> /etc/yum.conf ;;
+  echo "proxy=${http_proxy}" >> /etc/yum.conf ;;
 esac
 echo "DefaultEnvironment=\"http_proxy=${http_proxy}\" \"https_proxy=${http_proxy}\" \"NO_PROXY=${no_proxy}\" \"no_proxy=${no_proxy}\"" >> /etc/systemd/system.conf
 systemctl daemon-reload

diff --git a/pkg/model/tests/data/bootstrapscript_3.txt b/pkg/model/tests/data/bootstrapscript_3.txt
@@ -34,7 +34,7 @@ case `cat /proc/version` in
 *[Uu]buntu*)
   echo "Acquire::http::Proxy \"${http_proxy}\";" > /etc/apt/apt.conf.d/30proxy ;;
 *[Rr]ed[Hh]at*)
-  echo "http_proxy=${http_proxy}" >> /etc/yum.conf ;;
+  echo "proxy=${http_proxy}" >> /etc/yum.conf ;;
 esac
 echo "DefaultEnvironment=\"http_proxy=${http_proxy}\" \"https_proxy=${http_proxy}\" \"NO_PROXY=${no_proxy}\" \"no_proxy=${no_proxy}\"" >> /etc/systemd/system.conf
 systemctl daemon-reload

diff --git a/pkg/model/tests/data/bootstrapscript_4.txt b/pkg/model/tests/data/bootstrapscript_4.txt
@@ -34,7 +34,7 @@ case `cat /proc/version` in
 *[Uu]buntu*)
   echo "Acquire::http::Proxy \"${http_proxy}\";" > /etc/apt/apt.conf.d/30proxy ;;
 *[Rr]ed[Hh]at*)
-  echo "http_proxy=${http_proxy}" >> /etc/yum.conf ;;
+  echo "proxy=${http_proxy}" >> /etc/yum.conf ;;
 esac
 echo "DefaultEnvironment=\"http_proxy=${http_proxy}\" \"https_proxy=${http_proxy}\" \"NO_PROXY=${no_proxy}\" \"no_proxy=${no_proxy}\"" >> /etc/systemd/system.conf
 systemctl daemon-reload

diff --git a/pkg/model/tests/data/bootstrapscript_5.txt b/pkg/model/tests/data/bootstrapscript_5.txt
@@ -34,7 +34,7 @@ case `cat /proc/version` in
 *[Uu]buntu*)
   echo "Acquire::http::Proxy \"${http_proxy}\";" > /etc/apt/apt.conf.d/30proxy ;;
 *[Rr]ed[Hh]at*)
-  echo "http_proxy=${http_proxy}" >> /etc/yum.conf ;;
+  echo "proxy=${http_proxy}" >> /etc/yum.conf ;;
 esac
 echo "DefaultEnvironment=\"http_proxy=${http_proxy}\" \"https_proxy=${http_proxy}\" \"NO_PROXY=${no_proxy}\" \"no_proxy=${no_proxy}\"" >> /etc/systemd/system.conf
 systemctl daemon-reload