Merge pull request #59 from shipyard-run/nomad_job

Nomad job

Author: nicholasjackson

.github/workflows/build.yml

@@ -10,8 +10,14 @@ jobs:
       - name: Check out code into the Go module directory
         uses: actions/checkout@v2
 
+      - name: Setup Go version
+        uses: actions/setup-go@v2-beta
+        with:
+          go-version: '1.13.9' # The Go version to download (if necessary) and use.
+
       - name: Get dependencies
         run: |
+          go version
           go get -v -t ./...
 
       - name: Unit Test
@@ -32,9 +38,15 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Build and install 
-      run: make install_local
+      - uses: actions/checkout@v2
+      
+      - name: Setup Go version
+        uses: actions/setup-go@v2-beta
+        with:
+          go-version: '1.13.9' # The Go version to download (if necessary) and use.
+      
+      - name: Build and install 
+        run: make install_local
 
-    - name: Run tests
-      run: make test_functional
+      - name: Run tests
+        run: make test_functional

.github/workflows/release.yml

@@ -1,7 +1,6 @@
 name: goreleaser
 
 on:
-  pull_request:
   push:
     tags:
        - 'v*'

ChangeLog.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## version 0.0.4
+
+### Container
+Allow HTTP health checks to be added to containers
+
+
 ## version 0.0.2
 
 ## Docs

cmd/push.go

@@ -13,7 +13,7 @@ import (
 	"golang.org/x/xerrors"
 )
 
-func newPushCmd(ct clients.ContainerTasks, kc clients.Kubernetes, ht clients.HTTP, log hclog.Logger) *cobra.Command {
+func newPushCmd(ct clients.ContainerTasks, kc clients.Kubernetes, ht clients.HTTP, nc clients.Nomad, l hclog.Logger) *cobra.Command {
 	return &cobra.Command{
 		Use:                   "push [image] [cluster]",
 		Short:                 "Push a local Docker image to a cluster",
@@ -50,9 +50,9 @@ func newPushCmd(ct clients.ContainerTasks, kc clients.Kubernetes, ht clients.HTT
 
 			switch p.Info().Type {
 			case config.TypeK8sCluster:
-				return pushK8sCluster(image, p.(*config.K8sCluster), ct, kc, ht, log)
+				return pushK8sCluster(image, p.(*config.K8sCluster), ct, kc, ht, l)
 			case config.TypeNomadCluster:
-				return pushNomadCluster(image, p.(*config.NomadCluster), ct, ht, log)
+				return pushNomadCluster(image, p.(*config.NomadCluster), ct, nc, l)
 			}
 
 			return nil
@@ -80,7 +80,7 @@ func pushK8sCluster(image string, c *config.K8sCluster, ct clients.ContainerTask
 	return nil
 }
 
-func pushNomadCluster(image string, c *config.NomadCluster, ct clients.ContainerTasks, ht clients.HTTP, log hclog.Logger) error {
+func pushNomadCluster(image string, c *config.NomadCluster, ct clients.ContainerTasks, ht clients.Nomad, log hclog.Logger) error {
 	cl := providers.NewNomadCluster(c, ct, ht, log)
 
 	// get the id of the cluster

cmd/push_test.go

@@ -20,8 +20,9 @@ func setupPush(state string) (*cobra.Command, *mocks.MockContainerTasks, func())
 
 	mk := &mocks.MockKubernetes{}
 	mh := &mocks.MockHTTP{}
+	mn := &mocks.MockNomad{}
 
-	return newPushCmd(mt, mk, mh, hclog.NewNullLogger()), mt, setupState(state)
+	return newPushCmd(mt, mk, mh, mn, hclog.NewNullLogger()), mt, setupState(state)
 }
 
 func TestPushInvalidArgsReturnsError(t *testing.T) {

cmd/root.go

@@ -60,7 +60,7 @@ func init() {
 	//rootCmd.AddCommand(toolsCmd)
 	//rootCmd.AddCommand(upgradeCmd)
 	rootCmd.AddCommand(uninstallCmd)
-	rootCmd.AddCommand(newPushCmd(engineClients.ContainerTasks, engineClients.Kubernetes, engineClients.HTTP, logger))
+	rootCmd.AddCommand(newPushCmd(engineClients.ContainerTasks, engineClients.Kubernetes, engineClients.HTTP, engineClients.Nomad, logger))
 }
 
 func configure() {

functional_tests/features/single_container.feature

@@ -2,7 +2,7 @@ Feature: Docker Container
   In order to test Docker containers
   I should apply a blueprint
 
-  Scenario: Single Container
+  Scenario: Single Container from Local Blueprint
     Given I apply the config "./test_fixtures/single_container"
     Then there should be 1 network called "onprem"
     And there should be 1 container running called "consul.container.shipyard"

functional_tests/features/single_k3s_cluster.feature

@@ -7,4 +7,5 @@ Feature: Kubernetes Cluster
     Given I apply the config "./test_fixtures/single_k3s_cluster"
     Then there should be 1 network called "cloud"
     And there should be 1 container running called "server.k3s.k8s_cluster.shipyard"
+    And there should be 1 container running called "consul-http.ingress.shipyard"
     And a call to "http://localhost:18500/v1/agent/members" should result in status 200

functional_tests/main_test.go

@@ -13,13 +13,14 @@ import (
 	"testing"
 	"time"
 
+	"os/exec"
+
 	"github.com/DATA-DOG/godog"
 	"github.com/DATA-DOG/godog/colors"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/filters"
 	"github.com/hashicorp/go-hclog"
 	"github.com/shipyard-run/shipyard/pkg/shipyard"
-	"k8s.io/utils/exec"
 )
 
 var currentClients *shipyard.Clients
@@ -73,8 +74,10 @@ func FeatureContext(s *godog.Suite) {
 	})
 
 	s.AfterScenario(func(interface{}, error) {
-		ex := exec.New()
-		cmd := ex.Command("yard-dev", []string{"destroy"}...)
+		fmt.Println("")
+		cmd := exec.Command("yard-dev", []string{"destroy"}...)
+		cmd.Stdout = os.Stdout
+		cmd.Stderr = os.Stderr
 		cmd.Run()
 	})
 }
@@ -88,9 +91,19 @@ func iRunApply(config string) error {
 	}
 
 	// run the shipyard executable
-	ex := exec.New()
-	cmd := ex.Command("yard-dev", []string{"run", config}...)
-	return cmd.Run()
+	cmd := exec.Command("yard-dev", []string{"run", "--no-browser", config}...)
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
+
+	runErr := cmd.Run()
+
+	if runErr != nil {
+		if exitError, ok := runErr.(*exec.ExitError); ok {
+			return fmt.Errorf("Shipyard command exited with status code %d", exitError.ExitCode())
+		}
+	}
+
+	return nil
 }
 
 func thereShouldBeContainerRunningCalled(arg1 int, arg2 string) error {
@@ -147,7 +160,7 @@ func thereShouldBe1NetworkCalled(arg1 string) error {
 func aCallToShouldResultInStatus(arg1 string, arg2 int) error {
 	// try 100 times
 	var err error
-	for i := 0; i < 100; i++ {
+	for i := 0; i < 200; i++ {
 		var resp *http.Response
 		resp, err = http.Get(arg1)
 

functional_tests/test_fixtures/nomad/app_config/example2.nomad

@@ -0,0 +1,73 @@
+job "example_2" {
+  datacenters = ["dc1"]
+  type = "service"
+
+  update {
+    max_parallel = 1
+    min_healthy_time = "10s"
+    healthy_deadline = "3m"
+    progress_deadline = "10m"
+    auto_revert = false
+    canary = 0
+  }
+  
+  migrate {
+    max_parallel = 1
+    health_check = "checks"
+    min_healthy_time = "10s"
+    healthy_deadline = "5m"
+  }
+  
+  group "cache" {
+    count = 1
+
+    restart {
+      # The number of attempts to run the job within the specified interval.
+      attempts = 2
+      interval = "30m"
+      delay = "15s"
+      mode = "fail"
+    }
+    
+    ephemeral_disk {
+      size = 200
+    }
+
+    task "redis" {
+      # The "driver" parameter specifies the task driver that should be used to
+      # run the task.
+      driver = "docker"
+
+      config {
+        image = "redis:3.2"
+
+        port_map {
+          db = 6380
+        }
+      }
+
+      resources {
+        cpu    = 500 # 500 MHz
+        memory = 256 # 256MB
+
+        network {
+          mbits = 10
+          port  "db"  {}
+        }
+      }
+      
+      service {
+        name = "redis-cache"
+        tags = ["global", "cache"]
+        port = "db"
+
+        check {
+          name     = "alive"
+          type     = "tcp"
+          interval = "10s"
+          timeout  = "2s"
+        }
+      }
+    }
+  }
+}