feat: byo catalog by ferruhcihan · Pull Request #2901 · linode/apl-core

ferruhcihan · 2026-02-02T12:44:04Z

📌 Summary

This PR introduces support for Bring Your Own (BYO) catalog functionality, allowing users to configure custom Helm chart repositories instead of relying solely on the default APL charts repository.

🔍 Reviewer Notes

The related apl-api branch was created only for testing purposes and not to break cluster creation. The api and console changes will be implemented later.

🧹 Checklist

Code is readable, maintainable, and robust.
Unit tests added/updated

…talog urls

svcAPLBot · 2026-02-02T12:45:26Z

Comparison of Helm chart templating output:

@@ data @@
! - one map entry removed:
- HELM_CHART_CATALOG: "https://gitea.dev.linode-apl.net/otomi/charts.git"

@@ data.VERSIONS @@
! ± value change in multiline text (one insert, one deletion)
  
- {"api":"main","aplCharts":"main","console":"main","consoleLogin":"main","core":"main","specVersion":48,"tasks":"main","tools":"main"}
+ {"api":"APL-1458","aplCharts":"main","console":"main","consoleLogin":"main","core":"main","specVersion":50,"tasks":"main","tools":"main"}


@@ spec.template.spec.containers.otomi-api.image @@
! ± value change
- docker.io/linode/apl-api:main
+ docker.io/linode/apl-api:APL-1458



@@ (root level) @@
! + one map entry added:
+ catalogs:
+   default:
+     name: default
+     url: "https://github.com/linode/apl-charts.git"
+     branch: main
+     enabled: true

@@ versions.specVersion @@
! ± value change
- 48
+ 50

svcAPLBot · 2026-02-02T13:53:37Z

Comparison of Helm chart templating output:

@@ data @@
! - one map entry removed:
- HELM_CHART_CATALOG: "https://gitea.dev.linode-apl.net/otomi/charts.git"

@@ data.VERSIONS @@
! ± value change in multiline text (one insert, one deletion)
  
- {"api":"main","aplCharts":"main","console":"main","consoleLogin":"main","core":"main","specVersion":48,"tasks":"main","tools":"main"}
+ {"api":"APL-1458","aplCharts":"main","console":"main","consoleLogin":"main","core":"main","specVersion":50,"tasks":"main","tools":"main"}


@@ spec.template.spec.containers.otomi-api.image @@
! ± value change
- docker.io/linode/apl-api:main
+ docker.io/linode/apl-api:APL-1458



@@ (root level) @@
! + one map entry added:
+ catalogs:
+   default:
+     name: default
+     url: "https://github.com/linode/apl-charts.git"
+     branch: main
+     enabled: true

@@ versions.specVersion @@
! ± value change
- 48
+ 50

svcAPLBot · 2026-02-02T14:37:21Z

Comparison of Helm chart templating output:

@@ data @@
! - one map entry removed:
- HELM_CHART_CATALOG: "https://gitea.dev.linode-apl.net/otomi/charts.git"

@@ data.VERSIONS @@
! ± value change in multiline text (one insert, one deletion)
  
- {"api":"main","aplCharts":"main","console":"main","consoleLogin":"main","core":"main","specVersion":48,"tasks":"main","tools":"main"}
+ {"api":"APL-1458","console":"main","consoleLogin":"main","core":"main","specVersion":50,"tasks":"main","tools":"main"}


@@ spec.template.spec.containers.otomi-api.image @@
! ± value change
- docker.io/linode/apl-api:main
+ docker.io/linode/apl-api:APL-1458



@@ (root level) @@
! + one map entry added:
+ catalogs:
+   default:
+     name: default
+     url: "https://github.com/linode/apl-charts.git"
+     branch: main
+     enabled: true

@@ versions.specVersion @@
! ± value change
- 48
+ 50

Copilot

Pull request overview

This PR introduces support for Bring Your Own (BYO) catalog functionality, allowing users to configure custom Helm chart repositories instead of relying solely on the default APL charts repository. The implementation includes a migration strategy that automatically sets up a default catalog configuration, with optional private repository support via sealed secrets.

Changes:

Adds AplCatalog resource type with schema validation for catalog configuration
Removes OTOMI_CHARTS_URL environment variable and the cloneOtomiChartsInGitea function
Implements migration function to create default catalog configuration with Gitea integration when available
Updates API version from 48 to 50 with catalog-related schema changes

Reviewed changes

Copilot reviewed 21 out of 22 changed files in this pull request and generated 4 comments.

Show a summary per file

File	Description
versions.yaml	Updates API version to branch APL-1458 and removes aplCharts version reference
values/otomi-api/otomi-api.gotmpl	Removes hardcoded HELM_CHART_CATALOG environment variable
values-schema.yaml	Adds catalog schema definition with git URL, branch, and credentials support
values-changes.yaml	Registers setDefaultAplCatalog migration function for version 50
tests/fixtures/env/settings/versions.yaml	Updates specVersion to 50
tests/fixtures/env/catalogs/default.yaml	Adds default catalog fixture configuration
src/operator/EXECUTION_FLOW.md	Removes cloneOtomiChartsInGitea step from installation flow
src/common/repo.ts	Adds AplCatalog kind and platformCatalogs resource group handling
src/common/repo.test.ts	Adds comprehensive test coverage for AplCatalog resource operations
src/common/k8s.ts	Adds getSealedSecretsPEM function to retrieve sealed secrets public key
src/common/k8s.test.ts	Adds test coverage for getSealedSecretsPEM function
src/common/envalid.ts	Removes OTOMI_CHARTS_URL environment variable
src/cmd/migrate.ts	Implements setDefaultAplCatalog migration with sealed secret creation
src/cmd/migrate.test.ts	Adds test coverage for catalog migration scenarios
src/cmd/install.ts	Removes cloneOtomiChartsInGitea call from installation flow
src/cmd/install.test.ts	Removes cloneOtomiChartsInGitea mock
src/cmd/commit.ts	Removes cloneOtomiChartsInGitea function and unused imports
package.json	Adds @linode/kubeseal-encrypt dependency
helmfile.d/snippets/defaults.yaml	Updates specVersion to 50
helmfile.d/snippets/defaults.gotmpl	Adds default catalog configuration to defaults
.env.sample	Removes OTOMI_CHARTS_URL environment variable

svcAPLBot · 2026-02-03T15:25:18Z

Comparison of Helm chart templating output:

@@ data @@
! - one map entry removed:
- HELM_CHART_CATALOG: "https://gitea.dev.linode-apl.net/otomi/charts.git"

@@ data.VERSIONS @@
! ± value change in multiline text (one insert, one deletion)
  
- {"api":"main","aplCharts":"main","console":"main","consoleLogin":"main","core":"main","specVersion":50,"tasks":"main","tools":"main"}
+ {"api":"APL-1458","console":"main","consoleLogin":"main","core":"main","specVersion":52,"tasks":"main","tools":"main"}


@@ spec.template.spec.containers.otomi-api.image @@
! ± value change
- docker.io/linode/apl-api:main
+ docker.io/linode/apl-api:APL-1458



@@ (root level) @@
! + one map entry added:
+ catalogs:
+   default:
+     name: default
+     url: "https://github.com/linode/apl-charts.git"
+     branch: main
+     enabled: true

@@ versions.specVersion @@
! ± value change
- 50
+ 52

ElderMatt

Looks good, when the comments from Cas are fixed I think it can be approved

svcAPLBot · 2026-02-04T09:24:57Z

Comparison of Helm chart templating output:

@@ data @@
! - one map entry removed:
- HELM_CHART_CATALOG: "https://gitea.dev.linode-apl.net/otomi/charts.git"

@@ data.VERSIONS @@
! ± value change in multiline text (one insert, one deletion)
  
- {"api":"main","aplCharts":"main","console":"main","consoleLogin":"main","core":"main","specVersion":52,"tasks":"main","tools":"main"}
+ {"api":"APL-1458","console":"main","consoleLogin":"main","core":"main","specVersion":53,"tasks":"main","tools":"main"}


@@ spec.template.spec.containers.otomi-api.image @@
! ± value change
- docker.io/linode/apl-api:main
+ docker.io/linode/apl-api:APL-1458



@@ (root level) @@
! + one map entry added:
+ catalogs:
+   default:
+     name: default
+     url: "https://github.com/linode/apl-charts.git"
+     branch: main
+     enabled: true

@@ versions.specVersion @@
! ± value change
- 52
+ 53

svcAPLBot · 2026-02-04T12:15:17Z

Comparison of Helm chart templating output:

@@ data @@
! - one map entry removed:
- HELM_CHART_CATALOG: "https://gitea.dev.linode-apl.net/otomi/charts.git"

@@ data.VERSIONS @@
! ± value change in multiline text (one insert, one deletion)
  
- {"api":"main","aplCharts":"main","console":"main","consoleLogin":"main","core":"main","specVersion":52,"tasks":"main","tools":"main"}
+ {"api":"APL-1458","console":"main","consoleLogin":"main","core":"main","specVersion":53,"tasks":"main","tools":"main"}


@@ spec.template.spec.containers.otomi-api.image @@
! ± value change
- docker.io/linode/apl-api:main
+ docker.io/linode/apl-api:APL-1458



@@ (root level) @@
! + one map entry added:
+ catalogs:
+   default:
+     name: default
+     url: "https://github.com/linode/apl-charts.git"
+     branch: main
+     enabled: true

@@ versions.specVersion @@
! ± value change
- 52
+ 53

svcAPLBot · 2026-02-04T12:38:01Z

Comparison of Helm chart templating output:

@@ data @@
! - one map entry removed:
- HELM_CHART_CATALOG: "https://gitea.dev.linode-apl.net/otomi/charts.git"

@@ data.VERSIONS @@
! ± value change in multiline text (one insert, one deletion)
  
- {"api":"main","aplCharts":"main","console":"main","consoleLogin":"main","core":"main","specVersion":52,"tasks":"main","tools":"main"}
+ {"api":"main","console":"main","consoleLogin":"main","core":"main","specVersion":53,"tasks":"main","tools":"main"}




@@ (root level) @@
! + one map entry added:
+ catalogs:
+   default:
+     name: default
+     url: "https://github.com/linode/apl-charts.git"
+     branch: main
+     enabled: true

@@ versions.specVersion @@
! ± value change
- 52
+ 53

ferruhcihan added 21 commits January 28, 2026 21:16

feat: add catalogs to the values-schema

59440eb

feat: add AplCatalog kind & update default.gotmpl

d5f0533

feat: add tests for AplCatalog resource

4ee134e

fix: values-schema catalogs

1c81271

feat: add migration function for default AplCatalog

64eddc4

Merge branch 'main' into APL-1458

e8f544b

fix: argocd team-ns app to support argocd namespace for sealed secrets

137144c

feat: create default catalog credentials with migration

edff2e2

feat: move getSealedSecretsPEM to k8s.ts

04a935d

feat: improve default catalog migration

91ebf6f

Merge branch 'main' into APL-1458

4e55ee9

feat: remove cloneOtomiChartsInGitea & otomi-charts and helm-chart-ca…

e2b1da2

…talog urls

feat: render sealed secrets manifests

b2aa272

test: default apl catalog migration

f66231f

test: with apl-api

46ae64f

Merge branch 'main' into APL-1458

2c57953

fix: revert unnecessary changes

0040834

feat: create sealedsecrets in values manifests

c8a1c97

fix: default catalog migration

9f386e2

fix: create sealedsecrets with manifests

016e6f7

feat: update default specVersion

51d48f3

ferruhcihan commented Feb 2, 2026

View reviewed changes

Comment thread versions.yaml Outdated

feat: improve catalog migration and tests

4389c89

ferruhcihan added 2 commits February 2, 2026 15:32

fix: default catalog sealed secret manifest

ca98f3f

fix: remove aplCharts from versions

6cbe612

ferruhcihan requested a review from Copilot February 2, 2026 14:44

Copilot AI reviewed Feb 2, 2026

View reviewed changes

Comment thread src/cmd/migrate.ts

Comment thread src/common/k8s.ts

Comment thread src/common/k8s.ts

Comment thread src/cmd/migrate.test.ts

ferruhcihan marked this pull request as ready for review February 2, 2026 14:57

ferruhcihan requested review from Ani1357, CasLubbers, j-zimnowoda and merll as code owners February 2, 2026 14:57

ferruhcihan added 2 commits February 3, 2026 16:16

Merge branch 'main' into APL-1458

4d4ccc3

fix: update tests/fixtures spec version

7846d6a

CasLubbers reviewed Feb 3, 2026

View reviewed changes

Comment thread helmfile.d/snippets/defaults.gotmpl Outdated

Comment thread helmfile.d/snippets/defaults.yaml Outdated

Comment thread values-schema.yaml Outdated

Comment thread src/cmd/migrate.ts Outdated

Comment thread src/cmd/migrate.ts

svcAPLBot and others added 2 commits February 4, 2026 09:10

Merge branch 'main' into APL-1458

a0092a2

Merge branch 'main' into APL-1458

01288a2

ElderMatt reviewed Feb 4, 2026

View reviewed changes

svcAPLBot and others added 2 commits February 4, 2026 09:58

Merge branch 'main' into APL-1458

34de107

fix: addres pr comments

cd2a4a8

svcAPLBot and others added 3 commits February 4, 2026 10:41

Merge branch 'main' into APL-1458

bef4611

Merge branch 'main' into APL-1458

bcff180

chore: rename catalog url

dd2958f

CasLubbers approved these changes Feb 4, 2026

View reviewed changes

ElderMatt approved these changes Feb 4, 2026

View reviewed changes

revert: versions

79c3f4a

ferruhcihan enabled auto-merge (squash) February 4, 2026 12:37

ferruhcihan merged commit 0c7aa04 into main Feb 4, 2026
15 checks passed

ferruhcihan deleted the APL-1458 branch February 4, 2026 12:43

Conversation

ferruhcihan commented Feb 2, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

📌 Summary

🔍 Reviewer Notes

🧹 Checklist

Uh oh!

svcAPLBot commented Feb 2, 2026

Uh oh!

Uh oh!

svcAPLBot commented Feb 2, 2026

Uh oh!

svcAPLBot commented Feb 2, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

svcAPLBot commented Feb 3, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ElderMatt left a comment

Choose a reason for hiding this comment

Uh oh!

svcAPLBot commented Feb 4, 2026

Uh oh!

svcAPLBot commented Feb 4, 2026

Uh oh!

svcAPLBot commented Feb 4, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

ferruhcihan commented Feb 2, 2026 •

edited

Loading