mirror of
https://github.com/kubernetes/kubernetes.git
synced 2026-05-04 17:24:25 -04:00
Squashed commit of the following: commit dedaccffdc1d797b5f23e0004280c2fcc0ecffa9 Merge:24c3585f03a267Author: 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 commit24c358566cAuthor: Matt Bruzek <matthew.bruzek@canonical.com> Date: Tue Sep 15 16:44:58 2015 -0500 Fixing problems with verify-boilerplate. commita64443352cMerge:f152794ee3f662Author: 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 commitf152794502Author: Matt Bruzek <matthew.bruzek@canonical.com> Date: Wed Sep 9 14:12:21 2015 -0500 Fixes for problems found in testing. commit94effa4827Author: Matt Bruzek <matthew.bruzek@canonical.com> Date: Wed Sep 9 12:34:37 2015 -0500 Making updates for changes in master branch. commita81795b44eAuthor: Matt Bruzek <matthew.bruzek@canonical.com> Date: Wed Sep 9 11:39:36 2015 -0500 pep8 fix commit53a862caeaAuthor: Matt Bruzek <matthew.bruzek@canonical.com> Date: Wed Sep 9 11:37:31 2015 -0500 Adding diagnostic log messages and reloading nginx. commit96411a924fAuthor: Matt Bruzek <matthew.bruzek@canonical.com> Date: Wed Sep 9 11:19:31 2015 -0500 Making the check user logic cleaner. commita0243b34cdAuthor: Matt Bruzek <matthew.bruzek@canonical.com> Date: Wed Sep 9 11:18:04 2015 -0500 Open port 6443 for ssl enablement. commite842361476Author: Matt Bruzek <matthew.bruzek@canonical.com> Date: Wed Sep 9 11:16:54 2015 -0500 Generating certificates and adding config options. commit6570a818e2Author: Matt Bruzek <matthew.bruzek@canonical.com> Date: Wed Sep 9 11:14:56 2015 -0500 Removing the http configuration adding https config. commite624bd79f8Author: Matt Bruzek <matthew.bruzek@canonical.com> Date: Wed Sep 9 11:13:04 2015 -0500 Changed the distribution nginx config slightly. commitc497911170Author: Matt Bruzek <matthew.bruzek@canonical.com> Date: Wed Sep 9 10:57:17 2015 -0500 Adding the crt and key to the apiserver flags. commit6c1e76c5deAuthor: Matt Bruzek <matthew.bruzek@canonical.com> Date: Wed Sep 9 10:56:15 2015 -0500 Adding the cert and key configuration parameters. commit55da910d47Author: 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 commit27a39686afAuthor: Matt Bruzek <matthew.bruzek@canonical.com> Date: Fri Aug 21 16:34:56 2015 -0500 Making the install hook idempotent. commitee3f66287bAuthor: Matt Bruzek <matthew.bruzek@canonical.com> Date: Wed Sep 9 14:12:21 2015 -0500 Fixes for problems found in testing. commit3dfdbb0e21Author: Matt Bruzek <matthew.bruzek@canonical.com> Date: Wed Sep 9 12:34:37 2015 -0500 Making updates for changes in master branch. commitdf9c297fe2Author: Matt Bruzek <matthew.bruzek@canonical.com> Date: Wed Sep 9 11:39:36 2015 -0500 pep8 fix commit645b25d9ccAuthor: Matt Bruzek <matthew.bruzek@canonical.com> Date: Wed Sep 9 11:37:31 2015 -0500 Adding diagnostic log messages and reloading nginx. commit57654320bdAuthor: Matt Bruzek <matthew.bruzek@canonical.com> Date: Wed Sep 9 11:37:02 2015 -0500 Removing xtrace. commita0e8cd9835Author: Matt Bruzek <matthew.bruzek@canonical.com> Date: Wed Sep 9 11:19:31 2015 -0500 Making the check user logic cleaner. commit6c6eb7ff02Author: Matt Bruzek <matthew.bruzek@canonical.com> Date: Wed Sep 9 11:18:04 2015 -0500 Open port 6443 for ssl enablement. commit29f18cc95fAuthor: Matt Bruzek <matthew.bruzek@canonical.com> Date: Wed Sep 9 11:16:54 2015 -0500 Generating certificates and adding config options. commitc9bdaa4995Author: Matt Bruzek <matthew.bruzek@canonical.com> Date: Wed Sep 9 11:14:56 2015 -0500 Removing the http configuration adding https config. commitec33e66a15Author: Matt Bruzek <matthew.bruzek@canonical.com> Date: Wed Sep 9 11:13:04 2015 -0500 Changed the distribution nginx config slightly. commit96dc16879cAuthor: Matt Bruzek <matthew.bruzek@canonical.com> Date: Wed Sep 9 10:57:17 2015 -0500 Adding the crt and key to the apiserver flags. commit308799502cAuthor: Matt Bruzek <matthew.bruzek@canonical.com> Date: Wed Sep 9 10:56:15 2015 -0500 Adding the cert and key configuration parameters. commit7f407a4356Author: 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 commitf800ae1152Author: Matt Bruzek <matthew.bruzek@canonical.com> Date: Fri Aug 21 16:34:56 2015 -0500 Making the install hook idempotent. Resolving verification problems.
16 lines
621 B
Bash
16 lines
621 B
Bash
#!/bin/bash
|
|
|
|
# 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.
|
|
|