internal: Wire up new snapshots to DAG rebuilds #2850
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
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,46 @@ | ||
| // Copyright Project Contour 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 contour | ||
|
|
||
| import ( | ||
| "github.com/envoyproxy/go-control-plane/pkg/cache/v2" | ||
| "github.com/projectcontour/contour/internal/dag" | ||
| "github.com/sirupsen/logrus" | ||
| ) | ||
|
|
||
| // SnapshotHandler implements the xDS snapshot cache | ||
| type SnapshotHandler struct { | ||
| // resources holds the cache of xDS contents. | ||
| resources []ResourceCache | ||
|
|
||
| // snapshotCache is a snapshot-based cache that maintains a single versioned | ||
| // snapshot of responses for xDS resources that Contour manages | ||
| snapshotCache cache.SnapshotCache | ||
|
|
||
| logrus.FieldLogger | ||
| } | ||
|
|
||
| // NewSnapshotHandler returns an instance of SnapShotHandler | ||
| func NewSnapshotHandler(c cache.SnapshotCache, resources []ResourceCache, logger logrus.FieldLogger) *SnapshotHandler { | ||
| return &SnapshotHandler{ | ||
| snapshotCache: c, | ||
| resources: resources, | ||
| FieldLogger: logger, | ||
| } | ||
|
There was a problem hiding this comment. Nit: What I had in mind was something along the lines of the pseudocode below. We can treat the resources generically, and control how we forward the DAG changes. type SnapshotHandler struct {
snapshot types.Snapshot
resources []ResourceCache
}
func NewSnapshotHandler(c cache.SnapshotCache, resources []ResourceCache, logger logrus.FieldLogger) *SnapshotHandler {
}
func (s *SnapshotHandler) OnChange(root *dag.DAG) {
// Forward the DAG change to each resource cache.
for _, r := range s.resources {
r.OnChange(root)
}
for _, r := range s.resources {
contents := r.Contents()
responseType := responseTypeOf(r.TypeURL())
version := nextVersionForType()
s.snapshot.Resources[responseType] = cache.NewResources(version, responseSlice(contents)
}
} |
||
| } | ||
|
|
||
| // OnChange is called when the DAG is rebuilt | ||
| // and a new snapshot is needed. | ||
| func (s *SnapshotHandler) OnChange(root *dag.DAG) { | ||
| } | ||
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,36 @@ | ||
| // Copyright Project Contour 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 xds | ||
|
|
||
| import ( | ||
| envoy_api_v2_core "github.com/envoyproxy/go-control-plane/envoy/api/v2/core" | ||
| cache "github.com/envoyproxy/go-control-plane/pkg/cache/v2" | ||
| ) | ||
|
|
||
| // ConstantHash is a specialized node ID hasher used to allow | ||
| // any instance of Envoy to connect to Contour regardless of the | ||
| // service-node flag configured on Envoy. | ||
| type ConstantHash string | ||
|
|
||
| func (c ConstantHash) ID(*envoy_api_v2_core.Node) string { | ||
| return string(c) | ||
| } | ||
|
|
||
| func (c ConstantHash) String() string { | ||
| return string(c) | ||
| } | ||
|
|
||
| var _ cache.NodeHash = ConstantHash("") | ||
|
|
||
| var DefaultHash = ConstantHash("contour") |
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
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.
I'm not sure that "handler" is the right naming here. The "Handler" name is used for types that deal with Kubernetes events directly, but this is a DAG observer which is a different role.
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.
It "handles' snapshots? I dunno, please suggest I think the name is fine. =)
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.
ROFL, it's just that it's a handler in a different sense than the other types that we name "*Handler". I will get by with "handler" if we can't think of a evocative alternative :)