Migrate controller tests to envtest for future SSA compatibility #45
Conversation
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
mfleader
changed the title
mfleader
force-pushed
the
controller-envtest
branch
2 times, most recently
from
9af4828 to
e2edf84
Compare
Signed-off-by: Matthew F Leader <mleader@redhat.com> add comment on adding scheme and rename client Signed-off-by: Matthew F Leader <mleader@redhat.com> shorten comment Signed-off-by: Matthew F Leader <mleader@redhat.com> comment Signed-off-by: Matthew F Leader <mleader@redhat.com> fix comment Signed-off-by: Matthew F Leader <mleader@redhat.com>
mfleader
force-pushed
the
controller-envtest
branch
from
ca2e8ec to
5dda57f
Compare
mfleader
changed the title
|
This pull request has merge conflicts that must be resolved before it can be merged. @mfleader please rebase it. https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork |
Signed-off-by: Matthew F Leader <mleader@redhat.com>
Signed-off-by: Matthew F Leader <mleader@redhat.com>
Signed-off-by: Matthew F Leader <mleader@redhat.com>
|
LGTM I wonder though if we are now duplicating tests with https://github.com/llamastack/llama-stack-k8s-operator/tree/main/tests/e2e that run against a cluster |
That's definitely a good spot for tidying. It would be good to minimize the quantity of tests that require an instantiated cluster. I think it's worth creating an issue. |
Signed-off-by: Matthew F Leader <mleader@redhat.com>
VaishnaviHire
pushed a commit
to VaishnaviHire/llama-stack-k8s-operator
that referenced
this pull request
Jun 18, 2025
…amastack#45) Switched the controller tests over to use [envtest](https://pkg.go.dev/sigs.k8s.io/controller-runtime/pkg/envtest) to create a controller runtime client instead of using the [fake client](https://pkg.go.dev/sigs.k8s.io/controller-runtime/pkg/client/fake). ### Why? The fake client doesn't support Server-Side Apply (SSA), which we'll need for the Kustomize overlay integration coming up. `envtest` gives us a real (mini) Kubernetes API. ### What changed: * The test now runs against a Kubernetes API thanks to `envtest`. This means we had to: * Get `envtest` up and running. * Swap out the controller runtime client test double for a real client. * Made sure the tests play nice with `KUBEBUILDER_ASSETS` so `envtest` can find the k8s binaries. * Sprinkled in some comments to explain the `envtest`-specific bits. * **Important:** The actual tests for what the Deployment and PVC do haven't changed. ### Heads up for next steps (separate PRs): * Updating `reconcilePVC` to use Kustomize with those dynamic overlays. * Switching PVC management to proper SSA (`client.Patch(..., client.Apply, ...)`), which these new `envtest` tests will be able to handle. Approved-by: leseb
VaishnaviHire
pushed a commit
to VaishnaviHire/llama-stack-k8s-operator
that referenced
this pull request
Sep 4, 2025
…f06ae0 (llamastack#45) Signed-off-by: konflux-internal-p02 <170854209+konflux-internal-p02[bot]@users.noreply.github.com> Co-authored-by: konflux-internal-p02[bot] <170854209+konflux-internal-p02[bot]@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Switched the controller tests over to use envtest to create a controller runtime client instead of using the fake client.
Why?
The fake client doesn't support Server-Side Apply (SSA), which we'll need for the Kustomize overlay integration coming up.
envtestgives us a real (mini) Kubernetes API.What changed:
envtest. This means we had to:envtestup and running.KUBEBUILDER_ASSETSsoenvtestcan find the k8s binaries.envtest-specific bits.Heads up for next steps (separate PRs):
reconcilePVCto use Kustomize with those dynamic overlays.client.Patch(..., client.Apply, ...)), which these newenvtesttests will be able to handle.