Skip to content

Commit e001b1e

Browse files
authored
Merge pull request #192567 from csand-msft/main
Add AKS as cluster that can be used
2 parents 68d2eaf + c871108 commit e001b1e

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

articles/azure-arc/kubernetes/conceptual-gitops-flux2-ci-cd.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
---
22
title: "CI/CD Workflow using GitOps (Flux v2) - Azure Arc-enabled Kubernetes"
33
description: "This article provides a conceptual overview of a CI/CD workflow using GitOps"
4-
keywords: "GitOps, Flux, Kubernetes, K8s, Azure, Helm, Arc, CI/CD, Azure DevOps"
4+
keywords: "GitOps, Flux, Kubernetes, K8s, Azure, Helm, Arc, AKS, CI/CD, Azure DevOps"
55
services: azure-arc
66
ms.service: azure-arc
77
ms.date: 11/29/2021
88
ms.topic: conceptual
99
author: eedorenko
1010
ms.author: iefedore
1111
---
12-
# CI/CD workflow using GitOps (Flux v2) - Azure Arc enabled Kubernetes
12+
# CI/CD workflow using GitOps (Flux v2)
1313

1414
Modern Kubernetes deployments contain multiple applications, clusters, and environments. With GitOps, you can manage these complex setups more easily, tracking the desired state of the Kubernetes environments declaratively with Git. Using common Git tooling to declare cluster state, you can increase accountability, facilitate fault investigation, and enable automation to manage environments.
1515

@@ -65,7 +65,7 @@ The GitOps repository represents the current desired state of all environments a
6565

6666
### Kubernetes clusters
6767

68-
At least one Azure Arc-enabled Kubernetes cluster serves the different environments needed by the application. For example, a single cluster can serve both a dev and QA environment through different namespaces. A second cluster can provide easier separation of environments and more fine-grained control.
68+
At least one Azure Arc-enabled Kubernetes or Azure Kubernetes Service (AKS) cluster serves the different environments needed by the application. For example, a single cluster can serve both a dev and QA environment through different namespaces. A second cluster can provide easier separation of environments and more fine-grained control.
6969

7070
## Example workflow
7171

articles/azure-arc/kubernetes/tutorial-gitops-flux2-ci-cd.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
---
2-
title: 'Tutorial: Implement CI/CD with GitOps (Flux v2) in Azure Arc-enabled Kubernetes clusters'
3-
description: This tutorial walks through setting up a CI/CD solution using GitOps (Flux v2) in Azure Arc-enabled Kubernetes clusters. For a conceptual take on this workflow, see the CI/CD Workflow using GitOps - Azure Arc-enabled Kubernetes article.
4-
keywords: "GitOps, Flux, Kubernetes, K8s, Azure, Arc, ci/cd, devops"
2+
title: 'Tutorial: Implement CI/CD with GitOps (Flux v2)'
3+
description: This tutorial walks through setting up a CI/CD solution using GitOps (Flux v2) in Azure Arc-enabled Kubernetes or Azure Kubernetes Service clusters. For a conceptual take on this workflow, see the CI/CD Workflow using GitOps article.
4+
keywords: "GitOps, Flux, Kubernetes, K8s, Azure, Arc, AKS, ci/cd, devops"
55
author: eedorenko
66
ms.author: iefedore
77
ms.service: azure-arc
88
ms.topic: tutorial
99
ms.date: 12/15/2021
1010
ms.custom: template-tutorial, devx-track-azurecli
1111
---
12-
# Tutorial: Implement CI/CD with GitOps (Flux v2) using Azure Arc-enabled Kubernetes clusters
12+
# Tutorial: Implement CI/CD with GitOps (Flux v2)
1313

14-
In this tutorial, you'll set up a CI/CD solution using GitOps (Flux v2) and Azure Arc-enabled Kubernetes clusters. Using the sample Azure Vote app, you'll:
14+
In this tutorial, you'll set up a CI/CD solution using GitOps (Flux v2) and Azure Arc-enabled Kubernetes or Azure Kubernetes Service (AKS) clusters. Using the sample Azure Vote app, you'll:
1515

1616
> [!div class="checklist"]
17-
> * Create an Azure Arc-enabled Kubernetes cluster.
17+
> * Create an Azure Arc-enabled Kubernetes or AKS cluster.
1818
> * Connect your application and GitOps repositories to Azure Repos or Git Hub.
1919
> * Implement CI/CD flow with either Azure Pipelines or GitHub.
2020
> * Connect your Azure Container Registry to Azure DevOps and Kubernetes.
@@ -35,7 +35,7 @@ If you don't have an Azure subscription, create a [free account](https://azure.m
3535
* Verify you have:
3636
* A [connected Azure Arc-enabled Kubernetes cluster](./quickstart-connect-cluster.md#connect-an-existing-kubernetes-cluster) named **arc-cicd-cluster**.
3737
* A connected Azure Container Registry with either [AKS integration](../../aks/cluster-container-registry-integration.md) or [non-AKS cluster authentication](../../container-registry/container-registry-auth-kubernetes.md).
38-
* Install the latest versions of these Azure Arc-enabled Kubernetes CLI extensions:
38+
* Install the latest versions of these Azure Arc-enabled Kubernetes and Kubernetes Configuration CLI extensions:
3939

4040
```azurecli
4141
az extension add --name connectedk8s

0 commit comments

Comments
 (0)