Skip to content

Commit

Permalink
fix: update azure tenantId casing (#1385)
Browse files Browse the repository at this point in the history
  • Loading branch information
akashsinghal authored Apr 12, 2024
1 parent 003fe00 commit 8acd52b
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion charts/ratify/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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. | `` |
Expand Down
10 changes: 5 additions & 5 deletions charts/ratify/templates/akv-key-management-provider.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
4 changes: 2 additions & 2 deletions charts/ratify/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ azureManagedIdentity:
azurekeyvault:
enabled: false
vaultURI:
tenantID:
tenantId:
certificates: []
keys: []

Expand Down Expand Up @@ -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
tenantId: # DEPRECATED: Use azurekeyvault.tenantId instead

0 comments on commit 8acd52b

Please sign in to comment.