Initialitation of Development/2.10 branch

CHANGELOG.md

@@ -1,5 +1,14 @@
 # CHANGELOG
 
+## Release 2.10.0 (in development)
+## Enhancements
+
+- Bump Kubernetes version to 1.21.0
+  (PR[#3354](https://github.com/scality/metalk8s/pull/3354))
+
+- Bump CoreDNS version to 1.8.0
+  (PR[#3354](https://github.com/scality/metalk8s/pull/3354))
+
 ## Release 2.9.2 (in development)
 
 ## Release 2.9.1

VERSION

@@ -1,4 +1,4 @@
 VERSION_MAJOR=2
-VERSION_MINOR=9
-VERSION_PATCH=2
+VERSION_MINOR=10
+VERSION_PATCH=0
 VERSION_SUFFIX=-dev

buildchain/buildchain/constants.py

@@ -18,6 +18,7 @@
 
 # URLs of the main container repositories.
 CALICO_REPOSITORY: str = "docker.io/calico"
+COREDNS_REPOSITORY: str = "k8s.gcr.io/coredns"
 COREOS_REPOSITORY: str = "quay.io/coreos"
 DEX_REPOSITORY: str = "docker.io/dexidp"
 DOCKER_REPOSITORY: str = "docker.io/library"

buildchain/buildchain/image.py

@@ -171,6 +171,9 @@ def _operator_image(name: str, **kwargs: Any) -> targets.OperatorImage:
         "calico-node",
         "calico-kube-controllers",
     ],
+    constants.COREDNS_REPOSITORY: [
+        "coredns",
+    ],
     constants.COREOS_REPOSITORY: [
         "kube-state-metrics",
     ],
@@ -181,7 +184,6 @@ def _operator_image(name: str, **kwargs: Any) -> targets.OperatorImage:
         "nginx",
     ],
     constants.GOOGLE_REPOSITORY: [
-        "coredns",
         "etcd",
         "kube-apiserver",
         "kube-controller-manager",

buildchain/buildchain/versions.py

@@ -19,7 +19,7 @@
 # Project-wide versions {{{
 
 CALICO_VERSION: str = "3.17.0"
-K8S_VERSION: str = "1.20.6"
+K8S_VERSION: str = "1.21.0"
 SALT_VERSION: str = "3002.6"
 CONTAINERD_VERSION: str = "1.4.3"
 
@@ -111,8 +111,8 @@ def _version_prefix(version: str, prefix: str = "v") -> str:
     ),
     Image(
         name="coredns",
-        version="1.7.0",
-        digest="sha256:73ca82b4ce829766d4f1f10947c3a338888f876fbed0540dc849c89ff256e90c",
+        version="v1.8.0",
+        digest="sha256:cc8fb77bc2a0541949d1d9320a641b82fd392b0d3d8145469ca4709ae769980e",
     ),
     Image(
         name="dex",
@@ -137,22 +137,22 @@ def _version_prefix(version: str, prefix: str = "v") -> str:
     Image(
         name="kube-apiserver",
         version=_version_prefix(K8S_VERSION),
-        digest="sha256:e6d960baa4219fa810ee26da8fe8a92a1cf9dae83b6ad8bda0e17ee159c68501",
+        digest="sha256:828fefd9598ed865d45364d1be859c87aabfa445b03b350e3440d143bd21bca9",
     ),
     Image(
         name="kube-controller-manager",
         version=_version_prefix(K8S_VERSION),
-        digest="sha256:a1a6e8dbcf0294175df5f248503c8792b3770c53535670e44a7724718fc93e87",
+        digest="sha256:92414283b8a8ba52ad04691a7124aea042e3f2ec3f6384efc5b08da3e100442d",
     ),
     Image(
         name="kube-proxy",
         version=_version_prefix(K8S_VERSION),
-        digest="sha256:7c1710c965f55bca8d06ebd8d5774ecd9ef924f33fb024e424c2b9b565f477dc",
+        digest="sha256:326199e7a5232bf7531a3058e9811c925b07085f33fa882558cc4e89379b9109",
     ),
     Image(
         name="kube-scheduler",
         version=_version_prefix(K8S_VERSION),
-        digest="sha256:ebb0350893fcfe7328140452f8a88ce682ec6f00337015a055d51b3fe0373429",
+        digest="sha256:1bcafcb4a0c3105fe08018f34c0e43a10a5d696fc8598b1c705116bcc773726f",
     ),
     Image(
         name="kube-state-metrics",

charts/dex.yaml

@@ -61,6 +61,14 @@ certs:
   grpc:
     create: false
 
+# Explicitly set namespace from env since it's needed for Dex in K8s 1.21
+# Sees: https://github.com/dexidp/dex/issues/2082
+env:
+  - name: KUBERNETES_POD_NAMESPACE
+    valueFrom:
+      fieldRef:
+        fieldPath: metadata.namespace
+
 # NOTE: Ignore these values, the configuration is computed from
 #       - salt/metalk8s/addons/dex/config/dex.yaml
 #       - salt/metalk8s/addons/dex/deployed/service-configuration.sls

salt/metalk8s/addons/dex/deployed/chart.sls

@@ -135,7 +135,11 @@ spec:
         - /usr/local/bin/dex
         - serve
         - /etc/dex/cfg/config.yaml
-        env: []
+        env:
+        - name: KUBERNETES_POD_NAMESPACE
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.namespace
         image: {% endraw -%}{{ build_image_name("dex", False) }}{%- raw %}:v2.27.0
         imagePullPolicy: IfNotPresent
         name: main