HYPERFLEET-569 - feat: Implement maestro DSL loader #41
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -76,7 +76,31 @@ spec: | |
| # Resources with valid K8s manifests | ||
| resources: | ||
| - name: "maestro" | ||
|
Contributor
There was a problem hiding this comment. This kind of configuration lose the manifestwork ref. And for there should be multiple manifests in the manifestwork.
Contributor
There was a problem hiding this comment. And we should put manifests in same manifestwork together. Manifests number cannot be changed once the manifestwork created. |
||
| transport: | ||
| client: "maestro" | ||
| maestro: | ||
| targetCluster: cluster1 | ||
|
Contributor
There was a problem hiding this comment. manifestwork.ref here should be something required and have a validation |
||
| manifest: | ||
| apiVersion: v1 | ||
| kind: Namespace | ||
| metadata: | ||
| name: "maestro-{{ .clusterId }}" | ||
| labels: | ||
| hyperfleet.io/cluster-id: "{{ .clusterId }}" | ||
| hyperfleet.io/cluster-name: "{{ .clusterName }}" | ||
| annotations: | ||
| hyperfleet.io/generation: "{{ .generationSpec }}" | ||
| discovery: | ||
|
Contributor
There was a problem hiding this comment. Discovery is manifest level not manifestwork.
Contributor
There was a problem hiding this comment. the discovery can help us locate the manifest attributes with jsonPath |
||
| namespace: "*" # Cluster-scoped resource (Namespace) | ||
| bySelectors: | ||
| labelSelector: | ||
| hyperfleet.io/cluster-id: "{{ .clusterId }}" | ||
| hyperfleet.io/cluster-name: "{{ .clusterName }}" | ||
|
|
||
| - name: "clusterNamespace" | ||
| transport: | ||
| client: "kubernetes" | ||
| manifest: | ||
| apiVersion: v1 | ||
| kind: Namespace | ||
|
|
@@ -98,6 +122,8 @@ spec: | |
| # in the namespace created above | ||
| # it will require a service account to be created in that namespace as well as a role and rolebinding | ||
| - name: "jobServiceAccount" | ||
| transport: | ||
| client: "kubernetes" | ||
| manifest: | ||
| ref: "/etc/adapter/job-serviceaccount.yaml" | ||
| discovery: | ||
|
|
@@ -107,6 +133,8 @@ spec: | |
| hyperfleet.io/cluster-id: "{{ .clusterId }}" | ||
|
|
||
| - name: "job_role" | ||
| transport: | ||
| client: "kubernetes" | ||
| manifest: | ||
| ref: "/etc/adapter/job-role.yaml" | ||
| discovery: | ||
|
|
@@ -118,6 +146,8 @@ spec: | |
| hyperfleet.io/resource-type: "role" | ||
|
|
||
| - name: "job_rolebinding" | ||
| transport: | ||
| client: "kubernetes" | ||
| manifest: | ||
| ref: "/etc/adapter/job-rolebinding.yaml" | ||
| discovery: | ||
|
|
@@ -129,6 +159,8 @@ spec: | |
| hyperfleet.io/resource-type: "rolebinding" | ||
|
|
||
| - name: "jobNamespace" | ||
| transport: | ||
| client: "kubernetes" | ||
| manifest: | ||
| ref: "/etc/adapter/job.yaml" | ||
| discovery: | ||
|
|
@@ -143,6 +175,8 @@ spec: | |
| # and using the same service account as the adapter | ||
|
|
||
| - name: "deploymentNamespace" | ||
| transport: | ||
| client: "kubernetes" | ||
| manifest: | ||
| ref: "/etc/adapter/deployment.yaml" | ||
| discovery: | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,10 +9,10 @@ import ( | |
| "syscall" | ||
| "time" | ||
|
|
||
| "github.com/openshift-hyperfleet/hyperfleet-adapter/internal/client_factory" | ||
| "github.com/openshift-hyperfleet/hyperfleet-adapter/internal/config_loader" | ||
| "github.com/openshift-hyperfleet/hyperfleet-adapter/internal/executor" | ||
| "github.com/openshift-hyperfleet/hyperfleet-adapter/internal/maestro_client" | ||
| "github.com/openshift-hyperfleet/hyperfleet-adapter/pkg/health" | ||
| "github.com/openshift-hyperfleet/hyperfleet-adapter/pkg/logger" | ||
| "github.com/openshift-hyperfleet/hyperfleet-adapter/pkg/otel" | ||
|
|
@@ -50,7 +50,6 @@ const ( | |
| ) | ||
|
|
||
| func main() { | ||
| // Root command | ||
| rootCmd := &cobra.Command{ | ||
| Use: "adapter", | ||
|
|
@@ -269,7 +268,7 @@ func runServe() error { | |
|
|
||
| // Create HyperFleet API client from config | ||
| log.Info(ctx, "Creating HyperFleet API client...") | ||
| apiClient, err := client_factory.CreateAPIClient(config.Spec.Clients.HyperfleetAPI, log) | ||
| if err != nil { | ||
| errCtx := logger.WithErrorField(ctx, err) | ||
| log.Errorf(errCtx, "Failed to create HyperFleet API client") | ||
|
|
@@ -278,21 +277,39 @@ func runServe() error { | |
|
|
||
| // Create Kubernetes client | ||
| log.Info(ctx, "Creating Kubernetes client...") | ||
| k8sClient, err := client_factory.CreateK8sClient(ctx, config.Spec.Clients.Kubernetes, log) | ||
| if err != nil { | ||
| errCtx := logger.WithErrorField(ctx, err) | ||
| log.Errorf(errCtx, "Failed to create Kubernetes client") | ||
| return fmt.Errorf("failed to create Kubernetes client: %w", err) | ||
| } | ||
|
|
||
| // Create Maestro client if configured | ||
| var maestroClient maestro_client.ManifestWorkClient | ||
| if config.Spec.Clients.Maestro != nil { | ||
| log.Info(ctx, "Creating Maestro client...") | ||
| maestroClient, err = client_factory.CreateMaestroClient(ctx, config.Spec.Clients.Maestro, log) | ||
| if err != nil { | ||
| errCtx := logger.WithErrorField(ctx, err) | ||
| log.Errorf(errCtx, "Failed to create Maestro client") | ||
| return fmt.Errorf("failed to create Maestro client: %w", err) | ||
| } | ||
| log.Info(ctx, "Maestro client created successfully") | ||
| } | ||
|
|
||
| // Create the executor using the builder pattern | ||
| log.Info(ctx, "Creating event executor...") | ||
| execBuilder := executor.NewBuilder(). | ||
| WithConfig(config). | ||
| WithAPIClient(apiClient). | ||
| WithK8sClient(k8sClient). | ||
| WithLogger(log) | ||
|
|
||
| if maestroClient != nil { | ||
| execBuilder = execBuilder.WithMaestroClient(maestroClient) | ||
| } | ||
|
|
||
| exec, err := execBuilder.Build() | ||
| if err != nil { | ||
|
Comment on lines
+287
to
313
There was a problem hiding this comment. 🧩 Analysis chain🏁 Script executed: #!/bin/bash
# Search for Maestro client validation logic
rg -n "WithMaestroClient|MaestroClient|TransportClientMaestro" internal/executor internal/config_loader -C 3Repository: openshift-hyperfleet/hyperfleet-adapter Length of output: 8184 🏁 Script executed: #!/bin/bash
# Check executor Build() method for validation
rg -n "func.*Build\(\)" internal/executor/executor.go -A 20Repository: openshift-hyperfleet/hyperfleet-adapter Length of output: 181 🏁 Script executed: #!/bin/bash
# Check applyResourceMaestro implementation
rg -n "func.*applyResourceMaestro" internal/executor -A 15Repository: openshift-hyperfleet/hyperfleet-adapter Length of output: 1449 🏁 Script executed: #!/bin/bash
# Check NewExecutor function for validation logic
rg -n "func NewExecutor" internal/executor/executor.go -A 30Repository: openshift-hyperfleet/hyperfleet-adapter Length of output: 999 🏁 Script executed: #!/bin/bash
# Get the full validateExecutorConfig function
rg -n "func validateExecutorConfig" internal/executor/executor.go -A 50Repository: openshift-hyperfleet/hyperfleet-adapter Length of output: 2081 🏁 Script executed: #!/bin/bash
# Check if there's any config-level validation linking transport requirements to client initialization
rg -n "TransportClientMaestro" internal/config_loader/validator.go -B 5 -A 10Repository: openshift-hyperfleet/hyperfleet-adapter Length of output: 759 Add build-time validation to fail fast when resources require Maestro transport but no Maestro client is configured. The executor currently has a runtime guard in 🤖 Prompt for AI Agents |
||
| errCtx := logger.WithErrorField(ctx, err) | ||
| log.Errorf(errCtx, "Failed to create executor") | ||
|
|
@@ -437,60 +454,3 @@ func runServe() error { | |
|
|
||
| return nil | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Avoid enabling full config debug logging in the example.
debugConfig: truelogs the full merged config and can leak secrets when users copy this example into real deployments. Consider defaulting it to false and leaving a comment for troubleshooting.🔒 Suggested change
📝 Committable suggestion
🤖 Prompt for AI Agents