Skip to content

Commit dd28552

Browse files
kvapskvaps
committed
fix(merge): repair the charts the rename/rename merge fused
Merging main left four Chart.yaml files carrying both sides of a rename/rename conflict. Git had paired the deletion of the fluxcd packages against two unrelated additions -- our new forklift charts on one side, main's valkey ones on the other -- and resolving by path staged the markers rather than clearing them, which broke the per-app generate on a file that could no longer be parsed as YAML. Each file now comes from the branch that actually owns it. The cozystack-api rule count moves with main, which added two rules of its own to the same role. Assisted-by: LLM Signed-off-by: Andrei Kvapil <[email protected]>
1 parent e3bc2e4 commit dd28552

5 files changed

Lines changed: 5 additions & 25 deletions

File tree

‎packages/apps/valkey/Chart.yaml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
apiVersion: v2
2-
<<<<<<<< HEAD:packages/system/forklift-operator/Chart.yaml
3-
name: cozy-forklift-operator
4-
========
52
name: valkey
63
description: Managed Valkey service
74
icon: /logos/valkey.svg
85
type: application
9-
>>>>>>>> origin/main:packages/apps/valkey/Chart.yaml
106
version: 0.0.0 # Placeholder, the actual version will be automatically set during the build process
117
appVersion: "8.1.8"

‎packages/system/cozystack-api/tests/rbac_test.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ release:
1515
# the API group string exactly.
1616
#
1717
# The last two tests bound the role from two directions, and neither covers the
18-
# other. The count bound pins the list at exactly eighteen: templates/rbac.yaml
19-
# carries no template directives, so anything appended makes rules[18] exist and
20-
# anything dropped takes rules[17] away, whatever the rule is called. It says
18+
# other. The count bound pins the list at exactly twenty: templates/rbac.yaml
19+
# carries no template directives, so anything appended makes rules[20] exist and
20+
# anything dropped takes rules[19] away, whatever the rule is called. It says
2121
# nothing about a grant swapped in for an existing one, because the count does
2222
# not move under a swap. The spelling assert catches that case for the one rule
2323
# it names, and misses every other wording of it, because helm-unittest compares
@@ -80,6 +80,6 @@ tests:
8080
# Both directions. A dropped grant is the failure this suite is about:
8181
# the apiserver returns forbidden and List silently drops the dropdown.
8282
- exists:
83-
path: rules[17]
83+
path: rules[19]
8484
- notExists:
85-
path: rules[18]
85+
path: rules[20]

‎packages/system/forklift-operator/Chart.yaml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
11
apiVersion: v2
2-
<<<<<<<< HEAD:packages/system/forklift-operator/Chart.yaml
32
name: cozy-forklift-operator
4-
========
5-
name: valkey
6-
description: Managed Valkey service
7-
icon: /logos/valkey.svg
8-
type: application
9-
>>>>>>>> origin/main:packages/apps/valkey/Chart.yaml
103
version: 0.0.0 # Placeholder, the actual version will be automatically set during the build process
11-
appVersion: "8.1.8"

‎packages/system/forklift/Chart.yaml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
11
apiVersion: v2
2-
<<<<<<<< HEAD:packages/system/forklift/Chart.yaml
32
name: cozy-forklift
4-
========
5-
name: valkey-rd
6-
>>>>>>>> origin/main:packages/system/valkey-rd/Chart.yaml
73
version: 0.0.0 # Placeholder, the actual version will be automatically set during the build process

‎packages/system/valkey-rd/Chart.yaml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
11
apiVersion: v2
2-
<<<<<<<< HEAD:packages/system/forklift/Chart.yaml
3-
name: cozy-forklift
4-
========
52
name: valkey-rd
6-
>>>>>>>> origin/main:packages/system/valkey-rd/Chart.yaml
73
version: 0.0.0 # Placeholder, the actual version will be automatically set during the build process

0 commit comments

Comments
 (0)