Merge pull request #34 from gianarb/bump/20210111

Bump tink stack 2021 01 11

.gitattributes

@@ -0,0 +1,2 @@
+# Use Unix line endings for scripts
+*.sh text eol=lf

.github/workflows/tags.yaml

@@ -7,7 +7,7 @@ jobs:
   release:
     runs-on: ubuntu-latest
     steps:
-      - run: sudo apt install -y libgpgme-dev libassuan-dev libdevmapper-dev
+      - run: sudo apt-get update && sudo apt install -y libgpgme-dev libassuan-dev libdevmapper-dev
       - name: Checkout code
         uses: actions/checkout@v2
       - uses: actions/setup-go@v2

.gitignore

@@ -1,2 +1,3 @@
 envrc
 out
+.env

README.md

@@ -14,7 +14,7 @@ is running the hood. Sandbox runs a pinned version for all the components via
 commit sha. In this way as a user you won't be effected (ideally) from new code
 that will may change a bit how Tinkerbell works.
 
-We are keeping the number of bc break as low as possible but in the current
+We are keeping the number of breaking changes as low as possible but in the current
 state they are expected.
 
 ## Binary release

cmd/getbinariesfromquay/main.go

@@ -98,14 +98,14 @@ func main() {
 		if err != nil {
 			log.Fatal(err)
 		}
-		err = copyBinaryFromLastLayer(path.Join(imgsDir, imgDir), path.Join(releaseDir, imgDir), binaryToCopy)
+		err = untarLayers(path.Join(imgsDir, imgDir), path.Join(releaseDir, imgDir), binaryToCopy)
 		if err != nil {
 			log.Fatal(err)
 		}
 	}
 }
 
-func copyBinaryFromLastLayer(src, dest, binaryPath string) error {
+func untarLayers(src, dest, binaryPath string) error {
 	b, err := ioutil.ReadFile(path.Join(src, "manifest.json"))
 	if err != nil {
 		return err
@@ -114,14 +114,15 @@ func copyBinaryFromLastLayer(src, dest, binaryPath string) error {
 	if err != nil {
 		return err
 	}
-	last := man.LayerInfos()[len(man.LayerInfos())-1]
-	layerTar, err := os.Open(path.Join(src, last.Digest.String()[7:]))
-	if err != nil {
-		return err
-	}
-	err = tar.Untar(src, layerTar)
-	if err != nil {
-		return err
+	for _, l := range man.LayerInfos() {
+		layerTar, err := os.Open(path.Join(src, l.Digest.String()[7:]))
+		if err != nil {
+			return err
+		}
+		err = tar.Untar(src, layerTar)
+		if err != nil {
+			return err
+		}
 	}
 
 	input, err := ioutil.ReadFile(path.Join(src, binaryPath))

current_versions.sh

@@ -4,9 +4,9 @@
 # automation that needs to get the version of the programs currently supported
 # in sandbox
 
-export OSIE_DOWNLOAD_LINK=https://tinkerbell-oss.s3.amazonaws.com/osie-uploads/osie-v0-n=366,c=1aec189,b=master.tar.gz
-export TINKERBELL_TINK_SERVER_IMAGE=quay.io/tinkerbell/tink:sha-0e8e5733
-export TINKERBELL_TINK_CLI_IMAGE=quay.io/tinkerbell/tink-cli:sha-0e8e5733
-export TINKERBELL_TINK_BOOTS_IMAGE=quay.io/tinkerbell/boots:sha-e81a291c
-export TINKERBELL_TINK_HEGEL_IMAGE=quay.io/tinkerbell/hegel:sha-c17b512f
-export TINKERBELL_TINK_WORKER_IMAGE=quay.io/tinkerbell/tink-worker:sha-0e8e5733
+export OSIE_DOWNLOAD_LINK="https://tinkerbell-oss.s3.amazonaws.com/osie-uploads/osie-v0-n=404,c=c35a5f8,b=master.tar.gz"
+export TINKERBELL_TINK_SERVER_IMAGE=quay.io/tinkerbell/tink:sha-57eb0efb
+export TINKERBELL_TINK_CLI_IMAGE=quay.io/tinkerbell/tink-cli:sha-57eb0efb
+export TINKERBELL_TINK_BOOTS_IMAGE=quay.io/tinkerbell/boots:sha-a449ad23
+export TINKERBELL_TINK_HEGEL_IMAGE=quay.io/tinkerbell/hegel:sha-c8a68311
+export TINKERBELL_TINK_WORKER_IMAGE=quay.io/tinkerbell/tink-worker:sha-57eb0efb

deploy/db/tinkerbell-init.sql

@@ -1,76 +0,0 @@
-SET ROLE tinkerbell;
-
-CREATE TABLE IF NOT EXISTS hardware (
-	id UUID UNIQUE
-	, inserted_at TIMESTAMPTZ
-	, deleted_at TIMESTAMPTZ
-	, data JSONB
-);
-
-CREATE INDEX IF NOT EXISTS idx_id ON hardware (id);
-CREATE INDEX IF NOT EXISTS idx_deleted_at ON hardware (deleted_at NULLS FIRST);
-CREATE INDEX IF NOT EXISTS idxgin_type ON hardware USING GIN (data JSONB_PATH_OPS);
-
-CREATE TABLE IF NOT EXISTS template (
-        id UUID UNIQUE NOT NULL
-        , name VARCHAR(200) NOT NULL
-        , created_at TIMESTAMPTZ
-        , updated_at TIMESTAMPTZ
-        , deleted_at TIMESTAMPTZ
-        , data BYTEA
-
-        CONSTRAINT CK_name CHECK (name ~ '^[a-zA-Z0-9_-]*$')
-);
-
-CREATE INDEX IF NOT EXISTS idx_tid ON template (id);
-CREATE INDEX IF NOT EXISTS idx_tdeleted_at ON template (deleted_at NULLS FIRST);
-
-CREATE TABLE IF NOT EXISTS workflow (
-	id UUID UNIQUE NOT NULL
-	, template UUID NOT NULL
-	, devices JSONB NOT NULL
-	, created_at TIMESTAMPTZ
-	, updated_at TIMESTAMPTZ
-	, deleted_at TIMESTAMPTZ
-);
-
-CREATE INDEX IF NOT EXISTS idx_wid ON workflow (id);
-CREATE INDEX IF NOT EXISTS idx_wdeleted_at ON workflow (deleted_at NULLS FIRST);
-
-CREATE TABLE IF NOT EXISTS workflow_state (
-        workflow_id UUID UNIQUE NOT NULL
-        , current_task_name VARCHAR(200)
-        , current_action_name VARCHAR(200)
-        , current_action_state SMALLINT
-        , current_worker VARCHAR(200)
-        , action_list JSONB
-        , current_action_index int
-        , total_number_of_actions INT
-);
-
-CREATE INDEX IF NOT EXISTS idx_wfid ON workflow_state (workflow_id);
-
-CREATE TABLE IF NOT EXISTS workflow_event (
-        workflow_id UUID NOT NULL
-        , worker_id UUID  NOT NULL
-        , task_name VARCHAR(200)
-        , action_name VARCHAR(200)
-        , execution_time int
-	, message VARCHAR(200)
-	, status SMALLINT
-        , created_at TIMESTAMPTZ
-);
-
-CREATE INDEX IF NOT EXISTS idx_event ON workflow_event (created_at);
-
-CREATE TABLE IF NOT EXISTS workflow_worker_map (
-        workflow_id UUID NOT NULL
-        , worker_id UUID NOT NULL
-);
-
-CREATE TABLE IF NOT EXISTS workflow_data (
-        workflow_id UUID NOT NULL
-        , version INT
-        , metadata JSONB
-        , data JSONB
-);

deploy/docker-compose.yml

@@ -65,7 +65,6 @@ services:
       POSTGRES_PASSWORD: tinkerbell
       POSTGRES_USER: tinkerbell
     volumes:
-      - ./db/tinkerbell-init.sql:/docker-entrypoint-initdb.d/tinkerbell-init.sql:ro
       - postgres_data:/var/lib/postgresql/data:rw
     ports:
       - 5432:5432

script/release-binaries.sh

@@ -4,25 +4,25 @@ source ./current_versions.sh
 
 go run cmd/getbinariesfromquay/main.go \
 	-binary-to-copy /usr/bin/hegel \
-	-image docker://quay.io/tinkerbell/hegel:sha-c17b512f \
+	-image docker://${TINKERBELL_TINK_HEGEL_IMAGE} \
 	-program hegel
 
 go run cmd/getbinariesfromquay/main.go \
 	-binary-to-copy /usr/bin/boots \
-	-image docker://quay.io/tinkerbell/boots:sha-e81a291c \
+	-image docker://${TINKERBELL_TINK_BOOTS_IMAGE} \
 	-program boots
 
 go run cmd/getbinariesfromquay/main.go \
 	-binary-to-copy /usr/bin/tink-worker \
-	-image docker://quay.io/tinkerbell/tink-worker:sha-0e8e5733 \
+	-image docker://${TINKERBELL_TINK_WORKER_IMAGE} \
 	-program tink-worker
 
 go run cmd/getbinariesfromquay/main.go \
 	-binary-to-copy /usr/bin/tink-server \
-	-image docker://quay.io/tinkerbell/tink:sha-0e8e5733 \
+	-image docker://${TINKERBELL_TINK_SERVER_IMAGE} \
 	-program tink-server
 
 go run cmd/getbinariesfromquay/main.go \
 	-binary-to-copy /usr/bin/tink \
-	-image docker://quay.io/tinkerbell/tink-cli:sha-0e8e5733 \
+	-image docker://${TINKERBELL_TINK_CLI_IMAGE} \
 	-program tink

setup.sh

@@ -487,6 +487,12 @@ whats_next() (
 	echo "$BLANK    Follow the steps described in https://tinkerbell.org/examples/hello-world/ to say 'Hello World!' with a workflow."
 )
 
+setup_nat() (
+	iptables -A FORWARD -i eth1 -o eth0 -j ACCEPT
+	iptables -A FORWARD -i eth0 -o eth1 -m state --state ESTABLISHED,RELATED -j ACCEPT
+	iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE
+)
+
 do_setup() (
 	# perform some very rudimentary platform detection
 	lsb_dist=$(get_distribution)
@@ -504,7 +510,7 @@ do_setup() (
 	source "$ENV_FILE"
 
 	setup_networking "$lsb_dist" "$lsb_version"
-
+	setup_nat
 	setup_osie
 	generate_certificates
 	setup_docker_registry