Maksytka/kind
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kind.git synced 2025-12-01 07:26:05 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1847 from aojea/iptbump

Browse Source 
bump debian iptables base image
This commit is contained in:
Benjamin Elder
2020-09-25 12:19:29 -07:00
committed by GitHub
parent 3baa8682dd 1d2c89f568
commit 6fdc85d2c0
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
images/kindnetd/Dockerfile
View File

@@ -24,6 +24,6 @@ COPY . .
RUN CGO_ENABLED=0 go build -o ./kindnetd ./cmd/kindnetd
# build real kindnetd image
FROM k8s.gcr.io/build-image/debian-iptables:v12.1.0
FROM k8s.gcr.io/build-image/debian-iptables:buster-v1.3.0
COPY --from=0 --chown=root:root ./go/src/kindnetd /bin/kindnetd
CMD ["/bin/kindnetd"]

4
pkg/build/nodeimage/const_cni.go
View File

@@ -20,7 +20,7 @@ package nodeimage
The default CNI manifest and images are our own tiny kindnet
*/
var defaultCNIImages = []string{"kindest/kindnetd:v20200725-4d6bea59"}
var defaultCNIImages = []string{"kindest/kindnetd:v20200918-c5e52a49"}
const defaultCNIManifest = `
# kindnetd networking manifest
@@ -93,7 +93,7 @@ spec:
serviceAccountName: kindnet
containers:
- name: kindnet-cni
image: kindest/kindnetd:v20200725-4d6bea59
image: kindest/kindnetd:v20200918-c5e52a49
env:
- name: HOST_IP
valueFrom: