github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #28778 from ivan4th/support-custom-fedora-repos-in-vagrant-provider

Browse Source 
Automatic merge from submit-queue

Support custom Fedora repos in vagrant provider

Sometimes `KUBERNETES_PROVIDER=vagrant cluster/kube-up.sh` fails due to problems
with Fedora's metalink URL:
```
Timeout was reached for https://mirrors.fedoraproject.org/metalink?repo=fedora-23&arch=x86_64 [Connection timed out after 120002 milliseconds]
```

This PR makes it possible to specify a custom Fedora repository URL:
```
export CUSTOM_FEDORA_REPOSITORY_URL=https://download.fedoraproject.org/pub/fedora/
```

[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.kubernetes.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.kubernetes.io/reviews/kubernetes/kubernetes/28778)
<!-- Reviewable:end -->
This commit is contained in:
Kubernetes Submit Queue 2016-08-10 16:33:54 -07:00 committed by GitHub
commit 97d65ce8e4
3 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cluster/vagrant/provision-utils.sh
View File

@ -28,7 +28,14 @@ function prepare-package-manager() {
echo "Prepare package manager" echo "Prepare package manager"
# Useful if a mirror is broken or slow # Useful if a mirror is broken or slow
echo "fastestmirror=True" >> /etc/dnf/dnf.conf if [ -z "$CUSTOM_FEDORA_REPOSITORY_URL" ]; then
echo "fastestmirror=True" >> /etc/dnf/dnf.conf
else
# remove trailing slash from URL if it's present
CUSTOM_FEDORA_REPOSITORY_URL="${CUSTOM_FEDORA_REPOSITORY_URL%/}"
sed -i -e "/^metalink=/d" /etc/yum.repos.d/*.repo
sed -i -e "s@^#baseurl=http://download.fedoraproject.org/pub/fedora@baseurl=$CUSTOM_FEDORA_REPOSITORY_URL@" /etc/yum.repos.d/*.repo
fi
} }

1
cluster/vagrant/util.sh
View File

@ -187,6 +187,7 @@ function echo-kube-env() {
echo "OPENCONTRAIL_KUBERNETES_TAG='${OPENCONTRAIL_KUBERNETES_TAG:-}'" echo "OPENCONTRAIL_KUBERNETES_TAG='${OPENCONTRAIL_KUBERNETES_TAG:-}'"
echo "OPENCONTRAIL_PUBLIC_SUBNET='${OPENCONTRAIL_PUBLIC_SUBNET:-}'" echo "OPENCONTRAIL_PUBLIC_SUBNET='${OPENCONTRAIL_PUBLIC_SUBNET:-}'"
echo "E2E_STORAGE_TEST_ENVIRONMENT='${E2E_STORAGE_TEST_ENVIRONMENT:-}'" echo "E2E_STORAGE_TEST_ENVIRONMENT='${E2E_STORAGE_TEST_ENVIRONMENT:-}'"
echo "CUSTOM_FEDORA_REPOSITORY_URL='${CUSTOM_FEDORA_REPOSITORY_URL:-}'"
} }
function verify-cluster { function verify-cluster {

14
docs/devel/developer-guides/vagrant.md
View File

@ -429,6 +429,20 @@ environment variables. For example, if running `make quick-release`, use:
sudo -E make quick-release sudo -E make quick-release
``` ```
#### I have repository access errors during VM provisioning!
Sometimes VM provisioning may fail with errors that look like this:
```
Timeout was reached for https://mirrors.fedoraproject.org/metalink?repo=fedora-23&arch=x86_64 [Connection timed out after 120002 milliseconds]
```
You may use a custom Fedora repository URL to fix this:
```shell
export CUSTOM_FEDORA_REPOSITORY_URL=https://download.fedoraproject.org/pub/fedora/
```
#### I ran vagrant suspend and nothing works! #### I ran vagrant suspend and nothing works!
`vagrant suspend` seems to mess up the network. It's not supported at this time. `vagrant suspend` seems to mess up the network. It's not supported at this time.