github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-07 03:03:59 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #57648 from Fsero/bugfix/add_ipset_binary_for_ipvs

Browse Source 
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Add ipset binary for IPVS, context: Fixes #57321

**What this PR does / why we need it**: Add ipset binary in debian-hyperkube-base which fixes issue 57321

**Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*:
Fixes #57321  

**Special notes for your reviewer**:

**Release note**:

```release-note
Add ipset binary for IPVS to hyperkube docker image
```
This commit is contained in:
Kubernetes Submit Queue 2018-02-21 11:42:42 -08:00 committed by GitHub
commit 8712ed358d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build/debian-hyperkube-base/Dockerfile
View File

@ -34,6 +34,7 @@ RUN echo CACHEBUST>/dev/null && clean-install \
git \ git \
glusterfs-client \ glusterfs-client \
iptables \ iptables \
ipset \
jq \ jq \
kmod \ kmod \
openssh-client \ openssh-client \

2
build/debian-hyperkube-base/Makefile
View File

@ -19,7 +19,7 @@
REGISTRY?=staging-k8s.gcr.io REGISTRY?=staging-k8s.gcr.io
IMAGE?=debian-hyperkube-base IMAGE?=debian-hyperkube-base
TAG=0.8 TAG=0.9
ARCH?=amd64 ARCH?=amd64
CACHEBUST?=1 CACHEBUST?=1

4
build/root/WORKSPACE
View File

@ -67,10 +67,10 @@ docker_pull(
docker_pull( docker_pull(
name = "debian-hyperkube-base-amd64", name = "debian-hyperkube-base-amd64",
digest = "sha256:fc1b461367730660ac5a40c1eb2d1b23221829acf8a892981c12361383b3742b", digest = "sha256:d83594ecd85345144584523e7fa5388467edf5d2dfa30d0a1bcbf184cddf4a7b",
registry = "k8s.gcr.io", registry = "k8s.gcr.io",
repository = "debian-hyperkube-base-amd64", repository = "debian-hyperkube-base-amd64",
tag = "0.8", # ignored, but kept here for documentation tag = "0.9", # ignored, but kept here for documentation
) )
docker_pull( docker_pull(