• R/O
  • HTTP
  • SSH
  • HTTPS

grid-chef-repo: コミット

Grid環境構築用のChefリポジトリです。


コミットメタ情報

リビジョン741222e453a17e78e3305b2227fae2ee639d148a (tree)
日時2017-01-27 22:12:36
作者whitestar <whitestar@gaea...>
コミッターwhitestar

ログメッセージ

adds the kubernetes-grid::gp-node recipe.

変更サマリ

差分

--- a/cookbooks/kubernetes-grid/CHANGELOG.md
+++ b/cookbooks/kubernetes-grid/CHANGELOG.md
@@ -1,5 +1,9 @@
11 # kubernetes-grid CHANGELOG
22
3+0.1.1
4+-----
5+- adds the `kubernetes-grid::gp-node` recipe.
6+
37 0.1.0
48 -----
59 - Initial release of kubernetes-grid
--- a/cookbooks/kubernetes-grid/README.md
+++ b/cookbooks/kubernetes-grid/README.md
@@ -50,6 +50,10 @@ This cookbook sets up Kubernetes cluster.
5050
5151 This recipe does nothing.
5252
53+#### kubernetes-grid::gp-node
54+
55+This recipe sets up a general-purpose (GP) node (master or worker).
56+
5357 #### kubernetes-grid::master
5458
5559 This recipe sets up a master node.
--- a/cookbooks/kubernetes-grid/metadata.rb
+++ b/cookbooks/kubernetes-grid/metadata.rb
@@ -5,7 +5,7 @@ maintainer_email ''
55 license 'Apache 2.0'
66 description 'Installs/Configures Kubernetes'
77 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
8-version '0.1.0'
8+version '0.1.1'
99
1010 source_url 'http://scm.osdn.jp/gitroot/metasearch/grid-chef-repo.git'
1111 issues_url 'https://osdn.jp/projects/metasearch/ticket'
--- /dev/null
+++ b/cookbooks/kubernetes-grid/recipes/gp-node.rb
@@ -0,0 +1,23 @@
1+#
2+# Cookbook Name:: kubernetes-grid
3+# Recipe:: gp-node
4+#
5+# Copyright 2017, whitestar
6+#
7+# Licensed under the Apache License, Version 2.0 (the "License");
8+# you may not use this file except in compliance with the License.
9+# You may obtain a copy of the License at
10+#
11+# http://www.apache.org/licenses/LICENSE-2.0
12+#
13+# Unless required by applicable law or agreed to in writing, software
14+# distributed under the License is distributed on an "AS IS" BASIS,
15+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+# See the License for the specific language governing permissions and
17+# limitations under the License.
18+#
19+
20+# http://kubernetes.io/docs/getting-started-guides/kubeadm/
21+
22+include_recipe 'kubernetes-grid::master'
23+include_recipe 'kubernetes-grid::node'
--- a/cookbooks/kubernetes-grid/recipes/node-commons.rb
+++ b/cookbooks/kubernetes-grid/recipes/node-commons.rb
@@ -19,12 +19,19 @@
1919
2020 # http://kubernetes.io/docs/getting-started-guides/kubeadm/
2121
22+::Chef::Recipe.send(:include, PlatformUtils::VirtUtils)
23+
2224 if node['kubernetes-grid']['docker-engine']['setup']
2325 include_recipe 'docker-grid::engine'
2426 end
2527
2628 case node['platform_family']
2729 when 'rhel'
30+=begin
31+ if container_guest_node?
32+ # TODO:
33+ end
34+=end
2835 disable_selinux = 'disable_selinux'
2936 resources(execute: disable_selinux) rescue execute disable_selinux do
3037 user 'root'
@@ -53,6 +60,17 @@ when 'rhel'
5360 notifies :run, 'execute[yum_makecache_kubernetes]', :immediately
5461 end
5562 when 'debian'
63+ if container_guest_node?
64+ Chef::Log.warn(
65+ 'This node is running in the Linux container, Chef installs the linux-image. ' \
66+ 'See https://github.com/kubernetes/kubernetes/issues/39282'
67+ )
68+ kern_pkg = "linux-image-#{node['kernel']['release']}"
69+ resources(package: kern_pkg) rescue package kern_pkg do
70+ action :install
71+ end
72+ end
73+
5674 [
5775 'curl',
5876 ].each {|pkg|
--- /dev/null
+++ b/nodes/local-kube-gp-node.json
@@ -0,0 +1,5 @@
1+{
2+ "run_list": [
3+ "role[kube-gp-node]"
4+ ]
5+}
--- /dev/null
+++ b/roles/kube-gp-node.rb
@@ -0,0 +1,17 @@
1+cluster_name = 'kube'
2+
3+name "#{cluster_name}-gp-node"
4+description "#{cluster_name} cluster general-purpose node"
5+
6+run_list(
7+ "role[#{cluster_name}]",
8+ 'recipe[kubernetes-grid::gp-node]',
9+)
10+
11+#env_run_lists
12+
13+default_attributes(
14+)
15+
16+override_attributes(
17+)
--- /dev/null
+++ b/roles/kube.rb
@@ -0,0 +1,25 @@
1+cluster_name = 'kube'
2+
3+name "#{cluster_name}"
4+description "#{cluster_name} cluster"
5+
6+run_list(
7+)
8+
9+#env_run_lists
10+
11+default_attributes(
12+)
13+
14+override_attributes(
15+ 'docker-grid' => {
16+ 'engine' => {
17+ 'version_on_centos' => '1.11.2-1',
18+ 'version_on_ubuntu' => '1.11.2-0',
19+ 'storage-driver_on_centos' => 'overlay',
20+ 'storage-driver_on_ubuntu' => 'overlay', # default: aufs
21+ #'userns-remap' => 'default',
22+ 'daemon_extra_options' => '-H fd:// --bip=192.168.128.1/24 --fixed-cidr=192.168.128.0/24',
23+ },
24+ },
25+)
旧リポジトリブラウザで表示