kite 0.2.0 → 1.0.0

data/tpl/skel/config/cloud.yml

@@ -1,66 +1,11 @@
-kite:
-  keypair_name: "kitekey"
-  public_key_path: "~/.ssh/kite.key.pub"
-  private_key_path: "~/.ssh/kite.key"
-  bucket_name: "kite-state-project-example"
-
-aws:
-  access_key: "enter your amazon key"
-  secret_key: "enter your secret key"
-  region: "eu-central-1"
-  zone: "eu-central-1a"
-  vpc_name: "platform-tools"
-  vpc_cidr_block: "10.0.0.0/16"
-  vpc_id: "" # submit vpc id if you want to use an existing vpc
-  public_subnet:
-    name: "platform-dmz"
-    gateway: "10.0.10.1"
-    network: "10.0.10.0/26"
-    id: "" # submit id if you want to use an existing public subnet
-  private_subnet:
-    name: "platform-net"
-    gateway: "10.0.20.1"
-    network: "10.0.20.0/26"
-
-gcp:
-  project: "gcp-project"
-  region: "europe-west1"
-  zone: "europe-west1-c"
-  service_account: "~/safe/terraform.json"
-  vpc_name: "platform-tools"
-  subnet_name: "platform-net"
-  subnet_cidr: "10.0.20.0/24"
-  internal_gw: "10.0.20.2"
-
-bosh:
-  name: "bosh-director"
-  static_ip: "10.0.20.10"
-
-k8s:
-  config_path: "~/.kube/config"
-  cluster_address: "k8s.example.com"
-  api_server_address: "https://api.k8s.example.com"
-
-ingress:
-  vip: "42.42.42.42"
-
-vault:
-  hostname: "vault.example.com"
-
-prometheus:
-  hostname: "prometheus.example.com"
-
-grafana:
-  hostname: "grafana.example.com"
-
-alertmanager:
-  hostname: "alertmanager.example.com"
-
-concourse:
-  hostname: "concourse.example.com"
-  url: "https://concourse.example.com"
-  auth_username: "concourse"
-
-oauth:
-  hostname: "oauth.example.com"
-  url: "https://oauth.example.com"
+default: &default
+  region: "us-east1" # Note that region formats differ between AWS and GCP
+  zone: "us-east1-a"
+  gcp:
+    project: "hc-public"
+    service_account: "~/safe/hc-public/terraform.json"
+    bucket_name: "kite-state-helios-devel"
+  aws:
+    access_key: "********************"
+    secret_key: "****************************************"
+    bucket_name: "kite-state-helios-devel"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kite
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Louis Bellet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-07 00:00:00.000000000 Z
+date: 2018-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: git
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +122,7 @@ files:
 - CHANGELOG.md
 - Dockerfile
 - Gemfile
+- LICENSE.md
 - Makefile
 - README.md
 - Rakefile
@@ -122,6 +137,7 @@ files:
 - config/pipelines/tasks/create-repository-tag.yml
 - config/pipelines/tasks/run-master-tests.yml
 - config/pipelines/tasks/run-pr-tests.yml
+- docs/kite-concourse-resource.md
 - kite.gemspec
 - lib/kite.rb
 - lib/kite/base.rb
@@ -131,87 +147,14 @@ files:
 - lib/kite/generate.rb
 - lib/kite/helpers.rb
 - lib/kite/helpers/concourse.rb
-- lib/kite/render.rb
+- lib/kite/module.rb
+- lib/kite/terraform.rb
 - lib/kite/version.rb
-- tpl/aws/README.md
-- tpl/aws/bin/base/bootstrap.sh
-- tpl/aws/bin/base/cleanup.sh.tt
-- tpl/aws/bin/base/set-env.sh.tt
-- tpl/aws/bin/base/setup-tunnel.sh.tt
-- tpl/aws/bin/bosh-install.sh.tt
-- tpl/aws/bin/concourse-deploy.sh.tt
-- tpl/aws/bin/ingress-deploy.sh.tt
-- tpl/aws/bin/ingress-update.sh.tt
-- tpl/aws/bin/kops-delete.sh.erb
-- tpl/aws/bin/kops-deploy.sh.erb
-- tpl/aws/bin/oauth-deploy.sh.tt
-- tpl/aws/bin/prometheus-deploy.sh.tt
-- tpl/aws/bin/vault-deploy.sh.tt
-- tpl/aws/bosh-vars.yml.erb
-- tpl/aws/config/oauth.yml
-- tpl/aws/deployments/bosh/bosh.yml
-- tpl/aws/deployments/bosh/cloud-config.yml.tt
-- tpl/aws/deployments/bosh/cpi.yml
-- tpl/aws/deployments/bosh/jumpbox-user.yml
-- tpl/aws/deployments/concourse/concourse.yml.tt
-- tpl/aws/deployments/ingress/ingress.yml.erb
-- tpl/aws/deployments/oauth/oauth.yml.tt
-- tpl/aws/deployments/prometheus/monitor-bosh.yml
-- tpl/aws/deployments/prometheus/monitor-kubernetes.yml
-- tpl/aws/deployments/prometheus/prometheus.yml.tt
-- tpl/aws/deployments/vault/vault.yml.erb
-- tpl/aws/docs/bosh.md
-- tpl/aws/docs/concourse.md
-- tpl/aws/docs/ingress.md
-- tpl/aws/docs/kops.md
-- tpl/aws/docs/oauth.md
-- tpl/aws/docs/prometheus.md
-- tpl/aws/docs/vault.md
-- tpl/aws/terraform/kite_bucket.tf
-- tpl/aws/terraform/main.tf.tt
-- tpl/aws/terraform/network.tf.tt
-- tpl/aws/terraform/outputs.tf
-- tpl/aws/terraform/terraform.tfvars.tt
-- tpl/aws/terraform/variables.tf
-- tpl/gcp/README.md
-- tpl/gcp/bin/base/bootstrap.sh
-- tpl/gcp/bin/base/cleanup.sh.tt
-- tpl/gcp/bin/base/set-env.sh.tt
-- tpl/gcp/bin/base/setup-tunnel.sh.tt
-- tpl/gcp/bin/bosh-install.sh.tt
-- tpl/gcp/bin/concourse-deploy.sh.tt
-- tpl/gcp/bin/ingress-deploy.sh.tt
-- tpl/gcp/bin/ingress-update.sh.tt
-- tpl/gcp/bin/oauth-deploy.sh.tt
-- tpl/gcp/bin/prometheus-deploy.sh.tt
-- tpl/gcp/bin/vault-deploy.sh.tt
-- tpl/gcp/bosh-vars.yml.erb
-- tpl/gcp/config/oauth.yml
-- tpl/gcp/deployments/bosh/bosh.yml
-- tpl/gcp/deployments/bosh/cloud-config.yml.tt
-- tpl/gcp/deployments/bosh/cpi.yml
-- tpl/gcp/deployments/bosh/jumpbox-user.yml
-- tpl/gcp/deployments/concourse/concourse.yml.tt
-- tpl/gcp/deployments/concourse/test/test-credentials.yml
-- tpl/gcp/deployments/concourse/test/test-pipeline.yml
-- tpl/gcp/deployments/ingress/ingress.yml.erb
-- tpl/gcp/deployments/oauth/oauth.yml.tt
-- tpl/gcp/deployments/prometheus/monitor-bosh.yml
-- tpl/gcp/deployments/prometheus/monitor-kubernetes.yml
-- tpl/gcp/deployments/prometheus/prometheus.yml
-- tpl/gcp/deployments/vault/vault.yml.erb
-- tpl/gcp/docs/bosh.md
-- tpl/gcp/docs/concourse.md
-- tpl/gcp/docs/ingress.md
-- tpl/gcp/docs/oauth.md
-- tpl/gcp/docs/prometheus.md
-- tpl/gcp/docs/vault.md
-- tpl/gcp/terraform/gcs.tf.tt
-- tpl/gcp/terraform/main.tf
-- tpl/gcp/terraform/network.tf
-- tpl/gcp/terraform/outputs.tf
-- tpl/gcp/terraform/terraform.tfvars.tt
-- tpl/gcp/terraform/variables.tf
+- tpl/aws/environment/main.tf.tt
+- tpl/aws/environment/s3.tf.tt
+- tpl/gcp/environment/gcs.tf.tt
+- tpl/gcp/environment/main.tf.tt
+- tpl/gcp/environment/outputs.tf.tt
 - tpl/service/%output_path%/charts/%app_name%/Chart.yaml.tt
 - tpl/service/%output_path%/charts/%app_name%/templates/NOTES.txt.tt
 - tpl/service/%output_path%/charts/%app_name%/templates/_helpers.tpl
@@ -223,19 +166,17 @@ files:
 - tpl/service/%output_path%/pipelines/review.yml.tt
 - tpl/service/%output_path%/pipelines/tasks/create-pull-requests-tag.yml.tt
 - tpl/service/%output_path%/pipelines/tasks/create-repository-tag.yml.tt
-- tpl/service/%output_path%/pipelines/tasks/helm-deploy.yml.tt
-- tpl/service/%output_path%/pipelines/tasks/run-master-tests.yml.tt
-- tpl/service/%output_path%/pipelines/tasks/run-pr-tests.yml.tt
+- tpl/service/%output_path%/pipelines/tasks/run-unit.yml.tt
 - tpl/service/Dockerfile.tt
 - tpl/service/Makefile.tt
 - tpl/service/VERSION.tt
+- tpl/service/docs/getting-started.md
 - tpl/service/docs/pipeline.md.tt
+- tpl/service/docs/service.md
 - tpl/skel/Gemfile.tt
 - tpl/skel/README.md.tt
 - tpl/skel/bin/kite
 - tpl/skel/config/cloud.yml
-- tpl/skel/docs/index.md.tt
-- tpl/skel/docs/quickstart.md.tt
 - tpl/skel/lib/tasks/.keep
 - tpl/skel/log/.keep
 - tpl/skel/tmp/.keep
@@ -258,7 +199,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Command line tool for devops scaffolding.

data/lib/kite/render.rb

@@ -1,116 +0,0 @@
-module Kite
-  # Subcommand for rendering manifests, deployments etc.
-  class Render < Base
-
-    include Kite::Helpers
-
-    no_commands do
-      def ingress_db_file
-        "config/ingress.yml"
-      end
-
-      def ingress_db
-        @db ||= YAML.load(File.read(ingress_db_file)) rescue {}
-      end
-
-      def ingress_db_save!
-        create_file ingress_db_file, YAML.dump(ingress_db), force: true
-      end
-
-      def ingress_add_entry(hostname, upstreams, args = {})
-        raise "upstreams argument should be an array" unless upstreams.is_a?(Array)
-        args[:port] ||= 80
-        args[:protocol] ||= "http"
-        ingress_db[hostname] = {
-          upstreams: upstreams,
-          port: args[:port],
-          protocol: args[:protocol],
-        }
-        ingress_db_save!
-      end
-    end
-
-    desc "manifest <type>", "Renders a manifest of selected type"
-    long_desc <<-LONGDESC
-      Available types:
-      \x5  BOSH        Render Bosh environement
-      \x5  CONCOURSE   Render Concourse deployment
-      \x5  VAULT       Render Vault deployment
-      \x5  INGRESS     Render Ingress deployment
-      \x5  PROMETHEUS  Render Prometheus deployment
-      \x5  OAUTH       Render OAuth (UAA) deployment
-    LONGDESC
-    method_option :cloud, type: :string, desc: "Cloud provider", enum: %w{aws gcp}, required: true
-    # Render a manifest of selected type based on <b>config/cloud.yml</b> and <b>terraform apply</b> results
-    def manifest(type)
-      type = type.downcase
-      say "Rendering #{type} manifest", :green
-      @values = parse_cloud_config
-      @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
-        @public_subnet = IPAddr.new(@values['aws']['public_subnet']['network']).to_range.to_a
-      else
-        @private_subnet = IPAddr.new(@values['gcp']['subnet_cidr']).to_range.to_a
-      end
-
-      @static_ip_vault            = @private_subnet[11].to_s
-      @static_ips_concourse       = [@private_subnet[12]].map(&:to_s)
-      @static_ip_prometheus_stack = @private_subnet[18].to_s
-      @static_ip_oauth            = @private_subnet[23].to_s
-
-      case type
-      when "bosh"
-        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"
-        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)
-        ingress_add_entry(@values['concourse']['hostname'], @static_ips_concourse, port: 8080)
-
-      when "vault"
-        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)
-        ingress_add_entry(@values['vault']['hostname'], [@static_ip_vault], port: 8200)
-
-      when "ingress"
-        template("#{options[:cloud]}/deployments/ingress/ingress.yml.erb",        "deployments/ingress/ingress.yml")
-        copy_file("#{options[:cloud]}/docs/ingress.md",                           "docs/ingress.md")
-        template("#{options[:cloud]}/bin/ingress-deploy.sh.tt",                   "bin/ingress-deploy.sh")
-        template("#{options[:cloud]}/bin/ingress-update.sh.tt",                   "bin/ingress-update.sh")
-        chmod('bin/ingress-deploy.sh', 0755)
-        chmod('bin/ingress-update.sh', 0755)
-
-      when "prometheus"
-        directory("#{options[:cloud]}/deployments/prometheus",                    "deployments/prometheus")
-        copy_file("#{options[:cloud]}/docs/prometheus.md",                        "docs/prometheus.md")
-        template("#{options[:cloud]}/bin/prometheus-deploy.sh.tt",                "bin/prometheus-deploy.sh")
-        chmod('bin/prometheus-deploy.sh', 0755)
-        ingress_add_entry(@values['alertmanager']['hostname'], [@static_ip_prometheus_stack], port: 9093)
-        ingress_add_entry(@values['grafana']['hostname'], [@static_ip_prometheus_stack], port: 3000)
-        ingress_add_entry(@values['prometheus']['hostname'], [@static_ip_prometheus_stack], port: 9090)
-
-      when "oauth"
-        directory("#{options[:cloud]}/deployments/oauth",                         "deployments/oauth")
-        copy_file("#{options[:cloud]}/config/oauth.yml",                          "config/oauth.yml")
-        template("#{options[:cloud]}/docs/oauth.md",                              "docs/oauth.md")
-        template("#{options[:cloud]}/bin/oauth-deploy.sh.tt",                     "bin/oauth-deploy.sh")
-        chmod('bin/oauth-deploy.sh', 0755)
-        ingress_add_entry(@values['oauth']['hostname'], [@static_ip_oauth], port: 8080)
-
-      else
-        say "Manifest type not specified"
-
-      end
-    end
-  end
-end

data/tpl/aws/README.md

@@ -1,52 +0,0 @@
-## AWS Cloud
-
-### Setup
-
-Apply terraform code
-```
-pushd terraform && terraform init && terraform apply && popd
-```
-
-[Note]
-To destroy Bastion later, use `terraform destroy -target aws_instance.bastion`
-
-Render BOSH manifest and related files
-```
-kite render manifest bosh --cloud aws
-```
-
-Prepare BOSH environment using instructions from [docs/bosh.md](docs/bosh.md)
-
-[Optional]
-If you want to access components outside of your VPC, use the Ingress deployment:
-
-Render Ingress deployment files
-```
-kite render manifest prometheus --cloud aws
-```
-
-Follow instructions from [docs/prometheus.md](docs/prometheus.md) to deploy Prometheus
-
-[Note]
-If you're using Ingress, create CNAME DNS records for each deployment as listed in `config/cloud.yml`(e.g. vault.example.com pointing to ingress.example.com)
-
-Render Prometheus deployment files
-```
-kite render manifest prometheus --cloud aws
-```
-
-Follow instructions from [docs/prometheus.md](docs/prometheus.md) to deploy Prometheus
-
-Render Vault deployment
-```
-kite render manifest vault --cloud aws
-```
-
-Follow instructions from [docs/vault.md](docs/vault.md) to deploy Vault
-
-Render Concourse manifest
-```
-kite render manifest concourse --cloud aws
-```
-
-Follow instructions from [docs/concourse.md](docs/concourse.md) to deploy Concourse

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

@@ -1,35 +0,0 @@
-#!/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