Merge pull request #2025 from replicatedhq/divolgin/embed-experiment

Build experimental binary

.github/workflows/deploy.yaml

@@ -19,7 +19,7 @@ jobs:
         go-version: '^1.16.3'
 
     - run: sudo apt-get update
-    - run: sudo apt-get -qq -y install gnupg2 libdevmapper-dev libgpgme-dev libc6-dev-i386 btrfs-progs
+    - run: sudo apt-get -qq -y install gnupg2 libdevmapper-dev libgpgme-dev libc6-dev-i386 btrfs-progs pkg-config libgpgme-dev
     - name: set previous release tag for goreleaser
       shell: bash
       run: |

Makefile.build

@@ -1,6 +1,6 @@
 export GO111MODULE=on
 export GOPROXY=https://proxy.golang.org
-export CGO_ENABLED=1
+export CGO_ENABLED=0
 
 SHELL := /bin/bash -o pipefail
 VERSION_PACKAGE = github.com/replicatedhq/kots/pkg/buildversion

cmd/kots/cli/experimental-off.go

@@ -0,0 +1,9 @@
+// +build !kots_experimental
+
+package cli
+
+import "github.com/spf13/cobra"
+
+func addExperimentalCmds(cmd *cobra.Command) {
+	// no-op
+}

cmd/kots/cli/experimental-on.go

@@ -0,0 +1,9 @@
+// +build kots_experimental
+
+package cli
+
+import "github.com/spf13/cobra"
+
+func addExperimentalCmds(cmd *cobra.Command) {
+	cmd.AddCommand(RunCmd())
+}

cmd/kots/cli/root.go

@@ -42,7 +42,8 @@ func RootCmd() *cobra.Command {
 	cmd.AddCommand(AppStatusCmd())
 	cmd.AddCommand(GetCmd())
 	cmd.AddCommand(SetCmd())
-	cmd.AddCommand(RunCmd())
+
+	addExperimentalCmds(cmd)
 
 	viper.BindPFlags(cmd.Flags())
 

cmd/kots/cli/run.go

@@ -1,3 +1,5 @@
+// +build kots_experimental
+
 package cli
 
 import (

deploy/.goreleaser.yaml

@@ -12,7 +12,7 @@ builds:
     goarch:
     - amd64
     env:
-      - CGO_ENABLED=1
+      - CGO_ENABLED=0
       - GO111MODULE=on
     main: cmd/kots/main.go
     ldflags: -s -w
@@ -23,6 +23,23 @@ builds:
     binary: kots
     hooks: {}
 
+  - id: kots_experimental
+    goos:
+    - linux
+    goarch:
+    - amd64
+    env:
+    - CGO_ENABLED=1
+    - GO111MODULE=on
+    main: cmd/kots/main.go
+    ldflags: -s -w
+      -X github.com/replicatedhq/kots/pkg/buildversion.version={{.Version}}
+      -X github.com/replicatedhq/kots/pkg/buildversion.gitSHA={{.FullCommit}}
+      -X github.com/replicatedhq/kots/pkg/buildversion.buildTime={{.Date}}
+    flags: -tags netgo -tags containers_image_ostree_stub -tags exclude_graphdriver_devicemapper -tags exclude_graphdriver_btrfs -tags containers_image_openpgp -tags kots_experimental -installsuffix netgo
+    binary: kots
+    hooks: {}
+
 archives:
   - id: kots
     builds:
@@ -38,3 +55,18 @@ archives:
       - README*
       - changelog*
       - CHANGELOG*
+
+  - id: kots_experimental
+    builds:
+      - kots_experimental
+    format: tar.gz
+    name_template: '{{ .Binary }}_{{ .Os }}_{{ .Arch }}_experimental'
+    files:
+      - licence*
+      - LICENCE*
+      - license*
+      - LICENSE*
+      - readme*
+      - README*
+      - changelog*
+      - CHANGELOG*