Merge remote-tracking branch 'upstream/master'

.github/workflows/goreleaser.yml

@@ -0,0 +1,29 @@
+name: goreleaser
+
+on:
+  push:
+    tags:
+      - '*'
+
+jobs:
+  goreleaser:
+    runs-on: ubuntu-latest
+    steps:
+      -
+        name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      -
+        name: Set up Go
+        uses: actions/setup-go@v2
+        with:
+          go-version: 1.16
+      -
+        name: Run GoReleaser
+        uses: goreleaser/goreleaser-action@v2
+        with:
+          version: latest
+          args: release --rm-dist
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.goreleaser.yml

@@ -7,8 +7,8 @@ builds:
       - linux
     goarch:
       - amd64
-archive:
-  format: binary
+archives:
+- format: binary
 checksum:
   name_template: 'checksums.txt'
 snapshot:

build/Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:alpine AS build
+FROM golang:1.16-alpine AS build
 
 RUN apk add --no-cache \
       git \
@@ -17,7 +17,7 @@ WORKDIR /out
 RUN curl -sL https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl -o usr/local/bin/kubectl && \
     chmod +x usr/local/bin/kubectl
 
-FROM google/cloud-sdk:alpine
+FROM google/cloud-sdk:239.0.0-alpine
 LABEL maintainer="Marc Wickenden <marc@4armed.com>"
 
 RUN apk add --no-cache \

go.mod

@@ -0,0 +1,34 @@
+module github.com/4armed/kubeletmein
+
+go 1.16
+
+require (
+	cloud.google.com/go v0.33.1
+	github.com/fatih/color v1.7.0 // indirect
+	github.com/ghodss/yaml v1.0.0 // indirect
+	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
+	github.com/google/btree v1.0.0 // indirect
+	github.com/googleapis/gnostic v0.5.4 // indirect
+	github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
+	github.com/hashicorp/golang-lru v0.5.0 // indirect
+	github.com/imdario/mergo v0.3.6 // indirect
+	github.com/inconshreveable/mousetrap v1.0.0 // indirect
+	github.com/kris-nova/lolgopher v0.0.0-20180921204813-313b3abb0d9b // indirect
+	github.com/kubicorn/kubicorn v0.0.0-20181105233416-70f8aeca1062
+	github.com/mattn/go-colorable v0.0.9 // indirect
+	github.com/mattn/go-isatty v0.0.4 // indirect
+	github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
+	github.com/spf13/cobra v0.0.3
+	github.com/spf13/pflag v1.0.3 // indirect
+	github.com/stretchr/testify v1.7.0 // indirect
+	golang.org/x/oauth2 v0.0.0-20181128211412-28207608b838 // indirect
+	golang.org/x/time v0.0.0-20181108054448-85acf8d2951c // indirect
+	gopkg.in/inf.v0 v0.9.1 // indirect
+	gopkg.in/yaml.v2 v2.2.8
+	k8s.io/api v0.0.0-20181121071145-b7bd5f2d334c // indirect
+	k8s.io/apimachinery v0.0.0-20181126191516-4a9a8137c0a1
+	k8s.io/client-go v9.0.0+incompatible
+	k8s.io/klog v0.1.0 // indirect
+	k8s.io/kube-openapi v0.0.0-20210216185858-15cd8face8d6 // indirect
+	k8s.io/kubernetes v1.12.3
+)

pkg/bootstrap/do.go

@@ -116,7 +116,7 @@ func bootstrapDoCmd(c *config.Config) *cobra.Command {
 			}
 
 			logger.Info("wrote bootstrap-kubeconfig")
-			logger.Info("now generate a new node certificate with: kubeletmein do generate")
+			logger.Info("now generate a new node certificate with: kubeletmein generate")
 
 			return err
 		},

pkg/bootstrap/gke.go

@@ -134,7 +134,7 @@ func bootstrapGkeCmd(c *config.Config) *cobra.Command {
 			}
 
 			logger.Info("wrote bootstrap-kubeconfig")
-			logger.Info("now generate a new node certificate with: kubeletmein gke generate")
+			logger.Info("now generate a new node certificate with: kubeletmein generate")
 
 			return err
 		},