Merge branch 'master' into fix-get-worker-by-id

tinkerbell · Jul 5, 2021 · 07b5572 · 07b5572
2 parents d502ede + 4bdd9cb
commit 07b5572
Show file tree

Hide file tree

Showing 19 changed files with 195 additions and 579 deletions.
diff --git a/Makefile b/Makefile
@@ -4,6 +4,7 @@ all: cli server worker ## Build all binaries for host OS and CPU
 
 crosscompile: $(crossbinaries) ## Build all binaries for Linux and all supported CPU arches
 images: tink-cli-image tink-server-image tink-worker-image ## Build all docker images
+run: crosscompile run-stack ## Builds and runs the Tink stack (tink, db, cli) via docker-compose
 
 test: ## Run tests
 	go clean -testcache

diff --git a/db/mock/template.go b/db/mock/template.go
@@ -16,7 +16,7 @@ type Template struct {
 }
 
 // CreateTemplate creates a new workflow template
-func (d DB) CreateTemplate(ctx context.Context, name string, data string, id uuid.UUID) error {
+func (d *DB) CreateTemplate(ctx context.Context, name string, data string, id uuid.UUID) error {
 	if d.TemplateDB == nil {
 		d.TemplateDB = make(map[string]interface{})
 	}
@@ -66,6 +66,6 @@ func (d DB) UpdateTemplate(ctx context.Context, name string, data string, id uui
 }
 
 // ClearTemplateDB clear all the templates
-func (d DB) ClearTemplateDB() {
+func (d *DB) ClearTemplateDB() {
 	d.TemplateDB = make(map[string]interface{})
 }
diff --git a/deploy/db/tinkerbell-init.sql b/deploy/db/tinkerbell-init.sql
diff --git a/deploy/docker-compose.yml b/deploy/docker-compose.yml
diff --git a/deploy/registry/Dockerfile b/deploy/registry/Dockerfile
diff --git a/deploy/tls/.gitignore b/deploy/tls/.gitignore
diff --git a/deploy/tls/Dockerfile b/deploy/tls/Dockerfile
diff --git a/deploy/tls/ca.in.json b/deploy/tls/ca.in.json
diff --git a/deploy/tls/server-csr.in.json → deploy/tls/csr.json b/deploy/tls/server-csr.in.json → deploy/tls/csr.json
diff --git a/deploy/tls/entrypoint.sh b/deploy/tls/entrypoint.sh
diff --git a/deploy/tls/gencerts.sh b/deploy/tls/gencerts.sh
diff --git a/deploy/tls/generate.sh b/deploy/tls/generate.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+cfssl gencert -initca /code/tls/csr.json | cfssljson -bare ca -
+cfssl gencert -config /code/tls/ca-config.json -ca ca.pem -ca-key ca-key.pem -profile server /code/tls/csr.json | cfssljson -bare server
+cat server.pem ca.pem >/certs/"${FACILITY:-onprem}"/bundle.pem
+mv server-key.pem /certs/"${FACILITY:-onprem}"/server-key.pem
+rm -rf ca-key.pem ca.csr ca.pem server.csr server.pem