github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-07-17 20:00:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #136827 from atombrella/feature/fix_nilness_controller

Browse Source 
Fix cases of nilness under pkg/controller.
This commit is contained in:
Kubernetes Prow Robot
2026-03-10 15:15:11 +05:30
committed by GitHub
parent a142b22c38 af5741da5f
commit 21b427c299
2 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/controller/statefulset/stateful_set_control_test.go
View File

@@ -887,7 +887,7 @@ func TestStatefulSetControl_getSetRevisions(t *testing.T) {
if len(revisions) != test.expectedCount {
t.Errorf("%s: want %d revisions got %d", test.name, test.expectedCount, len(revisions))
}
if test.err && err == nil {
if test.err {
t.Errorf("%s: expected error", test.name)
}
if !test.err && !history.EqualRevision(current, test.expectedCurrent) {
@@ -2093,9 +2093,6 @@ func TestStatefulSetControlRollback(t *testing.T) {
if err := updateStatefulSetControl(set, ssc, om, assertUpdateInvariants); err != nil {
t.Fatalf("%s: %s", test.name, err)
}
if err != nil {
t.Fatalf("%s: %s", test.name, err)
}
pods, err = om.podsLister.Pods(set.Namespace).List(selector)
if err != nil {
t.Fatalf("%s: %s", test.name, err)

9
pkg/controller/volume/attachdetach/cache/actual_state_of_world_test.go vendored
View File

@@ -629,7 +629,7 @@ func Test_GetAttachedVolumes_Positive_OneVolumeTwoNodes(t *testing.T) {
t.Fatalf("Failed to get volume plugin from spec %v, %v", volumeSpec, err)
}
uniqueVolumeName, err := volumeutil.GetUniqueVolumeNameFromSpec(plugin, volumeSpec)
if err != nil || plugin == nil {
if err != nil || uniqueVolumeName == "" {
t.Fatalf("Failed to get uniqueVolumeName from spec %v, %v", volumeSpec, err)
}
logger, _ := ktesting.NewTestContext(t)
@@ -927,9 +927,6 @@ func Test_MarkDesireToDetach_Positive_MarkedAddVolumeNodeReset(t *testing.T) {
if markDesireToDetachErr != nil {
t.Fatalf("RemoveVolumeFromReportAsAttached failed. Expected: <no error> Actual: <%v>", markDesireToDetachErr)
}
if addErr != nil {
t.Fatalf("AddVolumeNode failed. Expected: <no error> Actual: <%v>", addErr)
}
// Assert
attachedVolumes := asw.GetAttachedVolumes()
@@ -1224,7 +1221,7 @@ func Test_GetAttachedVolumesForNode_Positive_OneVolumeTwoNodes(t *testing.T) {
t.Fatalf("Failed to get volume plugin from spec %v, %v", volumeSpec, err)
}
uniqueVolumeName, err := volumeutil.GetUniqueVolumeNameFromSpec(plugin, volumeSpec)
if err != nil || plugin == nil {
if err != nil || uniqueVolumeName == "" {
t.Fatalf("Failed to get uniqueVolumeName from spec %v, %v", volumeSpec, err)
}
generatedVolumeName1, add1Err := asw.AddVolumeNode(logger, uniqueVolumeName, volumeSpec, node1Name, devicePath, true)
@@ -1269,7 +1266,7 @@ func Test_OneVolumeTwoNodes_TwoDevicePaths(t *testing.T) {
t.Fatalf("Failed to get volume plugin from spec %v, %v", volumeSpec, err)
}
uniqueVolumeName, err := volumeutil.GetUniqueVolumeNameFromSpec(plugin, volumeSpec)
if err != nil || plugin == nil {
if err != nil || uniqueVolumeName == "" {
t.Fatalf("Failed to get uniqueVolumeName from spec %v, %v", volumeSpec, err)
}
generatedVolumeName1, add1Err := asw.AddVolumeNode(logger, uniqueVolumeName, volumeSpec, node1Name, devicePath1, true)