Skip to content

Adding artifact cache entries to capz/container-registry for calico images to avoid throttling during large cluster deployments #8431

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Adding artifact cache entries to capz/container-registry for calico images to avoid throttling during large cluster deployments #8431

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e8412ac
Adding artifaact cache entries to capz/container-registry for calico
marosset Aug 21, 2025
2b7b3e9
fixup! Adding artifaact cache entries to capz/container-registry for …
marosset Aug 22, 2025
3c7cdf1
Add subscription id as terraform variable for azure/capz resources
marosset Aug 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions infra/azure/terraform/capz/capz-monitoring/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,14 @@ resource "azurerm_role_assignment" "monitoring_reader" {
principal_id = azurerm_user_assigned_identity.capz_monitoring_user_identity.principal_id
role_definition_name = "Monitoring Reader"
scope = "/subscriptions/${var.subscription_id}"
depends_on = [ azurerm_user_assigned_identity.capz_monitoring_user_identity ]
depends_on = [azurerm_user_assigned_identity.capz_monitoring_user_identity]
}

resource "azurerm_kubernetes_cluster" "capz-monitoring" {
dns_prefix = var.resource_group_name
location = var.location
name = var.resource_group_name
resource_group_name = var.resource_group_name
dns_prefix = var.resource_group_name
location = var.location
name = var.resource_group_name
resource_group_name = var.resource_group_name
tags = {
DO-NOT-DELETE = "contact capz"
creationTimestamp = timestamp()
Expand All @@ -66,7 +66,7 @@ resource "azurerm_kubernetes_cluster" "capz-monitoring" {
user_assigned_identity_id = azurerm_user_assigned_identity.capz_monitoring_user_identity.id
}
identity {
type = "UserAssigned"
type = "UserAssigned"
identity_ids = [
azurerm_user_assigned_identity.capz_monitoring_user_identity.id
]
Expand Down
45 changes: 37 additions & 8 deletions infra/azure/terraform/capz/container-registry/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,7 @@ resource "azurerm_container_registry" "capzci_registry" {
sku = "Premium"
anonymous_pull_enabled = true

retention_policy {
days = 7
enabled = true
}
retention_policy_in_days = 7

tags = {
RetentionPolicy = "7days"
Expand All @@ -46,6 +43,41 @@ resource "azurerm_management_lock" "registry_lock" {
notes = "Contact Capz"
}

resource "azurerm_container_registry_cache_rule" "tigera_operator" {
name = "tigera-operator-cache"
container_registry_id = azurerm_container_registry.capzci_registry.id
source_repo = "quay.io/tigera/operator"
target_repo = "tigera/operator"
}

resource "azurerm_container_registry_cache_rule" "calico_node" {
name = "calico-node-cache"
container_registry_id = azurerm_container_registry.capzci_registry.id
source_repo = "quay.io/calico/node"
target_repo = "calico/node"
}

resource "azurerm_container_registry_cache_rule" "calico_cni" {
name = "calico-cni-cache"
container_registry_id = azurerm_container_registry.capzci_registry.id
source_repo = "quay.io/calico/cni"
target_repo = "calico/cni"
}

resource "azurerm_container_registry_cache_rule" "calico_kube_controllers" {
name = "calico-kube-controllers-cache"
container_registry_id = azurerm_container_registry.capzci_registry.id
source_repo = "quay.io/calico/kube-controllers"
target_repo = "calico/kube-controllers"
}

resource "azurerm_container_registry_cache_rule" "calico_ctl" {
name = "calico-ctl-cache"
container_registry_id = azurerm_container_registry.capzci_registry.id
source_repo = "quay.io/calico/ctl"
target_repo = "calico/ctl"
}

resource "azurerm_container_registry_task" "registry_task" {
container_registry_id = azurerm_container_registry.capzci_registry.id
name = "midnight_capz_purge"
Expand Down Expand Up @@ -87,10 +119,7 @@ resource "azurerm_container_registry" "e2eprivate_registry" {
resource_group_name = var.resource_group_name
sku = "Premium"

retention_policy {
days = 7
enabled = true
}
retention_policy_in_days = 7

tags = {
RetentionPolicy = "7days"
Expand Down
5 changes: 4 additions & 1 deletion infra/azure/terraform/capz/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ limitations under the License.

provider "azurerm" {
features {}
subscription_id = var.subscription_id
}

terraform {
Expand Down Expand Up @@ -131,7 +132,9 @@ module "cluster_api_gallery" {
source = "./cluster-api-gallery"
resource_group_name = var.resource_group_name
location = var.location
depends_on = module.role_assignments
depends_on = [
module.role_assignments
]
}

# Import CAPZ monitoring module
Expand Down
6 changes: 6 additions & 0 deletions infra/azure/terraform/capz/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,9 @@ variable "storage_account_name" {
default = "k8sprowstoragecomm"
description = "Name of the storage account."
}

variable "subscription_id" {
type = string
default = "46678f10-4bbb-447e-98e8-d2829589f2d8"
description = "Azure Subscription ID to use for the azurerm provider."
}