From a973e1ee343d71da3be9d5694a0129e7d20b49ef Mon Sep 17 00:00:00 2001 From: Yunfei Jiang Date: Tue, 7 Mar 2023 21:33:31 +0800 Subject: [PATCH] fix-kms-msg --- .../aws/kms-key/ipi-conf-aws-kms-key-ref.yaml | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/ci-operator/step-registry/ipi/conf/aws/kms-key/ipi-conf-aws-kms-key-ref.yaml b/ci-operator/step-registry/ipi/conf/aws/kms-key/ipi-conf-aws-kms-key-ref.yaml index 9245aef686f5c..5df1afd927709 100644 --- a/ci-operator/step-registry/ipi/conf/aws/kms-key/ipi-conf-aws-kms-key-ref.yaml +++ b/ci-operator/step-registry/ipi/conf/aws/kms-key/ipi-conf-aws-kms-key-ref.yaml @@ -13,26 +13,32 @@ ref: - name: AWS_KMS_KEY_ARN_DEFAULT_MACHINE default: "" documentation: |- - KMS Key for defaultMachine, if empty (""), read key id from "${SHARED_DIR}/aws_kms_key_arn" created by step aws-provision-kms-key + KMS key of default machine platform + If empty (""), read key id from "${SHARED_DIR}/aws_kms_key_arn" created by step aws-provision-kms-key - name: AWS_KMS_KEY_ARN_CONTROL_PLANE default: "" documentation: |- - KMS Key for control plane nodes, if empty (""), read key id from "${SHARED_DIR}/aws_kms_key_arn" created by step aws-provision-kms-key + KMS key of control plane nodes + If empty (""), read key id from "${SHARED_DIR}/aws_kms_key_arn" created by step aws-provision-kms-key - name: AWS_KMS_KEY_ARN_COMPUTE default: "" documentation: |- - KMS Key for control plane nodes, if empty (""), read key id from "${SHARED_DIR}/aws_kms_key_arn" created by step aws-provision-kms-key + KMS key of compute nodes + If empty (""), read key id from "${SHARED_DIR}/aws_kms_key_arn" created by step aws-provision-kms-key - name: AWS_KMS_KEY_ENABLE_DEFAULT_MACHINE default: "yes" documentation: |- - Flag that indicate if provide KMS key in install-config.yaml for default machine nodes (platform.aws.defaultMachinePlatform.rootVolume.kmsKeyARN) - - name: AWS_KMS_KEY_ENABLE_COMPUTE + If set KMS key in default machine platform + - name: AWS_KMS_KEY_ENABLE_CONTROL_PLANE default: "no" documentation: |- - Flag that indicate if provide KMS key in install-config.yaml for control plane nodes (controlPlane.platform.aws.rootVolume.kmsKeyARN) - - name: AWS_KMS_KEY_ENABLE_CONTROL_PLANE + If set KMS key for control plane nodes + - name: AWS_KMS_KEY_ENABLE_COMPUTE default: "no" documentation: |- - Flag that indicate if provide KMS key in install-config.yaml for compute nodes (compute.platform.aws.rootVolume.kmsKeyARN) + If set KMS key for compute nodes documentation: |- - Set custom KMS key. + Set custom KMS key: + control plane nodes: controlPlane.platform.aws.rootVolume.kmsKeyARN + compute nodes: compute[0].platform.aws.rootVolume.kmsKeyARN + default machine platform: platform.aws.defaultMachinePlatform.rootVolume.kmsKeyARN