fix: preserve generated Tekton apps
This commit is contained in:
parent
7b1de17e5d
commit
a867c209c3
|
|
@ -1161,7 +1161,15 @@ func ensureClusterKustomizations(clusterDir string, includeDelivery bool) error
|
||||||
|
|
||||||
func copyTemplateBaseComponents(templateDir, repoDir string, includeDelivery bool) error {
|
func copyTemplateBaseComponents(templateDir, repoDir string, includeDelivery bool) error {
|
||||||
for _, component := range templateBaseComponents {
|
for _, component := range templateBaseComponents {
|
||||||
if err := copyDirExcept(filepath.Join(templateDir, "base", component), filepath.Join(repoDir, "base", component), true, generatedTemplateFiles[component]); err != nil {
|
excluded := generatedTemplateFiles[component]
|
||||||
|
if component == "tekton" {
|
||||||
|
excluded = make(map[string]bool, len(excluded)+1)
|
||||||
|
for path, skip := range generatedTemplateFiles[component] {
|
||||||
|
excluded[path] = skip
|
||||||
|
}
|
||||||
|
excluded["apps"] = true
|
||||||
|
}
|
||||||
|
if err := copyDirExcept(filepath.Join(templateDir, "base", component), filepath.Join(repoDir, "base", component), true, excluded); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -236,6 +236,12 @@ func TestCopyAndRenderPlatformDeliveryBasesOverwritesExistingMigrationOutput(t *
|
||||||
if err := os.WriteFile(filepath.Join(templateDir, "base", "tekton", "kustomization.yaml"), []byte("resources:\n"), 0644); err != nil {
|
if err := os.WriteFile(filepath.Join(templateDir, "base", "tekton", "kustomization.yaml"), []byte("resources:\n"), 0644); err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
|
if err := os.MkdirAll(filepath.Join(templateDir, "base", "tekton", "apps"), 0755); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if err := os.WriteFile(filepath.Join(templateDir, "base", "tekton", "apps", "kustomization.yaml"), []byte("resources: []\n"), 0644); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
customGatewayFile := filepath.Join(repoDir, "base", "gateway", "custom.yaml")
|
customGatewayFile := filepath.Join(repoDir, "base", "gateway", "custom.yaml")
|
||||||
if err := os.WriteFile(customGatewayFile, []byte("custom: route\n"), 0644); err != nil {
|
if err := os.WriteFile(customGatewayFile, []byte("custom: route\n"), 0644); err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue