Skip to content

Commit 69177d6

Browse files
jacobseejacobsee
committed
Update etcd test data for k8s 1.34 release
1 parent 97f9052 commit 69177d6

File tree

1 file changed

+206
-16
lines changed

1 file changed

+206
-16
lines changed

‎test/extended/etcd/etcd_storage_path.go‎

Lines changed: 206 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -283,11 +283,62 @@ func testEtcd3StoragePath(t g.GinkgoTInterface, oc *exutil.CLI, etcdClient3Fn fu
283283
// Apply output of git diff origin/release-1.XY origin/release-1.X(Y+1) test/integration/etcd/data.go. This is needed
284284
// to apply the right data depending on the kube version of the running server. Replace this with the next current
285285
// and rebase version next time. Don't pile them up.
286-
if strings.HasPrefix(version.Minor, "33") {
286+
if strings.HasPrefix(version.Minor, "34") {
287287
for k, a := range map[schema.GroupVersionResource]etcddata.StorageData{
288288
// Added etcd data.
289289
// TODO: When rebase has started, add etcd storage data has been added to
290-
// k8s.io/kubernetes/test/integration/etcd/data.go in the 1.33 release.
290+
// k8s.io/kubernetes/test/integration/etcd/data.go in the 1.34 release.
291+
gvr("certificates.k8s.io", "v1alpha1", "podcertificaterequests"): {
292+
Stub: `{"metadata": {"name": "req-1"}, "spec": {"signerName":"example.com/signer", "podName":"pod-1", "podUID":"pod-uid-1", "serviceAccountName":"sa-1", "serviceAccountUID":"sa-uid-1", "nodeName":"node-1", "nodeUID":"node-uid-1", "maxExpirationSeconds":86400, "pkixPublicKey":"MCowBQYDK2VwAyEA5g+rk9q/hjojtc2nwHJ660RdX5w1f4AK0/kP391QyLY=", "proofOfPossession":"SuGHX7SMyPHuN5cD5wjKLXGNbhdlCYUnTH65JkTx17iWlLynQ/g9GiTYObftSHNzqRh0ofdgAGqK6a379O7RBw=="}}`,
293+
ExpectedEtcdPath: "/registry/podcertificaterequests/" + oc.Namespace() + "/req-1",
294+
ExpectedGVK: gvkP("certificates.k8s.io", "v1alpha1", "PodCertificateRequest"),
295+
IntroducedVersion: "1.34",
296+
RemovedVersion: "1.37",
297+
},
298+
gvr("storage.k8s.io", "v1", "volumeattributesclasses"): {
299+
Stub: `{"metadata": {"name": "vac3"}, "driverName": "example.com/driver", "parameters": {"foo": "bar"}}`,
300+
ExpectedEtcdPath: "/registry/volumeattributesclasses/vac3",
301+
ExpectedGVK: gvkP("storage.k8s.io", "v1beta1", "VolumeAttributesClass"),
302+
IntroducedVersion: "1.34",
303+
},
304+
gvr("admissionregistration.k8s.io", "v1beta1", "mutatingadmissionpolicies"): {
305+
Stub: `{"metadata":{"name":"map1b1"},"spec":{"paramKind":{"apiVersion":"test.example.com/v1","kind":"Example"},"matchConstraints":{"resourceRules": [{"resourceNames": ["fakeName"], "apiGroups":["apps"],"apiVersions":["v1"],"operations":["CREATE", "UPDATE"], "resources":["deployments"]}]},"reinvocationPolicy": "IfNeeded","mutations":[{"applyConfiguration": {"expression":"Object{metadata: Object.metadata{labels: {'example':'true'}}}"}, "patchType":"ApplyConfiguration"}]}}`,
306+
ExpectedEtcdPath: "/registry/mutatingadmissionpolicies/map1b1",
307+
ExpectedGVK: gvkP("admissionregistration.k8s.io", "v1alpha1", "MutatingAdmissionPolicy"),
308+
IntroducedVersion: "1.34",
309+
RemovedVersion: "1.40",
310+
},
311+
gvr("admissionregistration.k8s.io", "v1beta1", "mutatingadmissionpolicybindings"): {
312+
Stub: `{"metadata":{"name":"mpb1b1"},"spec":{"policyName":"replicalimit-policy.example.com","paramRef":{"name":"replica-limit-test.example.com", "parameterNotFoundAction": "Allow"}}}`,
313+
ExpectedEtcdPath: "/registry/mutatingadmissionpolicybindings/mpb1b1",
314+
ExpectedGVK: gvkP("admissionregistration.k8s.io", "v1alpha1", "MutatingAdmissionPolicyBinding"),
315+
IntroducedVersion: "1.34",
316+
RemovedVersion: "1.40",
317+
},
318+
gvr("resource.k8s.io", "v1", "deviceclasses"): {
319+
Stub: `{"metadata": {"name": "class4name"}}`,
320+
ExpectedEtcdPath: "/registry/deviceclasses/class4name",
321+
ExpectedGVK: gvkP("resource.k8s.io", "v1beta2", "DeviceClass"),
322+
IntroducedVersion: "1.34",
323+
},
324+
gvr("resource.k8s.io", "v1", "resourceclaims"): {
325+
Stub: `{"metadata": {"name": "claim4name"}, "spec": {"devices": {"requests": [{"name": "req-0", "exactly": {"deviceClassName": "example-class", "allocationMode": "ExactCount", "count": 1}}]}}}`,
326+
ExpectedEtcdPath: "/registry/resourceclaims/" + oc.Namespace() + "/claim4name",
327+
ExpectedGVK: gvkP("resource.k8s.io", "v1beta2", "ResourceClaim"),
328+
IntroducedVersion: "1.34",
329+
},
330+
gvr("resource.k8s.io", "v1", "resourceclaimtemplates"): {
331+
Stub: `{"metadata": {"name": "claimtemplate4name"}, "spec": {"spec": {"devices": {"requests": [{"name": "req-0", "exactly": {"deviceClassName": "example-class", "allocationMode": "ExactCount", "count": 1}}]}}}}`,
332+
ExpectedEtcdPath: "/registry/resourceclaimtemplates/" + oc.Namespace() + "/claimtemplate4name",
333+
ExpectedGVK: gvkP("resource.k8s.io", "v1beta2", "ResourceClaimTemplate"),
334+
IntroducedVersion: "1.34",
335+
},
336+
gvr("resource.k8s.io", "v1", "resourceslices"): {
337+
Stub: `{"metadata": {"name": "node4slice"}, "spec": {"nodeName": "worker1", "driver": "dra.example.com", "pool": {"name": "worker1", "resourceSliceCount": 1}}}`,
338+
ExpectedEtcdPath: "/registry/resourceslices/node4slice",
339+
ExpectedGVK: gvkP("resource.k8s.io", "v1beta2", "ResourceSlice"),
340+
IntroducedVersion: "1.34",
341+
},
291342
} {
292343
if _, preexisting := etcdStorageData[k]; preexisting {
293344
t.Errorf("upstream etcd storage data already has data for %v. Update current and rebase version diff to next rebase version", k)
@@ -297,27 +348,166 @@ func testEtcd3StoragePath(t g.GinkgoTInterface, oc *exutil.CLI, etcdClient3Fn fu
297348

298349
// Modified etcd data.
299350
// TODO: When rebase has started, fixup etcd storage data that has been modified
300-
// in k8s.io/kubernetes/test/integration/etcd/data.go in the 1.33 release.
301-
etcdStorageData[gvr("networking.k8s.io", "v1", "servicecidrs")] = etcddata.StorageData{
302-
Stub: `{"metadata": {"name": "range-b2"}, "spec": {"cidrs": ["192.168.0.0/16","fd00:1::/120"]}}`,
303-
ExpectedEtcdPath: "/registry/servicecidrs/range-b2",
304-
ExpectedGVK: gvkP("networking.k8s.io", "v1beta1", "ServiceCIDR"),
351+
// in k8s.io/kubernetes/test/integration/etcd/data.go in the 1.34 release.
352+
etcdStorageData[gvr("apps", "v1", "statefulsets")] = etcddata.StorageData{
353+
Stub: `{"metadata": {"name": "ss3"}, "spec": {"selector": {"matchLabels": {"a": "b"}}, "template": {"metadata": {"labels": {"a": "b"}}, "spec": {"restartPolicy": "Always", "terminationGracePeriodSeconds": 30, "containers": [{"image": "` + exutilimage.ShellImage() + `", "name": "container6", "terminationMessagePolicy": "File"}]}}}}`,
354+
ExpectedEtcdPath: "/registry/statefulsets/" + oc.Namespace() + "/ss3",
355+
IntroducedVersion: "1.9",
356+
}
357+
etcdStorageData[gvr("apps", "v1", "controllerrevisions")] = etcddata.StorageData{
358+
Stub: `{"metadata":{"name":"crs3"},"data":{"name":"abc","namespace":"default","Spec":{"Replicas":0,"Selector":{"matchLabels":{"foo":"bar"}},"Template":{"labels":{"foo":"bar"},"Spec":{"Volumes":null,"InitContainers":null,"Containers":null,"RestartPolicy":"Always","TerminationGracePeriodSeconds":null,"ActiveDeadlineSeconds":null,"DNSPolicy":"ClusterFirst","NodeSelector":null,"ServiceAccountName":"","AutomountServiceAccountToken":null,"NodeName":"","SecurityContext":null,"ImagePullSecrets":null,"Hostname":"","Subdomain":"","Affinity":null,"SchedulerName":"","Tolerations":null,"HostAliases":null}},"VolumeClaimTemplates":null,"ServiceName":""},"Status":{"ObservedGeneration":null,"Replicas":0}},"revision":0}`,
359+
ExpectedEtcdPath: "/registry/controllerrevisions/" + oc.Namespace() + "/crs3",
360+
IntroducedVersion: "1.9",
361+
}
362+
etcdStorageData[gvr("autoscaling", "v1", "horizontalpodautoscalers")] = etcddata.StorageData{
363+
Stub: `{"metadata": {"name": "hpa2"}, "spec": {"maxReplicas": 3, "scaleTargetRef": {"kind": "something", "name": "cross", "apiVersion": "apps/v1"}}}`,
364+
ExpectedEtcdPath: "/registry/horizontalpodautoscalers/" + oc.Namespace() + "/hpa2",
365+
ExpectedGVK: gvkP("autoscaling", "v2", "HorizontalPodAutoscaler"),
366+
IntroducedVersion: "1.2",
367+
}
368+
etcdStorageData[gvr("autoscaling", "v2", "horizontalpodautoscalers")] = etcddata.StorageData{
369+
Stub: `{"metadata": {"name": "hpa4"}, "spec": {"maxReplicas": 3, "scaleTargetRef": {"kind": "something", "name": "cross", "apiVersion": "apps/v1"}}}`,
370+
ExpectedEtcdPath: "/registry/horizontalpodautoscalers/" + oc.Namespace() + "/hpa4",
371+
IntroducedVersion: "1.23",
305372
}
306373
etcdStorageData[gvr("networking.k8s.io", "v1", "ipaddresses")] = etcddata.StorageData{
307-
Stub: `{"metadata": {"name": "192.168.2.3"}, "spec": {"parentRef": {"resource": "services","name": "test", "namespace": "ns"}}}`,
308-
ExpectedEtcdPath: "/registry/ipaddresses/192.168.2.3",
309-
ExpectedGVK: gvkP("networking.k8s.io", "v1beta1", "IPAddress"),
374+
Stub: `{"metadata": {"name": "192.168.2.3"}, "spec": {"parentRef": {"resource": "services","name": "test", "namespace": "ns"}}}`,
375+
ExpectedEtcdPath: "/registry/ipaddresses/192.168.2.3",
376+
ExpectedGVK: gvkP("networking.k8s.io", "v1", "IPAddress"),
377+
IntroducedVersion: "1.33",
378+
}
379+
etcdStorageData[gvr("networking.k8s.io", "v1", "servicecidrs")] = etcddata.StorageData{
380+
Stub: `{"metadata": {"name": "range-b2"}, "spec": {"cidrs": ["192.168.0.0/16","fd00:1::/120"]}}`,
381+
ExpectedEtcdPath: "/registry/servicecidrs/range-b2",
382+
ExpectedGVK: gvkP("networking.k8s.io", "v1", "ServiceCIDR"),
383+
IntroducedVersion: "1.33",
384+
}
385+
etcdStorageData[gvr("networking.k8s.io", "v1beta1", "ipaddresses")] = etcddata.StorageData{
386+
Stub: `{"metadata": {"name": "192.168.1.3"}, "spec": {"parentRef": {"resource": "services","name": "test", "namespace": "ns"}}}`,
387+
ExpectedEtcdPath: "/registry/ipaddresses/192.168.1.3",
388+
ExpectedGVK: gvkP("networking.k8s.io", "v1", "IPAddress"),
389+
IntroducedVersion: "1.31",
390+
RemovedVersion: "1.37",
391+
}
392+
etcdStorageData[gvr("networking.k8s.io", "v1beta1", "servicecidrs")] = etcddata.StorageData{
393+
Stub: `{"metadata": {"name": "range-b1"}, "spec": {"cidrs": ["192.168.0.0/16","fd00:1::/120"]}}`,
394+
ExpectedEtcdPath: "/registry/servicecidrs/range-b1",
395+
ExpectedGVK: gvkP("networking.k8s.io", "v1", "ServiceCIDR"),
396+
IntroducedVersion: "1.31",
397+
RemovedVersion: "1.37",
398+
}
399+
etcdStorageData[gvr("admissionregistration.k8s.io", "v1", "validatingwebhookconfigurations")] = etcddata.StorageData{
400+
Stub: `{"metadata":{"name":"hook2"},"webhooks":[{"name":"externaladmissionhook.k8s.io","clientConfig":{"service":{"namespace":"ns","name":"n"},"caBundle":null},"rules":[{"operations":["CREATE"],"apiGroups":["group"],"apiVersions":["version"],"resources":["resource"]}],"failurePolicy":"Ignore","sideEffects":"None","admissionReviewVersions":["v1beta1"]}]}`,
401+
ExpectedEtcdPath: "/registry/validatingwebhookconfigurations/hook2",
402+
IntroducedVersion: "1.16",
403+
}
404+
etcdStorageData[gvr("admissionregistration.k8s.io", "v1", "mutatingwebhookconfigurations")] = etcddata.StorageData{
405+
Stub: `{"metadata":{"name":"hook2"},"webhooks":[{"name":"externaladmissionhook.k8s.io","clientConfig":{"service":{"namespace":"ns","name":"n"},"caBundle":null},"rules":[{"operations":["CREATE"],"apiGroups":["group"],"apiVersions":["version"],"resources":["resource"]}],"failurePolicy":"Ignore","sideEffects":"None","admissionReviewVersions":["v1beta1"]}]}`,
406+
ExpectedEtcdPath: "/registry/mutatingwebhookconfigurations/hook2",
407+
IntroducedVersion: "1.16",
408+
}
409+
etcdStorageData[gvr("admissionregistration.k8s.io", "v1", "validatingadmissionpolicies")] = etcddata.StorageData{
410+
Stub: `{"metadata":{"name":"vap1"},"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"}]}}`,
411+
ExpectedEtcdPath: "/registry/validatingadmissionpolicies/vap1",
412+
IntroducedVersion: "1.30",
413+
}
414+
etcdStorageData[gvr("admissionregistration.k8s.io", "v1", "validatingadmissionpolicybindings")] = etcddata.StorageData{
415+
Stub: `{"metadata":{"name":"pb1"},"spec":{"policyName":"replicalimit-policy.example.com","paramRef":{"name":"replica-limit-test.example.com","parameterNotFoundAction":"Deny"},"validationActions":["Deny"]}}`,
416+
ExpectedEtcdPath: "/registry/validatingadmissionpolicybindings/pb1",
417+
IntroducedVersion: "1.30",
418+
}
419+
etcdStorageData[gvr("admissionregistration.k8s.io", "v1beta1", "validatingadmissionpolicies")] = etcddata.StorageData{
420+
Stub: `{"metadata":{"name":"vap1b1"},"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"}]}}`,
421+
ExpectedEtcdPath: "/registry/validatingadmissionpolicies/vap1b1",
422+
ExpectedGVK: gvkP("admissionregistration.k8s.io", "v1", "ValidatingAdmissionPolicy"),
423+
IntroducedVersion: "1.28",
424+
RemovedVersion: "1.34",
425+
}
426+
etcdStorageData[gvr("admissionregistration.k8s.io", "v1beta1", "validatingadmissionpolicybindings")] = etcddata.StorageData{
427+
Stub: `{"metadata":{"name":"pb1b1"},"spec":{"policyName":"replicalimit-policy.example.com","paramRef":{"name":"replica-limit-test.example.com","parameterNotFoundAction":"Deny"},"validationActions":["Deny"]}}`,
428+
ExpectedEtcdPath: "/registry/validatingadmissionpolicybindings/pb1b1",
429+
ExpectedGVK: gvkP("admissionregistration.k8s.io", "v1", "ValidatingAdmissionPolicyBinding"),
430+
IntroducedVersion: "1.28",
431+
RemovedVersion: "1.34",
432+
}
433+
etcdStorageData[gvr("admissionregistration.k8s.io", "v1alpha1", "mutatingadmissionpolicies")] = etcddata.StorageData{
434+
Stub: `{"metadata":{"name":"map1"},"spec":{"paramKind":{"apiVersion":"test.example.com/v1","kind":"Example"},"matchConstraints":{"resourceRules": [{"resourceNames": ["fakeName"], "apiGroups":["apps"],"apiVersions":["v1"],"operations":["CREATE", "UPDATE"], "resources":["deployments"]}]},"reinvocationPolicy": "IfNeeded","mutations":[{"applyConfiguration": {"expression":"Object{metadata: Object.metadata{labels: {'example':'true'}}}"}, "patchType":"ApplyConfiguration"}]}}`,
435+
ExpectedEtcdPath: "/registry/mutatingadmissionpolicies/map1",
436+
IntroducedVersion: "1.32",
437+
RemovedVersion: "1.38",
438+
}
439+
etcdStorageData[gvr("admissionregistration.k8s.io", "v1alpha1", "mutatingadmissionpolicybindings")] = etcddata.StorageData{
440+
Stub: `{"metadata":{"name":"mpb1"},"spec":{"policyName":"replicalimit-policy.example.com","paramRef":{"name":"replica-limit-test.example.com", "parameterNotFoundAction": "Allow"}}}`,
441+
ExpectedEtcdPath: "/registry/mutatingadmissionpolicybindings/mpb1",
442+
IntroducedVersion: "1.32",
443+
RemovedVersion: "1.38",
444+
}
445+
etcdStorageData[gvr("resource.k8s.io", "v1beta1", "deviceclasses")] = etcddata.StorageData{
446+
Stub: `{"metadata": {"name": "class2name"}}`,
447+
ExpectedEtcdPath: "/registry/deviceclasses/class2name",
448+
ExpectedGVK: gvkP("resource.k8s.io", "v1beta2", "DeviceClass"),
449+
IntroducedVersion: "1.32",
450+
RemovedVersion: "1.38",
451+
}
452+
etcdStorageData[gvr("resource.k8s.io", "v1beta1", "resourceclaims")] = etcddata.StorageData{
453+
Stub: `{"metadata": {"name": "claim2name"}, "spec": {"devices": {"requests": [{"name": "req-0", "deviceClassName": "example-class", "allocationMode": "ExactCount", "count": 1}]}}}`,
454+
ExpectedEtcdPath: "/registry/resourceclaims/" + oc.Namespace() + "/claim2name",
455+
ExpectedGVK: gvkP("resource.k8s.io", "v1beta2", "ResourceClaim"),
456+
IntroducedVersion: "1.32",
457+
RemovedVersion: "1.38",
458+
}
459+
etcdStorageData[gvr("resource.k8s.io", "v1beta1", "resourceclaimtemplates")] = etcddata.StorageData{
460+
Stub: `{"metadata": {"name": "claimtemplate2name"}, "spec": {"spec": {"devices": {"requests": [{"name": "req-0", "deviceClassName": "example-class", "allocationMode": "ExactCount", "count": 1}]}}}}`,
461+
ExpectedEtcdPath: "/registry/resourceclaimtemplates/" + oc.Namespace() + "/claimtemplate2name",
462+
ExpectedGVK: gvkP("resource.k8s.io", "v1beta2", "ResourceClaimTemplate"),
463+
IntroducedVersion: "1.32",
464+
RemovedVersion: "1.38",
465+
}
466+
etcdStorageData[gvr("resource.k8s.io", "v1beta1", "resourceslices")] = etcddata.StorageData{
467+
Stub: `{"metadata": {"name": "node2slice"}, "spec": {"nodeName": "worker1", "driver": "dra.example.com", "pool": {"name": "worker1", "resourceSliceCount": 1}}}`,
468+
ExpectedEtcdPath: "/registry/resourceslices/node2slice",
469+
ExpectedGVK: gvkP("resource.k8s.io", "v1beta2", "ResourceSlice"),
470+
IntroducedVersion: "1.32",
471+
RemovedVersion: "1.38",
472+
}
473+
etcdStorageData[gvr("resource.k8s.io", "v1beta2", "deviceclasses")] = etcddata.StorageData{
474+
Stub: `{"metadata": {"name": "class3name"}}`,
475+
ExpectedEtcdPath: "/registry/deviceclasses/class3name",
476+
ExpectedGVK: gvkP("resource.k8s.io", "v1beta2", "DeviceClass"),
477+
IntroducedVersion: "1.33",
478+
RemovedVersion: "1.39",
479+
}
480+
etcdStorageData[gvr("resource.k8s.io", "v1beta2", "resourceclaims")] = etcddata.StorageData{
481+
Stub: `{"metadata": {"name": "claim3name"}, "spec": {"devices": {"requests": [{"name": "req-0", "exactly": {"deviceClassName": "example-class", "allocationMode": "ExactCount", "count": 1}}]}}}`,
482+
ExpectedEtcdPath: "/registry/resourceclaims/" + oc.Namespace() + "/claim3name",
483+
ExpectedGVK: gvkP("resource.k8s.io", "v1beta2", "ResourceClaim"),
484+
IntroducedVersion: "1.33",
485+
RemovedVersion: "1.39",
486+
}
487+
etcdStorageData[gvr("resource.k8s.io", "v1beta2", "resourceclaimtemplates")] = etcddata.StorageData{
488+
Stub: `{"metadata": {"name": "claimtemplate3name"}, "spec": {"spec": {"devices": {"requests": [{"name": "req-0", "exactly": {"deviceClassName": "example-class", "allocationMode": "ExactCount", "count": 1}}]}}}}`,
489+
ExpectedEtcdPath: "/registry/resourceclaimtemplates/" + oc.Namespace() + "/claimtemplate3name",
490+
ExpectedGVK: gvkP("resource.k8s.io", "v1beta2", "ResourceClaimTemplate"),
491+
IntroducedVersion: "1.33",
492+
RemovedVersion: "1.39",
310493
}
311-
etcdStorageData[gvr("resource.k8s.io", "v1alpha3", "devicetaintrules")] = etcddata.StorageData{
312-
Stub: `{"metadata": {"name": "taint1name"}, "spec": {"taint": {"key": "example.com/taintkey", "value": "taintvalue", "effect": "NoSchedule"}}}`,
313-
ExpectedEtcdPath: "/registry/devicetaintrules/taint1name",
314-
ExpectedGVK: gvkP("resource.k8s.io", "v1alpha3", "DeviceTaintRule"),
494+
etcdStorageData[gvr("resource.k8s.io", "v1beta2", "resourceslices")] = etcddata.StorageData{
495+
Stub: `{"metadata": {"name": "node3slice"}, "spec": {"nodeName": "worker1", "driver": "dra.example.com", "pool": {"name": "worker1", "resourceSliceCount": 1}}}`,
496+
ExpectedEtcdPath: "/registry/resourceslices/node3slice",
497+
ExpectedGVK: gvkP("resource.k8s.io", "v1beta2", "ResourceSlice"),
498+
IntroducedVersion: "1.33",
499+
RemovedVersion: "1.39",
315500
}
316501

317502
// Removed etcd data.
318503
// TODO: When rebase has started, remove etcd storage data that has been removed
319-
// from k8s.io/kubernetes/test/integration/etcd/data.go in the 1.33 release.
320-
removeStorageData(t, etcdStorageData)
504+
// from k8s.io/kubernetes/test/integration/etcd/data.go in the 1.34 release.
505+
removeStorageData(t, etcdStorageData,
506+
gvr("resource.k8s.io", "v1alpha3", "deviceclasses"),
507+
gvr("resource.k8s.io", "v1alpha3", "resourceclaims"),
508+
gvr("resource.k8s.io", "v1alpha3", "resourceclaimtemplates"),
509+
gvr("resource.k8s.io", "v1alpha3", "resourceslices"),
510+
)
321511
}
322512

323513
// we use a different default path prefix for kube resources

0 commit comments

Comments
 (0)