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.

Sign up for GitHub

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

fix(*): merging arrays in new policies #5084

Merged
merged 27 commits into from
Oct 18, 2022
Merged

fix(*): merging arrays in new policies #5084

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
f373556
fix(*): KDS marshal to json for new policies
lobkovilya Sep 29, 2022
354c01e
fix(*): unit tests
lobkovilya Sep 30, 2022
89f38f4
fix(*): golden tests
lobkovilya Sep 30, 2022
3a8ae9c
Merge branch 'master' into fix/new-policy-merge
lobkovilya Sep 30, 2022
962cd88
fix(*): make check
lobkovilya Sep 30, 2022
82841ca
fix(*): make check
lobkovilya Sep 30, 2022
a7a335d
fix(*): maek sed across ubuntu and darwin
lobkovilya Sep 30, 2022
a84d728
fix merge func, add unit test
lobkovilya Oct 3, 2022
2915de7
fix(*): add reflect to create new 'conf'
lobkovilya Oct 4, 2022
1edf203
fix(*): get rid of extra marshaling/unmarshaling
lobkovilya Oct 5, 2022
638600a
Merge branch 'master' into fix/new-policy-merge
lobkovilya Oct 10, 2022
a6f9fed
fix(*): golden files
lobkovilya Oct 10, 2022
cb873b2
fix(*): revert omitempty for non-lists, add '+nullable'
lobkovilya Oct 11, 2022
ab16e6a
make check
lobkovilya Oct 12, 2022
90597d8
fix(*): update golden files
lobkovilya Oct 12, 2022
8a096e2
fix(*): add '+optional' marker
lobkovilya Oct 12, 2022
ca0930e
make check
lobkovilya Oct 12, 2022
0a16de8
fix(*): remove package optional marker
lobkovilya Oct 12, 2022
613ea12
fix(*): revert policy bootstrap change
lobkovilya Oct 12, 2022
21db4be
Merge branch 'master' into fix/new-policy-merge
lobkovilya Oct 14, 2022
837d9eb
make check
lobkovilya Oct 14, 2022
5336a50
fix(*): marshal in postgres store
lobkovilya Oct 16, 2022
11190f6
fix(*): update kumactl
lobkovilya Oct 17, 2022
f3fb251
fix(*): replace proto.Message with 'any'
lobkovilya Oct 18, 2022
aa472e4
Merge branch 'master' into fix/new-policy-merge
lobkovilya Oct 18, 2022
03b75e5
review
lobkovilya Oct 18, 2022
0126763
Merge branch 'master' into fix/new-policy-merge
lobkovilya Oct 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions app/kumactl/cmd/install/testdata/install-control-plane.defaults.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,6 +411,7 @@ spec:
type: string
type: object
type: object
nullable: true
type: array
sampling:
description: Sampling configuration. Sampling is the process by
Expand Down Expand Up @@ -480,6 +481,7 @@ spec:
description: Name of the tag.
type: string
type: object
nullable: true
type: array
type: object
targetRef:
Expand Down Expand Up @@ -608,6 +610,7 @@ spec:
type: object
type: object
type: object
nullable: true
type: array
targetRef:
description: TargetRef is a reference to the resource the policy takes
Expand Down Expand Up @@ -1655,6 +1658,7 @@ spec:
value:
type: string
type: object
nullable: true
type: array
plain:
type: string
Expand Down Expand Up @@ -1683,12 +1687,14 @@ spec:
value:
type: string
type: object
nullable: true
type: array
plain:
type: string
type: object
type: object
type: object
nullable: true
type: array
type: object
targetRef:
Expand Down Expand Up @@ -1721,6 +1727,7 @@ spec:
type: object
type: object
type: object
nullable: true
type: array
targetRef:
description: TargetRef is a reference to the resource the policy takes
Expand Down Expand Up @@ -1778,6 +1785,7 @@ spec:
value:
type: string
type: object
nullable: true
type: array
plain:
type: string
Expand Down Expand Up @@ -1806,12 +1814,14 @@ spec:
value:
type: string
type: object
nullable: true
type: array
plain:
type: string
type: object
type: object
type: object
nullable: true
type: array
type: object
targetRef:
Expand Down Expand Up @@ -1844,6 +1854,7 @@ spec:
type: object
type: object
type: object
nullable: true
type: array
type: object
type: object
Expand Down
11 changes: 11 additions & 0 deletions app/kumactl/cmd/install/testdata/install-control-plane.gateway-api-present-not-enabled.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,6 +411,7 @@ spec:
type: string
type: object
type: object
nullable: true
type: array
sampling:
description: Sampling configuration. Sampling is the process by
Expand Down Expand Up @@ -480,6 +481,7 @@ spec:
description: Name of the tag.
type: string
type: object
nullable: true
type: array
type: object
targetRef:
Expand Down Expand Up @@ -608,6 +610,7 @@ spec:
type: object
type: object
type: object
nullable: true
type: array
targetRef:
description: TargetRef is a reference to the resource the policy takes
Expand Down Expand Up @@ -1655,6 +1658,7 @@ spec:
value:
type: string
type: object
nullable: true
type: array
plain:
type: string
Expand Down Expand Up @@ -1683,12 +1687,14 @@ spec:
value:
type: string
type: object
nullable: true
type: array
plain:
type: string
type: object
type: object
type: object
nullable: true
type: array
type: object
targetRef:
Expand Down Expand Up @@ -1721,6 +1727,7 @@ spec:
type: object
type: object
type: object
nullable: true
type: array
targetRef:
description: TargetRef is a reference to the resource the policy takes
Expand Down Expand Up @@ -1778,6 +1785,7 @@ spec:
value:
type: string
type: object
nullable: true
type: array
plain:
type: string
Expand Down Expand Up @@ -1806,12 +1814,14 @@ spec:
value:
type: string
type: object
nullable: true
type: array
plain:
type: string
type: object
type: object
type: object
nullable: true
type: array
type: object
targetRef:
Expand Down Expand Up @@ -1844,6 +1854,7 @@ spec:
type: object
type: object
type: object
nullable: true
type: array
type: object
type: object
Expand Down
11 changes: 11 additions & 0 deletions app/kumactl/cmd/install/testdata/install-control-plane.gateway-api-present.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -670,6 +670,7 @@ spec:
type: string
type: object
type: object
nullable: true
type: array
sampling:
description: Sampling configuration. Sampling is the process by
Expand Down Expand Up @@ -739,6 +740,7 @@ spec:
description: Name of the tag.
type: string
type: object
nullable: true
type: array
type: object
targetRef:
Expand Down Expand Up @@ -867,6 +869,7 @@ spec:
type: object
type: object
type: object
nullable: true
type: array
targetRef:
description: TargetRef is a reference to the resource the policy takes
Expand Down Expand Up @@ -1914,6 +1917,7 @@ spec:
value:
type: string
type: object
nullable: true
type: array
plain:
type: string
Expand Down Expand Up @@ -1942,12 +1946,14 @@ spec:
value:
type: string
type: object
nullable: true
type: array
plain:
type: string
type: object
type: object
type: object
nullable: true
type: array
type: object
targetRef:
Expand Down Expand Up @@ -1980,6 +1986,7 @@ spec:
type: object
type: object
type: object
nullable: true
type: array
targetRef:
description: TargetRef is a reference to the resource the policy takes
Expand Down Expand Up @@ -2037,6 +2044,7 @@ spec:
value:
type: string
type: object
nullable: true
type: array
plain:
type: string
Expand Down Expand Up @@ -2065,12 +2073,14 @@ spec:
value:
type: string
type: object
nullable: true
type: array
plain:
type: string
type: object
type: object
type: object
nullable: true
type: array
type: object
targetRef:
Expand Down Expand Up @@ -2103,6 +2113,7 @@ spec:
type: object
type: object
type: object
nullable: true
type: array
type: object
type: object
Expand Down
11 changes: 11 additions & 0 deletions app/kumactl/cmd/install/testdata/install-control-plane.with-helm-set.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,6 +431,7 @@ spec:
type: string
type: object
type: object
nullable: true
type: array
sampling:
description: Sampling configuration. Sampling is the process by
Expand Down Expand Up @@ -500,6 +501,7 @@ spec:
description: Name of the tag.
type: string
type: object
nullable: true
type: array
type: object
targetRef:
Expand Down Expand Up @@ -628,6 +630,7 @@ spec:
type: object
type: object
type: object
nullable: true
type: array
targetRef:
description: TargetRef is a reference to the resource the policy takes
Expand Down Expand Up @@ -1675,6 +1678,7 @@ spec:
value:
type: string
type: object
nullable: true
type: array
plain:
type: string
Expand Down Expand Up @@ -1703,12 +1707,14 @@ spec:
value:
type: string
type: object
nullable: true
type: array
plain:
type: string
type: object
type: object
type: object
nullable: true
type: array
type: object
targetRef:
Expand Down Expand Up @@ -1741,6 +1747,7 @@ spec:
type: object
type: object
type: object
nullable: true
type: array
targetRef:
description: TargetRef is a reference to the resource the policy takes
Expand Down Expand Up @@ -1798,6 +1805,7 @@ spec:
value:
type: string
type: object
nullable: true
type: array
plain:
type: string
Expand Down Expand Up @@ -1826,12 +1834,14 @@ spec:
value:
type: string
type: object
nullable: true
type: array
plain:
type: string
type: object
type: object
type: object
nullable: true
type: array
type: object
targetRef:
Expand Down Expand Up @@ -1864,6 +1874,7 @@ spec:
type: object
type: object
type: object
nullable: true
type: array
type: object
type: object
Expand Down
Loading