github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 11:21:47 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #24218 from jimmyjones2/hyperkube-container-behind-proxy

Browse Source 
Automatic merge from submit-queue

Add easy-rsa to hyperkube container

Otherwise gets downloaded a runtime, which kind of breaks the container model.

See [comment](https://github.com/kubernetes/kubernetes/issues/20514#issuecomment-195835786) in #20514 - this causes dockerized install of k8s to fail if you're behind a proxy. make-ca-cert.sh already looks for a local copy of easy-rsa.tar.gz before downloading it, so this drops the tarball in the expected place in the container.
This commit is contained in:
k8s-merge-robot 2016-04-17 06:32:37 -07:00
commit 031c1ea398
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cluster/images/hyperkube/Dockerfile
View File

@ -50,6 +50,9 @@ COPY safe_format_and_mount /usr/share/google/safe_format_and_mount
COPY setup-files.sh /setup-files.sh
COPY make-ca-cert.sh /make-ca-cert.sh
# easy-rsa package required by make-ca-cert
ADD https://storage.googleapis.com/kubernetes-release/easy-rsa/easy-rsa.tar.gz /root/kube/
# Make scripts executable
RUN chmod a+rx \
/hyperkube \