From 03baa38a84260742469157489cfd69cf5921f843 Mon Sep 17 00:00:00 2001 From: unkin-agent Date: Tue, 20 Oct 2026 22:44:10 +1100 Subject: [PATCH 1/2] Add deb-internal local and deb-custom virtual --- config/config.hcl | 5 +++++ config/local_deb/deb-internal.yaml | 1 + config/virtual/deb-custom.yaml | 15 +++++++++++++++ .../terragrunt.hcl | 1 + modules/artifactapi/main.tf | 7 +++++++ modules/artifactapi/variables.tf | 8 ++++++++ 6 files changed, 37 insertions(+) create mode 100644 config/local_deb/deb-internal.yaml create mode 100644 config/virtual/deb-custom.yaml diff --git a/config/config.hcl b/config/config.hcl index 66e6f0a..6cdbc26 100644 --- a/config/config.hcl +++ b/config/config.hcl @@ -97,6 +97,11 @@ locals { trimsuffix(basename(file_path), ".yaml") => content if startswith(file_path, "local_helm/") } + local_deb = { + for file_path, content in local.all_configs : + trimsuffix(basename(file_path), ".yaml") => content + if startswith(file_path, "local_deb/") + } local_npm = { for file_path, content in local.all_configs : trimsuffix(basename(file_path), ".yaml") => content diff --git a/config/local_deb/deb-internal.yaml b/config/local_deb/deb-internal.yaml new file mode 100644 index 0000000..dc6f93f --- /dev/null +++ b/config/local_deb/deb-internal.yaml @@ -0,0 +1 @@ +description: "Internal Debian packages" diff --git a/config/virtual/deb-custom.yaml b/config/virtual/deb-custom.yaml new file mode 100644 index 0000000..7d67c41 --- /dev/null +++ b/config/virtual/deb-custom.yaml @@ -0,0 +1,15 @@ +package_type: deb +description: "Custom flat-layout deb repo: internal and GitHub-release packages. Member order is priority order." +members: + - deb-internal + - storytold-cadcraft-deb + - storytold-deckcraft-deb + - storytold-effectcraft-deb + - storytold-filmcraft-deb + - storytold-gridcraft-deb + - storytold-lightcraft-deb + - storytold-pdfcraft-deb + - storytold-photocraft-deb + - storytold-soundcraft-deb + - storytold-vectorcraft-deb + - storytold-wordcraft-deb diff --git a/environments/artifactapi.k8s.syd1.au.unkin.net/terragrunt.hcl b/environments/artifactapi.k8s.syd1.au.unkin.net/terragrunt.hcl index 14379b7..9e600bc 100644 --- a/environments/artifactapi.k8s.syd1.au.unkin.net/terragrunt.hcl +++ b/environments/artifactapi.k8s.syd1.au.unkin.net/terragrunt.hcl @@ -35,6 +35,7 @@ inputs = { local_pypi = local.config.local_pypi local_rpm = local.config.local_rpm local_helm = local.config.local_helm + local_deb = local.config.local_deb local_npm = local.config.local_npm local_goproxy = local.config.local_goproxy local_gems = local.config.local_gems diff --git a/modules/artifactapi/main.tf b/modules/artifactapi/main.tf index 2a6cbe3..d62f279 100644 --- a/modules/artifactapi/main.tf +++ b/modules/artifactapi/main.tf @@ -215,6 +215,13 @@ resource "artifactapi_local_helm" "this" { description = each.value.description } +resource "artifactapi_local_deb" "this" { + for_each = var.local_deb + + name = each.key + description = each.value.description +} + resource "artifactapi_local_npm" "this" { for_each = var.local_npm diff --git a/modules/artifactapi/variables.tf b/modules/artifactapi/variables.tf index bc3760a..dfa3c70 100644 --- a/modules/artifactapi/variables.tf +++ b/modules/artifactapi/variables.tf @@ -221,6 +221,14 @@ variable "local_helm" { default = {} } +variable "local_deb" { + description = "Map of local Debian repositories" + type = map(object({ + description = optional(string, "") + })) + default = {} +} + variable "local_npm" { description = "Map of local npm registries" type = map(object({ -- 2.47.3 From 2bf1240e70ab18576a6262c268c20bed841b5fbe Mon Sep 17 00:00:00 2001 From: unkin-agent Date: Tue, 20 Oct 2026 22:45:56 +1100 Subject: [PATCH 2/2] add cnpg and orca github deb remotes to deb-custom --- config/virtual/deb-custom.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/virtual/deb-custom.yaml b/config/virtual/deb-custom.yaml index 7d67c41..6a954f5 100644 --- a/config/virtual/deb-custom.yaml +++ b/config/virtual/deb-custom.yaml @@ -2,6 +2,7 @@ package_type: deb description: "Custom flat-layout deb repo: internal and GitHub-release packages. Member order is priority order." members: - deb-internal + - cloudnative-pg-cloudnative-pg-deb - storytold-cadcraft-deb - storytold-deckcraft-deb - storytold-effectcraft-deb @@ -13,3 +14,4 @@ members: - storytold-soundcraft-deb - storytold-vectorcraft-deb - storytold-wordcraft-deb + - stablyai-orca-deb -- 2.47.3