Skip to content

WRKLDS-1449: Rebase 1.31.1 #29103

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 15 commits into from
Oct 8, 2024
Merged

WRKLDS-1449: Rebase 1.31.1 #29103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
f3c3bba
bump(k8s): update k8s.io/* dependencies to v1.31.1
atiratree Sep 12, 2024
34d3c55
bump(k8s): go mod vendor
atiratree Sep 12, 2024
8f4a3b8
react to openshift/api changes
atiratree Sep 5, 2024
dd86baf
react to kubernetes framework changes
atiratree Sep 12, 2024
6a65034
react to a new test image
atiratree Sep 12, 2024
c1d81b2
Revert "Update etcd test data for 1.31 release"
atiratree Oct 2, 2024
68436b6
Revert "Update etcd test data for 1.31 release"
atiratree Oct 2, 2024
8e321f2
Revert "skip health handlers e2e for 1.31 rebase"
atiratree Oct 2, 2024
6ea35cd
update the exclusion version for the next rebase
atiratree Oct 2, 2024
f73f41b
Revert "Add more images coming in k8s 1.31"
atiratree Oct 2, 2024
71c9c8b
Revert "Add images coming in k8s 1.31"
atiratree Oct 2, 2024
8073bce
make update
atiratree Sep 12, 2024
b8835cb
replace agnhost:2.47 with agnhost:2.52
bertinatto Oct 2, 2024
5321cac
Updated Kubernetes vendoring
bertinatto Oct 3, 2024
aec877e
Added pause:3.10 to the exception list
bertinatto Oct 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
249 changes: 121 additions & 128 deletions go.mod
View file
Open in desktop

Large diffs are not rendered by default.

503 changes: 217 additions & 286 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

35 changes: 0 additions & 35 deletions pkg/cmd/openshift-tests/images/images_command.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,11 +83,6 @@ func NewImagesCommand() *cobra.Command {
for _, line := range lines {
fmt.Fprintln(os.Stdout, line)
}
// TODO: these should be removed when landing k8s 1.31:
newImages := injectNewImages(ref, o.Upstream)
for _, line := range newImages {
fmt.Fprintln(os.Stdout, line)
}
return nil
},
}
Expand All @@ -99,36 +94,6 @@ func NewImagesCommand() *cobra.Command {
return cmd
}

func injectNewImages(ref reference.DockerImageReference, upstream bool) []string {
lines := []string{}
for original, mirror := range map[string]string{
"registry.k8s.io/etcd:3.5.15-0": "e2e-11-registry-k8s-io-etcd-3-5-15-0-W7c5qq4cz4EE20EQ",
"registry.k8s.io/e2e-test-images/agnhost:2.52": "e2e-1-registry-k8s-io-e2e-test-images-agnhost-2-52-vo_U710PrYLetnfE",
"registry.k8s.io/pause:3.10": "e2e-27-registry-k8s-io-pause-3-10-b3MYAwZ_MelO9baY",
"registry.k8s.io/e2e-test-images/regression-issue-74839:1.2": "e2e-30-registry-k8s-io-e2e-test-images-regression-issue-74839-1-2-pZ_RxNuqvcwEiCKE",
"registry.k8s.io/e2e-test-images/resource-consumer:1.13": "e2e-31-registry-k8s-io-e2e-test-images-resource-consumer-1-13-LT0C2W4wMzShSeGS",
"registry.k8s.io/e2e-test-images/volume/nfs:1.4": "e2e-32-registry-k8s-io-e2e-test-images-volume-nfs-1-4-u7V8iW5QIcWM2i6h",
"registry.k8s.io/sig-storage/hostpathplugin:v1.14.0": "e2e-43-registry-k8s-io-sig-storage-hostpathplugin-v1-14-0-LWjla55lyZB4CQu0",
"registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.1": "e2e-45-registry-k8s-io-sig-storage-csi-node-driver-registrar-v2-10-1-bVz-v06gRSvh6Rp3",
"registry.k8s.io/sig-storage/csi-attacher:v4.6.1": "e2e-47-registry-k8s-io-sig-storage-csi-attacher-v4-6-1-NP4z4EcSo-N1xk_4",
"registry.k8s.io/sig-storage/csi-provisioner:v5.0.1": "e2e-48-registry-k8s-io-sig-storage-csi-provisioner-v5-0-1-wPw2vjyYX1LWVmkn",
"registry.k8s.io/sig-storage/csi-resizer:v1.11.1": "e2e-49-registry-k8s-io-sig-storage-csi-resizer-v1-11-1-6jB55ZThgstz1GrW",
"registry.k8s.io/sig-storage/csi-snapshotter:v8.0.1": "e2e-50-registry-k8s-io-sig-storage-csi-snapshotter-v8-0-1-vAVT_GHf7Vm-TXyx",
"registry.k8s.io/e2e-test-images/busybox:1.29-2": "e2e-51-registry-k8s-io-e2e-test-images-busybox-1-29-2-ZYWRth-o9U_JR2ZE",
"registry.k8s.io/sig-storage/hello-populator:v1.0.1": "e2e-34-registry-k8s-io-sig-storage-hello-populator-v1-0-1-Ei7libli17J5IWn-",
"registry.k8s.io/sig-storage/volume-data-source-validator:v1.0.0": "e2e-35-registry-k8s-io-sig-storage-volume-data-source-validator-v1-0-0-pJwTeQGTDmAV8753",
"registry.k8s.io/sig-storage/livenessprobe:v2.12.0": "e2e-46-registry-k8s-io-sig-storage-livenessprobe-v2-12-0-wCYz5fsB0ew8MCS0",
} {
if upstream {
lines = append(lines, fmt.Sprintf("%s %s:%s", original, ref.Exact(), mirror))
} else {
lines = append(lines, fmt.Sprintf("quay.io/openshift/community-e2e-images:%s %s:%s", mirror, ref.Exact(), mirror))
}
}
sort.Strings(lines)
return lines
}

type imagesOptions struct {
Repository string
Upstream bool
Expand Down
7 changes: 2 additions & 5 deletions pkg/test/ginkgo/cmd_runsuite.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -590,16 +590,13 @@ func (o *GinkgoRunSuiteOptions) filterOutRebaseTests(restConfig *rest.Config, te
}
// TODO: this version along with below exclusions lists needs to be updated
// for the rebase in-progress.
if !strings.HasPrefix(serverVersion.Minor, "31") {
if !strings.HasPrefix(serverVersion.Minor, "32") {
return tests, nil
}

// Below list should only be filled in when we're trying to land k8s rebase.
// Don't pile them up!
exclusions := []string{
// affected by the available controller split https://github.com/kubernetes/kubernetes/pull/126149
`[sig-api-machinery] health handlers should contain necessary checks`,
}
exclusions := []string{}

matches := make([]*testCase, 0, len(tests))
outerLoop:
Expand Down
4 changes: 2 additions & 2 deletions test/extended/authorization/authorization.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -849,8 +849,8 @@ func (test subjectAccessReviewTest) run(t g.GinkgoTInterface) {
var testNS string
if test.localReview != nil {
switch {
case len(test.localReview.Namespace) > 0:
testNS = test.localReview.Namespace
case len(test.localReview.Action.Namespace) > 0:
testNS = test.localReview.Action.Namespace
case len(test.response.Namespace) > 0:
testNS = test.response.Namespace
case len(test.kubeNamespace) > 0:
Expand Down
56 changes: 0 additions & 56 deletions test/extended/etcd/etcd_storage_path.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,62 +298,6 @@ func testEtcd3StoragePath(t g.GinkgoTInterface, oc *exutil.CLI, etcdClient3Fn fu
// TODO: When rebase has started, fixup etcd storage data that has been modified
// in k8s.io/kubernetes/test/integration/etcd/data.go in the 1.30 release.

// compare https://github.com/kubernetes/kubernetes/pull/124602
etcdStorageData[gvr("discovery.k8s.io", "v1", "endpointslices")] = etcddata.StorageData{
Stub: `{"metadata": {"name": "slicev1"}, "addressType": "IPv4", "protocol": "TCP", "ports": [], "endpoints": []}`,
ExpectedEtcdPath: "/registry/endpointslices/" + oc.Namespace() + "/slicev1",
ExpectedGVK: gvkP("discovery.k8s.io", "v1", "EndpointSlice"),
}

// compare https://github.com/kubernetes/kubernetes/pull/125101
etcdStorageData[gvr("admissionregistration.k8s.io", "v1", "validatingadmissionpolicies")] = etcddata.StorageData{
Stub: `{"metadata":{"name":"vap1","creationTimestamp":null},"spec":{"paramKind":{"apiVersion":"test.example.com/v1","kind":"Example"},"matchConstraints":{"resourceRules": [{"resourceNames": ["fakeName"], "apiGroups":["apps"],"apiVersions":["v1"],"operations":["CREATE", "UPDATE"], "resources":["deployments"]}]},"validations":[{"expression":"object.spec.replicas <= params.maxReplicas","message":"Too many replicas"}]}}`,
ExpectedEtcdPath: "/registry/validatingadmissionpolicies/vap1",
ExpectedGVK: gvkP("admissionregistration.k8s.io", "v1", "ValidatingAdmissionPolicy"),
}
etcdStorageData[gvr("admissionregistration.k8s.io", "v1", "validatingadmissionpolicybindings")] = etcddata.StorageData{
Stub: `{"metadata":{"name":"pb1","creationTimestamp":null},"spec":{"policyName":"replicalimit-policy.example.com","paramRef":{"name":"replica-limit-test.example.com","parameterNotFoundAction":"Deny"},"validationActions":["Deny"]}}`,
ExpectedEtcdPath: "/registry/validatingadmissionpolicybindings/pb1",
ExpectedGVK: gvkP("admissionregistration.k8s.io", "v1", "ValidatingAdmissionPolicyBinding"),
}
etcdStorageData[gvr("admissionregistration.k8s.io", "v1beta1", "validatingadmissionpolicies")] = etcddata.StorageData{
Stub: `{"metadata":{"name":"vap1b1","creationTimestamp":null},"spec":{"paramKind":{"apiVersion":"test.example.com/v1","kind":"Example"},"matchConstraints":{"resourceRules": [{"resourceNames": ["fakeName"], "apiGroups":["apps"],"apiVersions":["v1"],"operations":["CREATE", "UPDATE"], "resources":["deployments"]}]},"validations":[{"expression":"object.spec.replicas <= params.maxReplicas","message":"Too many replicas"}]}}`,
ExpectedEtcdPath: "/registry/validatingadmissionpolicies/vap1b1",
ExpectedGVK: gvkP("admissionregistration.k8s.io", "v1", "ValidatingAdmissionPolicy"),
}
etcdStorageData[gvr("admissionregistration.k8s.io", "v1beta1", "validatingadmissionpolicybindings")] = etcddata.StorageData{
Stub: `{"metadata":{"name":"pb1b1","creationTimestamp":null},"spec":{"policyName":"replicalimit-policy.example.com","paramRef":{"name":"replica-limit-test.example.com","parameterNotFoundAction":"Deny"},"validationActions":["Deny"]}}`,
ExpectedEtcdPath: "/registry/validatingadmissionpolicybindings/pb1b1",
ExpectedGVK: gvkP("admissionregistration.k8s.io", "v1", "ValidatingAdmissionPolicyBinding"),
}

// compare https://github.com/kubernetes/kubernetes/pull/125488
etcdStorageData[gvr("resource.k8s.io", "v1alpha3", "deviceclasses")] = etcddata.StorageData{
Stub: `{"metadata": {"name": "class1name"}}`,
ExpectedEtcdPath: "/registry/deviceclasses/class1name",
ExpectedGVK: gvkP("resource.k8s.io", "v1alpha3", "DeviceClass"),
}
etcdStorageData[gvr("resource.k8s.io", "v1alpha3", "resourceclaims")] = etcddata.StorageData{
Stub: `{"metadata": {"name": "claim1name"}, "spec": {"devices": {"requests": [{"name": "req-0", "deviceClassName": "example-class", "allocationMode": "ExactCount", "count": 1}]}}}`,
ExpectedEtcdPath: "/registry/resourceclaims/" + oc.Namespace() + "/claim1name",
ExpectedGVK: gvkP("resource.k8s.io", "v1alpha3", "ResourceClaim"),
}
etcdStorageData[gvr("resource.k8s.io", "v1alpha3", "resourceclaimtemplates")] = etcddata.StorageData{
Stub: `{"metadata": {"name": "claimtemplate1name"}, "spec": {"spec": {"devices": {"requests": [{"name": "req-0", "deviceClassName": "example-class", "allocationMode": "ExactCount", "count": 1}]}}}}`,
ExpectedEtcdPath: "/registry/resourceclaimtemplates/" + oc.Namespace() + "/claimtemplate1name",
ExpectedGVK: gvkP("resource.k8s.io", "v1alpha3", "ResourceClaimTemplate"),
}
etcdStorageData[gvr("resource.k8s.io", "v1alpha3", "podschedulingcontexts")] = etcddata.StorageData{
Stub: `{"metadata": {"name": "pod1name"}, "spec": {"selectedNode": "node1name", "potentialNodes": ["node1name", "node2name"]}}`,
ExpectedEtcdPath: "/registry/podschedulingcontexts/" + oc.Namespace() + "/pod1name",
ExpectedGVK: gvkP("resource.k8s.io", "v1alpha3", "PodSchedulingContext"),
}
etcdStorageData[gvr("resource.k8s.io", "v1alpha3", "resourceslices")] = etcddata.StorageData{
Stub: `{"metadata": {"name": "node1slice"}, "spec": {"nodeName": "worker1", "driver": "dra.example.com", "pool": {"name": "worker1", "resourceSliceCount": 1}}}`,
ExpectedEtcdPath: "/registry/resourceslices/node1slice",
ExpectedGVK: gvkP("resource.k8s.io", "v1alpha3", "ResourceSlice"),
}

// Removed etcd data.
// TODO: When rebase has started, remove etcd storage data that has been removed
// from k8s.io/kubernetes/test/integration/etcd/data.go in the 1.29 release.
Expand Down
2 changes: 1 addition & 1 deletion test/extended/networking/egress_firewall.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ const (
egressFWE2E = "egress-firewall-e2e"
wcEgressFWE2E = "wildcard-egress-firewall-e2e"
noEgressFWE2E = "no-egress-firewall-e2e"
egressFWTestImage = "registry.k8s.io/e2e-test-images/agnhost:2.47"
egressFWTestImage = "registry.k8s.io/e2e-test-images/agnhost:2.52"
oVNKManifest = "ovnk-egressfirewall-test.yaml"
oVNKWCManifest = "ovnk-egressfirewall-wildcard-test.yaml"
openShiftSDNManifest = "sdn-egressnetworkpolicy-test.yaml"
Expand Down
4 changes: 2 additions & 2 deletions test/extended/networking/internal_ports.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ import (
"k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/util/intstr"
"k8s.io/apimachinery/pkg/util/wait"
imageutils "k8s.io/kubernetes/test/utils/image"

"k8s.io/kubernetes/test/e2e/framework"
e2enetwork "k8s.io/kubernetes/test/e2e/framework/network"
e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
admissionapi "k8s.io/pod-security-admission/api"

Expand Down Expand Up @@ -82,7 +82,7 @@ var _ = ginkgo.Describe("[sig-network] Internal connectivity", func() {
Containers: []v1.Container{
{
Name: "webserver",
Image: e2enetwork.NetexecImageName,
Image: imageutils.GetE2EImage(imageutils.Agnhost),
Command: []string{"/agnhost", "netexec", fmt.Sprintf("--http-port=%v", nodeTCPPort), fmt.Sprintf("--udp-port=%v", nodeUDPPort)},
Ports: []v1.ContainerPort{
{Name: "tcp", ContainerPort: nodeTCPPort},
Expand Down
2 changes: 1 addition & 1 deletion test/extended/operators/certs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ func fetchOnDiskCertificates(ctx context.Context, kubeClient kubernetes.Interfac
}
defer kubeClient.RbacV1().ClusterRoleBindings().Delete(ctx, nodeReaderCRB, metav1.DeleteOptions{})

pauseImage := image.LocationFor("registry.k8s.io/e2e-test-images/agnhost:2.47")
pauseImage := image.LocationFor("registry.k8s.io/e2e-test-images/agnhost:2.52")
podNameOnNode, err := createPods(ctx, kubeClient, namespace, nodeList, testPullSpec, pauseImage)
if err != nil {
return nil, err
Expand Down
2 changes: 1 addition & 1 deletion test/extended/router/config_manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,7 @@ http {
Containers: []corev1.Container{
{
Name: "test",
Image: image.LocationFor("registry.k8s.io/e2e-test-images/agnhost:2.47"),
Image: image.LocationFor("registry.k8s.io/e2e-test-images/agnhost:2.52"),
Args: []string{"netexec"},
Ports: []corev1.ContainerPort{
{
Expand Down
6 changes: 3 additions & 3 deletions test/extended/router/weighted.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ var _ = g.Describe("[sig-network][Feature:Router][apigroup:image.openshift.io]",
Containers: []corev1.Container{
{
Name: "test",
Image: image.LocationFor("registry.k8s.io/e2e-test-images/agnhost:2.47"),
Image: image.LocationFor("registry.k8s.io/e2e-test-images/agnhost:2.52"),
Args: []string{
"netexec",
},
Expand Down Expand Up @@ -272,7 +272,7 @@ var _ = g.Describe("[sig-network][Feature:Router][apigroup:image.openshift.io]",
Containers: []corev1.Container{
{
Name: "test",
Image: image.LocationFor("registry.k8s.io/e2e-test-images/agnhost:2.47"),
Image: image.LocationFor("registry.k8s.io/e2e-test-images/agnhost:2.52"),
Args: []string{
"netexec",
},
Expand Down Expand Up @@ -303,7 +303,7 @@ var _ = g.Describe("[sig-network][Feature:Router][apigroup:image.openshift.io]",
Containers: []corev1.Container{
{
Name: "test",
Image: image.LocationFor("registry.k8s.io/e2e-test-images/agnhost:2.47"),
Image: image.LocationFor("registry.k8s.io/e2e-test-images/agnhost:2.52"),
Args: []string{
"netexec",
},
Expand Down
24 changes: 12 additions & 12 deletions test/extended/testdata/bindata.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion test/extended/testdata/cmd/test/cmd/testdata/hello-openshift/hello-pod.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"containers": [
{
"name": "hello-openshift",
"image": "registry.k8s.io/e2e-test-images/agnhost:2.47",
"image": "registry.k8s.io/e2e-test-images/agnhost:2.52",
"args": ["netexec"],
"ports": [
{
Expand Down
2 changes: 1 addition & 1 deletion test/extended/testdata/cmd/test/cmd/testdata/templateinstance_objectkinds.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ items:
spec:
containers:
- name: hello-openshift
image: registry.k8s.io/e2e-test-images/agnhost:2.47
image: registry.k8s.io/e2e-test-images/agnhost:2.52
- kind: Route
apiVersion: route.openshift.io/v1
metadata:
Expand Down
2 changes: 1 addition & 1 deletion test/extended/testdata/idling-echo-server-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ items:
deployment: idling-echo
spec:
containers:
- image: registry.k8s.io/e2e-test-images/agnhost:2.47
- image: registry.k8s.io/e2e-test-images/agnhost:2.52
name: idling-echo-server
args: [ "netexec", "--http-port", "8675", "--udp-port", "3090" ]
ports:
Expand Down
2 changes: 1 addition & 1 deletion test/extended/testdata/idling-echo-server-rc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ items:
replicationcontroller: idling-echo
spec:
containers:
- image: registry.k8s.io/e2e-test-images/agnhost:2.47
- image: registry.k8s.io/e2e-test-images/agnhost:2.52
name: idling-echo-server
args: [ "netexec", "--http-port", "8675" ]
ports:
Expand Down
2 changes: 1 addition & 1 deletion test/extended/testdata/idling-echo-server.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ items:
deploymentconfig: idling-echo
spec:
containers:
- image: registry.k8s.io/e2e-test-images/agnhost:2.47
- image: registry.k8s.io/e2e-test-images/agnhost:2.52
name: idling-echo-server
args: [ "netexec", "--http-port", "8675", "--udp-port", "3090" ]
ports:
Expand Down
4 changes: 2 additions & 2 deletions test/extended/testdata/router/ingress.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ items:
terminationGracePeriodSeconds: 1
containers:
- name: test
image: registry.k8s.io/e2e-test-images/agnhost:2.47
image: registry.k8s.io/e2e-test-images/agnhost:2.52
args: ["netexec"]
ports:
- containerPort: 8080
Expand All @@ -109,7 +109,7 @@ items:
terminationGracePeriodSeconds: 1
containers:
- name: test
image: registry.k8s.io/e2e-test-images/agnhost:2.47
image: registry.k8s.io/e2e-test-images/agnhost:2.52
args: ["netexec"]
ports:
- containerPort: 8080
Expand Down
2 changes: 1 addition & 1 deletion test/extended/testdata/router/router-common.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ items:
terminationGracePeriodSeconds: 1
containers:
- name: test
image: registry.k8s.io/e2e-test-images/agnhost:2.47
image: registry.k8s.io/e2e-test-images/agnhost:2.52
args: ["netexec"]
ports:
- containerPort: 8080
Expand Down
Loading