kontena-mortar 0.1.0 → 0.2.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: adf60fa80da057855968f430ee78c54ed1213b8db335512c38256b51644a1a27
-  data.tar.gz: cadede47cf01a39158a8b0f1b25be097d40c7a7b1b4d03626bb5ee33e1e9cc99
+  metadata.gz: bea90dd703d70062d7fdc1d1fb6df91c4d58db52caa8e2e106734a82b713cb8b
+  data.tar.gz: 50ff8a0d860da001ad116b1037424aad567dbd01f82499fc2f81c0418fcf29c7
 SHA512:
-  metadata.gz: 938e4e8013e6e04205144d58f972b401c60798129db76d4f657f33f9384601295cd807c1d7f24e505631a373ff5aaa31813281da0171ba419d2b1ca44c01901e
-  data.tar.gz: 1f86940abc8e582c6c2b3feb94583760cf1cf8bf9f694f60eed86ec65153a21e7f82cd12c820b6882b0c70157daad9115b70444d6ea5433f90a173bfc1839667
+  metadata.gz: c0faca7f612c4924b7dc175d3faf0c7bb11a7dbf018473043a60c6a4152f3ffa0be598fc1606cb7d5188b8f34b9f0102c709797422ddb677bd421f853d838c8f
+  data.tar.gz: 3a7dedfd64a08550a725e12cbc27fcdee3ac15bc3658312b2aca604434754acf46c082fafb395dad599c68856f9ecab439d433496cde925c65074ebfb48bec56

data/.drone.yml

@@ -3,8 +3,7 @@ pipeline:
     image: ruby:2.4
     commands:
       - bundle install --path bundler
-      # Uncomment when we have proper tests etc. in place
-      # - bundle exec rspec spec/ && bundle exec rubocop --fail-level A -S --format c --parallel
+      - bundle exec rspec spec/ # && bundle exec rubocop --fail-level A -S --format c --parallel
   docker_latest:
     registry: quay.io
     image: plugins/docker
@@ -35,3 +34,20 @@ pipeline:
       - gem push *.gem
     when:
       event: ['tag']
+
+  create_gh_release:
+    image: ubuntu:xenial
+    secrets: [ github_token ]
+    commands:
+      - ./build/drone/create_release.sh
+    when:
+      event: tag
+  build_xenial:
+    image: ubuntu:xenial
+    secrets: [ github_token ]
+    environment:
+      - CPPFLAGS=-P
+    commands:
+      - ./build/drone/ubuntu_xenial.sh
+    when:
+      event: tag

data/.travis.yml

@@ -0,0 +1,28 @@
+language: ruby
+sudo: required
+cache: bundler
+bundler_args: --without development
+env:
+  global:
+    - secure: "AX0y/vETBJ4C93/RWgTZNFwlm8r+4b0cWExOa3G4NBvxc3x1PBjA9sD7LOezUxMCaOuTM1GF+vpXupreeZtdU6mUqQNJSsOH5sWivPfQwCmxbhODW/CGhlhKZT0pTJQ2QhUbp6zXeLfQ3WJT4X4VH2NP5zkfJ7Q0hO7AJqqty/+mAZLbtaBkw1eKhwWPx1t3UQx9zY07V2WsJQCmj9O/bdMyoa3uoTvSahzvAQsY/1XQ6OMZrVvt7JGoFjEVLNnttT3at3HvG3Izwb8u+ftrCr+0u6V9tUPAH+1WHJgP1fYrysU2n+HwhvGYlkl3TYt0wxP9ccz18NiFGf3SOf+OSBQJ11cQ6RJ7R6Qo/RLpW2AffjYW881d32pORbVsEpj8vBvElfJKbl0rT4IgIRJxxCuZnqVbX+8szma9EAmltGbtNdyuX4WxARZ3XNlFONacX5mnubRZDruYijNPzv3tCb6KBaRV5yfg8dhMPjOf6r0i8r0+9IFRsfszVMSxJhrnXlhtaYn7OikqBDOSiCa/VeSBb09fl/klnTCpCHFRICYgWqO8vf1jWvXLuKtHA7E3Ah4CJTkirY4eFwLMEN2kJ6g28OudWMU/urL4/rRb4LpzlDySy9KFA8f1/+7A/mzLDv7Iket2ig6/Pa7ymnYSlmypzVZTvcpJr0EfK+hmr6E="
+stages:
+  - name: publish binary
+    if: tag IS present
+jobs:
+  include:
+    - stage: publish binary
+      script: ./build/travis/macos.sh
+      rvm: 2.4
+      os: osx
+      deploy:
+        provider: s3
+        access_key_id:
+          secure: "OHjLg4bzJBUdwmw42XK5s/+5tHUy7SO32/NzV5qCETIw+lr0lEhHIUeGUDGEqsMKvB3X1rIyFhhYJcRUCkJHfDUM2uRyIxYl/HUNNHCnZttwBHsn517Wt8sSzx5mSHuqXl54hoI47vvx0yfKrvW70/AF0aNufEde5tQePzsgghZ0FIPKx29CiG0QAufTgJ3B3tXJtDywDXO6kyQmmpjSTO+Rne8YEx4MvyoGH1DhHiiSsggSMrYUy80mZP967AvQ6cCQNS7d9A1ThNjJVNGQ9jzTGW8vWRsvI1Y5583sWwAwVbKSYtcaO2t5IC1q62PnYu9xVyy6D5QZ4uJ4jQk8at00348nj059CosNEE9IdqRaTJi5TIiX9H1nU8y3P/c/2dYpsQIKch0Ji/cQhl4RCe+QQuOpCzggElf8GeD/tg9GJFhX+uPPWFJMl4zvrH5EascRm+PHJsr7UFL0Lv4Q0x85qdCa/0Oh1XA+f+WaLpSkUUiLUUB27+2dLupD3VyuSZ0IferiDHHgIG0teXoSvI6hgSBg85ZYZKls72seTuGG0icrn+U/iz+7ywtaaS5yVmrelUiYq4ElZr3N9SPaWUxUGXo734B60AIJ9dPQQJY8e+TJ2jjX3OCAd//Z3Kh2+O+nbcHUUMY4OfUVp4wcRy2LKlNqPC5DevZij2uVmKM="
+        secret_access_key:
+          secure: "HCnQTlTJ3jo4oX2ZLXZUUWHOL7yiV/z2dVNTmiQYGJ8Xsf34zLnwRvPTymq4nA7elCmO0J6G2ub1wqBLZqyYHhbhI//9txPpRJmgFf7C3R0c9j5HRG2lxRJ8PNHuOzT5e2Zx1Aq9Aawy2+zXTuNMnTF0gtXg2tO3oHzs2h99mk5qeoLDAbu1HUd+W7ymalbhw+GH3D6X4mHuv/AUowOJuieIMpg/FPvu0/SXh4/KpSV54hlfSDYIqaBlMDxdAJsoJi/tKBegNMkLeXyaFf9PYF6U83P8RABdBkhinatN0b6EJB21mmaRkfVam4gNhEgB+SobZVelmLLAsTZU9kEkt2V4zBgUYUbNI32ZXMhMFsOZtPfInbGAzqZPmKGRh39yFnN92uQjxWJXocGFrk43K3d2lviAntP05+xPpBjO4CDXuC8mqyRZf6vg/Cysu3OuxrUGMru0EHePG6DZDcH8yNq7GcBbarA5+w+hupnfHD8SoRtnSuyPdyPsjGb25vikkgeLN8J8d2FxcUH9NBgeBJXhMcXCKCxmIgCcMtJ1NElip6MktTYMl2nkxDmgpPljUG0QL95fVq88jwWhyxTvpASJvUSDbq0AUWNP5xJ4R+4vlWkSkVrtLhn4IaJ4ou6PATmgzyaw+0EG4JeAT2TfP8z6ILv5NNb/4YThwg08fVA="
+        bucket: "pharos-cluster-binaries"
+        region: "eu-west-1"
+        local-dir: upload
+        skip_cleanup: true
+        on:
+          all_branches: true

data/Dockerfile

@@ -2,14 +2,12 @@ FROM ruby:2.5-alpine as build
 
 ADD . /src
 
-RUN apk --update add git && \
-    cd /src ; gem build kontena-mortar.gemspec
+RUN apk --update add git build-base && \
+    cd /src ; gem build kontena-mortar.gemspec && \
+    gem install *.gem
 
 FROM ruby:2.5-alpine
 
-COPY --from=build /src/*.gem /tmp/
-
-RUN gem install /tmp/*.gem && \
-    rm -f /tmp/*.gem
+COPY --from=build /usr/local/bundle /usr/local/bundle
 
 ENTRYPOINT [ "/usr/local/bundle/bin/mortar" ]

data/Gemfile.lock

@@ -1,10 +1,11 @@
 PATH
   remote: .
   specs:
-    kontena-mortar (0.1.0)
+    kontena-mortar (0.2.0.pre1)
       clamp (~> 1.3)
       deep_merge (~> 1.2)
-      k8s-client (~> 0.3)
+      k8s-client (~> 0.4.1)
+      pastel (~> 0.7.2)
       rouge (~> 3.2)
 
 GEM
@@ -39,13 +40,19 @@ GEM
       dry-equalizer (~> 0.2)
       dry-inflector (~> 0.1, >= 0.1.2)
       dry-logic (~> 0.4, >= 0.4.2)
+    equatable (0.5.0)
     excon (0.62.0)
+    hashdiff (0.3.7)
     ice_nine (0.11.2)
-    k8s-client (0.3.4)
+    k8s-client (0.4.1)
       deep_merge (~> 1.2.1)
       dry-struct (~> 0.5.0)
       excon (~> 0.62.0)
+      hashdiff (~> 0.3.7)
       recursive-open-struct (~> 1.1.0)
+    pastel (0.7.2)
+      equatable (~> 0.5.0)
+      tty-color (~> 0.4.0)
     rake (10.5.0)
     recursive-open-struct (1.1.0)
     rouge (3.2.1)
@@ -62,6 +69,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.0)
+    tty-color (0.4.3)
 
 PLATFORMS
   ruby

data/README.md

@@ -1,6 +1,16 @@
 # Kontena Mortar
 
-Kubernetes manifest shooter.
+![Mortar - Manifest shooter for Kubernetes](kontena-mortar.png)
+
+Mortar is a tool to easily handle a complex set of Kubernetes resources. Using `kubectl apply -f some_folder/` is pretty straightforward for simple cases, but often, especially in CI/CD pipelines things get complex. Then on the otherhand, writing everything in Helm charts is way too complex.
+
+While we were developing [Kontena Pharos](https://kontena.io/pharos) Kubernetes distro and tooling around it, we soon realized that we really want to manage sets of resources as a single unit. This thinking got even stronger while we were transitioning many of our production solutions to run on top of Kubernetes. As this is a common problem for all Kubernetes users, Mortar was born.
+
+## Features
+
+- [Management of sets of resources as a single unit](#shots)
+- [Simple templating](#templating)
+- [Overlays](#overlays)
 
 ## Installation
 
@@ -12,6 +22,8 @@ Docker:
 
 `$ docker pull quay.io/kontena/mortar:latest`
 
+We will be working on also to support binary installation method in near future.
+
 ## Usage
 
 ### Configuration
@@ -21,13 +33,19 @@ By default mortar looks for if file `~/.kube/config` exists and uses it as the c
 For CI/CD use mortar also understands following environment variables:
 
 - `KUBE_SERVER`: kubernetes api server address, for example `https://10.10.10.10:6443`
-- `KUBE_TOKEN`: service account token
+- `KUBE_TOKEN`: service account token (base64 encoded)
 - `KUBE_CA`: kubernetes CA certificate (base64 encoded)
 
 ### Deploying k8s yaml manifests
 
 ```
-$ mortar <deployment-name> <src-folder>
+$ mortar fire [options] <src-folder> <deployment-name>
+```
+
+### Removing a deployment
+
+```
+$ mortar yank [options] <deployment-name>
 ```
 
 ### Docker image
@@ -46,6 +64,96 @@ pipeline:
 
 ```
 
+## Shots
+
+Mortar manages a set of resources as a single unit, we call them *shots*. A shot can have as many resources as your application needs, there's no limit to that. Much like you'd do with `kubectl apply -f my_dir/`, but Mortar actually injects information into the resources it shoots into your Kubernetes cluster. This added information, labels and annotations, will be used later on by Mortar itself or can be used with `kubectl` too. This allows the management of many resources as a single application.
+
+Most importantly, Mortar is able to use this information when re-shooting your applications. One of the most difficult parts when using plain `kubectl apply ...` approach is the fact that it's super easy to leave behind some lingering resources. Say you have some `deployments` and a `service` in your application, each defined in their own `yaml` file. Now you remove the service and re-apply with `kubectl apply -f my_resources/`. The service will live on in your cluster. With Mortar, you don't have to worry. With the extra labels and annotations Mortar injects into the resources, it's also able to automatically prune the "un-necessary" resources from the cluster. The automatic pruning is done with `--prune` option.
+
+See basic example [here](/examples/basic).
+
+## Overlays
+
+One of the most powerful features of Mortar is it's ability to support *overlays*. An overlay is a variant of the set of resources you are managing. A variant might be for example the same application running on many different environments like production, test, QA an so on. A variant might also be a separate application "instance" for each customer. Or what ever the need is. Overlays in Mortar are inspired by [kustomize](https://github.com/kubernetes-sigs/kustomize).
+
+Given a folder & file structure like:
+```
+echoservice-metallb/
+├── echo-metal.yml
+├── foo
+│   └── pod.yml.erb
+└── prod
+    ├── pod.yml
+    └── svc.yml
+```
+
+where overlays (`prod` & `foo`) contain same resources as the base folder, mortar now merges all resources together. Merging is done in the order overlays are given in the command. Resources are considered to be the same resource if all of these match: `kind`, `apiVersion`, `metadata.name` and `metadata.namespace`.
+
+If there are new resources in the overlay dirs, they are taken into the shot as-is.
+
+You'd select overlays taken into processing with `--overlay option`.
+
+**Note:** Overlays are taken in in the order defined, so make sure you define them in correct order.
+
+The resources in the overlays do not have to be complete, it's enough that the "identifying" fields are the same.
+
+See example of overlays [here](/examples/overlays).
+
+## Templating
+
+Mortar also support templating for the resource definitons. The templating language used is [ERB](https://en.wikipedia.org/wiki/ERuby). It's pretty simple templating language but yet powerful enough for Kubernetes resource templating.
+
+Mortar automatically processes the resource definition as a template if the filename is either `.yml.erb` or `.yaml.erb`.
+
+There are two ways to introduce variables into the templating.
+
+See examples at [examples/templates](examples/templates).
+
+### Environment variables
+
+As for any process, environment variables are also available for Mortar during template processing.
+
+```
+kind: Pod
+apiVersion: v1
+metadata:
+  name: nginx
+  labels:
+    name: nginx
+  namespace: default
+spec:
+  containers:
+  - name: nginx
+    image: nginx:<%= ENV["NGINX_VERSION"] || "latest" %>
+    ports:
+      - containerPort: 80
+```
+
+### Variables via options
+
+Another option to use variables is via command-line options. Use `mortar --var foo=bar my-app resources/`.
+
+Each of the variables defined will be available in the template via `var.<variable name>`.
+
+```
+kind: Pod
+apiVersion: v1
+metadata:
+  name: nginx
+  labels:
+    name: nginx
+  namespace: default
+spec:
+  containers:
+  - name: nginx
+    image: nginx:latest
+    ports:
+      - containerPort: <%= port.number %>
+        name: <%= port.name %>
+```
+
+You could shoot this resource with `mortar --var port.name=some-port --var port.number=80 my-app resources/pod.yml.erb`
+
 
 ## Contributing
 
@@ -59,4 +167,4 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use
 
 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.
+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.

data/bin/mortar

@@ -10,4 +10,4 @@ require 'mortar'
 $0 = 'mortar'
 $stdout.sync = true
 
-Mortar::Command.run
+Mortar::RootCommand.run

data/build/drone/create_release.sh

@@ -0,0 +1,28 @@
+#!/bin/bash
+
+set -ue
+
+apt-get update -y
+apt-get install -y -q curl bzip2
+
+# ship to github
+curl -sL https://github.com/aktau/github-release/releases/download/v0.7.2/linux-amd64-github-release.tar.bz2 | tar -xjO > /usr/local/bin/github-release
+chmod +x /usr/local/bin/github-release
+
+if [[ $DRONE_TAG =~ .+-.+ ]]; then
+    /usr/local/bin/github-release release \
+        --user kontena \
+        --repo mortar \
+        --tag $DRONE_TAG \
+        --name $DRONE_TAG \
+        --description "Pre-release, only for testing" \
+        --draft \
+        --pre-release
+else
+    /usr/local/bin/github-release release \
+        --user kontena \
+        --repo mortar \
+        --draft \
+        --tag $DRONE_TAG \
+        --name $DRONE_TAG
+fi

data/build/drone/ubuntu_xenial.sh

@@ -0,0 +1,24 @@
+#!/bin/sh
+
+set -ue
+
+# build binary
+apt-get update -y
+apt-get install -y -q squashfs-tools build-essential ruby bison ruby-dev git-core texinfo curl
+curl -sL https://dl.bintray.com/kontena/ruby-packer/0.5.0-dev/rubyc-linux-amd64.gz | gunzip > /usr/local/bin/rubyc
+chmod +x /usr/local/bin/rubyc
+gem install bundler
+version=${DRONE_TAG#"v"}
+package="mortar-linux-amd64-${version}"
+rubyc -o $package mortar
+./$package version
+
+# ship to github
+curl -sL https://github.com/aktau/github-release/releases/download/v0.7.2/linux-amd64-github-release.tar.bz2 | tar -xjO > /usr/local/bin/github-release
+chmod +x /usr/local/bin/github-release
+/usr/local/bin/github-release upload \
+    --user kontena \
+    --repo mortar \
+    --tag $DRONE_TAG \
+    --name $package \
+    --file ./$package

data/build/travis/macos.sh

@@ -0,0 +1,24 @@
+#!/bin/sh
+
+set -ue
+
+brew install squashfs
+curl -sL https://dl.bintray.com/kontena/ruby-packer/0.5.0-dev/rubyc-darwin-amd64.gz | gunzip > /usr/local/bin/rubyc
+chmod +x /usr/local/bin/rubyc
+version=${TRAVIS_TAG#"v"}
+package="mortar-darwin-amd64-${version}"
+rubyc -o $package mortar
+./$package version
+
+# ship to github
+curl -sL https://github.com/aktau/github-release/releases/download/v0.7.2/darwin-amd64-github-release.tar.bz2 | tar -xjO > /usr/local/bin/github-release
+chmod +x /usr/local/bin/github-release
+/usr/local/bin/github-release upload \
+    --user kontena \
+    --repo mortar \
+    --tag $TRAVIS_TAG \
+    --name $package \
+    --file ./$package
+
+mkdir -p upload
+mv $package upload/

data/examples/basic/deployment.yml

@@ -0,0 +1,18 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: myapp
+spec:
+  selector:
+    matchLabels:
+      app: myapp
+  template:
+    metadata:
+      labels:
+        app: myapp
+    spec:
+      containers:
+      - name: myapp
+        image: nginx:latest
+        ports:
+        - containerPort: 80

data/examples/basic/service.yml

@@ -0,0 +1,10 @@
+kind: Service
+apiVersion: v1
+metadata:
+  name: myapp
+spec:
+  selector:
+    app: myapp
+  ports:
+  - port: 80
+    targetPort: 80

data/examples/force-deployment/deployment.yml.erb

@@ -0,0 +1,27 @@
+# An dynamic annotation can be used to force Kubernetes to deploy pods.
+# In this example mortar will set DRONE_BUILD_NUMBER environment variable as a value of 'build' annotation.
+# Basically annotation can be, for example, datetime, commit sha or any unique value
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: nginx
+  labels:
+    app: nginx
+spec:
+  selector:
+    matchLabels:
+      app: nginx
+  strategy:
+  template:
+    metadata:
+      labels:
+        app: nginx
+      annotations:
+        build: "<%= ENV['DRONE_BUILD_NUMBER'] %>"
+    spec:
+      containers:
+      - image: docker.io/nginx:alpine
+        imagePullPolicy: Always
+        name: nginx
+        ports:
+        - containerPort: 80

data/examples/overlays/echo-metal.yml

@@ -0,0 +1,35 @@
+---
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: echoserver
+  namespace: default
+spec:
+  replicas: 1
+  template:
+    metadata:
+      labels:
+        app: echoserver
+    spec:
+      containers:
+      - image: gcr.io/google_containers/echoserver:1.0
+        imagePullPolicy: Always
+        name: echoserver
+        ports:
+        - containerPort: 8080
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: echoserver
+  namespace: default
+  annotations:
+    metallb.universe.tf/address-pool: default
+spec:
+  type: LoadBalancer
+  ports:
+  - port: 80
+    targetPort: 8080
+    protocol: TCP
+  selector:
+    app: echoserver

data/examples/overlays/foo/pod.yml.erb

@@ -0,0 +1,14 @@
+kind: Pod
+apiVersion: v1
+metadata:
+  name: myapp
+  labels:
+    name: myapp
+    foo: <%= var.foo.bar %>
+spec:
+  containers:
+  - name: myapp
+    image: foobar
+    ports:
+      - containerPort: 8080
+

data/examples/overlays/partial/echo.yml

@@ -0,0 +1,8 @@
+---
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: echoserver
+  namespace: default
+  labels:
+    partial: works too :)

data/examples/overlays/prod/pod.yml

@@ -0,0 +1,13 @@
+kind: Pod
+apiVersion: v1
+metadata:
+  name: myapp
+  labels:
+    name: myapp
+spec:
+  containers:
+  - name: myapp
+    image: foobar
+    ports:
+      - containerPort: 8080
+

data/examples/overlays/prod/svc.yml

@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: echoserver
+  annotations:
+    environment: production
+spec:
+  type: LoadBalancer
+  ports:
+  - port: 80
+    targetPort: 8080
+    protocol: TCP
+  selector:
+    app: echoserver

data/examples/templates/env_vars/pod.yml.erb

@@ -0,0 +1,13 @@
+kind: Pod
+apiVersion: v1
+metadata:
+  name: nginx
+  labels:
+    name: nginx
+  namespace: default
+spec:
+  containers:
+  - name: nginx
+    image: nginx:<%= ENV["NGINX_VERSION"] || "latest" %>
+    ports:
+      - containerPort: 80

data/examples/templates/variables/loops.yml.erb

@@ -0,0 +1,19 @@
+kind: Pod
+apiVersion: v1
+metadata:
+  name: nginx
+  labels:
+    name: nginx
+  namespace: default
+spec:
+  containers:
+  - name: nginx
+    image: nginx:latest
+    ports:
+      <%# Easy to loop through some variables with the dotted notation
+        # Run this with example mortar --var port.one=80 --var port.two=8080
+      %>
+      <% var.port.each do |name, number| %>
+      - containerPort: <%= number %>
+        name: <%= name %>
+      <% end %>

data/examples/templates/variables/pod-vars.yml.erb

@@ -0,0 +1,15 @@
+kind: Pod
+apiVersion: v1
+metadata:
+  name: nginx
+  labels:
+    name: nginx
+  namespace: default
+spec:
+  containers:
+  - name: nginx
+    image: nginx:latest
+    ports:
+      <%# Variables can be accessed by the name easily %>
+      - containerPort: <%= port.number %>
+        name: <%= port.name %>

data/kontena-mortar.gemspec

@@ -24,9 +24,10 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "clamp", "~> 1.3"
-  spec.add_runtime_dependency "k8s-client", "~> 0.3"
+  spec.add_runtime_dependency "k8s-client", "~> 0.4.1"
   spec.add_runtime_dependency "rouge", "~> 3.2"
   spec.add_runtime_dependency "deep_merge", "~> 1.2"
+  spec.add_runtime_dependency "pastel", "~> 0.7.2"
   spec.add_development_dependency "bundler", "~> 1.16"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"

data/lib/extensions/recursive_open_struct/each.rb

@@ -0,0 +1,12 @@
+module Extensions
+  module RecursiveOpenStruct
+    module Each
+      def each(&block)
+        self.to_h.each { |k,v| yield k.to_s,v }
+      end
+    end
+  end
+end
+
+# Monkey-patch the above module into RecursiveOpenStruct
+RecursiveOpenStruct.include Extensions::RecursiveOpenStruct::Each

data/lib/mortar/command.rb

@@ -1,164 +1,10 @@
 require "clamp"
-require "base64"
-require_relative "yaml_file"
-require_relative "resource_helper"
-
-Clamp.allow_options_after_parameters = true
 
 module Mortar
   class Command < Clamp::Command
-    include Mortar::ResourceHelper
-
-    banner "mortar - Kubernetes manifest shooter"
-
-    parameter "NAME", "deployment name"
-    parameter "SRC", "source folder"
-
-    option ["--var"], "VAR", "set template variables", multivalued: true
-    option ["-d", "--debug"], :flag, "debug"
-    option ["--output"], :flag, "only output generated yaml"
-    option ["--prune"], :flag, "automatically delete removed resources"
-    option ['-v', '--version'], :flag, "print mortar version" do
-      puts "mortar #{Mortar::VERSION}"
-      exit 0
-    end
-    option ["--overlay"], "OVERLAY", "overlay dirs", multivalued: true
-
     LABEL = 'mortar.kontena.io/shot'
     CHECKSUM_ANNOTATION = 'mortar.kontena.io/shot-checksum'
 
-    def execute
-      signal_usage_error("#{src} does not exist") unless File.exist?(src)
-      resources = process_overlays
-      if output?
-        puts resources_output(resources)
-        exit
-      end
-
-      K8s::Stack.new(
-        name, resources,
-        debug: debug?,
-        label: LABEL,
-        checksum_annotation: CHECKSUM_ANNOTATION
-      ).apply(client, prune: prune?)
-
-      puts "shot #{name} successfully!" if $stdout.tty?
-    end
-
-    def process_overlays
-      resources = load_resources(src)
-
-      overlay_list.each do |overlay|
-        overlay_resources = from_files(overlay)
-        overlay_resources.each do |overlay_resource|
-          match = false
-          resources = resources.map { |r|
-            if same_resource?(r, overlay_resource)
-              match = true
-              r.merge(overlay_resource.to_hash)
-            else
-              r
-            end
-          }
-          resources << overlay_resource unless match
-        end
-      end
-
-      resources
-    end
-
-    # @param resources [Array<K8s::Resource>]
-    # @return [String]
-    def resources_output(resources)
-      yaml = ''
-      resources.each do |resource|
-        yaml << ::YAML.dump(stringify_hash(resource.to_hash))
-      end
-      return yaml unless $stdout.tty?
-
-      lexer = Rouge::Lexers::YAML.new
-      rouge = Rouge::Formatters::Terminal256.new(Rouge::Themes::Github.new)
-      rouge.format(lexer.lex(yaml))
-    end
-
-    # @return [RecursiveOpenStruct]
-    def variables_struct
-      return @variables_struct if @variables_struct
-
-      set_hash = {}
-      var_list.each do |var|
-        k, v = var.split("=", 2)
-        set_hash[k] = v
-      end
-      RecursiveOpenStruct.new(dotted_path_to_hash(set_hash))
-    end
-
-    def dotted_path_to_hash(hash)
-      hash.map do |pkey, pvalue|
-        pkey.to_s.split(".").reverse.inject(pvalue) do |value, key|
-          {key.to_sym => value}
-        end
-      end.inject(&:deep_merge)
-    end
-
-    # @return [K8s::Client]
-    def client
-      return @client if @client
-
-      if ENV['KUBE_TOKEN'] && ENV['KUBE_CA'] && ENV['KUBE_SERVER']
-        @client = K8s::Client.new(K8s::Transport.config(build_kubeconfig_from_env))
-      elsif ENV['KUBECONFIG']
-        @client = K8s::Client.config(K8s::Config.load_file(ENV['KUBECONFIG']))
-      elsif File.exist?(File.join(Dir.home, '.kube', 'config'))
-        @client = K8s::Client.config(K8s::Config.load_file(File.join(Dir.home, '.kube', 'config')))
-      else
-        @client = K8s::Client.in_cluster_config
-      end
-    end
-
-    # @return [K8s::Config]
-    def build_kubeconfig_from_env
-      token = ENV['KUBE_TOKEN']
-      begin
-        token = Base64.strict_decode64(token)
-      rescue ArgumentError # raised if token is not base64 encoded
-      end
-      K8s::Config.new(
-        clusters: [
-          {
-            name: 'kubernetes',
-            cluster: {
-              server: ENV['KUBE_SERVER'],
-              certificate_authority_data: ENV['KUBE_CA']
-            }
-          }
-        ],
-        users: [
-          {
-            name: 'mortar',
-            user: {
-              token: token
-            }
-          }
-        ],
-        contexts: [
-          {
-            name: 'mortar',
-            context: {
-              cluster: 'kubernetes',
-              user: 'mortar'
-            }
-          }
-        ],
-        preferences: {},
-        current_context: 'mortar'
-      )
-    end
-
-    # Stringifies all hash keys
-    # @return [Hash]
-    def stringify_hash(hash)
-      JSON.load(JSON.dump(hash))
-    end
+    option ["-d", "--debug"], :flag, "debug"
   end
 end

data/lib/mortar/fire_command.rb

@@ -0,0 +1,108 @@
+require "base64"
+require_relative "command"
+require_relative "yaml_file"
+require_relative "mixins/resource_helper"
+require_relative "mixins/client_helper"
+require_relative "mixins/tty_helper"
+
+module Mortar
+  class FireCommand < Mortar::Command
+    include Mortar::ResourceHelper
+    include Mortar::ClientHelper
+    include Mortar::TTYHelper
+
+    parameter "SRC", "source file or directory"
+    parameter "NAME", "deployment name"
+
+    option ["--var"], "VAR", "set template variables", multivalued: true
+    option ["--output"], :flag, "only output generated yaml"
+    option ["--prune"], :flag, "automatically delete removed resources"
+    option ["--overlay"], "OVERLAY", "overlay dirs", multivalued: true
+
+    def execute
+      signal_usage_error("#{src} does not exist") unless File.exist?(src)
+      resources = process_overlays
+
+      if output?
+        puts resources_output(resources)
+        exit
+      end
+
+      if resources.empty?
+        warn 'nothing to do!'
+        exit
+      end
+
+      K8s::Stack.new(
+        name, resources,
+        debug: debug?,
+        label: LABEL,
+        checksum_annotation: CHECKSUM_ANNOTATION
+      ).apply(client, prune: prune?)
+
+      puts "shot '#{pastel.cyan(name)}' successfully!" if $stdout.tty?
+    end
+
+    def process_overlays
+      resources = load_resources(src)
+
+      overlay_list.each do |overlay|
+        overlay_resources = from_files(overlay)
+        overlay_resources.each do |overlay_resource|
+          match = false
+          resources = resources.map { |r|
+            if same_resource?(r, overlay_resource)
+              match = true
+              r.merge(overlay_resource.to_hash)
+            else
+              r
+            end
+          }
+          resources << overlay_resource unless match
+        end
+      end
+
+      resources
+    end
+
+    # @param resources [Array<K8s::Resource>]
+    # @return [String]
+    def resources_output(resources)
+      yaml = ''
+      resources.each do |resource|
+        yaml << ::YAML.dump(stringify_hash(resource.to_hash))
+      end
+      return yaml unless $stdout.tty?
+
+      lexer = Rouge::Lexers::YAML.new
+      rouge = Rouge::Formatters::Terminal256.new(Rouge::Themes::Github.new)
+      rouge.format(lexer.lex(yaml))
+    end
+
+    # @return [RecursiveOpenStruct]
+    def variables_struct
+      return @variables_struct if @variables_struct
+
+      set_hash = {}
+      var_list.each do |var|
+        k, v = var.split("=", 2)
+        set_hash[k] = v
+      end
+      RecursiveOpenStruct.new(dotted_path_to_hash(set_hash))
+    end
+
+    def dotted_path_to_hash(hash)
+      hash.map do |pkey, pvalue|
+        pkey.to_s.split(".").reverse.inject(pvalue) do |value, key|
+          {key.to_sym => value}
+        end
+      end.inject(&:deep_merge)
+    end
+
+    # Stringifies all hash keys
+    # @return [Hash]
+    def stringify_hash(hash)
+      JSON.load(JSON.dump(hash))
+    end
+  end
+end

data/lib/mortar/mixins/client_helper.rb

@@ -0,0 +1,57 @@
+module Mortar
+  module ClientHelper
+    # @return [K8s::Client]
+    def client
+      return @client if @client
+
+      if ENV['KUBE_TOKEN'] && ENV['KUBE_CA'] && ENV['KUBE_SERVER']
+        @client = K8s::Client.new(K8s::Transport.config(build_kubeconfig_from_env))
+      elsif ENV['KUBECONFIG']
+        @client = K8s::Client.config(K8s::Config.load_file(ENV['KUBECONFIG']))
+      elsif File.exist?(File.join(Dir.home, '.kube', 'config'))
+        @client = K8s::Client.config(K8s::Config.load_file(File.join(Dir.home, '.kube', 'config')))
+      else
+        @client = K8s::Client.in_cluster_config
+      end
+    end
+
+    # @return [K8s::Config]
+    def build_kubeconfig_from_env
+      token = ENV['KUBE_TOKEN']
+      token = Base64.strict_decode64(token)
+
+      K8s::Config.new(
+        clusters: [
+          {
+            name: 'kubernetes',
+            cluster: {
+              server: ENV['KUBE_SERVER'],
+              certificate_authority_data: ENV['KUBE_CA']
+            }
+          }
+        ],
+        users: [
+          {
+            name: 'mortar',
+            user: {
+              token: token
+            }
+          }
+        ],
+        contexts: [
+          {
+            name: 'mortar',
+            context: {
+              cluster: 'kubernetes',
+              user: 'mortar'
+            }
+          }
+        ],
+        preferences: {},
+        current_context: 'mortar'
+      )
+    rescue ArgumentError
+      signal_usage_error "KUBE_TOKEN env doesn't seem to be base64 encoded!"
+    end
+  end
+end

data/lib/mortar/mixins/tty_helper.rb

@@ -0,0 +1,8 @@
+module Mortar
+  module TTYHelper
+    # @return [Pastel]
+    def pastel
+      @pastel ||= Pastel.new
+    end
+  end
+end

data/lib/mortar/root_command.rb

@@ -0,0 +1,20 @@
+require "clamp"
+require_relative "fire_command"
+require_relative "yank_command"
+
+Clamp.allow_options_after_parameters = true
+
+module Mortar
+  class RootCommand < Clamp::Command
+
+    banner "mortar - Kubernetes manifest shooter"
+
+    option ['-v', '--version'], :flag, "print mortar version" do
+      puts "mortar #{Mortar::VERSION}"
+      exit 0
+    end
+
+    subcommand "fire", "Fire a shot (of k8s manifests)", FireCommand
+    subcommand "yank", "Yank a shot (of k8s manifests)", YankCommand
+  end
+end

data/lib/mortar/version.rb

@@ -1,3 +1,3 @@
 module Mortar
-  VERSION = "0.1.0"
+  VERSION = "0.2.0.pre1"
 end

data/lib/mortar/yank_command.rb

@@ -0,0 +1,40 @@
+require_relative "command"
+require_relative "mixins/client_helper"
+require_relative "mixins/tty_helper"
+
+module Mortar
+  class YankCommand < Mortar::Command
+    include Mortar::ClientHelper
+    include Mortar::TTYHelper
+
+    parameter "NAME", "deployment name"
+
+    option ["--force"], :flag, "use force"
+
+    def execute
+      unless force?
+        if $stdin.tty?
+          print "enter '#{pastel.cyan(name)}' to confirm yank: "
+          begin
+            signal_error("confirmation did not match #{pastel.cyan(name)}.") unless $stdin.gets.chomp == name
+          rescue Interrupt
+            puts
+            puts "Canceled"
+            return
+          end
+        else
+          signal_usage_error '--force required when running in a non-interactive mode'
+        end
+      end
+
+      K8s::Stack.new(
+        name, [],
+        debug: debug?,
+        label: LABEL,
+        checksum_annotation: CHECKSUM_ANNOTATION
+      ).prune(client, keep_resources: false)
+
+      puts "yanked #{pastel.cyan(name)} successfully!" if $stdout.tty?
+    end
+  end
+end

data/lib/mortar.rb

@@ -1,13 +1,16 @@
 require "clamp"
 require "deep_merge"
 require "mortar/version"
-require "mortar/command"
+require "mortar/root_command"
 
 autoload :K8s, "k8s-client"
 autoload :YAML, "yaml"
 autoload :ERB, "erb"
 autoload :Rouge, "rouge"
 autoload :RecursiveOpenStruct, "recursive-open-struct"
+autoload :Pastel, "pastel"
+
+require "extensions/recursive_open_struct/each"
 
 module Mortar
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-mortar
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0.pre1
 platform: ruby
 authors:
 - Kontena, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-28 00:00:00.000000000 Z
+date: 2018-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: rouge
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: pastel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -119,6 +133,7 @@ files:
 - ".drone.yml"
 - ".gitignore"
 - ".rspec"
+- ".travis.yml"
 - Dockerfile
 - Gemfile
 - Gemfile.lock
@@ -126,12 +141,33 @@ files:
 - README.md
 - Rakefile
 - bin/mortar
+- build/drone/create_release.sh
+- build/drone/ubuntu_xenial.sh
+- build/travis/macos.sh
+- examples/basic/deployment.yml
+- examples/basic/service.yml
+- examples/force-deployment/deployment.yml.erb
+- examples/overlays/echo-metal.yml
+- examples/overlays/foo/pod.yml.erb
+- examples/overlays/partial/echo.yml
+- examples/overlays/prod/pod.yml
+- examples/overlays/prod/svc.yml
+- examples/templates/env_vars/pod.yml.erb
+- examples/templates/variables/loops.yml.erb
+- examples/templates/variables/pod-vars.yml.erb
 - kontena-mortar.gemspec
+- kontena-mortar.png
+- lib/extensions/recursive_open_struct/each.rb
 - lib/mortar.rb
 - lib/mortar/command.rb
-- lib/mortar/resource_helper.rb
+- lib/mortar/fire_command.rb
+- lib/mortar/mixins/client_helper.rb
+- lib/mortar/mixins/resource_helper.rb
+- lib/mortar/mixins/tty_helper.rb
+- lib/mortar/root_command.rb
 - lib/mortar/version.rb
 - lib/mortar/yaml_file.rb
+- lib/mortar/yank_command.rb
 homepage: https://github.com/kontena/mortar
 licenses:
 - Apache-2.0
@@ -147,9 +183,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.6