
Squashed commit of the following:
commit dedaccffdc1d797b5f23e0004280c2fcc0ecffa9
Merge: 24c3585 f03a267
Author: Matt Bruzek <matthew.bruzek@canonical.com>
Date: Tue Sep 15 17:07:42 2015 -0500
Merge branch 'master' of github.com:kubernetes/kubernetes into enable-ssl
commit 24c358566cc0963fb86dc057db15739f031ba6f6
Author: Matt Bruzek <matthew.bruzek@canonical.com>
Date: Tue Sep 15 16:44:58 2015 -0500
Fixing problems with verify-boilerplate.
commit a64443352c64498255ac98fc0da1a7d8d5934485
Merge: f152794 ee3f662
Author: Matt Bruzek <matthew.bruzek@canonical.com>
Date: Tue Sep 15 15:43:08 2015 -0500
Merge branch 'enable-ssl' of github.com:mbruzek/kubernetes into enable-ssl
Conflicts:
cluster/juju/util.sh
commit f152794502c017ae7d3cff0351d8bf44b7311883
Author: Matt Bruzek <matthew.bruzek@canonical.com>
Date: Wed Sep 9 14:12:21 2015 -0500
Fixes for problems found in testing.
commit 94effa4827d5f30c60621e9133c4526c187e40b4
Author: Matt Bruzek <matthew.bruzek@canonical.com>
Date: Wed Sep 9 12:34:37 2015 -0500
Making updates for changes in master branch.
commit a81795b44e57d54b8b4ae486ca6ea8164ac8fc6b
Author: Matt Bruzek <matthew.bruzek@canonical.com>
Date: Wed Sep 9 11:39:36 2015 -0500
pep8 fix
commit 53a862caea02c4b35f8cd19b1549fda29e040f12
Author: Matt Bruzek <matthew.bruzek@canonical.com>
Date: Wed Sep 9 11:37:31 2015 -0500
Adding diagnostic log messages and reloading nginx.
commit 96411a924fb05e2e58534cce94d9a1e51d7db9af
Author: Matt Bruzek <matthew.bruzek@canonical.com>
Date: Wed Sep 9 11:19:31 2015 -0500
Making the check user logic cleaner.
commit a0243b34cdda2f865e559bd4812c5a78ab6f6f05
Author: Matt Bruzek <matthew.bruzek@canonical.com>
Date: Wed Sep 9 11:18:04 2015 -0500
Open port 6443 for ssl enablement.
commit e8423614763aa6d650089c735c3dc1893bf73993
Author: Matt Bruzek <matthew.bruzek@canonical.com>
Date: Wed Sep 9 11:16:54 2015 -0500
Generating certificates and adding config options.
commit 6570a818e252f2cb156a577094ba987dec834fe1
Author: Matt Bruzek <matthew.bruzek@canonical.com>
Date: Wed Sep 9 11:14:56 2015 -0500
Removing the http configuration adding https config.
commit e624bd79f8840b71b141a111bca7c6091b677575
Author: Matt Bruzek <matthew.bruzek@canonical.com>
Date: Wed Sep 9 11:13:04 2015 -0500
Changed the distribution nginx config slightly.
commit c497911170268ee75bed53afeb5fa32ff44c82af
Author: Matt Bruzek <matthew.bruzek@canonical.com>
Date: Wed Sep 9 10:57:17 2015 -0500
Adding the crt and key to the apiserver flags.
commit 6c1e76c5de31eb4d0f800065ce4bc96a82801846
Author: Matt Bruzek <matthew.bruzek@canonical.com>
Date: Wed Sep 9 10:56:15 2015 -0500
Adding the cert and key configuration parameters.
commit 55da910d473efa0be0af5efccf2336612525986e
Author: Matt Bruzek <matthew.bruzek@canonical.com>
Date: Wed Sep 9 10:49:46 2015 -0500
Adding a requirements file to install path.py with pip -r
commit 27a39686af89e134268be50ce5e4fc36cffdf2b3
Author: Matt Bruzek <matthew.bruzek@canonical.com>
Date: Fri Aug 21 16:34:56 2015 -0500
Making the install hook idempotent.
commit ee3f66287ba045592f932c3a41aeb8e0167a9235
Author: Matt Bruzek <matthew.bruzek@canonical.com>
Date: Wed Sep 9 14:12:21 2015 -0500
Fixes for problems found in testing.
commit 3dfdbb0e21d79da66617f7a29e6dd8d977528057
Author: Matt Bruzek <matthew.bruzek@canonical.com>
Date: Wed Sep 9 12:34:37 2015 -0500
Making updates for changes in master branch.
commit df9c297fe27c63713fc0d7dbd461b2d47133614c
Author: Matt Bruzek <matthew.bruzek@canonical.com>
Date: Wed Sep 9 11:39:36 2015 -0500
pep8 fix
commit 645b25d9cc84555ca7af5c75e3f0b1300aaa9f48
Author: Matt Bruzek <matthew.bruzek@canonical.com>
Date: Wed Sep 9 11:37:31 2015 -0500
Adding diagnostic log messages and reloading nginx.
commit 57654320bd73dc4dd52d6d56021d40a97c6ed893
Author: Matt Bruzek <matthew.bruzek@canonical.com>
Date: Wed Sep 9 11:37:02 2015 -0500
Removing xtrace.
commit a0e8cd98353e7cd411786bc8836fe99a77cde3ba
Author: Matt Bruzek <matthew.bruzek@canonical.com>
Date: Wed Sep 9 11:19:31 2015 -0500
Making the check user logic cleaner.
commit 6c6eb7ff02d6dbf66d3175b715e957b00a861525
Author: Matt Bruzek <matthew.bruzek@canonical.com>
Date: Wed Sep 9 11:18:04 2015 -0500
Open port 6443 for ssl enablement.
commit 29f18cc95ff96de1a48f72af2cff2e37420a43c7
Author: Matt Bruzek <matthew.bruzek@canonical.com>
Date: Wed Sep 9 11:16:54 2015 -0500
Generating certificates and adding config options.
commit c9bdaa499552980153ff263a1ab9b4fa73a0536a
Author: Matt Bruzek <matthew.bruzek@canonical.com>
Date: Wed Sep 9 11:14:56 2015 -0500
Removing the http configuration adding https config.
commit ec33e66a159a4b44207353b16741c7fad2e4ee0d
Author: Matt Bruzek <matthew.bruzek@canonical.com>
Date: Wed Sep 9 11:13:04 2015 -0500
Changed the distribution nginx config slightly.
commit 96dc16879c0dd230569ceb928f9f7bf92ff8ab3f
Author: Matt Bruzek <matthew.bruzek@canonical.com>
Date: Wed Sep 9 10:57:17 2015 -0500
Adding the crt and key to the apiserver flags.
commit 308799502c0a22f214408395f5efa4821d075374
Author: Matt Bruzek <matthew.bruzek@canonical.com>
Date: Wed Sep 9 10:56:15 2015 -0500
Adding the cert and key configuration parameters.
commit 7f407a4356de8703ff2f237432084f35910d8abd
Author: Matt Bruzek <matthew.bruzek@canonical.com>
Date: Wed Sep 9 10:49:46 2015 -0500
Adding a requirements file to install path.py with pip -r
commit f800ae1152076758d4db203fdbecf6d945c0e892
Author: Matt Bruzek <matthew.bruzek@canonical.com>
Date: Fri Aug 21 16:34:56 2015 -0500
Making the install hook idempotent.
Resolving verification problems.
108 lines
4.0 KiB
Python
108 lines
4.0 KiB
Python
#!/usr/bin/env python
|
|
|
|
# Copyright 2015 The Kubernetes Authors All rights reserved.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
import os
|
|
import shlex
|
|
import subprocess
|
|
from path import Path
|
|
|
|
|
|
def run(command, shell=False):
|
|
""" A convience method for executing all the commands. """
|
|
print(command)
|
|
if shell is False:
|
|
command = shlex.split(command)
|
|
output = subprocess.check_output(command, shell=shell)
|
|
print(output)
|
|
return output
|
|
|
|
|
|
class KubernetesInstaller():
|
|
"""
|
|
This class contains the logic needed to install kuberentes binary files.
|
|
"""
|
|
|
|
def __init__(self, arch, version, output_dir):
|
|
""" Gather the required variables for the install. """
|
|
# The kubernetes-master charm needs certain commands to be aliased.
|
|
self.aliases = {'kube-apiserver': 'apiserver',
|
|
'kube-controller-manager': 'controller-manager',
|
|
'kube-proxy': 'kube-proxy',
|
|
'kube-scheduler': 'scheduler',
|
|
'kubectl': 'kubectl',
|
|
'kubelet': 'kubelet'}
|
|
self.arch = arch
|
|
self.version = version
|
|
self.output_dir = Path(output_dir)
|
|
|
|
def build(self, branch):
|
|
""" Build kubernetes from a github repository using the Makefile. """
|
|
# Remove any old build artifacts.
|
|
make_clean = 'make clean'
|
|
run(make_clean)
|
|
# Always checkout the master to get the latest repository information.
|
|
git_checkout_cmd = 'git checkout master'
|
|
run(git_checkout_cmd)
|
|
# When checking out a tag, delete the old branch (not master).
|
|
if branch != 'master':
|
|
git_drop_branch = 'git branch -D {0}'.format(self.version)
|
|
print(git_drop_branch)
|
|
rc = subprocess.call(git_drop_branch.split())
|
|
if rc != 0:
|
|
print('returned: %d' % rc)
|
|
# Make sure the git repository is up-to-date.
|
|
git_fetch = 'git fetch origin {0}'.format(branch)
|
|
run(git_fetch)
|
|
|
|
if branch == 'master':
|
|
git_reset = 'git reset --hard origin/master'
|
|
run(git_reset)
|
|
else:
|
|
# Checkout a branch of kubernetes so the repo is correct.
|
|
checkout = 'git checkout -b {0} {1}'.format(self.version, branch)
|
|
run(checkout)
|
|
|
|
# Create an environment with the path to the GO binaries included.
|
|
go_path = ('/usr/local/go/bin', os.environ.get('PATH', ''))
|
|
go_env = os.environ.copy()
|
|
go_env['PATH'] = ':'.join(go_path)
|
|
print(go_env['PATH'])
|
|
|
|
# Compile the binaries with the make command using the WHAT variable.
|
|
make_what = "make all WHAT='cmd/kube-apiserver cmd/kubectl "\
|
|
"cmd/kube-controller-manager plugin/cmd/kube-scheduler "\
|
|
"cmd/kubelet cmd/kube-proxy'"
|
|
print(make_what)
|
|
rc = subprocess.call(shlex.split(make_what), env=go_env)
|
|
|
|
def install(self, install_dir=Path('/usr/local/bin')):
|
|
""" Install kubernetes binary files from the output directory. """
|
|
|
|
if not install_dir.isdir():
|
|
install_dir.makedirs_p()
|
|
|
|
# Create the symbolic links to the real kubernetes binaries.
|
|
for key, value in self.aliases.iteritems():
|
|
target = self.output_dir / key
|
|
if target.exists():
|
|
link = install_dir / value
|
|
if link.exists():
|
|
link.remove()
|
|
target.symlink(link)
|
|
else:
|
|
print('Error target file {0} does not exist.'.format(target))
|
|
exit(1)
|