Skip to content

K
k3s
Commit 45e557e2 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #31099 from luxas/remove_kubelet_container

Automatic merge from submit-queue Remove the kubelet container as it's unmaintained <!-- Thanks for sending a pull request! Here are some tips for you: 1. If this is your first time, read our contributor guidelines https://github.com/kubernetes/kubernetes/blob/master/CONTRIBUTING.md and developer guide https://github.com/kubernetes/kubernetes/blob/master/docs/devel/development.md 2. If you want *faster* PR reviews, read how: https://github.com/kubernetes/kubernetes/blob/master/docs/devel/faster_reviews.md 3. Follow the instructions for writing a release note: https://github.com/kubernetes/kubernetes/blob/master/docs/devel/pull-requests.md#release-notes --> **What this PR does / why we need it**: It removes the outdated and unmainained kubelet image, since we're using the hyperkube image instead. Should be pretty straightforward to remove this. @fgrzadkowski @thockin @mikedanese @pmorie
parents 1e754539 eb652814
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 59 deletions
cluster/images/kubelet/Dockerfile deleted 100644 → 0
View file @ 1e754539
# Copyright 2016 The Kubernetes Authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
FROM centos
ADD kubelet /kubelet
RUN chmod a+rx /kubelet
RUN cp /usr/bin/nsenter /nsenter
VOLUME /var/lib/docker
VOLUME /var/lib/kubelet
CMD [ "/kubelet" ]
cluster/images/kubelet/Makefile deleted 100644 → 0
View file @ 1e754539
# Copyright 2016 The Kubernetes Authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# build the kubelet image.
# TODO: figure out the best base image
# TODO: figure out how to best source the nsenter binary, if necessary
# TODO: figure out how to make a single source of version info for these
# images
VERSION=v0.16
BIN_DIR=bin/linux/amd64
LOCAL_OUTPUT_DIR=../../../_output/local
release: clean
curl -O https://storage.googleapis.com/kubernetes-release/release/${VERSION}/${BIN_DIR}/kubelet
docker build -t gcr.io/google_containers/kubelet:${VERSION} .
gcloud docker push gcr.io/google_containers/kubelet:${VERSION}
local: clean
cp ${LOCAL_OUTPUT_DIR}/${BIN_DIR}/kubelet .
docker build -t gcr.io/google_containers/kubelet .
clean:
rm -f kubelet
.PHONY: release
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment