Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: cilium/statedb
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v0.3.2
Choose a base ref
...
head repository: cilium/statedb
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v0.3.3
Choose a head ref
  • 2 commits
  • 8 files changed
  • 1 contributor

Commits on Oct 29, 2024

  1. Fix JSON formatting in db show command

    The "db show -format=json" was missing newline at the end. While
    at it, switch to MarshalIndent for nicer output and extend the tests.
    
    Hive dependency is bumped to add the -scripttest.update support.
    
    Signed-off-by: Jussi Maki <jussi.maki@isovalent.com>
    joamaki committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    e0d473d View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2024

  1. reconciler: Fix Status JSON marshalling

    43587d4 broke JSON marshalling of Status by introducing a separate statusJSON
    type and Unmarshal{JSON,YAML} methods, but didn't introduce the Marshal{JSON,YAML}
    methods, which caused dictionary key mismatches as Status struct was used to marshal
    instead of statusJSON.
    
    Fix this by removing the whole statusJSON construct and add json and yaml tags to Status.
    There is no need for filling in the `id` field when unmarshalling Status as this is completely
    internal to the reconciler.
    
    Fixes: 43587d4 ("reconciler: Implement tests using scripttest")
    
    Signed-off-by: Jussi Maki <jussi.maki@isovalent.com>
    joamaki committed Oct 31, 2024
    Configuration menu
    Copy the full SHA
    132edd6 View commit details
    Browse the repository at this point in the history
Loading