ci: resolve conflicts

.github/workflows/dev-release.yml

@@ -11,6 +11,9 @@ jobs:
       - name: Source Checkout Dev
         id: source-checkout-dev
         uses: actions/checkout@v1
+      - uses: actions/setup-go@v2
+        with:
+          go-version: '1.16.0'
       - name: Dev-Release
         id: dev-release
         shell: bash

.github/workflows/release.yml

@@ -11,6 +11,9 @@ jobs:
       - name: Source Checkout
         id: source-checkout
         uses: actions/checkout@v1
+      - uses: actions/setup-go@v2
+        with:
+          go-version: '1.16.0'
       - name: Release
         id: release
         shell: bash

.releaserc.js

@@ -1,15 +1,16 @@
 module.exports = {
-    plugins: [ 
+    plugins: [
         "@semantic-release/commit-analyzer",
         "@semantic-release/release-notes-generator",
         ["@semantic-release/github", {
             "assets": [
-              {"path": "./artifacts/orbctl-Darwin-x86_64", "label": "Darwin x86_64"},
-              {"path": "./artifacts/orbctl-FreeBSD-x86_64", "label": "FreeBSD x86_64"},
-              {"path": "./artifacts/orbctl-Linux-x86_64", "label": "Linux x86_64"},
-              {"path": "./artifacts/orbctl-OpenBSD-x86_64", "label": "OpenBSD x86_64"},
-              {"path": "./artifacts/orbctl-Windows-x86_64.exe", "label": "Windows x86_64"}
+                {"path": "./artifacts/orbctl-Darwin-x86_64", "label": "Darwin x86_64"},
+                {"path": "./artifacts/orbctl-Darwin-ARM64", "label": "Darwin ARM64"},
+                {"path": "./artifacts/orbctl-FreeBSD-x86_64", "label": "FreeBSD x86_64"},
+                {"path": "./artifacts/orbctl-Linux-x86_64", "label": "Linux x86_64"},
+                {"path": "./artifacts/orbctl-OpenBSD-x86_64", "label": "OpenBSD x86_64"},
+                {"path": "./artifacts/orbctl-Windows-x86_64.exe", "label": "Windows x86_64"},
             ]
         }]
     ]
-  };
+};

build/orbos/Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.16.6-alpine3.13 as build
+FROM golang:1.16-alpine3.14 as build
 
 RUN apk update && \
     apk add -U --no-cache ca-certificates git curl openssh && \

cmd/chore/gen-executables/main.go

@@ -78,6 +78,7 @@ func main() {
 		orbctlBin(orbctlMain, *orbctldir, "linux", "amd64"),
 		orbctlBin(orbctlMain, *orbctldir, "openbsd", "amd64"),
 		orbctlBin(orbctlMain, *orbctldir, "windows", "amd64"),
+		orbctlBin(orbctlMain, *orbctldir, "darwin", "arm64"),
 	}
 	if *dev {
 		orbctls = []executables.Buildable{orbctlBin(orbctlMain, *orbctldir, runtime.GOOS, "amd64")}
@@ -101,6 +102,10 @@ func main() {
 func orbctlBin(mainPath, outPath, goos, goarch string) executables.Buildable {
 
 	arch := "x86_64"
+	switch goarch {
+	case "arm64":
+		arch = "ARM64"
+	}
 	os := strings.ToUpper(goos[0:1]) + goos[1:]
 	switch goos {
 	case "freebsd":

docs/orbiter/gce.md

@@ -41,7 +41,10 @@ $(sed s/^/\ \ /g /tmp/myorb_repo)
 EOF
 ```
 
-## Create a service account in a billable GCP project of your choice
+## Enable IAP in a billable GCP project of you choice and create a service account
+
+Please follow [this](https://cloud.google.com/iap/docs/enabling-compute-howto#iap-enable) instructions and enable IAP for the project in which the compute-instances should run.
+Under this [link](https://console.cloud.google.com/apis/library/iap.googleapis.com) in the console it should be possible to activate.
 
 Assign the service account the roles `Compute Admin`, `IAP-secured Tunnel User` and `Service Usage Admin`
 

go.mod

@@ -1,13 +1,13 @@
 module github.com/caos/orbos
 
-go 1.14
+go 1.16
 
 require (
-	github.com/AlecAivazis/survey/v2 v2.1.0
+	github.com/AlecAivazis/survey/v2 v2.2.15
 	github.com/AppsFlyer/go-sundheit v0.2.0
 	github.com/afiskon/promtail-client v0.0.0-20190305142237-506f3f921e9c
-	github.com/aws/aws-sdk-go v1.31.12
-	github.com/caos/oidc v0.14.4
+	github.com/aws/aws-sdk-go v1.40.7
+	github.com/caos/oidc v0.15.7
 	github.com/cloudflare/cloudflare-go v0.12.1
 	github.com/cloudscale-ch/cloudscale-go-sdk v1.6.0
 	github.com/fsnotify/fsnotify v1.5.0 // indirect
@@ -16,44 +16,42 @@ require (
 	github.com/go-delve/delve v1.6.1 // indirect
 	github.com/go-git/go-billy/v5 v5.0.0
 	github.com/go-git/go-git/v5 v5.2.0
-	github.com/golang/mock v1.5.0
-	github.com/golang/protobuf v1.4.2
-	github.com/golang/snappy v0.0.3 // indirect
+	github.com/golang/mock v1.6.0
 	github.com/google/go-github/v31 v31.0.0
 	github.com/google/uuid v1.2.0
+	github.com/hashicorp/go-rootcerts v1.0.2 // indirect
 	github.com/kataras/tablewriter v0.0.0-20180708051242-e063d29b7c23
 	github.com/kr/pty v1.1.8 // indirect
 	github.com/landoop/tableprinter v0.0.0-20200805134727-ea32388e35c1
 	github.com/mattn/go-colorable v0.1.4 // indirect
 	github.com/mattn/go-isatty v0.0.11 // indirect
 	github.com/mattn/go-runewidth v0.0.9 // indirect
 	github.com/onsi/ginkgo v1.16.4
-	github.com/onsi/gomega v1.10.2
+	github.com/onsi/gomega v1.14.0
 	github.com/philhofer/fwd v1.1.1 // indirect
 	github.com/pires/go-proxyproto v0.3.3
 	github.com/pkg/errors v0.9.1
-	github.com/prometheus/client_golang v1.7.1
+	github.com/prometheus/client_golang v1.11.0
 	github.com/rendon/testcli v1.0.0
 	github.com/satori/go.uuid v1.2.0
-	github.com/spf13/cobra v1.0.0
+	github.com/spf13/cobra v1.1.1
 	github.com/stretchr/testify v1.7.0
-	github.com/tinylib/msgp v1.1.2 // indirect
-	golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
-	golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4
-	golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43
+	github.com/tinylib/msgp v1.1.6 // indirect
+	golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83
+	golang.org/x/net v0.0.0-20210614182718-04defd469f4e
+	golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914
 	golang.org/x/sys v0.0.0-20210820121016-41cdb8703e55 // indirect
 	golang.org/x/tools v0.1.5 // indirect
-	google.golang.org/api v0.30.0
-	google.golang.org/grpc v1.31.0
-	google.golang.org/protobuf v1.25.0
+	google.golang.org/api v0.52.0
+	google.golang.org/grpc v1.39.0
+	google.golang.org/protobuf v1.27.1
 	gopkg.in/raintank/schema.v1 v1.0.0
 	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
-	k8s.io/api v0.19.2
-	k8s.io/apiextensions-apiserver v0.19.2
-	k8s.io/apimachinery v0.19.2
-	k8s.io/client-go v0.19.2
-	k8s.io/kubectl v0.18.3
-	sigs.k8s.io/controller-runtime v0.7.0
+	k8s.io/api v0.21.3
+	k8s.io/apiextensions-apiserver v0.21.3
+	k8s.io/apimachinery v0.21.3
+	k8s.io/client-go v0.21.3
+	k8s.io/kubectl v0.21.3
+	sigs.k8s.io/controller-runtime v0.9.5
 	sigs.k8s.io/controller-tools v0.4.1
-	sigs.k8s.io/yaml v1.2.0
 )