Skip to content

Commit

Permalink
Update talos/k8s versions (#5)
Browse files Browse the repository at this point in the history
  • Loading branch information
choffmeister authored Jan 13, 2023
1 parent b5b523f commit 1513bf0
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 13 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/test-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ jobs:
fail-fast: false
matrix:
version:
- talos: 1.2.6
kubernetes: 1.23.13
- talos: 1.2.6
kubernetes: 1.24.7
- talos: 1.2.6
kubernetes: 1.25.3
- talos: 1.2.8
kubernetes: 1.23.15
- talos: 1.2.8
kubernetes: 1.24.9
- talos: 1.2.8
kubernetes: 1.25.5
steps:
- uses: actions/setup-go@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ RUN apk add ca-certificates
FROM scratch
ENTRYPOINT ["/bin/hcloud-talos"]
COPY --from=ca-certificates /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
COPY --from=ghcr.io/siderolabs/talosctl:v1.2.6 /talosctl /bin/talosctl
COPY --from=ghcr.io/siderolabs/talosctl:v1.2.8 /talosctl /bin/talosctl
COPY hcloud-talos /bin/hcloud-talos
WORKDIR /workdir
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ cd my-cluster

export HCLOUD_TOKEN=...
# bootstrap cluster
hcloud-talos -v bootstrap-cluster --talos-version=1.2.6 --kubernetes-version=1.25.3 my-cluster controlplane-1
hcloud-talos -v bootstrap-cluster --talos-version=1.2.8 --kubernetes-version=1.25.5 my-cluster controlplane-1

# add more nodes
hcloud-talos -v add-node --talos-version=1.2.6 controlplane-2 --controlplane
hcloud-talos -v add-node --talos-version=1.2.6 worker-1
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
```
4 changes: 2 additions & 2 deletions e2etests/00_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ func TestMain(t *testing.M) {
func setup() {
talosVersion = os.Getenv("TALOS_VERSION")
if talosVersion == "" {
talosVersion = "1.2.6"
talosVersion = "1.2.8"
}
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))
Expand All @@ -51,7 +51,7 @@ func setup() {

kubernetesVersion = os.Getenv("KUBERNETES_VERSION")
if kubernetesVersion == "" {
kubernetesVersion = "1.25.3"
kubernetesVersion = "1.25.5"
}

hcloudToken = os.Getenv("HCLOUD_TOKEN")
Expand Down
2 changes: 1 addition & 1 deletion e2etests/02_add_node_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ func TestAddNode(t *testing.T) {
ConfigFile: configFile,
ServerType: "cx21",
NodeName: "worker-01",
TalosVersion: "1.2.6",
TalosVersion: "1.2.8",
})
assert.NoError(t, err)
}

0 comments on commit 1513bf0

Please sign in to comment.