From a660af05f167cca2eb3f80ae1d19650413afa32e Mon Sep 17 00:00:00 2001 From: Malte Poll Date: Tue, 19 Jul 2022 09:25:44 +0200 Subject: [PATCH] Use same name for k8s config map key and filename of k8s config map version in joinservice Signed-off-by: Malte Poll --- bootstrapper/internal/kubernetes/kubernetes.go | 3 ++- internal/constants/constants.go | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/bootstrapper/internal/kubernetes/kubernetes.go b/bootstrapper/internal/kubernetes/kubernetes.go index 56ccc7d80..e5fc1a2be 100644 --- a/bootstrapper/internal/kubernetes/kubernetes.go +++ b/bootstrapper/internal/kubernetes/kubernetes.go @@ -15,6 +15,7 @@ import ( "github.com/edgelesssys/constellation/bootstrapper/util" attestationtypes "github.com/edgelesssys/constellation/internal/attestation/types" "github.com/edgelesssys/constellation/internal/cloud/metadata" + "github.com/edgelesssys/constellation/internal/constants" "github.com/edgelesssys/constellation/internal/logger" "github.com/edgelesssys/constellation/internal/versions" "github.com/spf13/afero" @@ -380,7 +381,7 @@ func (k *KubeWrapper) setupK8sVersionConfigMap(ctx context.Context, k8sVersion s Namespace: "kube-system", }, Data: map[string]string{ - "K8sVersion": k8sVersion, + constants.K8sVersion: k8sVersion, }, } diff --git a/internal/constants/constants.go b/internal/constants/constants.go index 4fde71131..8432188c0 100644 --- a/internal/constants/constants.go +++ b/internal/constants/constants.go @@ -69,7 +69,7 @@ const ( MeasurementsFilename = "measurements" // IDFilename is the filename of Constellation's IDs. IDFilename = "id" - // K8sVersion is the filename of the mapped k8s-version configMap file. + // K8sVersion is the filename of the mapped "k8s-version" configMap file. K8sVersion = "k8s-version" //