Sync fork from upstream openconfig/kne (resolve conflicts)#29
Closed
msupinodn wants to merge 6 commits into
Closed
Sync fork from upstream openconfig/kne (resolve conflicts)#29msupinodn wants to merge 6 commits into
msupinodn wants to merge 6 commits into
Conversation
* Upgrade k8s to 1.35 * cloud-provider-gcp no longer uses Bazel build * Set go path for auth-provider-gcp build
* configure containerd mirror for registry.k8s.io * update path for internal * fix config path * enable authentication for kubelet containerd mirrors * use kne-external for infra containers --------- Co-authored-by: Neha Manjunath <nehamanjunath@google.com>
* update srlinux controller manifest * bump srl-controller
* Add support for IN_CLUSTER_PROXY node type
- Update proto/topo.proto with `IN_CLUSTER_PROXY` in Vendor and `Node.Type` enums.
- Create `topo/node/inclusterproxy` package implementing `Node` interface.
- Set default image to `nicolaka/netshoot:latest` and enforce at least 1 `Service`.
- Enforce link constraints to allow exactly one interface (`eth1`).
- Add warning if `socat` is missing from `Command` or `Args`.
- Update `topo/topo.go` to register the new node type.
- Add unit tests in `topo/node/inclusterproxy/inclusterproxy_test.go`.
* Add support for IN_CLUSTER_PROXY node type
- Update proto/topo.proto with `IN_CLUSTER_PROXY` in Vendor and `Node.Type` enums.
- Create `topo/node/inclusterproxy` package implementing `Node` interface.
- Set default image to `nicolaka/netshoot:latest` and enforce at least 1 `Service`.
- Enforce link constraints to allow exactly one interface (`eth1`).
- Enforce that `proxy-pool-for` label is present in static configuration.
- Add static validation assuring `eth1` is connected directly to the node given in `proxy-pool-for`.
- Add automatic `socat` command generation using `peer-ip` and `target-port` labels:
- Supports IPv4 address allocation arithmetic using `/31` masks.
- Adds IPv6 support using `/127` arithmetic and handles `TCP6-LISTEN` argument switches.
- Update `topo/topo.go` to register the new node type.
- Update `topo/topo.go` to register the new node type.
- Add unit tests in `topo/node/inclusterproxy/inclusterproxy_test.go`.
* Fix config labels for peer ip
* Rename calculateStaticIP to deriveAdjacentIP
* Fix typos
* Fix failing valid_pb_with_automatic_generation_ipv
* Fix lint errors
) * Relax IN_CLUSTER_PROXY link validation to support early addDefaults() passes When loading KNE topologies via the Ondatra testbed framework (knegcebind), an early `addDefaults()` pass instantiates nodes via `node.New()` to calculate default values. Since this pass occurs before the KNE topology manager has fully resolved cross-node links, `eth1.PeerName` is empty during initialization. * Relax IN_CLUSTER_PROXY link validation to support early addDefaults() passes When loading KNE topologies via the Ondatra testbed framework (knegcebind), an early `addDefaults()` pass instantiates nodes via `node.New()` to calculate default values. Since this pass occurs before the KNE topology manager has fully resolved cross-node links, `eth1.PeerName` is empty during initialization.
… containerd mirrors, proto/topo) Resolved go.mod/go.sum conflicts by keeping the DriveNets fork's newer security-bumped versions (grpc v1.79.3, protobuf v1.36.10) over upstream's older protobuf v1.36.7 / grpc v1.65.0, then ran 'go mod tidy'. All other upstream dependency bumps and the 10 non-conflicting files auto-merged. Co-authored-by: Cursor <cursoragent@cursor.com>
Closed
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 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.
This supersedes #28, whose head was upstream openconfig/kne:main (maintainerCanModify=false) and therefore could not be updated, so the resolved merge is pushed here as a replacement branch.
What this pulls from upstream openconfig/kne
Conflict resolution
Build/test