github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-12 13:31:52 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #7344 from roberthbailey/google-storage-ssl

Browse Source 
Fetch resources from storage.googleapis.com over SSL.
This commit is contained in:
Brendan Burns 2015-04-27 12:24:46 -07:00
commit a02823c0db
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/images/hyperkube/Makefile
View File

@ -3,7 +3,7 @@
VERSION=v0.14.2 VERSION=v0.14.2
all: all:
curl -O http://storage.googleapis.com/kubernetes-release/release/${VERSION}/bin/linux/amd64/hyperkube curl -O https://storage.googleapis.com/kubernetes-release/release/${VERSION}/bin/linux/amd64/hyperkube
docker build -t gcr.io/google_containers/hyperkube:${VERSION} . docker build -t gcr.io/google_containers/hyperkube:${VERSION} .
gcloud preview docker push gcr.io/google_containers/hyperkube:${VERSION} gcloud preview docker push gcr.io/google_containers/hyperkube:${VERSION}

2
cluster/rackspace/cloud-config/master-cloud-config.yaml
View File

@ -118,7 +118,7 @@ coreos:
Documentation=https://github.com/kelseyhightower/kube-register Documentation=https://github.com/kelseyhightower/kube-register
[Service] [Service]
ExecStartPre=/usr/bin/wget -N -P /opt/bin http://storage.googleapis.com/kubernetes/kube-register ExecStartPre=/usr/bin/wget -N -P /opt/bin https://storage.googleapis.com/kubernetes/kube-register
ExecStartPre=/usr/bin/chmod +x /opt/bin/kube-register ExecStartPre=/usr/bin/chmod +x /opt/bin/kube-register
ExecStart=/opt/bin/kube-register \ ExecStart=/opt/bin/kube-register \
--metadata=kubernetes_role=minion \ --metadata=kubernetes_role=minion \