Add admonition type to shortcode (#9482)

* Change existing admon blocks

* Fix includes issue

content/en/docs/tasks/federation/federation-service-discovery.md

@@ -135,7 +135,7 @@ Events:                 <none>
 ```
 
 {{< note >}}
-**Note:** The 'LoadBalancer Ingress' addresses of your Federated Service
+The 'LoadBalancer Ingress' addresses of your Federated Service
 correspond with the 'LoadBalancer Ingress' addresses of all of the
 underlying Kubernetes services (once these have been allocated - this
 may take a few seconds). For inter-cluster and inter-cloud-provider
@@ -222,7 +222,7 @@ nginx.mynamespace.myfederation.svc.europe-west1-d.example.com.  CNAME     180
 ```
 
 {{< note >}}
-**Note:** If your Federation is configured to use AWS Route53, you can use one of the equivalent AWS tools, for example:
+If your Federation is configured to use AWS Route53, you can use one of the equivalent AWS tools, for example:
 
 ``` shell
 $ aws route53 list-hosted-zones

content/en/docs/tasks/federation/set-up-cluster-federation-kubefed.md

@@ -44,7 +44,7 @@ Download the client tarball corresponding to the particular release and
 extract the binaries in the tarball:
 
 {{< note >}}
-**Note:** Until Kubernetes version `1.8.x` the federation project was
+Until Kubernetes version `1.8.x` the federation project was
 maintained as part of the [core kubernetes repo](https://github.com/kubernetes/kubernetes).
 Between Kubernetes releases `1.8` and `1.9`, the federation project moved into
 a separate [federation repo](https://github.com/kubernetes/federation), where it is
@@ -59,7 +59,7 @@ curl -LO https://storage.googleapis.com/kubernetes-release/release/${RELEASE-VER
 tar -xzvf kubernetes-client-linux-amd64.tar.gz
 ```
 {{< note >}}
-**Note:** The `RELEASE-VERSION` variable should either be set to or replaced with the actual version needed.
+The `RELEASE-VERSION` variable should either be set to or replaced with the actual version needed.
 {{< /note >}}
 
 Copy the extracted binary to one of the directories in your `$PATH`
@@ -78,7 +78,7 @@ tar -xzvf federation-client-linux-amd64.tar.gz
 ```
 
 {{< note >}}
-**Note:** The `RELEASE-VERSION` variable should be replaced with one of the release versions available at [federation release page](https://github.com/kubernetes/federation/releases).
+The `RELEASE-VERSION` variable should be replaced with one of the release versions available at [federation release page](https://github.com/kubernetes/federation/releases).
 {{< /note >}}
 
 Copy the extracted binary to one of the directories in your `$PATH`
@@ -179,7 +179,7 @@ modify a Google Kubernetes Engine cluster directly to add this scope, but you ca
 new node pool for your cluster and delete the old one.
 
 {{< note >}}
-**Note:** This will cause pods in the cluster to be rescheduled.
+This will cause pods in the cluster to be rescheduled.
 {{< /note >}}
 
 To add the new node pool, run:
@@ -200,8 +200,9 @@ gcloud container node-pools delete default-pool --cluster gke-cluster
 `kubefed init` sets up the federation control plane in the host
 cluster and also adds an entry for the federation API server in your
 local kubeconfig.
+
 {{< note >}}
-**Note:** In the beta release of Kubernetes 1.6, `kubefed init` does not automatically set the current context to the
+In the beta release of Kubernetes 1.6, `kubefed init` does not automatically set the current context to the
 newly deployed federation. You can set the current context manually by running:
 
 ```shell
@@ -466,7 +467,7 @@ A new context has now been added to your kubeconfig named `fellowship` (after th
 
 
 {{< note >}}
-**Note:** The name that you provide to the `join` command is used as the joining cluster's identity in federation. This name should adhere to the rules described in the [identifiers doc](/docs/concepts/overview/working-with-objects/names/). If the context
+The name that you provide to the `join` command is used as the joining cluster's identity in federation. This name should adhere to the rules described in the [identifiers doc](/docs/concepts/overview/working-with-objects/names/). If the context
 corresponding to your joining cluster conforms to these rules, you can use the same name in the join command. Otherwise, you must choose a different name for your cluster's identity.
 {{< /note >}}
 
@@ -515,7 +516,7 @@ kubefed join noldor --host-cluster-context=rivendell --secret-name=11kingdom
 ```
 
 {{< note >}}
-**Note:** If your cluster name does not conform to the DNS subdomain name specification, all you need to do is supply the secret name using the `--secret-name` flag. `kubefed join` automatically creates the secret for you.
+If your cluster name does not conform to the DNS subdomain name specification, all you need to do is supply the secret name using the `--secret-name` flag. `kubefed join` automatically creates the secret for you.
 {{< /note >}}
 
 ### `kube-dns` configuration
@@ -555,7 +556,7 @@ kubectl delete ns federation-system --context=rivendell
 ```
 
 {{< note >}}
-**Note:** `rivendell` is the host cluster name. Replace that name with the appropriate name in your configuration.
+`rivendell` is the host cluster name. Replace that name with the appropriate name in your configuration.
 {{< /note >}}
 
 {{% /capture %}}

content/en/docs/tasks/federation/set-up-coredns-provider-federation.md

@@ -118,15 +118,19 @@ coredns-provider.conf has below format:
  - `zones` is the federation domain for which CoreDNS is authoritative and is same as --dns-zone-name flag of `kubefed init`.
  - `coredns-endpoints` is the endpoint to access CoreDNS server. This is an optional parameter introduced from v1.7 onwards.
 
-{{< note >}}**Note**: *plugins.etcd.zones in CoreDNS configuration and --dns-zone-name flag to kubefed init should match.*{{< /note >}}
+{{< note >}}
+`plugins.etcd.zones` in the CoreDNS configuration and the `--dns-zone-name` flag to `kubefed init` should match.
+{{< /note >}}
 
 
 ## Setup CoreDNS server in nameserver resolv.conf chain
 
-*Note: The following section applies only to versions prior to v1.7
+{{< note >}}
+The following section applies only to versions prior to v1.7
 and will be automatically taken care of if the `coredns-endpoints`
 parameter is configured in `coredns-provider.conf` as described in
-section above.*
+section above.
+{{< /note >}}
 
 Once the federation control plane is deployed and federated clusters
 are joined to the federation, you need to add the CoreDNS server to the