internal/bootstrap/bootstrap.go

@@ -437,11 +437,7 @@ func copyAndRenderDeliveryBases(templateDir, repoDir string, cfg config.Config)
 			return err
 		}
 	}
-	dir := filepath.Join(repoDir, "base", "tekton")
+	return writePreviewDeliveryConfig(filepath.Join(repoDir, "base", "tekton"), cfg)
-	if err := writePreviewDeliveryConfig(dir, cfg); err != nil {
-		return err
-	}
-	return writeAppDeliverySource(dir, cfg)
 }
 
 func writePreviewDeliveryConfig(dir string, cfg config.Config) error {
@@ -485,57 +481,6 @@ func writePreviewDeliveryConfig(dir string, cfg config.Config) error {
 	return os.WriteFile(path, append(data, []byte("  - maidn-preview-delivery-config.yaml\n")...), 0644)
 }
 
-func writeAppDeliverySource(dir string, cfg config.Config) error {
-	if err := config.ValidateDelivery(cfg); err != nil {
-		return err
-	}
-	name := cfg.Delivery.AppName
-	filename := name + "-source.yaml"
-	content := fmt.Sprintf(`apiVersion: source.toolkit.fluxcd.io/v1
-kind: GitRepository
-metadata:
-  name: %s
-  namespace: flux-system
-spec:
-  interval: 5m
-  url: %s
-  ref:
-    branch: %s
-  secretRef:
-    name: forgejo-flux-credentials
----
-apiVersion: kustomize.toolkit.fluxcd.io/v1
-kind: Kustomization
-metadata:
-  name: %s-delivery
-  namespace: flux-system
-spec:
-  dependsOn:
-    - name: tekton-catalog
-  interval: 5m
-  path: ./.tekton
-  prune: true
-  sourceRef:
-    kind: GitRepository
-    name: %s
-`, name, cfg.Delivery.AppRepoURL, cfg.Delivery.AppRepoRef, name, name)
-	if err := os.WriteFile(filepath.Join(dir, filename), []byte(content), 0644); err != nil {
-		return err
-	}
-	path := filepath.Join(dir, "kustomization.yaml")
-	data, err := os.ReadFile(path)
-	if err != nil {
-		return err
-	}
-	if !strings.Contains("\n"+string(data), "\nresources:") {
-		return errors.New("Tekton Kustomization must define resources before adding app delivery source")
-	}
-	if strings.Contains(string(data), filename) {
-		return nil
-	}
-	return os.WriteFile(path, append(data, []byte("  - "+filename+"\n")...), 0644)
-}
-
 func canonicalForgejoOrigin(value string) (string, error) {
 	parsed, err := url.Parse(value)
 	if err != nil || parsed.Scheme != "https" || parsed.Host == "" || parsed.User != nil || parsed.RawPath != "" || parsed.RawQuery != "" || parsed.Fragment != "" || strings.Trim(parsed.Path, "/") != "" {
@@ -1147,35 +1092,7 @@ func installCilium(dir string, cfg config.Config) error {
 	if err := os.MkdirAll(helmDir, 0755); err != nil {
 		return err
 	}
-	// The generated HelmRelease is the sole Cilium chart-version authority.
+	return utils.RunCommandInDir(dir, "helm", "upgrade", "--install", "cilium", "cilium", "--repo=https://helm.cilium.io", "--version=1.19.6", "--repository-config="+filepath.Join(helmDir, "repositories.yaml"), "--repository-cache="+helmDir, "--namespace=kube-system", "--create-namespace", "--kubeconfig=kubeconfig", "--wait", "--timeout=5m", "--set=kubeProxyReplacement=true", "--set=ipam.mode=kubernetes", "--set=k8sServiceHost=localhost", "--set=k8sServicePort=7445", "--set=cgroup.autoMount.enabled=false", "--set=cgroup.hostRoot=/sys/fs/cgroup", "--set=bpf.hostLegacyRouting=true", "--set=securityContext.capabilities.ciliumAgent={CHOWN,KILL,NET_ADMIN,NET_RAW,IPC_LOCK,SYS_ADMIN,SYS_RESOURCE,DAC_OVERRIDE,FOWNER,SETGID,SETUID}", "--set=securityContext.capabilities.cleanCiliumState={NET_ADMIN,SYS_ADMIN,SYS_RESOURCE}", "--set=envoy.enabled=true", "--set=gatewayAPI.enabled=true", "--set=hubble.enabled=true", "--set=hubble.relay.enabled=true", "--set=hubble.ui.enabled=true", "--set=l2announcements.enabled=true", "--set=rollOutCiliumPods=true", "--set=operator.replicas=1", "--set=operator.rollOutPods=true")
-	version, err := ciliumChartVersion(filepath.Join(dir, "base", "cilium", "release.yaml"))
-	if err != nil {
-		return err
-	}
-	return utils.RunCommandInDir(dir, "helm", "upgrade", "--install", "cilium", "cilium", "--repo=https://helm.cilium.io", "--version="+version, "--repository-config="+filepath.Join(helmDir, "repositories.yaml"), "--repository-cache="+helmDir, "--namespace=kube-system", "--create-namespace", "--kubeconfig=kubeconfig", "--wait", "--timeout=5m", "--set=kubeProxyReplacement=true", "--set=ipam.mode=kubernetes", "--set=k8sServiceHost=localhost", "--set=k8sServicePort=7445", "--set=cgroup.autoMount.enabled=false", "--set=cgroup.hostRoot=/sys/fs/cgroup", "--set=bpf.hostLegacyRouting=true", "--set=securityContext.capabilities.ciliumAgent={CHOWN,KILL,NET_ADMIN,NET_RAW,IPC_LOCK,SYS_ADMIN,SYS_RESOURCE,DAC_OVERRIDE,FOWNER,SETGID,SETUID}", "--set=securityContext.capabilities.cleanCiliumState={NET_ADMIN,SYS_ADMIN,SYS_RESOURCE}", "--set=envoy.enabled=true", "--set=gatewayAPI.enabled=true", "--set=hubble.enabled=true", "--set=hubble.relay.enabled=true", "--set=hubble.ui.enabled=true", "--set=l2announcements.enabled=true", "--set=rollOutCiliumPods=true", "--set=operator.replicas=1", "--set=operator.rollOutPods=true")
-}
-
-func ciliumChartVersion(path string) (string, error) {
-	content, err := os.ReadFile(path)
-	if err != nil {
-		return "", err
-	}
-	var release struct {
-		Spec struct {
-			Chart struct {
-				Spec struct {
-					Version string `yaml:"version"`
-				} `yaml:"spec"`
-			} `yaml:"chart"`
-		} `yaml:"spec"`
-	}
-	if err := yaml.Unmarshal(content, &release); err != nil {
-		return "", fmt.Errorf("parse Cilium HelmRelease: %w", err)
-	}
-	if release.Spec.Chart.Spec.Version == "" {
-		return "", errors.New("Cilium HelmRelease chart version is required")
-	}
-	return release.Spec.Chart.Spec.Version, nil
 }
 
 func copyDir(source, destination string, overwrite bool) error {

internal/bootstrap/bootstrap_test.go

@@ -39,17 +39,6 @@ func TestRenderCiliumConfig(t *testing.T) {
 	}
 }
 
-func TestCiliumChartVersion(t *testing.T) {
-	path := filepath.Join(t.TempDir(), "release.yaml")
-	if err := os.WriteFile(path, []byte("spec:\n  chart:\n    spec:\n      version: test-version\n"), 0644); err != nil {
-		t.Fatal(err)
-	}
-	version, err := ciliumChartVersion(path)
-	if err != nil || version != "test-version" {
-		t.Fatalf("ciliumChartVersion() = %q, %v", version, err)
-	}
-}
-
 func TestRenderDeliveryConfig(t *testing.T) {
 	dir := t.TempDir()
 	path := filepath.Join(dir, "webhook.yaml")
@@ -69,29 +58,6 @@ func TestRenderDeliveryConfig(t *testing.T) {
 	}
 }
 
-func TestWriteAppDeliverySource(t *testing.T) {
-	dir := t.TempDir()
-	if err := os.WriteFile(filepath.Join(dir, "kustomization.yaml"), []byte("resources:\n"), 0644); err != nil {
-		t.Fatal(err)
-	}
-	cfg := config.Config{
-		Git:      config.GitConfig{BaseURL: "https://git.example.test", Owner: "apps"},
-		Flux:     config.FluxConfig{Branch: "main", ManifestsRepo: "manifests"},
-		Delivery: config.DeliveryConfig{AppName: "web-ui", AppRepoURL: "https://git.example.test/apps/web-ui.git", AppRepoRef: "main", ProductionBranch: "production", ImageRepository: "registry.example.test/apps/web-ui", BuildOutputDirectory: "dist", BuildConfiguration: "production", WebhookHostname: "tekton.example.test", WebhookPath: "/"},
-	}
-	if err := writeAppDeliverySource(dir, cfg); err != nil {
-		t.Fatal(err)
-	}
-	content, err := os.ReadFile(filepath.Join(dir, "web-ui-source.yaml"))
-	if err != nil || !strings.Contains(string(content), "name: web-ui-delivery") || strings.Contains(string(content), "token") {
-		t.Fatalf("app delivery source = %q, %v", content, err)
-	}
-	kustomization, err := os.ReadFile(filepath.Join(dir, "kustomization.yaml"))
-	if err != nil || !strings.Contains(string(kustomization), "web-ui-source.yaml") {
-		t.Fatalf("Tekton Kustomization = %q, %v", kustomization, err)
-	}
-}
-
 func TestGeneratedDeliveryIsGenericAndUsesSafePreviewCleanupContract(t *testing.T) {
 	cfg := config.Config{
 		Git:      config.GitConfig{BaseURL: "https://git.example.test", Owner: "platform"},