Skip to content

Commit

Permalink
feat: upgrade Ceph to octopus
Browse files Browse the repository at this point in the history
Brings in an updated version of the Ceph.

Signed-off-by: Andrew Rynhard <andrew@rynhard.io>
  • Loading branch information
andrewrynhard authored and talos-bot committed Nov 11, 2020
1 parent 00cd044 commit 74f5562
Showing 1 changed file with 13 additions and 7 deletions.
20 changes: 13 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ ARG KUBELET_VER
ARG KUBELET_SHA512_AMD64
ARG KUBELET_URL=https://storage.googleapis.com/kubernetes-release/release/${KUBELET_VER}/bin/linux/${TARGETARCH}/kubelet

RUN wget -q -O /kubelet ${KUBELET_URL} && \
echo "${KUBELET_SHA512_AMD64} /kubelet" | sha512sum -c && \
chmod +x /kubelet
RUN wget -q -O /kubelet ${KUBELET_URL} \
&& echo "${KUBELET_SHA512_AMD64} /kubelet" | sha512sum -c \
&& chmod +x /kubelet

FROM alpine:latest as builder-arm64

Expand All @@ -19,9 +19,9 @@ ARG KUBELET_VER
ARG KUBELET_SHA512_ARM64
ARG KUBELET_URL=https://storage.googleapis.com/kubernetes-release/release/${KUBELET_VER}/bin/linux/${TARGETARCH}/kubelet

RUN wget -q -O /kubelet ${KUBELET_URL} && \
echo "${KUBELET_SHA512_ARM64} /kubelet" | sha512sum -c && \
chmod +x /kubelet
RUN wget -q -O /kubelet ${KUBELET_URL} \
&& echo "${KUBELET_SHA512_ARM64} /kubelet" | sha512sum -c \
&& chmod +x /kubelet

ARG TARGETARCH
FROM builder-${TARGETARCH} as builder
Expand All @@ -31,7 +31,8 @@ FROM us.gcr.io/k8s-artifacts-prod/build-image/debian-iptables:v12.1.2 as contain
RUN clean-install \
bash \
ca-certificates \
ceph-common \
wget \
gnupg \
cifs-utils \
e2fsprogs \
xfsprogs \
Expand All @@ -45,6 +46,11 @@ RUN clean-install \
udev \
util-linux

RUN wget -q -O- 'https://download.ceph.com/keys/release.asc' | apt-key add -
RUN echo deb https://download.ceph.com/debian-octopus/ buster main | tee /etc/apt/sources.list.d/ceph.list
RUN apt-get clean \
&& clean-install ceph-common

COPY --from=builder /kubelet /usr/local/bin/kubelet

LABEL org.opencontainers.image.source https://github.com/talos-systems/kubelet
Expand Down

0 comments on commit 74f5562

Please sign in to comment.