public_git/actions-runner-controller
1
0
Fork 0
mirror of https://github.com/actions-runner-controller/actions-runner-controller.git synced 2026-10-22 10:04:24 +02:00
Code Issues Projects Releases Wiki Activity

Fix empty collection drift across scale-set resources (#4695)

Browse Source
This commit is contained in:
Nikola Jokic
2026-09-29 16:38:32 +02:00
committed by GitHub
parent ce0c6b7437
commit 6a04f3c6d7
6 changed files with 348 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/actions.github.com/helpers_drift_test.go
+54
View File
@@ -147,6 +147,60 @@ func TestEphemeralRunnerSetActionableSpecChanged_RealChangeStillDetected(t *test
})
}
func TestEphemeralRunnerSetDesiredSpecChanged_Metadata(t *testing.T) {
for _, tc := range []struct {
name string
current *v1alpha1.ResourceMeta
desired *v1alpha1.ResourceMeta
changed bool
}{
{name: "both omitted"},
{
name: "empty labels", current: &v1alpha1.ResourceMeta{},
desired: &v1alpha1.ResourceMeta{Labels: map[string]string{}},
},
{
name: "empty annotations", current: &v1alpha1.ResourceMeta{},
desired: &v1alpha1.ResourceMeta{Annotations: map[string]string{}},
},
{
name: "empty maps", current: &v1alpha1.ResourceMeta{},
desired: &v1alpha1.ResourceMeta{Labels: map[string]string{}, Annotations: map[string]string{}},
},
{
name: "metadata object added", desired: &v1alpha1.ResourceMeta{}, changed: true,
},
{
name: "label added", current: &v1alpha1.ResourceMeta{},
desired: &v1alpha1.ResourceMeta{Labels: map[string]string{"team": "arc"}}, changed: true,
},
{
name: "label changed",
current: &v1alpha1.ResourceMeta{Labels: map[string]string{"team": "old"}},
desired: &v1alpha1.ResourceMeta{Labels: map[string]string{"team": "arc"}}, changed: true,
},
{
name: "annotation added", current: &v1alpha1.ResourceMeta{},
desired: &v1alpha1.ResourceMeta{Annotations: map[string]string{"team": "arc"}}, changed: true,
},
{
name: "annotation changed",
current: &v1alpha1.ResourceMeta{Annotations: map[string]string{"team": "old"}},
desired: &v1alpha1.ResourceMeta{Annotations: map[string]string{"team": "arc"}}, changed: true,
},
} {
t.Run(tc.name, func(t *testing.T) {
current := &v1alpha1.EphemeralRunnerSet{Spec: v1alpha1.EphemeralRunnerSetSpec{EphemeralRunnerMetadata: tc.current}}
desired := &v1alpha1.EphemeralRunnerSet{Spec: v1alpha1.EphemeralRunnerSetSpec{EphemeralRunnerMetadata: tc.desired}}
currentBefore, desiredBefore := current.DeepCopy(), desired.DeepCopy()
assert.Equal(t, tc.changed, ephemeralRunnerSetDesiredSpecChanged(current, desired))
assert.Equal(t, tc.changed, ephemeralRunnerSetDesiredSpecChanged(desired, current), "removals must also be detected")
assert.Equal(t, currentBefore, current)
assert.Equal(t, desiredBefore, desired)
})
}
}
type listenerEmptyCollectionTestCase struct {
name string
runnerSetSpec string