Update e2e tests (#8)

.github/workflows/release.yml

@@ -9,7 +9,7 @@ jobs:
     steps:
     - uses: actions/setup-go@v2
       with:
-        go-version: 1.17.x
+        go-version: 1.19.x
     - name: Set up QEMU
       uses: docker/setup-qemu-action@v2
     - name: Set up Docker Buildx

.github/workflows/test-e2e.yml

@@ -1,8 +1,5 @@
 name: test-e2e
 on:
-  push:
-    branches:
-    - main
   pull_request:
     branches:
     - main
@@ -14,20 +11,22 @@ jobs:
   test-e2e:
     runs-on: ubuntu-latest
     strategy:
-      max-parallel: 3
+      max-parallel: 2
       fail-fast: false
       matrix:
         version:
-          - talos: 1.2.8
-            kubernetes: 1.23.15
-          - talos: 1.2.8
-            kubernetes: 1.24.9
-          - talos: 1.2.8
-            kubernetes: 1.25.5
+          - talos: 1.2.9
+            kubernetes: 1.24.13
+          - talos: 1.2.9
+            kubernetes: 1.25.9
+          - talos: 1.3.7
+            kubernetes: 1.25.9
+          - talos: 1.3.7
+            kubernetes: 1.26.4
     steps:
     - uses: actions/setup-go@v2
       with:
-        go-version: 1.17.x
+        go-version: 1.19.x
     - uses: actions/checkout@v2
     - name: Build sources
       run: go build ./...

.github/workflows/test.yml

@@ -9,7 +9,7 @@ jobs:
     steps:
     - uses: actions/setup-go@v2
       with:
-        go-version: 1.17.x
+        go-version: 1.19.x
     - uses: actions/checkout@v2
     - name: Build sources
       run: go build ./...

.goreleaser.yml

@@ -14,32 +14,6 @@ builds:
     goarch:
       - amd64
       - arm64
-dockers:
-  - image_templates:
-      - "ghcr.io/airfocusio/{{ .ProjectName }}:{{ .Version }}-amd64"
-      - "ghcr.io/airfocusio/{{ .ProjectName }}:latest-amd64"
-    use: buildx
-    goarch: amd64
-    dockerfile: Dockerfile
-    build_flag_templates:
-      - "--platform=linux/amd64"
-  - image_templates:
-      - "ghcr.io/airfocusio/{{ .ProjectName }}:{{ .Version }}-arm64v8"
-      - "ghcr.io/airfocusio/{{ .ProjectName }}:latest-arm64v8"
-    use: buildx
-    goarch: arm64
-    dockerfile: Dockerfile
-    build_flag_templates:
-      - "--platform=linux/arm64/v8"
-docker_manifests:
-  - name_template: ghcr.io/airfocusio/{{ .ProjectName }}:{{ .Version }}
-    image_templates:
-      - ghcr.io/airfocusio/{{ .ProjectName }}:{{ .Version }}-amd64
-      - ghcr.io/airfocusio/{{ .ProjectName }}:{{ .Version }}-arm64v8
-  - name_template: ghcr.io/airfocusio/{{ .ProjectName }}:latest
-    image_templates:
-      - ghcr.io/airfocusio/{{ .ProjectName }}:latest-amd64
-      - ghcr.io/airfocusio/{{ .ProjectName }}:latest-arm64v8
 checksum:
   name_template: 'checksums.txt'
 snapshot:

README.md

@@ -21,9 +21,9 @@ cd my-cluster
 
 export HCLOUD_TOKEN=...
 # bootstrap cluster
-hcloud-talos -v bootstrap-cluster --talos-version=1.2.8 --kubernetes-version=1.25.5 my-cluster controlplane-1
+hcloud-talos -v bootstrap-cluster --talos-version=1.2.9 --kubernetes-version=1.25.5 my-cluster controlplane-1
 
 # add more nodes
-hcloud-talos -v add-node --talos-version=1.2.8 controlplane-2 --controlplane
-hcloud-talos -v add-node --talos-version=1.2.8 worker-1
+hcloud-talos -v add-node --talos-version=1.2.9 controlplane-2 --controlplane
+hcloud-talos -v add-node --talos-version=1.2.9 worker-1
 ```

e2etests/00_test.go

@@ -35,7 +35,7 @@ func TestMain(t *testing.M) {
 func setup() {
 	talosVersion = os.Getenv("TALOS_VERSION")
 	if talosVersion == "" {
-		talosVersion = "1.2.8"
+		talosVersion = "1.2.9"
 	}
 	talosctlUrl = fmt.Sprintf("https://github.com/siderolabs/talos/releases/download/v%s/talosctl-%s-%s", talosVersion, runtime.GOOS, runtime.GOARCH)
 	talosctlBin = path.Join(os.TempDir(), fmt.Sprintf("talosctl-%s", talosVersion))
@@ -51,7 +51,7 @@ func setup() {
 
 	kubernetesVersion = os.Getenv("KUBERNETES_VERSION")
 	if kubernetesVersion == "" {
-		kubernetesVersion = "1.25.5"
+		kubernetesVersion = "1.25.9"
 	}
 
 	hcloudToken = os.Getenv("HCLOUD_TOKEN")

e2etests/01_bootstrap_cluster_test.go

@@ -12,7 +12,7 @@ func TestBootstrapCluster(t *testing.T) {
 		ConfigFile:        configFile,
 		ClusterName:       clusterName,
 		ServerType:        "cx21",
-		NodeName:          "controlplane-01",
+		NodeName:          "controlplane-1",
 		Location:          "nbg1",
 		NetworkZone:       "eu-central",
 		Token:             hcloudToken,

e2etests/02_add_node_test.go

@@ -11,8 +11,8 @@ func TestAddNode(t *testing.T) {
 	_, err := internal.AddNode(&logger, clusterDir, internal.AddNodeOpts{
 		ConfigFile:   configFile,
 		ServerType:   "cx21",
-		NodeName:     "worker-01",
-		TalosVersion: "1.2.8",
+		NodeName:     "worker-1",
+		TalosVersion: talosVersion,
 	})
 	assert.NoError(t, err)
 }

e2etests/04_delete_node_test.go

@@ -10,7 +10,7 @@ import (
 func TestDeleteNode(t *testing.T) {
 	err := internal.DeleteNode(&logger, clusterDir, internal.DeleteNodeOpts{
 		ConfigFile: configFile,
-		NodeName:   "worker-01",
+		NodeName:   "worker-1",
 		Force:      true,
 	})
 	assert.NoError(t, err)

go.mod

@@ -1,71 +1,72 @@
 module github.com/airfocusio/hcloud-talos
 
-go 1.17
+go 1.19
 
 require (
-	github.com/hetznercloud/hcloud-go v1.35.1
-	github.com/spf13/cobra v1.5.0
-	github.com/stretchr/testify v1.8.0
-	golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d
+	github.com/hetznercloud/hcloud-go v1.44.0
+	github.com/spf13/cobra v1.7.0
+	github.com/stretchr/testify v1.8.2
+	golang.org/x/crypto v0.8.0
 	gopkg.in/yaml.v3 v3.0.1
-	k8s.io/api v0.24.2
-	k8s.io/apimachinery v0.24.2
-	k8s.io/cli-runtime v0.24.2
-	k8s.io/client-go v0.24.2
+	k8s.io/api v0.27.1
+	k8s.io/apimachinery v0.27.1
+	k8s.io/cli-runtime v0.27.1
+	k8s.io/client-go v0.27.1
 )
 
 require (
 	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/cespare/xxhash/v2 v2.1.2 // indirect
+	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/emicklei/go-restful/v3 v3.8.0 // indirect
+	github.com/emicklei/go-restful/v3 v3.10.2 // indirect
 	github.com/evanphx/json-patch v5.6.0+incompatible // indirect
 	github.com/go-errors/errors v1.4.2 // indirect
-	github.com/go-logr/logr v1.2.3 // indirect
-	github.com/go-openapi/jsonpointer v0.19.5 // indirect
-	github.com/go-openapi/jsonreference v0.20.0 // indirect
-	github.com/go-openapi/swag v0.21.1 // indirect
+	github.com/go-logr/logr v1.2.4 // indirect
+	github.com/go-openapi/jsonpointer v0.19.6 // indirect
+	github.com/go-openapi/jsonreference v0.20.2 // indirect
+	github.com/go-openapi/swag v0.22.3 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/golang/protobuf v1.5.3 // 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
 	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
-	github.com/imdario/mergo v0.3.13 // indirect
-	github.com/inconshreveable/mousetrap v1.0.0 // indirect
+	github.com/google/uuid v1.3.0 // indirect
+	github.com/imdario/mergo v0.3.15 // indirect
+	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
-	github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
+	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/prometheus/client_golang v1.12.2 // indirect
-	github.com/prometheus/client_model v0.2.0 // indirect
-	github.com/prometheus/common v0.35.0 // indirect
-	github.com/prometheus/procfs v0.7.3 // indirect
+	github.com/prometheus/client_golang v1.15.1 // indirect
+	github.com/prometheus/client_model v0.4.0 // indirect
+	github.com/prometheus/common v0.43.0 // indirect
+	github.com/prometheus/procfs v0.9.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
-	github.com/xlab/treeprint v1.1.0 // indirect
-	go.starlark.net v0.0.0-20220328144851-d1966c6b9fcd // indirect
-	golang.org/x/net v0.0.0-20220708220712-1185a9018129 // indirect
-	golang.org/x/oauth2 v0.0.0-20220630143837-2104d58473e0 // indirect
-	golang.org/x/sys v0.0.0-20220708085239-5a0f0661e09d // indirect
-	golang.org/x/term v0.0.0-20220526004731-065cf7ba2467 // indirect
-	golang.org/x/text v0.3.7 // indirect
-	golang.org/x/time v0.0.0-20220609170525-579cf78fd858 // indirect
+	github.com/xlab/treeprint v1.2.0 // indirect
+	go.starlark.net v0.0.0-20230302034142-4b1e35fe2254 // indirect
+	golang.org/x/net v0.9.0 // indirect
+	golang.org/x/oauth2 v0.7.0 // indirect
+	golang.org/x/sys v0.8.0 // indirect
+	golang.org/x/term v0.8.0 // indirect
+	golang.org/x/text v0.9.0 // indirect
+	golang.org/x/time v0.3.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/protobuf v1.28.0 // indirect
-	gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b // indirect
+	google.golang.org/protobuf v1.30.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
-	k8s.io/klog/v2 v2.70.1 // indirect
-	k8s.io/kube-openapi v0.0.0-20220627174259-011e075b9cb8 // indirect
-	k8s.io/utils v0.0.0-20220706174534-f6158b442e7c // indirect
-	sigs.k8s.io/json v0.0.0-20220525155127-227cbc7cc124 // indirect
-	sigs.k8s.io/kustomize/api v0.11.5 // indirect
-	sigs.k8s.io/kustomize/kyaml v0.13.7 // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
+	k8s.io/klog/v2 v2.100.1 // indirect
+	k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
+	k8s.io/utils v0.0.0-20230505201702-9f6742963106 // indirect
+	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
+	sigs.k8s.io/kustomize/api v0.13.3 // indirect
+	sigs.k8s.io/kustomize/kyaml v0.14.2 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
 	sigs.k8s.io/yaml v1.3.0 // indirect
 )