kite 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d029f893bc9f787beff2681b15c0b6ab31371b70
-  data.tar.gz: 406a1dc3d0a397bba6e2dae0983d464a9ce7b791
+  metadata.gz: '0499a1f48e1e1ff191047b0a757469b537cebf0a'
+  data.tar.gz: c562a68c9cf7c851f5088ac6413a2b7d756e0c65
 SHA512:
-  metadata.gz: 4247ff2253a5ff7d392b820cd3cd8c329f8a23159017ca4359072102e2bf57bb2fee91b28401371eb4c658f7cbc390faede99486323b2485b7944f456b54ccd3
-  data.tar.gz: 1e4593d77af49accd33e8e6341d250e919034da2358610f9c0ddc08bd3b136cbb2180333776aa35d24c797a55131046d18c34dc84f923a6ce8e37782ebe475b8
+  metadata.gz: cd0754e76c673d8001452b1c053d76c2e4053d0ce916b5df8ab18a2dc92212c5d3e359376cd70df6d5e1160ee33a5f9529cc5f626eb2e926747cb452d1421f70
+  data.tar.gz: 071f54533c2228073440213c31145e42668c510de0fe377f15950fd0c93614575a16abc8a69df9b8e1bf88d553f898c7821a3fe4db5f0991c80529fd98a0dd65

data/.travis.yml

@@ -3,3 +3,5 @@ language: ruby
 rvm:
   - 2.4.0
 before_install: gem install bundler -v 1.14.6
+env:
+  COVERAGE: true

data/CHANGELOG.md

@@ -2,7 +2,31 @@
 
 ## [Unreleased](https://github.com/helios-technologies/kite/tree/HEAD)
 
-[Full Changelog](https://github.com/helios-technologies/kite/compare/v0.0.7...HEAD)
+[Full Changelog](https://github.com/helios-technologies/kite/compare/v0.0.8...HEAD)
+
+**Closed issues:**
+
+- Move bosh\_vars into config/ [\#31](https://github.com/helios-technologies/kite/issues/31)
+
+**Merged pull requests:**
+
+- Improved documentation and kite render flow [\#47](https://github.com/helios-technologies/kite/pull/47) ([vshatravenko](https://github.com/vshatravenko))
+- Added Vault manifest for AWS [\#46](https://github.com/helios-technologies/kite/pull/46) ([vshatravenko](https://github.com/vshatravenko))
+- Added nginx manifest for GCP [\#45](https://github.com/helios-technologies/kite/pull/45) ([vshatravenko](https://github.com/vshatravenko))
+- Removed public IPs from GCP BOSH deployments [\#44](https://github.com/helios-technologies/kite/pull/44) ([vshatravenko](https://github.com/vshatravenko))
+- Add codecov report [\#42](https://github.com/helios-technologies/kite/pull/42) ([calj](https://github.com/calj))
+- Add coverage report [\#41](https://github.com/helios-technologies/kite/pull/41) ([calj](https://github.com/calj))
+- Fixes for GCP provider [\#40](https://github.com/helios-technologies/kite/pull/40) ([vshatravenko](https://github.com/vshatravenko))
+- Conditional terraform network resources [\#39](https://github.com/helios-technologies/kite/pull/39) ([vshatravenko](https://github.com/vshatravenko))
+- Fixed moving scripts to tpl/bin [\#38](https://github.com/helios-technologies/kite/pull/38) ([vshatravenko](https://github.com/vshatravenko))
+- Add task generate command [\#37](https://github.com/helios-technologies/kite/pull/37) ([nmuzychuk](https://github.com/nmuzychuk))
+- Added bootstrap and cleanup scripts [\#34](https://github.com/helios-technologies/kite/pull/34) ([vshatravenko](https://github.com/vshatravenko))
+- Fixed AWS terraform.tfvars rendering [\#33](https://github.com/helios-technologies/kite/pull/33) ([vshatravenko](https://github.com/vshatravenko))
+- Moved things in proper places [\#32](https://github.com/helios-technologies/kite/pull/32) ([vshatravenko](https://github.com/vshatravenko))
+- Connected Vault to Concourse [\#23](https://github.com/helios-technologies/kite/pull/23) ([vshatravenko](https://github.com/vshatravenko))
+
+## [v0.0.8](https://github.com/helios-technologies/kite/tree/v0.0.8) (2017-09-22)
+[Full Changelog](https://github.com/helios-technologies/kite/compare/v0.0.7...v0.0.8)
 
 **Closed issues:**
 
@@ -59,3 +83,6 @@
 [Full Changelog](https://github.com/helios-technologies/kite/compare/v0.0.2...v0.0.3)
 
 ## [v0.0.2](https://github.com/helios-technologies/kite/tree/v0.0.2) (2017-08-24)
+
+
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

data/README.md

@@ -1,9 +1,14 @@
 # Kite
 
 [![Build Status](https://travis-ci.org/helios-technologies/kite.svg?branch=master)](https://travis-ci.org/helios-technologies/kite)
+[![codecov](https://codecov.io/gh/helios-technologies/kite/branch/master/graph/badge.svg)](https://codecov.io/gh/helios-technologies/kite)
+
 
 Kite is a CLI for scaffolding and managing devops modules
 The main purpose is templating of various tools for devops around terraform, bosh, ansible
+Currently Kite support one Stack on both AWS and GCP.
+
+We plan in adding community stack using a simple template repository structure.
 
 ## Installation
 
@@ -23,13 +28,37 @@ Or install it yourself as:
 
 ## Usage
 
-To start using kite from scratch:
-- Create a new kite project, use `kite new`
+To start using kite for bootstraping your infrastructure
+follow the steps below :
+
+### Create your Infrastructure as Code base repository
+
+Create a new kite project using:
+
+```
+$ kite new PROJECT_NAME
+```
+
+### Configure your cloud and credentials
+
 - Fill out the `config/cloud.yml` file with your credentials.
 - For BOSH you'll need an SSH key, to generate one, use `ssh-keygen -f *path_to_key*`
-- Generate the cloud IaC needed with `kite generate --cloud=*aws or gcp*`
-- Continue with instructions from newly generated README.md
 
+### Generate your infrastructure using terraform
+
+Generate the cloud IaC needed with 
+
+```
+$ kite generate --cloud=aws|gcp
+```
+
+you can now review and apply your terraform files.
+
+### Deploy the default stack (BOSH / Concourse / Vault / Kubernetes)
+
+Continue with instructions from newly generated README.md
+
+## Getting help
 
 To list all Kite commands, use
 

data/kite.gemspec

@@ -25,4 +25,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.14"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "simplecov"
+  spec.add_development_dependency "codecov"
 end

data/lib/kite.rb

@@ -9,5 +9,6 @@ require 'kite/error'
 
 require 'kite/base'
 require 'kite/render'
+require 'kite/generate'
 require 'kite/core'
 require 'kite/cloud'

data/lib/kite/core.rb

@@ -10,46 +10,8 @@ module Kite
       target.prepare
     end
 
-    method_option :cloud, type: :string, desc: "Cloud provider", enum: %w{aws gcp}, required: true
-    desc "generate", "Generate Cloud IaC from configuration"
-    # Generates Infrastructure as Code and setup scripts for the given cloud using values from <b>config/cloud.yml</b>
-    def generate()
-      say "Generating Cloud #{ options[:cloud] } IaC", :green
-      @values = parse_cloud_config
-
-      case options[:cloud]
-      when 'aws'
-        directory('aws/terraform',                          'terraform')
-        copy_file('aws/README.md',                          'README.md', force: true)
-
-        template('aws/bosh-install.sh.erb',                 'bin/bosh-install.sh')
-        template('aws/setup-tunnel.sh.erb',                 'bin/setup-tunnel.sh')
-        template('aws/concourse-deploy.sh.erb',             'bin/concourse-deploy.sh')
-        template('aws/set-env.sh.erb',                      'bin/set-env.sh')
-        chmod('bin/bosh-install.sh', 0755)
-        chmod('bin/concourse-deploy.sh', 0755)
-        chmod('bin/setup-tunnel.sh', 0755)
-
-      when 'gcp'
-        directory('gcp/terraform',                          'terraform')
-        copy_file('gcp/README.md',                          'README.md', force: true)
-
-        template('gcp/bosh-install.sh.erb',                 'bin/bosh-install.sh')
-        template('gcp/bosh-vars.yml.erb',                   'bosh-vars.yml')
-        template('gcp/setup-tunnel.sh.erb',                 'bin/setup-tunnel.sh')
-        template('gcp/concourse-deploy.sh.erb',             'bin/concourse-deploy.sh')
-        template('gcp/vault-deploy.sh.erb',                 'bin/vault-deploy.sh')
-        template('gcp/set-env.sh.erb',                      'bin/set-env.sh')
-        chmod('bin/bosh-install.sh', 0755)
-        chmod('bin/concourse-deploy.sh', 0755)
-        chmod('bin/vault-deploy.sh', 0755)
-        chmod('bin/setup-tunnel.sh', 0755)
-
-      else
-        say 'Cloud provider not specified'
-
-      end
-    end
+    desc "generate", "Generate IaC from configuration"
+    subcommand "generate", Kite::Generate
 
     desc 'render MANIFEST', 'Render manifest file from configuration and Terraform output'
     subcommand "render", Kite::Render

data/lib/kite/generate.rb

@@ -0,0 +1,43 @@
+module Kite
+  # Subcommand for rendering manifests, deployments etc.
+  class Generate < Base
+    include Kite::Helpers
+
+    method_option :provider, type: :string, desc: "Cloud provider", enum: %w{aws gcp}, required: true
+    desc "cloud", "Generate cloud IaC from configuration"
+    # Generates Infrastructure as Code and setup scripts for the given cloud using values from <b>config/cloud.yml</b>
+    def cloud()
+      say "Generating cloud #{ options[:provider] } IaC", :green
+      @values = parse_cloud_config
+
+      case options[:provider]
+        when 'aws'
+          directory('aws/terraform',                          'terraform')
+          copy_file('aws/README.md',                          'README.md', force: true)
+
+          directory('aws/bin/base',                           'bin')
+          chmod('bin/bootstrap.sh', 0755)
+          chmod('bin/cleanup.sh', 0755)
+
+        when 'gcp'
+          directory('gcp/terraform',                          'terraform')
+          copy_file('gcp/README.md',                          'README.md', force: true)
+
+
+          directory('gcp/bin/base',                           'bin')
+          chmod('bin/bootstrap.sh', 0755)
+          chmod('bin/cleanup.sh', 0755)
+
+        else
+          say 'Cloud provider not specified'
+
+      end
+    end
+
+    method_option :name, type: :string, desc: "Task name", required: true
+    desc "task", "Generate task IaC from configuration"
+    def task()
+      say "Generating task #{ options[:name] } IaC", :green
+    end
+  end
+end

data/lib/kite/helpers.rb

@@ -28,6 +28,33 @@ module Kite::Helpers
     cloud_config
   end
 
+  # Return public subnet id depending on
+  # whether it's declared in config/cloud.yml or not
+  def conditional_subnet_id(values)
+    subnet_id = values['aws']['public_subnet']['id']
+
+    if subnet_id.empty?
+      '${aws_subnet.platform_dmz.id}'
+    else
+      subnet_id
+    end
+  end
+
+  # Return vpc id depending on
+  # whether it's declared in config/cloud.yml or not
+  def conditional_vpc_id(values)
+    vpc_id = values['aws']['vpc_id']
+
+    if vpc_id.empty?
+      '${aws_vpc.platform.id}'
+    else
+      vpc_id
+    end
+  end
+
+
+
+
   # Returns subnet's IP range slice in a BOSH manifest-compatible way
   def ip_range(subnet, range)
 

data/lib/kite/render.rb

@@ -10,24 +10,36 @@ module Kite
     def manifest(type)
       say "Rendering #{type} manifest", :green
       @values = parse_cloud_config
-      @tf_output = parse_tf_state('terraform/terraform.tfstate')
+      @tf_output = parse_tf_state('terraform/terraform.tfstate') if options[:cloud] == 'aws'
+
+      if options[:cloud] == 'aws'
+        @private_subnet = IPAddr.new(@values['aws']['private_subnet']['network']).to_range.to_a
+      else
+        @private_subnet = IPAddr.new(@values['gcp']['subnet_cidr']).to_range.to_a
+      end
 
       case type
       when "bosh"
-        if options[:cloud] == 'aws'
-          @private_subnet = IPAddr.new(@values['aws']['private_subnet']['network']).to_range.to_a
-        else
-          @private_subnet = IPAddr.new(@values['gcp']['subnet_cidr']).to_range.to_a
-        end
-
         directory("#{options[:cloud]}/deployments/bosh",                          'deployments/bosh')
+        template("#{options[:cloud]}/bosh-vars.yml.erb",                          'config/bosh-vars.yml')
+        copy_file("#{options[:cloud]}/docs/bosh.md",                              "docs/bosh.md")
+        template("#{options[:cloud]}/bin/bosh-install.sh.tt",                     "bin/bosh-install.sh")
+        chmod('bin/bosh-install.sh', 0755)
 
       when "concourse"
-        template("#{options[:cloud]}/deployments/concourse/cloud-config.yml.erb", "deployments/concourse/cloud-config.yml")
-        template("#{options[:cloud]}/deployments/concourse/concourse.yml.erb",    "deployments/concourse/concourse.yml")
+        directory("#{options[:cloud]}/deployments/concourse",                     "deployments/concourse")
+        copy_file("#{options[:cloud]}/docs/concourse.md",                         "docs/concourse.md")
+        template("#{options[:cloud]}/bin/concourse-deploy.sh.tt",                 "bin/concourse-deploy.sh")
+        chmod('bin/concourse-deploy.sh', 0755)
+
       when "vault"
-        copy_file("#{options[:cloud]}/deployments/vault/vault.yml",               "deployments/vault/vault.yml")
-        copy_file("#{options[:cloud]}/vault.md",                                  "docs/vault.md")
+        template("#{options[:cloud]}/deployments/vault/vault.yml.erb",            "deployments/vault/vault.yml")
+        copy_file("#{options[:cloud]}/docs/vault.md",                             "docs/vault.md")
+        template("#{options[:cloud]}/bin/vault-deploy.sh.tt",                     "bin/vault-deploy.sh")
+        chmod('bin/vault-deploy.sh', 0755)
+
+      when "nginx"
+        template("#{options[:cloud]}/deployments/nginx/nginx.yml.erb",            "deployments/nginx/nginx.yml")
 
       else
         say "Manifest type not specified"

data/lib/kite/version.rb

@@ -1,3 +1,3 @@
 module Kite
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/tpl/aws/README.md

@@ -1,29 +1,29 @@
-BOSH Director & Concourse Bootstrap
-===================================
+## AWS Cloud
 
-This project achieves the following:
+### Setup
 
-- Preparation of an AWS environment for BOSH & Concourse
-- Deployment of a new BOSH Director using bosh-init
-- Deployment of a new Concourse cluster, or standalone server
+Apply terraform code
+```
+pushd terraform && terraform init && terraform apply && popd
+```
 
-Terraform is used to setup the base network and security infrastructure, including an ELB for Concourse.
+Render BOSH manifest and related files
+```
+kite render manifest bosh --cloud aws
+```
 
-Requirements
------
+Prepare BOSH environment using instructions from [docs/bosh.md](docs/bosh.md)
 
-- Install [terraform](https://www.terraform.io/intro/getting-started/install.html)
-- Install [bosh](https://bosh.io/docs/cli-v2.html#install)
+Render Vault deployment
+```
+kite render manifest vault --cloud aws
+```
 
-Usage
------
+Follow instructions from [docs/vault.md](docs/vault.md) to deploy Vault
 
-To deploy a BOSH Director:
-- Apply the terraform IaC from `terraform` folder
-- Run `source bin/setup-tunnel.sh` to create an SSH CLI tunnel
-- Run `kite render manifest bosh --cloud=aws` to render BOSH deployment files
-- Run `bin/bosh-install.sh` to deploy the BOSH Director
+Render Concourse manifest
+```
+kite render manifest concourse --cloud aws
+```
 
-To access BOSH Director information, use bosh -e *bosh_name* env
-
-To connect to Bastion over SSH, use ssh jumpbox@*bastion ip* -i jumpbox.key
+Follow instructions from [docs/concourse.md](docs/concourse.md) to deploy Concourse

data/tpl/aws/bin/base/bootstrap.sh

@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+
+set -xe
+
+# Apply Terraform IaC
+pushd terraform
+
+terraform init
+terraform apply
+
+popd
+
+# Set up an SSH tunnel to Bastion
+. bin/setup-tunnel.sh
+
+# Render BOSH manifest and related files
+kite render manifest bosh --cloud aws
+
+# Deploy BOSH Director
+./bin/bosh-install.sh
+
+# Set the needed environment variables
+. bin/set-env.sh
+
+# Render Vault manifest
+kite render manifest vault --cloud aws
+
+# Deploy Vault
+./bin/vault-deploy.sh
+
+# Render Concourse manifest and related files
+kite render manifest concourse --cloud aws
+
+# Deploy Concourse
+./bin/concourse-deploy.sh

data/tpl/aws/bin/base/cleanup.sh.tt

@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+# Remove existing BOSH deployments
+bosh -e <%= @values['bosh']['name'] %> -d concourse deld
+
+# Destroy BOSH director
+bosh delete-env deployments/bosh/bosh.yml \
+  --state=config/state.json \
+  --vars-store=config/creds.yml \
+  --vars-file=config/bosh-vars.yml \
+  --var-file private_key=<%= @values['kite']['private_key_path'] %> \
+  -o deployments/bosh/cpi.yml \
+  -o deployments/bosh/jumpbox-user.yml
+
+# Destroy Terraform-generated infrastructure
+pushd terraform && terraform destroy && popd
+
+# Remove files generated by kite
+rm -rf terraform deployments config/{creds.yml,bosh_vars.yml,jumpbox.key} bin/*.sh

data/tpl/aws/{bosh-install.sh.erb → bin/bosh-install.sh.tt}

@@ -6,7 +6,7 @@ set -xe
 bosh create-env deployments/bosh/bosh.yml \
   --state=config/state.json \
   --vars-store=config/creds.yml \
-  --vars-file=deployments/bosh/bosh_vars.yml \
+  --vars-file=config/bosh-vars.yml \
   --var-file private_key=<%= @values['kite']['private_key_path'] %> \
   -o deployments/bosh/cpi.yml \
   -o deployments/bosh/jumpbox-user.yml
@@ -16,7 +16,7 @@ bosh alias-env <%= @values['bosh']['name'] %> \
   -e <%= @values['bosh']['static_ip'] %>  \
   --ca-cert <(bosh int ./config/creds.yml --path /director_ssl/ca)
 
-bosh -e <%= @values['bosh']['name'] %> ucc deployments/bosh/cloud_config.yml
+bosh -e <%= @values['bosh']['name'] %> ucc deployments/bosh/cloud-config.yml
 
 # Get jumpbox user key
 bosh int config/creds.yml --path /jumpbox_ssh/private_key > config/jumpbox.key