Merge pull request #1545 from kinarashah/azdocs2

update correct location for azure's cloud controller manager manifest

Author: btat

Diff for: docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/azure.md

@@ -175,34 +175,6 @@ stringData:
       "loadBalancerSku": "standard",
       "excludeMasterFromStandardLB": false,
     }
----
-apiVersion: rbac.authorization.k8s.io/v1beta1
-kind: ClusterRole
-metadata:
-  labels:
-    kubernetes.io/cluster-service: "true"
-  name: system:azure-cloud-provider-secret-getter
-rules:
-  - apiGroups: [""]
-resources: ["secrets"]
-resourceNames: ["azure-cloud-config"]
-verbs:
-  - get
----
-apiVersion: rbac.authorization.k8s.io/v1beta1
-kind: ClusterRoleBinding
-metadata:
-  labels:
-    kubernetes.io/cluster-service: "true"
-  name: system:azure-cloud-provider-secret-getter
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: system:azure-cloud-provider-secret-getter
-  subjects:
-    - kind: ServiceAccount
-      name: azure-cloud-config
-      namespace: kube-system
    ``` 
 
 ## Using the Out-of-tree Azure Cloud Provider
@@ -212,109 +184,85 @@ roleRef:
 
 1. Select **External** from the **Cloud Provider** drop-down in the **Cluster Configuration** section.
 
-2. Prepare the Cloud Provider Configuration to set it in the next step. Note that Rancher automatically creates a new Network Security Group, Resource Group, Availability Set, Subnet, and Virtual Network. If you already have some or all of these created, you must specify them before creating the cluster.
-  - Click **Show Advanced** to view or edit these automatically generated names. Your Cloud Provider Configuration **must** match the fields in the **Machine Pools** section. If you have multiple pools, they must all use the same Resource Group, Availability Set, Subnet, Virtual Network, and Network Security Group.
+2. Under **Cluster Configuration > Advanced**, click **Add** under **Additional Controller Manager Args** and add this flag: `--configure-cloud-routes=false`.
 
-3. Under **Cluster Configuration > Advanced**, click **Add** under **Additional Controller Manager Args** and add this flag: `--configure-cloud-routes=false`. 
+3. Prepare the Cloud Provider Configuration to set it in the next step. Note that Rancher automatically creates a new Network Security Group, Resource Group, Availability Set, Subnet, and Virtual Network. If you already have some or all of these created, you must specify them before creating the cluster.
 
-Note that the chart reads the Cloud Provider Config from the secret in the `kube-system` namespace. An example secret for the Cloud Provider Config is shown below. Modify it as needed. Refer to the full list of configuration options in the [upstream docs](https://cloud-provider-azure.sigs.k8s.io/install/configs/).
+    Click **Show Advanced** to view or edit these automatically generated names. Your Cloud Provider Configuration **must** match the fields in the **Machine Pools** section. If you have multiple pools, they must all use the same Resource Group, Availability Set, Subnet, Virtual Network, and Network Security Group.
 
-  ```yaml
-apiVersion: helm.cattle.io/v1
-kind: HelmChart
-metadata:
-  name: azure-cloud-controller-manager
-  namespace: kube-system
-spec:
-  chart: cloud-provider-azure
-  repo: https://raw.githubusercontent.com/kubernetes-sigs/cloud-provider-azure/master/helm/repo
-  targetNamespace: kube-system
-  bootstrap: true
-  valuesContent: |-
-    infra:
-      clusterName: <cluster-name>
-    cloudControllerManager:
-      cloudConfigSecretName: azure-cloud-config
-      cloudConfig: null
-      clusterCIDR: null
-      enableDynamicReloading: 'true'
-      nodeSelector: 
-        node-role.kubernetes.io/control-plane: 'true'
-      allocateNodeCidrs: 'false' 
-      hostNetworking: true
-      caCertDir: /etc/ssl
-      configureCloudRoutes: 'false'
-      enabled: true
-      tolerations:
-        - effect: NoSchedule
-          key: node-role.kubernetes.io/master
-        - effect: NoSchedule
-          key: node-role.kubernetes.io/control-plane
-          value: 'true'
-        - effect: NoSchedule
-          key: node.cloudprovider.kubernetes.io/uninitialized
-          value: 'true'
----
-apiVersion: v1
-kind: Secret
-metadata:
-  name: azure-cloud-config
-  namespace: kube-system
-type: Opaque
-stringData:
-  cloud-config: |-
-    {
-      "cloud": "AzurePublicCloud",
-      "tenantId": "<tenant-id>",
-      "subscriptionId": "<subscription-id>",
-      "aadClientId": "<client-id>",
-      "aadClientSecret": "<tenant-id>",
-      "resourceGroup": "docker-machine",
-      "location": "westus",
-      "subnetName": "docker-machine",
-      "securityGroupName": "rancher-managed-kqmtsjgJ",
-      "securityGroupResourceGroup": "docker-machine",
-      "vnetName": "docker-machine-vnet",
-      "vnetResourceGroup": "docker-machine",
-      "primaryAvailabilitySetName": "docker-machine",  
-      "routeTableResourceGroup": "docker-machine",
-      "cloudProviderBackoff": false,
-      "useManagedIdentityExtension": false,
-      "useInstanceMetadata": true,
-      "loadBalancerSku": "standard",
-      "excludeMasterFromStandardLB": false,
-    }
----
-apiVersion: rbac.authorization.k8s.io/v1beta1
-kind: ClusterRole
-metadata:
-  labels:
-    kubernetes.io/cluster-service: "true"
-  name: system:azure-cloud-provider-secret-getter
-rules:
-  - apiGroups: [""]
-resources: ["secrets"]
-resourceNames: ["azure-cloud-config"]
-verbs:
-  - get
----
-apiVersion: rbac.authorization.k8s.io/v1beta1
-kind: ClusterRoleBinding
-metadata:
-  labels:
-    kubernetes.io/cluster-service: "true"
-  name: system:azure-cloud-provider-secret-getter
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: system:azure-cloud-provider-secret-getter
-  subjects:
-    - kind: ServiceAccount
+4. Under **Cluster Configuration > Add-on Config**, add the cloud controller manager manifest shown below into **Additional Manifest**.
+Note that this chart reads the Cloud Provider Config from the secret in the `kube-system` namespace. An example secret for the Cloud Provider Config is shown below; modify it as needed. Refer to the full list of configuration options in the [upstream docs](https://cloud-provider-azure.sigs.k8s.io/install/configs/).
+
+    Alternatively, you can also install the cloud controller manager using the [Helm CLI](#helm-chart-installation-from-cli).
+
+    ```yaml
+    apiVersion: helm.cattle.io/v1
+    kind: HelmChart
+    metadata:
+      name: azure-cloud-controller-manager
+      namespace: kube-system
+    spec:
+      chart: cloud-provider-azure
+      repo: https://raw.githubusercontent.com/kubernetes-sigs/cloud-provider-azure/master/helm/repo
+      targetNamespace: kube-system
+      bootstrap: true
+      valuesContent: |-
+        infra:
+          clusterName: <cluster-name>
+        cloudControllerManager:
+          cloudConfigSecretName: azure-cloud-config
+          cloudConfig: null
+          clusterCIDR: null
+          enableDynamicReloading: 'true'
+          nodeSelector: 
+            node-role.kubernetes.io/control-plane: 'true'
+          allocateNodeCidrs: 'false' 
+          hostNetworking: true
+          caCertDir: /etc/ssl
+          configureCloudRoutes: 'false'
+          enabled: true
+          tolerations:
+            - effect: NoSchedule
+              key: node-role.kubernetes.io/master
+            - effect: NoSchedule
+              key: node-role.kubernetes.io/control-plane
+              value: 'true'
+            - effect: NoSchedule
+              key: node.cloudprovider.kubernetes.io/uninitialized
+              value: 'true'
+    ---
+    apiVersion: v1
+    kind: Secret
+    metadata:
       name: azure-cloud-config
       namespace: kube-system
-  ```
+    type: Opaque
+    stringData:
+      cloud-config: |-
+        {
+          "cloud": "AzurePublicCloud",
+          "tenantId": "<tenant-id>",
+          "subscriptionId": "<subscription-id>",
+          "aadClientId": "<client-id>",
+          "aadClientSecret": "<tenant-id>",
+          "resourceGroup": "docker-machine",
+          "location": "westus",
+          "subnetName": "docker-machine",
+          "securityGroupName": "rancher-managed-kqmtsjgJ",
+          "securityGroupResourceGroup": "docker-machine",
+          "vnetName": "docker-machine-vnet",
+          "vnetResourceGroup": "docker-machine",
+          "primaryAvailabilitySetName": "docker-machine",  
+          "routeTableResourceGroup": "docker-machine",
+          "cloudProviderBackoff": false,
+          "useManagedIdentityExtension": false,
+          "useInstanceMetadata": true,
+          "loadBalancerSku": "standard",
+          "excludeMasterFromStandardLB": false,
+        }
+    ```
 
-4. Click **Create** to submit the form and create the cluster.
+5. Click **Create** to submit the form and create the cluster.
 
 </TabItem>