From 3446a861c8332928c258af0a775e9d5076ed2f59 Mon Sep 17 00:00:00 2001 From: unkin-agent Date: Sat, 17 Oct 2026 15:12:09 +1100 Subject: [PATCH 1/2] Add local_helm kind with helm-internal as first helm virtual member --- config/config.hcl | 5 +++++ config/local_helm/helm-internal.yaml | 1 + config/virtual/helm.yaml | 1 + .../artifactapi.k8s.syd1.au.unkin.net/terragrunt.hcl | 1 + modules/artifactapi/main.tf | 7 +++++++ modules/artifactapi/variables.tf | 8 ++++++++ 6 files changed, 23 insertions(+) create mode 100644 config/local_helm/helm-internal.yaml diff --git a/config/config.hcl b/config/config.hcl index f1075e8..56025ed 100644 --- a/config/config.hcl +++ b/config/config.hcl @@ -77,6 +77,11 @@ locals { trimsuffix(basename(file_path), ".yaml") => content if startswith(file_path, "local_rpm/") } + local_helm = { + for file_path, content in local.all_configs : + trimsuffix(basename(file_path), ".yaml") => content + if startswith(file_path, "local_helm/") + } local_docker = { for file_path, content in local.all_configs : trimsuffix(basename(file_path), ".yaml") => content diff --git a/config/local_helm/helm-internal.yaml b/config/local_helm/helm-internal.yaml new file mode 100644 index 0000000..b587521 --- /dev/null +++ b/config/local_helm/helm-internal.yaml @@ -0,0 +1 @@ +description: "Internal Helm charts" diff --git a/config/virtual/helm.yaml b/config/virtual/helm.yaml index 0548341..1b2b317 100644 --- a/config/virtual/helm.yaml +++ b/config/virtual/helm.yaml @@ -1,6 +1,7 @@ package_type: helm description: "Virtual repository merging all helm remotes — member order is priority order for duplicate chart+version" members: + - helm-internal - authentik - ceph-csi - cnpg diff --git a/environments/artifactapi.k8s.syd1.au.unkin.net/terragrunt.hcl b/environments/artifactapi.k8s.syd1.au.unkin.net/terragrunt.hcl index 887f819..b46c6fc 100644 --- a/environments/artifactapi.k8s.syd1.au.unkin.net/terragrunt.hcl +++ b/environments/artifactapi.k8s.syd1.au.unkin.net/terragrunt.hcl @@ -31,6 +31,7 @@ inputs = { local_terraform = local.config.local_terraform local_pypi = local.config.local_pypi local_rpm = local.config.local_rpm + local_helm = local.config.local_helm local_docker = local.config.local_docker local_generic = local.config.local_generic virtual = local.config.virtual diff --git a/modules/artifactapi/main.tf b/modules/artifactapi/main.tf index 48d0bf5..2289ebe 100644 --- a/modules/artifactapi/main.tf +++ b/modules/artifactapi/main.tf @@ -169,6 +169,13 @@ resource "artifactapi_local_rpm" "this" { description = each.value.description } +resource "artifactapi_local_helm" "this" { + for_each = var.local_helm + + name = each.key + description = each.value.description +} + resource "artifactapi_local_docker" "this" { for_each = var.local_docker diff --git a/modules/artifactapi/variables.tf b/modules/artifactapi/variables.tf index 16ba039..0181dfd 100644 --- a/modules/artifactapi/variables.tf +++ b/modules/artifactapi/variables.tf @@ -171,6 +171,14 @@ variable "local_rpm" { default = {} } +variable "local_helm" { + description = "Map of local Helm chart repositories" + type = map(object({ + description = optional(string, "") + })) + default = {} +} + variable "local_generic" { description = "Map of local generic (raw-file) repositories" type = map(object({ From f04d400b5c12d9a2f2c57ecb246c12c9ce608a1f Mon Sep 17 00:00:00 2001 From: unkin-agent Date: Sat, 17 Oct 2026 15:34:35 +1100 Subject: [PATCH 2/2] retrigger CI for provider v0.8.0