Skip to content

Commit

Permalink
Merge branch 'improvement/bump-k8s-1212' into q/2.10
Browse files Browse the repository at this point in the history
  • Loading branch information
bert-e committed Jun 23, 2021
2 parents 5806039 + 1e8bb33 commit edba22b
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
## Release 2.10.0 (in development)
### Enhancements

- Bump Kubernetes version to 1.21.0
(PR[#3354](https://github.com/scality/metalk8s/pull/3354))
- Bump Kubernetes version to 1.21.2
(PR[#3423](https://github.com/scality/metalk8s/pull/3423))

- Bump CoreDNS version to 1.8.0
(PR[#3354](https://github.com/scality/metalk8s/pull/3354))
Expand Down
10 changes: 5 additions & 5 deletions buildchain/buildchain/versions.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
# Project-wide versions {{{

CALICO_VERSION: str = "3.19.0"
K8S_VERSION: str = "1.21.0"
K8S_VERSION: str = "1.21.2"
SALT_VERSION: str = "3002.6"
CONTAINERD_VERSION: str = "1.4.3"
SOS_VERSION: str = "< 4.0"
Expand Down Expand Up @@ -133,22 +133,22 @@ def _version_prefix(version: str, prefix: str = "v") -> str:
Image(
name="kube-apiserver",
version=_version_prefix(K8S_VERSION),
digest="sha256:828fefd9598ed865d45364d1be859c87aabfa445b03b350e3440d143bd21bca9",
digest="sha256:c86c3855e360b1483008c30c8deaed2b1a92f63eaacec819a90a0ffe04df152b",
),
Image(
name="kube-controller-manager",
version=_version_prefix(K8S_VERSION),
digest="sha256:92414283b8a8ba52ad04691a7124aea042e3f2ec3f6384efc5b08da3e100442d",
digest="sha256:2ea5e2885485fc20aaa15a0033d50e47ce7c559bf292741c16604984088bd700",
),
Image(
name="kube-proxy",
version=_version_prefix(K8S_VERSION),
digest="sha256:326199e7a5232bf7531a3058e9811c925b07085f33fa882558cc4e89379b9109",
digest="sha256:3ee783402715225d6bc483b3a2f8ea11adcb997d00fb5ca2f74734023ade0561",
),
Image(
name="kube-scheduler",
version=_version_prefix(K8S_VERSION),
digest="sha256:1bcafcb4a0c3105fe08018f34c0e43a10a5d696fc8598b1c705116bcc773726f",
digest="sha256:d372f36741c015e30d36aef958a021de4af7218c467edac91796fb03aab478b4",
),
Image(
name="kube-state-metrics",
Expand Down

0 comments on commit edba22b

Please sign in to comment.