Maidn/maidn-cli
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'fix: refresh Cloudflare tunnel template' (#9) from fix/refresh-cloudflare-template into main

Browse source 
Reviewed-on: #9
This commit is contained in:
eding 2026-08-03 00:00:08 +02:00
parent f21635a0a6 1df14ef62e
commit eebd36cca1
2 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
internal/bootstrap/bootstrap.go
View file

@ -70,7 +70,7 @@ var webhookTargetTimeout = 70 * time.Minute
var webhookTargetPollInterval = 2 * time.Second
var templateBaseComponents = []string{"snapshot-crds", "democratic-csi", "cert-manager", "cluster-issuers", "gateway-api", "gateway", "monitoring", "openbao", "external-secrets", "cnpg", "external-dns", "tekton", "tekton-triggers"}
var templateBaseComponents = []string{"snapshot-crds", "democratic-csi", "cert-manager", "cluster-issuers", "gateway-api", "gateway", "monitoring", "openbao", "external-secrets", "cnpg", "cloudflare-tunnel", "external-dns", "tekton", "tekton-triggers"}
var generatedTemplateFiles = map[string]map[string]bool{
"democratic-csi": {"secret.sops.yaml": true},

15
internal/bootstrap/bootstrap_test.go
View file

@ -126,6 +126,17 @@ func TestCopyTemplateBaseComponentsRefreshesCNPGAndPreservesGeneratedSecrets(t *
if err := os.WriteFile(cnpgDestination, []byte("resources:\n - release.yaml\n - infrastructure-postgres.yaml\n"), 0644); err != nil {
t.Fatal(err)
}
cloudflareSource := filepath.Join(templateDir, "base", "cloudflare-tunnel", "deployment.yaml")
cloudflareDestination := filepath.Join(repoDir, "base", "cloudflare-tunnel", "deployment.yaml")
if err := os.WriteFile(cloudflareSource, []byte("command: cloudflared\n"), 0644); err != nil {
t.Fatal(err)
}
if err := os.MkdirAll(filepath.Dir(cloudflareDestination), 0755); err != nil {
t.Fatal(err)
}
if err := os.WriteFile(cloudflareDestination, []byte("command: stale\n"), 0644); err != nil {
t.Fatal(err)
}
operatorSource := filepath.Join(templateDir, "base", "cnpg", "operator", "kustomization.yaml")
if err := os.MkdirAll(filepath.Dir(operatorSource), 0755); err != nil {
t.Fatal(err)
@ -157,6 +168,10 @@ func TestCopyTemplateBaseComponentsRefreshesCNPGAndPreservesGeneratedSecrets(t *
if err != nil || string(content) != "resources:\n - release.yaml\n" {
t.Fatalf("CNPG operator child was not copied: %q, %v", content, err)
}
content, err = os.ReadFile(cloudflareDestination)
if err != nil || string(content) != "command: cloudflared\n" {
t.Fatalf("Cloudflare Tunnel deployment was not refreshed: %q, %v", content, err)
}
for _, file := range []string{"democratic-csi/secret.sops.yaml", "openbao/unseal.sops.yaml"} {
content, err := os.ReadFile(filepath.Join(repoDir, "base", file))
if err != nil || string(content) != "sops: generated\n" {