Skip to content

Commit a1ac217

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #5380 from isabella-janssen/mco-1933
MCO-1933: Pick up openshift/kubernetes 1.34 rebase updates
2 parents 747fddc + b677e89 commit a1ac217

File tree

1,848 files changed

+134742
-107035
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,848 files changed

+134742
-107035
lines changed

‎Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Use RHEL 9 as the primary builder base for the Machine Config Operator
2-
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.20 AS rhel9-builder
2+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.21 AS rhel9-builder
33
ARG TAGS=""
44
WORKDIR /go/src/github.com/openshift/machine-config-operator
55
COPY . .
@@ -12,7 +12,7 @@ RUN --mount=type=cache,target=/go/rhel9/.cache,z \
1212
make install DESTDIR=./instroot-rhel9 && tar -C instroot-rhel9 -cf instroot-rhel9.tar .
1313

1414
# Add a RHEL 8 builder to compile the RHEL 8 compatible binaries
15-
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.24-openshift-4.20 AS rhel8-builder
15+
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.24-openshift-4.21 AS rhel8-builder
1616
ARG TAGS=""
1717
WORKDIR /go/src/github.com/openshift/machine-config-operator
1818
# Copy the RHEL 8 machine-config-daemon binary and rename
@@ -23,7 +23,7 @@ RUN --mount=type=cache,target=/go/rhel8/.cache,z \
2323
--mount=type=cache,target=/go/rhel8/pkg/mod,z \
2424
make install DESTDIR=./instroot-rhel8 && tar -C instroot-rhel8 -cf instroot-rhel8.tar .
2525

26-
FROM registry.ci.openshift.org/ocp/builder:rhel-9-enterprise-base-multi-openshift-4.19
26+
FROM registry.ci.openshift.org/ocp/4.21:base-rhel9
2727
ARG TAGS=""
2828
COPY install /manifests
2929
RUN --mount=type=cache,target=/var/cache/dnf,z \

‎go.mod‎

Lines changed: 86 additions & 88 deletions
Large diffs are not rendered by default.

‎go.sum‎

Lines changed: 152 additions & 159 deletions
Large diffs are not rendered by default.

‎lib/resourceapply/machineconfig_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ func TestApplyMachineConfig(t *testing.T) {
4343
}
4444
actual := actions[1].(clienttesting.CreateAction).GetObject().(*mcfgv1.MachineConfig)
4545
if !equality.Semantic.DeepEqual(expected, actual) {
46-
t.Error(diff.ObjectDiff(expected, actual))
46+
t.Error(diff.Diff(expected, actual))
4747
}
4848
},
4949
}, {
@@ -91,7 +91,7 @@ func TestApplyMachineConfig(t *testing.T) {
9191
}
9292
actual := actions[1].(clienttesting.UpdateAction).GetObject().(*mcfgv1.MachineConfig)
9393
if !equality.Semantic.DeepEqual(expected, actual) {
94-
t.Error(diff.ObjectDiff(expected, actual))
94+
t.Error(diff.Diff(expected, actual))
9595
}
9696
},
9797
}, {
@@ -126,7 +126,7 @@ func TestApplyMachineConfig(t *testing.T) {
126126
}
127127
actual := actions[1].(clienttesting.UpdateAction).GetObject().(*mcfgv1.MachineConfig)
128128
if !equality.Semantic.DeepEqual(expected, actual) {
129-
t.Error(diff.ObjectDiff(expected, actual))
129+
t.Error(diff.Diff(expected, actual))
130130
}
131131
},
132132
}, {
@@ -164,7 +164,7 @@ func TestApplyMachineConfig(t *testing.T) {
164164
}
165165
actual := actions[1].(clienttesting.UpdateAction).GetObject().(*mcfgv1.MachineConfig)
166166
if !equality.Semantic.DeepEqual(expected, actual) {
167-
t.Error(diff.ObjectDiff(expected, actual))
167+
t.Error(diff.Diff(expected, actual))
168168
}
169169
},
170170
}, {
@@ -215,7 +215,7 @@ func TestApplyMachineConfig(t *testing.T) {
215215
}
216216
actual := actions[1].(clienttesting.UpdateAction).GetObject().(*mcfgv1.MachineConfig)
217217
if !equality.Semantic.DeepEqual(expected, actual) {
218-
t.Error(diff.ObjectDiff(expected, actual))
218+
t.Error(diff.Diff(expected, actual))
219219
}
220220
},
221221
}, {
@@ -277,7 +277,7 @@ func TestApplyMachineConfig(t *testing.T) {
277277
}
278278
actual := actions[1].(clienttesting.UpdateAction).GetObject().(*mcfgv1.MachineConfig)
279279
if !equality.Semantic.DeepEqual(expected, actual) {
280-
t.Error(diff.ObjectDiff(expected, actual))
280+
t.Error(diff.Diff(expected, actual))
281281
}
282282
},
283283
}}

‎pkg/controller/bootstrap/bootstrap_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ spec:
151151
t.Fatalf("failed to parse manifest: %v", err)
152152
}
153153
if !reflect.DeepEqual(got, test.want) {
154-
t.Fatalf("mismatch found %s", diff.ObjectDiff(got, test.want))
154+
t.Fatalf("mismatch found %s", diff.Diff(got, test.want))
155155
}
156156
})
157157
}

‎pkg/controller/container-runtime-config/container_runtime_config_controller_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,7 @@ func checkAction(expected, actual core.Action, t *testing.T, index int) {
418418

419419
if !equality.Semantic.DeepEqual(expObject, object) {
420420
t.Errorf("Action %s %s has wrong object\nDiff:\n %s",
421-
a.GetVerb(), a.GetResource().Resource, diff.ObjectGoPrintDiff(expObject, object))
421+
a.GetVerb(), a.GetResource().Resource, diff.Diff(expObject, object))
422422
}
423423
case core.PatchAction:
424424
e, _ := expected.(core.PatchAction)
@@ -427,7 +427,7 @@ func checkAction(expected, actual core.Action, t *testing.T, index int) {
427427

428428
if !equality.Semantic.DeepEqual(expPatch, patch) {
429429
t.Errorf("Action %s %s has wrong patch\nDiff:\n %s",
430-
a.GetVerb(), a.GetResource().Resource, diff.ObjectGoPrintDiff(expPatch, patch))
430+
a.GetVerb(), a.GetResource().Resource, diff.Diff(expPatch, patch))
431431
}
432432
}
433433
}

‎pkg/controller/container-runtime-config/helpers_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -887,7 +887,7 @@ func TestUpdatePolicyJSON(t *testing.T) {
887887
return
888888
}
889889
if !reflect.DeepEqual(gotConf, tt.want) {
890-
t.Errorf("updatePolicyJSON() Diff:\n %s", diff.ObjectGoPrintDiff(tt.want, gotConf))
890+
t.Errorf("updatePolicyJSON() Diff:\n %s", diff.Diff(tt.want, gotConf))
891891
}
892892
// Ensure that the generated configuration is actually valid.
893893
_, err = signature.NewPolicyFromBytes(got)

‎pkg/controller/kubelet-config/kubelet_config_controller_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -125,11 +125,11 @@ func (f *fixture) validateMachineConfig() {
125125
require.NoError(f.t, err)
126126
if !equality.Semantic.DeepEqual(actualKubeletConfig.FeatureGates, expectedKubeletConfig.FeatureGates) {
127127
f.t.Errorf("Action %s %s has wrong object\nDiff:\n %s",
128-
actual.GetVerb(), actual.GetResource().Resource, diff.ObjectGoPrintDiff(actualKubeletConfig.FeatureGates, expectedKubeletConfig.FeatureGates))
128+
actual.GetVerb(), actual.GetResource().Resource, diff.Diff(actualKubeletConfig.FeatureGates, expectedKubeletConfig.FeatureGates))
129129
}
130130
if !equality.Semantic.DeepEqual(actualKubeletConfig.MaxPods, expectedKubeletConfig.MaxPods) {
131131
f.t.Errorf("Action %s %s has wrong object\nDiff:\n %s",
132-
actual.GetVerb(), actual.GetResource().Resource, diff.ObjectGoPrintDiff(actualKubeletConfig.MaxPods, expectedKubeletConfig.MaxPods))
132+
actual.GetVerb(), actual.GetResource().Resource, diff.Diff(actualKubeletConfig.MaxPods, expectedKubeletConfig.MaxPods))
133133
}
134134
}
135135
}
@@ -383,7 +383,7 @@ func checkAction(expected, actual core.Action, t *testing.T, index int) {
383383

384384
if !equality.Semantic.DeepEqual(expObject, object) {
385385
t.Errorf("Action %s %s has wrong object\nDiff:\n %s",
386-
a.GetVerb(), a.GetResource().Resource, diff.ObjectGoPrintDiff(expObject, object))
386+
a.GetVerb(), a.GetResource().Resource, diff.Diff(expObject, object))
387387
}
388388
case core.PatchAction:
389389
e, _ := expected.(core.PatchAction)
@@ -392,7 +392,7 @@ func checkAction(expected, actual core.Action, t *testing.T, index int) {
392392

393393
if !equality.Semantic.DeepEqual(expPatch, patch) {
394394
t.Errorf("Action %s %s has wrong patch\nDiff:\n %s",
395-
a.GetVerb(), a.GetResource().Resource, diff.ObjectGoPrintDiff(expPatch, patch))
395+
a.GetVerb(), a.GetResource().Resource, diff.Diff(expPatch, patch))
396396
}
397397
}
398398
}

‎pkg/controller/render/render_controller_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ func checkAction(expected, actual core.Action, t *testing.T) {
170170

171171
if !equality.Semantic.DeepEqual(expObject, object) {
172172
t.Errorf("Action %s %s has wrong object\nDiff:\n %s",
173-
a.GetVerb(), a.GetResource().Resource, diff.ObjectGoPrintDiff(expObject, object))
173+
a.GetVerb(), a.GetResource().Resource, diff.Diff(expObject, object))
174174
}
175175
case core.UpdateAction:
176176
e, _ := expected.(core.UpdateAction)
@@ -179,7 +179,7 @@ func checkAction(expected, actual core.Action, t *testing.T) {
179179

180180
if !equality.Semantic.DeepEqual(expObject, object) {
181181
t.Errorf("Action %s %s has wrong object\nDiff:\n %s",
182-
a.GetVerb(), a.GetResource().Resource, diff.ObjectGoPrintDiff(expObject, object))
182+
a.GetVerb(), a.GetResource().Resource, diff.Diff(expObject, object))
183183
}
184184
case core.PatchAction:
185185
e, _ := expected.(core.PatchAction)
@@ -188,7 +188,7 @@ func checkAction(expected, actual core.Action, t *testing.T) {
188188

189189
if !equality.Semantic.DeepEqual(expPatch, expPatch) {
190190
t.Errorf("Action %s %s has wrong patch\nDiff:\n %s",
191-
a.GetVerb(), a.GetResource().Resource, diff.ObjectGoPrintDiff(expPatch, patch))
191+
a.GetVerb(), a.GetResource().Resource, diff.Diff(expPatch, patch))
192192
}
193193
}
194194
}

‎pkg/controller/template/template_controller_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ func checkAction(expected, actual core.Action, t *testing.T) {
205205
filterTimeFromControllerStatus(object, expObject)
206206
if !equality.Semantic.DeepEqual(expObject, object) {
207207
t.Errorf("Action %s %s has wrong object\nDiff:\n %s",
208-
a.GetVerb(), a.GetResource().Resource, diff.ObjectGoPrintDiff(expObject, object))
208+
a.GetVerb(), a.GetResource().Resource, diff.Diff(expObject, object))
209209
}
210210
case core.UpdateAction:
211211
e, _ := expected.(core.UpdateAction)
@@ -215,7 +215,7 @@ func checkAction(expected, actual core.Action, t *testing.T) {
215215
filterTimeFromControllerStatus(object, expObject)
216216
if !equality.Semantic.DeepEqual(expObject, object) {
217217
t.Errorf("Action %s %s has wrong object\nDiff:\n %s",
218-
a.GetVerb(), a.GetResource().Resource, diff.ObjectGoPrintDiff(expObject, object))
218+
a.GetVerb(), a.GetResource().Resource, diff.Diff(expObject, object))
219219
}
220220
case core.PatchAction:
221221
e, _ := expected.(core.PatchAction)
@@ -224,7 +224,7 @@ func checkAction(expected, actual core.Action, t *testing.T) {
224224

225225
if !equality.Semantic.DeepEqual(expPatch, expPatch) {
226226
t.Errorf("Action %s %s has wrong patch\nDiff:\n %s",
227-
a.GetVerb(), a.GetResource().Resource, diff.ObjectGoPrintDiff(expPatch, patch))
227+
a.GetVerb(), a.GetResource().Resource, diff.Diff(expPatch, patch))
228228
}
229229
}
230230
}

0 commit comments

Comments
 (0)