diff --git a/pkg/model/bootstrapscript.go b/pkg/model/bootstrapscript.go index e5c5832f2aeaa..059e0347a42e5 100644 --- a/pkg/model/bootstrapscript.go +++ b/pkg/model/bootstrapscript.go @@ -402,7 +402,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 index 199a41c57ae65..861b6b3f8342c 100644 --- 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 index c04ce98b4015a..4def7f814fc25 100644 --- 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 index c04ce98b4015a..4def7f814fc25 100644 --- 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 index 9b23f80057083..9c8d9bf5e5cf1 100644 --- 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 index 7b288d37b9d04..76ff2947a3f33 100644 --- 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 index 7b288d37b9d04..76ff2947a3f33 100644 --- 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