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
4274c426
Commit
4274c426
authored
Sep 28, 2018
by
Benjamin Elder
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add nsswitch to busybox control plane images
parent
5f7e1b55
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
26 additions
and
6 deletions
+26
-6
BUILD
build/BUILD
+14
-4
release.sh
build/lib/release.sh
+10
-2
nsswitch.conf
build/nsswitch.conf
+2
-0
No files found.
build/BUILD
View file @
4274c426
package(default_visibility = ["//visibility:public"])
package(default_visibility = ["//visibility:public"])
load("@io_bazel_rules_docker//docker:docker.bzl", "docker_build", "docker_bundle")
load("@io_bazel_rules_docker//docker:docker.bzl", "docker_build", "docker_bundle")
load("@io_bazel_rules_docker//container:container.bzl", "container_image")
load("@io_kubernetes_build//defs:build.bzl", "release_filegroup")
load("@io_kubernetes_build//defs:build.bzl", "release_filegroup")
filegroup(
filegroup(
...
@@ -21,23 +22,32 @@ filegroup(
...
@@ -21,23 +22,32 @@ filegroup(
tags = ["automanaged"],
tags = ["automanaged"],
)
)
# ensure /etc/nsswitch.conf exists so go's resolver respects /etc/hosts
container_image(
name = "busybox-with-nsswitch",
base = "@official_busybox//image",
directory = "/etc",
files = ["nsswitch.conf"],
mode = "0644",
)
# This list should roughly match kube::build::get_docker_wrapped_binaries()
# This list should roughly match kube::build::get_docker_wrapped_binaries()
# in build/common.sh.
# in build/common.sh.
DOCKERIZED_BINARIES = {
DOCKERIZED_BINARIES = {
"cloud-controller-manager": {
"cloud-controller-manager": {
"base": "
@official_busybox//image
",
"base": "
:busybox-with-nsswitch
",
"target": "//cmd/cloud-controller-manager:cloud-controller-manager",
"target": "//cmd/cloud-controller-manager:cloud-controller-manager",
},
},
"kube-apiserver": {
"kube-apiserver": {
"base": "
@official_busybox//image
",
"base": "
:busybox-with-nsswitch
",
"target": "//cmd/kube-apiserver:kube-apiserver",
"target": "//cmd/kube-apiserver:kube-apiserver",
},
},
"kube-controller-manager": {
"kube-controller-manager": {
"base": "
@official_busybox//image
",
"base": "
:busybox-with-nsswitch
",
"target": "//cmd/kube-controller-manager:kube-controller-manager",
"target": "//cmd/kube-controller-manager:kube-controller-manager",
},
},
"kube-scheduler": {
"kube-scheduler": {
"base": "
@official_busybox//image
",
"base": "
:busybox-with-nsswitch
",
"target": "//cmd/kube-scheduler:kube-scheduler",
"target": "//cmd/kube-scheduler:kube-scheduler",
},
},
"kube-proxy": {
"kube-proxy": {
...
...
build/lib/release.sh
View file @
4274c426
...
@@ -355,8 +355,16 @@ function kube::release::create_docker_images_for_server() {
...
@@ -355,8 +355,16 @@ function kube::release::create_docker_images_for_server() {
rm
-rf
"
${
docker_build_path
}
"
rm
-rf
"
${
docker_build_path
}
"
mkdir
-p
"
${
docker_build_path
}
"
mkdir
-p
"
${
docker_build_path
}
"
ln
"
${
binary_dir
}
/
${
binary_name
}
"
"
${
docker_build_path
}
/
${
binary_name
}
"
ln
"
${
binary_dir
}
/
${
binary_name
}
"
"
${
docker_build_path
}
/
${
binary_name
}
"
printf
" FROM
${
base_image
}
\n
ADD
${
binary_name
}
/usr/local/bin/
${
binary_name
}
\n
"
>
"
${
docker_file_path
}
"
ln
"
${
KUBE_ROOT
}
/build/nsswitch.conf"
"
${
docker_build_path
}
/nsswitch.conf"
chmod
0644
"
${
docker_build_path
}
/nsswitch.conf"
cat
<<
EOF
> "
${
docker_file_path
}
"
FROM
${
base_image
}
COPY
${
binary_name
}
/usr/local/bin/
${
binary_name
}
EOF
# ensure /etc/nsswitch.conf exists so go's resolver respects /etc/hosts
if
[[
"
${
base_image
}
"
=
~ busybox
]]
;
then
echo
"COPY nsswitch.conf /etc/"
>>
"
${
docker_file_path
}
"
fi
"
${
DOCKER
[@]
}
"
build
--pull
-q
-t
"
${
docker_image_tag
}
"
"
${
docker_build_path
}
"
>
/dev/null
"
${
DOCKER
[@]
}
"
build
--pull
-q
-t
"
${
docker_image_tag
}
"
"
${
docker_build_path
}
"
>
/dev/null
"
${
DOCKER
[@]
}
"
tag
"
${
docker_image_tag
}
"
"
${
deprecated_image_tag
}
"
>
/dev/null
"
${
DOCKER
[@]
}
"
tag
"
${
docker_image_tag
}
"
"
${
deprecated_image_tag
}
"
>
/dev/null
"
${
DOCKER
[@]
}
"
save
"
${
docker_image_tag
}
"
"
${
deprecated_image_tag
}
"
>
"
${
binary_dir
}
/
${
binary_name
}
.tar"
"
${
DOCKER
[@]
}
"
save
"
${
docker_image_tag
}
"
"
${
deprecated_image_tag
}
"
>
"
${
binary_dir
}
/
${
binary_name
}
.tar"
...
...
build/nsswitch.conf
0 → 100644
View file @
4274c426
# ensure go's non-cgo resolver respects /etc/hosts
hosts
:
files
dns
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