Skip to content

Commit 216f821

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #29709 from bertinatto/bump-v1.33
CNTRLPLANE-371: Update to Kubernetes v1.33.2
2 parents b042f6b + 64b8756 commit 216f821

File tree

2,647 files changed

+143128
-51355
lines changed

Some content is hidden

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

2,647 files changed

+143128
-51355
lines changed

‎go.mod

Lines changed: 106 additions & 109 deletions
Large diffs are not rendered by default.

‎go.sum

Lines changed: 176 additions & 168 deletions
Large diffs are not rendered by default.

‎hack/update-generated.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ go run -mod vendor ./cmd/openshift-tests render test-report --output-dir=./zz_ge
1616
# By default, "openshift-tests images" lists images from external binaries. However, we force
1717
# this script to list images from built-in tests in order to avoid requiring an OCP release image.
1818
echo "# This file is generated by hack/update-generated.sh" > test/extended/util/image/zz_generated.txt
19-
OPENSHIFT_SKIP_EXTERNAL_TESTS=1 go run -mod vendor ./cmd/openshift-tests images --upstream --to-repository quay.io/openshift/community-e2e-images >> test/extended/util/image/zz_generated.txt
19+
QUAY_REPO="quay.io/openshift/community-e2e-images"
20+
OPENSHIFT_SKIP_EXTERNAL_TESTS=1 go run -mod vendor ./cmd/openshift-tests images --upstream --to-repository "$QUAY_REPO" | grep "$QUAY_REPO" >> test/extended/util/image/zz_generated.txt
2021

2122
os::build::setup_env
2223

‎images/tests/Dockerfile.rhel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@ RUN PACKAGES="git gzip util-linux" && \
2222
LABEL io.k8s.display-name="OpenShift End-to-End Tests" \
2323
io.openshift.release.operator=true \
2424
io.k8s.description="OpenShift is a platform for developing, building, and deploying containerized applications." \
25-
io.openshift.build.versions="kubernetes-tests=1.32.5" \
25+
io.openshift.build.versions="kubernetes-tests=1.33.2" \
2626
io.openshift.tags="openshift,tests,e2e"

‎pkg/clioptions/suiteselection/suite_flags.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ func (f *TestSuiteSelectionFlags) SelectSuite(
7171
}
7272
}
7373
if suite == nil && len(args) == 0 {
74-
fmt.Fprintf(f.ErrOut, SuitesString(suites, "Select a test suite to run against the server:\n\n"))
74+
fmt.Fprint(f.ErrOut, SuitesString(suites, "Select a test suite to run against the server:\n\n"))
7575
return nil, fmt.Errorf("specify a test suite to run, for example: %s run %s", filepath.Base(os.Args[0]), suites[0].Name)
7676
}
7777
if suite == nil && len(args) > 0 {
@@ -83,7 +83,7 @@ func (f *TestSuiteSelectionFlags) SelectSuite(
8383
}
8484
}
8585
if suite == nil {
86-
fmt.Fprintf(f.ErrOut, SuitesString(suites, "Select a test suite to run against the server:\n\n"))
86+
fmt.Fprint(f.ErrOut, SuitesString(suites, "Select a test suite to run against the server:\n\n"))
8787
return nil, fmt.Errorf("suite %q does not exist", args[0])
8888
}
8989

@@ -149,7 +149,7 @@ func (f *TestSuiteSelectionFlags) testFileMatchFunc() (testginkgo.TestMatchFunc,
149149
// printed at the beginning of the output.
150150
func SuitesString(suites []*testginkgo.TestSuite, prefix string) string {
151151
buf := &bytes.Buffer{}
152-
fmt.Fprintf(buf, prefix)
152+
fmt.Fprint(buf, prefix)
153153
for _, suite := range suites {
154154
fmt.Fprintf(buf, "%s\n %s\n\n", suite.Name, suite.Description)
155155
}

‎pkg/disruption/backend/shutdown/handler.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ func (h *ciShutdownIntervalHandler) Handle(shutdown *shutdownInterval) {
6060
message = fmt.Sprintf("%s: load balancer took new(%s) reused(%s) to switch to a new host", message,
6161
shutdown.MaxElapsedWithNewConnection.Round(time.Second), shutdown.MaxElapsedWithConnectionReuse.Round(time.Second))
6262
message = fmt.Sprintf("reason/%s locator/%s %s: %s", reason, h.descriptor.ShutdownLocator(), message, shutdown.String())
63-
framework.Logf(message)
63+
framework.Logf("%s", message)
6464

6565
if level == monitorapi.Error {
6666
h.eventRecorder.Eventf(

‎pkg/monitor/backenddisruption/disruption_backend_sampler.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -622,7 +622,7 @@ func (b *disruptionSampler) consumeSamples(ctx context.Context, consumerDoneCh c
622622

623623
// start a new interval with the new error
624624
message, eventReason, level := DisruptionBegan(b.backendSampler.GetLocator().OldLocator(), b.backendSampler.GetConnectionType(), currentError, currSample.getRequestAuditID())
625-
framework.Logf(message.BuildString())
625+
framework.Logf("%s", message.BuildString())
626626
eventRecorder.Eventf(
627627
&v1.ObjectReference{Kind: "OpenShiftTest", Namespace: "kube-system", Name: b.backendSampler.GetDisruptionBackendName()}, nil,
628628
v1.EventTypeWarning, string(eventReason), "detected", message.BuildString())
@@ -654,7 +654,7 @@ func (b *disruptionSampler) consumeSamples(ctx context.Context, consumerDoneCh c
654654
}
655655

656656
message, eventReason, level := DisruptionBegan(b.backendSampler.GetLocator().OldLocator(), b.backendSampler.GetConnectionType(), currentError, currSample.getRequestAuditID())
657-
framework.Logf(message.BuildString())
657+
framework.Logf("%s", message.BuildString())
658658
eventRecorder.Eventf(
659659
&v1.ObjectReference{Kind: "OpenShiftTest", Namespace: "kube-system", Name: b.backendSampler.GetDisruptionBackendName()}, nil,
660660
v1.EventTypeWarning, string(eventReason), "detected", message.BuildString())

‎pkg/monitortestlibrary/pathologicaleventlibrary/duplicated_events_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,7 @@ func TestPathologicalEventsWithNamespaces(t *testing.T) {
407407
assert.Equal(t, test.expectedMessage, junit.FailureOutput.Output)
408408
} else {
409409
if !assert.Nil(t, junit.FailureOutput, "expected success but got failure output") {
410-
t.Logf(junit.FailureOutput.Output)
410+
t.Log(junit.FailureOutput.Output)
411411
}
412412
}
413413
}
@@ -658,7 +658,7 @@ func TestPathologicalEventsTopologyAwareHintsDisabled(t *testing.T) {
658658
assert.Equal(t, test.expectedMessage, junit.FailureOutput.Output)
659659
} else {
660660
if !assert.Nil(t, junit.FailureOutput, "expected success but got failure output for junit: %s", junit.Name) {
661-
t.Logf(junit.FailureOutput.Output)
661+
t.Log(junit.FailureOutput.Output)
662662
}
663663
}
664664
}

‎pkg/monitortests/network/disruptionpodnetwork/monitortest.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ func (pna *podNetworkAvalibility) serviceHasEndpoints(ctx context.Context) (bool
212212
}
213213
endpointSlices, err := pna.kubeClient.DiscoveryV1().EndpointSlices(pna.targetService.Namespace).List(ctx, listOptions)
214214
if err != nil {
215-
klog.Errorf(err.Error())
215+
klog.Error(err.Error())
216216
return false, nil
217217
}
218218

‎pkg/monitortests/network/disruptionserviceloadbalancer/monitortest.go

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import (
1919
configv1 "github.com/openshift/api/config/v1"
2020
configclient "github.com/openshift/client-go/config/clientset/versioned"
2121
"github.com/openshift/library-go/pkg/operator/resource/resourceread"
22+
appsv1 "k8s.io/api/apps/v1"
2223
corev1 "k8s.io/api/core/v1"
2324
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2425
utilnet "k8s.io/apimachinery/pkg/util/net"
@@ -192,28 +193,28 @@ func (w *availability) PrepareCollection(ctx context.Context, adminRESTConfig *r
192193
svcPort := int(tcpService.Spec.Ports[0].Port)
193194

194195
fmt.Fprintf(os.Stderr, "creating RC to be part of service %v\n", serviceName)
195-
rc, err := jig.Run(ctx, func(rc *corev1.ReplicationController) {
196+
rc, err := jig.Run(ctx, func(deployment *appsv1.Deployment) {
196197
// ensure the pod waits long enough during update for the LB to see the newly ready pod, which
197198
// must be longer than the worst load balancer above (GCP at 32s)
198-
rc.Spec.MinReadySeconds = 33
199+
deployment.Spec.MinReadySeconds = 33
199200

200201
// use a readiness endpoint that will go not ready before the pod terminates.
201202
// the probe will go false when the sig-term is sent.
202-
rc.Spec.Template.Spec.Containers[0].ReadinessProbe.HTTPGet.Path = "/readyz"
203+
deployment.Spec.Template.Spec.Containers[0].ReadinessProbe.HTTPGet.Path = "/readyz"
203204

204205
// delay shutdown long enough to go readyz=false before the process exits when the pod is deleted.
205206
// 80 second delay was found to not show disruption in testing
206-
rc.Spec.Template.Spec.Containers[0].Args = append(rc.Spec.Template.Spec.Containers[0].Args, "--delay-shutdown=80")
207+
deployment.Spec.Template.Spec.Containers[0].Args = append(deployment.Spec.Template.Spec.Containers[0].Args, "--delay-shutdown=80")
207208

208209
// force the image to use the "normal" global mapping.
209210
originalAgnhost := k8simage.GetOriginalImageConfigs()[k8simage.Agnhost]
210-
rc.Spec.Template.Spec.Containers[0].Image = image.LocationFor(originalAgnhost.GetE2EImage())
211+
deployment.Spec.Template.Spec.Containers[0].Image = image.LocationFor(originalAgnhost.GetE2EImage())
211212

212213
// ensure the pod is not forcibly deleted at 30s, but waits longer than the graceful sleep
213214
minuteAndAHalf := int64(90)
214-
rc.Spec.Template.Spec.TerminationGracePeriodSeconds = &minuteAndAHalf
215+
deployment.Spec.Template.Spec.TerminationGracePeriodSeconds = &minuteAndAHalf
215216

216-
jig.AddRCAntiAffinity(rc)
217+
jig.AddDeploymentAntiAffinity(deployment)
217218
})
218219
if err != nil {
219220
return fmt.Errorf("error waiting for replicaset: %w", err)

0 commit comments

Comments
 (0)