Skip to content

Commit 86d5b9f

Browse files
Merge pull request #273787 from JnHs/jh-arck8-flux191
Flux 1.9.1 and related updates
2 parents 3e9cf0c + c5fcad3 commit 86d5b9f

File tree

3 files changed

+51
-17
lines changed

3 files changed

+51
-17
lines changed

articles/azure-arc/kubernetes/extensions-release.md

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: "Available extensions for Azure Arc-enabled Kubernetes clusters"
3-
ms.date: 04/25/2024
3+
ms.date: 04/30/2024
44
ms.topic: how-to
55
description: "See which extensions are currently available for Azure Arc-enabled Kubernetes clusters and view release notes."
66
---
@@ -121,7 +121,7 @@ The most recent version of the Flux v2 extension and the two previous versions (
121121
> [!NOTE]
122122
> When a new version of the `microsoft.flux` extension is released, it may take several days for the new version to become available in all regions.
123123
124-
### 1.8.4 (April 2024)
124+
### 1.9.1 (April 2024)
125125

126126
Flux version: [Release v2.1.2](https://github.com/fluxcd/flux2/releases/tag/v2.1.2)
127127

@@ -134,13 +134,14 @@ Flux version: [Release v2.1.2](https://github.com/fluxcd/flux2/releases/tag/v2.1
134134

135135
Changes made for this version:
136136

137-
- Updated source-controller to v1.2.5
137+
- The log-level parameters for controllers (including `fluxconfig-agent` and `fluxconfig-controller`) are now customizable. For more information, see [Configurable log-level parameters](tutorial-use-gitops-flux2.md#configurable-log-level-parameters).
138+
- Helm chart changes to expose new SSH host key algorithm to connect to Azure DevOps. For more information, see [Azure DevOps SSH-RSA deprecation](tutorial-use-gitops-flux2.md#azure-devops-ssh-rsa-deprecation).
138139

139-
### 1.8.3 (March 2024)
140+
### 1.8.4 (April 2024)
140141

141142
Flux version: [Release v2.1.2](https://github.com/fluxcd/flux2/releases/tag/v2.1.2)
142143

143-
- source-controller: v1.1.2
144+
- source-controller: v1.2.5
144145
- kustomize-controller: v1.1.1
145146
- helm-controller: v0.36.2
146147
- notification-controller: v1.1.0
@@ -149,9 +150,9 @@ Flux version: [Release v2.1.2](https://github.com/fluxcd/flux2/releases/tag/v2.1
149150

150151
Changes made for this version:
151152

152-
- The log-level parameters for controllers are now customizable. For more information, see [Configurable log-level parameters](tutorial-use-gitops-flux2.md#configurable-log-level-parameters).
153+
- Updated source-controller to v1.2.5
153154

154-
### 1.8.2 (February 2024)
155+
### 1.8.3 (March 2024)
155156

156157
Flux version: [Release v2.1.2](https://github.com/fluxcd/flux2/releases/tag/v2.1.2)
157158

@@ -164,7 +165,7 @@ Flux version: [Release v2.1.2](https://github.com/fluxcd/flux2/releases/tag/v2.1
164165

165166
Changes made for this version:
166167

167-
- Improve the identity token generation logic to handle token generation failures
168+
- The log-level parameters for controllers are now customizable. For more information, see [Configurable log-level parameters](tutorial-use-gitops-flux2.md#configurable-log-level-parameters).
168169

169170
## Dapr extension for Azure Kubernetes Service (AKS) and Arc-enabled Kubernetes
170171

articles/azure-arc/kubernetes/gitops-flux2-parameters.md

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: "GitOps (Flux v2) supported parameters"
33
description: "Understand the supported parameters for GitOps (Flux v2) in Azure for use in Azure Arc-enabled Kubernetes and Azure Kubernetes Service (AKS) clusters."
4-
ms.date: 02/08/2024
4+
ms.date: 04/30/2024
55
ms.topic: conceptual
66
---
77

@@ -55,15 +55,20 @@ For more information, see the [Flux documentation on Git repository checkout str
5555
| ------------- | ------------- | ------------- |
5656
| `--url` `-u` | `http[s]://server/repo[.git]` | URL of the Git repository source to reconcile with the cluster. |
5757

58-
### Private Git repository with SSH and Flux-created keys
58+
### Private Git repository with SSH
59+
60+
> [!IMPORTANT]
61+
> Azure DevOps [announced the deprecation of SSH-RSA](https://aka.ms/ado-ssh-rsa-deprecation) as a supported encryption method for connecting to Azure repositories using SSH. If you use SSH keys to connect to Azure repositories in Flux configurations, we recommend moving to more secure RSA-SHA2-256 or RSA-SHA2-512 keys. For more information, see [Azure DevOps SSH-RSA deprecation](tutorial-use-gitops-flux2.md#azure-devops-ssh-rsa-deprecation).
62+
63+
#### Private Git repository with SSH and Flux-created keys
5964

6065
Add the public key generated by Flux to the user account in your Git service provider.
6166

6267
| Parameter | Format | Notes |
6368
| ------------- | ------------- | ------------- |
6469
| `--url` `-u` | `ssh://user@server/repo[.git]` | `git@` should replace `user@` if the public key is associated with the repository instead of the user account. |
6570

66-
### Private Git repository with SSH and user-provided keys
71+
#### Private Git repository with SSH and user-provided keys
6772

6873
Use your own private key directly or from a file. The key must be in [PEM format](https://aka.ms/PEMformat) and end with a newline (`\n`).
6974

@@ -75,7 +80,7 @@ Add the associated public key to the user account in your Git service provider.
7580
| `--ssh-private-key` | Base64 key in [PEM format](https://aka.ms/PEMformat) | Provide the key directly. |
7681
| `--ssh-private-key-file` | Full path to local file | Provide the full path to the local file that contains the PEM-format key.
7782

78-
### Private Git host with SSH and user-provided known hosts
83+
#### Private Git host with SSH and user-provided known hosts
7984

8085
The Flux operator maintains a list of common Git hosts in its `known_hosts` file. Flux uses this information to authenticate the Git repository before establishing the SSH connection. If you're using an uncommon Git repository or your own Git host, you can supply the host key so that Flux can identify your repository.
8186

@@ -158,6 +163,9 @@ kubectl create ns flux-config
158163
kubectl create secret generic -n flux-config my-custom-secret --from-file=identity=./id_rsa --from-file=known_hosts=./known_hosts
159164
```
160165

166+
> [!IMPORTANT]
167+
> Azure DevOps [announced the deprecation of SSH-RSA](https://aka.ms/ado-ssh-rsa-deprecation) as a supported encryption method for connecting to Azure repositories using SSH. If you use SSH keys to connect to Azure repositories in Flux configurations, we recommend moving to more secure RSA-SHA2-256 or RSA-SHA2-512 keys. For more information, see [Azure DevOps SSH-RSA deprecation](tutorial-use-gitops-flux2.md#azure-devops-ssh-rsa-deprecation).
168+
161169
For both cases, when you create the Flux configuration, use `--local-auth-ref my-custom-secret` in place of the other authentication parameters:
162170

163171
```azurecli

articles/azure-arc/kubernetes/tutorial-use-gitops-flux2.md

Lines changed: 30 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: "Tutorial: Deploy applications using GitOps with Flux v2"
33
description: "This tutorial shows how to use GitOps with Flux v2 to manage configuration and application deployment in Azure Arc and AKS clusters."
4-
ms.date: 03/22/2024
4+
ms.date: 04/30/2024
55
ms.topic: tutorial
66
ms.custom: template-tutorial, devx-track-azurecli, references_regions
77
---
@@ -568,7 +568,7 @@ If you don't specify values for `memoryThreshold` and `outOfMemoryWatch`, the de
568568

569569
## Configurable log-level parameters
570570

571-
By default, the `log-level` for Flux controllers is set to `info`. Starting with [`microsoft.flux` v1.8.3](extensions-release.md#flux-gitops), you can modify these default settings using the `k8s-extension` command as follows:
571+
By default, the `log-level` for Flux controllers is set to `info`. Starting with `microsoft.flux` v1.8.3, you can modify these default settings using the `k8s-extension` command as follows:
572572

573573
```azurecli
574574
--config helm-controller.log-level=<info/error/debug>
@@ -579,14 +579,39 @@ By default, the `log-level` for Flux controllers is set to `info`. Starting with
579579
--config image-reflector-controller.log-level=<info/error/debug>
580580
```
581581

582-
Valid values are `debug`, `info`, or `error`. These values are only configurable for the controllers listed above; they don't apply to the `fluxconfig-agent` and `fluxconfig-controller`.
583-
584-
For instance, to change the `log-level` for the `source-controller` and `kustomize-controller`, use the following command:
582+
Valid values are `debug`, `info`, or `error`. For instance, to change the `log-level` for the `source-controller` and `kustomize-controller`, use the following command:
585583

586584
```azurecli
587585
az k8s-extension update --resource-group <resource-group> --cluster-name <cluster-name> --cluster-type <cluster-type> --name flux --config source-controller.log-level=error kustomize-controller.log-level=error
588586
```
589587

588+
Starting with [`microsoft.flux` v1.9.1](extensions-release.md#flux-gitops), `fluxconfig-agent` and `fluxconfig-controller` support `info` and `error` log levels (but not `debug`). These can be modified by using the k8s-extension command as follows:
589+
590+
```azurecli
591+
--config fluxconfig-agent.log-level=<info/error>
592+
--config fluxconfig-controller.log-level=<info/error>
593+
```
594+
595+
For example, the following command changes `log-level` to `error`:
596+
597+
```azurecli
598+
az k8s-extension update --resource-group <resource-group> --cluster-name <cluster-name> --cluster-type <cluster-type> --name flux --config fluxconfig-agent.log-level=error fluxconfig-controller.log-level=error
599+
```
600+
601+
### Azure DevOps SSH-RSA deprecation
602+
603+
Azure DevOps [announced the deprecation of SSH-RSA](https://aka.ms/ado-ssh-rsa-deprecation) as a supported encryption method for connecting to Azure repositories using SSH. If you use SSH keys to connect to Azure repositories in Flux configurations, we recommend moving to more secure RSA-SHA2-256 or RSA-SHA2-512 keys.
604+
605+
When reconciling Flux configurations, you might see an error message indicating ssh-rsa is about to be deprecated or is unsupported. If so, update the host key algorithm used to establish SSH connections to Azure DevOps repositories from the Flux `source-controller` and `image-automation-controller` (if enabled) by using the `az k8s-extension update` command. For example:
606+
607+
```azurecli
608+
az k8s-extension update --cluster-name <cluster-name> --resource-group <resource-group> --cluster-type <cluster-type> --name flux --config source-controller.ssh-host-key-args="--ssh-hostkey-algos=rsa-sha2-512,rsa-sha2-256"
609+
610+
az k8s-extension update --cluster-name <cluster-name> --resource-group <resource-group> --cluster-type <cluster-type> --name flux --config image-automation-controller.ssh-host-key-args="--ssh-hostkey-algos=rsa-sha2-512,rsa-sha2-256"
611+
```
612+
613+
For more information on Azure DevOps SSH-RSA deprecation, see [End of SSH-RSA support for Azure Repos](https://aka.ms/ado-ssh-rsa-deprecation).
614+
590615
### Workload identity in AKS clusters
591616

592617
Starting with [`microsoft.flux` v1.8.0](extensions-release.md#flux-gitops), you can create Flux configurations in [AKS clusters with workload identity enabled](/azure/aks/workload-identity-deploy-cluster). To do so, modify the flux extension as shown in the following steps.

0 commit comments

Comments
 (0)