Merge branch 'master' of github.com:replicatedcom/ship into kustomize…

…-usability

.circleci/config.yml

@@ -17,8 +17,11 @@ jobs:
     steps:
       - checkout
       - run: mkdir -p web/dist
-      - run: make build-deps citest ci-upload-coverage
-
+      - run: |
+          make build-deps citest
+          if [ "${CIRCLE_PROJECT_USERNAME}" == "replicatedhq" ]; then
+            make ci-upload-coverage
+          fi
   build_ui:
     docker:
       - image: circleci/node:9

.gitignore

@@ -11,5 +11,6 @@ integration/*/test*
 /base/
 
 /.state/
-
-chart/
+/chart/
+/overlays/
+/base/

Gopkg.toml

@@ -42,6 +42,10 @@
   name = "github.com/spf13/viper"
   version = "1.0.0"
 
+[[constraint]]
+  name = "github.com/mholt/archiver"
+  revision = "e4ef56d48eb029648b0e895bb0b6a393ef0829c3"
+
 [[constraint]]
   name = "github.com/docker/docker"
   revision = "4047cede65862aa0ea5616297d7c0f3b12526ad4"

Makefile

@@ -3,7 +3,7 @@
 
 SHELL := /bin/bash
 SRC = $(shell find . -name "*.go")
-UI = $(shell find ui/ -name "*.js")
+UI = $(shell find web/dist -name "*.js")
 
 DOCKER_REPO ?= replicated
 
@@ -39,6 +39,7 @@ _mockgen:
 	mkdir -p pkg/test-mocks/ui
 	mkdir -p pkg/test-mocks/config
 	mkdir -p pkg/test-mocks/planner
+	mkdir -p pkg/test-mocks/lifecycle
 	mkdir -p pkg/test-mocks/images/saver
 	mkdir -p pkg/test-mocks/docker
 	mkdir -p pkg/test-mocks/helm
@@ -61,7 +62,7 @@ _mockgen:
 	mockgen \
 		-destination pkg/test-mocks/daemon/daemon.go \
 		-package daemon \
-		github.com/replicatedhq/ship/pkg/lifecycle/daemon \
+		github.com/replicatedhq/ship/pkg/lifecycle/daemon/daemontypes \
 		Daemon
 	mockgen \
 		-destination pkg/test-mocks/planner/planner_mock.go \
@@ -128,6 +129,11 @@ _mockgen:
 		-package state \
 		github.com/replicatedhq/ship/pkg/state \
 		Manager
+	mockgen \
+		-destination pkg/test-mocks/lifecycle/messenger_mock.go \
+		-package lifecycle \
+		github.com/replicatedhq/ship/pkg/lifecycle \
+		Messenger
 
 mockgen: _mockgen fmt
 

deploy/Dockerfile

@@ -28,6 +28,15 @@ RUN curl -fsSLO "${TERRAFORM_URL}" \
 	&& ln -s "/usr/local/bin/terraform-${TERRAFORM_VERSION}" /usr/local/bin/terraform \
 	&& rm "$TERRAFORM_ZIP"
 
+ENV KUBECTL_VERSION=v1.11.1
+ENV KUBECTL_URL=https://storage.googleapis.com/kubernetes-release/release/${KUBECTL_VERSION}/bin/linux/amd64/kubectl
+ENV KUBECTL_SHA256SUM=d16a4e7bfe0033ea5f56f8d11e74f7a2dec5ff8832a046a643c8355b79b4ba5c
+
+RUN curl -fsSLO "${KUBECTL_URL}" \
+	&& echo "${KUBECTL_SHA256SUM}  kubectl" | sha256sum -c - \
+	&& chmod +x kubectl \
+	&& mv kubectl "/usr/local/bin/kubectl-${KUBECTL_VERSION}" \
+	&& ln -s "/usr/local/bin/kubectl-${KUBECTL_VERSION}" /usr/local/bin/kubectl
 
 LABEL "com.replicated.ship"="true"
 WORKDIR /out

hack/docs/mutations.json

@@ -731,7 +731,9 @@
           "level": "warn"
         }
       ]
-
+    },
+    "replace": {
+      "required": []
     }
   },
   {
@@ -783,5 +785,35 @@
     "path": "properties.assets.properties.v1.items.properties.terraform.properties",
     "delete": ["github"]
   },
+  {
+    "path": "properties.lifecycle.properties.v1.items.properties.kubectl",
+    "merge": {
+      "description": "A `kubectl` step will run `kubectl apply` with the provided file path and kubeconfig.",
+      "examples": [
+        { "path": "config.yml" },
+        {
+          "path": "k8s/another.yml",
+          "kubeconfig": "k8s/generated_kubeconfig"
+        }
+      ]
+    },
+    "replace": {
+      "required": [
+        "path"
+      ]
+    }
+  },
+  {
+    "path": "properties.lifecycle.properties.v1.items.properties.kubectl.properties.path",
+    "merge": {
+      "description": "the file to apply"
+    }
+  },
+  {
+    "path": "properties.lifecycle.properties.v1.items.properties.kubectl.properties.kubeconfig",
+    "merge": {
+      "description": "the kubeconfig file to use, overriding the system default"
+    }
+  },
   {}
 ]