Merge pull request #101034 from verb/1.22-ec-api

Switch alpha Pod ephemeralcontainers API to use Pod kind

api/api-rules/violation_exceptions.list

@@ -93,7 +93,6 @@ API rule violation: list_type_missing,k8s.io/api/core/v1,EphemeralContainerCommo
 API rule violation: list_type_missing,k8s.io/api/core/v1,EphemeralContainerCommon,Ports
 API rule violation: list_type_missing,k8s.io/api/core/v1,EphemeralContainerCommon,VolumeDevices
 API rule violation: list_type_missing,k8s.io/api/core/v1,EphemeralContainerCommon,VolumeMounts
-API rule violation: list_type_missing,k8s.io/api/core/v1,EphemeralContainers,EphemeralContainers
 API rule violation: list_type_missing,k8s.io/api/core/v1,ExecAction,Command
 API rule violation: list_type_missing,k8s.io/api/core/v1,FCVolumeSource,TargetWWNs
 API rule violation: list_type_missing,k8s.io/api/core/v1,FCVolumeSource,WWIDs

api/openapi-spec/swagger.json

@@ -6590,42 +6590,6 @@
       ],
       "type": "object"
     },
-    "io.k8s.api.core.v1.EphemeralContainers": {
-      "description": "A list of ephemeral containers used with the Pod ephemeralcontainers subresource.",
-      "properties": {
-        "apiVersion": {
-          "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
-          "type": "string"
-        },
-        "ephemeralContainers": {
-          "description": "A list of ephemeral containers associated with this pod. New ephemeral containers may be appended to this list, but existing ephemeral containers may not be removed or modified.",
-          "items": {
-            "$ref": "#/definitions/io.k8s.api.core.v1.EphemeralContainer"
-          },
-          "type": "array",
-          "x-kubernetes-patch-merge-key": "name",
-          "x-kubernetes-patch-strategy": "merge"
-        },
-        "kind": {
-          "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
-          "type": "string"
-        },
-        "metadata": {
-          "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta"
-        }
-      },
-      "required": [
-        "ephemeralContainers"
-      ],
-      "type": "object",
-      "x-kubernetes-group-version-kind": [
-        {
-          "group": "",
-          "kind": "EphemeralContainers",
-          "version": "v1"
-        }
-      ]
-    },
     "io.k8s.api.core.v1.EphemeralVolumeSource": {
       "description": "Represents an ephemeral volume that is handled by a normal storage driver.",
       "properties": {
@@ -24896,7 +24860,7 @@
           "200": {
             "description": "OK",
             "schema": {
-              "$ref": "#/definitions/io.k8s.api.core.v1.EphemeralContainers"
+              "$ref": "#/definitions/io.k8s.api.core.v1.Pod"
             }
           },
           "401": {
@@ -24912,13 +24876,13 @@
         "x-kubernetes-action": "get",
         "x-kubernetes-group-version-kind": {
           "group": "",
-          "kind": "EphemeralContainers",
+          "kind": "Pod",
           "version": "v1"
         }
       },
       "parameters": [
         {
-          "description": "name of the EphemeralContainers",
+          "description": "name of the Pod",
           "in": "path",
           "name": "name",
           "required": true,
@@ -24990,13 +24954,13 @@
           "200": {
             "description": "OK",
             "schema": {
-              "$ref": "#/definitions/io.k8s.api.core.v1.EphemeralContainers"
+              "$ref": "#/definitions/io.k8s.api.core.v1.Pod"
             }
           },
           "201": {
             "description": "Created",
             "schema": {
-              "$ref": "#/definitions/io.k8s.api.core.v1.EphemeralContainers"
+              "$ref": "#/definitions/io.k8s.api.core.v1.Pod"
             }
           },
           "401": {
@@ -25012,7 +24976,7 @@
         "x-kubernetes-action": "patch",
         "x-kubernetes-group-version-kind": {
           "group": "",
-          "kind": "EphemeralContainers",
+          "kind": "Pod",
           "version": "v1"
         }
       },
@@ -25028,7 +24992,7 @@
             "name": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/io.k8s.api.core.v1.EphemeralContainers"
+              "$ref": "#/definitions/io.k8s.api.core.v1.Pod"
             }
           },
           {
@@ -25055,13 +25019,13 @@
           "200": {
             "description": "OK",
             "schema": {
-              "$ref": "#/definitions/io.k8s.api.core.v1.EphemeralContainers"
+              "$ref": "#/definitions/io.k8s.api.core.v1.Pod"
             }
           },
           "201": {
             "description": "Created",
             "schema": {
-              "$ref": "#/definitions/io.k8s.api.core.v1.EphemeralContainers"
+              "$ref": "#/definitions/io.k8s.api.core.v1.Pod"
             }
           },
           "401": {
@@ -25077,7 +25041,7 @@
         "x-kubernetes-action": "put",
         "x-kubernetes-group-version-kind": {
           "group": "",
-          "kind": "EphemeralContainers",
+          "kind": "Pod",
           "version": "v1"
         }
       }