fix: pull request actions workflow (#4)

* test pr

* fix: actions

* f

* fix

* fix: helm values

* fix: e2e tests

* fix: unit tests exclude e2e

Author: emosbaugh

.github/pullrequest.yml renamed to .github/workflows/pullrequest.yml

@@ -21,4 +21,4 @@ jobs:
         with:
           go-version: '1.20'
       - uses: actions/checkout@v3
-      - run: make smoketest
+      - run: make smoketests

Makefile

@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 
+include embedded-bins/Makefile.variables
 include inttest/Makefile.variables
 
 BIN_DIR := $(shell pwd)/bin
@@ -12,7 +13,6 @@ help: ## Display this help
 	@awk 'BEGIN {FS = ":.*##"; printf "\nUsage:\n  make \033[36m<target>\033[0m\n"} /^[a-zA-Z_0-9-]+:.*?##/ { printf "  \033[36m%-15s\033[0m %s\n", $$1, $$2 } /^##@/ { printf "\n\033[1m%s\033[0m\n", substr($$0, 5) } ' $(MAKEFILE_LIST)
 
 ##@ Build
-ADMIN_CONSOLE_VERSION=1.99.0
 
 GO_TAGS = -tags=''
 
@@ -44,17 +44,17 @@ bin/helmbin: $(GO_SRCS) go.sum
 	@mkdir -p bin
 	CGO_ENABLED=0 go build $(GO_GCFLAGS) $(GO_ASMFLAGS) $(LD_FLAGS) $(GO_TAGS) -o $(BIN) ./cmd/helmbin
 
-static: static/bin/k0s static/helm/000-admin-console-$(ADMIN_CONSOLE_VERSION).tgz ## Build static assets
+static: static/bin/k0s static/helm/000-admin-console-$(admin_console_version).tgz ## Build static assets
 
 static/bin/k0s:
 	@mkdir -p static/bin
-	@curl -sSL -o static/bin/k0s https://github.com/k0sproject/k0s/releases/download/v1.27.2%2Bk0s.0/k0s-v1.27.2+k0s.0-amd64
+	@curl -fsSL -o static/bin/k0s https://github.com/k0sproject/k0s/releases/download/$(k0s_version)/k0s-$(k0s_version)-amd64
 	chmod +x static/bin/k0s
 
-static/helm/000-admin-console-$(ADMIN_CONSOLE_VERSION).tgz: helm
+static/helm/000-admin-console-$(admin_console_version).tgz: helm
 	@mkdir -p static/helm
-	@helm pull oci://registry.replicated.com/library/admin-console --version=$(ADMIN_CONSOLE_VERSION)
-	mv admin-console-$(ADMIN_CONSOLE_VERSION).tgz static/helm/000-admin-console-$(ADMIN_CONSOLE_VERSION).tgz
+	@helm pull oci://registry.replicated.com/library/admin-console --version=$(admin_console_version)
+	mv admin-console-$(admin_console_version).tgz static/helm/000-admin-console-$(admin_console_version).tgz
 
 ##@ Development
 
@@ -68,7 +68,7 @@ lint-fix: golangci-lint ## Run golangci-lint linter and perform fixes
 
 .PHONY: test
 test: ## Run the unit tests
-	go test $(GO_TAGS) -race -v ./...
+	go test $(GO_TAGS) -race -v ./pkg/...
 
 .PHONY: $(smoketests)
 $(smoketests): build
@@ -85,8 +85,7 @@ golangci-lint:
 	curl -fsSL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(shell dirname $(GOLANGCI_LINT));\
 	}
 
-HELM_VERSION = v3.12.0
 .PHONY: helm
 helm:
 	@mkdir -p $(BIN_DIR)
-	curl -fsSL https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 | DESIRED_VERSION=$(HELM_VERSION) HELM_INSTALL_DIR=$(BIN_DIR) bash
+	curl -fsSL https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 | DESIRED_VERSION=v$(helm_version) HELM_INSTALL_DIR=$(BIN_DIR) bash

README.md

@@ -12,15 +12,15 @@ Usage:
 Available Commands:
   completion  Generate the autocompletion script for the specified shell
   help        Help about any command
-  install     Installs and starts the server as a systemd service
+  install     Installs and starts a controller+worker as a systemd service
   kubectl     kubectl controls the Kubernetes cluster manager
-  run         Runs the server
+  run         Runs a controller+worker node
   start       Starts the systemd service
   stop        Stops the systemd service
   version     Prints version information
 
 Flags:
-  -d, --debug                Debug logging (default: false)
+  -d, --debug                Enables debug logging
   -h, --help                 help for helmbin
 
 Use "helmbin [command] --help" for more information about a command.
@@ -37,33 +37,49 @@ go build -gcflags "all=-trimpath=/home/ethan/go/src/github.com/emosbaugh" -asmfl
 
 ```bash
 ./bin/helmbin server  --help
-Runs the server
+Runs a controller+worker node
 
 Usage:
-  helmbin server [flags]
+  helmbin run [flags]
+  helmbin run [command]
 
-Aliases:
-  server, controller
+Available Commands:
+  controller  Runs a controller node
+  worker      Runs a worker node
 
 Flags:
-      --data-dir string   Path to the data directory. (default "/var/lib/replicated")
-  -h, --help              help for server
-
-Global Flags:
-  -d, --debug                Debug logging (default: false)
+  -c, --config string       k0s config file, use '-' to read the config from stdin (default "/etc/k0s/k0s.yaml")
+      --data-dir string     Data Directory. DO NOT CHANGE for an existing setup, things will break! (default "/var/lib/replicated")
+  -d, --debug               Debug logging (default: false)
+      --enable-worker       enable worker (default true)
+  -h, --help                help for run
+      --no-taints           disable default taints for controller node (default true)
+      --token-file string   Path to the file containing join-token.
+
+Use "helmbin run [command] --help" for more information about a command.
 ```
 
 ```bash
 $ ./bin/helmbin install --help
-Installs the server as a systemd service
+Installs and starts a controller+worker as a systemd service
 
 Usage:
   helmbin install [flags]
+  helmbin install [command]
 
-Flags:
-      --data-dir string   Path to the data directory. (default "/var/lib/replicated")
-  -h, --help              help for install
+Available Commands:
+  controller  Installs and starts a controller as a systemd service
+  controller  Installs and starts a worker as a systemd service
 
-Global Flags:
-  -d, --debug                Debug logging (default: false)
+Flags:
+  -c, --config string       k0s config file, use '-' to read the config from stdin (default "/etc/k0s/k0s.yaml")
+      --data-dir string     Data Directory. DO NOT CHANGE for an existing setup, things will break! (default "/var/lib/replicated")
+  -d, --debug               Debug logging (default: false)
+      --enable-worker       enable worker (default true)
+  -h, --help                help for install
+      --no-taints           disable default taints for controller node (default true)
+      --start               Start the service after installation (default true)
+      --token-file string   Path to the file containing join-token.
+
+Use "helmbin install [command] --help" for more information about a command.
 ```

embedded-bins/Makefile.variables

@@ -0,0 +1,10 @@
+k0s_version = v1.27.2+k0s.0
+admin_console_version = 1.99.0
+
+alpine_version = 3.17
+alpine_patch_version = $(alpine_version).3
+golang_buildimage=docker.io/library/golang:$(go_version)-alpine$(alpine_version)
+go_version = 1.20.4
+kubernetes_version = 1.27.2
+helm_version = 3.11.1
+etcd_version = 3.5.9

go.mod

@@ -18,7 +18,6 @@ require (
 	k8s.io/cli-runtime v0.27.2
 	k8s.io/client-go v0.27.2
 	k8s.io/component-base v0.27.2
-	k8s.io/klog/v2 v2.100.1
 	k8s.io/kubectl v0.27.2
 	sigs.k8s.io/controller-runtime v0.13.1-0.20230412185432-fbd6b944a634
 	sigs.k8s.io/yaml v1.3.0
@@ -35,7 +34,6 @@ require (
 	github.com/Masterminds/sprig v2.22.0+incompatible // indirect
 	github.com/Masterminds/sprig/v3 v3.2.3 // indirect
 	github.com/Masterminds/squirrel v1.5.3 // indirect
-	github.com/Microsoft/go-winio v0.6.1 // indirect
 	github.com/NYTimes/gziphandler v1.1.1 // indirect
 	github.com/antlr/antlr4/runtime/Go/antlr v1.4.10 // indirect
 	github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535 // indirect
@@ -46,6 +44,7 @@ require (
 	github.com/cenkalti/backoff/v4 v4.2.0 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/chai2010/gettext-go v1.0.2 // indirect
+	github.com/cloudflare/cfssl v1.6.4 // indirect
 	github.com/containerd/containerd v1.7.1 // indirect
 	github.com/coreos/go-semver v0.3.0 // indirect
 	github.com/coreos/go-systemd/v22 v22.5.0 // indirect
@@ -81,6 +80,7 @@ require (
 	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/google/btree v1.1.2 // indirect
 	github.com/google/cel-go v0.12.6 // indirect
+	github.com/google/certificate-transparency-go v1.1.4 // indirect
 	github.com/google/gnostic v0.6.9 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
@@ -100,6 +100,8 @@ require (
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/kardianos/service v1.2.2 // indirect
+	github.com/karrick/godirwalk v1.17.0 // indirect
+	github.com/kisielk/sqlstruct v0.0.0-20201105191214-5f3e10d3ab46 // indirect
 	github.com/klauspost/compress v1.16.0 // indirect
 	github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
 	github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
@@ -137,15 +139,17 @@ require (
 	github.com/rivo/uniseg v0.2.0 // indirect
 	github.com/rubenv/sql-migrate v1.3.1 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
-	github.com/sergi/go-diff v1.2.0 // indirect
 	github.com/shopspring/decimal v1.3.1 // indirect
 	github.com/spf13/cast v1.5.0 // indirect
 	github.com/stoewer/go-strcase v1.2.0 // indirect
 	github.com/weaveworks/footloose v0.0.0-20210208164054-2862489574a3 // indirect
+	github.com/weppos/publicsuffix-go v0.15.1-0.20210511084619-b1f36a2d6c0b // indirect
 	github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
 	github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
 	github.com/xeipuuv/gojsonschema v1.2.0 // indirect
 	github.com/xlab/treeprint v1.1.0 // indirect
+	github.com/zmap/zcrypto v0.0.0-20210511125630-18f1e0152cfc // indirect
+	github.com/zmap/zlint/v3 v3.1.0 // indirect
 	go.etcd.io/etcd/api/v3 v3.5.9 // indirect
 	go.etcd.io/etcd/client/pkg/v3 v3.5.9 // indirect
 	go.etcd.io/etcd/client/v3 v3.5.9 // indirect
@@ -171,7 +175,6 @@ require (
 	golang.org/x/term v0.7.0 // indirect
 	golang.org/x/text v0.9.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
-	golang.org/x/tools v0.8.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 // indirect
 	google.golang.org/grpc v1.54.0 // indirect
@@ -184,6 +187,7 @@ require (
 	k8s.io/cloud-provider v0.27.2 // indirect
 	k8s.io/component-helpers v0.27.2 // indirect
 	k8s.io/controller-manager v0.27.2 // indirect
+	k8s.io/klog/v2 v2.100.1 // indirect
 	k8s.io/kms v0.27.2 // indirect
 	k8s.io/kube-aggregator v0.27.2 // indirect
 	k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
@@ -207,9 +211,9 @@ replace (
 	// which includes https://github.com/open-telemetry/opentelemetry-go/pull/3631.
 	// This is incompatible to the current Kubernetes libraries, which still
 	// use those deprecated packages. Use v0.35.0 instead, which is the last
-	// version that includes those. Use the otelhttp instrumentation which is
+	// version that includes those. Use an otelhttp instrumentation which is
 	// compatible to metric v0.35, too.
-	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp => go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.38.0
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp => go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.39.0
 	go.opentelemetry.io/otel/metric => go.opentelemetry.io/otel/metric v0.35.0
 
 	// Use a patched version of Helm so that it compiles using Kubernetes 1.27.
@@ -220,34 +224,34 @@ replace (
 
 // Replacements duplicated from upstream Kubernetes
 replace (
-	// https://github.com/kubernetes/kubernetes/blob/v1.27.1/go.mod#L245-L275
-	k8s.io/api => k8s.io/api v0.27.1
-	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.27.1
-	k8s.io/apimachinery => k8s.io/apimachinery v0.27.1
-	k8s.io/apiserver => k8s.io/apiserver v0.27.1
-	k8s.io/cli-runtime => k8s.io/cli-runtime v0.27.1
-	k8s.io/client-go => k8s.io/client-go v0.27.1
-	k8s.io/cloud-provider => k8s.io/cloud-provider v0.27.1
-	k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.27.1
-	k8s.io/code-generator => k8s.io/code-generator v0.27.1
-	k8s.io/component-base => k8s.io/component-base v0.27.1
-	k8s.io/component-helpers => k8s.io/component-helpers v0.27.1
-	k8s.io/controller-manager => k8s.io/controller-manager v0.27.1
-	k8s.io/cri-api => k8s.io/cri-api v0.27.1
-	k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.27.1
-	k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.27.1
-	k8s.io/kms => k8s.io/kms v0.27.1
-	k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.27.1
-	k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.27.1
-	k8s.io/kube-proxy => k8s.io/kube-proxy v0.27.1
-	k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.27.1
-	k8s.io/kubectl => k8s.io/kubectl v0.27.1
-	k8s.io/kubelet => k8s.io/kubelet v0.27.1
-	k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.27.1
-	k8s.io/metrics => k8s.io/metrics v0.27.1
-	k8s.io/mount-utils => k8s.io/mount-utils v0.27.1
-	k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.27.1
-	k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.27.1
-	k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.27.1
-	k8s.io/sample-controller => k8s.io/sample-controller v0.27.1
+	// https://github.com/kubernetes/kubernetes/blob/v1.27.2/go.mod#L245-L275
+	k8s.io/api => k8s.io/api v0.27.2
+	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.27.2
+	k8s.io/apimachinery => k8s.io/apimachinery v0.27.2
+	k8s.io/apiserver => k8s.io/apiserver v0.27.2
+	k8s.io/cli-runtime => k8s.io/cli-runtime v0.27.2
+	k8s.io/client-go => k8s.io/client-go v0.27.2
+	k8s.io/cloud-provider => k8s.io/cloud-provider v0.27.2
+	k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.27.2
+	k8s.io/code-generator => k8s.io/code-generator v0.27.2
+	k8s.io/component-base => k8s.io/component-base v0.27.2
+	k8s.io/component-helpers => k8s.io/component-helpers v0.27.2
+	k8s.io/controller-manager => k8s.io/controller-manager v0.27.2
+	k8s.io/cri-api => k8s.io/cri-api v0.27.2
+	k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.27.2
+	k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.27.2
+	k8s.io/kms => k8s.io/kms v0.27.2
+	k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.27.2
+	k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.27.2
+	k8s.io/kube-proxy => k8s.io/kube-proxy v0.27.2
+	k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.27.2
+	k8s.io/kubectl => k8s.io/kubectl v0.27.2
+	k8s.io/kubelet => k8s.io/kubelet v0.27.2
+	k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.27.2
+	k8s.io/metrics => k8s.io/metrics v0.27.2
+	k8s.io/mount-utils => k8s.io/mount-utils v0.27.2
+	k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.27.2
+	k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.27.2
+	k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.27.2
+	k8s.io/sample-controller => k8s.io/sample-controller v0.27.2
 )