Skip to content

Allow multiple management planes#1124

Merged
aphralG merged 16 commits intomainfrom
add-auxiliary-command-server-to-agent-config
Jul 7, 2025
Merged

Allow multiple management planes#1124
aphralG merged 16 commits intomainfrom
add-auxiliary-command-server-to-agent-config

Conversation

@aphralG
Copy link
Contributor

@aphralG aphralG commented Jun 12, 2025

Proposed changes

Add Auxiliary Command Server block to agent config.
Modified Command plugin to take a command server type so two can be created one for each Management plane
Added CommandServerType to context for management plane sepcific messages "command" or "auxiliary"

auxiliary_command:
    server: 
        host: "second.management.plane"
        port: 9999
    auth: 
        token: "1234"
        tokenpath: "path/to/my_token"
    tls: 
        cert: "some.cert"
        key: "some.key"
        ca: "some.ca"
        skip_verify: false
        server_name: "server-name"

Checklist

Before creating a PR, run through this checklist and mark each as complete.

  • I have read the CONTRIBUTING document
  • I have run make install-tools and have attached any dependency changes to this pull request
  • If applicable, I have added tests that prove my fix is effective or that my feature works
  • If applicable, I have checked that any relevant tests pass after adding my changes
  • If applicable, I have updated any relevant documentation (README.md)
  • If applicable, I have tested my cross-platform changes on Ubuntu 22, Redhat 8, SUSE 15 and FreeBSD 13

@aphralG aphralG self-assigned this Jun 12, 2025
@aphralG aphralG requested a review from a team as a code owner June 12, 2025 15:43
@github-actions github-actions bot added the chore Pull requests for routine tasks label Jun 12, 2025
}
}

func (s ServerType) String() string {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you move this to the top near the ServerType declaration?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've moved all the SeverType code into the model package in server.go

return plugins
}

func addAuxiliaryCommandAndFilePlugins(ctx context.Context, plugins []bus.Plugin,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be addAuxiliaryCommandPlugin?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, the read only file plugin is added to this function in the next PR

@dhurley dhurley added the v3.x Issues and Pull Requests related to the major version v3 label Jun 19, 2025
@aphralG aphralG requested review from dhurley and sean-breen June 23, 2025 10:21
Base automatically changed from add-auxiliary-command-server-proto to main July 7, 2025 12:35
@aphralG aphralG merged commit ab05296 into main Jul 7, 2025
33 of 34 checks passed
@aphralG aphralG deleted the add-auxiliary-command-server-to-agent-config branch July 7, 2025 12:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

chore Pull requests for routine tasks v3.x Issues and Pull Requests related to the major version v3

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants