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

Jump to bottom

Make aad-pod-identity install optional when using Managed Identity. #1236

Merged
merged 7 commits into from
Aug 28, 2020
Merged

Make aad-pod-identity install optional when using Managed Identity. #1236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6107518
Updating chart to make aad-pod-identity installation optional.
Kyle0654 Jul 17, 2020
1d3c9ae
Adding newline to end of Chart.yaml
Kyle0654 Jul 17, 2020
3917650
Updating chart to make aad-pod-identity installation optional.
Kyle0654 Jul 17, 2020
a5ebf36
Adding newline to end of Chart.yaml
Kyle0654 Jul 17, 2020
0a748e5
Merge branch 'master' of https://github.com/kyschouv/azure-service-op…
Kyle0654 Jul 21, 2020
4a7388f
Reverting chart version to 0.1.0
Kyle0654 Jul 21, 2020
842eac2
Merge branch 'master' into temp-master
matthchr Aug 27, 2020
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
1 change: 1 addition & 0 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,7 @@ steps:
--set azureClientID=$(AZURE_CLIENT_ID) \
--set azureClientSecret=$(AZURE_CLIENT_SECRET) \
--set azureUseMI=true \
--set installAadPodIdentity=true \
--set azureOperatorKeyvault=$(AZURE_OPERATOR_KEYVAULT) \
--set aad-pod-identity.azureIdentity.resourceID="/subscriptions/$(AZURE_SUBSCRIPTION_ID)/resourcegroups/resourcegroup-azure-operators/providers/Microsoft.ManagedIdentity/userAssignedIdentities/$(ASO-DEVOPS-MI)" \
--set aad-pod-identity.azureIdentity.clientID=$(POD-IDENTITY-CLIENTID) \
Expand Down
Binary file modified charts/azure-service-operator-0.1.0.tgz
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion charts/azure-service-operator/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ dependencies:
- name: aad-pod-identity
version: 1.5.5
repository: https://raw.githubusercontent.com/Azure/aad-pod-identity/master/charts
condition: azureUseMI
condition: installAadPodIdentity
2 changes: 2 additions & 0 deletions charts/azure-service-operator/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ azureUseMI: False
image:
repository: mcr.microsoft.com/k8s/azureserviceoperator:latest

installAadPodIdentity: False

aad-pod-identity:
azureIdentityBinding:
name: aso-identity-binding
Expand Down
8 changes: 4 additions & 4 deletions charts/index.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,19 @@ entries:
azure-service-operator:
- apiVersion: v2
appVersion: 0.1.0
created: "2020-08-10T12:19:52.885712813+12:00"
created: "2020-08-27T16:47:28.270940264-07:00"
dependencies:
- condition: azureUseMI
- condition: installAadPodIdentity
name: aad-pod-identity
repository: https://raw.githubusercontent.com/Azure/aad-pod-identity/master/charts
version: 1.5.5
description: Deploy components and dependencies of azure-service-operator
digest: ce626047dbe45b258d7df40217ea0997cb1f546c8f034c18c62acccf16485d12
digest: 9875fbc4ab1a933f9512f91af7393bef7f95864a715acb2235284cd78f166dab
home: https://github.com/Azure/azure-service-operator
name: azure-service-operator
sources:
- https://github.com/Azure/azure-service-operator
urls:
- azure-service-operator-0.1.0.tgz
version: 0.1.0
generated: "2020-08-10T12:19:52.834243908+12:00"
generated: "2020-08-27T16:47:28.266941889-07:00"
2 changes: 2 additions & 0 deletions docs/howto/helmdeploy.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ Follow the instructions [here](../../docs/managedIdentity.md) to create an ident
Set the following Helm Chart values:
```yaml
azureUseMI: True
installAadPodIdentity: True
aad-pod-identity:
azureIdentity:
resourceID: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/<rg>/providers/Microsoft.ManagedIdentity/userAssignedIdentities/<identity>"
Expand Down Expand Up @@ -93,6 +94,7 @@ The following table lists the configurable parameters of the azure-service-opera
| `azureClientID` | Azure Service Principal Client ID | `` |
| `azureClientSecret` | Azure Service Principal Client Secret | `` |
| `azureUseMI` | Set to True if using Managed Identity for authentication | `False` |
| `installAadPodIdentity` | Set to `True` to install [aad-pod-identity](https://github.com/Azure/aad-pod-identity), or leave false if you already have it installed. You will have to create the AzureIdentity and AzureIdentityBinding yourself if you already have it installed | `False` |
| `azureOperatorKeyvault` | Set this value with the name of your Azure Key Vault resource if you prefer to store secrets in Key Vault rather than as Kubernetes secrets (default) | `` |
| `image.repository` | Image repository | `mcr.microsoft.com/k8s/azureserviceoperator:latest` |
| `cloudEnvironment` | Set the cloud environment, possible values include: AzurePublicCloud, AzureUSGovernmentCloud, AzureChinaCloud, AzureGermanCloud | `AzurePublicCloud` |
Expand Down