Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
dd2a1e5d
Unverified
Commit
dd2a1e5d
authored
Sep 17, 2018
by
k8s-ci-robot
Committed by
GitHub
Sep 17, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #68769 from ixdy/debian-iptables-netbase
Update to use debian-iptables v10.2 and debian-hyperkube-base 0.10.2
parents
247240ac
b4635a82
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
common.sh
build/common.sh
+1
-1
Makefile
cluster/images/hyperkube/Makefile
+1
-1
No files found.
build/common.sh
View file @
dd2a1e5d
...
...
@@ -88,7 +88,7 @@ readonly KUBE_CONTAINER_RSYNC_PORT=8730
#
# $1 - server architecture
kube::build::get_docker_wrapped_binaries
()
{
debian_iptables_version
=
v10.
1
debian_iptables_version
=
v10.
2
### If you change any of these lists, please also update DOCKERIZED_BINARIES
### in build/BUILD. And kube::golang::server_image_targets
case
$1
in
...
...
cluster/images/hyperkube/Makefile
View file @
dd2a1e5d
...
...
@@ -22,7 +22,7 @@ ARCH?=amd64
OUT_DIR
?=
_output
HYPERKUBE_BIN
?=
$(
shell
pwd
)
/../../../
$(OUT_DIR)
/dockerized/bin/linux/
$(ARCH)
/hyperkube
BASEIMAGE
=
k8s.gcr.io/debian-hyperkube-base-
$(ARCH)
:0.10.
1
BASEIMAGE
=
k8s.gcr.io/debian-hyperkube-base-
$(ARCH)
:0.10.
2
TEMP_DIR
:=
$(
shell
mktemp
-d
-t
hyperkubeXXXXXX
)
all
:
build
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment