Skip to content

Commit

Permalink
Upgrades CoreOS, k8s, CNI plugins and crictl (#153)
Browse files Browse the repository at this point in the history
* Upgrades k8s from 1.13.5 to 1.14.8, and upgrades CNI plugins and crictl.

* Modifies CNI plugin download url to include 'linux' in the file name, since that is now how things are.

* Exports all variables defined config.sh so that they are available to subprocesses.
  • Loading branch information
nkinkade committed Oct 31, 2019
1 parent 27b3c7c commit 423937c
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
22 changes: 11 additions & 11 deletions config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@
# relevant settings.

# stage3 coreos
COREOS_VERSION=2135.6.0
K8S_VERSION=v1.13.5
CRI_VERSION=v1.13.0
CNI_VERSION=v0.7.5
export COREOS_VERSION=2247.5.0
export K8S_VERSION=v1.14.8
export CRI_VERSION=v1.16.1
export CNI_VERSION=v0.8.2

# stage1 mlxrom
MLXROM_VERSION=3.4.816
MLXROM_REGEXP_mlab_sandbox='mlab[1-4].[a-z]{3}[0-9]t.*'
MLXROM_REGEXP_mlab_staging='mlab4.[a-z]{3}[0-9]{2}.*'
MLXROM_REGEXP_mlab_oti='mlab[1-3].[a-z]{3}[0-9]{2}.*'
export MLXROM_VERSION=3.4.816
export MLXROM_REGEXP_mlab_sandbox='mlab[1-4].[a-z]{3}[0-9]t.*'
export MLXROM_REGEXP_mlab_staging='mlab4.[a-z]{3}[0-9]{2}.*'
export MLXROM_REGEXP_mlab_oti='mlab[1-3].[a-z]{3}[0-9]{2}.*'

# stage1 isos
ISO_REGEXP_mlab_sandbox='mlab[1-4].[a-z]{3}[0-9]t.*'
ISO_REGEXP_mlab_staging='mlab4.[a-z]{3}[0-9]{2}.*'
ISO_REGEXP_mlab_oti='mlab[1-3].[a-z]{3}[0-9]{2}.*'
export ISO_REGEXP_mlab_sandbox='mlab[1-4].[a-z]{3}[0-9]t.*'
export ISO_REGEXP_mlab_staging='mlab4.[a-z]{3}[0-9]{2}.*'
export ISO_REGEXP_mlab_oti='mlab[1-3].[a-z]{3}[0-9]{2}.*'
2 changes: 1 addition & 1 deletion setup_stage3_coreos.sh
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ pushd $IMAGEDIR
# Install the cni binaries: bridge, flannel, host-local, ipvlan, loopback, and
# others.
mkdir -p squashfs-root/cni/bin
curl --location "https://github.com/containernetworking/plugins/releases/download/${CNI_VERSION}/cni-plugins-amd64-${CNI_VERSION}.tgz" \
curl --location "https://github.com/containernetworking/plugins/releases/download/${CNI_VERSION}/cni-plugins-linux-amd64-${CNI_VERSION}.tgz" \
| tar --directory=squashfs-root/cni/bin -xz

# Make all the shims so that network plugins can be debugged.
Expand Down

0 comments on commit 423937c

Please sign in to comment.