Skip to content

Commit

Permalink
Merge pull request #3317 from ncopa/release-1.24-kube-1.24.16
Browse files Browse the repository at this point in the history
[release-1.24] kubernets 1.24.16 / go 1.20.6 / runc 1.1.8
  • Loading branch information
ncopa authored Jul 24, 2023
2 parents e49f488 + 011cfec commit eded291
Show file tree
Hide file tree
Showing 17 changed files with 121 additions and 121 deletions.
8 changes: 4 additions & 4 deletions docs/autopilot-multicommand.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,20 +62,20 @@ processed by **autopilot**.
6: spec:
7: commands:
8: - airgapupdate:
9: version: v1.24.15+k0s.0
9: version: v1.24.16+k0s.0
10: platforms:
11: linux-amd64:
12: url: https://github.com/k0sproject/k0s/releases/download/v1.24.15+k0s.0/k0s-airgap-bundle-v1.24.15+k0s.0-amd64
12: url: https://github.com/k0sproject/k0s/releases/download/v1.24.16+k0s.0/k0s-airgap-bundle-v1.24.16+k0s.0-amd64
13: workers:
14: discovery:
15: static:
16: nodes:
17: - worker0
18: - k0supdate:
19: version: v1.24.15+k0s.0
19: version: v1.24.16+k0s.0
20: platforms:
21: linux-amd64:
22: url: https://github.com/k0sproject/k0s/releases/download/v1.24.15+k0s.0/k0s-v1.24.15+k0s.0-amd64
22: url: https://github.com/k0sproject/k0s/releases/download/v1.24.16+k0s.0/k0s-v1.24.16+k0s.0-amd64
23: targets:
24: controllers:
25: discovery:
Expand Down
4 changes: 2 additions & 2 deletions docs/autopilot.md
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,10 @@ spec:

commands:
- k0supdate:
version: v1.24.15+k0s.0
version: v1.24.16+k0s.0
platforms:
linux-amd64:
url: https://github.com/k0sproject/k0s/releases/download/v1.24.15+k0s.0/k0s-v1.24.15+k0s.0-amd64
url: https://github.com/k0sproject/k0s/releases/download/v1.24.16+k0s.0/k0s-v1.24.16+k0s.0-amd64
sha256: '0000000000000000000000000000000000000000000000000000000000000000'
targets:
controllers:
Expand Down
2 changes: 1 addition & 1 deletion docs/configuration.md
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ spec:
version: v0.5.2
kubeproxy:
image: registry.k8s.io/kube-proxy
version: v1.24.15
version: v1.24.16
coredns:
image: docker.io/coredns/coredns
version: 1.7.4
Expand Down
8 changes: 4 additions & 4 deletions docs/docker-shim.md
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,8 @@ On the controller, you'll be able to see the worker started with the new docker
sudo k0s kubectl get nodes -o wide

NAME STATUS ROLES AGE VERSION INTERNAL-IP EXTERNAL-IP OS-IMAGE KERNEL-VERSION CONTAINER-RUNTIME
ip-10-0-49-188.eu-west-1.compute.internal Ready control-plane 117m v1.24.15+k0s 10.0.49.188 <none> Ubuntu 20.04.4 LTS 5.13.0-1022-aws docker://20.10.16
ip-10-0-62-250.eu-west-1.compute.internal Ready,SchedulingDisabled <none> 64m v1.24.15+k0s 10.0.62.250 <none> Ubuntu 20.04.4 LTS 5.13.0-1017-aws docker://20.10.16
ip-10-0-49-188.eu-west-1.compute.internal Ready control-plane 117m v1.24.16+k0s 10.0.49.188 <none> Ubuntu 20.04.4 LTS 5.13.0-1022-aws docker://20.10.16
ip-10-0-62-250.eu-west-1.compute.internal Ready,SchedulingDisabled <none> 64m v1.24.16+k0s 10.0.62.250 <none> Ubuntu 20.04.4 LTS 5.13.0-1017-aws docker://20.10.16
```

### Uncordon the Node
Expand All @@ -157,6 +157,6 @@ You should now see the node Ready for scheduling with the docker Runtime:
sudo k0s kubectl get nodes -o wide

NAME STATUS ROLES AGE VERSION INTERNAL-IP EXTERNAL-IP OS-IMAGE KERNEL-VERSION CONTAINER-RUNTIME
ip-10-0-49-188.eu-west-1.compute.internal Ready control-plane 119m v1.24.15+k0s 10.0.49.188 <none> Ubuntu 20.04.4 LTS 5.13.0-1022-aws docker://20.10.16
ip-10-0-62-250.eu-west-1.compute.internal Ready <none> 66m v1.24.15+k0s 10.0.62.250 <none> Ubuntu 20.04.4 LTS 5.13.0-1017-aws docker://20.10.16
ip-10-0-49-188.eu-west-1.compute.internal Ready control-plane 119m v1.24.16+k0s 10.0.49.188 <none> Ubuntu 20.04.4 LTS 5.13.0-1022-aws docker://20.10.16
ip-10-0-62-250.eu-west-1.compute.internal Ready <none> 66m v1.24.16+k0s 10.0.62.250 <none> Ubuntu 20.04.4 LTS 5.13.0-1017-aws docker://20.10.16
```
4 changes: 2 additions & 2 deletions docs/install.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ Though the Quick Start material is written for Debian/Ubuntu, you can use it for

```shell
$ sudo k0s status
Version: v1.24.15+k0s.0
Version: v1.24.16+k0s.0
Process ID: 436
Role: controller
Workloads: true
Expand All @@ -77,7 +77,7 @@ Though the Quick Start material is written for Debian/Ubuntu, you can use it for
```shell
$ sudo k0s kubectl get nodes
NAME STATUS ROLES AGE VERSION
k0s Ready <none> 4m6s v1.24.15+k0s
k0s Ready <none> 4m6s v1.24.16+k0s
```

## Uninstall k0s
Expand Down
6 changes: 3 additions & 3 deletions docs/k0s-in-docker.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ You will require a [Docker environment](https://docs.docker.com/get-docker/) run

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:

- docker.io/k0sproject/k0s:v1.24.15-k0s.0
- ghcr.io/k0sproject/k0s:v1.24.15-k0s.0
- docker.io/k0sproject/k0s:v1.24.16-k0s.0
- ghcr.io/k0sproject/k0s:v1.24.16-k0s.0

**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 `v1.24.15+k0s.0` is tagged as `docker.io/k0sproject/k0s:v1.24.15-k0s.0`.
**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 `v1.24.16+k0s.0` is tagged as `docker.io/k0sproject/k0s:v1.24.16-k0s.0`.

## Start k0s

Expand Down
8 changes: 4 additions & 4 deletions docs/k0s-multi-node.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@ The download script accepts the following environment variables:

| Variable | Purpose |
|:----------------------------|:--------------------------------------------------|
| `K0S_VERSION=v1.24.15+k0s.0 | Select the version of k0s to be installed |
| `K0S_VERSION=v1.24.16+k0s.0 | Select the version of k0s to be installed |
| `DEBUG=true` | Output commands and their arguments at execution. |

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

```shell
curl -sSLf https://get.k0s.sh | sudo K0S_VERSION=v1.24.15+k0s.0 sh
curl -sSLf https://get.k0s.sh | sudo K0S_VERSION=v1.24.16+k0s.0 sh
```

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

```shell
Version: v1.24.15+k0s.0
Version: v1.24.16+k0s.0
Process ID: 2769
Parent Process ID: 1
Role: controller
Expand All @@ -144,7 +144,7 @@ sudo k0s kubectl get nodes

```shell
NAME STATUS ROLES AGE VERSION
k0s Ready <none> 4m6s v1.24.15+k0s
k0s Ready <none> 4m6s v1.24.16+k0s
```

You can also access your cluster easily with [Lens](https://k8slens.dev/), simply by copying the kubeconfig and pasting it to Lens:
Expand Down
10 changes: 5 additions & 5 deletions docs/raspberry-pi4.md
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ In addition, add each of these modules to your `/etc/modules-load.d/modules.conf
Download a [k0s release](https://github.com/k0sproject/k0s/releases/latest). For example:

```shell
wget -O /tmp/k0s https://github.com/k0sproject/k0s/releases/download/v1.24.15+k0s.0/k0s-v1.24.15+k0s.0-arm64 # replace version number!
wget -O /tmp/k0s https://github.com/k0sproject/k0s/releases/download/v1.24.16+k0s.0/k0s-v1.24.16+k0s.0-arm64 # replace version number!
sudo install /tmp/k0s /usr/local/bin/k0s
```

Expand All @@ -120,7 +120,7 @@ k0s version
```

```shell
v1.24.15+k0s.0
v1.24.16+k0s.0
```

### Deploy Kubernetes
Expand Down Expand Up @@ -202,9 +202,9 @@ kubectl get nodes,deployments,pods -A

```shell
NAME STATUS ROLES AGE VERSION
node/k8s-4 Ready <none> 5m9s v1.24.15+k0s
node/k8s-5 Ready <none> 5m v1.24.15+k0s
node/k8s-6 Ready <none> 4m45s v1.24.15+k0s
node/k8s-4 Ready <none> 5m9s v1.24.16+k0s
node/k8s-5 Ready <none> 5m v1.24.16+k0s
node/k8s-6 Ready <none> 4m45s v1.24.16+k0s
NAMESPACE NAME READY UP-TO-DATE AVAILABLE AGE
kube-system deployment.apps/calico-kube-controllers 1/1 1 1 12m
Expand Down
4 changes: 2 additions & 2 deletions docs/releases.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ The biggest new k0s features will typically only be delivered on top of the late

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

- v1.24.15+k0s.0
- v1.24.16+k0s.0

The Kubernetes version (1.24.15) is the first part, and the last part (k0s.0) reflects the k0s version, which is built on top of the certain Kubernetes version.
The Kubernetes version (1.24.16) is the first part, and the last part (k0s.0) reflects the k0s version, which is built on top of the certain Kubernetes version.
4 changes: 2 additions & 2 deletions docs/worker-node-config.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ kubectl get node --show-labels

```shell
NAME STATUS ROLES AGE VERSION LABELS
worker0 NotReady <none> 10s v1.24.15+k0s beta.kubernetes.io/arch=amd64,beta.kubernetes.io/os=linux,k0sproject.io/foo=bar,k0sproject.io/other=xyz,kubernetes.io/arch=amd64,kubernetes.io/hostname=worker0,kubernetes.io/os=linux
worker0 NotReady <none> 10s v1.24.16+k0s beta.kubernetes.io/arch=amd64,beta.kubernetes.io/os=linux,k0sproject.io/foo=bar,k0sproject.io/other=xyz,kubernetes.io/arch=amd64,kubernetes.io/hostname=worker0,kubernetes.io/os=linux
```

Controller worker nodes are assigned `node.k0sproject.io/role=control-plane` and `node-role.kubernetes.io/control-plane=true` labels:
Expand All @@ -25,7 +25,7 @@ kubectl get node --show-labels

```shell
NAME STATUS ROLES AGE VERSION LABELS
controller0 NotReady control-plane 10s v1.24.15+k0s beta.kubernetes.io/arch=amd64,beta.kubernetes.io/os=linux,kubernetes.io/hostname=worker0,kubernetes.io/os=linux,node.k0sproject.io/role=control-plane,node-role.kubernetes.io/control-plane=true
controller0 NotReady control-plane 10s v1.24.16+k0s beta.kubernetes.io/arch=amd64,beta.kubernetes.io/os=linux,kubernetes.io/hostname=worker0,kubernetes.io/os=linux,node.k0sproject.io/role=control-plane,node-role.kubernetes.io/control-plane=true
```

**Note:** Setting the labels is only effective on the first registration of the node. Changing the labels thereafter has no effect.
Expand Down
6 changes: 3 additions & 3 deletions embedded-bins/Makefile.variables
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
alpine_version = 3.17
alpine_patch_version = $(alpine_version).4
golang_buildimage=docker.io/library/golang:$(go_version)-alpine$(alpine_version)
go_version = 1.19.10
go_version = 1.20.6

runc_version = 1.1.7
runc_version = 1.1.8
runc_buildimage = $(golang_buildimage)
runc_build_go_tags = "seccomp"
#runc_build_go_cgo_enabled =
Expand All @@ -22,7 +22,7 @@ containerd_build_shim_go_cgo_enabled = 0
#containerd_build_go_ldflags =
containerd_build_go_ldflags_extra = "-w -s -extldflags=-static"

kubernetes_version = 1.24.15
kubernetes_version = 1.24.16
kubernetes_buildimage = $(golang_buildimage)
kubernetes_build_go_tags = "providerless"
#kubernetes_build_go_cgo_enabled =
Expand Down
2 changes: 1 addition & 1 deletion examples/footloose-ha-controllers/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM quay.io/footloose/ubuntu18.04

ADD k0s.service /etc/systemd/system/k0s.service

RUN curl -L -o /usr/local/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/v1.24.15/bin/linux/amd64/kubectl && \
RUN curl -L -o /usr/local/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/v1.24.16/bin/linux/amd64/kubectl && \
chmod +x /usr/local/bin/kubectl

ENV KUBECONFIG=/var/lib/k0s/pki/admin.conf
92 changes: 46 additions & 46 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -59,19 +59,19 @@ require (

// Kubernetes
require (
k8s.io/api v0.24.15
k8s.io/apiextensions-apiserver v0.24.15
k8s.io/apimachinery v0.24.15
k8s.io/cli-runtime v0.24.15
k8s.io/client-go v0.24.15
k8s.io/cloud-provider v0.24.15
k8s.io/component-base v0.24.15
k8s.io/api v0.24.16
k8s.io/apiextensions-apiserver v0.24.16
k8s.io/apimachinery v0.24.16
k8s.io/cli-runtime v0.24.16
k8s.io/client-go v0.24.16
k8s.io/cloud-provider v0.24.16
k8s.io/component-base v0.24.16
k8s.io/cri-api v0.25.0
k8s.io/kube-aggregator v0.24.15
k8s.io/kubectl v0.24.15
k8s.io/kubelet v0.24.15
k8s.io/kubernetes v1.24.15
k8s.io/mount-utils v0.24.15
k8s.io/kube-aggregator v0.24.16
k8s.io/kubectl v0.24.16
k8s.io/kubelet v0.24.16
k8s.io/kubernetes v1.24.16
k8s.io/mount-utils v0.24.16
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448
sigs.k8s.io/controller-runtime v0.12.2
sigs.k8s.io/yaml v1.3.0
Expand Down Expand Up @@ -204,7 +204,7 @@ require (
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/runc v1.1.7 // indirect
github.com/opencontainers/runc v1.1.8 // indirect
github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417 // indirect
github.com/opencontainers/selinux v1.10.1 // indirect
github.com/pelletier/go-toml v1.9.5 // indirect
Expand Down Expand Up @@ -271,12 +271,12 @@ require (
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiserver v0.24.15 // indirect
k8s.io/component-helpers v0.24.15 // indirect
k8s.io/controller-manager v0.24.15 // indirect
k8s.io/apiserver v0.24.16 // indirect
k8s.io/component-helpers v0.24.16 // indirect
k8s.io/controller-manager v0.24.16 // indirect
k8s.io/klog/v2 v2.80.1 // indirect
k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect
k8s.io/metrics v0.24.15 // indirect
k8s.io/metrics v0.24.16 // indirect
oras.land/oras-go v1.1.1 // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.37 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
Expand All @@ -292,11 +292,11 @@ replace github.com/weaveworks/footloose => github.com/ncopa/footloose v0.0.0-202

// Replacements duplicated from upstream Kubernetes
replace (
// https://github.com/kubernetes/kubernetes/blob/v1.24.15/go.mod#L342-L343
// https://github.com/kubernetes/kubernetes/blob/v1.24.16/go.mod#L342-L343
github.com/docker/distribution => github.com/docker/distribution v2.8.2+incompatible
github.com/docker/docker => github.com/docker/docker v20.10.12+incompatible

// https://github.com/kubernetes/kubernetes/blob/v1.24.15/go.mod#L516-L527
// https://github.com/kubernetes/kubernetes/blob/v1.24.16/go.mod#L516-L527
go.opentelemetry.io/contrib => go.opentelemetry.io/contrib v0.20.0
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc => go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp => go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0
Expand All @@ -310,31 +310,31 @@ replace (
go.opentelemetry.io/otel/trace => go.opentelemetry.io/otel/trace v0.20.0
go.opentelemetry.io/proto/otlp => go.opentelemetry.io/proto/otlp v0.7.0

k8s.io/api => k8s.io/api v0.24.15
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.24.15
k8s.io/apimachinery => k8s.io/apimachinery v0.24.15
k8s.io/apiserver => k8s.io/apiserver v0.24.15
k8s.io/cli-runtime => k8s.io/cli-runtime v0.24.15
k8s.io/client-go => k8s.io/client-go v0.24.15
k8s.io/cloud-provider => k8s.io/cloud-provider v0.24.15
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.24.15
k8s.io/code-generator => k8s.io/code-generator v0.24.15
k8s.io/component-base => k8s.io/component-base v0.24.15
k8s.io/component-helpers => k8s.io/component-helpers v0.24.15
k8s.io/controller-manager => k8s.io/controller-manager v0.24.15
k8s.io/cri-api => k8s.io/cri-api v0.24.15
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.24.15
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.24.15
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.24.15
k8s.io/kube-proxy => k8s.io/kube-proxy v0.24.15
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.24.15
k8s.io/kubectl => k8s.io/kubectl v0.24.15
k8s.io/kubelet => k8s.io/kubelet v0.24.15
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.24.15
k8s.io/metrics => k8s.io/metrics v0.24.15
k8s.io/mount-utils => k8s.io/mount-utils v0.24.15
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.24.15
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.24.15
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.24.15
k8s.io/sample-controller => k8s.io/sample-controller v0.24.15
k8s.io/api => k8s.io/api v0.24.16
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.24.16
k8s.io/apimachinery => k8s.io/apimachinery v0.24.16
k8s.io/apiserver => k8s.io/apiserver v0.24.16
k8s.io/cli-runtime => k8s.io/cli-runtime v0.24.16
k8s.io/client-go => k8s.io/client-go v0.24.16
k8s.io/cloud-provider => k8s.io/cloud-provider v0.24.16
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.24.16
k8s.io/code-generator => k8s.io/code-generator v0.24.16
k8s.io/component-base => k8s.io/component-base v0.24.16
k8s.io/component-helpers => k8s.io/component-helpers v0.24.16
k8s.io/controller-manager => k8s.io/controller-manager v0.24.16
k8s.io/cri-api => k8s.io/cri-api v0.24.16
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.24.16
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.24.16
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.24.16
k8s.io/kube-proxy => k8s.io/kube-proxy v0.24.16
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.24.16
k8s.io/kubectl => k8s.io/kubectl v0.24.16
k8s.io/kubelet => k8s.io/kubelet v0.24.16
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.24.16
k8s.io/metrics => k8s.io/metrics v0.24.16
k8s.io/mount-utils => k8s.io/mount-utils v0.24.16
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.24.16
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.24.16
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.24.16
k8s.io/sample-controller => k8s.io/sample-controller v0.24.16
)
Loading

0 comments on commit eded291

Please sign in to comment.