-
Notifications
You must be signed in to change notification settings - Fork 31
Add DirectSourceFetch feature gate to bypass cache for source objects
#314
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
Merged
Merged
Changes from all commits
Commits
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 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
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
131 changes: 131 additions & 0 deletions
131
internal/controller/artifactgenerator_direct_source_fetch_test.go
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 |
|---|---|---|
| @@ -0,0 +1,131 @@ | ||
| /* | ||
| Copyright 2026 The Flux authors | ||
|
|
||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
|
|
||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
|
|
||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package controller | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
| "testing" | ||
| "time" | ||
|
|
||
| . "github.com/onsi/gomega" | ||
| metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
| "sigs.k8s.io/controller-runtime/pkg/client" | ||
| "sigs.k8s.io/controller-runtime/pkg/reconcile" | ||
|
|
||
| gotkmeta "github.com/fluxcd/pkg/apis/meta" | ||
| gotkconditions "github.com/fluxcd/pkg/runtime/conditions" | ||
| gotktestsrv "github.com/fluxcd/pkg/testserver" | ||
| sourcev1 "github.com/fluxcd/source-controller/api/v1" | ||
|
|
||
| swapi "github.com/fluxcd/source-watcher/api/v2/v1beta1" | ||
| ) | ||
|
|
||
| func TestArtifactGeneratorReconciler_DirectSourceFetch(t *testing.T) { | ||
| g := NewWithT(t) | ||
| ctx, cancel := context.WithTimeout(context.Background(), timeout) | ||
| defer cancel() | ||
|
|
||
| // Create a namespace | ||
| ns, err := testEnv.CreateNamespace(ctx, "direct-fetch-test") | ||
| g.Expect(err).ToNot(HaveOccurred()) | ||
|
|
||
| t.Run("reconciles with DirectSourceFetch enabled (uses APIReader)", func(t *testing.T) { | ||
| g := NewWithT(t) | ||
|
|
||
| // Create reconciler with DirectSourceFetch enabled | ||
| reconciler := &ArtifactGeneratorReconciler{ | ||
| ControllerName: controllerName, | ||
| Client: testClient, | ||
| APIReader: testClient, | ||
| Scheme: testEnv.Scheme(), | ||
| EventRecorder: testEnv.GetEventRecorderFor(controllerName), | ||
| Storage: testStorage, | ||
| ArtifactFetchRetries: 1, | ||
| DependencyRequeueInterval: 5 * time.Second, | ||
| NoCrossNamespaceRefs: true, | ||
| DirectSourceFetch: true, // Enable DirectSourceFetch | ||
| } | ||
|
|
||
| // Create the ArtifactGenerator object | ||
| objKey := client.ObjectKey{ | ||
| Name: "direct-fetch-enabled", | ||
| Namespace: ns.Name, | ||
| } | ||
| obj := &swapi.ArtifactGenerator{ | ||
| TypeMeta: metav1.TypeMeta{ | ||
| Kind: swapi.ArtifactGeneratorKind, | ||
| APIVersion: swapi.GroupVersion.String(), | ||
| }, | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Name: objKey.Name, | ||
| Namespace: objKey.Namespace, | ||
| }, | ||
| Spec: swapi.ArtifactGeneratorSpec{ | ||
| Sources: []swapi.SourceReference{ | ||
| { | ||
| Alias: fmt.Sprintf("%s-git", objKey.Name), | ||
| Kind: sourcev1.GitRepositoryKind, | ||
| Name: objKey.Name, | ||
| }, | ||
| }, | ||
| OutputArtifacts: []swapi.OutputArtifact{ | ||
| { | ||
| Name: fmt.Sprintf("%s-git", objKey.Name), | ||
| Copy: []swapi.CopyOperation{ | ||
| { | ||
| From: fmt.Sprintf("@%s-git/**", objKey.Name), | ||
| To: "@artifact/", | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| } | ||
| err := testClient.Create(ctx, obj) | ||
| g.Expect(err).ToNot(HaveOccurred()) | ||
|
|
||
| // Create the GitRepository source | ||
| gitFiles := []gotktestsrv.File{ | ||
| {Name: "app.yaml", Body: "apiVersion: apps/v1\nkind: Deployment\nmetadata:\n name: direct-fetch-test"}, | ||
| } | ||
| err = applyGitRepository(objKey, "main@sha256:directfetch123", gitFiles) | ||
| g.Expect(err).ToNot(HaveOccurred()) | ||
|
|
||
| // Initialize the ArtifactGenerator with the finalizer | ||
| r, err := reconciler.Reconcile(ctx, reconcile.Request{ | ||
| NamespacedName: objKey, | ||
| }) | ||
| g.Expect(err).ToNot(HaveOccurred()) | ||
| g.Expect(r.RequeueAfter).To(BeEquivalentTo(time.Millisecond)) | ||
|
|
||
| // Reconcile to process the sources and build artifacts | ||
| r, err = reconciler.Reconcile(ctx, reconcile.Request{ | ||
| NamespacedName: objKey, | ||
| }) | ||
| g.Expect(err).ToNot(HaveOccurred()) | ||
| g.Expect(r.RequeueAfter).To(Equal(obj.GetRequeueAfter())) | ||
|
|
||
| // Verify the ArtifactGenerator status | ||
| err = testClient.Get(ctx, objKey, obj) | ||
| g.Expect(err).ToNot(HaveOccurred()) | ||
| g.Expect(gotkconditions.IsReady(obj)).To(BeTrue()) | ||
| g.Expect(gotkconditions.GetReason(obj, gotkmeta.ReadyCondition)).To(Equal(gotkmeta.SucceededReason)) | ||
|
|
||
| t.Log(objToYaml(obj)) | ||
| }) | ||
| } |
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 |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| /* | ||
| Copyright 2026 The Flux authors | ||
|
|
||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
|
|
||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
|
|
||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| // Package features sets the feature gates that source-watcher supports, | ||
| // and their default states. | ||
| package features | ||
|
|
||
| import ( | ||
| "github.com/fluxcd/pkg/runtime/controller" | ||
| feathelper "github.com/fluxcd/pkg/runtime/features" | ||
| ) | ||
|
|
||
| var features = map[string]bool{ | ||
| // DirectSourceFetch | ||
| // opt-in from v2.1 | ||
| controller.FeatureGateDirectSourceFetch: false, | ||
| } | ||
|
|
||
| // FeatureGates contains a list of all supported feature gates and | ||
| // their default values. | ||
| func FeatureGates() map[string]bool { | ||
| return features | ||
| } | ||
|
|
||
| // Enabled verifies whether the feature is enabled or not. | ||
| func Enabled(feature string) (bool, error) { | ||
| return feathelper.Enabled(feature) | ||
| } | ||
|
|
||
| // Disable disables the specified feature. If the feature is not | ||
| // present, it's a no-op. | ||
| func Disable(feature string) { | ||
| if _, ok := features[feature]; ok { | ||
| features[feature] = false | ||
| } | ||
| } |
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.
Good catch!