From c325cc32c3e06ec13be5dc127ccfbef59796cc35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charles-Edouard=20Br=C3=A9t=C3=A9ch=C3=A9?= Date: Wed, 27 Sep 2023 13:17:16 +0000 Subject: [PATCH] fix: make tuf feature in chart consistent with others (#8542) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Charles-Edouard Brétéché --- charts/kyverno/README.md | 2 +- charts/kyverno/templates/_helpers.tpl | 2 +- charts/kyverno/values.yaml | 4 ++-- scripts/config/custom-sigstore/kyverno.yaml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/charts/kyverno/README.md b/charts/kyverno/README.md index 9e5b7922e043..003b7af7b9d1 100644 --- a/charts/kyverno/README.md +++ b/charts/kyverno/README.md @@ -315,7 +315,7 @@ The chart values are organised per component. | features.registryClient.credentialHelpers | list | `["default","google","amazon","azure","github"]` | Enable registry client helpers | | features.reports.chunkSize | int | `1000` | Reports chunk size | | features.ttlController.reconciliationInterval | string | `"1m"` | Reconciliation interval for the label based cleanup manager | -| features.tuf.enable | bool | `false` | Enable tuf | +| features.tuf.enabled | bool | `false` | Enables the feature | | features.tuf.root | string | `nil` | Tuf root | | features.tuf.mirror | string | `nil` | Tuf mirror | diff --git a/charts/kyverno/templates/_helpers.tpl b/charts/kyverno/templates/_helpers.tpl index d306c19187dc..7eb2456ab98a 100644 --- a/charts/kyverno/templates/_helpers.tpl +++ b/charts/kyverno/templates/_helpers.tpl @@ -75,7 +75,7 @@ {{- $flags = append $flags (print "--ttlReconciliationInterval=" .reconciliationInterval) -}} {{- end -}} {{- with .tuf -}} - {{- with .enable -}} + {{- with .enabled -}} {{- $flags = append $flags (print "--enableTuf=" .) -}} {{- end -}} {{- with .mirror -}} diff --git a/charts/kyverno/values.yaml b/charts/kyverno/values.yaml index f21468cb1dc8..d24130c90f0f 100644 --- a/charts/kyverno/values.yaml +++ b/charts/kyverno/values.yaml @@ -448,8 +448,8 @@ features: # -- Reconciliation interval for the label based cleanup manager reconciliationInterval: 1m tuf: - # -- Enable tuf - enable: false + # -- Enables the feature + enabled: false # -- (string) Tuf root root: ~ # -- (string) Tuf mirror diff --git a/scripts/config/custom-sigstore/kyverno.yaml b/scripts/config/custom-sigstore/kyverno.yaml index b383006e739c..531dc1378d0c 100644 --- a/scripts/config/custom-sigstore/kyverno.yaml +++ b/scripts/config/custom-sigstore/kyverno.yaml @@ -1,6 +1,6 @@ features: tuf: - enable: true + enabled: true root: "$(TUF_MIRROR)/root.json" mirror: "$(TUF_MIRROR)"