Skip to content

Commit fe36fcf

Browse files
twz123twz123
authored
Merge pull request #4013 from twz123/prepare-1.28.6-1
Prepare v1.28.6+k0s.1
2 parents 6d7c4ff + 9daacd8 commit fe36fcf

15 files changed

+41
-41
lines changed

‎.github/workflows/publish-docs-manual.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ on:
33
workflow_dispatch:
44
inputs:
55
version:
6-
description: 'Version tag (e.g."v1.28.6+k0s.0")'
6+
description: 'Version tag (e.g."v1.28.6+k0s.1")'
77
required: true
88

99
env:

‎docs/airgap-install.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ metadata:
6666
name: k0s-cluster
6767
spec:
6868
k0s:
69-
version: {{{ extra.k8s_version }}}+k0s.0
69+
version: {{{ extra.k8s_version }}}+k0s.1
7070
hosts:
7171
- role: controller
7272
ssh:

‎docs/autopilot-multicommand.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -62,20 +62,20 @@ processed by **autopilot**.
6262
6: spec:
6363
7: commands:
6464
8: - airgapupdate:
65-
9: version: v{{{ extra.k8s_version }}}+k0s.0
65+
9: version: v{{{ extra.k8s_version }}}+k0s.1
6666
10: platforms:
6767
11: linux-amd64:
68-
12: url: https://github.com/k0sproject/k0s/releases/download/v{{{ extra.k8s_version }}}+k0s.0/k0s-airgap-bundle-v{{{ extra.k8s_version }}}+k0s.0-amd64
68+
12: url: https://github.com/k0sproject/k0s/releases/download/v{{{ extra.k8s_version }}}+k0s.1/k0s-airgap-bundle-v{{{ extra.k8s_version }}}+k0s.1-amd64
6969
13: workers:
7070
14: discovery:
7171
15: static:
7272
16: nodes:
7373
17: - worker0
7474
18: - k0supdate:
75-
19: version: v{{{ extra.k8s_version }}}+k0s.0
75+
19: version: v{{{ extra.k8s_version }}}+k0s.1
7676
20: platforms:
7777
21: linux-amd64:
78-
22: url: https://github.com/k0sproject/k0s/releases/download/v{{{ extra.k8s_version }}}+k0s.0/k0s-v{{{ extra.k8s_version }}}+k0s.0-amd64
78+
22: url: https://github.com/k0sproject/k0s/releases/download/v{{{ extra.k8s_version }}}+k0s.1/k0s-v{{{ extra.k8s_version }}}+k0s.1-amd64
7979
23: targets:
8080
24: controllers:
8181
25: discovery:

‎docs/autopilot.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -103,10 +103,10 @@ spec:
103103
104104
commands:
105105
- k0supdate:
106-
version: v{{{ extra.k8s_version }}}+k0s.0
106+
version: v{{{ extra.k8s_version }}}+k0s.1
107107
platforms:
108108
linux-amd64:
109-
url: https://github.com/k0sproject/k0s/releases/download/v1.28.6+k0s.0/k0s-v1.28.6+k0s.0-amd64
109+
url: https://github.com/k0sproject/k0s/releases/download/v1.28.6+k0s.1/k0s-v1.28.6+k0s.1-amd64
110110
sha256: '0000000000000000000000000000000000000000000000000000000000000000'
111111
targets:
112112
controllers:

‎docs/examples/ambassador-ingress.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ As you need to create a custom configuration file to install Ambassador Gateway,
1313
1. Run k0s under Docker:
1414

1515
```shell
16-
docker run -d --name k0s --hostname k0s --privileged -v /var/lib/k0s -p 6443:6443 docker.io/k0sproject/k0s:v{{{ extra.k8s_version }}}-k0s.0
16+
docker run -d --name k0s --hostname k0s --privileged -v /var/lib/k0s -p 6443:6443 docker.io/k0sproject/k0s:v{{{ extra.k8s_version }}}-k0s.1
1717
```
1818

1919
2. Export the default k0s configuration file:
@@ -77,7 +77,7 @@ As you need to create a custom configuration file to install Ambassador Gateway,
7777
3. Retart your k0s container, this time with additional ports and the above config file mapped into it:
7878

7979
```shell
80-
docker run --name k0s --hostname k0s --privileged -v /var/lib/k0s -v "$PWD"/k0s.yaml:/k0s.yaml -p 6443:6443 -p 80:80 -p 443:443 -p 8080:8080 docker.io/k0sproject/k0s:v{{{ extra.k8s_version }}}-k0s.0
80+
docker run --name k0s --hostname k0s --privileged -v /var/lib/k0s -v "$PWD"/k0s.yaml:/k0s.yaml -p 6443:6443 -p 80:80 -p 443:443 -p 8080:8080 docker.io/k0sproject/k0s:v{{{ extra.k8s_version }}}-k0s.1
8181
```
8282

8383
After some time, you will be able to list the Ambassador Services:

‎docs/install.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ Though the Quick Start material is written for Debian/Ubuntu, you can use it for
6161
6262
```shell
6363
$ sudo k0s status
64-
Version: v{{{ extra.k8s_version }}}+k0s.0
64+
Version: v{{{ extra.k8s_version }}}+k0s.1
6565
Process ID: 436
6666
Role: controller
6767
Workloads: true

‎docs/k0s-in-docker.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ You will require a [Docker environment](https://docs.docker.com/get-docker/) run
1010

1111
The k0s containers are published both on Docker Hub and GitHub. For reasons of simplicity, the examples given here use Docker Hub (GitHub requires a separate authentication that is not covered). Alternative links include:
1212

13-
- docker.io/k0sproject/k0s:v{{{ extra.k8s_version }}}-k0s.0
14-
- ghcr.io/k0sproject/k0s:v{{{ extra.k8s_version }}}-k0s.0
13+
- docker.io/k0sproject/k0s:v{{{ extra.k8s_version }}}-k0s.1
14+
- ghcr.io/k0sproject/k0s:v{{{ extra.k8s_version }}}-k0s.1
1515

16-
**Note:** Due to Docker Hub tag validation scheme, we have to use `-` as the k0s version separator instead of the usual `+`. So for example k0s version `v{{{ extra.k8s_version }}}+k0s.0` is tagged as `docker.io/k0sproject/k0s:v{{{ extra.k8s_version }}}-k0s.0`.
16+
**Note:** Due to Docker Hub tag validation scheme, we have to use `-` as the k0s version separator instead of the usual `+`. So for example k0s version `v{{{ extra.k8s_version }}}+k0s.1` is tagged as `docker.io/k0sproject/k0s:v{{{ extra.k8s_version }}}-k0s.1`.
1717

1818
## Start k0s
1919

@@ -22,7 +22,7 @@ The k0s containers are published both on Docker Hub and GitHub. For reasons of s
2222
You can run your own k0s in Docker:
2323

2424
```sh
25-
docker run -d --name k0s --hostname k0s --privileged -v /var/lib/k0s -p 6443:6443 docker.io/k0sproject/k0s:v{{{ extra.k8s_version }}}-k0s.0
25+
docker run -d --name k0s --hostname k0s --privileged -v /var/lib/k0s -p 6443:6443 docker.io/k0sproject/k0s:v{{{ extra.k8s_version }}}-k0s.1
2626
```
2727

2828
**Note:** If you are using Docker Desktop as the runtime, starting from 4.3.0 version it's using cgroups v2 in the VM that runs the engine. This means you have to add some extra flags to the above command to get kubelet and containerd to properly work with cgroups v2:
@@ -46,7 +46,7 @@ For each required worker:
4646
2. Run the container to create and join the new worker:
4747

4848
```sh
49-
docker run -d --name k0s-worker1 --hostname k0s-worker1 --privileged -v /var/lib/k0s docker.io/k0sproject/k0s:v{{{ extra.k8s_version }}}-k0s.0 k0s worker $token
49+
docker run -d --name k0s-worker1 --hostname k0s-worker1 --privileged -v /var/lib/k0s docker.io/k0sproject/k0s:v{{{ extra.k8s_version }}}-k0s.1 k0s worker $token
5050
```
5151

5252
### 3. Access your cluster
@@ -68,7 +68,7 @@ version: "3.9"
6868
services:
6969
k0s:
7070
container_name: k0s
71-
image: docker.io/k0sproject/k0s:v{{{ extra.k8s_version }}}-k0s.0
71+
image: docker.io/k0sproject/k0s:v{{{ extra.k8s_version }}}-k0s.1
7272
command: k0s controller --config=/etc/k0s/config.yaml --enable-worker
7373
hostname: k0s
7474
privileged: true

‎docs/k0s-multi-node.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ The download script accepts the following environment variables:
2424

2525
| Variable | Purpose |
2626
|:----------------------------|:---------------------------------------------------------------------|
27-
| `K0S_VERSION=v{{{ extra.k8s_version }}}+k0s.0` | Select the version of k0s to be installed |
27+
| `K0S_VERSION=v{{{ extra.k8s_version }}}+k0s.1` | Select the version of k0s to be installed |
2828
| `DEBUG=true` | Output commands and their arguments at execution. |
2929

3030
**Note**: If you require environment variables and use sudo, you can do:
3131

3232
```shell
33-
curl -sSLf https://get.k0s.sh | sudo K0S_VERSION=v{{{ extra.k8s_version }}}+k0s.0 sh
33+
curl -sSLf https://get.k0s.sh | sudo K0S_VERSION=v{{{ extra.k8s_version }}}+k0s.1 sh
3434
```
3535

3636
### 2. Bootstrap a controller node
@@ -126,7 +126,7 @@ To get general information about your k0s instance's status:
126126
```
127127

128128
```shell
129-
Version: v{{{ extra.k8s_version }}}+k0s.0
129+
Version: v{{{ extra.k8s_version }}}+k0s.1
130130
Process ID: 2769
131131
Parent Process ID: 1
132132
Role: controller

‎docs/nllb.md

+7-7
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ metadata:
8585
name: k0s-cluster
8686
spec:
8787
k0s:
88-
version: v{{{ extra.k8s_version }}}+k0s.0
88+
version: v{{{ extra.k8s_version }}}+k0s.1
8989
config:
9090
spec:
9191
network:
@@ -173,11 +173,11 @@ level=info msg="==> Running phase: Validate hosts"
173173
level=info msg="==> Running phase: Gather k0s facts"
174174
level=info msg="==> Running phase: Validate facts"
175175
level=info msg="==> Running phase: Upload k0s binaries to hosts"
176-
level=info msg="[ssh] 10.81.146.254:22: uploading k0s binary from /home/k0sctl/.cache/k0sctl/k0s/linux/amd64/k0s-v{{{ extra.k8s_version }}}+k0s.0"
177-
level=info msg="[ssh] 10.81.146.113:22: uploading k0s binary from /home/k0sctl/.cache/k0sctl/k0s/linux/amd64/k0s-v{{{ extra.k8s_version }}}+k0s.0"
178-
level=info msg="[ssh] 10.81.146.51:22: uploading k0s binary from /home/k0sctl/.cache/k0sctl/k0s/linux/amd64/k0s-v{{{ extra.k8s_version }}}+k0s.0"
179-
level=info msg="[ssh] 10.81.146.198:22: uploading k0s binary from /home/k0sctl/.cache/k0sctl/k0s/linux/amd64/k0s-v{{{ extra.k8s_version }}}+k0s.0"
180-
level=info msg="[ssh] 10.81.146.184:22: uploading k0s binary from /home/k0sctl/.cache/k0sctl/k0s/linux/amd64/k0s-v{{{ extra.k8s_version }}}+k0s.0"
176+
level=info msg="[ssh] 10.81.146.254:22: uploading k0s binary from /home/k0sctl/.cache/k0sctl/k0s/linux/amd64/k0s-v{{{ extra.k8s_version }}}+k0s.1"
177+
level=info msg="[ssh] 10.81.146.113:22: uploading k0s binary from /home/k0sctl/.cache/k0sctl/k0s/linux/amd64/k0s-v{{{ extra.k8s_version }}}+k0s.1"
178+
level=info msg="[ssh] 10.81.146.51:22: uploading k0s binary from /home/k0sctl/.cache/k0sctl/k0s/linux/amd64/k0s-v{{{ extra.k8s_version }}}+k0s.1"
179+
level=info msg="[ssh] 10.81.146.198:22: uploading k0s binary from /home/k0sctl/.cache/k0sctl/k0s/linux/amd64/k0s-v{{{ extra.k8s_version }}}+k0s.1"
180+
level=info msg="[ssh] 10.81.146.184:22: uploading k0s binary from /home/k0sctl/.cache/k0sctl/k0s/linux/amd64/k0s-v{{{ extra.k8s_version }}}+k0s.1"
181181
level=info msg="==> Running phase: Configure k0s"
182182
level=info msg="[ssh] 10.81.146.254:22: validating configuration"
183183
level=info msg="[ssh] 10.81.146.184:22: validating configuration"
@@ -217,7 +217,7 @@ level=info msg="[ssh] 10.81.146.51:22: waiting for node to become ready"
217217
level=info msg="==> Running phase: Release exclusive host lock"
218218
level=info msg="==> Running phase: Disconnect from hosts"
219219
level=info msg="==> Finished in 3m30s"
220-
level=info msg="k0s cluster version v{{{ extra.k8s_version }}}+k0s.0 is now installed"
220+
level=info msg="k0s cluster version v{{{ extra.k8s_version }}}+k0s.1 is now installed"
221221
level=info msg="Tip: To access the cluster you can now fetch the admin kubeconfig using:"
222222
level=info msg=" k0sctl kubeconfig"
223223
```

‎docs/raspberry-pi4.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ Download a [k0s release](https://github.com/k0sproject/k0s/releases/latest). For
125125
example:
126126

127127
```shell
128-
wget -O /tmp/k0s https://github.com/k0sproject/k0s/releases/download/v{{{ extra.k8s_version }}}+k0s.0/k0s-v{{{ extra.k8s_version }}}+k0s.0-arm64 # replace version number!
128+
wget -O /tmp/k0s https://github.com/k0sproject/k0s/releases/download/v{{{ extra.k8s_version }}}+k0s.1/k0s-v{{{ extra.k8s_version }}}+k0s.1-arm64 # replace version number!
129129
sudo install /tmp/k0s /usr/local/bin/k0s
130130
```
131131

@@ -142,7 +142,7 @@ At this point you can run `k0s`:
142142

143143
```console
144144
ubuntu@ubuntu:~$ k0s version
145-
v{{{ extra.k8s_version }}}+k0s.0
145+
v{{{ extra.k8s_version }}}+k0s.1
146146
```
147147

148148
To check if k0s's [system requirements](system-requirements.md) and [external
@@ -451,7 +451,7 @@ As this is a worker node, we cannot access the Kubernetes API via the builtin
451451
452452
```console
453453
ubuntu@ubuntu:~$ sudo k0s status
454-
Version: v{{{ extra.k8s_version }}}+k0s.0
454+
Version: v{{{ extra.k8s_version }}}+k0s.1
455455
Process ID: 1631
456456
Role: worker
457457
Workloads: true

‎docs/releases.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,6 @@ The biggest new k0s features will typically only be delivered on top of the late
3030

3131
The k0s version string consists of the Kubernetes version and the k0s version. For example:
3232

33-
- v{{{ extra.k8s_version }}}+k0s.0
33+
- v{{{ extra.k8s_version }}}+k0s.1
3434

3535
The Kubernetes version ({{{ extra.k8s_version }}}) is the first part, and the last part (k0s.0) reflects the k0s version, which is built on top of the certain Kubernetes version.

‎docs/reset.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ k0sctl can be used to connect each node and remove all k0s-related files and pro
5050
INFO ==> Running phase: Prepare hosts
5151
INFO ==> Running phase: Gather k0s facts
5252
INFO [ssh] 13.53.43.63:22: found existing configuration
53-
INFO [ssh] 13.53.43.63:22: is running k0s controller version {{{ extra.k8s_version }}}+k0s.0
54-
INFO [ssh] 13.53.218.149:22: is running k0s worker version {{{ extra.k8s_version }}}+k0s.0
53+
INFO [ssh] 13.53.43.63:22: is running k0s controller version {{{ extra.k8s_version }}}+k0s.1
54+
INFO [ssh] 13.53.218.149:22: is running k0s worker version {{{ extra.k8s_version }}}+k0s.1
5555
INFO [ssh] 13.53.43.63:22: checking if worker has joined
5656
INFO ==> Running phase: Reset hosts
5757
INFO [ssh] 13.53.43.63:22: stopping k0s

‎docs/upgrade.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ You can configure the desired cluster version in the k0sctl configuration by set
5252
```yaml
5353
spec:
5454
k0s:
55-
version: {{{ extra.k8s_version }}}+k0s.0
55+
version: {{{ extra.k8s_version }}}+k0s.1
5656
```
5757
5858
If you do not specify a version, k0sctl checks online for the latest version and defaults to it.
@@ -75,7 +75,7 @@ INFO[0027] [ssh] 10.0.0.17:22: waiting for node to become ready again
7575
INFO[0027] [ssh] 10.0.0.17:22: upgrade successful
7676
INFO[0027] ==> Running phase: Disconnect from hosts
7777
INFO[0027] ==> Finished in 27s
78-
INFO[0027] k0s cluster version {{{ extra.k8s_version }}}+k0s.0 is now installed
78+
INFO[0027] k0s cluster version {{{ extra.k8s_version }}}+k0s.1 is now installed
7979
INFO[0027] Tip: To access the cluster you can now fetch the admin kubeconfig using:
8080
INFO[0027] k0sctl kubeconfig
8181
```

‎inttest/sonobuoy/README.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ spec:
6161
user: "ubuntu"
6262
uploadBinary: true
6363
k0s:
64-
version: "1.28.6+k0s.0"
64+
version: "1.28.6+k0s.1"
6565
```
6666
6767
To deploy a k0s cluster on the AWS machine, run:
@@ -98,9 +98,9 @@ INFO ==> Running phase: Gather host facts
9898
.
9999
.
100100
.
101-
INFO [ssh] 3.250.52.147:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.28.6+k0s.0
102-
INFO [ssh] 63.32.21.232:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.28.6+k0s.0
103-
INFO [ssh] 54.216.71.108:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.28.6+k0s.0
101+
INFO [ssh] 3.250.52.147:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.28.6+k0s.1
102+
INFO [ssh] 63.32.21.232:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.28.6+k0s.1
103+
INFO [ssh] 54.216.71.108:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.28.6+k0s.1
104104
INFO ==> Running phase: Configure k0s
105105
WARN [ssh] 63.32.21.232:22: generating default configuration
106106
INFO [ssh] 63.32.21.232:22: validating configuration
@@ -124,7 +124,7 @@ INFO [ssh] 3.250.52.147:22: waiting for node to become ready
124124
INFO ==> Running phase: Release exclusive host lock
125125
INFO ==> Running phase: Disconnect from hosts
126126
INFO ==> Finished in 1m42s
127-
INFO k0s cluster version v1.28.6+k0s.0 is now installed
127+
INFO k0s cluster version v1.28.6+k0s.1 is now installed
128128
INFO Tip: To access the cluster you can now fetch the admin kubeconfig using:
129129
INFO k0sctl kubeconfig
130130
```

‎inttest/update-server/html/unstable/index.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: unstable
2-
version: v1.28.6+k0s.0
2+
version: v1.28.6+k0s.1
33
downloadURLs:
44
k0s:
55
linux-amd64: ..../k0s-amd64

0 commit comments

Comments
 (0)