-
Notifications
You must be signed in to change notification settings - Fork 1.6k
📖 Refactor sampleexternalplugin to be a Valid Reference Implementation #5116
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: master
Are you sure you want to change the base?
📖 Refactor sampleexternalplugin to be a Valid Reference Implementation #5116
Conversation
|
Hi @nerdeveloper. Thanks for your PR. I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with Once the patch is verified, the new status will be reflected by the I understand the commands that are listed here. Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. |
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: nerdeveloper The full list of commands accepted by this bot can be found here.
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
63b82e0 to
edc4046
Compare
d42c0be to
5395def
Compare
|
Hi @nerdeveloper thanks for the PR! This is a large one and will take some time to review. While you wait for the review, could you please adjust the title so it follows the guidelines for PR titles? Also, could you squash the four commits into one just so we keep the rule of a single commit per PR? Thanks! |
docs/book/src/simple-external-plugin-tutorial/testdata/sampleexternalplugin/v1/cmd/flags.go
Show resolved
Hide resolved
camilamacedo86
left a comment
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.
Thank you for your contribution 🥇
I tried give the first round of reviews, let me know wdyt.
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.
Pull Request Overview
This PR refactors the sampleexternalplugin from mock scaffolding into a realistic Prometheus monitoring generator that demonstrates best practices for external plugin development. The plugin now uses the edit subcommand to add optional monitoring features by reading PROJECT config and generating actual ServiceMonitor YAML manifests.
Key Changes:
- Removed mock
init,create api, andcreate webhooksubcommands in favor of realisticeditsubcommand - Implemented PROJECT config reading using
config.ConfigAPIs similar to internal plugins - Added local source replace directive for testing against local Kubebuilder source
Reviewed Changes
Copilot reviewed 20 out of 21 changed files in this pull request and generated 3 comments.
Show a summary per file
| File | Description |
|---|---|
v1/scaffolds/init.go |
Updated to scaffold Prometheus monitoring resources during initialization |
v1/scaffolds/edit.go |
New file implementing edit subcommand with PROJECT config loading |
v1/scaffolds/api.go |
Removed - mock create api subcommand deleted |
v1/scaffolds/webhook.go |
Removed - mock create webhook subcommand deleted |
v1/internal/test/plugins/prometheus/prometheus.go |
New Prometheus instance manifest template |
v1/internal/test/plugins/prometheus/kustomization.go |
New kustomization templates for Prometheus resources |
v1/cmd/cmd.go |
Updated command routing to support init and edit only |
v1/cmd/metadata.go |
Updated to handle init and edit metadata requests |
v1/cmd/flags.go |
Refactored flag handling for init and edit subcommands |
v1/go.mod |
Added afero dependency and local source replace directive |
v1/test/test.sh |
Updated test to verify Prometheus asset scaffolding |
external-plugins.md |
Updated documentation with realistic edit command examples |
v1/testdata/testplugin/* |
Removed mock test files |
v1/scaffolds/internal/templates/* |
Removed mock template files |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
| kubebuilder edit --plugins sampleexternalplugin/v1 | ||
|
|
||
| # Ensure Prometheus assets were scaffolded | ||
| test -f config/prometheus/prometheus.yaml |
Copilot
AI
Oct 27, 2025
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.
The test checks for prometheus.yaml but the code scaffolds the file at path config/prometheus/prometheus.yaml according to prometheus.go line 47. The filename should be prometheus.yaml, not monitor.yaml as mentioned in the PR description.
| pluginResponse.Error = true | ||
| pluginResponse.ErrorMsgs = []string{ | ||
| "unrecognized command: " + pr.Command, | ||
| "unrecognized subcommand flag in args: " + string(rune(len(pr.Args))), |
Copilot
AI
Oct 27, 2025
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.
Converting len(pr.Args) to a rune and then to a string produces a Unicode character, not a numeric string. This will result in confusing error messages. Use strconv.Itoa(len(pr.Args)) or fmt.Sprintf(\"%d\", len(pr.Args)) instead.
.../book/src/simple-external-plugin-tutorial/testdata/sampleexternalplugin/v1/scaffolds/edit.go
Outdated
Show resolved
Hide resolved
...-tutorial/testdata/sampleexternalplugin/v1/internal/test/plugins/prometheus/kustomization.go
Show resolved
Hide resolved
|
@camilamacedo86 should I also implement the copilot suggestions? |
You need here:
I hope that can helps out. |
9d001d4 to
8c61760
Compare
Transform the sample external plugin from mock scaffolding to a realistic Prometheus monitoring generator that demonstrates best practices for external plugin development. Key changes: - Implement init and edit subcommands that scaffold Prometheus instance manifests - Add PROJECT config reading to align with internal plugin patterns - Replace mock ServiceMonitor with complete Prometheus CR including RBAC - Add --namespace flag support to demonstrate argument passing - Update documentation with realistic examples showing argument usage - Fix error handling to properly validate PROJECT file existence - Add comprehensive kustomization manifests for Prometheus resources The plugin now serves as a proper reference implementation for: - Reading PROJECT configuration in external plugins - Scaffolding production-ready Kubernetes manifests - Supporting command-line arguments (--namespace flag) - Testing plugins against local Kubebuilder source - Adding optional monitoring features via edit subcommand Addresses maintainer feedback on PR kubernetes-sigs#5116 including proper error handling, argument passing examples, and realistic manifest generation. Fixes kubernetes-sigs#4824
8c61760 to
8efb648
Compare
Transform the sample external plugin from mock scaffolding to a realistic Prometheus monitoring generator that demonstrates best practices for external plugin development. Key changes: - Implement init and edit subcommands that scaffold Prometheus instance manifests - Add PROJECT config reading to align with internal plugin patterns - Replace mock ServiceMonitor with complete Prometheus CR including RBAC - Add --namespace flag support to demonstrate argument passing - Update documentation with realistic examples showing argument usage - Fix error handling to properly validate PROJECT file existence - Centralize kustomization in config/default/kustomization.yaml (no separate prometheus kustomization) - Provide clear instructions for users to add Prometheus resources manually The plugin now serves as a proper reference implementation for: - Reading PROJECT configuration in external plugins - Scaffolding production-ready Kubernetes manifests - Supporting command-line arguments (--namespace flag) - Testing plugins against local Kubebuilder source - Adding optional monitoring features via edit subcommand - Following Kubebuilder's centralized kustomization pattern Addresses maintainer feedback on PR kubernetes-sigs#5116 including proper error handling, argument passing examples, realistic manifest generation, and centralized kustomization. Fixes kubernetes-sigs#4824
Transform the sample external plugin from mock scaffolding to a realistic Prometheus monitoring generator that demonstrates best practices for external plugin development. Key changes: - Implement init and edit subcommands that scaffold Prometheus instance manifests - Add PROJECT config reading to align with internal plugin patterns - Replace mock ServiceMonitor with complete Prometheus CR including RBAC - Add --namespace flag support to demonstrate argument passing - Update documentation with realistic examples showing argument usage - Fix error handling to properly validate PROJECT file existence - Centralize kustomization in config/default/kustomization.yaml (no separate prometheus kustomization) - Provide clear instructions for users to add Prometheus resources manually The plugin now serves as a proper reference implementation for: - Reading PROJECT configuration in external plugins - Scaffolding production-ready Kubernetes manifests - Supporting command-line arguments (--namespace flag) - Testing plugins against local Kubebuilder source - Adding optional monitoring features via edit subcommand - Following Kubebuilder's centralized kustomization pattern Addresses maintainer feedback on PR kubernetes-sigs#5116 including proper error handling, argument passing examples, realistic manifest generation, and centralized kustomization. Fixes kubernetes-sigs#4824
8efb648 to
5b04b5e
Compare
Transform the sample external plugin from mock scaffolding to a realistic Prometheus monitoring generator that demonstrates best practices for external plugin development. Key changes: - Implement init and edit subcommands that scaffold Prometheus instance manifests - Add PROJECT config reading to align with internal plugin patterns - Replace mock ServiceMonitor with complete Prometheus CR including RBAC - Add --namespace flag support to demonstrate argument passing - Update documentation with realistic examples showing argument usage - Fix error handling to properly validate PROJECT file existence - Centralize kustomization in config/default/kustomization.yaml (no separate prometheus kustomization) - Provide clear instructions for users to add Prometheus resources manually The plugin now serves as a proper reference implementation for: - Reading PROJECT configuration in external plugins - Scaffolding production-ready Kubernetes manifests - Supporting command-line arguments (--namespace flag) - Testing plugins against local Kubebuilder source - Adding optional monitoring features via edit subcommand - Following Kubebuilder's centralized kustomization pattern Addresses maintainer feedback on PR 5116 including proper error handling, argument passing examples, realistic manifest generation, and centralized kustomization.
5b04b5e to
036056e
Compare
| subjects: | ||
| - kind: ServiceAccount | ||
| name: prometheus | ||
| namespace: %s |
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.
We would need scaffold each of them in the respective place
For example, rbac in the config/rbac dir.
Also, have we not those already?
| namespace: %s | ||
| labels: | ||
| app.kubernetes.io/name: %s | ||
| app.kubernetes.io/managed-by: kustomize |
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.
We have a Service Account already, would we need another one?
| "description": "The `init` subcommand initializes a project via Kubebuilder. It scaffolds a single file: `initFile`.", | ||
| "examples": "kubebuilder init --plugins sampleexternalplugin/v1 --domain my.domain" | ||
| "description": "The `edit` subcommand adds Prometheus instance configuration for monitoring your operator.", | ||
| "examples": "kubebuilder edit --plugins sampleexternalplugin/v1 --namespace monitoring" |
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.
What does it means namespace monitoring?
Why this flag would be required?
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.
Pull Request Overview
Copilot reviewed 20 out of 21 changed files in this pull request and generated 7 comments.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
| } | ||
| return pluginResponse | ||
| // For init command, we'll use default values since PROJECT file may not exist yet | ||
| projectConfig := &ProjectConfig{ |
Copilot
AI
Nov 10, 2025
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.
The ProjectConfig type is used here but is only defined in edit.go. This will cause a compilation error. Either move the ProjectConfig type definition to a shared location or duplicate it in this file.
| "universe": { | ||
| "initFile": "A file created with the `init` subcommand." | ||
| "config/prometheus/prometheus.yaml": "# Prometheus instance manifest with RBAC...", | ||
| "config/prometheus/kustomization.yaml": "resources:\n - prometheus.yaml\n", |
Copilot
AI
Nov 10, 2025
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.
The documentation example shows config/prometheus/kustomization.yaml being created in the universe (line 100), but the actual implementation doesn't scaffold this file. This inconsistency between documentation and implementation could mislead users. Either update the documentation to match the actual files created or modify the plugin to scaffold this file.
| "config/prometheus/kustomization.yaml": "resources:\n - prometheus.yaml\n", |
| // Parse namespace flag from args | ||
| namespace := "default" | ||
| for i, arg := range pr.Args { | ||
| if arg == "--namespace" && i+1 < len(pr.Args) { | ||
| namespace = pr.Args[i+1] | ||
| break | ||
| } | ||
| } |
Copilot
AI
Nov 10, 2025
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.
Manual flag parsing is error-prone and doesn't handle edge cases properly. This approach doesn't handle scenarios like --namespace=monitoring (equals syntax), missing value after --namespace, or unknown flags. Consider using pflag.NewFlagSet() for proper flag parsing, similar to how it was done in the deleted code (api.go, webhook.go).
| // WithProjectName sets the project name for the Prometheus instance | ||
| func WithProjectName(projectName string) PrometheusOptions { | ||
| return func(p *PrometheusInstance) { | ||
| // Project name can be used for labels or naming | ||
| // For now, we'll use it in a future iteration if needed | ||
| } | ||
| } | ||
|
|
Copilot
AI
Nov 10, 2025
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.
The WithProjectName option function is defined but doesn't actually do anything with the projectName parameter. This creates a misleading API where users might expect it to have an effect. Either implement the functionality or remove this option entirely until it's needed.
| // WithProjectName sets the project name for the Prometheus instance | |
| func WithProjectName(projectName string) PrometheusOptions { | |
| return func(p *PrometheusInstance) { | |
| // Project name can be used for labels or naming | |
| // For now, we'll use it in a future iteration if needed | |
| } | |
| } |
| } else { | ||
| pluginResponse.Error = true | ||
| pluginResponse.ErrorMsgs = []string{ |
Copilot
AI
Nov 10, 2025
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.
The error message "unrecognized flag" is vague and doesn't help users understand what went wrong or what flags are expected. Consider providing more helpful information such as "no subcommand flag provided; expected --init or --edit".
|
|
||
| # Ensure Prometheus assets were scaffolded | ||
| test -f config/prometheus/prometheus.yaml | ||
| test -f config/prometheus/kustomization.yaml |
Copilot
AI
Nov 10, 2025
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.
The test script expects config/prometheus/kustomization.yaml to be created, but the plugin only scaffolds config/prometheus/prometheus.yaml and config/default/kustomization_prometheus_patch.yaml. Either add code to scaffold the missing kustomization.yaml file or remove this test assertion.
| test -f config/prometheus/kustomization.yaml |
| } | ||
|
|
||
| // Parse namespace flag from args | ||
| namespace := "default" |
Copilot
AI
Nov 10, 2025
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.
The default namespace is set to "default" when the flag is not provided, but in the NewPrometheusInstance function (prometheus.go line 58), the default namespace is "system". This inconsistency could lead to confusion. Consider aligning these defaults or making the logic more explicit.
| namespace := "default" | |
| namespace := "system" |
Summary
This PR refactors the
sampleexternalpluginfrom outdated mock scaffolding into a realistic, working reference implementation that demonstrates best practices for external plugin development.Problem
The current
sampleexternalplugin(issue #4824) had several issues:initFile.txt,apiFile.txt)Solution
Transformed the plugin into a Prometheus Monitoring Generator that:
editsubcommand to add optional Prometheus monitoring featuresChanges
Plugin Functionality
init,create api,create webhooksubcommandseditsubcommand that scaffolds Prometheus monitoringconfig/prometheus/monitor.yaml- ServiceMonitor resourceconfig/prometheus/kustomization.yaml- Kustomize configconfig/default/kustomization_prometheus_patch.yaml- Integration instructionsCode Quality
config.ConfigAPIs like internal pluginsreplace sigs.k8s.io/kubebuilder/v4 => ../../../../../../../Documentation
external-plugins.mdwith realisticeditcommand examplesUsage Example
# Add Prometheus monitoring to your operator project kubebuilder edit --plugins sampleexternalplugin/v1This will scaffold:
Testing
Impact
This PR makes the sample plugin a proper reference that:
Fixes #4824