Skip to content
Permalink
Browse files

Merge pull request #3 from microsoft/staging

Updated introduction
  • Loading branch information...
sabbour committed Aug 14, 2019
2 parents 20fa7e1 + 83a8b14 commit b1f7e1428493a47b624939b0b318b0114a7377f8
Showing with 8 additions and 5 deletions.
  1. +8 −2 _entries/01 introduction.md
  2. +0 −3 _entries/01-02 k8sbasics.md
@@ -6,7 +6,13 @@ type: nocount
is-parent: yes
---

Welcome to the Azure Kubernetes Workshop. In this lab, you'll go through tasks that will help you master the basic and more advanced topics required to deploy a multi-container application to Kubernetes on Azure Kubernetes Service (AKS).
Welcome to the Azure Kubernetes Workshop. In this lab, you'll go through tasks that will help you master the basic and more advanced topics required to deploy a multi-container application to Kubernetes on [Azure Kubernetes Service (AKS)](https://azure.microsoft.com/en-us/services/kubernetes-service/).

You can use this guide as a Kubernetes tutorial and as study material to help you get started to learn Kubernetes.

If you are new to Kubernetes, start with the [Kubernetes Learning Path](https://aka.ms/LearnKubernetes) to learn Kubernetes basics, then go through the concepts of [what Kubernetes is and what it isn't](https://aka.ms/k8sLearning).

If you are a more experienced Kubernetes developer or administrator, you may have a look at the [Kubernetes best practices ebook](https://aka.ms/aks/bestpractices).

Some of the things you’ll be going through:

@@ -16,4 +22,4 @@ Some of the things you’ll be going through:
- Building CI/CD pipelines using Azure DevOps and Azure Container Registry
- Scaling using Virtual Nodes, setting up SSL/TLS for your deployments, using Azure Key Vault for secrets

You can review the [changelog](#changelog) for what has recently changed.
You can review the [changelog](#changelog) for what has recently changed.
@@ -6,6 +6,3 @@ parent-id: intro
---

There is an assumption of some prior knowledge of Kubernetes and its concepts.

If you are new to Kubernetes, start with the [Kubernetes Learning Path](https://aka.ms/LearnKubernetes) to learn Kubernetes basics, then go through the concepts of [what Kubernetes is and what it isn't](https://aka.ms/k8sLearning).
If you are a more experienced Kubernetes developer or administrator, you may have a look at the [Kubernetes best practices ebook](https://aka.ms/aks/bestpractices).

0 comments on commit b1f7e14

Please sign in to comment.
You can’t perform that action at this time.