Merge branch 'improvement/init-dev-2.9' into q/2.9

scality · Feb 23, 2021 · 0905921 · 0905921
2 parents c6d97ea + 0bea9da
commit 0905921
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,8 @@
 # CHANGELOG
 
 ## Release 2.9.0 (in development)
+### Enhancements
+- Bump Kubernetes version to 1.20.4 (PR[#3139](https://github.com/scality/metalk8s/pull/3139))
 
 ## Release 2.8.0 (in development)
 ### Enhancements

diff --git a/buildchain/buildchain/versions.py b/buildchain/buildchain/versions.py
@@ -18,7 +18,7 @@
 # Project-wide versions {{{
 
 CALICO_VERSION: str = "3.17.0"
-K8S_VERSION: str = "1.19.8"
+K8S_VERSION: str = "1.20.4"
 SALT_VERSION: str = "3002.2"
 CONTAINERD_VERSION: str = "1.4.3"
 
@@ -130,22 +130,22 @@ def _version_prefix(version: str, prefix: str = "v") -> str:
     Image(
         name="kube-apiserver",
         version=_version_prefix(K8S_VERSION),
-        digest="sha256:82e0ce4e1d08f3749d05c584fd60986197bfcdf9ce71d4666c71674221d53135",
+        digest="sha256:adef5d31ea2fcf9c523e47bbcc6a955f3c247abbd8a9a97f4a26fdeb18f9b4b8",
     ),
     Image(
         name="kube-controller-manager",
         version=_version_prefix(K8S_VERSION),
-        digest="sha256:2769005fb667dbb936009894d01fe35f5ce1bce45eee80a9ce3c139b9be4080e",
+        digest="sha256:37a251ee07e626fb34dfcd40957a92cf1711e22fade74295f03de8cb6a842845",
     ),
     Image(
         name="kube-proxy",
         version=_version_prefix(K8S_VERSION),
-        digest="sha256:8ed30419d9cf8965854f9ed501159e15deb30c42c3d2a60a278ae169320d140e",
+        digest="sha256:454050a55141f5f77ef30a6d2aa8ee41c6dc03e307f4f2558498099493087cc4",
     ),
     Image(
         name="kube-scheduler",
         version=_version_prefix(K8S_VERSION),
-        digest="sha256:bb66135ce9a25ac405e43bbae6a2ac766e0efcac0a6a73ef9d1fbb4cf4732c9b",
+        digest="sha256:e2e827b27282f0e36f40a9edc910630ba6124f78d572006f3d25bb000f7018ad",
     ),
     Image(
         name="kube-state-metrics",

diff --git a/salt/metalk8s/kubernetes/apiserver/installed.sls b/salt/metalk8s/kubernetes/apiserver/installed.sls
@@ -43,6 +43,7 @@ Create kube-apiserver Pod manifest:
         - /etc/kubernetes/pki/front-proxy-ca.crt
         - {{ certificates.client.files['front-proxy'].path }}
         - /etc/kubernetes/pki/front-proxy-client.key
+        - /etc/kubernetes/pki/sa.key
         - /etc/kubernetes/pki/sa.pub
         - /etc/metalk8s/pki/nginx-ingress/ca.crt
     - context:
@@ -77,7 +78,9 @@ Create kube-apiserver Pod manifest:
           - --requestheader-group-headers=X-Remote-Group
           - --requestheader-username-headers=X-Remote-User
           - --secure-port=6443
+          - --service-account-issuer=https://kubernetes.default.svc.cluster.local
           - --service-account-key-file=/etc/kubernetes/pki/sa.pub
+          - --service-account-signing-key-file=/etc/kubernetes/pki/sa.key
           - --service-cluster-ip-range={{ networks.service }}
           - --tls-cert-file={{ certificates.server.files.apiserver.path }}
           - --tls-private-key-file=/etc/kubernetes/pki/apiserver.key