Skip to content

Commit

Permalink
Merge branch 'master' into access-policy-postpone
Browse files Browse the repository at this point in the history
  • Loading branch information
frodopwns authored Jul 8, 2020
2 parents 1f9dc2f + c4bc917 commit a0ccc3a
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ Ready to quickly deploy the latest version of Azure Service Operator on your Kub
--set azureClientID=$AZURE_CLIENT_ID \
--set azureClientSecret=$AZURE_CLIENT_SECRET \
--set createNamespace=true \
--set image.repository="mcr.microsoft.com/k8s/azure-service-operator:latest"
--set image.repository="mcr.microsoft.com/k8s/azureserviceoperator:latest"
```

You should now see the Azure service operator pods running in your cluster.
Expand Down
2 changes: 1 addition & 1 deletion charts/azure-service-operator/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ The following table lists the configurable parameters of the azure-service-opera
| `azureClientSecret` | Azure Service Principal Client Secret | `` |
| `azureUseMI` | Set to True if using Managed Identity for authentication | `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/azure-service-operator:0.0.20258` |
| `image.repository` | Image repository | `mcr.microsoft.com/k8s/azureserviceoperator:0.0.20258` |
| `cloudEnvironment` | Set the cloud environment, possible values include: AzurePublicCloud, AzureUSGovernmentCloud, AzureChinaCloud, AzureGermanCloud | `AzurePublicCloud` |
| `aad-pod-identity.azureIdentity.resourceID` | The resource ID for your managed identity | `` |
| `aad-pod-identity.azureIdentity.clientID` | The client ID for your managed identity | `` |
2 changes: 1 addition & 1 deletion controllers/async_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ const (
)

// AsyncReconciler is a generic reconciler for Azure resources.
// It reconciles Kubernets objects which require long running operations in Azure.
// It reconciles Kubernetes objects which require long running operations in Azure.
type AsyncReconciler struct {
client.Client
AzureClient resourcemanager.ARMClient
Expand Down

0 comments on commit a0ccc3a

Please sign in to comment.