Skip to content
This repository has been archived by the owner on Dec 7, 2023. It is now read-only.

Update OS and kernel versions #602

Merged
merged 3 commits into from
Jun 1, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions images/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,11 @@ build-all:
$(MAKE) ${OP} WHAT=opensuse RELEASE=leap IS_LATEST=true
$(MAKE) ${OP} WHAT=opensuse RELEASE=tumbleweed
$(MAKE) ${OP} WHAT=ubuntu RELEASE=16.04 IS_MANIFEST_LIST=0
$(MAKE) ${OP} WHAT=ubuntu RELEASE=18.04 IS_LATEST=true IS_MANIFEST_LIST=1 GOARCH=arm64
$(MAKE) ${OP} WHAT=ubuntu RELEASE=18.04 IS_LATEST=true IS_MANIFEST_LIST=1 GOARCH=amd64
$(MAKE) ${OP} WHAT=ubuntu RELEASE=18.04 IS_MANIFEST_LIST=1 GOARCH=arm64
$(MAKE) ${OP} WHAT=ubuntu RELEASE=18.04 IS_MANIFEST_LIST=1 GOARCH=amd64
$(MAKE) ${OP} WHAT=ubuntu RELEASE=19.04 IS_MANIFEST_LIST=0
$(MAKE) ${OP} WHAT=centos RELEASE=7 IS_LATEST=true
$(MAKE) ${OP} WHAT=ubuntu RELEASE=20.04 IS_LATEST=true IS_MANIFEST_LIST=1 GOARCH=arm64
$(MAKE) ${OP} WHAT=ubuntu RELEASE=20.04 IS_LATEST=true IS_MANIFEST_LIST=1 GOARCH=amd64
$(MAKE) ${OP} WHAT=centos RELEASE=7
$(MAKE) ${OP} WHAT=centos RELEASE=8 IS_LATEST=true
$(MAKE) ${OP} WHAT=kubeadm
2 changes: 1 addition & 1 deletion images/kernel/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Check https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/refs/ for updates
REGISTRY?=weaveworks
IMAGE_NAME?=${REGISTRY}/ignite-kernel
KERNEL_VERSIONS ?= 4.14.166 4.19.97 5.4.13
KERNEL_VERSIONS ?= 4.14.182 4.19.125 5.4.43
GOARCH?=amd64
GOARCH_LIST = amd64 arm64

Expand Down
1 change: 1 addition & 0 deletions images/kernel/upgrade-config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ if [[ ${FROM} != ${TO} ]]; then
cp ${FROM} ${TO}
fi

docker pull ${KERNEL_BUILDER_IMAGE}
docker run -it \
${ARCH_PARAMETER} \
-v $(pwd)/${TO}:/tmp/.config \
Expand Down
8 changes: 4 additions & 4 deletions images/kubeadm/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM weaveworks/ignite-ubuntu:18.04
FROM weaveworks/ignite-ubuntu:20.04
# Install dependencies. Use containerd for running the containers (for better performance)
RUN apt-get update && apt-get install -y --no-install-recommends \
apt-transport-https \
Expand All @@ -8,10 +8,10 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
jq \
&& apt-get clean

# Install k8s v1.15.0 locally
ENV KUBERNETES_VERSION=v1.15.0
# Install k8s v1.18.1 locally
ENV KUBERNETES_VERSION=v1.18.1
COPY install.sh /
RUN /install.sh install release/stable-1.15 ${KUBERNETES_VERSION}
RUN /install.sh install release/stable-1.18 ${KUBERNETES_VERSION}
# Docker sets this automatically, but not containerd.
# It is required when running kubeadm.
RUN echo "net.ipv4.ip_forward=1" > /etc/sysctl.conf