From 15b612b4cbf6c92a889a55b995de56947ff321a9 Mon Sep 17 00:00:00 2001 From: Fabian Kammel Date: Mon, 14 Nov 2022 16:32:32 +0000 Subject: [PATCH] bump constellation versions to 2.2.1 Signed-off-by: Fabian Kammel --- CMakeLists.txt | 2 +- .../edgeless/constellation-services/Chart.yaml | 12 ++++++------ .../charts/autoscaler/Chart.yaml | 2 +- .../constellation-services/charts/ccm/Chart.yaml | 2 +- .../constellation-services/charts/cnm/Chart.yaml | 2 +- .../charts/join-service/Chart.yaml | 2 +- .../constellation-services/charts/kms/Chart.yaml | 2 +- internal/config/images_enterprise.go | 4 ++-- internal/versions/versions.go | 12 ++++++------ 9 files changed, 20 insertions(+), 20 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1f91a0132e..0ca48c04bb 100644 --- a/CMakeLists.txt +++ b/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() diff --git a/cli/internal/helm/charts/edgeless/constellation-services/Chart.yaml b/cli/internal/helm/charts/edgeless/constellation-services/Chart.yaml index 49012e4b1f..749ddcd3f2 100644 --- a/cli/internal/helm/charts/edgeless/constellation-services/Chart.yaml +++ b/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 diff --git a/cli/internal/helm/charts/edgeless/constellation-services/charts/autoscaler/Chart.yaml b/cli/internal/helm/charts/edgeless/constellation-services/charts/autoscaler/Chart.yaml index 75e5e44cfc..4ac29e9f30 100644 --- a/cli/internal/helm/charts/edgeless/constellation-services/charts/autoscaler/Chart.yaml +++ b/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 diff --git a/cli/internal/helm/charts/edgeless/constellation-services/charts/ccm/Chart.yaml b/cli/internal/helm/charts/edgeless/constellation-services/charts/ccm/Chart.yaml index 6cb52cc106..a5560c952e 100644 --- a/cli/internal/helm/charts/edgeless/constellation-services/charts/ccm/Chart.yaml +++ b/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 diff --git a/cli/internal/helm/charts/edgeless/constellation-services/charts/cnm/Chart.yaml b/cli/internal/helm/charts/edgeless/constellation-services/charts/cnm/Chart.yaml index e6f9aafcad..f546742dd3 100644 --- a/cli/internal/helm/charts/edgeless/constellation-services/charts/cnm/Chart.yaml +++ b/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 diff --git a/cli/internal/helm/charts/edgeless/constellation-services/charts/join-service/Chart.yaml b/cli/internal/helm/charts/edgeless/constellation-services/charts/join-service/Chart.yaml index b548120bf5..54b733bb10 100644 --- a/cli/internal/helm/charts/edgeless/constellation-services/charts/join-service/Chart.yaml +++ b/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 diff --git a/cli/internal/helm/charts/edgeless/constellation-services/charts/kms/Chart.yaml b/cli/internal/helm/charts/edgeless/constellation-services/charts/kms/Chart.yaml index 9de44ebab9..e5f64e131a 100644 --- a/cli/internal/helm/charts/edgeless/constellation-services/charts/kms/Chart.yaml +++ b/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 diff --git a/internal/config/images_enterprise.go b/internal/config/images_enterprise.go index ebbdbf0ee7..8f85aefecd 100644 --- a/internal/config/images_enterprise.go +++ b/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" - DefaultImageGCP = "projects/constellation-images/global/images/constellation-v2-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-1" ) diff --git a/internal/versions/versions.go b/internal/versions/versions.go index abbc2f3846..a6f7a5a82c 100644 --- a/internal/versions/versions.go +++ b/internal/versions/versions.go @@ -46,13 +46,13 @@ const ( // These images are built in a way that they support all versions currently listed in VersionConfigs. KonnectivityAgentImage = "us.gcr.io/k8s-artifacts-prod/kas-network-proxy/proxy-agent:v0.0.33@sha256:48f2a4ec3e10553a81b8dd1c6fa5fe4bcc9617f78e71c1ca89c6921335e2d7da" // renovate:container KonnectivityServerImage = "registry.k8s.io/kas-network-proxy/proxy-server:v0.0.33@sha256:2c111f004bec24888d8cfa2a812a38fb8341350abac67dcd0ac64e709dfe389c" // renovate:container - JoinImage = "ghcr.io/edgelesssys/constellation/join-service:v2.2.0@sha256:8d2c4483e4bee8b2ed1eb32ad35298f51ad167e0aa074c9bc45c2a75ec0d1a22" // renovate:container - AccessManagerImage = "ghcr.io/edgelesssys/constellation/access-manager:v2.2.0@sha256:e6aa2ef3a65e7d4be25569ad9cbf6cee1dafa2c00734fa85aeb4e56a5943f88e" // renovate:container - KmsImage = "ghcr.io/edgelesssys/constellation/kmsserver:v2.2.0@sha256:df72c9a8e75a848023a4b86faf3399efb8693b980e324eaa41823bc6d0a15006" // renovate:container - VerificationImage = "ghcr.io/edgelesssys/constellation/verification-service:v2.2.0@sha256:c928077e535507af7148c083bb1bde4d187eab8aee0e82be06f9b794aa2442e7" // renovate:container + JoinImage = "ghcr.io/edgelesssys/constellation/join-service:v2.2.1@sha256:52def1e33af92a29084a246d182c5e35cb455bcc2fbfeb0f9c586682dd18a6ce" // renovate:container + AccessManagerImage = "ghcr.io/edgelesssys/constellation/access-manager:v2.2.1@sha256:5d48b825e5ee265231ae327e3d1445918bfa7fd5c24df9d346d76de2b7522d29" // renovate:container + KmsImage = "ghcr.io/edgelesssys/constellation/kmsserver:v2.2.1@sha256:719be67709a2ac1fcacc6fd3456dea85aeff8e529cd6f0099bf52428bc57f791" // renovate:container + VerificationImage = "ghcr.io/edgelesssys/constellation/verification-service:v2.2.1@sha256:f13159dbe6acc4991c863e312136c563851ec9669238b6c51e4891b89bbb7897" // renovate:container // Check for new versions at https://github.com/GoogleCloudPlatform/guest-agent/releases and update in /.github/workflows/build-gcp-guest-agent.yml. GcpGuestImage = "ghcr.io/edgelesssys/gcp-guest-agent:20220927.00@sha256:3dea1ae3f162d2353e6584b325f0e325a39cda5f380f41e5a0ee43c6641d3905" // renovate:container - NodeOperatorCatalogImage = "ghcr.io/edgelesssys/constellation/node-operator-catalog:v2.2.0@sha256:543ebc67183b580cfeda9e14ff3a0c5056813847ad3605719b54d72b22427a69" // renovate:container + NodeOperatorCatalogImage = "ghcr.io/edgelesssys/constellation/node-operator-catalog:v2.2.1@sha256:ce65d00b9cd775dfc23566c5de8a8433c153f104ef217bb6528ddfc1a764757f" // renovate:container // TODO: switch node maintenance operator catalog back to upstream quay.io/medik8s/node-maintenance-operator-catalog // once https://github.com/medik8s/node-maintenance-operator/issues/49 is resolved. NodeMaintenanceOperatorCatalogImage = "ghcr.io/edgelesssys/constellation/node-maintenance-operator-catalog:v0.13.1-alpha1@sha256:d382c3aaf9bc470cde6f6c05c2c6ff5c9dcfd90540d5b11f9cf69c4e1dd1ca9d" // renovate:container @@ -61,7 +61,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