-
Notifications
You must be signed in to change notification settings - Fork 75
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
Add integration test framework. #10
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
3f850ed
Move logic from cmd/manager to a package for easier testing.
enisoc a3bd960
Add integration test framework.
enisoc 6e8ea7d
Add integration-test workflow.
enisoc 972c327
integration/framework: Wait for CRDs to be ready.
enisoc 2133534
Switch to controller-runtime client.
enisoc File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains 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 |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| name: integration-test | ||
| on: | ||
| push: | ||
| branches: | ||
| - master | ||
| pull_request: | ||
| branches: | ||
| - master | ||
| jobs: | ||
| build: | ||
| name: Integration Test | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
|
|
||
| - name: Set up Go | ||
| uses: actions/setup-go@v1 | ||
| with: | ||
| go-version: 1.12 | ||
| id: go | ||
|
|
||
| - name: Check out code into the Go module directory | ||
| uses: actions/checkout@v1 | ||
|
|
||
| - name: Go module cache | ||
| id: go-mod-cache | ||
| uses: actions/cache@v1 | ||
| with: | ||
| path: ~/go/pkg/mod | ||
| key: go-mod-cache | ||
|
|
||
| - name: Integration Test | ||
| run: make integration-test |
This file contains 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 |
|---|---|---|
|
|
@@ -32,4 +32,4 @@ jobs: | |
| run: go install -v ./... | ||
|
|
||
| - name: Unit Test | ||
| run: go test ./... | ||
| run: make unit-test | ||
This file contains 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 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 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 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 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 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 |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| package controllermanager | ||
|
|
||
| import ( | ||
| "fmt" | ||
|
|
||
| // Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.) | ||
| _ "k8s.io/client-go/plugin/pkg/client/auth" | ||
| "k8s.io/client-go/rest" | ||
|
|
||
| "sigs.k8s.io/controller-runtime/pkg/manager" | ||
| logf "sigs.k8s.io/controller-runtime/pkg/runtime/log" | ||
|
|
||
| "planetscale.dev/vitess-operator/pkg/controller" | ||
| vbssubcontroller "planetscale.dev/vitess-operator/pkg/controller/vitessbackupstorage/subcontroller" | ||
| ) | ||
|
|
||
| var log = logf.Log.WithName("controller-manager") | ||
|
|
||
| func New(forkPath string, cfg *rest.Config, opts manager.Options) (manager.Manager, error) { | ||
| // Set up scheme for all resources we depend on. | ||
| var err error | ||
| opts.Scheme, err = NewScheme() | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| // Create a new manager to provide shared dependencies and start components | ||
| mgr, err := manager.New(cfg, opts) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| log.Info("Registering Components.") | ||
|
|
||
| // We use the fork path primarily to decide which controllers to run in this | ||
| // manager process. Not all controllers run in the root process, for example. | ||
| switch forkPath { | ||
| case "": | ||
| // Run all root controllers, defined as anything that registers itself | ||
| // in the top-level 'pkg/controller' at package init time. | ||
| if err := controller.AddToManager(mgr); err != nil { | ||
| return nil, err | ||
| } | ||
| case vbssubcontroller.ForkPath: | ||
| // Run only the vitessbackupstorage subcontroller. | ||
| if err := vbssubcontroller.Add(mgr); err != nil { | ||
| return nil, err | ||
| } | ||
| default: | ||
| return nil, fmt.Errorf("undefined fork path: %v", forkPath) | ||
| } | ||
|
|
||
| return mgr, 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.
Can we make this a dedicated type? I'm not a huge fan of comparing against an empty string. It doesn't communicate much to a reader.
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.
This isn't new code; I'm just moving things around to make them easier to test. If you have an idea to make this better, can you send a separate PR?