kms: rename kms to keyservice

In the light of extending our eKMS support it will be helpful to have a tighter use of the word "KMS". KMS should refer to the actual component that manages keys. The keyservice, also called KMS in the constellation code, does not manage keys itself. It talks to a KMS backend, which in turn does the actual key management.
edgelesssys · Jan 11, 2023 · 692b62e · 692b62e
1 parent b89a301
commit 692b62e
Show file tree

Hide file tree

Showing 101 changed files with 275 additions and 273 deletions.
diff --git a/.github/actions/e2e_mini/run-e2e.sh b/.github/actions/e2e_mini/run-e2e.sh
@@ -59,7 +59,7 @@ kubectl -n kube-system wait --for=condition=Available=True --timeout=180s deploy
 # Wait for daemon sets
 kubectl -n kube-system rollout status --timeout 180s daemonset cilium
 kubectl -n kube-system rollout status --timeout 180s daemonset join-service
-kubectl -n kube-system rollout status --timeout 180s daemonset kms
+kubectl -n kube-system rollout status --timeout 180s daemonset keyservice
 kubectl -n kube-system rollout status --timeout 180s daemonset konnectivity-agent
 kubectl -n kube-system rollout status --timeout 180s daemonset verification-service
 echo "::endgroup::"
diff --git a/.github/workflows/build-kms-image.yml → .github/workflows/build-keyservice-image.yml b/.github/workflows/build-kms-image.yml → .github/workflows/build-keyservice-image.yml
@@ -1,4 +1,4 @@
-name: Build and upload KMS image
+name: Build and upload Keyservice image
 
 on:
   workflow_dispatch:
@@ -7,12 +7,12 @@ on:
       - main
       - "release/**"
     paths:
-      - "kms/**"
+      - "keyservice/**"
       - "internal/**"
       - "!internal/versions/versions.go" # Don't build on version bumps to avoid infinite loops
 
 jobs:
-  build-kms-server:
+  build-keyservice:
     runs-on: ubuntu-22.04
     permissions:
       contents: read
@@ -29,13 +29,13 @@ jobs:
         with:
           go-version: "1.19.4"
 
-      - name: Build and upload KMS server container image
+      - name: Build and upload Keyservice container image
         id: build-and-upload
         uses: ./.github/actions/build_micro_service
         with:
-          name: kmsserver
+          name: keyservice
           projectVersion: "0.0.0"
-          dockerfile: kms/Dockerfile
+          dockerfile: keyservice/Dockerfile
           githubToken: ${{ secrets.GITHUB_TOKEN }}
           cosignPublicKey: ${{ startsWith(github.ref, 'refs/heads/release/v') && secrets.COSIGN_PUBLIC_KEY || secrets.COSIGN_DEV_PUBLIC_KEY }}
           cosignPrivateKey: ${{ startsWith(github.ref, 'refs/heads/release/v') && secrets.COSIGN_PRIVATE_KEY || secrets.COSIGN_DEV_PRIVATE_KEY }}

diff --git a/.github/workflows/build-micro-service-manual.yml b/.github/workflows/build-micro-service-manual.yml
@@ -8,7 +8,7 @@ on:
         type: choice
         options:
           - "join-service"
-          - "kmsserver"
+          - "keyservice"
           - "verification-service"
           - "qemu-metadata-api"
           - "filebeat-debugd"
@@ -49,8 +49,8 @@ jobs:
           case "${{ inputs.microService }}" in
             "join-service" )
               echo "microServiceDockerfile=joinservice/Dockerfile" >> "$GITHUB_ENV" ;;
-            "kmsserver" )
-              echo "microServiceDockerfile=kms/Dockerfile" >> "$GITHUB_ENV" ;;
+            "keyservice" )
+              echo "microServiceDockerfile=keyservice/Dockerfile" >> "$GITHUB_ENV" ;;
             "verification-service" )
               echo "microServiceDockerfile=verify/Dockerfile" >> "$GITHUB_ENV" ;;
             "qemu-metadata-api" )

diff --git a/CODEOWNERS b/CODEOWNERS
@@ -36,7 +36,7 @@
 /internal/versions @katexochen
 /internal/versionsapi @katexochen
 /joinservice @daniel-weisse
-/kms @daniel-weisse
+/keyservice @daniel-weisse
 /operators @malt3
 /upgrade-agent @3u13r
 /verify @daniel-weisse

diff --git a/cli/internal/cmd/init.go b/cli/internal/cmd/init.go
@@ -33,7 +33,7 @@ import (
 	"github.com/edgelesssys/constellation/v2/internal/license"
 	"github.com/edgelesssys/constellation/v2/internal/retry"
 	"github.com/edgelesssys/constellation/v2/internal/versions"
-	kms "github.com/edgelesssys/constellation/v2/kms/setup"
+	keyservice "github.com/edgelesssys/constellation/v2/keyservice/setup"
 	"github.com/spf13/afero"
 	"github.com/spf13/cobra"
 	"google.golang.org/grpc"
@@ -143,8 +143,8 @@ func (i *initCmd) initialize(cmd *cobra.Command, newDialer func(validator *cloud
 	req := &initproto.InitRequest{
 		MasterSecret:           masterSecret.Key,
 		Salt:                   masterSecret.Salt,
-		KmsUri:                 kms.ClusterKMSURI,
-		StorageUri:             kms.NoStoreURI,
+		KmsUri:                 keyservice.ClusterKMSURI,
+		StorageUri:             keyservice.NoStoreURI,
 		KeyEncryptionKeyId:     "",
 		UseExistingKek:         false,
 		CloudServiceAccountUri: serviceAccURI,

diff --git a/cli/internal/helm/charts/edgeless/constellation-services/Chart.yaml b/cli/internal/helm/charts/edgeless/constellation-services/Chart.yaml
@@ -4,7 +4,7 @@ description: A chart to deploy all microservices that are part of a valid conste
 type: application
 version: 2.4.0
 dependencies:
-  - name: kms
+  - name: keyservice
     version: 2.4.0
     tags:
       - Azure

diff --git a/...less/constellation-services/charts/azuredisk-csi-driver/templates/csi-azuredisk-node.yaml b/...less/constellation-services/charts/azuredisk-csi-driver/templates/csi-azuredisk-node.yaml
@@ -121,7 +121,7 @@ spec:
             - "--allow-empty-cloud-config={{ .Values.node.allowEmptyCloudConfig }}"
             - "--support-zone={{ .Values.node.supportZone }}"
             - "--get-node-info-from-labels={{ .Values.linux.getNodeInfoFromLabels }}"
-            - "--kms-addr=kms.{{ .Values.node.kmsNamespace | default .Release.Namespace }}:{{ .Values.node.kmsPort }}"
+            - "--kms-addr=keyservice.{{ .Values.node.keyserviceNamespace | default .Release.Namespace }}:{{ .Values.global.keyservicePort }}"
           ports:
             - containerPort: {{ .Values.node.livenessProbe.healthPort }}
               name: healthz

diff --git a/...ernal/helm/charts/edgeless/constellation-services/charts/azuredisk-csi-driver/values.yaml b/...ernal/helm/charts/edgeless/constellation-services/charts/azuredisk-csi-driver/values.yaml
@@ -123,8 +123,7 @@ node:
   logLevel: 5
   livenessProbe:
     healthPort: 29603
-  kmsPort: "9000"
-  kmsNamespace: "kube-system"
+  keyserviceNamespace: "kube-system"
 
 snapshot:
   enabled: false

diff --git a/.../constellation-services/charts/gcp-compute-persistent-disk-csi-driver/templates/node.yaml b/.../constellation-services/charts/gcp-compute-persistent-disk-csi-driver/templates/node.yaml
@@ -41,7 +41,7 @@ spec:
             - "--v=5"
             - "--endpoint=unix:/csi/csi.sock"
             - "--run-controller-service=false"
-            - "--kms-addr=kms.{{ .Values.csiNode.kmsNamespace | default .Release.Namespace }}:{{ .Values.csiNode.kmsPort }}"
+            - "--kms-addr=keyservice.{{ .Values.csiNode.keyserviceNamespace | default .Release.Namespace }}:{{ .Values.global.keyservicePort }}"
           securityContext:
             privileged: true
           volumeMounts:

diff --git a/...edgeless/constellation-services/charts/gcp-compute-persistent-disk-csi-driver/values.yaml b/...edgeless/constellation-services/charts/gcp-compute-persistent-disk-csi-driver/values.yaml
@@ -30,7 +30,6 @@ csiController:
   runOnControlPlane: true
 
 csiNode:
-  kmsPort: "9000"
-  kmsNamespace: "kube-system"
+  keyserviceNamespace: "kube-system"
 
 createStorageClass: true
diff --git a/.../helm/charts/edgeless/constellation-services/charts/join-service/templates/daemonset.yaml b/.../helm/charts/edgeless/constellation-services/charts/join-service/templates/daemonset.yaml
@@ -38,7 +38,7 @@ spec:
           image: {{ .Values.image | quote }}
           args:
             - --cloud-provider={{ .Values.csp }}
-            - --kms-endpoint=kms.{{ .Release.Namespace }}:{{ .Values.global.kmsPort }}
+            - --keyservice-endpoint=keyservice.{{ .Release.Namespace }}:{{ .Values.global.keyservicePort }}
           volumeMounts:
             - mountPath: {{ .Values.global.serviceBasePath | quote }}
               name: config

diff --git a/...tellation-services/charts/kms/.helmignore → ...on-services/charts/keyservice/.helmignore b/...tellation-services/charts/kms/.helmignore → ...on-services/charts/keyservice/.helmignore
diff --git a/cli/internal/helm/charts/edgeless/constellation-services/charts/keyservice/Chart.yaml b/cli/internal/helm/charts/edgeless/constellation-services/charts/keyservice/Chart.yaml
@@ -0,0 +1,5 @@
+apiVersion: v2
+name: keyservice
+description: A Helm chart to deploy the Constellation Keyservice
+type: application
+version: 2.4.0
diff --git a/...ces/charts/kms/templates/clusterrole.yaml → ...rts/keyservice/templates/clusterrole.yaml b/...ces/charts/kms/templates/clusterrole.yaml → ...rts/keyservice/templates/clusterrole.yaml
@@ -2,8 +2,8 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   labels:
-    k8s-app: kms
-  name: kms
+    k8s-app: keyservice
+  name: keyservice
 rules:
 - apiGroups:
   - ""

diff --git a/...rts/kms/templates/clusterrolebinding.yaml → ...service/templates/clusterrolebinding.yaml b/...rts/kms/templates/clusterrolebinding.yaml → ...service/templates/clusterrolebinding.yaml
@@ -1,12 +1,12 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: kms
+  name: keyservice
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: kms
+  name: keyservice
 subjects:
 - kind: ServiceAccount
-  name: kms
+  name: keyservice
   namespace: {{ .Release.Namespace }}
diff --git a/...vices/charts/kms/templates/daemonset.yaml → ...harts/keyservice/templates/daemonset.yaml b/...vices/charts/kms/templates/daemonset.yaml → ...harts/keyservice/templates/daemonset.yaml
@@ -2,25 +2,25 @@ apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   labels:
-    component: kms
-    k8s-app: kms
+    component: keyservice
+    k8s-app: keyservice
     kubernetes.io/cluster-service: "true"
-  name: kms
+  name: keyservice
   namespace: {{ .Release.Namespace }}
 spec:
   selector:
     matchLabels:
-      k8s-app: kms
+      k8s-app: keyservice
   template:
     metadata:
       labels:
-        k8s-app: kms
+        k8s-app: keyservice
     spec:
       containers:
-        - name: kms
+        - name: keyservice
           image: {{ .Values.image | quote }}
           args:
-            - --port={{ .Values.global.kmsPort }}
+            - --port={{ .Values.global.keyservicePort }}
           volumeMounts:
             - mountPath: {{ .Values.global.serviceBasePath | quote }}
               name: config
@@ -29,7 +29,7 @@ spec:
       nodeSelector:
         node-role.kubernetes.io/control-plane: ""
       priorityClassName: system-cluster-critical
-      serviceAccountName: kms
+      serviceAccountName: keyservice
       tolerations:
       - key: CriticalAddonsOnly
         operator: Exists

diff --git a/...es/charts/kms/templates/mastersecret.yaml → ...ts/keyservice/templates/mastersecret.yaml b/...es/charts/kms/templates/mastersecret.yaml → ...ts/keyservice/templates/mastersecret.yaml
diff --git a/...ervices/charts/kms/templates/service.yaml → .../charts/keyservice/templates/service.yaml b/...ervices/charts/kms/templates/service.yaml → .../charts/keyservice/templates/service.yaml
@@ -1,16 +1,16 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: kms
+  name: keyservice
   namespace: {{ .Release.Namespace }}
 spec:
   ports:
   - name: grpc
-    port: {{ .Values.global.kmsPort }}
+    port: {{ .Values.global.keyservicePort }}
     protocol: TCP
-    targetPort: {{ .Values.global.kmsPort }}
+    targetPort: {{ .Values.global.keyservicePort }}
   selector:
-    k8s-app: kms
+    k8s-app: keyservice
   type: ClusterIP
 status:
   loadBalancer: {}
diff --git a/.../charts/kms/templates/serviceaccount.yaml → .../keyservice/templates/serviceaccount.yaml b/.../charts/kms/templates/serviceaccount.yaml → .../keyservice/templates/serviceaccount.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: kms
+  name: keyservice
   namespace: {{ .Release.Namespace }}
diff --git a/...on-services/charts/kms/values.schema.json → ...ices/charts/keyservice/values.schema.json b/...on-services/charts/kms/values.schema.json → ...ices/charts/keyservice/values.schema.json
@@ -4,7 +4,7 @@
         "image": {
             "description": "Container image to use for the spawned pods.",
             "type": "string",
-            "examples": ["ghcr.io/edgelesssys/constellation/kms:latest"]
+            "examples": ["ghcr.io/edgelesssys/constellation/keyservice:latest"]
         },
         "masterSecret": {
             "description": "Secret used to derive key material within the cluster",

diff --git a/...tellation-services/charts/kms/values.yaml → ...on-services/charts/keyservice/values.yaml b/...tellation-services/charts/kms/values.yaml → ...on-services/charts/keyservice/values.yaml
diff --git a/cli/internal/helm/charts/edgeless/constellation-services/values.yaml b/cli/internal/helm/charts/edgeless/constellation-services/values.yaml
@@ -1,6 +1,6 @@
 global:
-  # Port on which the KMS service will listen. Global since join-service also uses the value.
-  kmsPort: 9000
+  # Port on which the Keyservice will listen. Global since join-service also uses the value.
+  keyservicePort: 9000
   # Path to which secrets/CMs are mounted.
   serviceBasePath: /var/config
   # Name of the ConfigMap that holds measurements and other info.

diff --git a/cli/internal/helm/loader.go b/cli/internal/helm/loader.go
@@ -52,7 +52,7 @@ const (
 // ChartLoader loads embedded helm charts.
 type ChartLoader struct {
 	joinServiceImage             string
-	kmsImage                     string
+	keyserviceImage              string
 	ccmImage                     string
 	cnmImage                     string
 	autoscalerImage              string
@@ -78,7 +78,7 @@ func NewLoader(csp cloudprovider.Provider, k8sVersion versions.ValidK8sVersion)
 
 	return &ChartLoader{
 		joinServiceImage:             versions.JoinImage,
-		kmsImage:                     versions.KmsImage,
+		keyserviceImage:              versions.KeyServiceImage,
 		ccmImage:                     ccmImage,
 		cnmImage:                     cnmImage,
 		autoscalerImage:              versions.VersionConfigs[k8sVersion].ClusterAutoscalerImage,
@@ -359,13 +359,13 @@ func (i *ChartLoader) loadConstellationServicesValues(config *config.Config, mas
 	csp := config.GetProvider()
 	values := map[string]any{
 		"global": map[string]any{
-			"kmsPort":          constants.KMSPort,
+			"keyservicePort":   constants.KeyservicePort,
 			"serviceBasePath":  constants.ServiceBasePath,
 			"joinConfigCMName": constants.JoinConfigMap,
 			"internalCMName":   constants.InternalConfigMap,
 		},
-		"kms": map[string]any{
-			"image":                i.kmsImage,
+		"keyservice": map[string]any{
+			"image":                i.keyserviceImage,
 			"masterSecret":         base64.StdEncoding.EncodeToString(masterSecret),
 			"salt":                 base64.StdEncoding.EncodeToString(salt),
 			"saltKeyName":          constants.ConstellationSaltKey,
@@ -422,8 +422,7 @@ func (i *ChartLoader) loadConstellationServicesValues(config *config.Config, mas
 
 		values["azuredisk-csi-driver"] = map[string]any{
 			"node": map[string]any{
-				"kmsPort":      constants.KMSPort,
-				"kmsNamespace": "", // empty namespace means we use the release namespace
+				"keyserviceNamespace": "", // empty namespace means we use the release namespace
 			},
 		}
 
@@ -446,8 +445,7 @@ func (i *ChartLoader) loadConstellationServicesValues(config *config.Config, mas
 
 		values["gcp-compute-persistent-disk-csi-driver"] = map[string]any{
 			"csiNode": map[string]any{
-				"kmsPort":      constants.KMSPort,
-				"kmsNamespace": "", // empty namespace means we use the release namespace
+				"keyserviceNamespace": "", // empty namespace means we use the release namespace
 			},
 		}
 

diff --git a/cli/internal/helm/loader_test.go b/cli/internal/helm/loader_test.go
@@ -90,7 +90,7 @@ func TestConstellationServices(t *testing.T) {
 
 			chartLoader := ChartLoader{
 				joinServiceImage:         "joinServiceImage",
-				kmsImage:                 "kmsImage",
+				keyserviceImage:          "keyserviceImage",
 				ccmImage:                 tc.ccmImage,
 				cnmImage:                 tc.cnmImage,
 				autoscalerImage:          "autoscalerImage",
@@ -159,7 +159,7 @@ func TestOperators(t *testing.T) {
 
 			chartLoader := ChartLoader{
 				joinServiceImage:             "joinServiceImage",
-				kmsImage:                     "kmsImage",
+				keyserviceImage:              "keyserviceImage",
 				ccmImage:                     "ccmImage",
 				cnmImage:                     "cnmImage",
 				autoscalerImage:              "autoscalerImage",

diff --git a/...zure/constellation-services/charts/azuredisk-csi-driver/templates/csi-azuredisk-node.yaml b/...zure/constellation-services/charts/azuredisk-csi-driver/templates/csi-azuredisk-node.yaml
@@ -107,7 +107,7 @@ spec:
             - "--allow-empty-cloud-config=true"
             - "--support-zone=true"
             - "--get-node-info-from-labels=false"
-            - "--kms-addr=kms.testNamespace:9000"
+            - "--kms-addr=keyservice.testNamespace:9000"
           ports:
             - containerPort: 29603
               name: healthz

diff --git a/...l/helm/testdata/Azure/constellation-services/charts/join-service/templates/daemonset.yaml b/...l/helm/testdata/Azure/constellation-services/charts/join-service/templates/daemonset.yaml
@@ -38,7 +38,7 @@ spec:
           image: joinServiceImage
           args:
             - --cloud-provider=Azure
-            - --kms-endpoint=kms.testNamespace:9000
+            - --keyservice-endpoint=keyservice.testNamespace:9000
           volumeMounts:
             - mountPath: /var/config
               name: config

diff --git a/...ces/charts/kms/templates/clusterrole.yaml → ...rts/keyservice/templates/clusterrole.yaml b/...ces/charts/kms/templates/clusterrole.yaml → ...rts/keyservice/templates/clusterrole.yaml
@@ -2,8 +2,8 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   labels:
-    k8s-app: kms
-  name: kms
+    k8s-app: keyservice
+  name: keyservice
 rules:
 - apiGroups:
   - ""

diff --git a/...rts/kms/templates/clusterrolebinding.yaml → ...service/templates/clusterrolebinding.yaml b/...rts/kms/templates/clusterrolebinding.yaml → ...service/templates/clusterrolebinding.yaml
@@ -1,12 +1,12 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: kms
+  name: keyservice
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: kms
+  name: keyservice
 subjects:
 - kind: ServiceAccount
-  name: kms
+  name: keyservice
   namespace: testNamespace