From a794c00763d843144880ca633a613d7980afdc89 Mon Sep 17 00:00:00 2001 From: Razvan-Daniel Mihai <84674+razvan@users.noreply.github.com> Date: Mon, 9 Dec 2024 09:52:17 +0100 Subject: [PATCH] fix: revert default secret lifetime to 1 day --- rust/crd/src/lib.rs | 6 +++--- tests/templates/kuttl/kerberos/20-assert.yaml | 6 +++--- tests/templates/kuttl/kerberos/20-install-hdfs.txt.j2 | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/rust/crd/src/lib.rs b/rust/crd/src/lib.rs index 24d13138..2e1d3f42 100644 --- a/rust/crd/src/lib.rs +++ b/rust/crd/src/lib.rs @@ -1086,7 +1086,7 @@ pub struct NameNodeConfig { } impl NameNodeConfigFragment { - const DEFAULT_NAME_NODE_SECRET_LIFETIME: Duration = Duration::from_days_unchecked(7); + const DEFAULT_NAME_NODE_SECRET_LIFETIME: Duration = Duration::from_days_unchecked(1); pub fn default_config(cluster_name: &str, role: &HdfsRole) -> Self { Self { @@ -1223,7 +1223,7 @@ pub struct DataNodeConfig { } impl DataNodeConfigFragment { - const DEFAULT_DATA_NODE_SECRET_LIFETIME: Duration = Duration::from_days_unchecked(7); + const DEFAULT_DATA_NODE_SECRET_LIFETIME: Duration = Duration::from_days_unchecked(1); pub fn default_config(cluster_name: &str, role: &HdfsRole) -> Self { Self { @@ -1342,7 +1342,7 @@ pub struct JournalNodeConfig { } impl JournalNodeConfigFragment { - const DEFAULT_JOURNAL_NODE_SECRET_LIFETIME: Duration = Duration::from_days_unchecked(7); + const DEFAULT_JOURNAL_NODE_SECRET_LIFETIME: Duration = Duration::from_days_unchecked(1); pub fn default_config(cluster_name: &str, role: &HdfsRole) -> Self { Self { resources: ResourcesFragment { diff --git a/tests/templates/kuttl/kerberos/20-assert.yaml b/tests/templates/kuttl/kerberos/20-assert.yaml index ace5b5ca..8c1087f8 100644 --- a/tests/templates/kuttl/kerberos/20-assert.yaml +++ b/tests/templates/kuttl/kerberos/20-assert.yaml @@ -31,6 +31,6 @@ apiVersion: kuttl.dev/v1beta1 kind: TestAssert timeout: 600 commands: - - script: kubectl -n $NAMESPACE get sts/hdfs-namenode-default -o yaml | yq -e '.spec.template.spec.volumes.[] | select(.name == "tls" and .ephemeral.volumeClaimTemplate.metadata.annotations."secrets.stackable.tech/backend.autotls.cert.lifetime" == "7d")' - - script: kubectl -n $NAMESPACE get sts/hdfs-datanode-default -o yaml | yq -e '.spec.template.spec.volumes.[] | select(.name == "tls" and .ephemeral.volumeClaimTemplate.metadata.annotations."secrets.stackable.tech/backend.autotls.cert.lifetime" == "1d")' - - script: kubectl -n $NAMESPACE get sts/hdfs-journalnode-default -o yaml | yq -e '.spec.template.spec.volumes.[] | select(.name == "tls" and .ephemeral.volumeClaimTemplate.metadata.annotations."secrets.stackable.tech/backend.autotls.cert.lifetime" == "2d")' + - script: kubectl -n $NAMESPACE get sts/hdfs-namenode-default -o yaml | yq -e '.spec.template.spec.volumes.[] | select(.name == "tls" and .ephemeral.volumeClaimTemplate.metadata.annotations."secrets.stackable.tech/backend.autotls.cert.lifetime" == "1d")' + - script: kubectl -n $NAMESPACE get sts/hdfs-datanode-default -o yaml | yq -e '.spec.template.spec.volumes.[] | select(.name == "tls" and .ephemeral.volumeClaimTemplate.metadata.annotations."secrets.stackable.tech/backend.autotls.cert.lifetime" == "2d")' + - script: kubectl -n $NAMESPACE get sts/hdfs-journalnode-default -o yaml | yq -e '.spec.template.spec.volumes.[] | select(.name == "tls" and .ephemeral.volumeClaimTemplate.metadata.annotations."secrets.stackable.tech/backend.autotls.cert.lifetime" == "3d")' diff --git a/tests/templates/kuttl/kerberos/20-install-hdfs.txt.j2 b/tests/templates/kuttl/kerberos/20-install-hdfs.txt.j2 index 6f09314d..455f9630 100644 --- a/tests/templates/kuttl/kerberos/20-install-hdfs.txt.j2 +++ b/tests/templates/kuttl/kerberos/20-install-hdfs.txt.j2 @@ -44,7 +44,7 @@ spec: replicas: 2 dataNodes: config: - requestedSecretLifetime: 1d + requestedSecretLifetime: 2d logging: enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }} roleGroups: @@ -58,4 +58,4 @@ spec: default: replicas: 3 config: - requestedSecretLifetime: 2d + requestedSecretLifetime: 3d