Skip to content

Commit

Permalink
Fix 0.1.0 Helm chart to refer to correct container image version (Azu…
Browse files Browse the repository at this point in the history
…re#1349)

* Fix README to refer to current version of helm chart

 - Don't specify using :latest for the controller image
   in the README either as that defeats the purpose of
   hardcoding the specific image in the Helm chart.

* Fix 0.1.0 Helm chart to refer to correct container image version

 - Using :latest is not correct as that means it will always be
   pulling the latest version of the docker container.

* Fix possible null reference error
  • Loading branch information
matthchr committed Jan 11, 2021
1 parent b311032 commit cdbb8ae
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 9 deletions.
14 changes: 9 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ Ready to quickly deploy the latest version of Azure Service Operator on your Kub
2. Install [Helm](https://helm.sh/docs/intro/install/), and add the Helm repo for Azure Service Operator. Please note that the instructions here use Helm 3.

```sh
helm repo add azureserviceoperator https://raw.githubusercontent.com/Azure/azure-service-operator/master/charts
helm repo add aso https://raw.githubusercontent.com/Azure/azure-service-operator/master/charts
```
3. Create an Azure Service Principal. You'll need this to grant Azure Service Operator permissions to create resources in your subscription.
For more information about other forms of authentication supported by ASO, see [the authentication section of the deployment documentation](./docs/howto/deploy.md#Authentication).
Expand Down Expand Up @@ -95,17 +95,21 @@ Ready to quickly deploy the latest version of Azure Service Operator on your Kub
AZURE_CLIENT_SECRET=<your-client-secret> # This is the password from the service principal we created.
```

4. Install the Azure Service Operator on your cluster using the following helm install command.
4. Install the Azure Service Operator on your cluster using Helm.

```sh
helm upgrade --install aso https://github.com/Azure/azure-service-operator/raw/master/charts/azure-service-operator-0.1.0.tgz \
helm upgrade --install aso aso/azure-service-operator \
--create-namespace \
--namespace=azureoperator-system \
--set azureSubscriptionID=$AZURE_SUBSCRIPTION_ID \
--set azureTenantID=$AZURE_TENANT_ID \
--set azureClientID=$AZURE_CLIENT_ID \
--set azureClientSecret=$AZURE_CLIENT_SECRET \
--set image.repository="mcr.microsoft.com/k8s/azureserviceoperator:latest"
--set azureClientSecret=$AZURE_CLIENT_SECRET
```

If you would like to install an older version you can list the avialable versions:
```sh
helm search repo aso --versions
```

You should now see the Azure service operator pods running in your cluster, like the below.
Expand Down
Binary file modified charts/azure-service-operator-0.1.0.tgz
Binary file not shown.
6 changes: 3 additions & 3 deletions charts/index.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,19 @@ entries:
version: 1.0.0
- apiVersion: v2
appVersion: 0.1.0
created: "2021-01-05T16:45:57.0921513+13:00"
created: "2021-01-08T13:25:22.656743744-08:00"
dependencies:
- 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: e1b38482d77cc86afc2745ec735a49272e3d25ff766f91cc152b94fe0582c65b
digest: ccd0beea9b316b3f444de64117dcdf8faf6ec7497901e875c7b10df8604682c2
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: "2021-01-05T16:45:57.0906069+13:00"
generated: "2021-01-08T13:25:22.653121365-08:00"
2 changes: 1 addition & 1 deletion pkg/resourcemanager/vm/reconcile.go
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ func (c *AzureVirtualMachineClient) Ensure(ctx context.Context, obj runtime.Obje
return false, nil
}
//change to spec is required
if future.Response().StatusCode == 400 {
if azerr.Code == 400 {
instance.Status.FailedProvisioning = true
return false, nil
}
Expand Down

0 comments on commit cdbb8ae

Please sign in to comment.