Fix Tekton depedency order within Pulumi

TraceMachina · Aug 29, 2024 · ef183b6 · ef183b6
1 parent 0933c1a
commit ef183b6
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 15 deletions.
diff --git a/native-cli/components/tekton.go b/native-cli/components/tekton.go
@@ -64,20 +64,28 @@ func (component *TektonPipelines) Install(
 
 // The configuration for Tekton Triggers.
 type TektonTriggers struct {
-	Version string
+	Version      string
+	Dependencies []pulumi.Resource
 }
 
 // Install installs the Tekton Triggers release and interceptors on the cluster.
 func (component *TektonTriggers) Install(
 	ctx *pulumi.Context,
 	name string,
 ) ([]pulumi.Resource, error) {
-	tektonTriggers, err := yaml.NewConfigFile(ctx, name, &yaml.ConfigFileArgs{
-		File: fmt.Sprintf(
-			"https://storage.googleapis.com/tekton-releases/triggers/previous/v%s/release.yaml",
-			component.Version,
+	tektonTriggers, err := yaml.NewConfigFile(
+		ctx,
+		name,
+		&yaml.ConfigFileArgs{
+			File: fmt.Sprintf(
+				"https://storage.googleapis.com/tekton-releases/triggers/previous/v%s/release.yaml",
+				component.Version,
+			),
+		},
+		pulumi.DependsOn(
+			component.Dependencies,
 		),
-	})
+	)
 	if err != nil {
 		return nil, fmt.Errorf("%w: %w", errPulumi, err)
 	}
@@ -91,6 +99,9 @@ func (component *TektonTriggers) Install(
 				component.Version,
 			),
 		},
+		pulumi.DependsOn(
+			[]pulumi.Resource{tektonTriggers},
+		),
 	)
 	if err != nil {
 		return nil, fmt.Errorf("%w: %w", errPulumi, err)
@@ -101,20 +112,28 @@ func (component *TektonTriggers) Install(
 
 // Configuration for the Tekton Dashboard.
 type TektonDashboard struct {
-	Version string
+	Version      string
+	Dependencies []pulumi.Resource
 }
 
 // Install installs the Tekton Dashboard on the cluster.
 func (component *TektonDashboard) Install(
 	ctx *pulumi.Context,
 	name string,
 ) ([]pulumi.Resource, error) {
-	tektonDashboard, err := yaml.NewConfigFile(ctx, name, &yaml.ConfigFileArgs{
-		File: fmt.Sprintf(
-			"https://storage.googleapis.com/tekton-releases/dashboard/previous/v%s/release.yaml",
-			component.Version,
+	tektonDashboard, err := yaml.NewConfigFile(
+		ctx,
+		name,
+		&yaml.ConfigFileArgs{
+			File: fmt.Sprintf(
+				"https://storage.googleapis.com/tekton-releases/dashboard/previous/v%s/release.yaml",
+				component.Version,
+			),
+		},
+		pulumi.DependsOn(
+			component.Dependencies,
 		),
-	})
+	)
 	if err != nil {
 		return nil, fmt.Errorf("%w: %w", errPulumi, err)
 	}

diff --git a/native-cli/programs/local.go b/native-cli/programs/local.go
@@ -71,7 +71,9 @@ func ProgramForLocalCluster(ctx *pulumi.Context) error {
 	tektonPipelines, err := components.AddComponent(
 		ctx,
 		"tekton-pipelines",
-		&components.TektonPipelines{Version: "0.58.0"},
+		&components.TektonPipelines{
+			Version: "0.58.0",
+		},
 	)
 	if err != nil {
 		log.Println(err)
@@ -81,7 +83,12 @@ func ProgramForLocalCluster(ctx *pulumi.Context) error {
 	tektonTriggers, err := components.AddComponent(
 		ctx,
 		"tekton-triggers",
-		&components.TektonTriggers{Version: "0.26.1"},
+		&components.TektonTriggers{
+			Version: "0.26.1",
+			Dependencies: slices.Concat(
+				tektonPipelines,
+			),
+		},
 	)
 	if err != nil {
 		log.Println(err)
@@ -91,7 +98,12 @@ func ProgramForLocalCluster(ctx *pulumi.Context) error {
 	components.Check(components.AddComponent(
 		ctx,
 		"tekton-dashboard",
-		&components.TektonDashboard{Version: "0.45.0"},
+		&components.TektonDashboard{
+			Version: "0.45.0",
+			Dependencies: slices.Concat(
+				tektonPipelines, tektonTriggers,
+			),
+		},
 	))
 
 	components.Check(components.AddComponent(