From 112859937a9cc6e7200c5a752427e1b84b314f6b Mon Sep 17 00:00:00 2001 From: PixelRobots <22979170+PixelRobots@users.noreply.github.com> Date: Thu, 18 Apr 2024 07:55:24 +0100 Subject: [PATCH 1/8] added image cleaner Signed-off-by: PixelRobots <22979170+PixelRobots@users.noreply.github.com> --- .../managed-cluster/README.md | 23 +++++++++++++++++++ .../managed-cluster/main.bicep | 12 ++++++++++ .../managed-cluster/main.json | 19 +++++++++++++-- 3 files changed, 52 insertions(+), 2 deletions(-) diff --git a/avm/res/container-service/managed-cluster/README.md b/avm/res/container-service/managed-cluster/README.md index 9c6755ddb5..b282ed116f 100644 --- a/avm/res/container-service/managed-cluster/README.md +++ b/avm/res/container-service/managed-cluster/README.md @@ -1516,6 +1516,7 @@ module managedCluster 'br/public:avm/res/container-service/managed-cluster: Date: Thu, 18 Apr 2024 08:47:27 +0100 Subject: [PATCH 2/8] fix pester issue Signed-off-by: PixelRobots <22979170+PixelRobots@users.noreply.github.com> --- .../managed-cluster/README.md | 23 ++++++++----------- .../managed-cluster/main.bicep | 2 +- .../managed-cluster/main.json | 4 ++-- 3 files changed, 12 insertions(+), 17 deletions(-) diff --git a/avm/res/container-service/managed-cluster/README.md b/avm/res/container-service/managed-cluster/README.md index b282ed116f..7e2f7d8bf5 100644 --- a/avm/res/container-service/managed-cluster/README.md +++ b/avm/res/container-service/managed-cluster/README.md @@ -1535,6 +1535,7 @@ module managedCluster 'br/public:avm/res/container-service/managed-cluster: Date: Thu, 18 Apr 2024 09:21:03 +0100 Subject: [PATCH 3/8] re ran set-svmmodule Signed-off-by: PixelRobots <22979170+PixelRobots@users.noreply.github.com> --- avm/res/container-service/managed-cluster/main.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/avm/res/container-service/managed-cluster/main.json b/avm/res/container-service/managed-cluster/main.json index ab353d982e..9e6e9642bd 100644 --- a/avm/res/container-service/managed-cluster/main.json +++ b/avm/res/container-service/managed-cluster/main.json @@ -5,8 +5,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.26.54.24096", - "templateHash": "10969298207545891085" + "version": "0.26.170.59819", + "templateHash": "7647899051970012853" }, "name": "Azure Kubernetes Service (AKS) Managed Clusters", "description": "This module deploys an Azure Kubernetes Service (AKS) Managed Cluster.", @@ -1902,8 +1902,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.26.54.24096", - "templateHash": "8772299678418708256" + "version": "0.26.170.59819", + "templateHash": "4264461851737541966" }, "name": "Azure Kubernetes Service (AKS) Managed Cluster Agent Pools", "description": "This module deploys an Azure Kubernetes Service (AKS) Managed Cluster Agent Pool.", From 67dfd46ccbe2ea3c61282e387756b9d4106f243b Mon Sep 17 00:00:00 2001 From: Richard Hooper Date: Fri, 19 Apr 2024 08:08:01 +0100 Subject: [PATCH 4/8] Update avm/res/container-service/managed-cluster/main.bicep Co-authored-by: Ilhaan Rasheed --- avm/res/container-service/managed-cluster/main.bicep | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/avm/res/container-service/managed-cluster/main.bicep b/avm/res/container-service/managed-cluster/main.bicep index 5acfef6348..b7ff5bf52a 100644 --- a/avm/res/container-service/managed-cluster/main.bicep +++ b/avm/res/container-service/managed-cluster/main.bicep @@ -300,8 +300,8 @@ param enableAzureDefender bool = false @description('Optional. Whether to enable Image Cleaner for Kubernetes.') param enableImageCleaner bool = false -@description('Optional. The interval in hours Image Cleaner will run. Defaults 120, 5 days.') -param imageCleanerIntervalHours int = 120 +@description('Optional. The interval in hours Image Cleaner will run. Minimum value is 24 hours and maximum is three months') +param imageCleanerIntervalHours int = 24 @description('Optional. Whether to enable Kubernetes pod security policy. Requires enabling the pod security policy feature flag on the subscription.') param enablePodSecurityPolicy bool = false From e9ec0fe260d2dd09ec39a783430a41f31e82bafe Mon Sep 17 00:00:00 2001 From: PixelRobots <22979170+PixelRobots@users.noreply.github.com> Date: Fri, 19 Apr 2024 08:10:23 +0100 Subject: [PATCH 5/8] Update imageCleanerIntervalHours parameter description in managed-cluster README.md Signed-off-by: PixelRobots <22979170+PixelRobots@users.noreply.github.com> --- avm/res/container-service/managed-cluster/README.md | 6 +++--- avm/res/container-service/managed-cluster/main.json | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/avm/res/container-service/managed-cluster/README.md b/avm/res/container-service/managed-cluster/README.md index 7f43fc1278..68c10879fd 100644 --- a/avm/res/container-service/managed-cluster/README.md +++ b/avm/res/container-service/managed-cluster/README.md @@ -1536,7 +1536,7 @@ module managedCluster 'br/public:avm/res/container-service/managed-cluster: Date: Fri, 19 Apr 2024 08:11:44 +0100 Subject: [PATCH 6/8] Update imageCleanerIntervalHours parameter description in managed-cluster README.md Signed-off-by: PixelRobots <22979170+PixelRobots@users.noreply.github.com> --- avm/res/container-service/managed-cluster/README.md | 4 ++-- avm/res/container-service/managed-cluster/main.bicep | 2 +- avm/res/container-service/managed-cluster/main.json | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/avm/res/container-service/managed-cluster/README.md b/avm/res/container-service/managed-cluster/README.md index 68c10879fd..8f4e377c6b 100644 --- a/avm/res/container-service/managed-cluster/README.md +++ b/avm/res/container-service/managed-cluster/README.md @@ -1536,7 +1536,7 @@ module managedCluster 'br/public:avm/res/container-service/managed-cluster: Date: Mon, 22 Apr 2024 20:24:57 +0100 Subject: [PATCH 7/8] Update avm/res/container-service/managed-cluster/main.bicep Co-authored-by: Alexander Sehr --- avm/res/container-service/managed-cluster/main.bicep | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/avm/res/container-service/managed-cluster/main.bicep b/avm/res/container-service/managed-cluster/main.bicep index 7bdbd6e4dc..1f5b0c1fc1 100644 --- a/avm/res/container-service/managed-cluster/main.bicep +++ b/avm/res/container-service/managed-cluster/main.bicep @@ -307,7 +307,8 @@ param enableAzureDefender bool = false @description('Optional. Whether to enable Image Cleaner for Kubernetes.') param enableImageCleaner bool = false -@description('Optional. The interval in hours Image Cleaner will run. Minimum value is 24 hours and maximum is three months.') +@description('Optional. The interval in hours Image Cleaner will run. The maximum value is three months.') +@minValue(24) param imageCleanerIntervalHours int = 24 @description('Optional. Whether to enable Kubernetes pod security policy. Requires enabling the pod security policy feature flag on the subscription.') From c9006ab33fc0d4c21538fbba47df838c86f57a79 Mon Sep 17 00:00:00 2001 From: PixelRobots <22979170+PixelRobots@users.noreply.github.com> Date: Tue, 23 Apr 2024 08:07:41 +0100 Subject: [PATCH 8/8] Update imageCleanerIntervalHours description in README.md and main.json Signed-off-by: PixelRobots <22979170+PixelRobots@users.noreply.github.com> --- avm/res/container-service/managed-cluster/README.md | 4 ++-- avm/res/container-service/managed-cluster/main.json | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/avm/res/container-service/managed-cluster/README.md b/avm/res/container-service/managed-cluster/README.md index bd83c1451d..2c6fc4b762 100644 --- a/avm/res/container-service/managed-cluster/README.md +++ b/avm/res/container-service/managed-cluster/README.md @@ -1513,7 +1513,7 @@ module managedCluster 'br/public:avm/res/container-service/managed-cluster: