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
37bb0139
Commit
37bb0139
authored
Aug 13, 2018
by
Jeff Grafton
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update to debian-iptables v10.1 and hyperkube-base 0.10.1
parent
fbb2dfcc
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
common.sh
build/common.sh
+1
-1
WORKSPACE
build/root/WORKSPACE
+4
-4
Makefile
cluster/images/hyperkube/Makefile
+1
-1
No files found.
build/common.sh
View file @
37bb0139
...
@@ -88,7 +88,7 @@ readonly KUBE_CONTAINER_RSYNC_PORT=8730
...
@@ -88,7 +88,7 @@ readonly KUBE_CONTAINER_RSYNC_PORT=8730
#
#
# $1 - server architecture
# $1 - server architecture
kube::build::get_docker_wrapped_binaries
()
{
kube::build::get_docker_wrapped_binaries
()
{
debian_iptables_version
=
v10
debian_iptables_version
=
v10
.1
### If you change any of these lists, please also update DOCKERIZED_BINARIES
### If you change any of these lists, please also update DOCKERIZED_BINARIES
### in build/BUILD.
### in build/BUILD.
case
$1
in
case
$1
in
...
...
build/root/WORKSPACE
View file @
37bb0139
...
@@ -67,18 +67,18 @@ http_file(
...
@@ -67,18 +67,18 @@ http_file(
docker_pull(
docker_pull(
name = "debian-iptables-amd64",
name = "debian-iptables-amd64",
digest = "sha256:
fb18678f8203ca1bd2fad2671e3ebd80cb408a1baae423d4ad39c05f4caac4e
1",
digest = "sha256:
58e53e477d204fe32f761ec2718b792f653063d4192ae89efc79e4b6a8dbba9
1",
registry = "k8s.gcr.io",
registry = "k8s.gcr.io",
repository = "debian-iptables-amd64",
repository = "debian-iptables-amd64",
tag = "v10", # ignored, but kept here for documentation
tag = "v10
.1
", # ignored, but kept here for documentation
)
)
docker_pull(
docker_pull(
name = "debian-hyperkube-base-amd64",
name = "debian-hyperkube-base-amd64",
digest = "sha256:
cc782ed16599000ca4c85d47ec6264753747ae1e77520894dca84b104a7621e2
",
digest = "sha256:
1c83ca9c8ac4a06e4585802edf8a1cd954011152409116e9c801f4736b97b956
",
registry = "k8s.gcr.io",
registry = "k8s.gcr.io",
repository = "debian-hyperkube-base-amd64",
repository = "debian-hyperkube-base-amd64",
tag = "0.10", # ignored, but kept here for documentation
tag = "0.10
.1
", # ignored, but kept here for documentation
)
)
docker_pull(
docker_pull(
...
...
cluster/images/hyperkube/Makefile
View file @
37bb0139
...
@@ -22,7 +22,7 @@ ARCH?=amd64
...
@@ -22,7 +22,7 @@ ARCH?=amd64
OUT_DIR
?=
_output
OUT_DIR
?=
_output
HYPERKUBE_BIN
?=
$(
shell
pwd
)
/../../../
$(OUT_DIR)
/dockerized/bin/linux/
$(ARCH)
/hyperkube
HYPERKUBE_BIN
?=
$(
shell
pwd
)
/../../../
$(OUT_DIR)
/dockerized/bin/linux/
$(ARCH)
/hyperkube
BASEIMAGE
=
k8s.gcr.io/debian-hyperkube-base-
$(ARCH)
:0.10
BASEIMAGE
=
k8s.gcr.io/debian-hyperkube-base-
$(ARCH)
:0.10
.1
TEMP_DIR
:=
$(
shell
mktemp
-d
-t
hyperkubeXXXXXX
)
TEMP_DIR
:=
$(
shell
mktemp
-d
-t
hyperkubeXXXXXX
)
all
:
build
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