Merge v2.2.1 changes back to main (#563)

* Bump version to v2.2.0

Signed-off-by: Daniel Weiße <dw@edgeless.systems>

* Fix release detection in pipeline

Signed-off-by: Daniel Weiße <dw@edgeless.systems>

* Update CHANGELOG for 2.2.1

Signed-off-by: Fabian Kammel <fk@edgeless.systems>

* bump constellation versions to 2.2.1

Signed-off-by: Fabian Kammel <fk@edgeless.systems>

Signed-off-by: Daniel Weiße <dw@edgeless.systems>
Signed-off-by: Fabian Kammel <fk@edgeless.systems>
Co-authored-by: Daniel Weiße <dw@edgeless.systems>

CHANGELOG.md

@@ -33,13 +33,23 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 <!-- For now removed features. -->
 - `access-manager` was removed from code base. K8s native way to SSH into nodes documented.
 
+### Security
+<!-- For security related changes. -->
+
+
+## [2.2.1] - 2022-11-14
+
+### Changed
+
+- Increase timeout for `constellation config fetch-measurements` from 3 seconds to 60 seconds.
+- Consistently log CLI warnings and errors to `stderr`.
+
 ### Security
 
 Vulnerabilities in `kube-apiserver` fixed by upgrading to v1.23.14, v1.24.8 and v1.25.4:
 - [CVE-2022-3162](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-3162)
 - [CVE-2022-3294](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-3294)
 
-
 ## [2.2.0] - 2022-11-08
 
 ### Added

CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.11)
-project(constellation LANGUAGES C VERSION 2.2.0)
+project(constellation LANGUAGES C VERSION 2.2.1)
 set(CLI_BUILD_TAGS "" CACHE STRING "Tags passed to go build of Constellation CLI.")
 
 enable_testing()

cli/internal/helm/charts/edgeless/constellation-services/Chart.yaml

@@ -2,35 +2,35 @@ apiVersion: v2
 name: constellation-services
 description: A chart to deploy all microservices that are part of a valid constellation cluster
 type: application
-version: 2.2.0
+version: 2.2.1
 
 dependencies:
   - name: kms
-    version: 2.2.0
+    version: 2.2.1
     tags:
       - Azure
       - GCP
       - AWS
       - QEMU
   - name: join-service
-    version: 2.2.0
+    version: 2.2.1
     tags:
       - Azure
       - GCP
       - AWS
       - QEMU
   - name: ccm
-    version: 2.2.0
+    version: 2.2.1
     tags:
       - Azure
       - GCP
       - AWS
   - name: cnm
-    version: 2.2.0
+    version: 2.2.1
     tags:
       - Azure
   - name: autoscaler
-    version: 2.2.0
+    version: 2.2.1
     tags:
       - Azure
       - GCP

cli/internal/helm/charts/edgeless/constellation-services/charts/autoscaler/Chart.yaml

@@ -2,4 +2,4 @@ apiVersion: v2
 name: autoscaler
 description: A Helm chart to deploy the cluster autoscaler.
 type: application
-version: 2.2.0
+version: 2.2.1

cli/internal/helm/charts/edgeless/constellation-services/charts/ccm/Chart.yaml

@@ -2,4 +2,4 @@ apiVersion: v2
 name: ccm
 description: A Helm chart to deploy the cloud controller manager.
 type: application
-version: 2.2.0
+version: 2.2.1

cli/internal/helm/charts/edgeless/constellation-services/charts/cnm/Chart.yaml

@@ -2,4 +2,4 @@ apiVersion: v2
 name: cnm
 description: A chart to deploy cloud node manager for constellation
 type: application
-version: 2.2.0
+version: 2.2.1

cli/internal/helm/charts/edgeless/constellation-services/charts/join-service/Chart.yaml

@@ -2,4 +2,4 @@ apiVersion: v2
 name: join-service
 description: A chart to deploy the Constellation join-service
 type: application
-version: 2.2.0
+version: 2.2.1

cli/internal/helm/charts/edgeless/constellation-services/charts/kms/Chart.yaml

@@ -2,4 +2,4 @@ apiVersion: v2
 name: kms
 description: A Helm chart to deploy the Constellation Key Management Service
 type: application
-version: 2.2.0
+version: 2.2.1

internal/config/images_enterprise.go

@@ -9,6 +9,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 package config
 
 const (
-	DefaultImageAzure = "/communityGalleries/ConstellationCVM-b3782fa0-0df7-4f2f-963e-fc7fc42663df/images/constellation/versions/2.2.0"
+	DefaultImageAzure = "/communityGalleries/ConstellationCVM-b3782fa0-0df7-4f2f-963e-fc7fc42663df/images/constellation/versions/2.2.1"
-	DefaultImageGCP   = "projects/constellation-images/global/images/constellation-v2-2-0"
+	DefaultImageGCP   = "projects/constellation-images/global/images/constellation-v2-2-1"
 )

internal/versions/versions.go

@@ -73,7 +73,7 @@ const (
 	LibvirtImage = "ghcr.io/edgelesssys/constellation/libvirt:v2.2.0@sha256:81ddc30cd679a95379e94e2f154861d9112bcabfffa96330c09a4917693f7cce" // renovate:container
 
 	// ConstellationQEMUImageURL is the artifact URL for QEMU qcow2 images.
-	ConstellationQEMUImageURL = "https://cdn.confidential.cloud/constellation/images/mini-constellation/v2.2.0/constellation.raw"
+	ConstellationQEMUImageURL = "https://cdn.confidential.cloud/constellation/images/mini-constellation/v2.2.1/constellation.raw"
 
 	// currently supported versions.
 	//nolint:revive