Skip to content
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

BGPv2: Updates CiliumBGPNodeConfigOverride Type #31598

Merged
merged 1 commit into from
Apr 15, 2024

Conversation

danehans
Copy link
Contributor

@danehans danehans commented Mar 25, 2024

Previously, CiliumBGPNodeConfigOverrideSpec included the nodeRef field for referencing the name of a CiliumBGPNodeConfig to override. This approach introduces the potential for conflicts by multiple CiliumBGPNodeConfigOverride resources referencing the same CiliumBGPNodeConfig.

This PR removes the nodeRef field and updates the CiliumBGPNodeConfigOverride spec so users understand that the name of the CiliumBGPNodeConfig and CiliumBGPNodeConfigOverride must match for the configuration overrides to be applied.

@danehans danehans requested review from a team as code owners March 25, 2024 21:12
@maintainer-s-little-helper maintainer-s-little-helper bot added the dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. label Mar 25, 2024
@danehans
Copy link
Contributor Author

cc: @YutaroHayakawa @harsimran-pabla

@danehans
Copy link
Contributor Author

/test

@danehans
Copy link
Contributor Author

/ci-ginkgo

@danehans
Copy link
Contributor Author

ci-ginkgo is failing due to:

• Failure in Spec Teardown (AfterEach) [420.720 seconds]
K8sUpdates
/home/runner/work/cilium/cilium/test/ginkgo-ext/scopes.go:461
  Tests upgrade and downgrade from a Cilium stable image to master [AfterEach]
  /home/runner/work/cilium/cilium/test/ginkgo-ext/scopes.go:515

  Found 4 k8s-app=cilium logs matching list of errors that must be investigated:
  2024-03-26T15:41:00.247846907Z level=warning msg="unknown field \"spec.bootid\"" subsys=klog
  2024-03-26T15:41:00.482086200Z level=warning msg="unknown field \"spec.bootid\"" subsys=klog
  2024-03-26T15:41:00.070067466Z level=warning msg="unknown field \"spec.bootid\"" subsys=klog
  2024-03-26T15:41:00.195602475Z level=warning msg="unknown field \"spec.bootid\"" subsys=klog

c72e9f4 added this field to CiliumNode after this PR was pushed. I'm going to rebase to see if the commit resolves this CI flake.

Previously, the CiliumBGPNodeConfigOverrideSpec included the `nodeRef`
field for referencing the name of the node for which the BGP configuration
is overridden. This approach introduces the potential for conflicts by
multiple CiliumBGPNodeConfigOverride resources referencing the same
CiliumBGPNodeConfig.

This PR removes the `nodeRef` field and updates the CiliumBGPNodeConfigOverride
spec so users understand that the name of the CiliumBGPNodeConfig and
CiliumBGPNodeConfigOverride must match for the configuration overrides to
be applied.

Signed-off-by: Daneyon Hansen <daneyon.hansen@solo.io>
@danehans
Copy link
Contributor Author

/test

1 similar comment
@danehans
Copy link
Contributor Author

/test

@harsimran-pabla harsimran-pabla added the release-note/misc This PR makes changes that have no direct user impact. label Mar 27, 2024
@maintainer-s-little-helper maintainer-s-little-helper bot removed the dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. label Mar 27, 2024
@harsimran-pabla harsimran-pabla added dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. area/bgp labels Mar 27, 2024
@maintainer-s-little-helper maintainer-s-little-helper bot removed dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. labels Mar 27, 2024
@danehans
Copy link
Contributor Author

/ci-clustermesh

@danehans danehans changed the title BGP Control Plane v2: Updates CiliumBGPNoeConfigOverride Type BGP Control Plane v2: Updates CiliumBGPNodeConfigOverride Type Mar 29, 2024
@danehans danehans changed the title BGP Control Plane v2: Updates CiliumBGPNodeConfigOverride Type BGP v2: Updates CiliumBGPNodeConfigOverride Type Mar 29, 2024
@danehans danehans changed the title BGP v2: Updates CiliumBGPNodeConfigOverride Type BGPv2: Updates CiliumBGPNodeConfigOverride Type Mar 29, 2024
@danehans
Copy link
Contributor Author

@YutaroHayakawa since #31684 requires this PR, it would be great to get this merged. cc: @joestringer

@YutaroHayakawa
Copy link
Member

It still needs the review from sig-k8s. Let me ping @tommyp1ckles.

@danehans
Copy link
Contributor Author

danehans commented Apr 5, 2024

@YutaroHayakawa do you have any suggestions for someone else to review this PR?

@YutaroHayakawa YutaroHayakawa removed the request for review from tommyp1ckles April 8, 2024 02:24
@YutaroHayakawa
Copy link
Member

Ok, Tom is not available now. Let me randomly select a person from sig-k8s and request a review from @squeed 🙏

@squeed
Copy link
Contributor

squeed commented Apr 15, 2024

This needs a proper release note, unless we are removing a field that was never released, as well as an entry in the UPGRADING notes.

Usually we first mark a field as deprecated for one release, then remove the field. As this is v2alpha1 that may be loosened, but only for good reason.

@danehans
Copy link
Contributor Author

@squeed yes, this is a change to an unreleased API type.

@squeed
Copy link
Contributor

squeed commented Apr 15, 2024

Easy. Approved, thanks.

@maintainer-s-little-helper maintainer-s-little-helper bot added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Apr 15, 2024
@squeed squeed added this pull request to the merge queue Apr 15, 2024
Merged via the queue into cilium:main with commit 3068add Apr 15, 2024
62 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/bgp ready-to-merge This PR has passed all tests and received consensus from code owners to merge. release-note/misc This PR makes changes that have no direct user impact.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants