Skip to content

Commit 000e5b3

Browse files
Merge pull request #205834 from zr-msft/zr-aks-osm-addon-1.2
docs: update osm add-on version to 1.2.0
2 parents 9ac958b + b2b55d1 commit 000e5b3

7 files changed

+21
-8
lines changed

articles/aks/includes/servicemesh/osm/open-service-mesh-binary-install-linux.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ In a bash-based shell on Linux or [Windows Subsystem for Linux][install-wsl], us
1212

1313
```bash
1414
# Specify the OSM version that will be leveraged throughout these instructions
15-
OSM_VERSION=v1.1.1
15+
OSM_VERSION=v1.2.0
1616

1717
curl -sL "https://github.com/openservicemesh/osm/releases/download/$OSM_VERSION/osm-$OSM_VERSION-linux-amd64.tar.gz" | tar -vxzf -
1818
```

articles/aks/includes/servicemesh/osm/open-service-mesh-binary-install-macos.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ In a bash-based shell, use `curl` to download the OSM release and then extract w
1212

1313
```bash
1414
# Specify the OSM version that will be leveraged throughout these instructions
15-
OSM_VERSION=v1.1.1
15+
OSM_VERSION=v1.2.0
1616

1717
curl -sL "https://github.com/openservicemesh/osm/releases/download/$OSM_VERSION/osm-$OSM_VERSION-darwin-amd64.tar.gz" | tar -vxzf -
1818
```

articles/aks/includes/servicemesh/osm/open-service-mesh-binary-install-windows.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ In a PowerShell-based shell on Windows, use `Invoke-WebRequest` to download the
1212

1313
```powershell
1414
# Specify the OSM version that will be leveraged throughout these instructions
15-
$OSM_VERSION="v1.1.1"
15+
$OSM_VERSION="v1.2=0"
1616
1717
[Net.ServicePointManager]::SecurityProtocol = "tls12"
1818
$ProgressPreference = 'SilentlyContinue'; Invoke-WebRequest -URI "https://github.com/openservicemesh/osm/releases/download/$OSM_VERSION/osm-$OSM_VERSION-windows-amd64.zip" -OutFile "osm-$OSM_VERSION.zip"

articles/aks/open-service-mesh-about.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,10 @@ The OSM project was originated by Microsoft and has since been donated and is go
2020
OSM can be added to your Azure Kubernetes Service (AKS) cluster by enabling the OSM add-on using the [Azure CLI][osm-azure-cli] or a [Bicep template][osm-bicep]. The OSM add-on provides a fully supported installation of OSM that is integrated with AKS.
2121

2222
> [!IMPORTANT]
23-
> The OSM add-on installs version *1.1.1* of OSM on clusters running Kubernetes version 1.23.5 and higher. The OSM add-on installs version *1.0.0.* on clusters running a Kubernetes version below 1.23.5.
23+
> Based on the version of Kubernetes your cluster is running, the OSM add-on installs a different version of OSM:
24+
> - If your cluster is running Kubernetes version 1.24.0 or greater, the OSM add-on installs version *1.2.0* of OSM.
25+
> - If your cluster is running a version of Kubernetes between 1.23.5 and 1.24.0, the OSM add-on installs version *1.1.1* of OSM.
26+
> - If your cluster is running a version of Kubernetes below 1.23.5, the OSM add-on installs version *1.0.0* of OSM.
2427
2528
## Capabilities and features
2629

articles/aks/open-service-mesh-binary.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,12 @@ zone_pivot_groups: client-operating-system
1212

1313
This article will discuss how to download the OSM client library to be used to operate and configure the OSM add-on for AKS, and how to configure the binary for your environment.
1414

15-
> [!WARNING]
16-
> If you are using a Kubernetes version below 1.23.5, the OSM add-on installs version *1.0.0.* of OSM on your cluster, and you must use the OSM client library version *1.0.0* with the following commands.
15+
> [!IMPORTANT]
16+
> Based on the version of Kubernetes your cluster is running, the OSM add-on installs a different version of OSM:
17+
> - If your cluster is running Kubernetes version 1.24.0 or greater, the OSM add-on installs version *1.2.0* of OSM.
18+
> - If your cluster is running a version of Kubernetes between 1.23.5 and 1.24.0, the OSM add-on installs version *1.1.1* of OSM.
19+
> - If your cluster is running a version of Kubernetes below 1.23.5, the OSM add-on installs version *1.0.0* of OSM.
20+
1721

1822
::: zone pivot="client-operating-system-linux"
1923

articles/aks/open-service-mesh-deploy-addon-az-cli.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,10 @@ ms.author: pgibson
1212
This article shows you how to install the Open Service Mesh (OSM) add-on on an Azure Kubernetes Service (AKS) cluster and verify that it's installed and running.
1313

1414
> [!IMPORTANT]
15-
> The OSM add-on installs version *1.1.1* of OSM on clusters running Kubernetes version 1.23.5 and higher. The OSM add-on installs version *1.0.0.* on clusters running a Kubernetes version below 1.23.5.
15+
> Based on the version of Kubernetes your cluster is running, the OSM add-on installs a different version of OSM:
16+
> - If your cluster is running Kubernetes version 1.24.0 or greater, the OSM add-on installs version *1.2.0* of OSM.
17+
> - If your cluster is running a version of Kubernetes between 1.23.5 and 1.24.0, the OSM add-on installs version *1.1.1* of OSM.
18+
> - If your cluster is running a version of Kubernetes below 1.23.5, the OSM add-on installs version *1.0.0* of OSM.
1619
1720
## Prerequisites
1821

articles/aks/open-service-mesh-deploy-addon-bicep.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,10 @@ ms.author: pgibson
1212
This article shows you how to deploy the Open Service Mesh (OSM) add-on to Azure Kubernetes Service (AKS) by using a [Bicep](../azure-resource-manager/bicep/index.yml) template.
1313

1414
> [!IMPORTANT]
15-
> The OSM add-on installs version *1.1.1* of OSM on clusters running Kubernetes version 1.23.5 and higher. The OSM add-on installs version *1.0.0.* on clusters running a Kubernetes version below 1.23.5.
15+
> Based on the version of Kubernetes your cluster is running, the OSM add-on installs a different version of OSM:
16+
> - If your cluster is running Kubernetes version 1.24.0 or greater, the OSM add-on installs version *1.2.0* of OSM.
17+
> - If your cluster is running a version of Kubernetes between 1.23.5 and 1.24.0, the OSM add-on installs version *1.1.1* of OSM.
18+
> - If your cluster is running a version of Kubernetes below 1.23.5, the OSM add-on installs version *1.0.0* of OSM.
1619
1720
[Bicep](../azure-resource-manager/bicep/overview.md) is a domain-specific language that uses declarative syntax to deploy Azure resources. You can use Bicep in place of creating [Azure Resource Manager templates](../azure-resource-manager/templates/overview.md) to deploy your infrastructure-as-code Azure resources.
1821

0 commit comments

Comments
 (0)