Merge pull request #28458 from soltysh/etcd_test

OCPNODE-1892: Update etcd test data for 1.29 release

Author: openshift-merge-bot[bot]

test/extended/etcd/etcd_storage_path.go

@@ -286,7 +286,7 @@ func testEtcd3StoragePath(t g.GinkgoTInterface, oc *exutil.CLI, etcdClient3Fn fu
 		for k, a := range map[schema.GroupVersionResource]etcddata.StorageData{
 			// Added etcd data.
 			// TODO: When rebase has started, add etcd storage data has been added to
-			//       k8s.io/kubernetes/test/integration/etcd/data.go in the 1.27 release.
+			//       k8s.io/kubernetes/test/integration/etcd/data.go in the 1.29 release.
 
 			// compare https://github.com/kubernetes/kubernetes/pull/121089
 			gvr("flowcontrol.apiserver.k8s.io", "v1", "flowschemas"): {
@@ -308,11 +308,23 @@ func testEtcd3StoragePath(t g.GinkgoTInterface, oc *exutil.CLI, etcdClient3Fn fu
 
 		// Modified etcd data.
 		// 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.27 release.
+		//       in k8s.io/kubernetes/test/integration/etcd/data.go in the 1.29 release.
+
+		// compare https://github.com/kubernetes/kubernetes/pull/120018
+		etcdStorageData[gvr("admissionregistration.k8s.io", "v1alpha1", "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", "v1beta1", "ValidatingAdmissionPolicy"),
+		}
+		etcdStorageData[gvr("admissionregistration.k8s.io", "v1alpha1", "validatingadmissionpolicybindings")] = etcddata.StorageData{
+			Stub:             `{"metadata":{"name":"pb1","creationTimestamp":null},"spec":{"policyName":"replicalimit-policy.example.com","paramRef":{"name":"replica-limit-test.example.com"},"validationActions":["Deny"]}}`,
+			ExpectedEtcdPath: "/registry/validatingadmissionpolicybindings/pb1",
+			ExpectedGVK:      gvkP("admissionregistration.k8s.io", "v1beta1", "ValidatingAdmissionPolicyBinding"),
+		}
 
 		// 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.27 release.
+		//       from k8s.io/kubernetes/test/integration/etcd/data.go in the 1.29 release.
 		removeStorageData(t, etcdStorageData)
 	}