From 8acd52baaf02bfede1f5f25ad7014839c0f27c73 Mon Sep 17 00:00:00 2001 From: Akash Singhal Date: Fri, 12 Apr 2024 07:56:52 -0700 Subject: [PATCH] fix: update azure tenantId casing (#1385) --- charts/ratify/README.md | 2 +- .../ratify/templates/akv-key-management-provider.yaml | 10 +++++----- charts/ratify/values.yaml | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/charts/ratify/README.md b/charts/ratify/README.md index 7f822314f..eafe93360 100644 --- a/charts/ratify/README.md +++ b/charts/ratify/README.md @@ -125,7 +125,7 @@ Values marked `# DEPRECATED` in the `values.yaml` as well as **DEPRECATED** in t | azureManagedIdentity.tenantId | TenantID of Managed Identity resource | `` | | azurekeyvault.enabled | Enables/disables Azure Key Vault key management provider. If you are using a custom chart, certificate store should be referenced through a Verifier CR. | `false` | | azurekeyvault.vaultURI | Vault URI for Azure Key Vault | `` | -| azurekeyvault.tenantID | Tenant ID of the configured Azure Key Vault resource | `` | +| azurekeyvault.tenantId | Tenant ID of the configured Azure Key Vault resource | `` | | azurekeyvault.certificates | An array of certificate objects identified by `name` and `version` (optional) stored in Azure Key Vault | `[]` | | azurekeyvault.keys | An array of key objects identified by `name` and `version` (optional) stored in Azure Key Vault | `[]` | | notationCert | **DEPRECATED** Please switch to `notationCerts` to specify an array of verification certificates. Public certificate/certificate chain used to create inline certstore used by Notation verifier. | `` | diff --git a/charts/ratify/templates/akv-key-management-provider.yaml b/charts/ratify/templates/akv-key-management-provider.yaml index ec33f4c9a..831496792 100644 --- a/charts/ratify/templates/akv-key-management-provider.yaml +++ b/charts/ratify/templates/akv-key-management-provider.yaml @@ -44,12 +44,12 @@ spec: version: {{ .version }} {{- end }} {{- end }} - {{- if .Values.azurekeyvault.tenantID }} - tenantID: {{ .Values.azurekeyvault.tenantID }} - {{- else if .Values.akvCertConfig.tenantID }} - tenantID: {{ .Values.akvCertConfig.tenantID }} + {{- if .Values.azurekeyvault.tenantId }} + tenantID: {{ .Values.azurekeyvault.tenantId }} + {{- else if .Values.akvCertConfig.tenantId }} + tenantID: {{ .Values.akvCertConfig.tenantId }} {{- else }} - {{- fail "tenantID must be provided when azurekeyvault is enabled. please specify azurekeyvault.tenantID" }} + {{- fail "tenantID must be provided when azurekeyvault is enabled. please specify azurekeyvault.tenantId" }} {{- end }} clientID: {{ required "clientID must be provided when use workload identity in akv" .Values.azureWorkloadIdentity.clientId }} {{ end }} \ No newline at end of file diff --git a/charts/ratify/values.yaml b/charts/ratify/values.yaml index da131780a..315dbf509 100644 --- a/charts/ratify/values.yaml +++ b/charts/ratify/values.yaml @@ -60,7 +60,7 @@ azureManagedIdentity: azurekeyvault: enabled: false vaultURI: - tenantID: + tenantId: certificates: [] keys: [] @@ -155,4 +155,4 @@ akvCertConfig: # DEPRECATED: Use azurekeyvault instead cert2Name: # DEPRECATED: Use azurekeyvault.certificates instead cert2Version: # DEPRECATED: Use azurekeyvault.certificates instead certificates: # DEPRECATED: Use azurekeyvault.certificates instead - tenantId: # DEPRECATED: Use azurekeyvault.tenantID instead \ No newline at end of file + tenantId: # DEPRECATED: Use azurekeyvault.tenantId instead \ No newline at end of file