Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: update azure tenantId casing #1385

Merged
merged 2 commits into from
Apr 12, 2024
Merged

fix: update azure tenantId casing #1385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c7a858d
fix: update azure tenantId casing
akashsinghal Apr 11, 2024
6b4bf59
Merge branch 'staging' into akashsinghal/fixAKSTenant
akashsinghal Apr 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/ratify/README.md
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ azureManagedIdentity:
azurekeyvault:
enabled: false
vaultURI:
tenantID:
tenantId:
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this casing consistent with ClientId?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes this is consistent casing for the clientId in the values file. The existing tenantId under akvCertConfig also was the same casing. The CRD fields use a different casing of ID though but I thought we should remain consistent with other fields in values.yaml

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
Loading