diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json index 3059c2e1960..2478b5983f0 100644 --- a/api/openapi-spec/swagger.json +++ b/api/openapi-spec/swagger.json @@ -29,7 +29,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.APIVersions" + "$ref": "#/definitions/v1.APIVersions" } }, "401": { @@ -62,7 +62,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.APIResourceList" + "$ref": "#/definitions/v1.APIResourceList" } }, "401": { @@ -670,7 +670,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -910,7 +910,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -1066,7 +1066,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -1099,7 +1099,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -1307,7 +1307,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -1463,7 +1463,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -1496,7 +1496,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -1704,7 +1704,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -1860,7 +1860,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -1893,7 +1893,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -2101,7 +2101,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -2257,7 +2257,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -2290,7 +2290,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -2498,7 +2498,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -2654,7 +2654,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -2687,7 +2687,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -2823,7 +2823,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -3031,7 +3031,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -3187,7 +3187,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -3220,7 +3220,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -3705,13 +3705,6 @@ "name": "sinceSeconds", "in": "query" }, - { - "uniqueItems": true, - "type": "string", - "description": "An RFC3339 timestamp from which to show logs. If this value precedes the time a pod was started, only logs since the pod start will be returned. If this value is in the future, no logs will be returned. Only one of sinceSeconds or sinceTime may be specified.", - "name": "sinceTime", - "in": "query" - }, { "uniqueItems": true, "type": "integer", @@ -4282,7 +4275,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -4490,7 +4483,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -4646,7 +4639,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -4679,7 +4672,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -4887,7 +4880,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -5043,7 +5036,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -5076,7 +5069,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -5212,7 +5205,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -5348,7 +5341,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -5556,7 +5549,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -5712,7 +5705,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -5745,7 +5738,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -5881,7 +5874,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -6089,7 +6082,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -6245,7 +6238,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -6278,7 +6271,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -6486,7 +6479,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -6642,7 +6635,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -6675,7 +6668,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -6949,7 +6942,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -6982,7 +6975,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -7504,7 +7497,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -7676,7 +7669,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -7709,7 +7702,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -7893,7 +7886,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -8093,7 +8086,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -8241,7 +8234,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -8274,7 +8267,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -8772,7 +8765,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -9049,7 +9042,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -9197,7 +9190,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -9230,7 +9223,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -9358,7 +9351,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -14601,7 +14594,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.APIGroupList" + "$ref": "#/definitions/v1.APIGroupList" } }, "401": { @@ -14634,7 +14627,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.APIGroup" + "$ref": "#/definitions/v1.APIGroup" } }, "401": { @@ -14667,7 +14660,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.APIResourceList" + "$ref": "#/definitions/v1.APIResourceList" } }, "401": { @@ -14842,7 +14835,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -14998,7 +14991,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -15031,7 +15024,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -15167,7 +15160,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -15565,7 +15558,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.APIGroup" + "$ref": "#/definitions/v1.APIGroup" } }, "401": { @@ -15598,7 +15591,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.APIResourceList" + "$ref": "#/definitions/v1.APIResourceList" } }, "401": { @@ -15679,7 +15672,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.APIGroup" + "$ref": "#/definitions/v1.APIGroup" } }, "401": { @@ -15712,7 +15705,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.APIResourceList" + "$ref": "#/definitions/v1.APIResourceList" } }, "401": { @@ -15897,7 +15890,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.APIGroup" + "$ref": "#/definitions/v1.APIGroup" } }, "401": { @@ -15930,7 +15923,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.APIResourceList" + "$ref": "#/definitions/v1.APIResourceList" } }, "401": { @@ -16182,7 +16175,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -16338,7 +16331,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -16371,7 +16364,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -16507,7 +16500,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -16828,7 +16821,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.APIGroup" + "$ref": "#/definitions/v1.APIGroup" } }, "401": { @@ -16861,7 +16854,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.APIResourceList" + "$ref": "#/definitions/v1.APIResourceList" } }, "401": { @@ -17113,7 +17106,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -17269,7 +17262,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -17302,7 +17295,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -17438,7 +17431,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -17759,7 +17752,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.APIResourceList" + "$ref": "#/definitions/v1.APIResourceList" } }, "401": { @@ -18088,7 +18081,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -18244,7 +18237,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -18277,7 +18270,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -18413,7 +18406,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -18621,7 +18614,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -18777,7 +18770,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -18810,7 +18803,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -18946,7 +18939,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -19154,7 +19147,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -19310,7 +19303,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -19343,7 +19336,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -19479,7 +19472,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -20387,7 +20380,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.APIGroup" + "$ref": "#/definitions/v1.APIGroup" } }, "401": { @@ -20420,7 +20413,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.APIResourceList" + "$ref": "#/definitions/v1.APIResourceList" } }, "401": { @@ -20595,7 +20588,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -20743,7 +20736,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -20776,7 +20769,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -21108,7 +21101,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.APIGroup" + "$ref": "#/definitions/v1.APIGroup" } }, "401": { @@ -21141,7 +21134,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.APIResourceList" + "$ref": "#/definitions/v1.APIResourceList" } }, "401": { @@ -21701,7 +21694,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -21857,7 +21850,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -21890,7 +21883,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -22026,7 +22019,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -22234,7 +22227,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -22390,7 +22383,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -22423,7 +22416,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -22623,7 +22616,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -22759,7 +22752,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -22967,7 +22960,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -23123,7 +23116,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -23156,7 +23149,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -23292,7 +23285,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -23500,7 +23493,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -23656,7 +23649,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -23689,7 +23682,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -23825,7 +23818,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -24033,7 +24026,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -24189,7 +24182,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -24222,7 +24215,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -24358,7 +24351,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -24566,7 +24559,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -24722,7 +24715,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -24755,7 +24748,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -24963,7 +24956,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -25119,7 +25112,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -25152,7 +25145,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -25288,7 +25281,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -25424,7 +25417,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -25560,7 +25553,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -25922,7 +25915,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -26070,7 +26063,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -26103,7 +26096,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -28108,7 +28101,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.APIGroup" + "$ref": "#/definitions/v1.APIGroup" } }, "401": { @@ -28141,7 +28134,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.APIResourceList" + "$ref": "#/definitions/v1.APIResourceList" } }, "401": { @@ -28316,7 +28309,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -28472,7 +28465,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -28505,7 +28498,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -28641,7 +28634,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -29039,7 +29032,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.APIGroup" + "$ref": "#/definitions/v1.APIGroup" } }, "401": { @@ -29072,7 +29065,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.APIResourceList" + "$ref": "#/definitions/v1.APIResourceList" } }, "401": { @@ -29247,7 +29240,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -29379,7 +29372,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -29412,7 +29405,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -29612,7 +29605,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -29744,7 +29737,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -29777,7 +29770,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -29977,7 +29970,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -30117,7 +30110,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -30150,7 +30143,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -30358,7 +30351,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -30498,7 +30491,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -30531,7 +30524,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -31585,7 +31578,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.APIGroup" + "$ref": "#/definitions/v1.APIGroup" } }, "401": { @@ -31618,7 +31611,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.APIResourceList" + "$ref": "#/definitions/v1.APIResourceList" } }, "401": { @@ -31793,7 +31786,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -31941,7 +31934,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -31974,7 +31967,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -32263,7 +32256,7 @@ } } }, - "unversioned.APIGroup": { + "v1.APIGroup": { "description": "APIGroup contains the name, the supported versions, and the preferred version of a group.", "required": [ "name", @@ -32277,25 +32270,25 @@ }, "preferredVersion": { "description": "preferredVersion is the version preferred by the API server, which probably is the storage version.", - "$ref": "#/definitions/unversioned.GroupVersionForDiscovery" + "$ref": "#/definitions/v1.GroupVersionForDiscovery" }, "serverAddressByClientCIDRs": { "description": "a map of client CIDR to server address that is serving this group. This is to help clients reach servers in the most network-efficient way possible. Clients can use the appropriate server address as per the CIDR that they match. In case of multiple matches, clients should use the longest matching CIDR. The server returns only those CIDRs that it thinks that the client can match. For example: the master will return an internal IP CIDR only, if the client reaches the server using an internal IP. Server looks at X-Forwarded-For header or X-Real-Ip header or request.RemoteAddr (in that order) to get the client IP.", "type": "array", "items": { - "$ref": "#/definitions/unversioned.ServerAddressByClientCIDR" + "$ref": "#/definitions/v1.ServerAddressByClientCIDR" } }, "versions": { "description": "versions are the versions supported in this group.", "type": "array", "items": { - "$ref": "#/definitions/unversioned.GroupVersionForDiscovery" + "$ref": "#/definitions/v1.GroupVersionForDiscovery" } } } }, - "unversioned.APIGroupList": { + "v1.APIGroupList": { "description": "APIGroupList is a list of APIGroup, to allow clients to discover the API at /apis.", "required": [ "groups" @@ -32305,12 +32298,12 @@ "description": "groups is a list of APIGroup.", "type": "array", "items": { - "$ref": "#/definitions/unversioned.APIGroup" + "$ref": "#/definitions/v1.APIGroup" } } } }, - "unversioned.APIResource": { + "v1.APIResource": { "description": "APIResource specifies the name of a resource and whether it is namespaced.", "required": [ "name", @@ -32332,7 +32325,7 @@ } } }, - "unversioned.APIResourceList": { + "v1.APIResourceList": { "description": "APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.", "required": [ "groupVersion", @@ -32347,12 +32340,12 @@ "description": "resources contains the name of the resources and if they are namespaced.", "type": "array", "items": { - "$ref": "#/definitions/unversioned.APIResource" + "$ref": "#/definitions/v1.APIResource" } } } }, - "unversioned.APIVersions": { + "v1.APIVersions": { "description": "APIVersions lists the versions that are available, to allow clients to discover the API at /api, which is the root path of the legacy v1 API.", "required": [ "versions", @@ -32363,7 +32356,7 @@ "description": "a map of client CIDR to server address that is serving this group. This is to help clients reach servers in the most network-efficient way possible. Clients can use the appropriate server address as per the CIDR that they match. In case of multiple matches, clients should use the longest matching CIDR. The server returns only those CIDRs that it thinks that the client can match. For example: the master will return an internal IP CIDR only, if the client reaches the server using an internal IP. Server looks at X-Forwarded-For header or X-Real-Ip header or request.RemoteAddr (in that order) to get the client IP.", "type": "array", "items": { - "$ref": "#/definitions/unversioned.ServerAddressByClientCIDR" + "$ref": "#/definitions/v1.ServerAddressByClientCIDR" } }, "versions": { @@ -32375,179 +32368,6 @@ } } }, - "unversioned.GroupVersionForDiscovery": { - "description": "GroupVersion contains the \"group/version\" and \"version\" string of a version. It is made a struct to keep extensibility.", - "required": [ - "groupVersion", - "version" - ], - "properties": { - "groupVersion": { - "description": "groupVersion specifies the API group and version in the form \"group/version\"", - "type": "string" - }, - "version": { - "description": "version specifies the version in the form of \"version\". This is to save the clients the trouble of splitting the GroupVersion.", - "type": "string" - } - } - }, - "unversioned.LabelSelector": { - "description": "A label selector is a label query over a set of resources. The result of matchLabels and matchExpressions are ANDed. An empty label selector matches all objects. A null label selector matches no objects.", - "properties": { - "matchExpressions": { - "description": "matchExpressions is a list of label selector requirements. The requirements are ANDed.", - "type": "array", - "items": { - "$ref": "#/definitions/unversioned.LabelSelectorRequirement" - } - }, - "matchLabels": { - "description": "matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is \"key\", the operator is \"In\", and the values array contains only \"value\". The requirements are ANDed.", - "type": "object", - "additionalProperties": { - "type": "string" - } - } - } - }, - "unversioned.LabelSelectorRequirement": { - "description": "A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.", - "required": [ - "key", - "operator" - ], - "properties": { - "key": { - "description": "key is the label key that the selector applies to.", - "type": "string" - }, - "operator": { - "description": "operator represents a key's relationship to a set of values. Valid operators ard In, NotIn, Exists and DoesNotExist.", - "type": "string" - }, - "values": { - "description": "values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.", - "type": "array", - "items": { - "type": "string" - } - } - } - }, - "unversioned.ListMeta": { - "description": "ListMeta describes metadata that synthetic resources must have, including lists and various status objects. A resource may have only one of {ObjectMeta, ListMeta}.", - "properties": { - "resourceVersion": { - "description": "String that identifies the server's internal version of this object that can be used by clients to determine when objects have changed. Value must be treated as opaque by clients and passed unmodified back to the server. Populated by the system. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#concurrency-control-and-consistency", - "type": "string" - }, - "selfLink": { - "description": "SelfLink is a URL representing this object. Populated by the system. Read-only.", - "type": "string" - } - } - }, - "unversioned.Patch": { - "description": "Patch is provided to give a concrete name and type to the Kubernetes PATCH request body." - }, - "unversioned.ServerAddressByClientCIDR": { - "description": "ServerAddressByClientCIDR helps the client to determine the server address that they should use, depending on the clientCIDR that they match.", - "required": [ - "clientCIDR", - "serverAddress" - ], - "properties": { - "clientCIDR": { - "description": "The CIDR with which clients can match their IP to figure out the server address that they should use.", - "type": "string" - }, - "serverAddress": { - "description": "Address of this server, suitable for a client that matches the above CIDR. This can be a hostname, hostname:port, IP or IP:port.", - "type": "string" - } - } - }, - "unversioned.Status": { - "description": "Status is a return value for calls that don't return other objects.", - "properties": { - "code": { - "description": "Suggested HTTP return code for this status, 0 if not set.", - "type": "integer", - "format": "int32" - }, - "details": { - "description": "Extended data associated with the reason. Each reason may define its own extended details. This field is optional and the data returned is not guaranteed to conform to any schema except that defined by the reason type.", - "$ref": "#/definitions/unversioned.StatusDetails" - }, - "message": { - "description": "A human-readable description of the status of this operation.", - "type": "string" - }, - "metadata": { - "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds", - "$ref": "#/definitions/unversioned.ListMeta" - }, - "reason": { - "description": "A machine-readable description of why this operation is in the \"Failure\" status. If this value is empty there is no information available. A Reason clarifies an HTTP status code but does not override it.", - "type": "string" - }, - "status": { - "description": "Status of the operation. One of: \"Success\" or \"Failure\". More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status", - "type": "string" - } - } - }, - "unversioned.StatusCause": { - "description": "StatusCause provides more information about an api.Status failure, including cases when multiple errors are encountered.", - "properties": { - "field": { - "description": "The field of the resource that has caused this error, as named by its JSON serialization. May include dot and postfix notation for nested attributes. Arrays are zero-indexed. Fields may appear more than once in an array of causes due to fields having multiple errors. Optional.\n\nExamples:\n \"name\" - the field \"name\" on the current resource\n \"items[0].name\" - the field \"name\" on the first array entry in \"items\"", - "type": "string" - }, - "message": { - "description": "A human-readable description of the cause of the error. This field may be presented as-is to a reader.", - "type": "string" - }, - "reason": { - "description": "A machine-readable description of the cause of the error. If this value is empty there is no information available.", - "type": "string" - } - } - }, - "unversioned.StatusDetails": { - "description": "StatusDetails is a set of additional properties that MAY be set by the server to provide additional information about a response. The Reason field of a Status object defines what attributes will be set. Clients must ignore fields that do not match the defined type of each attribute, and should assume that any attribute may be empty, invalid, or under defined.", - "properties": { - "causes": { - "description": "The Causes array includes more details associated with the StatusReason failure. Not all StatusReasons may provide detailed causes.", - "type": "array", - "items": { - "$ref": "#/definitions/unversioned.StatusCause" - } - }, - "group": { - "description": "The group attribute of the resource associated with the status StatusReason.", - "type": "string" - }, - "kind": { - "description": "The kind attribute of the resource associated with the status StatusReason. On some operations may differ from the requested resource Kind. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds", - "type": "string" - }, - "name": { - "description": "The name attribute of the resource associated with the status StatusReason (when there is a single name which can be described).", - "type": "string" - }, - "retryAfterSeconds": { - "description": "If specified, the time in seconds before the operation should be retried.", - "type": "integer", - "format": "int32" - } - } - }, - "unversioned.Time": { - "type": "string", - "format": "date-time" - }, "v1.AttachedVolume": { "description": "AttachedVolume describes a volume attached to a node", "required": [ @@ -32656,7 +32476,7 @@ }, "metadata": { "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds", - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -32703,7 +32523,7 @@ }, "metadata": { "description": "More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata", - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -32874,7 +32694,7 @@ "properties": { "startedAt": { "description": "Time at which the container was last (re-)started", - "$ref": "#/definitions/unversioned.Time" + "$ref": "#/definitions/v1.Time" } } }, @@ -32895,7 +32715,7 @@ }, "finishedAt": { "description": "Time at which the container last terminated", - "$ref": "#/definitions/unversioned.Time" + "$ref": "#/definitions/v1.Time" }, "message": { "description": "Message regarding the last termination of the container", @@ -32912,7 +32732,7 @@ }, "startedAt": { "description": "Time at which previous execution of the container started", - "$ref": "#/definitions/unversioned.Time" + "$ref": "#/definitions/v1.Time" } } }, @@ -33131,7 +32951,7 @@ }, "metadata": { "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds", - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -33190,7 +33010,7 @@ }, "firstTimestamp": { "description": "The time at which the event was first recorded. (Time of server receipt is in TypeMeta.)", - "$ref": "#/definitions/unversioned.Time" + "$ref": "#/definitions/v1.Time" }, "involvedObject": { "description": "The object that this event is about.", @@ -33198,7 +33018,7 @@ }, "lastTimestamp": { "description": "The time at which the most recent occurrence of this event was recorded.", - "$ref": "#/definitions/unversioned.Time" + "$ref": "#/definitions/v1.Time" }, "message": { "description": "A human-readable description of the status of this operation.", @@ -33237,7 +33057,7 @@ }, "metadata": { "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds", - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -33266,6 +33086,23 @@ } } }, + "v1.GroupVersionForDiscovery": { + "description": "GroupVersion contains the \"group/version\" and \"version\" string of a version. It is made a struct to keep extensibility.", + "required": [ + "groupVersion", + "version" + ], + "properties": { + "groupVersion": { + "description": "groupVersion specifies the API group and version in the form \"group/version\"", + "type": "string" + }, + "version": { + "description": "version specifies the version in the form of \"version\". This is to save the clients the trouble of splitting the GroupVersion.", + "type": "string" + } + } + }, "v1.HTTPGetAction": { "description": "HTTPGetAction describes an action based on HTTP Get requests.", "required": [ @@ -33363,7 +33200,7 @@ }, "metadata": { "description": "Standard list metadata.", - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -33419,7 +33256,7 @@ }, "lastScaleTime": { "description": "last time the HorizontalPodAutoscaler scaled the number of pods; used by the autoscaler to control how often the number of pods is changed.", - "$ref": "#/definitions/unversioned.Time" + "$ref": "#/definitions/v1.Time" }, "observedGeneration": { "description": "most recent generation observed by this autoscaler.", @@ -33454,11 +33291,11 @@ "properties": { "lastProbeTime": { "description": "Last time the condition was checked.", - "$ref": "#/definitions/unversioned.Time" + "$ref": "#/definitions/v1.Time" }, "lastTransitionTime": { "description": "Last time the condition transit from one status to another.", - "$ref": "#/definitions/unversioned.Time" + "$ref": "#/definitions/v1.Time" }, "message": { "description": "Human readable message indicating details about last transition.", @@ -33493,7 +33330,7 @@ }, "metadata": { "description": "Standard list metadata More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata", - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -33524,7 +33361,7 @@ }, "selector": { "description": "Selector is a label query over pods that should match the pod count. Normally, the system sets this field for you. More info: http://kubernetes.io/docs/user-guide/labels#label-selectors", - "$ref": "#/definitions/unversioned.LabelSelector" + "$ref": "#/definitions/v1.LabelSelector" }, "template": { "description": "Template is the object that describes the pod that will be created when executing a job. More info: http://kubernetes.io/docs/user-guide/jobs", @@ -33542,7 +33379,7 @@ }, "completionTime": { "description": "CompletionTime represents time when the job was completed. It is not guaranteed to be set in happens-before order across separate operations. It is represented in RFC3339 form and is in UTC.", - "$ref": "#/definitions/unversioned.Time" + "$ref": "#/definitions/v1.Time" }, "conditions": { "description": "Conditions represent the latest available observations of an object's current state. More info: http://kubernetes.io/docs/user-guide/jobs", @@ -33558,7 +33395,7 @@ }, "startTime": { "description": "StartTime represents time when the job was acknowledged by the Job Manager. It is not guaranteed to be set in happens-before order across separate operations. It is represented in RFC3339 form and is in UTC.", - "$ref": "#/definitions/unversioned.Time" + "$ref": "#/definitions/v1.Time" }, "succeeded": { "description": "Succeeded is the number of pods which reached Phase Succeeded.", @@ -33567,6 +33404,49 @@ } } }, + "v1.LabelSelector": { + "description": "A label selector is a label query over a set of resources. The result of matchLabels and matchExpressions are ANDed. An empty label selector matches all objects. A null label selector matches no objects.", + "properties": { + "matchExpressions": { + "description": "matchExpressions is a list of label selector requirements. The requirements are ANDed.", + "type": "array", + "items": { + "$ref": "#/definitions/v1.LabelSelectorRequirement" + } + }, + "matchLabels": { + "description": "matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is \"key\", the operator is \"In\", and the values array contains only \"value\". The requirements are ANDed.", + "type": "object", + "additionalProperties": { + "type": "string" + } + } + } + }, + "v1.LabelSelectorRequirement": { + "description": "A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.", + "required": [ + "key", + "operator" + ], + "properties": { + "key": { + "description": "key is the label key that the selector applies to.", + "type": "string" + }, + "operator": { + "description": "operator represents a key's relationship to a set of values. Valid operators ard In, NotIn, Exists and DoesNotExist.", + "type": "string" + }, + "values": { + "description": "values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.", + "type": "array", + "items": { + "type": "string" + } + } + } + }, "v1.Lifecycle": { "description": "Lifecycle describes actions that the management system should take in response to container lifecycle events. For the PostStart and PreStop lifecycle handlers, management of the container blocks until the action is complete, unless the container process fails, in which case the handler is aborted.", "properties": { @@ -33652,7 +33532,7 @@ }, "metadata": { "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds", - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -33671,6 +33551,19 @@ } } }, + "v1.ListMeta": { + "description": "ListMeta describes metadata that synthetic resources must have, including lists and various status objects. A resource may have only one of {ObjectMeta, ListMeta}.", + "properties": { + "resourceVersion": { + "description": "String that identifies the server's internal version of this object that can be used by clients to determine when objects have changed. Value must be treated as opaque by clients and passed unmodified back to the server. Populated by the system. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#concurrency-control-and-consistency", + "type": "string" + }, + "selfLink": { + "description": "SelfLink is a URL representing this object. Populated by the system. Read-only.", + "type": "string" + } + } + }, "v1.LoadBalancerIngress": { "description": "LoadBalancerIngress represents the status of a load-balancer ingress point: traffic intended for the service should be sent to an ingress point.", "properties": { @@ -33737,7 +33630,7 @@ }, "metadata": { "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds", - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -33805,11 +33698,11 @@ "properties": { "lastHeartbeatTime": { "description": "Last time we got an update on a given condition.", - "$ref": "#/definitions/unversioned.Time" + "$ref": "#/definitions/v1.Time" }, "lastTransitionTime": { "description": "Last time the condition transit from one status to another.", - "$ref": "#/definitions/unversioned.Time" + "$ref": "#/definitions/v1.Time" }, "message": { "description": "Human readable message indicating details about last transition.", @@ -33853,7 +33746,7 @@ }, "metadata": { "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds", - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -34033,7 +33926,7 @@ }, "creationTimestamp": { "description": "CreationTimestamp is a timestamp representing the server time when this object was created. It is not guaranteed to be set in happens-before order across separate operations. Clients may not set this value. It is represented in RFC3339 form and is in UTC.\n\nPopulated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata", - "$ref": "#/definitions/unversioned.Time" + "$ref": "#/definitions/v1.Time" }, "deletionGracePeriodSeconds": { "description": "Number of seconds allowed for this object to gracefully terminate before it will be removed from the system. Only set when deletionTimestamp is also set. May only be shortened. Read-only.", @@ -34042,7 +33935,7 @@ }, "deletionTimestamp": { "description": "DeletionTimestamp is RFC 3339 date and time at which this resource will be deleted. This field is set by the server when a graceful deletion is requested by the user, and is not directly settable by a client. The resource is expected to be deleted (no longer visible from resource lists, and not reachable by name) after the time in this field. Once set, this value may not be unset or be set further into the future, although it may be shortened or the resource may be deleted prior to this time. For example, a user may request that a pod is deleted in 30 seconds. The Kubelet will react by sending a graceful termination signal to the containers in the pod. After that 30 seconds, the Kubelet will send a hard termination signal (SIGKILL) to the container and after cleanup, remove the pod from the API. In the presence of network partitions, this object may still exist after this timestamp, until an administrator or automated process can determine the resource is fully terminated. If not set, graceful deletion of the object has not been requested.\n\nPopulated by the system when a graceful deletion is requested. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata", - "$ref": "#/definitions/unversioned.Time" + "$ref": "#/definitions/v1.Time" }, "finalizers": { "description": "Must be empty before the object is deleted from the registry. Each entry is an identifier for the responsible component that will remove the entry from the list. If the deletionTimestamp of the object is non-nil, entries in this list can only be removed.", @@ -34160,6 +34053,9 @@ } } }, + "v1.Patch": { + "description": "Patch is provided to give a concrete name and type to the Kubernetes PATCH request body." + }, "v1.PersistentVolume": { "description": "PersistentVolume (PV) is a storage resource provisioned by an administrator. It is analogous to a node. More info: http://kubernetes.io/docs/user-guide/persistent-volumes", "properties": { @@ -34209,7 +34105,7 @@ }, "metadata": { "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds", - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -34229,7 +34125,7 @@ }, "selector": { "description": "A label query over volumes to consider for binding.", - "$ref": "#/definitions/unversioned.LabelSelector" + "$ref": "#/definitions/v1.LabelSelector" }, "volumeName": { "description": "VolumeName is the binding reference to the PersistentVolume backing this claim.", @@ -34275,7 +34171,7 @@ }, "metadata": { "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds", - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -34349,11 +34245,11 @@ "properties": { "lastProbeTime": { "description": "Last time we probed the condition.", - "$ref": "#/definitions/unversioned.Time" + "$ref": "#/definitions/v1.Time" }, "lastTransitionTime": { "description": "Last time the condition transitioned from one status to another.", - "$ref": "#/definitions/unversioned.Time" + "$ref": "#/definitions/v1.Time" }, "message": { "description": "Human-readable message indicating details about last transition.", @@ -34388,7 +34284,7 @@ }, "metadata": { "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds", - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -34552,7 +34448,7 @@ }, "startTime": { "description": "RFC 3339 date and time at which the object was acknowledged by the Kubelet. This is before the Kubelet pulled the container image(s) for the pod.", - "$ref": "#/definitions/unversioned.Time" + "$ref": "#/definitions/v1.Time" } } }, @@ -34584,7 +34480,7 @@ }, "metadata": { "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds", - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -34666,7 +34562,7 @@ "properties": { "lastTransitionTime": { "description": "The last time the condition transitioned from one status to another.", - "$ref": "#/definitions/unversioned.Time" + "$ref": "#/definitions/v1.Time" }, "message": { "description": "A human readable message indicating details about the transition.", @@ -34701,7 +34597,7 @@ }, "metadata": { "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds", - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -34823,7 +34719,7 @@ }, "metadata": { "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds", - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -35004,7 +34900,7 @@ }, "metadata": { "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds", - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -35038,6 +34934,23 @@ } } }, + "v1.ServerAddressByClientCIDR": { + "description": "ServerAddressByClientCIDR helps the client to determine the server address that they should use, depending on the clientCIDR that they match.", + "required": [ + "clientCIDR", + "serverAddress" + ], + "properties": { + "clientCIDR": { + "description": "The CIDR with which clients can match their IP to figure out the server address that they should use.", + "type": "string" + }, + "serverAddress": { + "description": "Address of this server, suitable for a client that matches the above CIDR. This can be a hostname, hostname:port, IP or IP:port.", + "type": "string" + } + } + }, "v1.Service": { "description": "Service is a named abstraction of software service (for example, mysql) consisting of local port (for example 3306) that the proxy listens on, and the selector that determines which pods will answer requests sent through the proxy.", "properties": { @@ -35093,7 +35006,7 @@ }, "metadata": { "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds", - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -35112,7 +35025,7 @@ }, "metadata": { "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds", - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -35218,6 +35131,82 @@ } } }, + "v1.Status": { + "description": "Status is a return value for calls that don't return other objects.", + "properties": { + "code": { + "description": "Suggested HTTP return code for this status, 0 if not set.", + "type": "integer", + "format": "int32" + }, + "details": { + "description": "Extended data associated with the reason. Each reason may define its own extended details. This field is optional and the data returned is not guaranteed to conform to any schema except that defined by the reason type.", + "$ref": "#/definitions/v1.StatusDetails" + }, + "message": { + "description": "A human-readable description of the status of this operation.", + "type": "string" + }, + "metadata": { + "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds", + "$ref": "#/definitions/v1.ListMeta" + }, + "reason": { + "description": "A machine-readable description of why this operation is in the \"Failure\" status. If this value is empty there is no information available. A Reason clarifies an HTTP status code but does not override it.", + "type": "string" + }, + "status": { + "description": "Status of the operation. One of: \"Success\" or \"Failure\". More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status", + "type": "string" + } + } + }, + "v1.StatusCause": { + "description": "StatusCause provides more information about an api.Status failure, including cases when multiple errors are encountered.", + "properties": { + "field": { + "description": "The field of the resource that has caused this error, as named by its JSON serialization. May include dot and postfix notation for nested attributes. Arrays are zero-indexed. Fields may appear more than once in an array of causes due to fields having multiple errors. Optional.\n\nExamples:\n \"name\" - the field \"name\" on the current resource\n \"items[0].name\" - the field \"name\" on the first array entry in \"items\"", + "type": "string" + }, + "message": { + "description": "A human-readable description of the cause of the error. This field may be presented as-is to a reader.", + "type": "string" + }, + "reason": { + "description": "A machine-readable description of the cause of the error. If this value is empty there is no information available.", + "type": "string" + } + } + }, + "v1.StatusDetails": { + "description": "StatusDetails is a set of additional properties that MAY be set by the server to provide additional information about a response. The Reason field of a Status object defines what attributes will be set. Clients must ignore fields that do not match the defined type of each attribute, and should assume that any attribute may be empty, invalid, or under defined.", + "properties": { + "causes": { + "description": "The Causes array includes more details associated with the StatusReason failure. Not all StatusReasons may provide detailed causes.", + "type": "array", + "items": { + "$ref": "#/definitions/v1.StatusCause" + } + }, + "group": { + "description": "The group attribute of the resource associated with the status StatusReason.", + "type": "string" + }, + "kind": { + "description": "The kind attribute of the resource associated with the status StatusReason. On some operations may differ from the requested resource Kind. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds", + "type": "string" + }, + "name": { + "description": "The name attribute of the resource associated with the status StatusReason (when there is a single name which can be described).", + "type": "string" + }, + "retryAfterSeconds": { + "description": "If specified, the time in seconds before the operation should be retried.", + "type": "integer", + "format": "int32" + } + } + }, "v1.TCPSocketAction": { "description": "TCPSocketAction describes an action based on opening a socket", "required": [ @@ -35230,6 +35219,10 @@ } } }, + "v1.Time": { + "type": "string", + "format": "date-time" + }, "v1.Volume": { "description": "Volume represents a named volume in a pod that may be accessed by any container in the pod.", "required": [ @@ -35290,7 +35283,7 @@ "properties": { "lastUpdateTime": { "description": "timestamp for the last update to this condition", - "$ref": "#/definitions/unversioned.Time" + "$ref": "#/definitions/v1.Time" }, "message": { "description": "human readable message with details about the request state", @@ -35318,7 +35311,7 @@ } }, "metadata": { - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -35422,7 +35415,7 @@ }, "metadata": { "description": "Standard object's metadata.", - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -35441,7 +35434,7 @@ }, "metadata": { "description": "Standard object's metadata.", - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -35550,7 +35543,7 @@ }, "metadata": { "description": "Standard object's metadata.", - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -35569,7 +35562,7 @@ }, "metadata": { "description": "Standard object's metadata.", - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -35673,7 +35666,7 @@ }, "metadata": { "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata", - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -35685,7 +35678,7 @@ "properties": { "selector": { "description": "Selector is a label query over pods that are managed by the daemon set. Must match in order to be controlled. If empty, defaulted to labels on Pod template. More info: http://kubernetes.io/docs/user-guide/labels#label-selectors", - "$ref": "#/definitions/unversioned.LabelSelector" + "$ref": "#/definitions/v1.LabelSelector" }, "template": { "description": "Template is the object that describes the pod that will be created. The DaemonSet will create exactly one copy of this pod on every node that matches the template's node selector (or on every node if no node selector is specified). More info: http://kubernetes.io/docs/user-guide/replication-controller#pod-template", @@ -35750,11 +35743,11 @@ "properties": { "lastTransitionTime": { "description": "Last time the condition transitioned from one status to another.", - "$ref": "#/definitions/unversioned.Time" + "$ref": "#/definitions/v1.Time" }, "lastUpdateTime": { "description": "The last time this condition was updated.", - "$ref": "#/definitions/unversioned.Time" + "$ref": "#/definitions/v1.Time" }, "message": { "description": "A human readable message indicating details about the transition.", @@ -35789,7 +35782,7 @@ }, "metadata": { "description": "Standard list metadata.", - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -35853,7 +35846,7 @@ }, "selector": { "description": "Label selector for pods. Existing ReplicaSets whose pods are selected by this will be the ones affected by this deployment.", - "$ref": "#/definitions/unversioned.LabelSelector" + "$ref": "#/definitions/v1.LabelSelector" }, "strategy": { "description": "The deployment strategy to use to replace existing pods with new ones.", @@ -35960,7 +35953,7 @@ }, "metadata": { "description": "Standard list metadata.", - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -36015,7 +36008,7 @@ }, "lastScaleTime": { "description": "last time the HorizontalPodAutoscaler scaled the number of pods; used by the autoscaler to control how often the number of pods is changed.", - "$ref": "#/definitions/unversioned.Time" + "$ref": "#/definitions/v1.Time" }, "observedGeneration": { "description": "most recent generation observed by this autoscaler.", @@ -36073,7 +36066,7 @@ }, "metadata": { "description": "Standard object's metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata", - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -36160,11 +36153,11 @@ "properties": { "lastProbeTime": { "description": "Last time the condition was checked.", - "$ref": "#/definitions/unversioned.Time" + "$ref": "#/definitions/v1.Time" }, "lastTransitionTime": { "description": "Last time the condition transit from one status to another.", - "$ref": "#/definitions/unversioned.Time" + "$ref": "#/definitions/v1.Time" }, "message": { "description": "Human readable message indicating details about last transition.", @@ -36199,7 +36192,7 @@ }, "metadata": { "description": "Standard list metadata More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata", - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -36230,7 +36223,7 @@ }, "selector": { "description": "Selector is a label query over pods that should match the pod count. Normally, the system sets this field for you. More info: http://kubernetes.io/docs/user-guide/labels#label-selectors", - "$ref": "#/definitions/unversioned.LabelSelector" + "$ref": "#/definitions/v1.LabelSelector" }, "template": { "description": "Template is the object that describes the pod that will be created when executing a job. More info: http://kubernetes.io/docs/user-guide/jobs", @@ -36248,7 +36241,7 @@ }, "completionTime": { "description": "CompletionTime represents time when the job was completed. It is not guaranteed to be set in happens-before order across separate operations. It is represented in RFC3339 form and is in UTC.", - "$ref": "#/definitions/unversioned.Time" + "$ref": "#/definitions/v1.Time" }, "conditions": { "description": "Conditions represent the latest available observations of an object's current state. More info: http://kubernetes.io/docs/user-guide/jobs", @@ -36264,7 +36257,7 @@ }, "startTime": { "description": "StartTime represents time when the job was acknowledged by the Job Manager. It is not guaranteed to be set in happens-before order across separate operations. It is represented in RFC3339 form and is in UTC.", - "$ref": "#/definitions/unversioned.Time" + "$ref": "#/definitions/v1.Time" }, "succeeded": { "description": "Succeeded is the number of pods which reached Phase Succeeded.", @@ -36338,7 +36331,7 @@ }, "metadata": { "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata", - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -36346,11 +36339,11 @@ "properties": { "namespaceSelector": { "description": "Selects Namespaces using cluster scoped-labels. This matches all pods in all namespaces selected by this label selector. This field follows standard label selector semantics. If omitted, this selector selects no namespaces. If present but empty, this selector selects all namespaces.", - "$ref": "#/definitions/unversioned.LabelSelector" + "$ref": "#/definitions/v1.LabelSelector" }, "podSelector": { "description": "This is a label selector which selects Pods in this namespace. This field follows standard label selector semantics. If not provided, this selector selects no pods. If present but empty, this selector selects all pods in this namespace.", - "$ref": "#/definitions/unversioned.LabelSelector" + "$ref": "#/definitions/v1.LabelSelector" } } }, @@ -36380,7 +36373,7 @@ }, "podSelector": { "description": "Selects the pods to which this NetworkPolicy object applies. The array of ingress rules is applied to any pods selected by this field. Multiple network policies can select the same set of pods. In this case, the ingress rules for each are combined additively. This field is NOT optional and follows standard label selector semantics. An empty podSelector matches all pods in this namespace.", - "$ref": "#/definitions/unversioned.LabelSelector" + "$ref": "#/definitions/v1.LabelSelector" } } }, @@ -36426,7 +36419,7 @@ } }, "metadata": { - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -36439,7 +36432,7 @@ }, "selector": { "description": "Label query over pods whose evictions are managed by the disruption budget.", - "$ref": "#/definitions/unversioned.LabelSelector" + "$ref": "#/definitions/v1.LabelSelector" } } }, @@ -36467,7 +36460,7 @@ "description": "DisruptedPods contains information about pods whose eviction was processed by the API server eviction subresource handler but has not yet been observed by the PodDisruptionBudget controller. A pod will be in this map from the time when the API server processed the eviction request to the time when the pod is seen by PDB controller as having been marked for deletion (or after a timeout). The key in the map is the name of the pod and the value is the time when the API server processed the eviction request. If the deletion didn't occur and a pod is still there it will be removed from the list automatically by PodDisruptionBudget controller after some time. If everything goes smooth this map should be empty for the most of the time. Large number of entries in the map may indicate problems with pod deletions.", "type": "object", "additionalProperties": { - "$ref": "#/definitions/unversioned.Time" + "$ref": "#/definitions/v1.Time" } }, "disruptionsAllowed": { @@ -36513,7 +36506,7 @@ "properties": { "lastTransitionTime": { "description": "The last time the condition transitioned from one status to another.", - "$ref": "#/definitions/unversioned.Time" + "$ref": "#/definitions/v1.Time" }, "message": { "description": "A human readable message indicating details about the transition.", @@ -36548,7 +36541,7 @@ }, "metadata": { "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds", - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -36567,7 +36560,7 @@ }, "selector": { "description": "Selector is a label query over pods that should match the replica count. If the selector is empty, it is defaulted to the labels present on the pod template. Label keys and values that must match in order to be controlled by this replica set. More info: http://kubernetes.io/docs/user-guide/labels#label-selectors", - "$ref": "#/definitions/unversioned.LabelSelector" + "$ref": "#/definitions/v1.LabelSelector" }, "template": { "description": "Template is the object that describes the pod that will be created if insufficient replicas are detected. More info: http://kubernetes.io/docs/user-guide/replication-controller#pod-template", @@ -36782,7 +36775,7 @@ } }, "metadata": { - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -36800,7 +36793,7 @@ }, "selector": { "description": "Selector is a label query over pods that should match the replica count. If empty, defaulted to labels on the pod template. More info: http://kubernetes.io/docs/user-guide/labels#label-selectors", - "$ref": "#/definitions/unversioned.LabelSelector" + "$ref": "#/definitions/v1.LabelSelector" }, "serviceName": { "description": "ServiceName is the name of the service that governs this StatefulSet. This service must exist before the StatefulSet, and is responsible for the network identity of the set. Pods get DNS/hostnames that follow the pattern: pod-specific-string.serviceName.default.svc.cluster.local where \"pod-specific-string\" is managed by the StatefulSet controller.", @@ -36875,7 +36868,7 @@ }, "metadata": { "description": "Standard list metadata More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata", - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -37008,7 +37001,7 @@ }, "metadata": { "description": "Standard list metadata.", - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -37119,7 +37112,7 @@ }, "metadata": { "description": "Standard list metadata More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata", - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -37165,7 +37158,7 @@ }, "lastScheduleTime": { "description": "LastScheduleTime keeps information of when was the last time the job was successfully scheduled.", - "$ref": "#/definitions/unversioned.Time" + "$ref": "#/definitions/v1.Time" } } }, @@ -37195,11 +37188,11 @@ "properties": { "lastProbeTime": { "description": "Last time the condition was checked.", - "$ref": "#/definitions/unversioned.Time" + "$ref": "#/definitions/v1.Time" }, "lastTransitionTime": { "description": "Last time the condition transit from one status to another.", - "$ref": "#/definitions/unversioned.Time" + "$ref": "#/definitions/v1.Time" }, "message": { "description": "Human readable message indicating details about last transition.", @@ -37234,7 +37227,7 @@ }, "metadata": { "description": "Standard list metadata More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata", - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -37265,7 +37258,7 @@ }, "selector": { "description": "Selector is a label query over pods that should match the pod count. Normally, the system sets this field for you. More info: http://kubernetes.io/docs/user-guide/labels#label-selectors", - "$ref": "#/definitions/unversioned.LabelSelector" + "$ref": "#/definitions/v1.LabelSelector" }, "template": { "description": "Template is the object that describes the pod that will be created when executing a job. More info: http://kubernetes.io/docs/user-guide/jobs", @@ -37283,7 +37276,7 @@ }, "completionTime": { "description": "CompletionTime represents time when the job was completed. It is not guaranteed to be set in happens-before order across separate operations. It is represented in RFC3339 form and is in UTC.", - "$ref": "#/definitions/unversioned.Time" + "$ref": "#/definitions/v1.Time" }, "conditions": { "description": "Conditions represent the latest available observations of an object's current state. More info: http://kubernetes.io/docs/user-guide/jobs", @@ -37299,7 +37292,7 @@ }, "startTime": { "description": "StartTime represents time when the job was acknowledged by the Job Manager. It is not guaranteed to be set in happens-before order across separate operations. It is represented in RFC3339 form and is in UTC.", - "$ref": "#/definitions/unversioned.Time" + "$ref": "#/definitions/v1.Time" }, "succeeded": { "description": "Succeeded is the number of pods which reached Phase Succeeded.", diff --git a/api/swagger-spec/api.json b/api/swagger-spec/api.json index 6ec7dba9c8e..1147033c40b 100644 --- a/api/swagger-spec/api.json +++ b/api/swagger-spec/api.json @@ -13,7 +13,7 @@ "description": "get available API versions", "operations": [ { - "type": "unversioned.APIVersions", + "type": "v1.APIVersions", "method": "GET", "summary": "get available API versions", "nickname": "getAPIVersions", @@ -33,8 +33,8 @@ } ], "models": { - "unversioned.APIVersions": { - "id": "unversioned.APIVersions", + "v1.APIVersions": { + "id": "v1.APIVersions", "description": "APIVersions lists the versions that are available, to allow clients to discover the API at /api, which is the root path of the legacy v1 API.", "required": [ "versions", @@ -59,14 +59,14 @@ "serverAddressByClientCIDRs": { "type": "array", "items": { - "$ref": "unversioned.ServerAddressByClientCIDR" + "$ref": "v1.ServerAddressByClientCIDR" }, "description": "a map of client CIDR to server address that is serving this group. This is to help clients reach servers in the most network-efficient way possible. Clients can use the appropriate server address as per the CIDR that they match. In case of multiple matches, clients should use the longest matching CIDR. The server returns only those CIDRs that it thinks that the client can match. For example: the master will return an internal IP CIDR only, if the client reaches the server using an internal IP. Server looks at X-Forwarded-For header or X-Real-Ip header or request.RemoteAddr (in that order) to get the client IP." } } }, - "unversioned.ServerAddressByClientCIDR": { - "id": "unversioned.ServerAddressByClientCIDR", + "v1.ServerAddressByClientCIDR": { + "id": "v1.ServerAddressByClientCIDR", "description": "ServerAddressByClientCIDR helps the client to determine the server address that they should use, depending on the clientCIDR that they match.", "required": [ "clientCIDR", diff --git a/api/swagger-spec/apis.json b/api/swagger-spec/apis.json index dea7ec02cf7..df729ba5160 100644 --- a/api/swagger-spec/apis.json +++ b/api/swagger-spec/apis.json @@ -13,7 +13,7 @@ "description": "get available API versions", "operations": [ { - "type": "unversioned.APIGroupList", + "type": "v1.APIGroupList", "method": "GET", "summary": "get available API versions", "nickname": "getAPIVersions", @@ -33,8 +33,8 @@ } ], "models": { - "unversioned.APIGroupList": { - "id": "unversioned.APIGroupList", + "v1.APIGroupList": { + "id": "v1.APIGroupList", "description": "APIGroupList is a list of APIGroup, to allow clients to discover the API at /apis.", "required": [ "groups" @@ -51,14 +51,14 @@ "groups": { "type": "array", "items": { - "$ref": "unversioned.APIGroup" + "$ref": "v1.APIGroup" }, "description": "groups is a list of APIGroup." } } }, - "unversioned.APIGroup": { - "id": "unversioned.APIGroup", + "v1.APIGroup": { + "id": "v1.APIGroup", "description": "APIGroup contains the name, the supported versions, and the preferred version of a group.", "required": [ "name", @@ -81,25 +81,25 @@ "versions": { "type": "array", "items": { - "$ref": "unversioned.GroupVersionForDiscovery" + "$ref": "v1.GroupVersionForDiscovery" }, "description": "versions are the versions supported in this group." }, "preferredVersion": { - "$ref": "unversioned.GroupVersionForDiscovery", + "$ref": "v1.GroupVersionForDiscovery", "description": "preferredVersion is the version preferred by the API server, which probably is the storage version." }, "serverAddressByClientCIDRs": { "type": "array", "items": { - "$ref": "unversioned.ServerAddressByClientCIDR" + "$ref": "v1.ServerAddressByClientCIDR" }, "description": "a map of client CIDR to server address that is serving this group. This is to help clients reach servers in the most network-efficient way possible. Clients can use the appropriate server address as per the CIDR that they match. In case of multiple matches, clients should use the longest matching CIDR. The server returns only those CIDRs that it thinks that the client can match. For example: the master will return an internal IP CIDR only, if the client reaches the server using an internal IP. Server looks at X-Forwarded-For header or X-Real-Ip header or request.RemoteAddr (in that order) to get the client IP." } } }, - "unversioned.GroupVersionForDiscovery": { - "id": "unversioned.GroupVersionForDiscovery", + "v1.GroupVersionForDiscovery": { + "id": "v1.GroupVersionForDiscovery", "description": "GroupVersion contains the \"group/version\" and \"version\" string of a version. It is made a struct to keep extensibility.", "required": [ "groupVersion", @@ -116,8 +116,8 @@ } } }, - "unversioned.ServerAddressByClientCIDR": { - "id": "unversioned.ServerAddressByClientCIDR", + "v1.ServerAddressByClientCIDR": { + "id": "v1.ServerAddressByClientCIDR", "description": "ServerAddressByClientCIDR helps the client to determine the server address that they should use, depending on the clientCIDR that they match.", "required": [ "clientCIDR", diff --git a/api/swagger-spec/apps.json b/api/swagger-spec/apps.json index 695f3160cef..5349f3ec8d1 100644 --- a/api/swagger-spec/apps.json +++ b/api/swagger-spec/apps.json @@ -13,7 +13,7 @@ "description": "get information of a group", "operations": [ { - "type": "unversioned.APIGroup", + "type": "v1.APIGroup", "method": "GET", "summary": "get information of a group", "nickname": "getAPIGroup", @@ -33,8 +33,8 @@ } ], "models": { - "unversioned.APIGroup": { - "id": "unversioned.APIGroup", + "v1.APIGroup": { + "id": "v1.APIGroup", "description": "APIGroup contains the name, the supported versions, and the preferred version of a group.", "required": [ "name", @@ -57,25 +57,25 @@ "versions": { "type": "array", "items": { - "$ref": "unversioned.GroupVersionForDiscovery" + "$ref": "v1.GroupVersionForDiscovery" }, "description": "versions are the versions supported in this group." }, "preferredVersion": { - "$ref": "unversioned.GroupVersionForDiscovery", + "$ref": "v1.GroupVersionForDiscovery", "description": "preferredVersion is the version preferred by the API server, which probably is the storage version." }, "serverAddressByClientCIDRs": { "type": "array", "items": { - "$ref": "unversioned.ServerAddressByClientCIDR" + "$ref": "v1.ServerAddressByClientCIDR" }, "description": "a map of client CIDR to server address that is serving this group. This is to help clients reach servers in the most network-efficient way possible. Clients can use the appropriate server address as per the CIDR that they match. In case of multiple matches, clients should use the longest matching CIDR. The server returns only those CIDRs that it thinks that the client can match. For example: the master will return an internal IP CIDR only, if the client reaches the server using an internal IP. Server looks at X-Forwarded-For header or X-Real-Ip header or request.RemoteAddr (in that order) to get the client IP." } } }, - "unversioned.GroupVersionForDiscovery": { - "id": "unversioned.GroupVersionForDiscovery", + "v1.GroupVersionForDiscovery": { + "id": "v1.GroupVersionForDiscovery", "description": "GroupVersion contains the \"group/version\" and \"version\" string of a version. It is made a struct to keep extensibility.", "required": [ "groupVersion", @@ -92,8 +92,8 @@ } } }, - "unversioned.ServerAddressByClientCIDR": { - "id": "unversioned.ServerAddressByClientCIDR", + "v1.ServerAddressByClientCIDR": { + "id": "v1.ServerAddressByClientCIDR", "description": "ServerAddressByClientCIDR helps the client to determine the server address that they should use, depending on the clientCIDR that they match.", "required": [ "clientCIDR", diff --git a/api/swagger-spec/apps_v1beta1.json b/api/swagger-spec/apps_v1beta1.json index df7018463a6..c0c4a1715da 100644 --- a/api/swagger-spec/apps_v1beta1.json +++ b/api/swagger-spec/apps_v1beta1.json @@ -141,7 +141,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete collection of StatefulSet", "nickname": "deletecollectionNamespacedStatefulSet", @@ -207,7 +207,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -445,7 +445,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -488,7 +488,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete a StatefulSet", "nickname": "deleteNamespacedStatefulSet", @@ -546,7 +546,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -934,7 +934,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -983,7 +983,7 @@ "description": "API at /apis/apps/v1beta1", "operations": [ { - "type": "unversioned.APIResourceList", + "type": "v1.APIResourceList", "method": "GET", "summary": "get available resources", "nickname": "getAPIResources", @@ -1019,7 +1019,7 @@ "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta" + "$ref": "v1.ListMeta" }, "items": { "type": "array", @@ -1029,8 +1029,8 @@ } } }, - "unversioned.ListMeta": { - "id": "unversioned.ListMeta", + "v1.ListMeta": { + "id": "v1.ListMeta", "description": "ListMeta describes metadata that synthetic resources must have, including lists and various status objects. A resource may have only one of {ObjectMeta, ListMeta}.", "properties": { "selfLink": { @@ -1103,12 +1103,10 @@ }, "creationTimestamp": { "type": "string", - "format": "date-time", "description": "CreationTimestamp is a timestamp representing the server time when this object was created. It is not guaranteed to be set in happens-before order across separate operations. Clients may not set this value. It is represented in RFC3339 form and is in UTC.\n\nPopulated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata" }, "deletionTimestamp": { "type": "string", - "format": "date-time", "description": "DeletionTimestamp is RFC 3339 date and time at which this resource will be deleted. This field is set by the server when a graceful deletion is requested by the user, and is not directly settable by a client. The resource is expected to be deleted (no longer visible from resource lists, and not reachable by name) after the time in this field. Once set, this value may not be unset or be set further into the future, although it may be shortened or the resource may be deleted prior to this time. For example, a user may request that a pod is deleted in 30 seconds. The Kubelet will react by sending a graceful termination signal to the containers in the pod. After that 30 seconds, the Kubelet will send a hard termination signal (SIGKILL) to the container and after cleanup, remove the pod from the API. In the presence of network partitions, this object may still exist after this timestamp, until an administrator or automated process can determine the resource is fully terminated. If not set, graceful deletion of the object has not been requested.\n\nPopulated by the system when a graceful deletion is requested. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata" }, "deletionGracePeriodSeconds": { @@ -1190,7 +1188,7 @@ "description": "Replicas is the desired number of replicas of the given Template. These are replicas in the sense that they are instantiations of the same Template, but individual replicas also have a consistent identity. If unspecified, defaults to 1." }, "selector": { - "$ref": "unversioned.LabelSelector", + "$ref": "v1.LabelSelector", "description": "Selector is a label query over pods that should match the replica count. If empty, defaulted to labels on the pod template. More info: http://kubernetes.io/docs/user-guide/labels#label-selectors" }, "template": { @@ -1210,8 +1208,8 @@ } } }, - "unversioned.LabelSelector": { - "id": "unversioned.LabelSelector", + "v1.LabelSelector": { + "id": "v1.LabelSelector", "description": "A label selector is a label query over a set of resources. The result of matchLabels and matchExpressions are ANDed. An empty label selector matches all objects. A null label selector matches no objects.", "properties": { "matchLabels": { @@ -1221,14 +1219,14 @@ "matchExpressions": { "type": "array", "items": { - "$ref": "unversioned.LabelSelectorRequirement" + "$ref": "v1.LabelSelectorRequirement" }, "description": "matchExpressions is a list of label selector requirements. The requirements are ANDed." } } }, - "unversioned.LabelSelectorRequirement": { - "id": "unversioned.LabelSelectorRequirement", + "v1.LabelSelectorRequirement": { + "id": "v1.LabelSelectorRequirement", "description": "A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.", "required": [ "key", @@ -2647,7 +2645,7 @@ "description": "AccessModes contains the desired access modes the volume should have. More info: http://kubernetes.io/docs/user-guide/persistent-volumes#access-modes-1" }, "selector": { - "$ref": "unversioned.LabelSelector", + "$ref": "v1.LabelSelector", "description": "A label query over volumes to consider for binding." }, "resources": { @@ -2704,8 +2702,8 @@ } } }, - "unversioned.Status": { - "id": "unversioned.Status", + "v1.Status": { + "id": "v1.Status", "description": "Status is a return value for calls that don't return other objects.", "properties": { "kind": { @@ -2717,7 +2715,7 @@ "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds" }, "status": { @@ -2733,7 +2731,7 @@ "description": "A machine-readable description of why this operation is in the \"Failure\" status. If this value is empty there is no information available. A Reason clarifies an HTTP status code but does not override it." }, "details": { - "$ref": "unversioned.StatusDetails", + "$ref": "v1.StatusDetails", "description": "Extended data associated with the reason. Each reason may define its own extended details. This field is optional and the data returned is not guaranteed to conform to any schema except that defined by the reason type." }, "code": { @@ -2743,8 +2741,8 @@ } } }, - "unversioned.StatusDetails": { - "id": "unversioned.StatusDetails", + "v1.StatusDetails": { + "id": "v1.StatusDetails", "description": "StatusDetails is a set of additional properties that MAY be set by the server to provide additional information about a response. The Reason field of a Status object defines what attributes will be set. Clients must ignore fields that do not match the defined type of each attribute, and should assume that any attribute may be empty, invalid, or under defined.", "properties": { "name": { @@ -2762,7 +2760,7 @@ "causes": { "type": "array", "items": { - "$ref": "unversioned.StatusCause" + "$ref": "v1.StatusCause" }, "description": "The Causes array includes more details associated with the StatusReason failure. Not all StatusReasons may provide detailed causes." }, @@ -2773,8 +2771,8 @@ } } }, - "unversioned.StatusCause": { - "id": "unversioned.StatusCause", + "v1.StatusCause": { + "id": "v1.StatusCause", "description": "StatusCause provides more information about an api.Status failure, including cases when multiple errors are encountered.", "properties": { "reason": { @@ -2806,8 +2804,8 @@ } } }, - "unversioned.Patch": { - "id": "unversioned.Patch", + "v1.Patch": { + "id": "v1.Patch", "description": "Patch is provided to give a concrete name and type to the Kubernetes PATCH request body.", "properties": {} }, @@ -2852,8 +2850,8 @@ "id": "types.UID", "properties": {} }, - "unversioned.APIResourceList": { - "id": "unversioned.APIResourceList", + "v1.APIResourceList": { + "id": "v1.APIResourceList", "description": "APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.", "required": [ "groupVersion", @@ -2875,14 +2873,14 @@ "resources": { "type": "array", "items": { - "$ref": "unversioned.APIResource" + "$ref": "v1.APIResource" }, "description": "resources contains the name of the resources and if they are namespaced." } } }, - "unversioned.APIResource": { - "id": "unversioned.APIResource", + "v1.APIResource": { + "id": "v1.APIResource", "description": "APIResource specifies the name of a resource and whether it is namespaced.", "required": [ "name", diff --git a/api/swagger-spec/authentication.k8s.io.json b/api/swagger-spec/authentication.k8s.io.json index 7135929d552..aa9df744333 100644 --- a/api/swagger-spec/authentication.k8s.io.json +++ b/api/swagger-spec/authentication.k8s.io.json @@ -13,7 +13,7 @@ "description": "get information of a group", "operations": [ { - "type": "unversioned.APIGroup", + "type": "v1.APIGroup", "method": "GET", "summary": "get information of a group", "nickname": "getAPIGroup", @@ -33,8 +33,8 @@ } ], "models": { - "unversioned.APIGroup": { - "id": "unversioned.APIGroup", + "v1.APIGroup": { + "id": "v1.APIGroup", "description": "APIGroup contains the name, the supported versions, and the preferred version of a group.", "required": [ "name", @@ -57,25 +57,25 @@ "versions": { "type": "array", "items": { - "$ref": "unversioned.GroupVersionForDiscovery" + "$ref": "v1.GroupVersionForDiscovery" }, "description": "versions are the versions supported in this group." }, "preferredVersion": { - "$ref": "unversioned.GroupVersionForDiscovery", + "$ref": "v1.GroupVersionForDiscovery", "description": "preferredVersion is the version preferred by the API server, which probably is the storage version." }, "serverAddressByClientCIDRs": { "type": "array", "items": { - "$ref": "unversioned.ServerAddressByClientCIDR" + "$ref": "v1.ServerAddressByClientCIDR" }, "description": "a map of client CIDR to server address that is serving this group. This is to help clients reach servers in the most network-efficient way possible. Clients can use the appropriate server address as per the CIDR that they match. In case of multiple matches, clients should use the longest matching CIDR. The server returns only those CIDRs that it thinks that the client can match. For example: the master will return an internal IP CIDR only, if the client reaches the server using an internal IP. Server looks at X-Forwarded-For header or X-Real-Ip header or request.RemoteAddr (in that order) to get the client IP." } } }, - "unversioned.GroupVersionForDiscovery": { - "id": "unversioned.GroupVersionForDiscovery", + "v1.GroupVersionForDiscovery": { + "id": "v1.GroupVersionForDiscovery", "description": "GroupVersion contains the \"group/version\" and \"version\" string of a version. It is made a struct to keep extensibility.", "required": [ "groupVersion", @@ -92,8 +92,8 @@ } } }, - "unversioned.ServerAddressByClientCIDR": { - "id": "unversioned.ServerAddressByClientCIDR", + "v1.ServerAddressByClientCIDR": { + "id": "v1.ServerAddressByClientCIDR", "description": "ServerAddressByClientCIDR helps the client to determine the server address that they should use, depending on the clientCIDR that they match.", "required": [ "clientCIDR", diff --git a/api/swagger-spec/authentication.k8s.io_v1beta1.json b/api/swagger-spec/authentication.k8s.io_v1beta1.json index 33ce006615a..7279f5ee7b2 100644 --- a/api/swagger-spec/authentication.k8s.io_v1beta1.json +++ b/api/swagger-spec/authentication.k8s.io_v1beta1.json @@ -58,7 +58,7 @@ "description": "API at /apis/authentication.k8s.io/v1beta1", "operations": [ { - "type": "unversioned.APIResourceList", + "type": "v1.APIResourceList", "method": "GET", "summary": "get available resources", "nickname": "getAPIResources", @@ -141,12 +141,10 @@ }, "creationTimestamp": { "type": "string", - "format": "date-time", "description": "CreationTimestamp is a timestamp representing the server time when this object was created. It is not guaranteed to be set in happens-before order across separate operations. Clients may not set this value. It is represented in RFC3339 form and is in UTC.\n\nPopulated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata" }, "deletionTimestamp": { "type": "string", - "format": "date-time", "description": "DeletionTimestamp is RFC 3339 date and time at which this resource will be deleted. This field is set by the server when a graceful deletion is requested by the user, and is not directly settable by a client. The resource is expected to be deleted (no longer visible from resource lists, and not reachable by name) after the time in this field. Once set, this value may not be unset or be set further into the future, although it may be shortened or the resource may be deleted prior to this time. For example, a user may request that a pod is deleted in 30 seconds. The Kubelet will react by sending a graceful termination signal to the containers in the pod. After that 30 seconds, the Kubelet will send a hard termination signal (SIGKILL) to the container and after cleanup, remove the pod from the API. In the presence of network partitions, this object may still exist after this timestamp, until an administrator or automated process can determine the resource is fully terminated. If not set, graceful deletion of the object has not been requested.\n\nPopulated by the system when a graceful deletion is requested. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata" }, "deletionGracePeriodSeconds": { @@ -267,8 +265,8 @@ } } }, - "unversioned.APIResourceList": { - "id": "unversioned.APIResourceList", + "v1.APIResourceList": { + "id": "v1.APIResourceList", "description": "APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.", "required": [ "groupVersion", @@ -290,14 +288,14 @@ "resources": { "type": "array", "items": { - "$ref": "unversioned.APIResource" + "$ref": "v1.APIResource" }, "description": "resources contains the name of the resources and if they are namespaced." } } }, - "unversioned.APIResource": { - "id": "unversioned.APIResource", + "v1.APIResource": { + "id": "v1.APIResource", "description": "APIResource specifies the name of a resource and whether it is namespaced.", "required": [ "name", diff --git a/api/swagger-spec/authorization.k8s.io.json b/api/swagger-spec/authorization.k8s.io.json index aedd67cd8ea..8a71a1a8951 100644 --- a/api/swagger-spec/authorization.k8s.io.json +++ b/api/swagger-spec/authorization.k8s.io.json @@ -13,7 +13,7 @@ "description": "get information of a group", "operations": [ { - "type": "unversioned.APIGroup", + "type": "v1.APIGroup", "method": "GET", "summary": "get information of a group", "nickname": "getAPIGroup", @@ -33,8 +33,8 @@ } ], "models": { - "unversioned.APIGroup": { - "id": "unversioned.APIGroup", + "v1.APIGroup": { + "id": "v1.APIGroup", "description": "APIGroup contains the name, the supported versions, and the preferred version of a group.", "required": [ "name", @@ -57,25 +57,25 @@ "versions": { "type": "array", "items": { - "$ref": "unversioned.GroupVersionForDiscovery" + "$ref": "v1.GroupVersionForDiscovery" }, "description": "versions are the versions supported in this group." }, "preferredVersion": { - "$ref": "unversioned.GroupVersionForDiscovery", + "$ref": "v1.GroupVersionForDiscovery", "description": "preferredVersion is the version preferred by the API server, which probably is the storage version." }, "serverAddressByClientCIDRs": { "type": "array", "items": { - "$ref": "unversioned.ServerAddressByClientCIDR" + "$ref": "v1.ServerAddressByClientCIDR" }, "description": "a map of client CIDR to server address that is serving this group. This is to help clients reach servers in the most network-efficient way possible. Clients can use the appropriate server address as per the CIDR that they match. In case of multiple matches, clients should use the longest matching CIDR. The server returns only those CIDRs that it thinks that the client can match. For example: the master will return an internal IP CIDR only, if the client reaches the server using an internal IP. Server looks at X-Forwarded-For header or X-Real-Ip header or request.RemoteAddr (in that order) to get the client IP." } } }, - "unversioned.GroupVersionForDiscovery": { - "id": "unversioned.GroupVersionForDiscovery", + "v1.GroupVersionForDiscovery": { + "id": "v1.GroupVersionForDiscovery", "description": "GroupVersion contains the \"group/version\" and \"version\" string of a version. It is made a struct to keep extensibility.", "required": [ "groupVersion", @@ -92,8 +92,8 @@ } } }, - "unversioned.ServerAddressByClientCIDR": { - "id": "unversioned.ServerAddressByClientCIDR", + "v1.ServerAddressByClientCIDR": { + "id": "v1.ServerAddressByClientCIDR", "description": "ServerAddressByClientCIDR helps the client to determine the server address that they should use, depending on the clientCIDR that they match.", "required": [ "clientCIDR", diff --git a/api/swagger-spec/authorization.k8s.io_v1beta1.json b/api/swagger-spec/authorization.k8s.io_v1beta1.json index 9f9462b0d3a..0ebefafecae 100644 --- a/api/swagger-spec/authorization.k8s.io_v1beta1.json +++ b/api/swagger-spec/authorization.k8s.io_v1beta1.json @@ -156,7 +156,7 @@ "description": "API at /apis/authorization.k8s.io/v1beta1", "operations": [ { - "type": "unversioned.APIResourceList", + "type": "v1.APIResourceList", "method": "GET", "summary": "get available resources", "nickname": "getAPIResources", @@ -239,12 +239,10 @@ }, "creationTimestamp": { "type": "string", - "format": "date-time", "description": "CreationTimestamp is a timestamp representing the server time when this object was created. It is not guaranteed to be set in happens-before order across separate operations. Clients may not set this value. It is represented in RFC3339 form and is in UTC.\n\nPopulated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata" }, "deletionTimestamp": { "type": "string", - "format": "date-time", "description": "DeletionTimestamp is RFC 3339 date and time at which this resource will be deleted. This field is set by the server when a graceful deletion is requested by the user, and is not directly settable by a client. The resource is expected to be deleted (no longer visible from resource lists, and not reachable by name) after the time in this field. Once set, this value may not be unset or be set further into the future, although it may be shortened or the resource may be deleted prior to this time. For example, a user may request that a pod is deleted in 30 seconds. The Kubelet will react by sending a graceful termination signal to the containers in the pod. After that 30 seconds, the Kubelet will send a hard termination signal (SIGKILL) to the container and after cleanup, remove the pod from the API. In the presence of network partitions, this object may still exist after this timestamp, until an administrator or automated process can determine the resource is fully terminated. If not set, graceful deletion of the object has not been requested.\n\nPopulated by the system when a graceful deletion is requested. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata" }, "deletionGracePeriodSeconds": { @@ -480,8 +478,8 @@ } } }, - "unversioned.APIResourceList": { - "id": "unversioned.APIResourceList", + "v1.APIResourceList": { + "id": "v1.APIResourceList", "description": "APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.", "required": [ "groupVersion", @@ -503,14 +501,14 @@ "resources": { "type": "array", "items": { - "$ref": "unversioned.APIResource" + "$ref": "v1.APIResource" }, "description": "resources contains the name of the resources and if they are namespaced." } } }, - "unversioned.APIResource": { - "id": "unversioned.APIResource", + "v1.APIResource": { + "id": "v1.APIResource", "description": "APIResource specifies the name of a resource and whether it is namespaced.", "required": [ "name", diff --git a/api/swagger-spec/autoscaling.json b/api/swagger-spec/autoscaling.json index 4de1765949b..3d227e0087c 100644 --- a/api/swagger-spec/autoscaling.json +++ b/api/swagger-spec/autoscaling.json @@ -13,7 +13,7 @@ "description": "get information of a group", "operations": [ { - "type": "unversioned.APIGroup", + "type": "v1.APIGroup", "method": "GET", "summary": "get information of a group", "nickname": "getAPIGroup", @@ -33,8 +33,8 @@ } ], "models": { - "unversioned.APIGroup": { - "id": "unversioned.APIGroup", + "v1.APIGroup": { + "id": "v1.APIGroup", "description": "APIGroup contains the name, the supported versions, and the preferred version of a group.", "required": [ "name", @@ -57,25 +57,25 @@ "versions": { "type": "array", "items": { - "$ref": "unversioned.GroupVersionForDiscovery" + "$ref": "v1.GroupVersionForDiscovery" }, "description": "versions are the versions supported in this group." }, "preferredVersion": { - "$ref": "unversioned.GroupVersionForDiscovery", + "$ref": "v1.GroupVersionForDiscovery", "description": "preferredVersion is the version preferred by the API server, which probably is the storage version." }, "serverAddressByClientCIDRs": { "type": "array", "items": { - "$ref": "unversioned.ServerAddressByClientCIDR" + "$ref": "v1.ServerAddressByClientCIDR" }, "description": "a map of client CIDR to server address that is serving this group. This is to help clients reach servers in the most network-efficient way possible. Clients can use the appropriate server address as per the CIDR that they match. In case of multiple matches, clients should use the longest matching CIDR. The server returns only those CIDRs that it thinks that the client can match. For example: the master will return an internal IP CIDR only, if the client reaches the server using an internal IP. Server looks at X-Forwarded-For header or X-Real-Ip header or request.RemoteAddr (in that order) to get the client IP." } } }, - "unversioned.GroupVersionForDiscovery": { - "id": "unversioned.GroupVersionForDiscovery", + "v1.GroupVersionForDiscovery": { + "id": "v1.GroupVersionForDiscovery", "description": "GroupVersion contains the \"group/version\" and \"version\" string of a version. It is made a struct to keep extensibility.", "required": [ "groupVersion", @@ -92,8 +92,8 @@ } } }, - "unversioned.ServerAddressByClientCIDR": { - "id": "unversioned.ServerAddressByClientCIDR", + "v1.ServerAddressByClientCIDR": { + "id": "v1.ServerAddressByClientCIDR", "description": "ServerAddressByClientCIDR helps the client to determine the server address that they should use, depending on the clientCIDR that they match.", "required": [ "clientCIDR", diff --git a/api/swagger-spec/autoscaling_v1.json b/api/swagger-spec/autoscaling_v1.json index dadcb070ebe..2cfe8d78d0f 100644 --- a/api/swagger-spec/autoscaling_v1.json +++ b/api/swagger-spec/autoscaling_v1.json @@ -141,7 +141,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete collection of HorizontalPodAutoscaler", "nickname": "deletecollectionNamespacedHorizontalPodAutoscaler", @@ -207,7 +207,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -445,7 +445,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -488,7 +488,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete a HorizontalPodAutoscaler", "nickname": "deleteNamespacedHorizontalPodAutoscaler", @@ -546,7 +546,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -934,7 +934,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -983,7 +983,7 @@ "description": "API at /apis/autoscaling/v1", "operations": [ { - "type": "unversioned.APIResourceList", + "type": "v1.APIResourceList", "method": "GET", "summary": "get available resources", "nickname": "getAPIResources", @@ -1019,7 +1019,7 @@ "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard list metadata." }, "items": { @@ -1031,8 +1031,8 @@ } } }, - "unversioned.ListMeta": { - "id": "unversioned.ListMeta", + "v1.ListMeta": { + "id": "v1.ListMeta", "description": "ListMeta describes metadata that synthetic resources must have, including lists and various status objects. A resource may have only one of {ObjectMeta, ListMeta}.", "properties": { "selfLink": { @@ -1106,12 +1106,10 @@ }, "creationTimestamp": { "type": "string", - "format": "date-time", "description": "CreationTimestamp is a timestamp representing the server time when this object was created. It is not guaranteed to be set in happens-before order across separate operations. Clients may not set this value. It is represented in RFC3339 form and is in UTC.\n\nPopulated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata" }, "deletionTimestamp": { "type": "string", - "format": "date-time", "description": "DeletionTimestamp is RFC 3339 date and time at which this resource will be deleted. This field is set by the server when a graceful deletion is requested by the user, and is not directly settable by a client. The resource is expected to be deleted (no longer visible from resource lists, and not reachable by name) after the time in this field. Once set, this value may not be unset or be set further into the future, although it may be shortened or the resource may be deleted prior to this time. For example, a user may request that a pod is deleted in 30 seconds. The Kubelet will react by sending a graceful termination signal to the containers in the pod. After that 30 seconds, the Kubelet will send a hard termination signal (SIGKILL) to the container and after cleanup, remove the pod from the API. In the presence of network partitions, this object may still exist after this timestamp, until an administrator or automated process can determine the resource is fully terminated. If not set, graceful deletion of the object has not been requested.\n\nPopulated by the system when a graceful deletion is requested. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata" }, "deletionGracePeriodSeconds": { @@ -1245,7 +1243,6 @@ }, "lastScaleTime": { "type": "string", - "format": "date-time", "description": "last time the HorizontalPodAutoscaler scaled the number of pods; used by the autoscaler to control how often the number of pods is changed." }, "currentReplicas": { @@ -1265,8 +1262,8 @@ } } }, - "unversioned.Status": { - "id": "unversioned.Status", + "v1.Status": { + "id": "v1.Status", "description": "Status is a return value for calls that don't return other objects.", "properties": { "kind": { @@ -1278,7 +1275,7 @@ "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds" }, "status": { @@ -1294,7 +1291,7 @@ "description": "A machine-readable description of why this operation is in the \"Failure\" status. If this value is empty there is no information available. A Reason clarifies an HTTP status code but does not override it." }, "details": { - "$ref": "unversioned.StatusDetails", + "$ref": "v1.StatusDetails", "description": "Extended data associated with the reason. Each reason may define its own extended details. This field is optional and the data returned is not guaranteed to conform to any schema except that defined by the reason type." }, "code": { @@ -1304,8 +1301,8 @@ } } }, - "unversioned.StatusDetails": { - "id": "unversioned.StatusDetails", + "v1.StatusDetails": { + "id": "v1.StatusDetails", "description": "StatusDetails is a set of additional properties that MAY be set by the server to provide additional information about a response. The Reason field of a Status object defines what attributes will be set. Clients must ignore fields that do not match the defined type of each attribute, and should assume that any attribute may be empty, invalid, or under defined.", "properties": { "name": { @@ -1323,7 +1320,7 @@ "causes": { "type": "array", "items": { - "$ref": "unversioned.StatusCause" + "$ref": "v1.StatusCause" }, "description": "The Causes array includes more details associated with the StatusReason failure. Not all StatusReasons may provide detailed causes." }, @@ -1334,8 +1331,8 @@ } } }, - "unversioned.StatusCause": { - "id": "unversioned.StatusCause", + "v1.StatusCause": { + "id": "v1.StatusCause", "description": "StatusCause provides more information about an api.Status failure, including cases when multiple errors are encountered.", "properties": { "reason": { @@ -1367,8 +1364,8 @@ } } }, - "unversioned.Patch": { - "id": "unversioned.Patch", + "v1.Patch": { + "id": "v1.Patch", "description": "Patch is provided to give a concrete name and type to the Kubernetes PATCH request body.", "properties": {} }, @@ -1413,8 +1410,8 @@ "id": "types.UID", "properties": {} }, - "unversioned.APIResourceList": { - "id": "unversioned.APIResourceList", + "v1.APIResourceList": { + "id": "v1.APIResourceList", "description": "APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.", "required": [ "groupVersion", @@ -1436,14 +1433,14 @@ "resources": { "type": "array", "items": { - "$ref": "unversioned.APIResource" + "$ref": "v1.APIResource" }, "description": "resources contains the name of the resources and if they are namespaced." } } }, - "unversioned.APIResource": { - "id": "unversioned.APIResource", + "v1.APIResource": { + "id": "v1.APIResource", "description": "APIResource specifies the name of a resource and whether it is namespaced.", "required": [ "name", diff --git a/api/swagger-spec/batch.json b/api/swagger-spec/batch.json index 1fe54f7ca9a..fc83312861b 100644 --- a/api/swagger-spec/batch.json +++ b/api/swagger-spec/batch.json @@ -13,7 +13,7 @@ "description": "get information of a group", "operations": [ { - "type": "unversioned.APIGroup", + "type": "v1.APIGroup", "method": "GET", "summary": "get information of a group", "nickname": "getAPIGroup", @@ -33,8 +33,8 @@ } ], "models": { - "unversioned.APIGroup": { - "id": "unversioned.APIGroup", + "v1.APIGroup": { + "id": "v1.APIGroup", "description": "APIGroup contains the name, the supported versions, and the preferred version of a group.", "required": [ "name", @@ -57,25 +57,25 @@ "versions": { "type": "array", "items": { - "$ref": "unversioned.GroupVersionForDiscovery" + "$ref": "v1.GroupVersionForDiscovery" }, "description": "versions are the versions supported in this group." }, "preferredVersion": { - "$ref": "unversioned.GroupVersionForDiscovery", + "$ref": "v1.GroupVersionForDiscovery", "description": "preferredVersion is the version preferred by the API server, which probably is the storage version." }, "serverAddressByClientCIDRs": { "type": "array", "items": { - "$ref": "unversioned.ServerAddressByClientCIDR" + "$ref": "v1.ServerAddressByClientCIDR" }, "description": "a map of client CIDR to server address that is serving this group. This is to help clients reach servers in the most network-efficient way possible. Clients can use the appropriate server address as per the CIDR that they match. In case of multiple matches, clients should use the longest matching CIDR. The server returns only those CIDRs that it thinks that the client can match. For example: the master will return an internal IP CIDR only, if the client reaches the server using an internal IP. Server looks at X-Forwarded-For header or X-Real-Ip header or request.RemoteAddr (in that order) to get the client IP." } } }, - "unversioned.GroupVersionForDiscovery": { - "id": "unversioned.GroupVersionForDiscovery", + "v1.GroupVersionForDiscovery": { + "id": "v1.GroupVersionForDiscovery", "description": "GroupVersion contains the \"group/version\" and \"version\" string of a version. It is made a struct to keep extensibility.", "required": [ "groupVersion", @@ -92,8 +92,8 @@ } } }, - "unversioned.ServerAddressByClientCIDR": { - "id": "unversioned.ServerAddressByClientCIDR", + "v1.ServerAddressByClientCIDR": { + "id": "v1.ServerAddressByClientCIDR", "description": "ServerAddressByClientCIDR helps the client to determine the server address that they should use, depending on the clientCIDR that they match.", "required": [ "clientCIDR", diff --git a/api/swagger-spec/batch_v1.json b/api/swagger-spec/batch_v1.json index 24505ec3d66..38e9743c5e7 100644 --- a/api/swagger-spec/batch_v1.json +++ b/api/swagger-spec/batch_v1.json @@ -141,7 +141,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete collection of Job", "nickname": "deletecollectionNamespacedJob", @@ -207,7 +207,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -445,7 +445,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -488,7 +488,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete a Job", "nickname": "deleteNamespacedJob", @@ -546,7 +546,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -934,7 +934,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -983,7 +983,7 @@ "description": "API at /apis/batch/v1", "operations": [ { - "type": "unversioned.APIResourceList", + "type": "v1.APIResourceList", "method": "GET", "summary": "get available resources", "nickname": "getAPIResources", @@ -1019,7 +1019,7 @@ "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard list metadata More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata" }, "items": { @@ -1031,8 +1031,8 @@ } } }, - "unversioned.ListMeta": { - "id": "unversioned.ListMeta", + "v1.ListMeta": { + "id": "v1.ListMeta", "description": "ListMeta describes metadata that synthetic resources must have, including lists and various status objects. A resource may have only one of {ObjectMeta, ListMeta}.", "properties": { "selfLink": { @@ -1106,12 +1106,10 @@ }, "creationTimestamp": { "type": "string", - "format": "date-time", "description": "CreationTimestamp is a timestamp representing the server time when this object was created. It is not guaranteed to be set in happens-before order across separate operations. Clients may not set this value. It is represented in RFC3339 form and is in UTC.\n\nPopulated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata" }, "deletionTimestamp": { "type": "string", - "format": "date-time", "description": "DeletionTimestamp is RFC 3339 date and time at which this resource will be deleted. This field is set by the server when a graceful deletion is requested by the user, and is not directly settable by a client. The resource is expected to be deleted (no longer visible from resource lists, and not reachable by name) after the time in this field. Once set, this value may not be unset or be set further into the future, although it may be shortened or the resource may be deleted prior to this time. For example, a user may request that a pod is deleted in 30 seconds. The Kubelet will react by sending a graceful termination signal to the containers in the pod. After that 30 seconds, the Kubelet will send a hard termination signal (SIGKILL) to the container and after cleanup, remove the pod from the API. In the presence of network partitions, this object may still exist after this timestamp, until an administrator or automated process can determine the resource is fully terminated. If not set, graceful deletion of the object has not been requested.\n\nPopulated by the system when a graceful deletion is requested. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata" }, "deletionGracePeriodSeconds": { @@ -1202,7 +1200,7 @@ "description": "Optional duration in seconds relative to the startTime that the job may be active before the system tries to terminate it; value must be positive integer" }, "selector": { - "$ref": "unversioned.LabelSelector", + "$ref": "v1.LabelSelector", "description": "Selector is a label query over pods that should match the pod count. Normally, the system sets this field for you. More info: http://kubernetes.io/docs/user-guide/labels#label-selectors" }, "manualSelector": { @@ -1215,8 +1213,8 @@ } } }, - "unversioned.LabelSelector": { - "id": "unversioned.LabelSelector", + "v1.LabelSelector": { + "id": "v1.LabelSelector", "description": "A label selector is a label query over a set of resources. The result of matchLabels and matchExpressions are ANDed. An empty label selector matches all objects. A null label selector matches no objects.", "properties": { "matchLabels": { @@ -1226,14 +1224,14 @@ "matchExpressions": { "type": "array", "items": { - "$ref": "unversioned.LabelSelectorRequirement" + "$ref": "v1.LabelSelectorRequirement" }, "description": "matchExpressions is a list of label selector requirements. The requirements are ANDed." } } }, - "unversioned.LabelSelectorRequirement": { - "id": "unversioned.LabelSelectorRequirement", + "v1.LabelSelectorRequirement": { + "id": "v1.LabelSelectorRequirement", "description": "A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.", "required": [ "key", @@ -2627,12 +2625,10 @@ }, "startTime": { "type": "string", - "format": "date-time", "description": "StartTime represents time when the job was acknowledged by the Job Manager. It is not guaranteed to be set in happens-before order across separate operations. It is represented in RFC3339 form and is in UTC." }, "completionTime": { "type": "string", - "format": "date-time", "description": "CompletionTime represents time when the job was completed. It is not guaranteed to be set in happens-before order across separate operations. It is represented in RFC3339 form and is in UTC." }, "active": { @@ -2670,12 +2666,10 @@ }, "lastProbeTime": { "type": "string", - "format": "date-time", "description": "Last time the condition was checked." }, "lastTransitionTime": { "type": "string", - "format": "date-time", "description": "Last time the condition transit from one status to another." }, "reason": { @@ -2688,8 +2682,8 @@ } } }, - "unversioned.Status": { - "id": "unversioned.Status", + "v1.Status": { + "id": "v1.Status", "description": "Status is a return value for calls that don't return other objects.", "properties": { "kind": { @@ -2701,7 +2695,7 @@ "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds" }, "status": { @@ -2717,7 +2711,7 @@ "description": "A machine-readable description of why this operation is in the \"Failure\" status. If this value is empty there is no information available. A Reason clarifies an HTTP status code but does not override it." }, "details": { - "$ref": "unversioned.StatusDetails", + "$ref": "v1.StatusDetails", "description": "Extended data associated with the reason. Each reason may define its own extended details. This field is optional and the data returned is not guaranteed to conform to any schema except that defined by the reason type." }, "code": { @@ -2727,8 +2721,8 @@ } } }, - "unversioned.StatusDetails": { - "id": "unversioned.StatusDetails", + "v1.StatusDetails": { + "id": "v1.StatusDetails", "description": "StatusDetails is a set of additional properties that MAY be set by the server to provide additional information about a response. The Reason field of a Status object defines what attributes will be set. Clients must ignore fields that do not match the defined type of each attribute, and should assume that any attribute may be empty, invalid, or under defined.", "properties": { "name": { @@ -2746,7 +2740,7 @@ "causes": { "type": "array", "items": { - "$ref": "unversioned.StatusCause" + "$ref": "v1.StatusCause" }, "description": "The Causes array includes more details associated with the StatusReason failure. Not all StatusReasons may provide detailed causes." }, @@ -2757,8 +2751,8 @@ } } }, - "unversioned.StatusCause": { - "id": "unversioned.StatusCause", + "v1.StatusCause": { + "id": "v1.StatusCause", "description": "StatusCause provides more information about an api.Status failure, including cases when multiple errors are encountered.", "properties": { "reason": { @@ -2790,8 +2784,8 @@ } } }, - "unversioned.Patch": { - "id": "unversioned.Patch", + "v1.Patch": { + "id": "v1.Patch", "description": "Patch is provided to give a concrete name and type to the Kubernetes PATCH request body.", "properties": {} }, @@ -2836,8 +2830,8 @@ "id": "types.UID", "properties": {} }, - "unversioned.APIResourceList": { - "id": "unversioned.APIResourceList", + "v1.APIResourceList": { + "id": "v1.APIResourceList", "description": "APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.", "required": [ "groupVersion", @@ -2859,14 +2853,14 @@ "resources": { "type": "array", "items": { - "$ref": "unversioned.APIResource" + "$ref": "v1.APIResource" }, "description": "resources contains the name of the resources and if they are namespaced." } } }, - "unversioned.APIResource": { - "id": "unversioned.APIResource", + "v1.APIResource": { + "id": "v1.APIResource", "description": "APIResource specifies the name of a resource and whether it is namespaced.", "required": [ "name", diff --git a/api/swagger-spec/batch_v2alpha1.json b/api/swagger-spec/batch_v2alpha1.json index c805a3b4c26..dc54a48a072 100644 --- a/api/swagger-spec/batch_v2alpha1.json +++ b/api/swagger-spec/batch_v2alpha1.json @@ -13,7 +13,7 @@ "description": "API at /apis/batch/v2alpha1", "operations": [ { - "type": "unversioned.APIResourceList", + "type": "v1.APIResourceList", "method": "GET", "summary": "get available resources", "nickname": "getAPIResources", @@ -33,8 +33,8 @@ } ], "models": { - "unversioned.APIResourceList": { - "id": "unversioned.APIResourceList", + "v1.APIResourceList": { + "id": "v1.APIResourceList", "description": "APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.", "required": [ "groupVersion", @@ -56,14 +56,14 @@ "resources": { "type": "array", "items": { - "$ref": "unversioned.APIResource" + "$ref": "v1.APIResource" }, "description": "resources contains the name of the resources and if they are namespaced." } } }, - "unversioned.APIResource": { - "id": "unversioned.APIResource", + "v1.APIResource": { + "id": "v1.APIResource", "description": "APIResource specifies the name of a resource and whether it is namespaced.", "required": [ "name", diff --git a/api/swagger-spec/certificates.k8s.io.json b/api/swagger-spec/certificates.k8s.io.json index 42855f420e3..55811b8adc7 100644 --- a/api/swagger-spec/certificates.k8s.io.json +++ b/api/swagger-spec/certificates.k8s.io.json @@ -13,7 +13,7 @@ "description": "get information of a group", "operations": [ { - "type": "unversioned.APIGroup", + "type": "v1.APIGroup", "method": "GET", "summary": "get information of a group", "nickname": "getAPIGroup", @@ -33,8 +33,8 @@ } ], "models": { - "unversioned.APIGroup": { - "id": "unversioned.APIGroup", + "v1.APIGroup": { + "id": "v1.APIGroup", "description": "APIGroup contains the name, the supported versions, and the preferred version of a group.", "required": [ "name", @@ -57,25 +57,25 @@ "versions": { "type": "array", "items": { - "$ref": "unversioned.GroupVersionForDiscovery" + "$ref": "v1.GroupVersionForDiscovery" }, "description": "versions are the versions supported in this group." }, "preferredVersion": { - "$ref": "unversioned.GroupVersionForDiscovery", + "$ref": "v1.GroupVersionForDiscovery", "description": "preferredVersion is the version preferred by the API server, which probably is the storage version." }, "serverAddressByClientCIDRs": { "type": "array", "items": { - "$ref": "unversioned.ServerAddressByClientCIDR" + "$ref": "v1.ServerAddressByClientCIDR" }, "description": "a map of client CIDR to server address that is serving this group. This is to help clients reach servers in the most network-efficient way possible. Clients can use the appropriate server address as per the CIDR that they match. In case of multiple matches, clients should use the longest matching CIDR. The server returns only those CIDRs that it thinks that the client can match. For example: the master will return an internal IP CIDR only, if the client reaches the server using an internal IP. Server looks at X-Forwarded-For header or X-Real-Ip header or request.RemoteAddr (in that order) to get the client IP." } } }, - "unversioned.GroupVersionForDiscovery": { - "id": "unversioned.GroupVersionForDiscovery", + "v1.GroupVersionForDiscovery": { + "id": "v1.GroupVersionForDiscovery", "description": "GroupVersion contains the \"group/version\" and \"version\" string of a version. It is made a struct to keep extensibility.", "required": [ "groupVersion", @@ -92,8 +92,8 @@ } } }, - "unversioned.ServerAddressByClientCIDR": { - "id": "unversioned.ServerAddressByClientCIDR", + "v1.ServerAddressByClientCIDR": { + "id": "v1.ServerAddressByClientCIDR", "description": "ServerAddressByClientCIDR helps the client to determine the server address that they should use, depending on the clientCIDR that they match.", "required": [ "clientCIDR", diff --git a/api/swagger-spec/certificates.k8s.io_v1alpha1.json b/api/swagger-spec/certificates.k8s.io_v1alpha1.json index 60db9515378..bd511c13ed5 100644 --- a/api/swagger-spec/certificates.k8s.io_v1alpha1.json +++ b/api/swagger-spec/certificates.k8s.io_v1alpha1.json @@ -125,7 +125,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete collection of CertificateSigningRequest", "nickname": "deletecollectionCertificateSigningRequest", @@ -183,7 +183,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -397,7 +397,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -432,7 +432,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete a CertificateSigningRequest", "nickname": "deleteCertificateSigningRequest", @@ -482,7 +482,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -694,7 +694,7 @@ "description": "API at /apis/certificates.k8s.io/v1alpha1", "operations": [ { - "type": "unversioned.APIResourceList", + "type": "v1.APIResourceList", "method": "GET", "summary": "get available resources", "nickname": "getAPIResources", @@ -729,7 +729,7 @@ "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta" + "$ref": "v1.ListMeta" }, "items": { "type": "array", @@ -739,8 +739,8 @@ } } }, - "unversioned.ListMeta": { - "id": "unversioned.ListMeta", + "v1.ListMeta": { + "id": "v1.ListMeta", "description": "ListMeta describes metadata that synthetic resources must have, including lists and various status objects. A resource may have only one of {ObjectMeta, ListMeta}.", "properties": { "selfLink": { @@ -813,12 +813,10 @@ }, "creationTimestamp": { "type": "string", - "format": "date-time", "description": "CreationTimestamp is a timestamp representing the server time when this object was created. It is not guaranteed to be set in happens-before order across separate operations. Clients may not set this value. It is represented in RFC3339 form and is in UTC.\n\nPopulated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata" }, "deletionTimestamp": { "type": "string", - "format": "date-time", "description": "DeletionTimestamp is RFC 3339 date and time at which this resource will be deleted. This field is set by the server when a graceful deletion is requested by the user, and is not directly settable by a client. The resource is expected to be deleted (no longer visible from resource lists, and not reachable by name) after the time in this field. Once set, this value may not be unset or be set further into the future, although it may be shortened or the resource may be deleted prior to this time. For example, a user may request that a pod is deleted in 30 seconds. The Kubelet will react by sending a graceful termination signal to the containers in the pod. After that 30 seconds, the Kubelet will send a hard termination signal (SIGKILL) to the container and after cleanup, remove the pod from the API. In the presence of network partitions, this object may still exist after this timestamp, until an administrator or automated process can determine the resource is fully terminated. If not set, graceful deletion of the object has not been requested.\n\nPopulated by the system when a graceful deletion is requested. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata" }, "deletionGracePeriodSeconds": { @@ -948,13 +946,12 @@ }, "lastUpdateTime": { "type": "string", - "format": "date-time", "description": "timestamp for the last update to this condition" } } }, - "unversioned.Status": { - "id": "unversioned.Status", + "v1.Status": { + "id": "v1.Status", "description": "Status is a return value for calls that don't return other objects.", "properties": { "kind": { @@ -966,7 +963,7 @@ "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds" }, "status": { @@ -982,7 +979,7 @@ "description": "A machine-readable description of why this operation is in the \"Failure\" status. If this value is empty there is no information available. A Reason clarifies an HTTP status code but does not override it." }, "details": { - "$ref": "unversioned.StatusDetails", + "$ref": "v1.StatusDetails", "description": "Extended data associated with the reason. Each reason may define its own extended details. This field is optional and the data returned is not guaranteed to conform to any schema except that defined by the reason type." }, "code": { @@ -992,8 +989,8 @@ } } }, - "unversioned.StatusDetails": { - "id": "unversioned.StatusDetails", + "v1.StatusDetails": { + "id": "v1.StatusDetails", "description": "StatusDetails is a set of additional properties that MAY be set by the server to provide additional information about a response. The Reason field of a Status object defines what attributes will be set. Clients must ignore fields that do not match the defined type of each attribute, and should assume that any attribute may be empty, invalid, or under defined.", "properties": { "name": { @@ -1011,7 +1008,7 @@ "causes": { "type": "array", "items": { - "$ref": "unversioned.StatusCause" + "$ref": "v1.StatusCause" }, "description": "The Causes array includes more details associated with the StatusReason failure. Not all StatusReasons may provide detailed causes." }, @@ -1022,8 +1019,8 @@ } } }, - "unversioned.StatusCause": { - "id": "unversioned.StatusCause", + "v1.StatusCause": { + "id": "v1.StatusCause", "description": "StatusCause provides more information about an api.Status failure, including cases when multiple errors are encountered.", "properties": { "reason": { @@ -1055,8 +1052,8 @@ } } }, - "unversioned.Patch": { - "id": "unversioned.Patch", + "v1.Patch": { + "id": "v1.Patch", "description": "Patch is provided to give a concrete name and type to the Kubernetes PATCH request body.", "properties": {} }, @@ -1101,8 +1098,8 @@ "id": "types.UID", "properties": {} }, - "unversioned.APIResourceList": { - "id": "unversioned.APIResourceList", + "v1.APIResourceList": { + "id": "v1.APIResourceList", "description": "APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.", "required": [ "groupVersion", @@ -1124,14 +1121,14 @@ "resources": { "type": "array", "items": { - "$ref": "unversioned.APIResource" + "$ref": "v1.APIResource" }, "description": "resources contains the name of the resources and if they are namespaced." } } }, - "unversioned.APIResource": { - "id": "unversioned.APIResource", + "v1.APIResource": { + "id": "v1.APIResource", "description": "APIResource specifies the name of a resource and whether it is namespaced.", "required": [ "name", diff --git a/api/swagger-spec/extensions.json b/api/swagger-spec/extensions.json index 6d2375f1a61..9ee75d6eb7e 100644 --- a/api/swagger-spec/extensions.json +++ b/api/swagger-spec/extensions.json @@ -13,7 +13,7 @@ "description": "get information of a group", "operations": [ { - "type": "unversioned.APIGroup", + "type": "v1.APIGroup", "method": "GET", "summary": "get information of a group", "nickname": "getAPIGroup", @@ -33,8 +33,8 @@ } ], "models": { - "unversioned.APIGroup": { - "id": "unversioned.APIGroup", + "v1.APIGroup": { + "id": "v1.APIGroup", "description": "APIGroup contains the name, the supported versions, and the preferred version of a group.", "required": [ "name", @@ -57,25 +57,25 @@ "versions": { "type": "array", "items": { - "$ref": "unversioned.GroupVersionForDiscovery" + "$ref": "v1.GroupVersionForDiscovery" }, "description": "versions are the versions supported in this group." }, "preferredVersion": { - "$ref": "unversioned.GroupVersionForDiscovery", + "$ref": "v1.GroupVersionForDiscovery", "description": "preferredVersion is the version preferred by the API server, which probably is the storage version." }, "serverAddressByClientCIDRs": { "type": "array", "items": { - "$ref": "unversioned.ServerAddressByClientCIDR" + "$ref": "v1.ServerAddressByClientCIDR" }, "description": "a map of client CIDR to server address that is serving this group. This is to help clients reach servers in the most network-efficient way possible. Clients can use the appropriate server address as per the CIDR that they match. In case of multiple matches, clients should use the longest matching CIDR. The server returns only those CIDRs that it thinks that the client can match. For example: the master will return an internal IP CIDR only, if the client reaches the server using an internal IP. Server looks at X-Forwarded-For header or X-Real-Ip header or request.RemoteAddr (in that order) to get the client IP." } } }, - "unversioned.GroupVersionForDiscovery": { - "id": "unversioned.GroupVersionForDiscovery", + "v1.GroupVersionForDiscovery": { + "id": "v1.GroupVersionForDiscovery", "description": "GroupVersion contains the \"group/version\" and \"version\" string of a version. It is made a struct to keep extensibility.", "required": [ "groupVersion", @@ -92,8 +92,8 @@ } } }, - "unversioned.ServerAddressByClientCIDR": { - "id": "unversioned.ServerAddressByClientCIDR", + "v1.ServerAddressByClientCIDR": { + "id": "v1.ServerAddressByClientCIDR", "description": "ServerAddressByClientCIDR helps the client to determine the server address that they should use, depending on the clientCIDR that they match.", "required": [ "clientCIDR", diff --git a/api/swagger-spec/extensions_v1beta1.json b/api/swagger-spec/extensions_v1beta1.json index f9ed720cdb0..11aebb3180e 100644 --- a/api/swagger-spec/extensions_v1beta1.json +++ b/api/swagger-spec/extensions_v1beta1.json @@ -141,7 +141,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete collection of DaemonSet", "nickname": "deletecollectionNamespacedDaemonSet", @@ -207,7 +207,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -445,7 +445,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -488,7 +488,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete a DaemonSet", "nickname": "deleteNamespacedDaemonSet", @@ -546,7 +546,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -934,7 +934,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -1111,7 +1111,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete collection of Deployment", "nickname": "deletecollectionNamespacedDeployment", @@ -1177,7 +1177,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -1415,7 +1415,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -1458,7 +1458,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete a Deployment", "nickname": "deleteNamespacedDeployment", @@ -1516,7 +1516,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -1965,7 +1965,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -2130,7 +2130,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -2307,7 +2307,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete collection of HorizontalPodAutoscaler", "nickname": "deletecollectionNamespacedHorizontalPodAutoscaler", @@ -2373,7 +2373,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -2611,7 +2611,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -2654,7 +2654,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete a HorizontalPodAutoscaler", "nickname": "deleteNamespacedHorizontalPodAutoscaler", @@ -2712,7 +2712,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -3100,7 +3100,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -3277,7 +3277,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete collection of Ingress", "nickname": "deletecollectionNamespacedIngress", @@ -3343,7 +3343,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -3581,7 +3581,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -3624,7 +3624,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete an Ingress", "nickname": "deleteNamespacedIngress", @@ -3682,7 +3682,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -4070,7 +4070,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -4247,7 +4247,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete collection of Job", "nickname": "deletecollectionNamespacedJob", @@ -4313,7 +4313,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -4551,7 +4551,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -4594,7 +4594,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete a Job", "nickname": "deleteNamespacedJob", @@ -4652,7 +4652,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -5040,7 +5040,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -5217,7 +5217,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete collection of NetworkPolicy", "nickname": "deletecollectionNamespacedNetworkPolicy", @@ -5283,7 +5283,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -5521,7 +5521,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -5564,7 +5564,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete a NetworkPolicy", "nickname": "deleteNamespacedNetworkPolicy", @@ -5622,7 +5622,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -6022,7 +6022,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete collection of ReplicaSet", "nickname": "deletecollectionNamespacedReplicaSet", @@ -6088,7 +6088,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -6326,7 +6326,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -6369,7 +6369,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete a ReplicaSet", "nickname": "deleteNamespacedReplicaSet", @@ -6427,7 +6427,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -6815,7 +6815,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -6980,7 +6980,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -7145,7 +7145,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -7306,7 +7306,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete collection of ThirdPartyResource", "nickname": "deletecollectionThirdPartyResource", @@ -7364,7 +7364,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -7578,7 +7578,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -7613,7 +7613,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete a ThirdPartyResource", "nickname": "deleteThirdPartyResource", @@ -7663,7 +7663,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -7769,7 +7769,7 @@ "description": "API at /apis/extensions/v1beta1", "operations": [ { - "type": "unversioned.APIResourceList", + "type": "v1.APIResourceList", "method": "GET", "summary": "get available resources", "nickname": "getAPIResources", @@ -7805,7 +7805,7 @@ "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata" }, "items": { @@ -7817,8 +7817,8 @@ } } }, - "unversioned.ListMeta": { - "id": "unversioned.ListMeta", + "v1.ListMeta": { + "id": "v1.ListMeta", "description": "ListMeta describes metadata that synthetic resources must have, including lists and various status objects. A resource may have only one of {ObjectMeta, ListMeta}.", "properties": { "selfLink": { @@ -7892,12 +7892,10 @@ }, "creationTimestamp": { "type": "string", - "format": "date-time", "description": "CreationTimestamp is a timestamp representing the server time when this object was created. It is not guaranteed to be set in happens-before order across separate operations. Clients may not set this value. It is represented in RFC3339 form and is in UTC.\n\nPopulated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata" }, "deletionTimestamp": { "type": "string", - "format": "date-time", "description": "DeletionTimestamp is RFC 3339 date and time at which this resource will be deleted. This field is set by the server when a graceful deletion is requested by the user, and is not directly settable by a client. The resource is expected to be deleted (no longer visible from resource lists, and not reachable by name) after the time in this field. Once set, this value may not be unset or be set further into the future, although it may be shortened or the resource may be deleted prior to this time. For example, a user may request that a pod is deleted in 30 seconds. The Kubelet will react by sending a graceful termination signal to the containers in the pod. After that 30 seconds, the Kubelet will send a hard termination signal (SIGKILL) to the container and after cleanup, remove the pod from the API. In the presence of network partitions, this object may still exist after this timestamp, until an administrator or automated process can determine the resource is fully terminated. If not set, graceful deletion of the object has not been requested.\n\nPopulated by the system when a graceful deletion is requested. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata" }, "deletionGracePeriodSeconds": { @@ -7973,7 +7971,7 @@ ], "properties": { "selector": { - "$ref": "unversioned.LabelSelector", + "$ref": "v1.LabelSelector", "description": "Selector is a label query over pods that are managed by the daemon set. Must match in order to be controlled. If empty, defaulted to labels on Pod template. More info: http://kubernetes.io/docs/user-guide/labels#label-selectors" }, "template": { @@ -7982,8 +7980,8 @@ } } }, - "unversioned.LabelSelector": { - "id": "unversioned.LabelSelector", + "v1.LabelSelector": { + "id": "v1.LabelSelector", "description": "A label selector is a label query over a set of resources. The result of matchLabels and matchExpressions are ANDed. An empty label selector matches all objects. A null label selector matches no objects.", "properties": { "matchLabels": { @@ -7993,14 +7991,14 @@ "matchExpressions": { "type": "array", "items": { - "$ref": "unversioned.LabelSelectorRequirement" + "$ref": "v1.LabelSelectorRequirement" }, "description": "matchExpressions is a list of label selector requirements. The requirements are ANDed." } } }, - "unversioned.LabelSelectorRequirement": { - "id": "unversioned.LabelSelectorRequirement", + "v1.LabelSelectorRequirement": { + "id": "v1.LabelSelectorRequirement", "description": "A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.", "required": [ "key", @@ -9413,8 +9411,8 @@ } } }, - "unversioned.Status": { - "id": "unversioned.Status", + "v1.Status": { + "id": "v1.Status", "description": "Status is a return value for calls that don't return other objects.", "properties": { "kind": { @@ -9426,7 +9424,7 @@ "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds" }, "status": { @@ -9442,7 +9440,7 @@ "description": "A machine-readable description of why this operation is in the \"Failure\" status. If this value is empty there is no information available. A Reason clarifies an HTTP status code but does not override it." }, "details": { - "$ref": "unversioned.StatusDetails", + "$ref": "v1.StatusDetails", "description": "Extended data associated with the reason. Each reason may define its own extended details. This field is optional and the data returned is not guaranteed to conform to any schema except that defined by the reason type." }, "code": { @@ -9452,8 +9450,8 @@ } } }, - "unversioned.StatusDetails": { - "id": "unversioned.StatusDetails", + "v1.StatusDetails": { + "id": "v1.StatusDetails", "description": "StatusDetails is a set of additional properties that MAY be set by the server to provide additional information about a response. The Reason field of a Status object defines what attributes will be set. Clients must ignore fields that do not match the defined type of each attribute, and should assume that any attribute may be empty, invalid, or under defined.", "properties": { "name": { @@ -9471,7 +9469,7 @@ "causes": { "type": "array", "items": { - "$ref": "unversioned.StatusCause" + "$ref": "v1.StatusCause" }, "description": "The Causes array includes more details associated with the StatusReason failure. Not all StatusReasons may provide detailed causes." }, @@ -9482,8 +9480,8 @@ } } }, - "unversioned.StatusCause": { - "id": "unversioned.StatusCause", + "v1.StatusCause": { + "id": "v1.StatusCause", "description": "StatusCause provides more information about an api.Status failure, including cases when multiple errors are encountered.", "properties": { "reason": { @@ -9515,8 +9513,8 @@ } } }, - "unversioned.Patch": { - "id": "unversioned.Patch", + "v1.Patch": { + "id": "v1.Patch", "description": "Patch is provided to give a concrete name and type to the Kubernetes PATCH request body.", "properties": {} }, @@ -9577,7 +9575,7 @@ "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard list metadata." }, "items": { @@ -9628,7 +9626,7 @@ "description": "Number of desired pods. This is a pointer to distinguish between explicit zero and not specified. Defaults to 1." }, "selector": { - "$ref": "unversioned.LabelSelector", + "$ref": "v1.LabelSelector", "description": "Label selector for pods. Existing ReplicaSets whose pods are selected by this will be the ones affected by this deployment." }, "template": { @@ -9758,12 +9756,10 @@ }, "lastUpdateTime": { "type": "string", - "format": "date-time", "description": "The last time this condition was updated." }, "lastTransitionTime": { "type": "string", - "format": "date-time", "description": "Last time the condition transitioned from one status to another." }, "reason": { @@ -9881,7 +9877,7 @@ "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard list metadata." }, "items": { @@ -9997,7 +9993,6 @@ }, "lastScaleTime": { "type": "string", - "format": "date-time", "description": "last time the HorizontalPodAutoscaler scaled the number of pods; used by the autoscaler to control how often the number of pods is changed." }, "currentReplicas": { @@ -10033,7 +10028,7 @@ "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard object's metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata" }, "items": { @@ -10229,7 +10224,7 @@ "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard list metadata More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata" }, "items": { @@ -10290,7 +10285,7 @@ "description": "Optional duration in seconds relative to the startTime that the job may be active before the system tries to terminate it; value must be positive integer" }, "selector": { - "$ref": "unversioned.LabelSelector", + "$ref": "v1.LabelSelector", "description": "Selector is a label query over pods that should match the pod count. Normally, the system sets this field for you. More info: http://kubernetes.io/docs/user-guide/labels#label-selectors" }, "autoSelector": { @@ -10316,12 +10311,10 @@ }, "startTime": { "type": "string", - "format": "date-time", "description": "StartTime represents time when the job was acknowledged by the Job Manager. It is not guaranteed to be set in happens-before order across separate operations. It is represented in RFC3339 form and is in UTC." }, "completionTime": { "type": "string", - "format": "date-time", "description": "CompletionTime represents time when the job was completed. It is not guaranteed to be set in happens-before order across separate operations. It is represented in RFC3339 form and is in UTC." }, "active": { @@ -10359,12 +10352,10 @@ }, "lastProbeTime": { "type": "string", - "format": "date-time", "description": "Last time the condition was checked." }, "lastTransitionTime": { "type": "string", - "format": "date-time", "description": "Last time the condition transit from one status to another." }, "reason": { @@ -10393,7 +10384,7 @@ "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata" }, "items": { @@ -10433,7 +10424,7 @@ ], "properties": { "podSelector": { - "$ref": "unversioned.LabelSelector", + "$ref": "v1.LabelSelector", "description": "Selects the pods to which this NetworkPolicy object applies. The array of ingress rules is applied to any pods selected by this field. Multiple network policies can select the same set of pods. In this case, the ingress rules for each are combined additively. This field is NOT optional and follows standard label selector semantics. An empty podSelector matches all pods in this namespace." }, "ingress": { @@ -10486,11 +10477,11 @@ "id": "v1beta1.NetworkPolicyPeer", "properties": { "podSelector": { - "$ref": "unversioned.LabelSelector", + "$ref": "v1.LabelSelector", "description": "This is a label selector which selects Pods in this namespace. This field follows standard label selector semantics. If not provided, this selector selects no pods. If present but empty, this selector selects all pods in this namespace." }, "namespaceSelector": { - "$ref": "unversioned.LabelSelector", + "$ref": "v1.LabelSelector", "description": "Selects Namespaces using cluster scoped-labels. This matches all pods in all namespaces selected by this label selector. This field follows standard label selector semantics. If omitted, this selector selects no namespaces. If present but empty, this selector selects all namespaces." } } @@ -10511,7 +10502,7 @@ "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds" }, "items": { @@ -10564,7 +10555,7 @@ "description": "Minimum number of seconds for which a newly created pod should be ready without any of its container crashing, for it to be considered available. Defaults to 0 (pod will be considered available as soon as it is ready)" }, "selector": { - "$ref": "unversioned.LabelSelector", + "$ref": "v1.LabelSelector", "description": "Selector is a label query over pods that should match the replica count. If the selector is empty, it is defaulted to the labels present on the pod template. Label keys and values that must match in order to be controlled by this replica set. More info: http://kubernetes.io/docs/user-guide/labels#label-selectors" }, "template": { @@ -10632,7 +10623,6 @@ }, "lastTransitionTime": { "type": "string", - "format": "date-time", "description": "The last time the condition transitioned from one status to another." }, "reason": { @@ -10661,7 +10651,7 @@ "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard list metadata." }, "items": { @@ -10712,8 +10702,8 @@ } } }, - "unversioned.APIResourceList": { - "id": "unversioned.APIResourceList", + "v1.APIResourceList": { + "id": "v1.APIResourceList", "description": "APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.", "required": [ "groupVersion", @@ -10735,14 +10725,14 @@ "resources": { "type": "array", "items": { - "$ref": "unversioned.APIResource" + "$ref": "v1.APIResource" }, "description": "resources contains the name of the resources and if they are namespaced." } } }, - "unversioned.APIResource": { - "id": "unversioned.APIResource", + "v1.APIResource": { + "id": "v1.APIResource", "description": "APIResource specifies the name of a resource and whether it is namespaced.", "required": [ "name", diff --git a/api/swagger-spec/policy.json b/api/swagger-spec/policy.json index 208c1079930..d3ccf618a5e 100644 --- a/api/swagger-spec/policy.json +++ b/api/swagger-spec/policy.json @@ -13,7 +13,7 @@ "description": "get information of a group", "operations": [ { - "type": "unversioned.APIGroup", + "type": "v1.APIGroup", "method": "GET", "summary": "get information of a group", "nickname": "getAPIGroup", @@ -33,8 +33,8 @@ } ], "models": { - "unversioned.APIGroup": { - "id": "unversioned.APIGroup", + "v1.APIGroup": { + "id": "v1.APIGroup", "description": "APIGroup contains the name, the supported versions, and the preferred version of a group.", "required": [ "name", @@ -57,25 +57,25 @@ "versions": { "type": "array", "items": { - "$ref": "unversioned.GroupVersionForDiscovery" + "$ref": "v1.GroupVersionForDiscovery" }, "description": "versions are the versions supported in this group." }, "preferredVersion": { - "$ref": "unversioned.GroupVersionForDiscovery", + "$ref": "v1.GroupVersionForDiscovery", "description": "preferredVersion is the version preferred by the API server, which probably is the storage version." }, "serverAddressByClientCIDRs": { "type": "array", "items": { - "$ref": "unversioned.ServerAddressByClientCIDR" + "$ref": "v1.ServerAddressByClientCIDR" }, "description": "a map of client CIDR to server address that is serving this group. This is to help clients reach servers in the most network-efficient way possible. Clients can use the appropriate server address as per the CIDR that they match. In case of multiple matches, clients should use the longest matching CIDR. The server returns only those CIDRs that it thinks that the client can match. For example: the master will return an internal IP CIDR only, if the client reaches the server using an internal IP. Server looks at X-Forwarded-For header or X-Real-Ip header or request.RemoteAddr (in that order) to get the client IP." } } }, - "unversioned.GroupVersionForDiscovery": { - "id": "unversioned.GroupVersionForDiscovery", + "v1.GroupVersionForDiscovery": { + "id": "v1.GroupVersionForDiscovery", "description": "GroupVersion contains the \"group/version\" and \"version\" string of a version. It is made a struct to keep extensibility.", "required": [ "groupVersion", @@ -92,8 +92,8 @@ } } }, - "unversioned.ServerAddressByClientCIDR": { - "id": "unversioned.ServerAddressByClientCIDR", + "v1.ServerAddressByClientCIDR": { + "id": "v1.ServerAddressByClientCIDR", "description": "ServerAddressByClientCIDR helps the client to determine the server address that they should use, depending on the clientCIDR that they match.", "required": [ "clientCIDR", diff --git a/api/swagger-spec/policy_v1beta1.json b/api/swagger-spec/policy_v1beta1.json index b79449f2adb..7d5695ecc00 100644 --- a/api/swagger-spec/policy_v1beta1.json +++ b/api/swagger-spec/policy_v1beta1.json @@ -141,7 +141,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete collection of PodDisruptionBudget", "nickname": "deletecollectionNamespacedPodDisruptionBudget", @@ -207,7 +207,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -445,7 +445,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -488,7 +488,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete a PodDisruptionBudget", "nickname": "deleteNamespacedPodDisruptionBudget", @@ -546,7 +546,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -934,7 +934,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -983,7 +983,7 @@ "description": "API at /apis/policy/v1beta1", "operations": [ { - "type": "unversioned.APIResourceList", + "type": "v1.APIResourceList", "method": "GET", "summary": "get available resources", "nickname": "getAPIResources", @@ -1019,7 +1019,7 @@ "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta" + "$ref": "v1.ListMeta" }, "items": { "type": "array", @@ -1029,8 +1029,8 @@ } } }, - "unversioned.ListMeta": { - "id": "unversioned.ListMeta", + "v1.ListMeta": { + "id": "v1.ListMeta", "description": "ListMeta describes metadata that synthetic resources must have, including lists and various status objects. A resource may have only one of {ObjectMeta, ListMeta}.", "properties": { "selfLink": { @@ -1103,12 +1103,10 @@ }, "creationTimestamp": { "type": "string", - "format": "date-time", "description": "CreationTimestamp is a timestamp representing the server time when this object was created. It is not guaranteed to be set in happens-before order across separate operations. Clients may not set this value. It is represented in RFC3339 form and is in UTC.\n\nPopulated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata" }, "deletionTimestamp": { "type": "string", - "format": "date-time", "description": "DeletionTimestamp is RFC 3339 date and time at which this resource will be deleted. This field is set by the server when a graceful deletion is requested by the user, and is not directly settable by a client. The resource is expected to be deleted (no longer visible from resource lists, and not reachable by name) after the time in this field. Once set, this value may not be unset or be set further into the future, although it may be shortened or the resource may be deleted prior to this time. For example, a user may request that a pod is deleted in 30 seconds. The Kubelet will react by sending a graceful termination signal to the containers in the pod. After that 30 seconds, the Kubelet will send a hard termination signal (SIGKILL) to the container and after cleanup, remove the pod from the API. In the presence of network partitions, this object may still exist after this timestamp, until an administrator or automated process can determine the resource is fully terminated. If not set, graceful deletion of the object has not been requested.\n\nPopulated by the system when a graceful deletion is requested. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata" }, "deletionGracePeriodSeconds": { @@ -1185,13 +1183,13 @@ "description": "An eviction is allowed if at least \"minAvailable\" pods selected by \"selector\" will still be available after the eviction, i.e. even in the absence of the evicted pod. So for example you can prevent all voluntary evictions by specifying \"100%\"." }, "selector": { - "$ref": "unversioned.LabelSelector", + "$ref": "v1.LabelSelector", "description": "Label query over pods whose evictions are managed by the disruption budget." } } }, - "unversioned.LabelSelector": { - "id": "unversioned.LabelSelector", + "v1.LabelSelector": { + "id": "v1.LabelSelector", "description": "A label selector is a label query over a set of resources. The result of matchLabels and matchExpressions are ANDed. An empty label selector matches all objects. A null label selector matches no objects.", "properties": { "matchLabels": { @@ -1201,14 +1199,14 @@ "matchExpressions": { "type": "array", "items": { - "$ref": "unversioned.LabelSelectorRequirement" + "$ref": "v1.LabelSelectorRequirement" }, "description": "matchExpressions is a list of label selector requirements. The requirements are ANDed." } } }, - "unversioned.LabelSelectorRequirement": { - "id": "unversioned.LabelSelectorRequirement", + "v1.LabelSelectorRequirement": { + "id": "v1.LabelSelectorRequirement", "description": "A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.", "required": [ "key", @@ -1274,8 +1272,8 @@ } } }, - "unversioned.Status": { - "id": "unversioned.Status", + "v1.Status": { + "id": "v1.Status", "description": "Status is a return value for calls that don't return other objects.", "properties": { "kind": { @@ -1287,7 +1285,7 @@ "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds" }, "status": { @@ -1303,7 +1301,7 @@ "description": "A machine-readable description of why this operation is in the \"Failure\" status. If this value is empty there is no information available. A Reason clarifies an HTTP status code but does not override it." }, "details": { - "$ref": "unversioned.StatusDetails", + "$ref": "v1.StatusDetails", "description": "Extended data associated with the reason. Each reason may define its own extended details. This field is optional and the data returned is not guaranteed to conform to any schema except that defined by the reason type." }, "code": { @@ -1313,8 +1311,8 @@ } } }, - "unversioned.StatusDetails": { - "id": "unversioned.StatusDetails", + "v1.StatusDetails": { + "id": "v1.StatusDetails", "description": "StatusDetails is a set of additional properties that MAY be set by the server to provide additional information about a response. The Reason field of a Status object defines what attributes will be set. Clients must ignore fields that do not match the defined type of each attribute, and should assume that any attribute may be empty, invalid, or under defined.", "properties": { "name": { @@ -1332,7 +1330,7 @@ "causes": { "type": "array", "items": { - "$ref": "unversioned.StatusCause" + "$ref": "v1.StatusCause" }, "description": "The Causes array includes more details associated with the StatusReason failure. Not all StatusReasons may provide detailed causes." }, @@ -1343,8 +1341,8 @@ } } }, - "unversioned.StatusCause": { - "id": "unversioned.StatusCause", + "v1.StatusCause": { + "id": "v1.StatusCause", "description": "StatusCause provides more information about an api.Status failure, including cases when multiple errors are encountered.", "properties": { "reason": { @@ -1376,8 +1374,8 @@ } } }, - "unversioned.Patch": { - "id": "unversioned.Patch", + "v1.Patch": { + "id": "v1.Patch", "description": "Patch is provided to give a concrete name and type to the Kubernetes PATCH request body.", "properties": {} }, @@ -1422,8 +1420,8 @@ "id": "types.UID", "properties": {} }, - "unversioned.APIResourceList": { - "id": "unversioned.APIResourceList", + "v1.APIResourceList": { + "id": "v1.APIResourceList", "description": "APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.", "required": [ "groupVersion", @@ -1445,14 +1443,14 @@ "resources": { "type": "array", "items": { - "$ref": "unversioned.APIResource" + "$ref": "v1.APIResource" }, "description": "resources contains the name of the resources and if they are namespaced." } } }, - "unversioned.APIResource": { - "id": "unversioned.APIResource", + "v1.APIResource": { + "id": "v1.APIResource", "description": "APIResource specifies the name of a resource and whether it is namespaced.", "required": [ "name", diff --git a/api/swagger-spec/rbac.authorization.k8s.io.json b/api/swagger-spec/rbac.authorization.k8s.io.json index 8df6f779780..be3255dbaa7 100644 --- a/api/swagger-spec/rbac.authorization.k8s.io.json +++ b/api/swagger-spec/rbac.authorization.k8s.io.json @@ -13,7 +13,7 @@ "description": "get information of a group", "operations": [ { - "type": "unversioned.APIGroup", + "type": "v1.APIGroup", "method": "GET", "summary": "get information of a group", "nickname": "getAPIGroup", @@ -33,8 +33,8 @@ } ], "models": { - "unversioned.APIGroup": { - "id": "unversioned.APIGroup", + "v1.APIGroup": { + "id": "v1.APIGroup", "description": "APIGroup contains the name, the supported versions, and the preferred version of a group.", "required": [ "name", @@ -57,25 +57,25 @@ "versions": { "type": "array", "items": { - "$ref": "unversioned.GroupVersionForDiscovery" + "$ref": "v1.GroupVersionForDiscovery" }, "description": "versions are the versions supported in this group." }, "preferredVersion": { - "$ref": "unversioned.GroupVersionForDiscovery", + "$ref": "v1.GroupVersionForDiscovery", "description": "preferredVersion is the version preferred by the API server, which probably is the storage version." }, "serverAddressByClientCIDRs": { "type": "array", "items": { - "$ref": "unversioned.ServerAddressByClientCIDR" + "$ref": "v1.ServerAddressByClientCIDR" }, "description": "a map of client CIDR to server address that is serving this group. This is to help clients reach servers in the most network-efficient way possible. Clients can use the appropriate server address as per the CIDR that they match. In case of multiple matches, clients should use the longest matching CIDR. The server returns only those CIDRs that it thinks that the client can match. For example: the master will return an internal IP CIDR only, if the client reaches the server using an internal IP. Server looks at X-Forwarded-For header or X-Real-Ip header or request.RemoteAddr (in that order) to get the client IP." } } }, - "unversioned.GroupVersionForDiscovery": { - "id": "unversioned.GroupVersionForDiscovery", + "v1.GroupVersionForDiscovery": { + "id": "v1.GroupVersionForDiscovery", "description": "GroupVersion contains the \"group/version\" and \"version\" string of a version. It is made a struct to keep extensibility.", "required": [ "groupVersion", @@ -92,8 +92,8 @@ } } }, - "unversioned.ServerAddressByClientCIDR": { - "id": "unversioned.ServerAddressByClientCIDR", + "v1.ServerAddressByClientCIDR": { + "id": "v1.ServerAddressByClientCIDR", "description": "ServerAddressByClientCIDR helps the client to determine the server address that they should use, depending on the clientCIDR that they match.", "required": [ "clientCIDR", diff --git a/api/swagger-spec/rbac.authorization.k8s.io_v1alpha1.json b/api/swagger-spec/rbac.authorization.k8s.io_v1alpha1.json index 6380ec43d83..37f53bc409d 100644 --- a/api/swagger-spec/rbac.authorization.k8s.io_v1alpha1.json +++ b/api/swagger-spec/rbac.authorization.k8s.io_v1alpha1.json @@ -125,7 +125,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete collection of ClusterRoleBinding", "nickname": "deletecollectionClusterRoleBinding", @@ -183,7 +183,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -381,7 +381,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -416,7 +416,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete a ClusterRoleBinding", "nickname": "deleteClusterRoleBinding", @@ -466,7 +466,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -684,7 +684,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete collection of ClusterRole", "nickname": "deletecollectionClusterRole", @@ -742,7 +742,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -940,7 +940,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -975,7 +975,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete a ClusterRole", "nickname": "deleteClusterRole", @@ -1025,7 +1025,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -1259,7 +1259,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete collection of RoleBinding", "nickname": "deletecollectionNamespacedRoleBinding", @@ -1325,7 +1325,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -1547,7 +1547,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -1590,7 +1590,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete a RoleBinding", "nickname": "deleteNamespacedRoleBinding", @@ -1648,7 +1648,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -2048,7 +2048,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete collection of Role", "nickname": "deletecollectionNamespacedRole", @@ -2114,7 +2114,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -2336,7 +2336,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -2379,7 +2379,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete a Role", "nickname": "deleteNamespacedRole", @@ -2437,7 +2437,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -2709,7 +2709,7 @@ "description": "API at /apis/rbac.authorization.k8s.io/v1alpha1", "operations": [ { - "type": "unversioned.APIResourceList", + "type": "v1.APIResourceList", "method": "GET", "summary": "get available resources", "nickname": "getAPIResources", @@ -2745,7 +2745,7 @@ "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard object's metadata." }, "items": { @@ -2757,8 +2757,8 @@ } } }, - "unversioned.ListMeta": { - "id": "unversioned.ListMeta", + "v1.ListMeta": { + "id": "v1.ListMeta", "description": "ListMeta describes metadata that synthetic resources must have, including lists and various status objects. A resource may have only one of {ObjectMeta, ListMeta}.", "properties": { "selfLink": { @@ -2839,12 +2839,10 @@ }, "creationTimestamp": { "type": "string", - "format": "date-time", "description": "CreationTimestamp is a timestamp representing the server time when this object was created. It is not guaranteed to be set in happens-before order across separate operations. Clients may not set this value. It is represented in RFC3339 form and is in UTC.\n\nPopulated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata" }, "deletionTimestamp": { "type": "string", - "format": "date-time", "description": "DeletionTimestamp is RFC 3339 date and time at which this resource will be deleted. This field is set by the server when a graceful deletion is requested by the user, and is not directly settable by a client. The resource is expected to be deleted (no longer visible from resource lists, and not reachable by name) after the time in this field. Once set, this value may not be unset or be set further into the future, although it may be shortened or the resource may be deleted prior to this time. For example, a user may request that a pod is deleted in 30 seconds. The Kubelet will react by sending a graceful termination signal to the containers in the pod. After that 30 seconds, the Kubelet will send a hard termination signal (SIGKILL) to the container and after cleanup, remove the pod from the API. In the presence of network partitions, this object may still exist after this timestamp, until an administrator or automated process can determine the resource is fully terminated. If not set, graceful deletion of the object has not been requested.\n\nPopulated by the system when a graceful deletion is requested. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata" }, "deletionGracePeriodSeconds": { @@ -2961,8 +2959,8 @@ } } }, - "unversioned.Status": { - "id": "unversioned.Status", + "v1.Status": { + "id": "v1.Status", "description": "Status is a return value for calls that don't return other objects.", "properties": { "kind": { @@ -2974,7 +2972,7 @@ "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds" }, "status": { @@ -2990,7 +2988,7 @@ "description": "A machine-readable description of why this operation is in the \"Failure\" status. If this value is empty there is no information available. A Reason clarifies an HTTP status code but does not override it." }, "details": { - "$ref": "unversioned.StatusDetails", + "$ref": "v1.StatusDetails", "description": "Extended data associated with the reason. Each reason may define its own extended details. This field is optional and the data returned is not guaranteed to conform to any schema except that defined by the reason type." }, "code": { @@ -3000,8 +2998,8 @@ } } }, - "unversioned.StatusDetails": { - "id": "unversioned.StatusDetails", + "v1.StatusDetails": { + "id": "v1.StatusDetails", "description": "StatusDetails is a set of additional properties that MAY be set by the server to provide additional information about a response. The Reason field of a Status object defines what attributes will be set. Clients must ignore fields that do not match the defined type of each attribute, and should assume that any attribute may be empty, invalid, or under defined.", "properties": { "name": { @@ -3019,7 +3017,7 @@ "causes": { "type": "array", "items": { - "$ref": "unversioned.StatusCause" + "$ref": "v1.StatusCause" }, "description": "The Causes array includes more details associated with the StatusReason failure. Not all StatusReasons may provide detailed causes." }, @@ -3030,8 +3028,8 @@ } } }, - "unversioned.StatusCause": { - "id": "unversioned.StatusCause", + "v1.StatusCause": { + "id": "v1.StatusCause", "description": "StatusCause provides more information about an api.Status failure, including cases when multiple errors are encountered.", "properties": { "reason": { @@ -3063,8 +3061,8 @@ } } }, - "unversioned.Patch": { - "id": "unversioned.Patch", + "v1.Patch": { + "id": "v1.Patch", "description": "Patch is provided to give a concrete name and type to the Kubernetes PATCH request body.", "properties": {} }, @@ -3125,7 +3123,7 @@ "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard object's metadata." }, "items": { @@ -3229,7 +3227,7 @@ "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard object's metadata." }, "items": { @@ -3290,7 +3288,7 @@ "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard object's metadata." }, "items": { @@ -3330,8 +3328,8 @@ } } }, - "unversioned.APIResourceList": { - "id": "unversioned.APIResourceList", + "v1.APIResourceList": { + "id": "v1.APIResourceList", "description": "APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.", "required": [ "groupVersion", @@ -3353,14 +3351,14 @@ "resources": { "type": "array", "items": { - "$ref": "unversioned.APIResource" + "$ref": "v1.APIResource" }, "description": "resources contains the name of the resources and if they are namespaced." } } }, - "unversioned.APIResource": { - "id": "unversioned.APIResource", + "v1.APIResource": { + "id": "v1.APIResource", "description": "APIResource specifies the name of a resource and whether it is namespaced.", "required": [ "name", diff --git a/api/swagger-spec/storage.k8s.io.json b/api/swagger-spec/storage.k8s.io.json index 526db1aecd3..b94c2feabf0 100644 --- a/api/swagger-spec/storage.k8s.io.json +++ b/api/swagger-spec/storage.k8s.io.json @@ -13,7 +13,7 @@ "description": "get information of a group", "operations": [ { - "type": "unversioned.APIGroup", + "type": "v1.APIGroup", "method": "GET", "summary": "get information of a group", "nickname": "getAPIGroup", @@ -33,8 +33,8 @@ } ], "models": { - "unversioned.APIGroup": { - "id": "unversioned.APIGroup", + "v1.APIGroup": { + "id": "v1.APIGroup", "description": "APIGroup contains the name, the supported versions, and the preferred version of a group.", "required": [ "name", @@ -57,25 +57,25 @@ "versions": { "type": "array", "items": { - "$ref": "unversioned.GroupVersionForDiscovery" + "$ref": "v1.GroupVersionForDiscovery" }, "description": "versions are the versions supported in this group." }, "preferredVersion": { - "$ref": "unversioned.GroupVersionForDiscovery", + "$ref": "v1.GroupVersionForDiscovery", "description": "preferredVersion is the version preferred by the API server, which probably is the storage version." }, "serverAddressByClientCIDRs": { "type": "array", "items": { - "$ref": "unversioned.ServerAddressByClientCIDR" + "$ref": "v1.ServerAddressByClientCIDR" }, "description": "a map of client CIDR to server address that is serving this group. This is to help clients reach servers in the most network-efficient way possible. Clients can use the appropriate server address as per the CIDR that they match. In case of multiple matches, clients should use the longest matching CIDR. The server returns only those CIDRs that it thinks that the client can match. For example: the master will return an internal IP CIDR only, if the client reaches the server using an internal IP. Server looks at X-Forwarded-For header or X-Real-Ip header or request.RemoteAddr (in that order) to get the client IP." } } }, - "unversioned.GroupVersionForDiscovery": { - "id": "unversioned.GroupVersionForDiscovery", + "v1.GroupVersionForDiscovery": { + "id": "v1.GroupVersionForDiscovery", "description": "GroupVersion contains the \"group/version\" and \"version\" string of a version. It is made a struct to keep extensibility.", "required": [ "groupVersion", @@ -92,8 +92,8 @@ } } }, - "unversioned.ServerAddressByClientCIDR": { - "id": "unversioned.ServerAddressByClientCIDR", + "v1.ServerAddressByClientCIDR": { + "id": "v1.ServerAddressByClientCIDR", "description": "ServerAddressByClientCIDR helps the client to determine the server address that they should use, depending on the clientCIDR that they match.", "required": [ "clientCIDR", diff --git a/api/swagger-spec/storage.k8s.io_v1beta1.json b/api/swagger-spec/storage.k8s.io_v1beta1.json index 35b339ebd7e..6b2befbfad2 100644 --- a/api/swagger-spec/storage.k8s.io_v1beta1.json +++ b/api/swagger-spec/storage.k8s.io_v1beta1.json @@ -125,7 +125,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete collection of StorageClass", "nickname": "deletecollectionStorageClass", @@ -183,7 +183,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -397,7 +397,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -432,7 +432,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete a StorageClass", "nickname": "deleteStorageClass", @@ -482,7 +482,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -588,7 +588,7 @@ "description": "API at /apis/storage.k8s.io/v1beta1", "operations": [ { - "type": "unversioned.APIResourceList", + "type": "v1.APIResourceList", "method": "GET", "summary": "get available resources", "nickname": "getAPIResources", @@ -624,7 +624,7 @@ "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard list metadata More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata" }, "items": { @@ -636,8 +636,8 @@ } } }, - "unversioned.ListMeta": { - "id": "unversioned.ListMeta", + "v1.ListMeta": { + "id": "v1.ListMeta", "description": "ListMeta describes metadata that synthetic resources must have, including lists and various status objects. A resource may have only one of {ObjectMeta, ListMeta}.", "properties": { "selfLink": { @@ -714,12 +714,10 @@ }, "creationTimestamp": { "type": "string", - "format": "date-time", "description": "CreationTimestamp is a timestamp representing the server time when this object was created. It is not guaranteed to be set in happens-before order across separate operations. Clients may not set this value. It is represented in RFC3339 form and is in UTC.\n\nPopulated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata" }, "deletionTimestamp": { "type": "string", - "format": "date-time", "description": "DeletionTimestamp is RFC 3339 date and time at which this resource will be deleted. This field is set by the server when a graceful deletion is requested by the user, and is not directly settable by a client. The resource is expected to be deleted (no longer visible from resource lists, and not reachable by name) after the time in this field. Once set, this value may not be unset or be set further into the future, although it may be shortened or the resource may be deleted prior to this time. For example, a user may request that a pod is deleted in 30 seconds. The Kubelet will react by sending a graceful termination signal to the containers in the pod. After that 30 seconds, the Kubelet will send a hard termination signal (SIGKILL) to the container and after cleanup, remove the pod from the API. In the presence of network partitions, this object may still exist after this timestamp, until an administrator or automated process can determine the resource is fully terminated. If not set, graceful deletion of the object has not been requested.\n\nPopulated by the system when a graceful deletion is requested. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata" }, "deletionGracePeriodSeconds": { @@ -787,8 +785,8 @@ } } }, - "unversioned.Status": { - "id": "unversioned.Status", + "v1.Status": { + "id": "v1.Status", "description": "Status is a return value for calls that don't return other objects.", "properties": { "kind": { @@ -800,7 +798,7 @@ "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds" }, "status": { @@ -816,7 +814,7 @@ "description": "A machine-readable description of why this operation is in the \"Failure\" status. If this value is empty there is no information available. A Reason clarifies an HTTP status code but does not override it." }, "details": { - "$ref": "unversioned.StatusDetails", + "$ref": "v1.StatusDetails", "description": "Extended data associated with the reason. Each reason may define its own extended details. This field is optional and the data returned is not guaranteed to conform to any schema except that defined by the reason type." }, "code": { @@ -826,8 +824,8 @@ } } }, - "unversioned.StatusDetails": { - "id": "unversioned.StatusDetails", + "v1.StatusDetails": { + "id": "v1.StatusDetails", "description": "StatusDetails is a set of additional properties that MAY be set by the server to provide additional information about a response. The Reason field of a Status object defines what attributes will be set. Clients must ignore fields that do not match the defined type of each attribute, and should assume that any attribute may be empty, invalid, or under defined.", "properties": { "name": { @@ -845,7 +843,7 @@ "causes": { "type": "array", "items": { - "$ref": "unversioned.StatusCause" + "$ref": "v1.StatusCause" }, "description": "The Causes array includes more details associated with the StatusReason failure. Not all StatusReasons may provide detailed causes." }, @@ -856,8 +854,8 @@ } } }, - "unversioned.StatusCause": { - "id": "unversioned.StatusCause", + "v1.StatusCause": { + "id": "v1.StatusCause", "description": "StatusCause provides more information about an api.Status failure, including cases when multiple errors are encountered.", "properties": { "reason": { @@ -889,8 +887,8 @@ } } }, - "unversioned.Patch": { - "id": "unversioned.Patch", + "v1.Patch": { + "id": "v1.Patch", "description": "Patch is provided to give a concrete name and type to the Kubernetes PATCH request body.", "properties": {} }, @@ -935,8 +933,8 @@ "id": "types.UID", "properties": {} }, - "unversioned.APIResourceList": { - "id": "unversioned.APIResourceList", + "v1.APIResourceList": { + "id": "v1.APIResourceList", "description": "APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.", "required": [ "groupVersion", @@ -958,14 +956,14 @@ "resources": { "type": "array", "items": { - "$ref": "unversioned.APIResource" + "$ref": "v1.APIResource" }, "description": "resources contains the name of the resources and if they are namespaced." } } }, - "unversioned.APIResource": { - "id": "unversioned.APIResource", + "v1.APIResource": { + "id": "v1.APIResource", "description": "APIResource specifies the name of a resource and whether it is namespaced.", "required": [ "name", diff --git a/api/swagger-spec/v1.json b/api/swagger-spec/v1.json index 0328c31704d..dfd66f4aaf1 100644 --- a/api/swagger-spec/v1.json +++ b/api/swagger-spec/v1.json @@ -318,7 +318,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete collection of ConfigMap", "nickname": "deletecollectionNamespacedConfigMap", @@ -384,7 +384,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -622,7 +622,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -665,7 +665,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete a ConfigMap", "nickname": "deleteNamespacedConfigMap", @@ -723,7 +723,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -1123,7 +1123,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete collection of Endpoints", "nickname": "deletecollectionNamespacedEndpoints", @@ -1189,7 +1189,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -1427,7 +1427,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -1470,7 +1470,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete Endpoints", "nickname": "deleteNamespacedEndpoints", @@ -1528,7 +1528,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -1928,7 +1928,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete collection of Event", "nickname": "deletecollectionNamespacedEvent", @@ -1994,7 +1994,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -2232,7 +2232,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -2275,7 +2275,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete an Event", "nickname": "deleteNamespacedEvent", @@ -2333,7 +2333,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -2733,7 +2733,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete collection of LimitRange", "nickname": "deletecollectionNamespacedLimitRange", @@ -2799,7 +2799,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -3037,7 +3037,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -3080,7 +3080,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete a LimitRange", "nickname": "deleteNamespacedLimitRange", @@ -3138,7 +3138,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -3522,7 +3522,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete collection of Namespace", "nickname": "deletecollectionNamespace", @@ -3580,7 +3580,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -3794,7 +3794,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -3829,7 +3829,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete a Namespace", "nickname": "deleteNamespace", @@ -3879,7 +3879,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -4138,7 +4138,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -4291,7 +4291,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete collection of Node", "nickname": "deletecollectionNode", @@ -4349,7 +4349,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -4563,7 +4563,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -4598,7 +4598,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete a Node", "nickname": "deleteNode", @@ -4648,7 +4648,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -5598,7 +5598,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -5767,7 +5767,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete collection of PersistentVolumeClaim", "nickname": "deletecollectionNamespacedPersistentVolumeClaim", @@ -5833,7 +5833,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -6071,7 +6071,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -6114,7 +6114,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete a PersistentVolumeClaim", "nickname": "deleteNamespacedPersistentVolumeClaim", @@ -6172,7 +6172,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -6560,7 +6560,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -6721,7 +6721,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete collection of PersistentVolume", "nickname": "deletecollectionPersistentVolume", @@ -6779,7 +6779,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -6993,7 +6993,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -7028,7 +7028,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete a PersistentVolume", "nickname": "deletePersistentVolume", @@ -7078,7 +7078,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -7284,7 +7284,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -7453,7 +7453,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete collection of Pod", "nickname": "deletecollectionNamespacedPod", @@ -7519,7 +7519,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -7757,7 +7757,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -7800,7 +7800,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete a Pod", "nickname": "deleteNamespacedPod", @@ -7858,7 +7858,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -9025,14 +9025,6 @@ "required": false, "allowMultiple": false }, - { - "type": "string", - "paramType": "query", - "name": "sinceTime", - "description": "An RFC3339 timestamp from which to show logs. If this value precedes the time a pod was started, only logs since the pod start will be returned. If this value is in the future, no logs will be returned. Only one of sinceSeconds or sinceTime may be specified.", - "required": false, - "allowMultiple": false - }, { "type": "boolean", "paramType": "query", @@ -9796,7 +9788,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -9973,7 +9965,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete collection of PodTemplate", "nickname": "deletecollectionNamespacedPodTemplate", @@ -10039,7 +10031,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -10277,7 +10269,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -10320,7 +10312,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete a PodTemplate", "nickname": "deleteNamespacedPodTemplate", @@ -10378,7 +10370,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -10778,7 +10770,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete collection of ReplicationController", "nickname": "deletecollectionNamespacedReplicationController", @@ -10844,7 +10836,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -11082,7 +11074,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -11125,7 +11117,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete a ReplicationController", "nickname": "deleteNamespacedReplicationController", @@ -11183,7 +11175,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -11571,7 +11563,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -11736,7 +11728,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -11913,7 +11905,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete collection of ResourceQuota", "nickname": "deletecollectionNamespacedResourceQuota", @@ -11979,7 +11971,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -12217,7 +12209,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -12260,7 +12252,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete a ResourceQuota", "nickname": "deleteNamespacedResourceQuota", @@ -12318,7 +12310,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -12706,7 +12698,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -12883,7 +12875,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete collection of Secret", "nickname": "deletecollectionNamespacedSecret", @@ -12949,7 +12941,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -13187,7 +13179,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -13230,7 +13222,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete a Secret", "nickname": "deleteNamespacedSecret", @@ -13288,7 +13280,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -13688,7 +13680,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete collection of ServiceAccount", "nickname": "deletecollectionNamespacedServiceAccount", @@ -13754,7 +13746,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -13992,7 +13984,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -14035,7 +14027,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete a ServiceAccount", "nickname": "deleteNamespacedServiceAccount", @@ -14093,7 +14085,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -14718,7 +14710,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -14761,7 +14753,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete a Service", "nickname": "deleteNamespacedService", @@ -14795,7 +14787,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -16119,7 +16111,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -16168,7 +16160,7 @@ "description": "API at /api/v1", "operations": [ { - "type": "unversioned.APIResourceList", + "type": "v1.APIResourceList", "method": "GET", "summary": "get available resources", "nickname": "getAPIResources", @@ -16248,12 +16240,10 @@ }, "creationTimestamp": { "type": "string", - "format": "date-time", "description": "CreationTimestamp is a timestamp representing the server time when this object was created. It is not guaranteed to be set in happens-before order across separate operations. Clients may not set this value. It is represented in RFC3339 form and is in UTC.\n\nPopulated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata" }, "deletionTimestamp": { "type": "string", - "format": "date-time", "description": "DeletionTimestamp is RFC 3339 date and time at which this resource will be deleted. This field is set by the server when a graceful deletion is requested by the user, and is not directly settable by a client. The resource is expected to be deleted (no longer visible from resource lists, and not reachable by name) after the time in this field. Once set, this value may not be unset or be set further into the future, although it may be shortened or the resource may be deleted prior to this time. For example, a user may request that a pod is deleted in 30 seconds. The Kubelet will react by sending a graceful termination signal to the containers in the pod. After that 30 seconds, the Kubelet will send a hard termination signal (SIGKILL) to the container and after cleanup, remove the pod from the API. In the presence of network partitions, this object may still exist after this timestamp, until an administrator or automated process can determine the resource is fully terminated. If not set, graceful deletion of the object has not been requested.\n\nPopulated by the system when a graceful deletion is requested. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata" }, "deletionGracePeriodSeconds": { @@ -16371,7 +16361,7 @@ "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds" }, "items": { @@ -16383,8 +16373,8 @@ } } }, - "unversioned.ListMeta": { - "id": "unversioned.ListMeta", + "v1.ListMeta": { + "id": "v1.ListMeta", "description": "ListMeta describes metadata that synthetic resources must have, including lists and various status objects. A resource may have only one of {ObjectMeta, ListMeta}.", "properties": { "selfLink": { @@ -16464,7 +16454,7 @@ "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata" }, "items": { @@ -16498,8 +16488,8 @@ } } }, - "unversioned.Status": { - "id": "unversioned.Status", + "v1.Status": { + "id": "v1.Status", "description": "Status is a return value for calls that don't return other objects.", "properties": { "kind": { @@ -16511,7 +16501,7 @@ "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds" }, "status": { @@ -16527,7 +16517,7 @@ "description": "A machine-readable description of why this operation is in the \"Failure\" status. If this value is empty there is no information available. A Reason clarifies an HTTP status code but does not override it." }, "details": { - "$ref": "unversioned.StatusDetails", + "$ref": "v1.StatusDetails", "description": "Extended data associated with the reason. Each reason may define its own extended details. This field is optional and the data returned is not guaranteed to conform to any schema except that defined by the reason type." }, "code": { @@ -16537,8 +16527,8 @@ } } }, - "unversioned.StatusDetails": { - "id": "unversioned.StatusDetails", + "v1.StatusDetails": { + "id": "v1.StatusDetails", "description": "StatusDetails is a set of additional properties that MAY be set by the server to provide additional information about a response. The Reason field of a Status object defines what attributes will be set. Clients must ignore fields that do not match the defined type of each attribute, and should assume that any attribute may be empty, invalid, or under defined.", "properties": { "name": { @@ -16556,7 +16546,7 @@ "causes": { "type": "array", "items": { - "$ref": "unversioned.StatusCause" + "$ref": "v1.StatusCause" }, "description": "The Causes array includes more details associated with the StatusReason failure. Not all StatusReasons may provide detailed causes." }, @@ -16567,8 +16557,8 @@ } } }, - "unversioned.StatusCause": { - "id": "unversioned.StatusCause", + "v1.StatusCause": { + "id": "v1.StatusCause", "description": "StatusCause provides more information about an api.Status failure, including cases when multiple errors are encountered.", "properties": { "reason": { @@ -16600,8 +16590,8 @@ } } }, - "unversioned.Patch": { - "id": "unversioned.Patch", + "v1.Patch": { + "id": "v1.Patch", "description": "Patch is provided to give a concrete name and type to the Kubernetes PATCH request body.", "properties": {} }, @@ -16662,7 +16652,7 @@ "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds" }, "items": { @@ -16792,7 +16782,7 @@ "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds" }, "items": { @@ -16842,12 +16832,10 @@ }, "firstTimestamp": { "type": "string", - "format": "date-time", "description": "The time at which the event was first recorded. (Time of server receipt is in TypeMeta.)" }, "lastTimestamp": { "type": "string", - "format": "date-time", "description": "The time at which the most recent occurrence of this event was recorded." }, "count": { @@ -16891,7 +16879,7 @@ "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds" }, "items": { @@ -16987,7 +16975,7 @@ "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds" }, "items": { @@ -17068,7 +17056,7 @@ "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds" }, "items": { @@ -17207,12 +17195,10 @@ }, "lastHeartbeatTime": { "type": "string", - "format": "date-time", "description": "Last time we got an update on a given condition." }, "lastTransitionTime": { "type": "string", - "format": "date-time", "description": "Last time the condition transit from one status to another." }, "reason": { @@ -17384,7 +17370,7 @@ "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds" }, "items": { @@ -17434,7 +17420,7 @@ "description": "AccessModes contains the desired access modes the volume should have. More info: http://kubernetes.io/docs/user-guide/persistent-volumes#access-modes-1" }, "selector": { - "$ref": "unversioned.LabelSelector", + "$ref": "v1.LabelSelector", "description": "A label query over volumes to consider for binding." }, "resources": { @@ -17451,8 +17437,8 @@ "id": "v1.PersistentVolumeAccessMode", "properties": {} }, - "unversioned.LabelSelector": { - "id": "unversioned.LabelSelector", + "v1.LabelSelector": { + "id": "v1.LabelSelector", "description": "A label selector is a label query over a set of resources. The result of matchLabels and matchExpressions are ANDed. An empty label selector matches all objects. A null label selector matches no objects.", "properties": { "matchLabels": { @@ -17462,14 +17448,14 @@ "matchExpressions": { "type": "array", "items": { - "$ref": "unversioned.LabelSelectorRequirement" + "$ref": "v1.LabelSelectorRequirement" }, "description": "matchExpressions is a list of label selector requirements. The requirements are ANDed." } } }, - "unversioned.LabelSelectorRequirement": { - "id": "unversioned.LabelSelectorRequirement", + "v1.LabelSelectorRequirement": { + "id": "v1.LabelSelectorRequirement", "description": "A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.", "required": [ "key", @@ -17544,7 +17530,7 @@ "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds" }, "items": { @@ -18159,7 +18145,7 @@ "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds" }, "items": { @@ -19109,7 +19095,6 @@ }, "startTime": { "type": "string", - "format": "date-time", "description": "RFC 3339 date and time at which the object was acknowledged by the Kubelet. This is before the Kubelet pulled the container image(s) for the pod." }, "containerStatuses": { @@ -19139,12 +19124,10 @@ }, "lastProbeTime": { "type": "string", - "format": "date-time", "description": "Last time we probed the condition." }, "lastTransitionTime": { "type": "string", - "format": "date-time", "description": "Last time the condition transitioned from one status to another." }, "reason": { @@ -19241,7 +19224,6 @@ "properties": { "startedAt": { "type": "string", - "format": "date-time", "description": "Time at which the container was last (re-)started" } } @@ -19273,12 +19255,10 @@ }, "startedAt": { "type": "string", - "format": "date-time", "description": "Time at which previous execution of the container started" }, "finishedAt": { "type": "string", - "format": "date-time", "description": "Time at which the container last terminated" }, "containerID": { @@ -19325,7 +19305,7 @@ "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds" }, "items": { @@ -19389,7 +19369,7 @@ "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds" }, "items": { @@ -19510,7 +19490,6 @@ }, "lastTransitionTime": { "type": "string", - "format": "date-time", "description": "The last time the condition transitioned from one status to another." }, "reason": { @@ -19594,7 +19573,7 @@ "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds" }, "items": { @@ -19683,7 +19662,7 @@ "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds" }, "items": { @@ -19741,7 +19720,7 @@ "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds" }, "items": { @@ -19801,7 +19780,7 @@ "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds" }, "items": { @@ -19968,8 +19947,8 @@ } } }, - "unversioned.APIResourceList": { - "id": "unversioned.APIResourceList", + "v1.APIResourceList": { + "id": "v1.APIResourceList", "description": "APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.", "required": [ "groupVersion", @@ -19991,14 +19970,14 @@ "resources": { "type": "array", "items": { - "$ref": "unversioned.APIResource" + "$ref": "v1.APIResource" }, "description": "resources contains the name of the resources and if they are namespaced." } } }, - "unversioned.APIResource": { - "id": "unversioned.APIResource", + "v1.APIResource": { + "id": "v1.APIResource", "description": "APIResource specifies the name of a resource and whether it is namespaced.", "required": [ "name", diff --git a/cmd/kube-controller-manager/app/options/options.go b/cmd/kube-controller-manager/app/options/options.go index 0c48a5cd2fc..3609c3abd31 100644 --- a/cmd/kube-controller-manager/app/options/options.go +++ b/cmd/kube-controller-manager/app/options/options.go @@ -21,8 +21,8 @@ package options import ( "time" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/componentconfig" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/leaderelection" "k8s.io/kubernetes/pkg/master/ports" "k8s.io/kubernetes/pkg/util/config" diff --git a/cmd/kubeadm/app/apis/kubeadm/types.go b/cmd/kubeadm/app/apis/kubeadm/types.go index ec7e361cf35..eeef3a4e625 100644 --- a/cmd/kubeadm/app/apis/kubeadm/types.go +++ b/cmd/kubeadm/app/apis/kubeadm/types.go @@ -16,7 +16,9 @@ limitations under the License. package kubeadm -import ( metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" ) +import ( + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" +) type EnvParams struct { KubernetesDir string diff --git a/cmd/kubeadm/app/apis/kubeadm/v1alpha1/register.go b/cmd/kubeadm/app/apis/kubeadm/v1alpha1/register.go index 0eb7c88afbf..a6f49f66551 100644 --- a/cmd/kubeadm/app/apis/kubeadm/v1alpha1/register.go +++ b/cmd/kubeadm/app/apis/kubeadm/v1alpha1/register.go @@ -17,8 +17,8 @@ limitations under the License. package v1alpha1 import ( - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" ) diff --git a/cmd/kubeadm/app/apis/kubeadm/v1alpha1/types.go b/cmd/kubeadm/app/apis/kubeadm/v1alpha1/types.go index 892262137d6..08e1627f65b 100644 --- a/cmd/kubeadm/app/apis/kubeadm/v1alpha1/types.go +++ b/cmd/kubeadm/app/apis/kubeadm/v1alpha1/types.go @@ -16,7 +16,9 @@ limitations under the License. package v1alpha1 -import ( metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" ) +import ( + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" +) type MasterConfiguration struct { metav1.TypeMeta `json:",inline"` diff --git a/cmd/kubeadm/app/master/apiclient.go b/cmd/kubeadm/app/master/apiclient.go index adde4835132..f6b5fbf466e 100644 --- a/cmd/kubeadm/app/master/apiclient.go +++ b/cmd/kubeadm/app/master/apiclient.go @@ -25,9 +25,9 @@ import ( "k8s.io/kubernetes/cmd/kubeadm/app/images" "k8s.io/kubernetes/pkg/api" apierrs "k8s.io/kubernetes/pkg/api/errors" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" "k8s.io/kubernetes/pkg/client/unversioned/clientcmd" clientcmdapi "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api" diff --git a/cmd/kubeadm/app/master/manifests.go b/cmd/kubeadm/app/master/manifests.go index 3167cbe9f27..71f96f4c176 100644 --- a/cmd/kubeadm/app/master/manifests.go +++ b/cmd/kubeadm/app/master/manifests.go @@ -27,8 +27,8 @@ import ( kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" "k8s.io/kubernetes/cmd/kubeadm/app/images" "k8s.io/kubernetes/pkg/api/resource" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" api "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/util/intstr" ) diff --git a/cmd/libs/go2idl/client-gen/test_apis/testgroup/types.generated.go b/cmd/libs/go2idl/client-gen/test_apis/testgroup/types.generated.go index 88ccebfde67..a282dc5704f 100644 --- a/cmd/libs/go2idl/client-gen/test_apis/testgroup/types.generated.go +++ b/cmd/libs/go2idl/client-gen/test_apis/testgroup/types.generated.go @@ -26,7 +26,7 @@ import ( "fmt" codec1978 "github.com/ugorji/go/codec" pkg2_api "k8s.io/kubernetes/pkg/api" - pkg1_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" + pkg1_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" pkg3_types "k8s.io/kubernetes/pkg/types" "reflect" "runtime" @@ -64,7 +64,7 @@ func init() { } if false { // reference the types, but skip this branch at build/run time var v0 pkg2_api.ObjectMeta - var v1 pkg1_unversioned.TypeMeta + var v1 pkg1_v1.TypeMeta var v2 pkg3_types.UID var v3 time.Time _, _, _, _ = v0, v1, v2, v3 @@ -586,7 +586,7 @@ func (x *TestTypeList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv48 := &x.ListMeta yym49 := z.DecBinary() @@ -667,7 +667,7 @@ func (x *TestTypeList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv55 := &x.ListMeta yym56 := z.DecBinary() diff --git a/cmd/libs/go2idl/client-gen/test_apis/testgroup/types.go b/cmd/libs/go2idl/client-gen/test_apis/testgroup/types.go index 616b279d9b2..9b1fe41b7c6 100644 --- a/cmd/libs/go2idl/client-gen/test_apis/testgroup/types.go +++ b/cmd/libs/go2idl/client-gen/test_apis/testgroup/types.go @@ -25,8 +25,8 @@ import ( type TestType struct { metav1.TypeMeta `json:",inline"` - api.ObjectMeta `json:"metadata,omitempty"` - Status TestTypeStatus `json:"status,omitempty"` + api.ObjectMeta `json:"metadata,omitempty"` + Status TestTypeStatus `json:"status,omitempty"` } type TestTypeList struct { diff --git a/cmd/libs/go2idl/client-gen/test_apis/testgroup/v1/register.go b/cmd/libs/go2idl/client-gen/test_apis/testgroup/v1/register.go index 20664385c99..68772a91db4 100644 --- a/cmd/libs/go2idl/client-gen/test_apis/testgroup/v1/register.go +++ b/cmd/libs/go2idl/client-gen/test_apis/testgroup/v1/register.go @@ -17,8 +17,8 @@ limitations under the License. package v1 import ( - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" versionedwatch "k8s.io/kubernetes/pkg/watch/versioned" diff --git a/cmd/libs/go2idl/client-gen/test_apis/testgroup/v1/types.generated.go b/cmd/libs/go2idl/client-gen/test_apis/testgroup/v1/types.generated.go index 16582411031..4a41e0ff0fc 100644 --- a/cmd/libs/go2idl/client-gen/test_apis/testgroup/v1/types.generated.go +++ b/cmd/libs/go2idl/client-gen/test_apis/testgroup/v1/types.generated.go @@ -26,7 +26,7 @@ import ( "fmt" codec1978 "github.com/ugorji/go/codec" pkg2_api "k8s.io/kubernetes/pkg/api" - pkg1_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" + pkg1_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" pkg3_types "k8s.io/kubernetes/pkg/types" "reflect" "runtime" @@ -64,7 +64,7 @@ func init() { } if false { // reference the types, but skip this branch at build/run time var v0 pkg2_api.ObjectMeta - var v1 pkg1_unversioned.TypeMeta + var v1 pkg1_v1.TypeMeta var v2 pkg3_types.UID var v3 time.Time _, _, _, _ = v0, v1, v2, v3 @@ -586,7 +586,7 @@ func (x *TestTypeList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv48 := &x.ListMeta yym49 := z.DecBinary() @@ -667,7 +667,7 @@ func (x *TestTypeList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv55 := &x.ListMeta yym56 := z.DecBinary() diff --git a/docs/api-reference/apps/v1beta1/definitions.html b/docs/api-reference/apps/v1beta1/definitions.html index 7c46f957e5d..c8a0391d89b 100755 --- a/docs/api-reference/apps/v1beta1/definitions.html +++ b/docs/api-reference/apps/v1beta1/definitions.html @@ -383,6 +383,61 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

Definitions

+

v1.APIResourceList

+
+

APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

kind

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

apiVersion

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources

false

string

groupVersion

groupVersion is the group and version this APIResourceList is for.

true

string

resources

resources contains the name of the resources and if they are namespaced.

true

v1.APIResource array

+ +
+

v1.PhotonPersistentDiskVolumeSource

Represents a Photon Controller persistent disk resource.

@@ -494,6 +549,89 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } +
+
+

v1.Status

+
+

Status is a return value for calls that don’t return other objects.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

kind

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

apiVersion

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources

false

string

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

v1.ListMeta

status

Status of the operation. One of: "Success" or "Failure". More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status

false

string

message

A human-readable description of the status of this operation.

false

string

reason

A machine-readable description of why this operation is in the "Failure" status. If this value is empty there is no information available. A Reason clarifies an HTTP status code but does not override it.

false

string

details

Extended data associated with the reason. Each reason may define its own extended details. This field is optional and the data returned is not guaranteed to conform to any schema except that defined by the reason type.

false

v1.StatusDetails

code

Suggested HTTP return code for this status, 0 if not set.

false

integer (int32)

+

v1.SELinuxOptions

@@ -693,6 +831,47 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } +
+
+

v1.LabelSelector

+
+

A label selector is a label query over a set of resources. The result of matchLabels and matchExpressions are ANDed. An empty label selector matches all objects. A null label selector matches no objects.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

matchLabels

matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.

false

object

matchExpressions

matchExpressions is a list of label selector requirements. The requirements are ANDed.

false

v1.LabelSelectorRequirement array

+

v1.PersistentVolumeClaimSpec

@@ -728,7 +907,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

selector

A label query over volumes to consider for binding.

false

-

unversioned.LabelSelector

+

v1.LabelSelector

@@ -954,58 +1133,6 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } -
-
-

unversioned.StatusCause

-
-

StatusCause provides more information about an api.Status failure, including cases when multiple errors are encountered.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

reason

A machine-readable description of the cause of the error. If this value is empty there is no information available.

false

string

message

A human-readable description of the cause of the error. This field may be presented as-is to a reader.

false

string

field

The field of the resource that has caused this error, as named by its JSON serialization. May include dot and postfix notation for nested attributes. Arrays are zero-indexed. Fields may appear more than once in an array of causes due to fields having multiple errors. Optional.
-
-Examples:
- "name" - the field "name" on the current resource
- "items[0].name" - the field "name" on the first array entry in "items"

false

string

-

v1beta1.StatefulSetStatus

@@ -1190,68 +1317,6 @@ Examples:
-
-
-

unversioned.StatusDetails

-
-

StatusDetails is a set of additional properties that MAY be set by the server to provide additional information about a response. The Reason field of a Status object defines what attributes will be set. Clients must ignore fields that do not match the defined type of each attribute, and should assume that any attribute may be empty, invalid, or under defined.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

name

The name attribute of the resource associated with the status StatusReason (when there is a single name which can be described).

false

string

group

The group attribute of the resource associated with the status StatusReason.

false

string

kind

The kind attribute of the resource associated with the status StatusReason. On some operations may differ from the requested resource Kind. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

causes

The Causes array includes more details associated with the StatusReason failure. Not all StatusReasons may provide detailed causes.

false

unversioned.StatusCause array

retryAfterSeconds

If specified, the time in seconds before the operation should be retried.

false

integer (int32)

-

v1.GitRepoVolumeSource

@@ -1362,6 +1427,68 @@ Examples:
+
+
+

v1.StatusDetails

+
+

StatusDetails is a set of additional properties that MAY be set by the server to provide additional information about a response. The Reason field of a Status object defines what attributes will be set. Clients must ignore fields that do not match the defined type of each attribute, and should assume that any attribute may be empty, invalid, or under defined.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

name

The name attribute of the resource associated with the status StatusReason (when there is a single name which can be described).

false

string

group

The group attribute of the resource associated with the status StatusReason.

false

string

kind

The kind attribute of the resource associated with the status StatusReason. On some operations may differ from the requested resource Kind. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

causes

The Causes array includes more details associated with the StatusReason failure. Not all StatusReasons may provide detailed causes.

false

v1.StatusCause array

retryAfterSeconds

If specified, the time in seconds before the operation should be retried.

false

integer (int32)

+

v1.Capabilities

@@ -1723,7 +1850,7 @@ Examples:

selector

Selector is a label query over pods that should match the replica count. If empty, defaulted to labels on the pod template. More info: http://kubernetes.io/docs/user-guide/labels#label-selectors

false

-

unversioned.LabelSelector

+

v1.LabelSelector

@@ -1839,7 +1966,7 @@ Populated by the system. Read-only. Value must be treated as opaque by clients a
Populated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata

false

-

string (date-time)

+

string

@@ -1848,7 +1975,7 @@ Populated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata

false

-

string (date-time)

+

string

@@ -1958,6 +2085,54 @@ Populated by the system when a graceful deletion is requested. Read-only. More i +
+
+

v1.APIResource

+
+

APIResource specifies the name of a resource and whether it is namespaced.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

name

name is the name of the resource.

true

string

namespaced

namespaced indicates if a resource is namespaced or not.

true

boolean

false

kind

kind is the kind for the resource (e.g. Foo is the kind for a resource foo)

true

string

+

types.UID

@@ -2147,12 +2322,6 @@ Populated by the system when a graceful deletion is requested. Read-only. More i -
-
-

unversioned.Patch

-
-

Patch is provided to give a concrete name and type to the Kubernetes PATCH request body.

-

v1.CinderVolumeSource

@@ -2431,6 +2600,47 @@ Populated by the system when a graceful deletion is requested. Read-only. More i +
+
+

v1.ListMeta

+
+

ListMeta describes metadata that synthetic resources must have, including lists and various status objects. A resource may have only one of {ObjectMeta, ListMeta}.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

selfLink

SelfLink is a URL representing this object. Populated by the system. Read-only.

false

string

resourceVersion

String that identifies the server’s internal version of this object that can be used by clients to determine when objects have changed. Value must be treated as opaque by clients and passed unmodified back to the server. Populated by the system. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#concurrency-control-and-consistency

false

string

+

v1.FlockerVolumeSource

@@ -2472,47 +2682,6 @@ Populated by the system when a graceful deletion is requested. Read-only. More i -
-
-

unversioned.ListMeta

-
-

ListMeta describes metadata that synthetic resources must have, including lists and various status objects. A resource may have only one of {ObjectMeta, ListMeta}.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

selfLink

SelfLink is a URL representing this object. Populated by the system. Read-only.

false

string

resourceVersion

String that identifies the server’s internal version of this object that can be used by clients to determine when objects have changed. Value must be treated as opaque by clients and passed unmodified back to the server. Populated by the system. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#concurrency-control-and-consistency

false

string

-

v1.PersistentVolumeClaimStatus

@@ -2623,47 +2792,6 @@ Populated by the system when a graceful deletion is requested. Read-only. More i -
-
-

unversioned.LabelSelector

-
-

A label selector is a label query over a set of resources. The result of matchLabels and matchExpressions are ANDed. An empty label selector matches all objects. A null label selector matches no objects.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

matchLabels

matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.

false

object

matchExpressions

matchExpressions is a list of label selector requirements. The requirements are ANDed.

false

unversioned.LabelSelectorRequirement array

-

v1.SecretVolumeSource

@@ -2715,6 +2843,54 @@ Populated by the system when a graceful deletion is requested. Read-only. More i +
+
+

v1.LabelSelectorRequirement

+
+

A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

key

key is the label key that the selector applies to.

true

string

operator

operator represents a key’s relationship to a set of values. Valid operators ard In, NotIn, Exists and DoesNotExist.

true

string

values

values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.

false

string array

+

v1.EnvVar

@@ -3117,6 +3293,12 @@ Populated by the system when a graceful deletion is requested. Read-only. More i +
+
+

v1.Patch

+
+

Patch is provided to give a concrete name and type to the Kubernetes PATCH request body.

+

v1.DeleteOptions

@@ -3570,109 +3752,6 @@ The StatefulSet guarantees that a given network identity will always map to the -
-
-

unversioned.LabelSelectorRequirement

-
-

A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

key

key is the label key that the selector applies to.

true

string

operator

operator represents a key’s relationship to a set of values. Valid operators ard In, NotIn, Exists and DoesNotExist.

true

string

values

values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.

false

string array

- -
-
-

unversioned.APIResourceList

-
-

APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

kind

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

apiVersion

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources

false

string

groupVersion

groupVersion is the group and version this APIResourceList is for.

true

string

resources

resources contains the name of the resources and if they are namespaced.

true

unversioned.APIResource array

-

v1.SecretKeySelector

@@ -3714,141 +3793,10 @@ The StatefulSet guarantees that a given network identity will always map to the -
-
-

unversioned.Status

-
-

Status is a return value for calls that don’t return other objects.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

kind

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

apiVersion

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources

false

string

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

unversioned.ListMeta

status

Status of the operation. One of: "Success" or "Failure". More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status

false

string

message

A human-readable description of the status of this operation.

false

string

reason

A machine-readable description of why this operation is in the "Failure" status. If this value is empty there is no information available. A Reason clarifies an HTTP status code but does not override it.

false

string

details

Extended data associated with the reason. Each reason may define its own extended details. This field is optional and the data returned is not guaranteed to conform to any schema except that defined by the reason type.

false

unversioned.StatusDetails

code

Suggested HTTP return code for this status, 0 if not set.

false

integer (int32)

-

v1.Capability

-
-
-

unversioned.APIResource

-
-

APIResource specifies the name of a resource and whether it is namespaced.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

name

name is the name of the resource.

true

string

namespaced

namespaced indicates if a resource is namespaced or not.

true

boolean

false

kind

kind is the kind for the resource (e.g. Foo is the kind for a resource foo)

true

string

-

v1.DownwardAPIVolumeFile

@@ -4332,7 +4280,7 @@ The StatefulSet guarantees that a given network identity will always map to the

metadata

false

-

unversioned.ListMeta

+

v1.ListMeta

@@ -4345,6 +4293,58 @@ The StatefulSet guarantees that a given network identity will always map to the +
+
+

v1.StatusCause

+
+

StatusCause provides more information about an api.Status failure, including cases when multiple errors are encountered.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

reason

A machine-readable description of the cause of the error. If this value is empty there is no information available.

false

string

message

A human-readable description of the cause of the error. This field may be presented as-is to a reader.

false

string

field

The field of the resource that has caused this error, as named by its JSON serialization. May include dot and postfix notation for nested attributes. Arrays are zero-indexed. Fields may appear more than once in an array of causes due to fields having multiple errors. Optional.
+
+Examples:
+ "name" - the field "name" on the current resource
+ "items[0].name" - the field "name" on the first array entry in "items"

false

string

+

v1.AzureDataDiskCachingMode

@@ -4444,7 +4444,7 @@ The StatefulSet guarantees that a given network identity will always map to the
diff --git a/docs/api-reference/apps/v1beta1/operations.html b/docs/api-reference/apps/v1beta1/operations.html index c0d7c17bc68..e3baa96f2b8 100755 --- a/docs/api-reference/apps/v1beta1/operations.html +++ b/docs/api-reference/apps/v1beta1/operations.html @@ -393,7 +393,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

default

success

-

unversioned.APIResourceList

+

v1.APIResourceList

@@ -707,7 +707,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -1231,7 +1231,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -1316,7 +1316,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -1695,7 +1695,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -2411,7 +2411,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
diff --git a/docs/api-reference/authentication.k8s.io/v1beta1/definitions.html b/docs/api-reference/authentication.k8s.io/v1beta1/definitions.html index 0a4d08f2a6c..b173f628379 100755 --- a/docs/api-reference/authentication.k8s.io/v1beta1/definitions.html +++ b/docs/api-reference/authentication.k8s.io/v1beta1/definitions.html @@ -584,7 +584,7 @@ Populated by the system. Read-only. Value must be treated as opaque by clients a
Populated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata

false

-

string (date-time)

+

string

@@ -593,7 +593,7 @@ Populated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata

false

-

string (date-time)

+

string

@@ -641,6 +641,61 @@ Populated by the system when a graceful deletion is requested. Read-only. More i +
+
+

v1.APIResourceList

+
+

APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

kind

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

apiVersion

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources

false

string

groupVersion

groupVersion is the group and version this APIResourceList is for.

true

string

resources

resources contains the name of the resources and if they are namespaced.

true

v1.APIResource array

+

v1beta1.TokenReviewStatus

@@ -787,62 +842,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
-

unversioned.APIResourceList

-
-

APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

kind

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

apiVersion

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources

false

string

groupVersion

groupVersion is the group and version this APIResourceList is for.

true

string

resources

resources contains the name of the resources and if they are namespaced.

true

unversioned.APIResource array

- -
-
-

unversioned.APIResource

+

v1.APIResource

APIResource specifies the name of a resource and whether it is namespaced.

@@ -900,7 +900,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
diff --git a/docs/api-reference/authentication.k8s.io/v1beta1/operations.html b/docs/api-reference/authentication.k8s.io/v1beta1/operations.html index 8763985dbf9..9f17e6af5d2 100755 --- a/docs/api-reference/authentication.k8s.io/v1beta1/operations.html +++ b/docs/api-reference/authentication.k8s.io/v1beta1/operations.html @@ -393,7 +393,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

default

success

-

unversioned.APIResourceList

+

v1.APIResourceList

@@ -558,7 +558,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } diff --git a/docs/api-reference/authorization.k8s.io/v1beta1/definitions.html b/docs/api-reference/authorization.k8s.io/v1beta1/definitions.html index 54ed5d87986..3ee15f75d2f 100755 --- a/docs/api-reference/authorization.k8s.io/v1beta1/definitions.html +++ b/docs/api-reference/authorization.k8s.io/v1beta1/definitions.html @@ -535,7 +535,7 @@ Populated by the system. Read-only. Value must be treated as opaque by clients a
Populated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata

false

-

string (date-time)

+

string

@@ -544,7 +544,7 @@ Populated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata

false

-

string (date-time)

+

string

@@ -592,6 +592,61 @@ Populated by the system when a graceful deletion is requested. Read-only. More i + +
+

v1.APIResourceList

+
+

APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

kind

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

apiVersion

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources

false

string

groupVersion

groupVersion is the group and version this APIResourceList is for.

true

string

resources

resources contains the name of the resources and if they are namespaced.

true

v1.APIResource array

+

v1beta1.SelfSubjectAccessReview

@@ -654,6 +709,54 @@ Populated by the system when a graceful deletion is requested. Read-only. More i +
+
+

v1.APIResource

+
+

APIResource specifies the name of a resource and whether it is namespaced.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

name

name is the name of the resource.

true

string

namespaced

namespaced indicates if a resource is namespaced or not.

true

boolean

false

kind

kind is the kind for the resource (e.g. Foo is the kind for a resource foo)

true

string

+

v1beta1.SubjectAccessReview

@@ -778,61 +881,6 @@ Populated by the system when a graceful deletion is requested. Read-only. More i -
-
-

unversioned.APIResourceList

-
-

APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

kind

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

apiVersion

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources

false

string

groupVersion

groupVersion is the group and version this APIResourceList is for.

true

string

resources

resources contains the name of the resources and if they are namespaced.

true

unversioned.APIResource array

-

v1beta1.ResourceAttributes

@@ -1053,54 +1101,6 @@ Populated by the system when a graceful deletion is requested. Read-only. More i -
-
-

unversioned.APIResource

-
-

APIResource specifies the name of a resource and whether it is namespaced.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

name

name is the name of the resource.

true

string

namespaced

namespaced indicates if a resource is namespaced or not.

true

boolean

false

kind

kind is the kind for the resource (e.g. Foo is the kind for a resource foo)

true

string

-

v1beta1.SubjectAccessReviewStatus

@@ -1161,7 +1161,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
diff --git a/docs/api-reference/authorization.k8s.io/v1beta1/operations.html b/docs/api-reference/authorization.k8s.io/v1beta1/operations.html index f611104f793..94570a3f76e 100755 --- a/docs/api-reference/authorization.k8s.io/v1beta1/operations.html +++ b/docs/api-reference/authorization.k8s.io/v1beta1/operations.html @@ -393,7 +393,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

default

success

-

unversioned.APIResourceList

+

v1.APIResourceList

@@ -788,7 +788,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } diff --git a/docs/api-reference/autoscaling/v1/definitions.html b/docs/api-reference/autoscaling/v1/definitions.html index 04763fc3580..52df174dcdb 100755 --- a/docs/api-reference/autoscaling/v1/definitions.html +++ b/docs/api-reference/autoscaling/v1/definitions.html @@ -383,7 +383,62 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

Definitions

-

unversioned.Patch

+

v1.APIResourceList

+
+

APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

kind

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

apiVersion

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources

false

string

groupVersion

groupVersion is the group and version this APIResourceList is for.

true

string

resources

resources contains the name of the resources and if they are namespaced.

true

v1.APIResource array

+ +
+
+

v1.Patch

Patch is provided to give a concrete name and type to the Kubernetes PATCH request body.

@@ -491,7 +546,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

metadata

Standard list metadata.

false

-

unversioned.ListMeta

+

v1.ListMeta

@@ -506,7 +561,86 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
-

unversioned.StatusDetails

+

v1.ListMeta

+
+

ListMeta describes metadata that synthetic resources must have, including lists and various status objects. A resource may have only one of {ObjectMeta, ListMeta}.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

selfLink

SelfLink is a URL representing this object. Populated by the system. Read-only.

false

string

resourceVersion

String that identifies the server’s internal version of this object that can be used by clients to determine when objects have changed. Value must be treated as opaque by clients and passed unmodified back to the server. Populated by the system. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#concurrency-control-and-consistency

false

string

+ +
+
+

versioned.Event

+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

type

true

string

object

true

string

+ +
+
+

v1.StatusDetails

StatusDetails is a set of additional properties that MAY be set by the server to provide additional information about a response. The Reason field of a Status object defines what attributes will be set. Clients must ignore fields that do not match the defined type of each attribute, and should assume that any attribute may be empty, invalid, or under defined.

@@ -553,7 +687,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

causes

The Causes array includes more details associated with the StatusReason failure. Not all StatusReasons may provide detailed causes.

false

-

unversioned.StatusCause array

+

v1.StatusCause array

@@ -566,85 +700,6 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } -
-
-

versioned.Event

- ------- - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

type

true

string

object

true

string

- -
-
-

unversioned.ListMeta

-
-

ListMeta describes metadata that synthetic resources must have, including lists and various status objects. A resource may have only one of {ObjectMeta, ListMeta}.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

selfLink

SelfLink is a URL representing this object. Populated by the system. Read-only.

false

string

resourceVersion

String that identifies the server’s internal version of this object that can be used by clients to determine when objects have changed. Value must be treated as opaque by clients and passed unmodified back to the server. Populated by the system. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#concurrency-control-and-consistency

false

string

-

v1.Preconditions

@@ -729,9 +784,9 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
-

unversioned.APIResourceList

+

v1.Status

-

APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.

+

Status is a return value for calls that don’t return other objects.

@@ -766,17 +821,45 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } - - - + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + @@ -844,137 +927,6 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

groupVersion

groupVersion is the group and version this APIResourceList is for.

true

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

v1.ListMeta

status

Status of the operation. One of: "Success" or "Failure". More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status

false

string

resources

resources contains the name of the resources and if they are namespaced.

true

unversioned.APIResource array

message

A human-readable description of the status of this operation.

false

string

reason

A machine-readable description of why this operation is in the "Failure" status. If this value is empty there is no information available. A Reason clarifies an HTTP status code but does not override it.

false

string

details

Extended data associated with the reason. Each reason may define its own extended details. This field is optional and the data returned is not guaranteed to conform to any schema except that defined by the reason type.

false

v1.StatusDetails

code

Suggested HTTP return code for this status, 0 if not set.

false

integer (int32)

-
-
-

unversioned.Status

-
-

Status is a return value for calls that don’t return other objects.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

kind

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

apiVersion

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources

false

string

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

unversioned.ListMeta

status

Status of the operation. One of: "Success" or "Failure". More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status

false

string

message

A human-readable description of the status of this operation.

false

string

reason

A machine-readable description of why this operation is in the "Failure" status. If this value is empty there is no information available. A Reason clarifies an HTTP status code but does not override it.

false

string

details

Extended data associated with the reason. Each reason may define its own extended details. This field is optional and the data returned is not guaranteed to conform to any schema except that defined by the reason type.

false

unversioned.StatusDetails

code

Suggested HTTP return code for this status, 0 if not set.

false

integer (int32)

- -
-
-

unversioned.APIResource

-
-

APIResource specifies the name of a resource and whether it is namespaced.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

name

name is the name of the resource.

true

string

namespaced

namespaced indicates if a resource is namespaced or not.

true

boolean

false

kind

kind is the kind for the resource (e.g. Foo is the kind for a resource foo)

true

string

-

v1.HorizontalPodAutoscalerStatus

@@ -1010,7 +962,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

lastScaleTime

last time the HorizontalPodAutoscaler scaled the number of pods; used by the autoscaler to control how often the number of pods is changed.

false

-

string (date-time)

+

string

@@ -1181,7 +1133,7 @@ Populated by the system. Read-only. Value must be treated as opaque by clients a
Populated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata

false

-

string (date-time)

+

string

@@ -1190,7 +1142,7 @@ Populated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata

false

-

string (date-time)

+

string

@@ -1300,13 +1252,61 @@ Populated by the system when a graceful deletion is requested. Read-only. More i +
+
+

v1.APIResource

+
+

APIResource specifies the name of a resource and whether it is namespaced.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

name

name is the name of the resource.

true

string

namespaced

namespaced indicates if a resource is namespaced or not.

true

boolean

false

kind

kind is the kind for the resource (e.g. Foo is the kind for a resource foo)

true

string

+

types.UID

-

unversioned.StatusCause

+

v1.StatusCause

StatusCause provides more information about an api.Status failure, including cases when multiple errors are encountered.

@@ -1368,7 +1368,7 @@ Examples:
diff --git a/docs/api-reference/autoscaling/v1/operations.html b/docs/api-reference/autoscaling/v1/operations.html index ba756d808c7..ca0032769ae 100755 --- a/docs/api-reference/autoscaling/v1/operations.html +++ b/docs/api-reference/autoscaling/v1/operations.html @@ -393,7 +393,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

default

success

-

unversioned.APIResourceList

+

v1.APIResourceList

@@ -856,7 +856,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -1380,7 +1380,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -1465,7 +1465,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -1844,7 +1844,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -2411,7 +2411,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
diff --git a/docs/api-reference/batch/v1/definitions.html b/docs/api-reference/batch/v1/definitions.html index 16562781ee2..eeb0cda9a2b 100755 --- a/docs/api-reference/batch/v1/definitions.html +++ b/docs/api-reference/batch/v1/definitions.html @@ -383,6 +383,61 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

Definitions

+

v1.APIResourceList

+
+

APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

kind

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

apiVersion

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources

false

string

groupVersion

groupVersion is the group and version this APIResourceList is for.

true

string

resources

resources contains the name of the resources and if they are namespaced.

true

v1.APIResource array

+ +
+

v1.PhotonPersistentDiskVolumeSource

Represents a Photon Controller persistent disk resource.

@@ -494,6 +549,89 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } +
+
+

v1.Status

+
+

Status is a return value for calls that don’t return other objects.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

kind

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

apiVersion

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources

false

string

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

v1.ListMeta

status

Status of the operation. One of: "Success" or "Failure". More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status

false

string

message

A human-readable description of the status of this operation.

false

string

reason

A machine-readable description of why this operation is in the "Failure" status. If this value is empty there is no information available. A Reason clarifies an HTTP status code but does not override it.

false

string

details

Extended data associated with the reason. Each reason may define its own extended details. This field is optional and the data returned is not guaranteed to conform to any schema except that defined by the reason type.

false

v1.StatusDetails

code

Suggested HTTP return code for this status, 0 if not set.

false

integer (int32)

+

v1.SELinuxOptions

@@ -693,6 +831,47 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } +
+
+

v1.LabelSelector

+
+

A label selector is a label query over a set of resources. The result of matchLabels and matchExpressions are ANDed. An empty label selector matches all objects. A null label selector matches no objects.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

matchLabels

matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.

false

object

matchExpressions

matchExpressions is a list of label selector requirements. The requirements are ANDed.

false

v1.LabelSelectorRequirement array

+

v1.CephFSVolumeSource

@@ -899,58 +1078,6 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } -
-
-

unversioned.StatusCause

-
-

StatusCause provides more information about an api.Status failure, including cases when multiple errors are encountered.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

reason

A machine-readable description of the cause of the error. If this value is empty there is no information available.

false

string

message

A human-readable description of the cause of the error. This field may be presented as-is to a reader.

false

string

field

The field of the resource that has caused this error, as named by its JSON serialization. May include dot and postfix notation for nested attributes. Arrays are zero-indexed. Fields may appear more than once in an array of causes due to fields having multiple errors. Optional.
-
-Examples:
- "name" - the field "name" on the current resource
- "items[0].name" - the field "name" on the first array entry in "items"

false

string

-

v1.GCEPersistentDiskVolumeSource

@@ -1094,68 +1221,6 @@ Examples:
-
-
-

unversioned.StatusDetails

-
-

StatusDetails is a set of additional properties that MAY be set by the server to provide additional information about a response. The Reason field of a Status object defines what attributes will be set. Clients must ignore fields that do not match the defined type of each attribute, and should assume that any attribute may be empty, invalid, or under defined.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

name

The name attribute of the resource associated with the status StatusReason (when there is a single name which can be described).

false

string

group

The group attribute of the resource associated with the status StatusReason.

false

string

kind

The kind attribute of the resource associated with the status StatusReason. On some operations may differ from the requested resource Kind. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

causes

The Causes array includes more details associated with the StatusReason failure. Not all StatusReasons may provide detailed causes.

false

unversioned.StatusCause array

retryAfterSeconds

If specified, the time in seconds before the operation should be retried.

false

integer (int32)

-

v1.GitRepoVolumeSource

@@ -1266,6 +1331,68 @@ Examples:
+
+
+

v1.StatusDetails

+
+

StatusDetails is a set of additional properties that MAY be set by the server to provide additional information about a response. The Reason field of a Status object defines what attributes will be set. Clients must ignore fields that do not match the defined type of each attribute, and should assume that any attribute may be empty, invalid, or under defined.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

name

The name attribute of the resource associated with the status StatusReason (when there is a single name which can be described).

false

string

group

The group attribute of the resource associated with the status StatusReason.

false

string

kind

The kind attribute of the resource associated with the status StatusReason. On some operations may differ from the requested resource Kind. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

causes

The Causes array includes more details associated with the StatusReason failure. Not all StatusReasons may provide detailed causes.

false

v1.StatusCause array

retryAfterSeconds

If specified, the time in seconds before the operation should be retried.

false

integer (int32)

+

v1.Capabilities

@@ -1627,14 +1754,14 @@ Examples:

startTime

StartTime represents time when the job was acknowledged by the Job Manager. It is not guaranteed to be set in happens-before order across separate operations. It is represented in RFC3339 form and is in UTC.

false

-

string (date-time)

+

string

completionTime

CompletionTime represents time when the job was completed. It is not guaranteed to be set in happens-before order across separate operations. It is represented in RFC3339 form and is in UTC.

false

-

string (date-time)

+

string

@@ -1750,7 +1877,7 @@ Populated by the system. Read-only. Value must be treated as opaque by clients a
Populated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata

false

-

string (date-time)

+

string

@@ -1759,7 +1886,7 @@ Populated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata

false

-

string (date-time)

+

string

@@ -1869,6 +1996,54 @@ Populated by the system when a graceful deletion is requested. Read-only. More i +
+
+

v1.APIResource

+
+

APIResource specifies the name of a resource and whether it is namespaced.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

name

name is the name of the resource.

true

string

namespaced

namespaced indicates if a resource is namespaced or not.

true

boolean

false

kind

kind is the kind for the resource (e.g. Foo is the kind for a resource foo)

true

string

+

types.UID

@@ -2058,12 +2233,6 @@ Populated by the system when a graceful deletion is requested. Read-only. More i -
-
-

unversioned.Patch

-
-

Patch is provided to give a concrete name and type to the Kubernetes PATCH request body.

-

v1.CinderVolumeSource

@@ -2280,6 +2449,47 @@ Populated by the system when a graceful deletion is requested. Read-only. More i +
+
+

v1.ListMeta

+
+

ListMeta describes metadata that synthetic resources must have, including lists and various status objects. A resource may have only one of {ObjectMeta, ListMeta}.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

selfLink

SelfLink is a URL representing this object. Populated by the system. Read-only.

false

string

resourceVersion

String that identifies the server’s internal version of this object that can be used by clients to determine when objects have changed. Value must be treated as opaque by clients and passed unmodified back to the server. Populated by the system. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#concurrency-control-and-consistency

false

string

+

v1.FlockerVolumeSource

@@ -2321,47 +2531,6 @@ Populated by the system when a graceful deletion is requested. Read-only. More i -
-
-

unversioned.ListMeta

-
-

ListMeta describes metadata that synthetic resources must have, including lists and various status objects. A resource may have only one of {ObjectMeta, ListMeta}.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

selfLink

SelfLink is a URL representing this object. Populated by the system. Read-only.

false

string

resourceVersion

String that identifies the server’s internal version of this object that can be used by clients to determine when objects have changed. Value must be treated as opaque by clients and passed unmodified back to the server. Populated by the system. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#concurrency-control-and-consistency

false

string

-

v1.QuobyteVolumeSource

@@ -2486,47 +2655,6 @@ Populated by the system when a graceful deletion is requested. Read-only. More i -
-
-

unversioned.LabelSelector

-
-

A label selector is a label query over a set of resources. The result of matchLabels and matchExpressions are ANDed. An empty label selector matches all objects. A null label selector matches no objects.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

matchLabels

matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.

false

object

matchExpressions

matchExpressions is a list of label selector requirements. The requirements are ANDed.

false

unversioned.LabelSelectorRequirement array

-

v1.JobCondition

@@ -2569,14 +2697,14 @@ Populated by the system when a graceful deletion is requested. Read-only. More i

lastProbeTime

Last time the condition was checked.

false

-

string (date-time)

+

string

lastTransitionTime

Last time the condition transit from one status to another.

false

-

string (date-time)

+

string

@@ -2638,7 +2766,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i

metadata

Standard list metadata More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata

false

-

unversioned.ListMeta

+

v1.ListMeta

@@ -2702,6 +2830,54 @@ Populated by the system when a graceful deletion is requested. Read-only. More i +
+
+

v1.LabelSelectorRequirement

+
+

A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

key

key is the label key that the selector applies to.

true

string

operator

operator represents a key’s relationship to a set of values. Valid operators ard In, NotIn, Exists and DoesNotExist.

true

string

values

values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.

false

string array

+

v1.EnvVar

@@ -3149,7 +3325,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i

selector

Selector is a label query over pods that should match the pod count. Normally, the system sets this field for you. More info: http://kubernetes.io/docs/user-guide/labels#label-selectors

false

-

unversioned.LabelSelector

+

v1.LabelSelector

@@ -3169,6 +3345,12 @@ Populated by the system when a graceful deletion is requested. Read-only. More i +
+
+

v1.Patch

+
+

Patch is provided to give a concrete name and type to the Kubernetes PATCH request body.

+

v1.DeleteOptions

@@ -3557,109 +3739,6 @@ Populated by the system when a graceful deletion is requested. Read-only. More i -
-
-

unversioned.LabelSelectorRequirement

-
-

A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

key

key is the label key that the selector applies to.

true

string

operator

operator represents a key’s relationship to a set of values. Valid operators ard In, NotIn, Exists and DoesNotExist.

true

string

values

values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.

false

string array

- -
-
-

unversioned.APIResourceList

-
-

APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

kind

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

apiVersion

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources

false

string

groupVersion

groupVersion is the group and version this APIResourceList is for.

true

string

resources

resources contains the name of the resources and if they are namespaced.

true

unversioned.APIResource array

-

v1.SecretKeySelector

@@ -3701,141 +3780,10 @@ Populated by the system when a graceful deletion is requested. Read-only. More i -
-
-

unversioned.Status

-
-

Status is a return value for calls that don’t return other objects.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

kind

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

apiVersion

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources

false

string

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

unversioned.ListMeta

status

Status of the operation. One of: "Success" or "Failure". More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status

false

string

message

A human-readable description of the status of this operation.

false

string

reason

A machine-readable description of why this operation is in the "Failure" status. If this value is empty there is no information available. A Reason clarifies an HTTP status code but does not override it.

false

string

details

Extended data associated with the reason. Each reason may define its own extended details. This field is optional and the data returned is not guaranteed to conform to any schema except that defined by the reason type.

false

unversioned.StatusDetails

code

Suggested HTTP return code for this status, 0 if not set.

false

integer (int32)

-

v1.Capability

-
-
-

unversioned.APIResource

-
-

APIResource specifies the name of a resource and whether it is namespaced.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

name

name is the name of the resource.

true

string

namespaced

namespaced indicates if a resource is namespaced or not.

true

boolean

false

kind

kind is the kind for the resource (e.g. Foo is the kind for a resource foo)

true

string

-

v1.DownwardAPIVolumeFile

@@ -4277,6 +4225,58 @@ Populated by the system when a graceful deletion is requested. Read-only. More i +
+
+

v1.StatusCause

+
+

StatusCause provides more information about an api.Status failure, including cases when multiple errors are encountered.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

reason

A machine-readable description of the cause of the error. If this value is empty there is no information available.

false

string

message

A human-readable description of the cause of the error. This field may be presented as-is to a reader.

false

string

field

The field of the resource that has caused this error, as named by its JSON serialization. May include dot and postfix notation for nested attributes. Arrays are zero-indexed. Fields may appear more than once in an array of causes due to fields having multiple errors. Optional.
+
+Examples:
+ "name" - the field "name" on the current resource
+ "items[0].name" - the field "name" on the first array entry in "items"

false

string

+

v1.AzureDataDiskCachingMode

@@ -4376,7 +4376,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
diff --git a/docs/api-reference/batch/v1/operations.html b/docs/api-reference/batch/v1/operations.html index 4196b896b1c..24ebec2558a 100755 --- a/docs/api-reference/batch/v1/operations.html +++ b/docs/api-reference/batch/v1/operations.html @@ -393,7 +393,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

default

success

-

unversioned.APIResourceList

+

v1.APIResourceList

@@ -856,7 +856,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -1380,7 +1380,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -1465,7 +1465,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -1844,7 +1844,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -2411,7 +2411,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
diff --git a/docs/api-reference/batch/v2alpha1/definitions.html b/docs/api-reference/batch/v2alpha1/definitions.html index 620dc0d7d47..ec5cff00ad9 100755 --- a/docs/api-reference/batch/v2alpha1/definitions.html +++ b/docs/api-reference/batch/v2alpha1/definitions.html @@ -374,7 +374,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

Definitions

-

unversioned.APIResourceList

+

v1.APIResourceList

APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.

@@ -421,7 +421,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

resources

resources contains the name of the resources and if they are namespaced.

true

-

unversioned.APIResource array

+

v1.APIResource array

@@ -429,7 +429,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
-

unversioned.APIResource

+

v1.APIResource

APIResource specifies the name of a resource and whether it is namespaced.

@@ -487,7 +487,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
diff --git a/docs/api-reference/batch/v2alpha1/operations.html b/docs/api-reference/batch/v2alpha1/operations.html index fb67623ee69..7e4b877bc15 100755 --- a/docs/api-reference/batch/v2alpha1/operations.html +++ b/docs/api-reference/batch/v2alpha1/operations.html @@ -393,7 +393,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

default

success

-

unversioned.APIResourceList

+

v1.APIResourceList

@@ -447,7 +447,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
diff --git a/docs/api-reference/certificates.k8s.io/v1alpha1/definitions.html b/docs/api-reference/certificates.k8s.io/v1alpha1/definitions.html index c1b772a68b2..972bc2c5751 100755 --- a/docs/api-reference/certificates.k8s.io/v1alpha1/definitions.html +++ b/docs/api-reference/certificates.k8s.io/v1alpha1/definitions.html @@ -383,10 +383,59 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

Definitions

-

unversioned.Patch

+

v1.APIResourceList

-

Patch is provided to give a concrete name and type to the Kubernetes PATCH request body.

+

APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.

+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

kind

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

apiVersion

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources

false

string

groupVersion

groupVersion is the group and version this APIResourceList is for.

true

string

resources

resources contains the name of the resources and if they are namespaced.

true

v1.APIResource array

+

v1alpha1.CertificateSigningRequestList

@@ -426,7 +475,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

metadata

false

-

unversioned.ListMeta

+

v1.ListMeta

@@ -439,6 +488,12 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } +
+
+

v1.Patch

+
+

Patch is provided to give a concrete name and type to the Kubernetes PATCH request body.

+

v1.DeleteOptions

@@ -558,7 +613,124 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
-

unversioned.StatusDetails

+

v1.ListMeta

+
+

ListMeta describes metadata that synthetic resources must have, including lists and various status objects. A resource may have only one of {ObjectMeta, ListMeta}.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

selfLink

SelfLink is a URL representing this object. Populated by the system. Read-only.

false

string

resourceVersion

String that identifies the server’s internal version of this object that can be used by clients to determine when objects have changed. Value must be treated as opaque by clients and passed unmodified back to the server. Populated by the system. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#concurrency-control-and-consistency

false

string

+ +
+
+

versioned.Event

+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

type

true

string

object

true

string

+ +
+
+

v1alpha1.CertificateSigningRequestStatus

+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

conditions

Conditions applied to the request, such as approval or denial.

false

v1alpha1.CertificateSigningRequestCondition array

certificate

If request was approved, the controller will place the issued certificate here.

false

string

+ +
+
+

v1.StatusDetails

StatusDetails is a set of additional properties that MAY be set by the server to provide additional information about a response. The Reason field of a Status object defines what attributes will be set. Clients must ignore fields that do not match the defined type of each attribute, and should assume that any attribute may be empty, invalid, or under defined.

@@ -605,7 +777,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

causes

The Causes array includes more details associated with the StatusReason failure. Not all StatusReasons may provide detailed causes.

false

-

unversioned.StatusCause array

+

v1.StatusCause array

@@ -618,123 +790,6 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } -
-
-

versioned.Event

- ------- - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

type

true

string

object

true

string

- -
-
-

unversioned.ListMeta

-
-

ListMeta describes metadata that synthetic resources must have, including lists and various status objects. A resource may have only one of {ObjectMeta, ListMeta}.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

selfLink

SelfLink is a URL representing this object. Populated by the system. Read-only.

false

string

resourceVersion

String that identifies the server’s internal version of this object that can be used by clients to determine when objects have changed. Value must be treated as opaque by clients and passed unmodified back to the server. Populated by the system. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#concurrency-control-and-consistency

false

string

- -
-
-

v1alpha1.CertificateSigningRequestStatus

- ------- - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

conditions

Conditions applied to the request, such as approval or denial.

false

v1alpha1.CertificateSigningRequestCondition array

certificate

If request was approved, the controller will place the issued certificate here.

false

string

-

v1alpha1.CertificateSigningRequestCondition

@@ -781,7 +836,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

lastUpdateTime

timestamp for the last update to this condition

false

-

string (date-time)

+

string

@@ -885,62 +940,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
-

unversioned.APIResourceList

-
-

APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

kind

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

apiVersion

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources

false

string

groupVersion

groupVersion is the group and version this APIResourceList is for.

true

string

resources

resources contains the name of the resources and if they are namespaced.

true

unversioned.APIResource array

- -
-
-

unversioned.Status

+

v1.Status

Status is a return value for calls that don’t return other objects.

@@ -980,7 +980,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

-

unversioned.ListMeta

+

v1.ListMeta

@@ -1008,7 +1008,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

details

Extended data associated with the reason. Each reason may define its own extended details. This field is optional and the data returned is not guaranteed to conform to any schema except that defined by the reason type.

false

-

unversioned.StatusDetails

+

v1.StatusDetails

@@ -1021,54 +1021,6 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } -
-
-

unversioned.APIResource

-
-

APIResource specifies the name of a resource and whether it is namespaced.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

name

name is the name of the resource.

true

string

namespaced

namespaced indicates if a resource is namespaced or not.

true

boolean

false

kind

kind is the kind for the resource (e.g. Foo is the kind for a resource foo)

true

string

-

v1.ObjectMeta

@@ -1158,7 +1110,7 @@ Populated by the system. Read-only. Value must be treated as opaque by clients a
Populated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata

false

-

string (date-time)

+

string

@@ -1167,7 +1119,7 @@ Populated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata

false

-

string (date-time)

+

string

@@ -1277,13 +1229,61 @@ Populated by the system when a graceful deletion is requested. Read-only. More i +
+
+

v1.APIResource

+
+

APIResource specifies the name of a resource and whether it is namespaced.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

name

name is the name of the resource.

true

string

namespaced

namespaced indicates if a resource is namespaced or not.

true

boolean

false

kind

kind is the kind for the resource (e.g. Foo is the kind for a resource foo)

true

string

+

types.UID

-

unversioned.StatusCause

+

v1.StatusCause

StatusCause provides more information about an api.Status failure, including cases when multiple errors are encountered.

@@ -1345,7 +1345,7 @@ Examples:
diff --git a/docs/api-reference/certificates.k8s.io/v1alpha1/operations.html b/docs/api-reference/certificates.k8s.io/v1alpha1/operations.html index 5fa4cad5355..3d5744e83e3 100755 --- a/docs/api-reference/certificates.k8s.io/v1alpha1/operations.html +++ b/docs/api-reference/certificates.k8s.io/v1alpha1/operations.html @@ -393,7 +393,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

default

success

-

unversioned.APIResourceList

+

v1.APIResourceList

@@ -691,7 +691,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -1183,7 +1183,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -1268,7 +1268,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -1900,7 +1900,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
diff --git a/docs/api-reference/extensions/v1beta1/definitions.html b/docs/api-reference/extensions/v1beta1/definitions.html index ab8301f79a4..16eac5aaa5f 100755 --- a/docs/api-reference/extensions/v1beta1/definitions.html +++ b/docs/api-reference/extensions/v1beta1/definitions.html @@ -498,6 +498,61 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } +
+
+

v1.APIResourceList

+
+

APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

kind

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

apiVersion

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources

false

string

groupVersion

groupVersion is the group and version this APIResourceList is for.

true

string

resources

resources contains the name of the resources and if they are namespaced.

true

v1.APIResource array

+

v1beta1.DaemonSetStatus

@@ -848,6 +903,47 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } +
+
+

v1.LabelSelector

+
+

A label selector is a label query over a set of resources. The result of matchLabels and matchExpressions are ANDed. An empty label selector matches all objects. A null label selector matches no objects.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

matchLabels

matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.

false

object

matchExpressions

matchExpressions is a list of label selector requirements. The requirements are ANDed.

false

v1.LabelSelectorRequirement array

+

v1beta1.IngressBackend

@@ -931,7 +1027,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

-

unversioned.ListMeta

+

v1.ListMeta

@@ -1088,58 +1184,6 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } -
-
-

unversioned.StatusCause

-
-

StatusCause provides more information about an api.Status failure, including cases when multiple errors are encountered.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

reason

A machine-readable description of the cause of the error. If this value is empty there is no information available.

false

string

message

A human-readable description of the cause of the error. This field may be presented as-is to a reader.

false

string

field

The field of the resource that has caused this error, as named by its JSON serialization. May include dot and postfix notation for nested attributes. Arrays are zero-indexed. Fields may appear more than once in an array of causes due to fields having multiple errors. Optional.
-
-Examples:
- "name" - the field "name" on the current resource
- "items[0].name" - the field "name" on the first array entry in "items"

false

string

-

v1beta1.ReplicaSetCondition

@@ -1182,7 +1226,7 @@ Examples:

lastTransitionTime

The last time the condition transitioned from one status to another.

false

-

string (date-time)

+

string

@@ -1244,7 +1288,7 @@ Examples:

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata

false

-

unversioned.ListMeta

+

v1.ListMeta

@@ -1524,14 +1568,14 @@ Examples:

startTime

StartTime represents time when the job was acknowledged by the Job Manager. It is not guaranteed to be set in happens-before order across separate operations. It is represented in RFC3339 form and is in UTC.

false

-

string (date-time)

+

string

completionTime

CompletionTime represents time when the job was completed. It is not guaranteed to be set in happens-before order across separate operations. It is represented in RFC3339 form and is in UTC.

false

-

string (date-time)

+

string

@@ -1756,7 +1800,7 @@ Populated by the system. Read-only. Value must be treated as opaque by clients a
Populated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata

false

-

string (date-time)

+

string

@@ -1765,7 +1809,7 @@ Populated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata

false

-

string (date-time)

+

string

@@ -1855,7 +1899,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i

selector

Selector is a label query over pods that should match the replica count. If the selector is empty, it is defaulted to the labels present on the pod template. Label keys and values that must match in order to be controlled by this replica set. More info: http://kubernetes.io/docs/user-guide/labels#label-selectors

false

-

unversioned.LabelSelector

+

v1.LabelSelector

@@ -1896,7 +1940,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i

selector

Selector is a label query over pods that are managed by the daemon set. Must match in order to be controlled. If empty, defaulted to labels on Pod template. More info: http://kubernetes.io/docs/user-guide/labels#label-selectors

false

-

unversioned.LabelSelector

+

v1.LabelSelector

@@ -2168,7 +2212,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i

metadata

Standard object’s metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata

false

-

unversioned.ListMeta

+

v1.ListMeta

@@ -2215,12 +2259,6 @@ Populated by the system when a graceful deletion is requested. Read-only. More i -
-
-

unversioned.Patch

-
-

Patch is provided to give a concrete name and type to the Kubernetes PATCH request body.

-

v1.FlockerVolumeSource

@@ -2262,6 +2300,47 @@ Populated by the system when a graceful deletion is requested. Read-only. More i +
+
+

v1.ListMeta

+
+

ListMeta describes metadata that synthetic resources must have, including lists and various status objects. A resource may have only one of {ObjectMeta, ListMeta}.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

selfLink

SelfLink is a URL representing this object. Populated by the system. Read-only.

false

string

resourceVersion

String that identifies the server’s internal version of this object that can be used by clients to determine when objects have changed. Value must be treated as opaque by clients and passed unmodified back to the server. Populated by the system. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#concurrency-control-and-consistency

false

string

+

v1.PersistentVolumeClaimVolumeSource

@@ -2303,47 +2382,6 @@ Populated by the system when a graceful deletion is requested. Read-only. More i -
-
-

unversioned.ListMeta

-
-

ListMeta describes metadata that synthetic resources must have, including lists and various status objects. A resource may have only one of {ObjectMeta, ListMeta}.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

selfLink

SelfLink is a URL representing this object. Populated by the system. Read-only.

false

string

resourceVersion

String that identifies the server’s internal version of this object that can be used by clients to determine when objects have changed. Value must be treated as opaque by clients and passed unmodified back to the server. Populated by the system. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#concurrency-control-and-consistency

false

string

-

v1beta1.HorizontalPodAutoscaler

@@ -2406,47 +2444,6 @@ Populated by the system when a graceful deletion is requested. Read-only. More i -
-
-

unversioned.LabelSelector

-
-

A label selector is a label query over a set of resources. The result of matchLabels and matchExpressions are ANDed. An empty label selector matches all objects. A null label selector matches no objects.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

matchLabels

matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.

false

object

matchExpressions

matchExpressions is a list of label selector requirements. The requirements are ANDed.

false

unversioned.LabelSelectorRequirement array

-

v1beta1.RollbackConfig

@@ -2688,14 +2685,14 @@ Populated by the system when a graceful deletion is requested. Read-only. More i

lastProbeTime

Last time the condition was checked.

false

-

string (date-time)

+

string

lastTransitionTime

Last time the condition transit from one status to another.

false

-

string (date-time)

+

string

@@ -3240,7 +3237,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata

false

-

unversioned.ListMeta

+

v1.ListMeta

@@ -3419,7 +3416,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i

selector

Label selector for pods. Existing ReplicaSets whose pods are selected by this will be the ones affected by this deployment.

false

-

unversioned.LabelSelector

+

v1.LabelSelector

@@ -3474,61 +3471,6 @@ Populated by the system when a graceful deletion is requested. Read-only. More i -
-
-

unversioned.APIResourceList

-
-

APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

kind

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

apiVersion

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources

false

string

groupVersion

groupVersion is the group and version this APIResourceList is for.

true

string

resources

resources contains the name of the resources and if they are namespaced.

true

unversioned.APIResource array

-

v1.SecretKeySelector

@@ -3574,54 +3516,6 @@ Populated by the system when a graceful deletion is requested. Read-only. More i

v1.Capability

-
-
-

unversioned.APIResource

-
-

APIResource specifies the name of a resource and whether it is namespaced.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

name

name is the name of the resource.

true

string

namespaced

namespaced indicates if a resource is namespaced or not.

true

boolean

false

kind

kind is the kind for the resource (e.g. Foo is the kind for a resource foo)

true

string

-

v1.DownwardAPIVolumeFile

@@ -4118,6 +4012,58 @@ Populated by the system when a graceful deletion is requested. Read-only. More i +
+
+

v1.StatusCause

+
+

StatusCause provides more information about an api.Status failure, including cases when multiple errors are encountered.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

reason

A machine-readable description of the cause of the error. If this value is empty there is no information available.

false

string

message

A human-readable description of the cause of the error. This field may be presented as-is to a reader.

false

string

field

The field of the resource that has caused this error, as named by its JSON serialization. May include dot and postfix notation for nested attributes. Arrays are zero-indexed. Fields may appear more than once in an array of causes due to fields having multiple errors. Optional.
+
+Examples:
+ "name" - the field "name" on the current resource
+ "items[0].name" - the field "name" on the first array entry in "items"

false

string

+

v1beta1.Scale

@@ -4394,6 +4340,89 @@ Populated by the system when a graceful deletion is requested. Read-only. More i +
+
+

v1.Status

+
+

Status is a return value for calls that don’t return other objects.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

kind

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

apiVersion

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources

false

string

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

v1.ListMeta

status

Status of the operation. One of: "Success" or "Failure". More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status

false

string

message

A human-readable description of the status of this operation.

false

string

reason

A machine-readable description of why this operation is in the "Failure" status. If this value is empty there is no information available. A Reason clarifies an HTTP status code but does not override it.

false

string

details

Extended data associated with the reason. Each reason may define its own extended details. This field is optional and the data returned is not guaranteed to conform to any schema except that defined by the reason type.

false

v1.StatusDetails

code

Suggested HTTP return code for this status, 0 if not set.

false

integer (int32)

+

v1beta1.ScaleStatus

@@ -4467,7 +4496,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i

podSelector

Selects the pods to which this NetworkPolicy object applies. The array of ingress rules is applied to any pods selected by this field. Multiple network policies can select the same set of pods. In this case, the ingress rules for each are combined additively. This field is NOT optional and follows standard label selector semantics. An empty podSelector matches all pods in this namespace.

true

-

unversioned.LabelSelector

+

v1.LabelSelector

@@ -4570,7 +4599,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i

metadata

Standard list metadata.

false

-

unversioned.ListMeta

+

v1.ListMeta

@@ -4721,7 +4750,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i

lastScaleTime

last time the HorizontalPodAutoscaler scaled the number of pods; used by the autoscaler to control how often the number of pods is changed.

false

-

string (date-time)

+

string

@@ -5028,7 +5057,7 @@ Both these may change in the future. Incoming requests are matched against the h

metadata

Standard list metadata More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata

false

-

unversioned.ListMeta

+

v1.ListMeta

@@ -5066,76 +5095,14 @@ Both these may change in the future. Incoming requests are matched against the h

podSelector

This is a label selector which selects Pods in this namespace. This field follows standard label selector semantics. If not provided, this selector selects no pods. If present but empty, this selector selects all pods in this namespace.

false

-

unversioned.LabelSelector

+

v1.LabelSelector

namespaceSelector

Selects Namespaces using cluster scoped-labels. This matches all pods in all namespaces selected by this label selector. This field follows standard label selector semantics. If omitted, this selector selects no namespaces. If present but empty, this selector selects all namespaces.

false

-

unversioned.LabelSelector

- - - - - -
-
-

unversioned.StatusDetails

-
-

StatusDetails is a set of additional properties that MAY be set by the server to provide additional information about a response. The Reason field of a Status object defines what attributes will be set. Clients must ignore fields that do not match the defined type of each attribute, and should assume that any attribute may be empty, invalid, or under defined.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -5203,6 +5170,68 @@ Both these may change in the future. Incoming requests are matched against the h
NameDescriptionRequiredSchemaDefault

name

The name attribute of the resource associated with the status StatusReason (when there is a single name which can be described).

false

string

group

The group attribute of the resource associated with the status StatusReason.

false

string

kind

The kind attribute of the resource associated with the status StatusReason. On some operations may differ from the requested resource Kind. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

causes

The Causes array includes more details associated with the StatusReason failure. Not all StatusReasons may provide detailed causes.

false

unversioned.StatusCause array

retryAfterSeconds

If specified, the time in seconds before the operation should be retried.

false

integer (int32)

v1.LabelSelector

+
+
+

v1.StatusDetails

+
+

StatusDetails is a set of additional properties that MAY be set by the server to provide additional information about a response. The Reason field of a Status object defines what attributes will be set. Clients must ignore fields that do not match the defined type of each attribute, and should assume that any attribute may be empty, invalid, or under defined.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

name

The name attribute of the resource associated with the status StatusReason (when there is a single name which can be described).

false

string

group

The group attribute of the resource associated with the status StatusReason.

false

string

kind

The kind attribute of the resource associated with the status StatusReason. On some operations may differ from the requested resource Kind. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

causes

The Causes array includes more details associated with the StatusReason failure. Not all StatusReasons may provide detailed causes.

false

v1.StatusCause array

retryAfterSeconds

If specified, the time in seconds before the operation should be retried.

false

integer (int32)

+

v1.LoadBalancerStatus

@@ -5657,6 +5686,54 @@ Both these may change in the future. Incoming requests are matched against the h +
+
+

v1.APIResource

+
+

APIResource specifies the name of a resource and whether it is namespaced.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

name

name is the name of the resource.

true

string

namespaced

namespaced indicates if a resource is namespaced or not.

true

boolean

false

kind

kind is the kind for the resource (e.g. Foo is the kind for a resource foo)

true

string

+

v1beta1.ReplicaSet

@@ -6159,6 +6236,54 @@ Both these may change in the future. Incoming requests are matched against the h +
+
+

v1.LabelSelectorRequirement

+
+

A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

key

key is the label key that the selector applies to.

true

string

operator

operator represents a key’s relationship to a set of values. Valid operators ard In, NotIn, Exists and DoesNotExist.

true

string

values

values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.

false

string array

+

v1.ResourceRequirements

@@ -6279,6 +6404,12 @@ Both these may change in the future. Incoming requests are matched against the h +
+
+

v1.Patch

+
+

Patch is provided to give a concrete name and type to the Kubernetes PATCH request body.

+

v1beta1.DeploymentCondition

@@ -6321,14 +6452,14 @@ Both these may change in the future. Incoming requests are matched against the h

lastUpdateTime

The last time this condition was updated.

false

-

string (date-time)

+

string

lastTransitionTime

Last time the condition transitioned from one status to another.

false

-

string (date-time)

+

string

@@ -6397,7 +6528,7 @@ Both these may change in the future. Incoming requests are matched against the h

selector

Selector is a label query over pods that should match the pod count. Normally, the system sets this field for you. More info: http://kubernetes.io/docs/user-guide/labels#label-selectors

false

-

unversioned.LabelSelector

+

v1.LabelSelector

@@ -6417,137 +6548,6 @@ Both these may change in the future. Incoming requests are matched against the h -
-
-

unversioned.LabelSelectorRequirement

-
-

A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

key

key is the label key that the selector applies to.

true

string

operator

operator represents a key’s relationship to a set of values. Valid operators ard In, NotIn, Exists and DoesNotExist.

true

string

values

values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.

false

string array

- -
-
-

unversioned.Status

-
-

Status is a return value for calls that don’t return other objects.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

kind

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

apiVersion

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources

false

string

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

unversioned.ListMeta

status

Status of the operation. One of: "Success" or "Failure". More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status

false

string

message

A human-readable description of the status of this operation.

false

string

reason

A machine-readable description of why this operation is in the "Failure" status. If this value is empty there is no information available. A Reason clarifies an HTTP status code but does not override it.

false

string

details

Extended data associated with the reason. Each reason may define its own extended details. This field is optional and the data returned is not guaranteed to conform to any schema except that defined by the reason type.

false

unversioned.StatusDetails

code

Suggested HTTP return code for this status, 0 if not set.

false

integer (int32)

-

v1beta1.HorizontalPodAutoscalerList

@@ -6590,7 +6590,7 @@ Both these may change in the future. Incoming requests are matched against the h

metadata

Standard list metadata.

false

-

unversioned.ListMeta

+

v1.ListMeta

@@ -6789,7 +6789,7 @@ Both these may change in the future. Incoming requests are matched against the h

metadata

Standard list metadata.

false

-

unversioned.ListMeta

+

v1.ListMeta

@@ -6818,7 +6818,7 @@ Both these may change in the future. Incoming requests are matched against the h
diff --git a/docs/api-reference/extensions/v1beta1/operations.html b/docs/api-reference/extensions/v1beta1/operations.html index 6e2c8b52d3d..7475b124921 100755 --- a/docs/api-reference/extensions/v1beta1/operations.html +++ b/docs/api-reference/extensions/v1beta1/operations.html @@ -393,7 +393,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

default

success

-

unversioned.APIResourceList

+

v1.APIResourceList

@@ -1452,7 +1452,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -1976,7 +1976,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -2061,7 +2061,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -2440,7 +2440,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -2796,7 +2796,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -3320,7 +3320,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -3405,7 +3405,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -3911,7 +3911,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -4290,7 +4290,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -4646,7 +4646,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -5170,7 +5170,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -5255,7 +5255,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -5634,7 +5634,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -5990,7 +5990,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -6514,7 +6514,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -6599,7 +6599,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -6978,7 +6978,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -7334,7 +7334,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -7858,7 +7858,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -7943,7 +7943,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -8322,7 +8322,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -8678,7 +8678,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -9202,7 +9202,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -9287,7 +9287,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -9643,7 +9643,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -10167,7 +10167,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -10252,7 +10252,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -10631,7 +10631,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -11010,7 +11010,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -11389,7 +11389,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -12027,7 +12027,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -12519,7 +12519,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -12604,7 +12604,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -16295,7 +16295,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
diff --git a/docs/api-reference/policy/v1beta1/definitions.html b/docs/api-reference/policy/v1beta1/definitions.html index 8aeceddcef4..20843d9ea97 100755 --- a/docs/api-reference/policy/v1beta1/definitions.html +++ b/docs/api-reference/policy/v1beta1/definitions.html @@ -445,7 +445,62 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
-

unversioned.Patch

+

v1.APIResourceList

+
+

APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

kind

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

apiVersion

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources

false

string

groupVersion

groupVersion is the group and version this APIResourceList is for.

true

string

resources

resources contains the name of the resources and if they are namespaced.

true

v1.APIResource array

+ +
+
+

v1.Patch

Patch is provided to give a concrete name and type to the Kubernetes PATCH request body.

@@ -513,7 +568,86 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
-

unversioned.StatusDetails

+

versioned.Event

+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

type

true

string

object

true

string

+ +
+
+

v1.ListMeta

+
+

ListMeta describes metadata that synthetic resources must have, including lists and various status objects. A resource may have only one of {ObjectMeta, ListMeta}.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

selfLink

SelfLink is a URL representing this object. Populated by the system. Read-only.

false

string

resourceVersion

String that identifies the server’s internal version of this object that can be used by clients to determine when objects have changed. Value must be treated as opaque by clients and passed unmodified back to the server. Populated by the system. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#concurrency-control-and-consistency

false

string

+ +
+
+

v1.StatusDetails

StatusDetails is a set of additional properties that MAY be set by the server to provide additional information about a response. The Reason field of a Status object defines what attributes will be set. Clients must ignore fields that do not match the defined type of each attribute, and should assume that any attribute may be empty, invalid, or under defined.

@@ -560,7 +694,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

causes

The Causes array includes more details associated with the StatusReason failure. Not all StatusReasons may provide detailed causes.

false

-

unversioned.StatusCause array

+

v1.StatusCause array

@@ -573,85 +707,6 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } -
-
-

versioned.Event

- ------- - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

type

true

string

object

true

string

- -
-
-

unversioned.ListMeta

-
-

ListMeta describes metadata that synthetic resources must have, including lists and various status objects. A resource may have only one of {ObjectMeta, ListMeta}.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

selfLink

SelfLink is a URL representing this object. Populated by the system. Read-only.

false

string

resourceVersion

String that identifies the server’s internal version of this object that can be used by clients to determine when objects have changed. Value must be treated as opaque by clients and passed unmodified back to the server. Populated by the system. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#concurrency-control-and-consistency

false

string

-

v1.Preconditions

@@ -688,57 +743,9 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
-

unversioned.LabelSelectorRequirement

+

v1.Status

-

A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

key

key is the label key that the selector applies to.

true

string

operator

operator represents a key’s relationship to a set of values. Valid operators ard In, NotIn, Exists and DoesNotExist.

true

string

values

values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.

false

string array

- -
-
-

unversioned.APIResourceList

-
-

APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.

+

Status is a return value for calls that don’t return other objects.

@@ -773,17 +780,45 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } - - - + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + @@ -858,47 +893,6 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

groupVersion

groupVersion is the group and version this APIResourceList is for.

true

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

v1.ListMeta

status

Status of the operation. One of: "Success" or "Failure". More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status

false

string

resources

resources contains the name of the resources and if they are namespaced.

true

unversioned.APIResource array

message

A human-readable description of the status of this operation.

false

string

reason

A machine-readable description of why this operation is in the "Failure" status. If this value is empty there is no information available. A Reason clarifies an HTTP status code but does not override it.

false

string

details

Extended data associated with the reason. Each reason may define its own extended details. This field is optional and the data returned is not guaranteed to conform to any schema except that defined by the reason type.

false

v1.StatusDetails

code

Suggested HTTP return code for this status, 0 if not set.

false

integer (int32)

-
-
-

unversioned.LabelSelector

-
-

A label selector is a label query over a set of resources. The result of matchLabels and matchExpressions are ANDed. An empty label selector matches all objects. A null label selector matches no objects.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

matchLabels

matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.

false

object

matchExpressions

matchExpressions is a list of label selector requirements. The requirements are ANDed.

false

unversioned.LabelSelectorRequirement array

-

v1beta1.PodDisruptionBudgetList

@@ -941,7 +935,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

metadata

false

-

unversioned.ListMeta

+

v1.ListMeta

@@ -956,9 +950,9 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
-

unversioned.Status

+

v1.LabelSelector

-

Status is a return value for calls that don’t return other objects.

+

A label selector is a label query over a set of resources. The result of matchLabels and matchExpressions are ANDed. An empty label selector matches all objects. A null label selector matches no objects.

@@ -979,107 +973,17 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } - - + + - + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

kind

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

matchLabels

matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.

false

string

object

apiVersion

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources

matchExpressions

matchExpressions is a list of label selector requirements. The requirements are ANDed.

false

string

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

unversioned.ListMeta

status

Status of the operation. One of: "Success" or "Failure". More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status

false

string

message

A human-readable description of the status of this operation.

false

string

reason

A machine-readable description of why this operation is in the "Failure" status. If this value is empty there is no information available. A Reason clarifies an HTTP status code but does not override it.

false

string

details

Extended data associated with the reason. Each reason may define its own extended details. This field is optional and the data returned is not guaranteed to conform to any schema except that defined by the reason type.

false

unversioned.StatusDetails

code

Suggested HTTP return code for this status, 0 if not set.

false

integer (int32)

- -
-
-

unversioned.APIResource

-
-

APIResource specifies the name of a resource and whether it is namespaced.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -1174,7 +1078,7 @@ Populated by the system. Read-only. Value must be treated as opaque by clients a
Populated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata

- + @@ -1183,7 +1087,7 @@ Populated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata

- + @@ -1293,13 +1197,109 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
NameDescriptionRequiredSchemaDefault

name

name is the name of the resource.

true

string

namespaced

namespaced indicates if a resource is namespaced or not.

true

boolean

false

kind

kind is the kind for the resource (e.g. Foo is the kind for a resource foo)

true

string

v1.LabelSelectorRequirement array

false

string (date-time)

string

false

string (date-time)

string

+
+
+

v1.LabelSelectorRequirement

+
+

A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

key

key is the label key that the selector applies to.

true

string

operator

operator represents a key’s relationship to a set of values. Valid operators ard In, NotIn, Exists and DoesNotExist.

true

string

values

values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.

false

string array

+ +
+
+

v1.APIResource

+
+

APIResource specifies the name of a resource and whether it is namespaced.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

name

name is the name of the resource.

true

string

namespaced

namespaced indicates if a resource is namespaced or not.

true

boolean

false

kind

kind is the kind for the resource (e.g. Foo is the kind for a resource foo)

true

string

+

types.UID

-

unversioned.StatusCause

+

v1.StatusCause

StatusCause provides more information about an api.Status failure, including cases when multiple errors are encountered.

@@ -1384,7 +1384,7 @@ Examples:

selector

Label query over pods whose evictions are managed by the disruption budget.

false

-

unversioned.LabelSelector

+

v1.LabelSelector

@@ -1402,7 +1402,7 @@ Examples:
diff --git a/docs/api-reference/policy/v1beta1/operations.html b/docs/api-reference/policy/v1beta1/operations.html index 3594854d2cb..df1d5936acd 100755 --- a/docs/api-reference/policy/v1beta1/operations.html +++ b/docs/api-reference/policy/v1beta1/operations.html @@ -393,7 +393,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

default

success

-

unversioned.APIResourceList

+

v1.APIResourceList

@@ -707,7 +707,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -1231,7 +1231,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -1316,7 +1316,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -1695,7 +1695,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -2411,7 +2411,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } diff --git a/docs/api-reference/rbac.authorization.k8s.io/v1alpha1/definitions.html b/docs/api-reference/rbac.authorization.k8s.io/v1alpha1/definitions.html index ebe4deee586..fea6fb209c5 100755 --- a/docs/api-reference/rbac.authorization.k8s.io/v1alpha1/definitions.html +++ b/docs/api-reference/rbac.authorization.k8s.io/v1alpha1/definitions.html @@ -401,7 +401,62 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

Definitions

-

unversioned.Patch

+

v1.APIResourceList

+
+

APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

kind

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

apiVersion

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources

false

string

groupVersion

groupVersion is the group and version this APIResourceList is for.

true

string

resources

resources contains the name of the resources and if they are namespaced.

true

v1.APIResource array

+ +
+
+

v1.Patch

Patch is provided to give a concrete name and type to the Kubernetes PATCH request body.

@@ -469,7 +524,86 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
-

unversioned.StatusDetails

+

v1.ListMeta

+
+

ListMeta describes metadata that synthetic resources must have, including lists and various status objects. A resource may have only one of {ObjectMeta, ListMeta}.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

selfLink

SelfLink is a URL representing this object. Populated by the system. Read-only.

false

string

resourceVersion

String that identifies the server’s internal version of this object that can be used by clients to determine when objects have changed. Value must be treated as opaque by clients and passed unmodified back to the server. Populated by the system. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#concurrency-control-and-consistency

false

string

+ +
+
+

versioned.Event

+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

type

true

string

object

true

string

+ +
+
+

v1.StatusDetails

StatusDetails is a set of additional properties that MAY be set by the server to provide additional information about a response. The Reason field of a Status object defines what attributes will be set. Clients must ignore fields that do not match the defined type of each attribute, and should assume that any attribute may be empty, invalid, or under defined.

@@ -516,7 +650,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

causes

The Causes array includes more details associated with the StatusReason failure. Not all StatusReasons may provide detailed causes.

false

-

unversioned.StatusCause array

+

v1.StatusCause array

@@ -529,85 +663,6 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } -
-
-

versioned.Event

- ------- - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

type

true

string

object

true

string

- -
-
-

unversioned.ListMeta

-
-

ListMeta describes metadata that synthetic resources must have, including lists and various status objects. A resource may have only one of {ObjectMeta, ListMeta}.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

selfLink

SelfLink is a URL representing this object. Populated by the system. Read-only.

false

string

resourceVersion

String that identifies the server’s internal version of this object that can be used by clients to determine when objects have changed. Value must be treated as opaque by clients and passed unmodified back to the server. Populated by the system. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#concurrency-control-and-consistency

false

string

-

v1alpha1.RoleBindingList

@@ -650,7 +705,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

metadata

Standard object’s metadata.

false

-

unversioned.ListMeta

+

v1.ListMeta

@@ -739,7 +794,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

metadata

Standard object’s metadata.

false

-

unversioned.ListMeta

+

v1.ListMeta

@@ -809,9 +864,9 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
-

unversioned.APIResourceList

+

v1.Status

-

APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.

+

Status is a return value for calls that don’t return other objects.

@@ -846,17 +901,45 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } - - - + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + @@ -904,7 +987,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } - + @@ -972,137 +1055,6 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

groupVersion

groupVersion is the group and version this APIResourceList is for.

true

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

v1.ListMeta

status

Status of the operation. One of: "Success" or "Failure". More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status

false

string

resources

resources contains the name of the resources and if they are namespaced.

true

unversioned.APIResource array

message

A human-readable description of the status of this operation.

false

string

reason

A machine-readable description of why this operation is in the "Failure" status. If this value is empty there is no information available. A Reason clarifies an HTTP status code but does not override it.

false

string

details

Extended data associated with the reason. Each reason may define its own extended details. This field is optional and the data returned is not guaranteed to conform to any schema except that defined by the reason type.

false

v1.StatusDetails

code

Suggested HTTP return code for this status, 0 if not set.

false

integer (int32)

metadata

Standard object’s metadata.

false

unversioned.ListMeta

v1.ListMeta

-
-
-

unversioned.Status

-
-

Status is a return value for calls that don’t return other objects.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

kind

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

apiVersion

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources

false

string

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

unversioned.ListMeta

status

Status of the operation. One of: "Success" or "Failure". More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status

false

string

message

A human-readable description of the status of this operation.

false

string

reason

A machine-readable description of why this operation is in the "Failure" status. If this value is empty there is no information available. A Reason clarifies an HTTP status code but does not override it.

false

string

details

Extended data associated with the reason. Each reason may define its own extended details. This field is optional and the data returned is not guaranteed to conform to any schema except that defined by the reason type.

false

unversioned.StatusDetails

code

Suggested HTTP return code for this status, 0 if not set.

false

integer (int32)

- -
-
-

unversioned.APIResource

-
-

APIResource specifies the name of a resource and whether it is namespaced.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

name

name is the name of the resource.

true

string

namespaced

namespaced indicates if a resource is namespaced or not.

true

boolean

false

kind

kind is the kind for the resource (e.g. Foo is the kind for a resource foo)

true

string

-

v1alpha1.ClusterRoleList

@@ -1145,7 +1097,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

metadata

Standard object’s metadata.

false

-

unversioned.ListMeta

+

v1.ListMeta

@@ -1247,7 +1199,7 @@ Populated by the system. Read-only. Value must be treated as opaque by clients a
Populated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata

false

-

string (date-time)

+

string

@@ -1256,7 +1208,7 @@ Populated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata

false

-

string (date-time)

+

string

@@ -1490,6 +1442,54 @@ Populated by the system when a graceful deletion is requested. Read-only. More i +
+
+

v1.APIResource

+
+

APIResource specifies the name of a resource and whether it is namespaced.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

name

name is the name of the resource.

true

string

namespaced

namespaced indicates if a resource is namespaced or not.

true

boolean

false

kind

kind is the kind for the resource (e.g. Foo is the kind for a resource foo)

true

string

+

v1alpha1.PolicyRule

@@ -1611,58 +1611,6 @@ Populated by the system when a graceful deletion is requested. Read-only. More i

types.UID

-
-
-

unversioned.StatusCause

-
-

StatusCause provides more information about an api.Status failure, including cases when multiple errors are encountered.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

reason

A machine-readable description of the cause of the error. If this value is empty there is no information available.

false

string

message

A human-readable description of the cause of the error. This field may be presented as-is to a reader.

false

string

field

The field of the resource that has caused this error, as named by its JSON serialization. May include dot and postfix notation for nested attributes. Arrays are zero-indexed. Fields may appear more than once in an array of causes due to fields having multiple errors. Optional.
-
-Examples:
- "name" - the field "name" on the current resource
- "items[0].name" - the field "name" on the first array entry in "items"

false

string

-

v1alpha1.Role

@@ -1718,6 +1666,58 @@ Examples:
+
+
+

v1.StatusCause

+
+

StatusCause provides more information about an api.Status failure, including cases when multiple errors are encountered.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

reason

A machine-readable description of the cause of the error. If this value is empty there is no information available.

false

string

message

A human-readable description of the cause of the error. This field may be presented as-is to a reader.

false

string

field

The field of the resource that has caused this error, as named by its JSON serialization. May include dot and postfix notation for nested attributes. Arrays are zero-indexed. Fields may appear more than once in an array of causes due to fields having multiple errors. Optional.
+
+Examples:
+ "name" - the field "name" on the current resource
+ "items[0].name" - the field "name" on the first array entry in "items"

false

string

+

any

@@ -1730,7 +1730,7 @@ Examples:
diff --git a/docs/api-reference/rbac.authorization.k8s.io/v1alpha1/operations.html b/docs/api-reference/rbac.authorization.k8s.io/v1alpha1/operations.html index a95a294a5f0..15c12065186 100755 --- a/docs/api-reference/rbac.authorization.k8s.io/v1alpha1/operations.html +++ b/docs/api-reference/rbac.authorization.k8s.io/v1alpha1/operations.html @@ -393,7 +393,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

default

success

-

unversioned.APIResourceList

+

v1.APIResourceList

@@ -691,7 +691,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -1167,7 +1167,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -1252,7 +1252,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -1584,7 +1584,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -2060,7 +2060,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -2145,7 +2145,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -2493,7 +2493,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -3001,7 +3001,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -3086,7 +3086,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -3442,7 +3442,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -3950,7 +3950,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -4035,7 +4035,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -5983,7 +5983,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
diff --git a/docs/api-reference/storage.k8s.io/v1beta1/definitions.html b/docs/api-reference/storage.k8s.io/v1beta1/definitions.html index 63897ff75b1..c7b48f5b1cd 100755 --- a/docs/api-reference/storage.k8s.io/v1beta1/definitions.html +++ b/docs/api-reference/storage.k8s.io/v1beta1/definitions.html @@ -383,10 +383,59 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

Definitions

-

unversioned.Patch

+

v1.APIResourceList

-

Patch is provided to give a concrete name and type to the Kubernetes PATCH request body.

+

APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.

+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

kind

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

apiVersion

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources

false

string

groupVersion

groupVersion is the group and version this APIResourceList is for.

true

string

resources

resources contains the name of the resources and if they are namespaced.

true

v1.APIResource array

+

v1beta1.StorageClassList

@@ -429,7 +478,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

metadata

Standard list metadata More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata

false

-

unversioned.ListMeta

+

v1.ListMeta

@@ -442,6 +491,12 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } +
+
+

v1.Patch

+
+

Patch is provided to give a concrete name and type to the Kubernetes PATCH request body.

+

v1.DeleteOptions

@@ -506,7 +561,86 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
-

unversioned.StatusDetails

+

v1.ListMeta

+
+

ListMeta describes metadata that synthetic resources must have, including lists and various status objects. A resource may have only one of {ObjectMeta, ListMeta}.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

selfLink

SelfLink is a URL representing this object. Populated by the system. Read-only.

false

string

resourceVersion

String that identifies the server’s internal version of this object that can be used by clients to determine when objects have changed. Value must be treated as opaque by clients and passed unmodified back to the server. Populated by the system. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#concurrency-control-and-consistency

false

string

+ +
+
+

versioned.Event

+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

type

true

string

object

true

string

+ +
+
+

v1.StatusDetails

StatusDetails is a set of additional properties that MAY be set by the server to provide additional information about a response. The Reason field of a Status object defines what attributes will be set. Clients must ignore fields that do not match the defined type of each attribute, and should assume that any attribute may be empty, invalid, or under defined.

@@ -553,7 +687,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

causes

The Causes array includes more details associated with the StatusReason failure. Not all StatusReasons may provide detailed causes.

false

-

unversioned.StatusCause array

+

v1.StatusCause array

@@ -566,85 +700,6 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } -
-
-

versioned.Event

- ------- - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

type

true

string

object

true

string

- -
-
-

unversioned.ListMeta

-
-

ListMeta describes metadata that synthetic resources must have, including lists and various status objects. A resource may have only one of {ObjectMeta, ListMeta}.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

selfLink

SelfLink is a URL representing this object. Populated by the system. Read-only.

false

string

resourceVersion

String that identifies the server’s internal version of this object that can be used by clients to determine when objects have changed. Value must be treated as opaque by clients and passed unmodified back to the server. Populated by the system. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#concurrency-control-and-consistency

false

string

-

v1.Preconditions

@@ -681,9 +736,9 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
-

unversioned.APIResourceList

+

v1.Status

-

APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.

+

Status is a return value for calls that don’t return other objects.

@@ -718,17 +773,45 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } - - - + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + @@ -799,137 +882,6 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

groupVersion

groupVersion is the group and version this APIResourceList is for.

true

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

v1.ListMeta

status

Status of the operation. One of: "Success" or "Failure". More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status

false

string

resources

resources contains the name of the resources and if they are namespaced.

true

unversioned.APIResource array

message

A human-readable description of the status of this operation.

false

string

reason

A machine-readable description of why this operation is in the "Failure" status. If this value is empty there is no information available. A Reason clarifies an HTTP status code but does not override it.

false

string

details

Extended data associated with the reason. Each reason may define its own extended details. This field is optional and the data returned is not guaranteed to conform to any schema except that defined by the reason type.

false

v1.StatusDetails

code

Suggested HTTP return code for this status, 0 if not set.

false

integer (int32)

-
-
-

unversioned.Status

-
-

Status is a return value for calls that don’t return other objects.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

kind

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

apiVersion

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources

false

string

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

unversioned.ListMeta

status

Status of the operation. One of: "Success" or "Failure". More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status

false

string

message

A human-readable description of the status of this operation.

false

string

reason

A machine-readable description of why this operation is in the "Failure" status. If this value is empty there is no information available. A Reason clarifies an HTTP status code but does not override it.

false

string

details

Extended data associated with the reason. Each reason may define its own extended details. This field is optional and the data returned is not guaranteed to conform to any schema except that defined by the reason type.

false

unversioned.StatusDetails

code

Suggested HTTP return code for this status, 0 if not set.

false

integer (int32)

- -
-
-

unversioned.APIResource

-
-

APIResource specifies the name of a resource and whether it is namespaced.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

name

name is the name of the resource.

true

string

namespaced

namespaced indicates if a resource is namespaced or not.

true

boolean

false

kind

kind is the kind for the resource (e.g. Foo is the kind for a resource foo)

true

string

-

v1.ObjectMeta

@@ -1019,7 +971,7 @@ Populated by the system. Read-only. Value must be treated as opaque by clients a
Populated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata

false

-

string (date-time)

+

string

@@ -1028,7 +980,7 @@ Populated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata

false

-

string (date-time)

+

string

@@ -1138,13 +1090,61 @@ Populated by the system when a graceful deletion is requested. Read-only. More i +
+
+

v1.APIResource

+
+

APIResource specifies the name of a resource and whether it is namespaced.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

name

name is the name of the resource.

true

string

namespaced

namespaced indicates if a resource is namespaced or not.

true

boolean

false

kind

kind is the kind for the resource (e.g. Foo is the kind for a resource foo)

true

string

+

types.UID

-

unversioned.StatusCause

+

v1.StatusCause

StatusCause provides more information about an api.Status failure, including cases when multiple errors are encountered.

@@ -1206,7 +1206,7 @@ Examples:
diff --git a/docs/api-reference/storage.k8s.io/v1beta1/operations.html b/docs/api-reference/storage.k8s.io/v1beta1/operations.html index edbe25f7c8d..d40510eae69 100755 --- a/docs/api-reference/storage.k8s.io/v1beta1/operations.html +++ b/docs/api-reference/storage.k8s.io/v1beta1/operations.html @@ -393,7 +393,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

default

success

-

unversioned.APIResourceList

+

v1.APIResourceList

@@ -691,7 +691,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -1183,7 +1183,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -1268,7 +1268,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -1662,7 +1662,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
diff --git a/docs/api-reference/v1/definitions.html b/docs/api-reference/v1/definitions.html index baaf0b064b4..01b06e39d41 100755 --- a/docs/api-reference/v1/definitions.html +++ b/docs/api-reference/v1/definitions.html @@ -479,6 +479,61 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

Definitions

+

v1.APIResourceList

+
+

APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

kind

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

apiVersion

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources

false

string

groupVersion

groupVersion is the group and version this APIResourceList is for.

true

string

resources

resources contains the name of the resources and if they are namespaced.

true

v1.APIResource array

+ +
+

v1.Node

Node is a worker node in Kubernetes. Each node will have a unique identifier in the cache (i.e. in etcd).

@@ -581,7 +636,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

-

unversioned.ListMeta

+

v1.ListMeta

@@ -752,7 +807,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

startedAt

Time at which the container was last (re-)started

false

-

string (date-time)

+

string

@@ -813,6 +868,47 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } +
+
+

v1.LabelSelector

+
+

A label selector is a label query over a set of resources. The result of matchLabels and matchExpressions are ANDed. An empty label selector matches all objects. A null label selector matches no objects.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

matchLabels

matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.

false

object

matchExpressions

matchExpressions is a list of label selector requirements. The requirements are ANDed.

false

v1.LabelSelectorRequirement array

+

v1.PersistentVolumeClaimSpec

@@ -848,7 +944,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

selector

A label query over volumes to consider for binding.

false

-

unversioned.LabelSelector

+

v1.LabelSelector

@@ -978,58 +1074,6 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } -
-
-

unversioned.StatusCause

-
-

StatusCause provides more information about an api.Status failure, including cases when multiple errors are encountered.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

reason

A machine-readable description of the cause of the error. If this value is empty there is no information available.

false

string

message

A human-readable description of the cause of the error. This field may be presented as-is to a reader.

false

string

field

The field of the resource that has caused this error, as named by its JSON serialization. May include dot and postfix notation for nested attributes. Arrays are zero-indexed. Fields may appear more than once in an array of causes due to fields having multiple errors. Optional.
-
-Examples:
- "name" - the field "name" on the current resource
- "items[0].name" - the field "name" on the first array entry in "items"

false

string

-

v1.GCEPersistentDiskVolumeSource

@@ -1301,7 +1345,7 @@ Examples:

metadata

More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata

false

-

unversioned.ListMeta

+

v1.ListMeta

@@ -1455,7 +1499,7 @@ Examples:

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

-

unversioned.ListMeta

+

v1.ListMeta

@@ -1558,7 +1602,7 @@ Examples:

lastTransitionTime

The last time the condition transitioned from one status to another.

false

-

string (date-time)

+

string

@@ -1757,7 +1801,7 @@ Examples:

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

-

unversioned.ListMeta

+

v1.ListMeta

@@ -1812,14 +1856,14 @@ Examples:

lastHeartbeatTime

Last time we got an update on a given condition.

false

-

string (date-time)

+

string

lastTransitionTime

Last time the condition transit from one status to another.

false

-

string (date-time)

+

string

@@ -2037,7 +2081,7 @@ Populated by the system. Read-only. Value must be treated as opaque by clients a
Populated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata

false

-

string (date-time)

+

string

@@ -2046,7 +2090,7 @@ Populated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata

false

-

string (date-time)

+

string

@@ -2325,7 +2369,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

-

unversioned.ListMeta

+

v1.ListMeta

@@ -2338,12 +2382,6 @@ Populated by the system when a graceful deletion is requested. Read-only. More i -
-
-

unversioned.Patch

-
-

Patch is provided to give a concrete name and type to the Kubernetes PATCH request body.

-

v1.NamespaceList

@@ -2386,7 +2424,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

-

unversioned.ListMeta

+

v1.ListMeta

@@ -2681,6 +2719,47 @@ Populated by the system when a graceful deletion is requested. Read-only. More i +
+
+

v1.ListMeta

+
+

ListMeta describes metadata that synthetic resources must have, including lists and various status objects. A resource may have only one of {ObjectMeta, ListMeta}.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

selfLink

SelfLink is a URL representing this object. Populated by the system. Read-only.

false

string

resourceVersion

String that identifies the server’s internal version of this object that can be used by clients to determine when objects have changed. Value must be treated as opaque by clients and passed unmodified back to the server. Populated by the system. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#concurrency-control-and-consistency

false

string

+

v1.FlockerVolumeSource

@@ -2763,47 +2842,6 @@ Populated by the system when a graceful deletion is requested. Read-only. More i -
-
-

unversioned.ListMeta

-
-

ListMeta describes metadata that synthetic resources must have, including lists and various status objects. A resource may have only one of {ObjectMeta, ListMeta}.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

selfLink

SelfLink is a URL representing this object. Populated by the system. Read-only.

false

string

resourceVersion

String that identifies the server’s internal version of this object that can be used by clients to determine when objects have changed. Value must be treated as opaque by clients and passed unmodified back to the server. Populated by the system. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#concurrency-control-and-consistency

false

string

-

v1.ResourceQuotaList

@@ -2846,7 +2884,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

-

unversioned.ListMeta

+

v1.ListMeta

@@ -2911,47 +2949,6 @@ Populated by the system when a graceful deletion is requested. Read-only. More i

v1.UniqueVolumeName

-
-
-

unversioned.LabelSelector

-
-

A label selector is a label query over a set of resources. The result of matchLabels and matchExpressions are ANDed. An empty label selector matches all objects. A null label selector matches no objects.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

matchLabels

matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.

false

object

matchExpressions

matchExpressions is a list of label selector requirements. The requirements are ANDed.

false

unversioned.LabelSelectorRequirement array

-

v1.EndpointSubset

@@ -3533,7 +3530,7 @@ The resulting set of endpoints can be viewed as:

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

-

unversioned.ListMeta

+

v1.ListMeta

@@ -3588,7 +3585,7 @@ The resulting set of endpoints can be viewed as:

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

-

unversioned.ListMeta

+

v1.ListMeta

@@ -4055,61 +4052,6 @@ The resulting set of endpoints can be viewed as:
-
-
-

unversioned.APIResourceList

-
-

APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

kind

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

apiVersion

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources

false

string

groupVersion

groupVersion is the group and version this APIResourceList is for.

true

string

resources

resources contains the name of the resources and if they are namespaced.

true

unversioned.APIResource array

-

v1.SecretKeySelector

@@ -4217,54 +4159,6 @@ The resulting set of endpoints can be viewed as:

v1.Capability

-
-
-

unversioned.APIResource

-
-

APIResource specifies the name of a resource and whether it is namespaced.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

name

name is the name of the resource.

true

string

namespaced

namespaced indicates if a resource is namespaced or not.

true

boolean

false

kind

kind is the kind for the resource (e.g. Foo is the kind for a resource foo)

true

string

-

v1.PodStatus

@@ -4335,7 +4229,7 @@ The resulting set of endpoints can be viewed as:

startTime

RFC 3339 date and time at which the object was acknowledged by the Kubelet. This is before the Kubelet pulled the container image(s) for the pod.

false

-

string (date-time)

+

string

@@ -4770,7 +4664,7 @@ The resulting set of endpoints can be viewed as:

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

-

unversioned.ListMeta

+

v1.ListMeta

@@ -5154,6 +5048,58 @@ The resulting set of endpoints can be viewed as:
+
+
+

v1.StatusCause

+
+

StatusCause provides more information about an api.Status failure, including cases when multiple errors are encountered.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

reason

A machine-readable description of the cause of the error. If this value is empty there is no information available.

false

string

message

A human-readable description of the cause of the error. This field may be presented as-is to a reader.

false

string

field

The field of the resource that has caused this error, as named by its JSON serialization. May include dot and postfix notation for nested attributes. Arrays are zero-indexed. Fields may appear more than once in an array of causes due to fields having multiple errors. Optional.
+
+Examples:
+ "name" - the field "name" on the current resource
+ "items[0].name" - the field "name" on the first array entry in "items"

false

string

+

v1.PodCondition

@@ -5196,14 +5142,14 @@ The resulting set of endpoints can be viewed as:

lastProbeTime

Last time we probed the condition.

false

-

string (date-time)

+

string

lastTransitionTime

Last time the condition transitioned from one status to another.

false

-

string (date-time)

+

string

@@ -5385,6 +5331,89 @@ The resulting set of endpoints can be viewed as:
+
+
+

v1.Status

+
+

Status is a return value for calls that don’t return other objects.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

kind

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

apiVersion

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources

false

string

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

v1.ListMeta

status

Status of the operation. One of: "Success" or "Failure". More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status

false

string

message

A human-readable description of the status of this operation.

false

string

reason

A machine-readable description of why this operation is in the "Failure" status. If this value is empty there is no information available. A Reason clarifies an HTTP status code but does not override it.

false

string

details

Extended data associated with the reason. Each reason may define its own extended details. This field is optional and the data returned is not guaranteed to conform to any schema except that defined by the reason type.

false

v1.StatusDetails

code

Suggested HTTP return code for this status, 0 if not set.

false

integer (int32)

+

v1.PodTemplate

@@ -5700,68 +5729,6 @@ The resulting set of endpoints can be viewed as:
-
-
-

unversioned.StatusDetails

-
-

StatusDetails is a set of additional properties that MAY be set by the server to provide additional information about a response. The Reason field of a Status object defines what attributes will be set. Clients must ignore fields that do not match the defined type of each attribute, and should assume that any attribute may be empty, invalid, or under defined.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

name

The name attribute of the resource associated with the status StatusReason (when there is a single name which can be described).

false

string

group

The group attribute of the resource associated with the status StatusReason.

false

string

kind

The kind attribute of the resource associated with the status StatusReason. On some operations may differ from the requested resource Kind. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

causes

The Causes array includes more details associated with the StatusReason failure. Not all StatusReasons may provide detailed causes.

false

unversioned.StatusCause array

retryAfterSeconds

If specified, the time in seconds before the operation should be retried.

false

integer (int32)

-

v1.HTTPGetAction

@@ -5824,6 +5791,68 @@ The resulting set of endpoints can be viewed as:
+
+
+

v1.StatusDetails

+
+

StatusDetails is a set of additional properties that MAY be set by the server to provide additional information about a response. The Reason field of a Status object defines what attributes will be set. Clients must ignore fields that do not match the defined type of each attribute, and should assume that any attribute may be empty, invalid, or under defined.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

name

The name attribute of the resource associated with the status StatusReason (when there is a single name which can be described).

false

string

group

The group attribute of the resource associated with the status StatusReason.

false

string

kind

The kind attribute of the resource associated with the status StatusReason. On some operations may differ from the requested resource Kind. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

causes

The Causes array includes more details associated with the StatusReason failure. Not all StatusReasons may provide detailed causes.

false

v1.StatusCause array

retryAfterSeconds

If specified, the time in seconds before the operation should be retried.

false

integer (int32)

+

v1.LoadBalancerStatus

@@ -5900,7 +5929,7 @@ The resulting set of endpoints can be viewed as:

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

-

unversioned.ListMeta

+

v1.ListMeta

@@ -6632,7 +6661,7 @@ The resulting set of endpoints can be viewed as:

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

-

unversioned.ListMeta

+

v1.ListMeta

@@ -6645,6 +6674,54 @@ The resulting set of endpoints can be viewed as:
+
+
+

v1.APIResource

+
+

APIResource specifies the name of a resource and whether it is namespaced.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

name

name is the name of the resource.

true

string

namespaced

namespaced indicates if a resource is namespaced or not.

true

boolean

false

kind

kind is the kind for the resource (e.g. Foo is the kind for a resource foo)

true

string

+

v1.HostPathVolumeSource

@@ -6735,14 +6812,14 @@ The resulting set of endpoints can be viewed as:

startedAt

Time at which previous execution of the container started

false

-

string (date-time)

+

string

finishedAt

Time at which the container last terminated

false

-

string (date-time)

+

string

@@ -7265,7 +7342,7 @@ The resulting set of endpoints can be viewed as:

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

-

unversioned.ListMeta

+

v1.ListMeta

@@ -7458,14 +7535,14 @@ The resulting set of endpoints can be viewed as:

firstTimestamp

The time at which the event was first recorded. (Time of server receipt is in TypeMeta.)

false

-

string (date-time)

+

string

lastTimestamp

The time at which the most recent occurrence of this event was recorded.

false

-

string (date-time)

+

string

@@ -7485,6 +7562,54 @@ The resulting set of endpoints can be viewed as:
+
+
+

v1.LabelSelectorRequirement

+
+

A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

key

key is the label key that the selector applies to.

true

string

operator

operator represents a key’s relationship to a set of values. Valid operators ard In, NotIn, Exists and DoesNotExist.

true

string

values

values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.

false

string array

+

v1.EnvVar

@@ -7785,7 +7910,7 @@ The resulting set of endpoints can be viewed as:

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

-

unversioned.ListMeta

+

v1.ListMeta

@@ -7840,7 +7965,7 @@ The resulting set of endpoints can be viewed as:

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

-

unversioned.ListMeta

+

v1.ListMeta

@@ -7895,7 +8020,7 @@ The resulting set of endpoints can be viewed as:

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

-

unversioned.ListMeta

+

v1.ListMeta

@@ -7908,6 +8033,12 @@ The resulting set of endpoints can be viewed as:
+
+
+

v1.Patch

+
+

Patch is provided to give a concrete name and type to the Kubernetes PATCH request body.

+

v1.ObjectReference

@@ -7984,54 +8115,6 @@ The resulting set of endpoints can be viewed as:
-
-
-

unversioned.LabelSelectorRequirement

-
-

A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

key

key is the label key that the selector applies to.

true

string

operator

operator represents a key’s relationship to a set of values. Valid operators ard In, NotIn, Exists and DoesNotExist.

true

string

values

values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.

false

string array

-

v1.ContainerStateWaiting

@@ -8073,89 +8156,6 @@ The resulting set of endpoints can be viewed as:
-
-
-

unversioned.Status

-
-

Status is a return value for calls that don’t return other objects.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

kind

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

apiVersion

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources

false

string

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

unversioned.ListMeta

status

Status of the operation. One of: "Success" or "Failure". More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status

false

string

message

A human-readable description of the status of this operation.

false

string

reason

A machine-readable description of why this operation is in the "Failure" status. If this value is empty there is no information available. A Reason clarifies an HTTP status code but does not override it.

false

string

details

Extended data associated with the reason. Each reason may define its own extended details. This field is optional and the data returned is not guaranteed to conform to any schema except that defined by the reason type.

false

unversioned.StatusDetails

code

Suggested HTTP return code for this status, 0 if not set.

false

integer (int32)

-

v1.ConfigMapKeySelector

@@ -8613,7 +8613,7 @@ The resulting set of endpoints can be viewed as:
diff --git a/docs/api-reference/v1/operations.html b/docs/api-reference/v1/operations.html index bc611b1fa50..ff900ba180c 100755 --- a/docs/api-reference/v1/operations.html +++ b/docs/api-reference/v1/operations.html @@ -393,7 +393,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

default

success

-

unversioned.APIResourceList

+

v1.APIResourceList

@@ -1547,7 +1547,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -2085,7 +2085,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -2609,7 +2609,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -2694,7 +2694,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -3050,7 +3050,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -3574,7 +3574,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -3659,7 +3659,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -4015,7 +4015,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -4539,7 +4539,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -4624,7 +4624,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -4980,7 +4980,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -5504,7 +5504,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -5589,7 +5589,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -5945,7 +5945,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -6469,7 +6469,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -6554,7 +6554,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -6933,7 +6933,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -7289,7 +7289,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -7813,7 +7813,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -7898,7 +7898,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -8910,14 +8910,6 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

QueryParameter

-

sinceTime

-

An RFC3339 timestamp from which to show logs. If this value precedes the time a pod was started, only logs since the pod start will be returned. If this value is in the future, no logs will be returned. Only one of sinceSeconds or sinceTime may be specified.

-

false

-

string

- - - -

QueryParameter

timestamps

If true, add an RFC3339 or RFC3339Nano timestamp at the beginning of every line of log output. Defaults to false.

false

@@ -10459,7 +10451,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -10815,7 +10807,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -11339,7 +11331,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -11424,7 +11416,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -11780,7 +11772,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -12304,7 +12296,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -12389,7 +12381,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -12768,7 +12760,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -13147,7 +13139,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -13503,7 +13495,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -14027,7 +14019,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -14112,7 +14104,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -14491,7 +14483,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -14847,7 +14839,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -15371,7 +15363,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -15456,7 +15448,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -15812,7 +15804,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -16336,7 +16328,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -16421,7 +16413,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -17126,7 +17118,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -17211,7 +17203,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -18526,7 +18518,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -18955,7 +18947,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -19040,7 +19032,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -19514,7 +19506,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -19846,7 +19838,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -20338,7 +20330,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -20423,7 +20415,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -21650,7 +21642,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -22131,7 +22123,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -22623,7 +22615,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -22708,7 +22700,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -23063,7 +23055,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -33316,7 +33308,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
diff --git a/federation/apis/core/v1/register.go b/federation/apis/core/v1/register.go index bdeec38a704..2d416ae013b 100644 --- a/federation/apis/core/v1/register.go +++ b/federation/apis/core/v1/register.go @@ -17,8 +17,8 @@ limitations under the License. package v1 import ( - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" versionedwatch "k8s.io/kubernetes/pkg/watch/versioned" diff --git a/federation/apis/federation/install/install_test.go b/federation/apis/federation/install/install_test.go index a6d01065118..f9121406e50 100644 --- a/federation/apis/federation/install/install_test.go +++ b/federation/apis/federation/install/install_test.go @@ -23,8 +23,8 @@ import ( "k8s.io/kubernetes/federation/apis/federation" "k8s.io/kubernetes/federation/apis/federation/v1beta1" "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" ) diff --git a/federation/apis/federation/types.generated.go b/federation/apis/federation/types.generated.go index 16f29d623a4..3006f2195f1 100644 --- a/federation/apis/federation/types.generated.go +++ b/federation/apis/federation/types.generated.go @@ -26,7 +26,7 @@ import ( "fmt" codec1978 "github.com/ugorji/go/codec" pkg1_api "k8s.io/kubernetes/pkg/api" - pkg2_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" + pkg2_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" pkg3_types "k8s.io/kubernetes/pkg/types" "reflect" "runtime" @@ -64,7 +64,7 @@ func init() { } if false { // reference the types, but skip this branch at build/run time var v0 pkg1_api.LocalObjectReference - var v1 pkg2_unversioned.Time + var v1 pkg2_v1.Time var v2 pkg3_types.UID var v3 time.Time _, _, _, _ = v0, v1, v2, v3 @@ -801,7 +801,7 @@ func (x *ClusterCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "lastProbeTime": if r.TryDecodeAsNil() { - x.LastProbeTime = pkg2_unversioned.Time{} + x.LastProbeTime = pkg2_v1.Time{} } else { yyv62 := &x.LastProbeTime yym63 := z.DecBinary() @@ -818,7 +818,7 @@ func (x *ClusterCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "lastTransitionTime": if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg2_unversioned.Time{} + x.LastTransitionTime = pkg2_v1.Time{} } else { yyv64 := &x.LastTransitionTime yym65 := z.DecBinary() @@ -903,7 +903,7 @@ func (x *ClusterCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastProbeTime = pkg2_unversioned.Time{} + x.LastProbeTime = pkg2_v1.Time{} } else { yyv71 := &x.LastProbeTime yym72 := z.DecBinary() @@ -930,7 +930,7 @@ func (x *ClusterCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg2_unversioned.Time{} + x.LastTransitionTime = pkg2_v1.Time{} } else { yyv73 := &x.LastTransitionTime yym74 := z.DecBinary() @@ -1855,7 +1855,7 @@ func (x *ClusterList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv154 := &x.ListMeta yym155 := z.DecBinary() @@ -1936,7 +1936,7 @@ func (x *ClusterList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv161 := &x.ListMeta yym162 := z.DecBinary() diff --git a/federation/apis/federation/v1beta1/generated.pb.go b/federation/apis/federation/v1beta1/generated.pb.go index d4039fff179..b1ea26f4a5f 100644 --- a/federation/apis/federation/v1beta1/generated.pb.go +++ b/federation/apis/federation/v1beta1/generated.pb.go @@ -482,8 +482,8 @@ func (this *ClusterCondition) String() string { s := strings.Join([]string{`&ClusterCondition{`, `Type:` + fmt.Sprintf("%v", this.Type) + `,`, `Status:` + fmt.Sprintf("%v", this.Status) + `,`, - `LastProbeTime:` + strings.Replace(strings.Replace(this.LastProbeTime.String(), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1), `&`, ``, 1) + `,`, - `LastTransitionTime:` + strings.Replace(strings.Replace(this.LastTransitionTime.String(), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1), `&`, ``, 1) + `,`, + `LastProbeTime:` + strings.Replace(strings.Replace(this.LastProbeTime.String(), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1), `&`, ``, 1) + `,`, + `LastTransitionTime:` + strings.Replace(strings.Replace(this.LastTransitionTime.String(), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1), `&`, ``, 1) + `,`, `Reason:` + fmt.Sprintf("%v", this.Reason) + `,`, `Message:` + fmt.Sprintf("%v", this.Message) + `,`, `}`, @@ -495,7 +495,7 @@ func (this *ClusterList) String() string { return "nil" } s := strings.Join([]string{`&ClusterList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "Cluster", "Cluster", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -1487,55 +1487,55 @@ var ( ) var fileDescriptorGenerated = []byte{ - // 793 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xa4, 0x54, 0xdd, 0x6a, 0x03, 0x45, - 0x14, 0xce, 0xe6, 0xb7, 0x99, 0x1a, 0x2d, 0x83, 0x42, 0xcc, 0xc5, 0xa6, 0x04, 0x91, 0x14, 0xed, - 0x2e, 0x09, 0x15, 0x0a, 0xa2, 0xd0, 0x4d, 0x11, 0x0a, 0x29, 0x95, 0x69, 0x11, 0x29, 0x88, 0x6c, - 0x36, 0x27, 0xdb, 0x35, 0xc9, 0xee, 0x32, 0x33, 0x1b, 0x69, 0xaf, 0x7c, 0x00, 0x2f, 0x7c, 0x08, - 0xdf, 0x40, 0x7c, 0x87, 0x5e, 0xf6, 0xc2, 0x0b, 0xf1, 0x22, 0xd8, 0xf8, 0x16, 0xbd, 0x92, 0x99, - 0x9d, 0x6c, 0xb2, 0xdd, 0x26, 0x68, 0x7b, 0xb7, 0xe7, 0xec, 0x39, 0xdf, 0xf7, 0xcd, 0xf9, 0x43, - 0xa7, 0xe3, 0x63, 0x66, 0x78, 0x81, 0x39, 0x8e, 0x06, 0x40, 0x7d, 0xe0, 0xc0, 0xcc, 0x11, 0x0c, - 0x81, 0xda, 0xdc, 0x0b, 0x7c, 0xd3, 0x0e, 0xbd, 0x94, 0x3d, 0xeb, 0x0c, 0x80, 0xdb, 0x1d, 0xd3, - 0x05, 0x5f, 0xb8, 0x60, 0x68, 0x84, 0x34, 0xe0, 0x01, 0x3e, 0x8a, 0x51, 0x8c, 0x15, 0x8a, 0xb1, - 0xca, 0x32, 0x04, 0xca, 0xba, 0xad, 0x50, 0x1a, 0x87, 0xae, 0xc7, 0x6f, 0xa2, 0x81, 0xe1, 0x04, - 0x53, 0xd3, 0x0d, 0xdc, 0xc0, 0x94, 0x60, 0x83, 0x68, 0x24, 0x2d, 0x69, 0xc8, 0xaf, 0x98, 0xa4, - 0xd1, 0xcd, 0x4a, 0x0d, 0xc7, 0xae, 0xd0, 0x68, 0x52, 0x60, 0x41, 0x44, 0x1d, 0x78, 0x2e, 0xac, - 0xf1, 0xd9, 0xe6, 0x9c, 0xc8, 0x9f, 0x01, 0x65, 0x5e, 0xe0, 0xc3, 0x30, 0x93, 0xf6, 0xe9, 0xe6, - 0xb4, 0x59, 0xe6, 0xf5, 0x8d, 0xc3, 0x97, 0xa3, 0x69, 0xe4, 0x73, 0x6f, 0x9a, 0xd5, 0x74, 0xb4, - 0x3d, 0x9c, 0x39, 0x37, 0x30, 0xb5, 0x33, 0x59, 0x9d, 0x97, 0xb3, 0x22, 0xee, 0x4d, 0x4c, 0xcf, - 0xe7, 0x8c, 0xd3, 0xe7, 0x29, 0xad, 0xdf, 0xf3, 0xa8, 0xd2, 0x9b, 0x44, 0x8c, 0x03, 0xc5, 0xdf, - 0xa2, 0x9d, 0x29, 0x70, 0x7b, 0x68, 0x73, 0xbb, 0xae, 0xed, 0x6b, 0xed, 0xdd, 0x6e, 0xdb, 0xc8, - 0x36, 0x2d, 0x1c, 0xbb, 0xa2, 0x5b, 0xc6, 0xac, 0x63, 0x5c, 0x0c, 0x7e, 0x00, 0x87, 0x9f, 0x03, - 0xb7, 0x2d, 0x7c, 0x3f, 0x6f, 0xe6, 0x16, 0xf3, 0x26, 0x5a, 0xf9, 0x48, 0x82, 0x86, 0x1d, 0x54, - 0x64, 0x21, 0x38, 0xf5, 0xbc, 0x44, 0x3d, 0x31, 0x5e, 0x33, 0x0a, 0x86, 0x92, 0x79, 0x19, 0x82, - 0x63, 0xbd, 0xa3, 0xe8, 0x8a, 0xc2, 0x22, 0x12, 0x1c, 0x8f, 0x51, 0x99, 0x71, 0x9b, 0x47, 0xac, - 0x5e, 0x90, 0x34, 0xbd, 0xb7, 0xd1, 0x48, 0x28, 0xeb, 0x5d, 0x45, 0x54, 0x8e, 0x6d, 0xa2, 0x28, - 0x5a, 0x7f, 0x15, 0xd0, 0x9e, 0x8a, 0xec, 0x05, 0xfe, 0xd0, 0x13, 0x10, 0xf8, 0x18, 0x15, 0xf9, - 0x6d, 0x08, 0xb2, 0x78, 0x55, 0xeb, 0xa3, 0xa5, 0xc6, 0xab, 0xdb, 0x10, 0x9e, 0xe6, 0xcd, 0xf7, - 0x9f, 0xc7, 0x0b, 0x3f, 0x91, 0x19, 0xf8, 0x9b, 0x44, 0x7b, 0x5e, 0xe6, 0x7e, 0x99, 0xa6, 0x7d, - 0x9a, 0x37, 0xb7, 0x8e, 0x9b, 0x91, 0x60, 0xa6, 0x65, 0xe2, 0x1b, 0x54, 0x9b, 0xd8, 0x8c, 0x7f, - 0x4d, 0x83, 0x01, 0x5c, 0x79, 0x53, 0x50, 0xa5, 0xf9, 0x64, 0x4b, 0x5f, 0xd7, 0x66, 0xde, 0x10, - 0x29, 0xd6, 0x07, 0x4a, 0x4b, 0xad, 0xbf, 0x8e, 0x44, 0xd2, 0xc0, 0xf8, 0x47, 0x84, 0x85, 0xe3, - 0x8a, 0xda, 0x3e, 0x8b, 0x5f, 0x27, 0xe8, 0x8a, 0xff, 0x9f, 0xae, 0xa1, 0xe8, 0x70, 0x3f, 0x03, - 0x47, 0x5e, 0xa0, 0xc0, 0x1f, 0xa3, 0x32, 0x05, 0x9b, 0x05, 0x7e, 0xbd, 0x24, 0x4b, 0x97, 0x74, - 0x8c, 0x48, 0x2f, 0x51, 0x7f, 0xf1, 0x01, 0xaa, 0x4c, 0x81, 0x31, 0xdb, 0x85, 0x7a, 0x59, 0x06, - 0xbe, 0xa7, 0x02, 0x2b, 0xe7, 0xb1, 0x9b, 0x2c, 0xff, 0xb7, 0x1e, 0x34, 0xb4, 0xab, 0x9a, 0xd5, - 0xf7, 0x18, 0xc7, 0xdf, 0x65, 0x16, 0xc3, 0xfc, 0x8f, 0x2f, 0x12, 0xe9, 0x72, 0x3f, 0xf6, 0x14, - 0xd9, 0xce, 0xd2, 0xb3, 0xb6, 0x1d, 0x03, 0x54, 0xf2, 0x38, 0x4c, 0x45, 0xef, 0x0b, 0xed, 0xdd, - 0xee, 0x17, 0x6f, 0x9a, 0x5b, 0xab, 0xa6, 0x98, 0x4a, 0x67, 0x02, 0x93, 0xc4, 0xd0, 0xad, 0x5f, - 0xf3, 0xc9, 0x93, 0xc4, 0xca, 0xe0, 0xdf, 0x34, 0xd4, 0x60, 0x40, 0x67, 0x40, 0x4f, 0x86, 0x43, - 0x0a, 0x8c, 0x59, 0xb7, 0xbd, 0x89, 0x07, 0x3e, 0xef, 0x9d, 0x9d, 0x12, 0x56, 0xd7, 0xa4, 0x92, - 0x8b, 0xd7, 0x29, 0xb9, 0xdc, 0x84, 0x6b, 0xb5, 0x94, 0xb6, 0xc6, 0xc6, 0x10, 0x46, 0xb6, 0xc8, - 0xc2, 0xdf, 0xa3, 0x2a, 0x03, 0x87, 0x02, 0x27, 0x30, 0x52, 0xc7, 0xa4, 0xbb, 0xfd, 0x44, 0xf5, - 0x03, 0xc7, 0x9e, 0xc4, 0x37, 0x89, 0xc0, 0x08, 0x28, 0xf8, 0x0e, 0x58, 0xb5, 0xc5, 0xbc, 0x59, - 0xbd, 0x5c, 0x02, 0x91, 0x15, 0x66, 0xeb, 0x0f, 0x0d, 0xd5, 0x52, 0x07, 0x00, 0xdf, 0x21, 0xe4, - 0x2c, 0x97, 0x6b, 0x59, 0x97, 0xaf, 0xde, 0xd4, 0xa1, 0x64, 0x57, 0x57, 0x47, 0x33, 0x71, 0x31, - 0xb2, 0xc6, 0x86, 0x9b, 0xa8, 0x74, 0x17, 0xf8, 0xc0, 0xea, 0xa5, 0xfd, 0x42, 0xbb, 0x6a, 0x55, - 0x45, 0x57, 0xaf, 0x85, 0x83, 0xc4, 0xfe, 0x78, 0xf6, 0x5d, 0x2f, 0xf0, 0xd5, 0x48, 0xaf, 0xcd, - 0xbe, 0xf0, 0x12, 0xf5, 0xb7, 0xf5, 0xb3, 0x86, 0x3e, 0xdc, 0x58, 0x72, 0xdc, 0x45, 0xc8, 0x49, - 0x2c, 0x75, 0xbc, 0x56, 0xd2, 0x92, 0x3f, 0x64, 0x2d, 0x0a, 0x7f, 0x8e, 0x6a, 0xa9, 0x3e, 0xa9, - 0xbb, 0x95, 0xdc, 0x8a, 0x14, 0x1b, 0x49, 0xc7, 0x5a, 0x07, 0xf7, 0x8f, 0x7a, 0xee, 0xe1, 0x51, - 0xcf, 0xfd, 0xf9, 0xa8, 0xe7, 0x7e, 0x5a, 0xe8, 0xda, 0xfd, 0x42, 0xd7, 0x1e, 0x16, 0xba, 0xf6, - 0xf7, 0x42, 0xd7, 0x7e, 0xf9, 0x47, 0xcf, 0x5d, 0x57, 0x54, 0xcd, 0xfe, 0x0d, 0x00, 0x00, 0xff, - 0xff, 0x4b, 0x32, 0xe4, 0xec, 0x7c, 0x08, 0x00, 0x00, + // 787 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xa4, 0x54, 0xcb, 0x6a, 0xf3, 0x46, + 0x14, 0xb6, 0x7c, 0x8d, 0x27, 0x75, 0x1b, 0x86, 0x16, 0x5c, 0x2f, 0xe4, 0x60, 0x4a, 0x71, 0x20, + 0x91, 0xb0, 0xc9, 0x22, 0x50, 0x5a, 0x88, 0x1c, 0x0a, 0x01, 0x87, 0x94, 0x49, 0x28, 0x25, 0x9b, + 0x22, 0xcb, 0xc7, 0x8a, 0x6a, 0x5b, 0x12, 0x33, 0x23, 0x43, 0xb2, 0xea, 0x03, 0x74, 0xd1, 0x87, + 0xe8, 0x1b, 0x94, 0xbe, 0x43, 0x36, 0x85, 0x2c, 0xb2, 0xe8, 0xca, 0x34, 0xee, 0x5b, 0x64, 0x55, + 0x66, 0x34, 0x96, 0xad, 0xf8, 0xc2, 0xff, 0x27, 0x3b, 0x9d, 0xa3, 0x73, 0xbe, 0xef, 0x9b, 0x73, + 0x43, 0x67, 0xc3, 0x13, 0x66, 0x78, 0x81, 0x39, 0x8c, 0x7a, 0x40, 0x7d, 0xe0, 0xc0, 0xcc, 0x01, + 0xf4, 0x81, 0xda, 0xdc, 0x0b, 0x7c, 0xd3, 0x0e, 0xbd, 0x94, 0x3d, 0x69, 0xf5, 0x80, 0xdb, 0x2d, + 0xd3, 0x05, 0x5f, 0xb8, 0xa0, 0x6f, 0x84, 0x34, 0xe0, 0x01, 0x3e, 0x8e, 0x51, 0x8c, 0x05, 0x8a, + 0xb1, 0xc8, 0x32, 0x04, 0xca, 0xb2, 0xad, 0x50, 0x6a, 0x47, 0xae, 0xc7, 0x6f, 0xa3, 0x9e, 0xe1, + 0x04, 0x63, 0xd3, 0x0d, 0xdc, 0xc0, 0x94, 0x60, 0xbd, 0x68, 0x20, 0x2d, 0x69, 0xc8, 0xaf, 0x98, + 0xa4, 0xd6, 0x5e, 0x95, 0x1a, 0x0e, 0x5d, 0xa1, 0xd1, 0xa4, 0xc0, 0x82, 0x88, 0x3a, 0xf0, 0x5a, + 0x58, 0xed, 0x70, 0x73, 0xce, 0x64, 0xe5, 0x19, 0x5b, 0x18, 0x98, 0x39, 0x06, 0x6e, 0xaf, 0xcb, + 0x39, 0x5a, 0x9f, 0x43, 0x23, 0x9f, 0x7b, 0xe3, 0x55, 0x41, 0xc7, 0xdb, 0xc3, 0x99, 0x73, 0x0b, + 0x63, 0x7b, 0x25, 0xab, 0xb5, 0x3e, 0x2b, 0xe2, 0xde, 0xc8, 0xf4, 0x7c, 0xce, 0x38, 0x7d, 0x9d, + 0xd2, 0xf8, 0x2b, 0x8b, 0x4a, 0x9d, 0x51, 0xc4, 0x38, 0x50, 0xfc, 0x13, 0xda, 0x11, 0xf2, 0xfb, + 0x36, 0xb7, 0xab, 0xda, 0xbe, 0xd6, 0xdc, 0x6d, 0x37, 0x8d, 0xd5, 0x8e, 0x85, 0x43, 0x57, 0xb4, + 0xca, 0x98, 0xb4, 0x8c, 0xcb, 0xde, 0x2f, 0xe0, 0xf0, 0x0b, 0xe0, 0xb6, 0x85, 0x1f, 0xa6, 0xf5, + 0xcc, 0x6c, 0x5a, 0x47, 0x0b, 0x1f, 0x49, 0xd0, 0xb0, 0x83, 0xf2, 0x2c, 0x04, 0xa7, 0x9a, 0x95, + 0xa8, 0xa7, 0xc6, 0x5b, 0xe6, 0xc0, 0x50, 0x32, 0xaf, 0x42, 0x70, 0xac, 0x4f, 0x14, 0x5d, 0x5e, + 0x58, 0x44, 0x82, 0xe3, 0x21, 0x2a, 0x32, 0x6e, 0xf3, 0x88, 0x55, 0x73, 0x92, 0xa6, 0xf3, 0x3e, + 0x1a, 0x09, 0x65, 0x7d, 0xaa, 0x88, 0x8a, 0xb1, 0x4d, 0x14, 0x45, 0xe3, 0x29, 0x87, 0xf6, 0x54, + 0x64, 0x27, 0xf0, 0xfb, 0x9e, 0x80, 0xc0, 0x27, 0x28, 0xcf, 0xef, 0x42, 0x90, 0xc5, 0x2b, 0x5b, + 0x5f, 0xcd, 0x35, 0x5e, 0xdf, 0x85, 0xf0, 0x32, 0xad, 0x7f, 0xfe, 0x3a, 0x5e, 0xf8, 0x89, 0xcc, + 0xc0, 0x3f, 0x26, 0xda, 0xb3, 0x32, 0xf7, 0xbb, 0x34, 0xed, 0xcb, 0xb4, 0xbe, 0x75, 0x44, 0x8d, + 0x04, 0x33, 0x2d, 0x13, 0x03, 0xaa, 0x8c, 0x6c, 0xc6, 0x7f, 0xa0, 0x41, 0x0f, 0xae, 0xbd, 0x31, + 0xa8, 0xd2, 0x6c, 0xe9, 0x2b, 0x33, 0x44, 0xd7, 0x44, 0x77, 0x45, 0xbc, 0xf5, 0x85, 0x12, 0x52, + 0xe9, 0x2e, 0xc3, 0x90, 0x34, 0x2a, 0xe6, 0x08, 0x0b, 0xc7, 0x35, 0xb5, 0x7d, 0x16, 0x3f, 0x4d, + 0x70, 0xe5, 0x3f, 0x92, 0xab, 0xa6, 0xb8, 0x70, 0x77, 0x05, 0x8b, 0xac, 0xc1, 0xc7, 0x5f, 0xa3, + 0x22, 0x05, 0x9b, 0x05, 0x7e, 0xb5, 0x20, 0x8b, 0x96, 0xf4, 0x8a, 0x48, 0x2f, 0x51, 0x7f, 0xf1, + 0x01, 0x2a, 0x8d, 0x81, 0x31, 0xdb, 0x85, 0x6a, 0x51, 0x06, 0x7e, 0xa6, 0x02, 0x4b, 0x17, 0xb1, + 0x9b, 0xcc, 0xff, 0x37, 0xfe, 0xd6, 0xd0, 0xae, 0x6a, 0x53, 0xd7, 0x63, 0x1c, 0xdf, 0xac, 0xac, + 0xc4, 0xe1, 0x87, 0x3c, 0x47, 0xe4, 0xca, 0xb5, 0xd8, 0x53, 0x4c, 0x3b, 0x73, 0xcf, 0xd2, 0x52, + 0xf4, 0x50, 0xc1, 0xe3, 0x30, 0x16, 0x2d, 0xcf, 0x35, 0x77, 0xdb, 0xdf, 0xbe, 0x6b, 0x5c, 0xad, + 0x8a, 0x62, 0x2a, 0x9c, 0x0b, 0x4c, 0x12, 0x43, 0x37, 0xfe, 0xc8, 0x26, 0xef, 0x11, 0x9b, 0x82, + 0xff, 0xd4, 0x50, 0x8d, 0x01, 0x9d, 0x00, 0x3d, 0xed, 0xf7, 0x29, 0x30, 0x66, 0xdd, 0x75, 0x46, + 0x1e, 0xf8, 0xbc, 0x73, 0x7e, 0x46, 0x58, 0x55, 0x93, 0x4a, 0x2e, 0xdf, 0xa6, 0xe4, 0x6a, 0x13, + 0xae, 0xd5, 0x50, 0xda, 0x6a, 0x1b, 0x43, 0x18, 0xd9, 0x22, 0x0b, 0xff, 0x8c, 0xca, 0x0c, 0x1c, + 0x0a, 0x9c, 0xc0, 0x40, 0xdd, 0x90, 0xf6, 0xf6, 0xcb, 0xd4, 0x0d, 0x1c, 0x7b, 0x14, 0x9f, 0x22, + 0x02, 0x03, 0xa0, 0xe0, 0x3b, 0x60, 0x55, 0x66, 0xd3, 0x7a, 0xf9, 0x6a, 0x0e, 0x44, 0x16, 0x98, + 0x8d, 0x27, 0x0d, 0x55, 0x52, 0x7b, 0x8f, 0xef, 0x11, 0x72, 0xe6, 0x3b, 0x35, 0xaf, 0xcb, 0xf7, + 0xef, 0xea, 0x50, 0xb2, 0xa2, 0x8b, 0x5b, 0x99, 0xb8, 0x18, 0x59, 0x62, 0xc3, 0x75, 0x54, 0xb8, + 0x0f, 0x7c, 0x60, 0xd5, 0xc2, 0x7e, 0xae, 0x59, 0xb6, 0xca, 0xa2, 0xab, 0x37, 0xc2, 0x41, 0x62, + 0x7f, 0x3c, 0xf8, 0xae, 0x17, 0xf8, 0x6a, 0x9e, 0x97, 0x06, 0x5f, 0x78, 0x89, 0xfa, 0xdb, 0xf8, + 0x4d, 0x43, 0x5f, 0x6e, 0x2c, 0x39, 0x6e, 0x23, 0xe4, 0x24, 0x96, 0xba, 0x59, 0x0b, 0x69, 0xc9, + 0x1f, 0xb2, 0x14, 0x85, 0xbf, 0x41, 0x95, 0x54, 0x9f, 0xd4, 0xb9, 0x4a, 0xae, 0x44, 0x8a, 0x8d, + 0xa4, 0x63, 0xad, 0x83, 0x87, 0x67, 0x3d, 0xf3, 0xf8, 0xac, 0x67, 0xfe, 0x79, 0xd6, 0x33, 0xbf, + 0xce, 0x74, 0xed, 0x61, 0xa6, 0x6b, 0x8f, 0x33, 0x5d, 0xfb, 0x77, 0xa6, 0x6b, 0xbf, 0xff, 0xa7, + 0x67, 0x6e, 0x4a, 0xaa, 0x66, 0xff, 0x07, 0x00, 0x00, 0xff, 0xff, 0x63, 0x94, 0x8a, 0xdf, 0x70, + 0x08, 0x00, 0x00, } diff --git a/federation/apis/federation/v1beta1/generated.proto b/federation/apis/federation/v1beta1/generated.proto index db890906c5f..21738c5e7eb 100644 --- a/federation/apis/federation/v1beta1/generated.proto +++ b/federation/apis/federation/v1beta1/generated.proto @@ -22,8 +22,8 @@ syntax = 'proto2'; package k8s.io.kubernetes.federation.apis.federation.v1beta1; import "k8s.io/kubernetes/pkg/api/resource/generated.proto"; -import "k8s.io/kubernetes/pkg/api/unversioned/generated.proto"; import "k8s.io/kubernetes/pkg/api/v1/generated.proto"; +import "k8s.io/kubernetes/pkg/apis/meta/v1/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/schema/generated.proto"; import "k8s.io/kubernetes/pkg/util/intstr/generated.proto"; @@ -57,11 +57,11 @@ message ClusterCondition { // Last time the condition was checked. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time lastProbeTime = 3; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time lastProbeTime = 3; // Last time the condition transit from one status to another. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time lastTransitionTime = 4; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time lastTransitionTime = 4; // (brief) reason for the condition's last transition. // +optional @@ -77,7 +77,7 @@ message ClusterList { // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // List of Cluster objects. repeated Cluster items = 2; diff --git a/federation/apis/federation/v1beta1/register.go b/federation/apis/federation/v1beta1/register.go index 0eaa3288c84..44be085c38d 100644 --- a/federation/apis/federation/v1beta1/register.go +++ b/federation/apis/federation/v1beta1/register.go @@ -17,8 +17,8 @@ limitations under the License. package v1beta1 import ( - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" versionedwatch "k8s.io/kubernetes/pkg/watch/versioned" diff --git a/federation/apis/federation/v1beta1/types.generated.go b/federation/apis/federation/v1beta1/types.generated.go index 4069793a023..693b588c94e 100644 --- a/federation/apis/federation/v1beta1/types.generated.go +++ b/federation/apis/federation/v1beta1/types.generated.go @@ -25,8 +25,8 @@ import ( "errors" "fmt" codec1978 "github.com/ugorji/go/codec" - pkg2_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" pkg1_v1 "k8s.io/kubernetes/pkg/api/v1" + pkg2_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" pkg3_types "k8s.io/kubernetes/pkg/types" "reflect" "runtime" @@ -63,8 +63,8 @@ func init() { panic(err) } if false { // reference the types, but skip this branch at build/run time - var v0 pkg2_unversioned.Time - var v1 pkg1_v1.LocalObjectReference + var v0 pkg1_v1.LocalObjectReference + var v1 pkg2_v1.Time var v2 pkg3_types.UID var v3 time.Time _, _, _, _ = v0, v1, v2, v3 @@ -801,7 +801,7 @@ func (x *ClusterCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "lastProbeTime": if r.TryDecodeAsNil() { - x.LastProbeTime = pkg2_unversioned.Time{} + x.LastProbeTime = pkg2_v1.Time{} } else { yyv62 := &x.LastProbeTime yym63 := z.DecBinary() @@ -818,7 +818,7 @@ func (x *ClusterCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "lastTransitionTime": if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg2_unversioned.Time{} + x.LastTransitionTime = pkg2_v1.Time{} } else { yyv64 := &x.LastTransitionTime yym65 := z.DecBinary() @@ -903,7 +903,7 @@ func (x *ClusterCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastProbeTime = pkg2_unversioned.Time{} + x.LastProbeTime = pkg2_v1.Time{} } else { yyv71 := &x.LastProbeTime yym72 := z.DecBinary() @@ -930,7 +930,7 @@ func (x *ClusterCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg2_unversioned.Time{} + x.LastTransitionTime = pkg2_v1.Time{} } else { yyv73 := &x.LastTransitionTime yym74 := z.DecBinary() @@ -1855,7 +1855,7 @@ func (x *ClusterList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv154 := &x.ListMeta yym155 := z.DecBinary() @@ -1936,7 +1936,7 @@ func (x *ClusterList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv161 := &x.ListMeta yym162 := z.DecBinary() diff --git a/federation/apis/federation/v1beta1/types.go b/federation/apis/federation/v1beta1/types.go index ffcd5495961..6dc3d3c7f73 100644 --- a/federation/apis/federation/v1beta1/types.go +++ b/federation/apis/federation/v1beta1/types.go @@ -17,8 +17,8 @@ limitations under the License. package v1beta1 import ( - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" ) // ServerAddressByClientCIDR helps the client to determine the server address that they should use, depending on the clientCIDR that they match. diff --git a/federation/apis/openapi-spec/swagger.json b/federation/apis/openapi-spec/swagger.json index a5636a4e43f..ef316d282c7 100644 --- a/federation/apis/openapi-spec/swagger.json +++ b/federation/apis/openapi-spec/swagger.json @@ -29,7 +29,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.APIVersions" + "$ref": "#/definitions/v1.APIVersions" } }, "401": { @@ -62,7 +62,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.APIResourceList" + "$ref": "#/definitions/v1.APIResourceList" } }, "401": { @@ -391,7 +391,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -575,7 +575,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -731,7 +731,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -764,7 +764,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -972,7 +972,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -1128,7 +1128,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -1161,7 +1161,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -1369,7 +1369,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -1525,7 +1525,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -1558,7 +1558,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -1766,7 +1766,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -1922,7 +1922,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -1955,7 +1955,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -2091,7 +2091,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -2263,7 +2263,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -2296,7 +2296,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -2480,7 +2480,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -3874,7 +3874,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.APIGroupList" + "$ref": "#/definitions/v1.APIGroupList" } }, "401": { @@ -3907,7 +3907,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.APIGroup" + "$ref": "#/definitions/v1.APIGroup" } }, "401": { @@ -3940,7 +3940,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.APIResourceList" + "$ref": "#/definitions/v1.APIResourceList" } }, "401": { @@ -4346,7 +4346,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -4502,7 +4502,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -4535,7 +4535,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -4671,7 +4671,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -4879,7 +4879,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -5035,7 +5035,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -5068,7 +5068,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -5268,7 +5268,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -5404,7 +5404,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -5612,7 +5612,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -5768,7 +5768,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -5801,7 +5801,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -5937,7 +5937,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -6145,7 +6145,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -6301,7 +6301,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -6334,7 +6334,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -6470,7 +6470,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -6606,7 +6606,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -7769,7 +7769,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.APIGroup" + "$ref": "#/definitions/v1.APIGroup" } }, "401": { @@ -7802,7 +7802,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.APIResourceList" + "$ref": "#/definitions/v1.APIResourceList" } }, "401": { @@ -7977,7 +7977,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -8125,7 +8125,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -8158,7 +8158,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -8503,7 +8503,7 @@ } } }, - "unversioned.APIGroup": { + "v1.APIGroup": { "description": "APIGroup contains the name, the supported versions, and the preferred version of a group.", "required": [ "name", @@ -8517,25 +8517,25 @@ }, "preferredVersion": { "description": "preferredVersion is the version preferred by the API server, which probably is the storage version.", - "$ref": "#/definitions/unversioned.GroupVersionForDiscovery" + "$ref": "#/definitions/v1.GroupVersionForDiscovery" }, "serverAddressByClientCIDRs": { "description": "a map of client CIDR to server address that is serving this group. This is to help clients reach servers in the most network-efficient way possible. Clients can use the appropriate server address as per the CIDR that they match. In case of multiple matches, clients should use the longest matching CIDR. The server returns only those CIDRs that it thinks that the client can match. For example: the master will return an internal IP CIDR only, if the client reaches the server using an internal IP. Server looks at X-Forwarded-For header or X-Real-Ip header or request.RemoteAddr (in that order) to get the client IP.", "type": "array", "items": { - "$ref": "#/definitions/unversioned.ServerAddressByClientCIDR" + "$ref": "#/definitions/v1.ServerAddressByClientCIDR" } }, "versions": { "description": "versions are the versions supported in this group.", "type": "array", "items": { - "$ref": "#/definitions/unversioned.GroupVersionForDiscovery" + "$ref": "#/definitions/v1.GroupVersionForDiscovery" } } } }, - "unversioned.APIGroupList": { + "v1.APIGroupList": { "description": "APIGroupList is a list of APIGroup, to allow clients to discover the API at /apis.", "required": [ "groups" @@ -8545,12 +8545,12 @@ "description": "groups is a list of APIGroup.", "type": "array", "items": { - "$ref": "#/definitions/unversioned.APIGroup" + "$ref": "#/definitions/v1.APIGroup" } } } }, - "unversioned.APIResource": { + "v1.APIResource": { "description": "APIResource specifies the name of a resource and whether it is namespaced.", "required": [ "name", @@ -8572,7 +8572,7 @@ } } }, - "unversioned.APIResourceList": { + "v1.APIResourceList": { "description": "APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.", "required": [ "groupVersion", @@ -8587,12 +8587,12 @@ "description": "resources contains the name of the resources and if they are namespaced.", "type": "array", "items": { - "$ref": "#/definitions/unversioned.APIResource" + "$ref": "#/definitions/v1.APIResource" } } } }, - "unversioned.APIVersions": { + "v1.APIVersions": { "description": "APIVersions lists the versions that are available, to allow clients to discover the API at /api, which is the root path of the legacy v1 API.", "required": [ "versions", @@ -8603,7 +8603,7 @@ "description": "a map of client CIDR to server address that is serving this group. This is to help clients reach servers in the most network-efficient way possible. Clients can use the appropriate server address as per the CIDR that they match. In case of multiple matches, clients should use the longest matching CIDR. The server returns only those CIDRs that it thinks that the client can match. For example: the master will return an internal IP CIDR only, if the client reaches the server using an internal IP. Server looks at X-Forwarded-For header or X-Real-Ip header or request.RemoteAddr (in that order) to get the client IP.", "type": "array", "items": { - "$ref": "#/definitions/unversioned.ServerAddressByClientCIDR" + "$ref": "#/definitions/v1.ServerAddressByClientCIDR" } }, "versions": { @@ -8615,179 +8615,6 @@ } } }, - "unversioned.GroupVersionForDiscovery": { - "description": "GroupVersion contains the \"group/version\" and \"version\" string of a version. It is made a struct to keep extensibility.", - "required": [ - "groupVersion", - "version" - ], - "properties": { - "groupVersion": { - "description": "groupVersion specifies the API group and version in the form \"group/version\"", - "type": "string" - }, - "version": { - "description": "version specifies the version in the form of \"version\". This is to save the clients the trouble of splitting the GroupVersion.", - "type": "string" - } - } - }, - "unversioned.LabelSelector": { - "description": "A label selector is a label query over a set of resources. The result of matchLabels and matchExpressions are ANDed. An empty label selector matches all objects. A null label selector matches no objects.", - "properties": { - "matchExpressions": { - "description": "matchExpressions is a list of label selector requirements. The requirements are ANDed.", - "type": "array", - "items": { - "$ref": "#/definitions/unversioned.LabelSelectorRequirement" - } - }, - "matchLabels": { - "description": "matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is \"key\", the operator is \"In\", and the values array contains only \"value\". The requirements are ANDed.", - "type": "object", - "additionalProperties": { - "type": "string" - } - } - } - }, - "unversioned.LabelSelectorRequirement": { - "description": "A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.", - "required": [ - "key", - "operator" - ], - "properties": { - "key": { - "description": "key is the label key that the selector applies to.", - "type": "string" - }, - "operator": { - "description": "operator represents a key's relationship to a set of values. Valid operators ard In, NotIn, Exists and DoesNotExist.", - "type": "string" - }, - "values": { - "description": "values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.", - "type": "array", - "items": { - "type": "string" - } - } - } - }, - "unversioned.ListMeta": { - "description": "ListMeta describes metadata that synthetic resources must have, including lists and various status objects. A resource may have only one of {ObjectMeta, ListMeta}.", - "properties": { - "resourceVersion": { - "description": "String that identifies the server's internal version of this object that can be used by clients to determine when objects have changed. Value must be treated as opaque by clients and passed unmodified back to the server. Populated by the system. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#concurrency-control-and-consistency", - "type": "string" - }, - "selfLink": { - "description": "SelfLink is a URL representing this object. Populated by the system. Read-only.", - "type": "string" - } - } - }, - "unversioned.Patch": { - "description": "Patch is provided to give a concrete name and type to the Kubernetes PATCH request body." - }, - "unversioned.ServerAddressByClientCIDR": { - "description": "ServerAddressByClientCIDR helps the client to determine the server address that they should use, depending on the clientCIDR that they match.", - "required": [ - "clientCIDR", - "serverAddress" - ], - "properties": { - "clientCIDR": { - "description": "The CIDR with which clients can match their IP to figure out the server address that they should use.", - "type": "string" - }, - "serverAddress": { - "description": "Address of this server, suitable for a client that matches the above CIDR. This can be a hostname, hostname:port, IP or IP:port.", - "type": "string" - } - } - }, - "unversioned.Status": { - "description": "Status is a return value for calls that don't return other objects.", - "properties": { - "code": { - "description": "Suggested HTTP return code for this status, 0 if not set.", - "type": "integer", - "format": "int32" - }, - "details": { - "description": "Extended data associated with the reason. Each reason may define its own extended details. This field is optional and the data returned is not guaranteed to conform to any schema except that defined by the reason type.", - "$ref": "#/definitions/unversioned.StatusDetails" - }, - "message": { - "description": "A human-readable description of the status of this operation.", - "type": "string" - }, - "metadata": { - "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds", - "$ref": "#/definitions/unversioned.ListMeta" - }, - "reason": { - "description": "A machine-readable description of why this operation is in the \"Failure\" status. If this value is empty there is no information available. A Reason clarifies an HTTP status code but does not override it.", - "type": "string" - }, - "status": { - "description": "Status of the operation. One of: \"Success\" or \"Failure\". More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status", - "type": "string" - } - } - }, - "unversioned.StatusCause": { - "description": "StatusCause provides more information about an api.Status failure, including cases when multiple errors are encountered.", - "properties": { - "field": { - "description": "The field of the resource that has caused this error, as named by its JSON serialization. May include dot and postfix notation for nested attributes. Arrays are zero-indexed. Fields may appear more than once in an array of causes due to fields having multiple errors. Optional.\n\nExamples:\n \"name\" - the field \"name\" on the current resource\n \"items[0].name\" - the field \"name\" on the first array entry in \"items\"", - "type": "string" - }, - "message": { - "description": "A human-readable description of the cause of the error. This field may be presented as-is to a reader.", - "type": "string" - }, - "reason": { - "description": "A machine-readable description of the cause of the error. If this value is empty there is no information available.", - "type": "string" - } - } - }, - "unversioned.StatusDetails": { - "description": "StatusDetails is a set of additional properties that MAY be set by the server to provide additional information about a response. The Reason field of a Status object defines what attributes will be set. Clients must ignore fields that do not match the defined type of each attribute, and should assume that any attribute may be empty, invalid, or under defined.", - "properties": { - "causes": { - "description": "The Causes array includes more details associated with the StatusReason failure. Not all StatusReasons may provide detailed causes.", - "type": "array", - "items": { - "$ref": "#/definitions/unversioned.StatusCause" - } - }, - "group": { - "description": "The group attribute of the resource associated with the status StatusReason.", - "type": "string" - }, - "kind": { - "description": "The kind attribute of the resource associated with the status StatusReason. On some operations may differ from the requested resource Kind. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds", - "type": "string" - }, - "name": { - "description": "The name attribute of the resource associated with the status StatusReason (when there is a single name which can be described).", - "type": "string" - }, - "retryAfterSeconds": { - "description": "If specified, the time in seconds before the operation should be retried.", - "type": "integer", - "format": "int32" - } - } - }, - "unversioned.Time": { - "type": "string", - "format": "date-time" - }, "v1.Capabilities": { "description": "Adds and removes POSIX capabilities from running containers.", "properties": { @@ -8850,7 +8677,7 @@ }, "metadata": { "description": "More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata", - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -9052,7 +8879,7 @@ }, "firstTimestamp": { "description": "The time at which the event was first recorded. (Time of server receipt is in TypeMeta.)", - "$ref": "#/definitions/unversioned.Time" + "$ref": "#/definitions/v1.Time" }, "involvedObject": { "description": "The object that this event is about.", @@ -9060,7 +8887,7 @@ }, "lastTimestamp": { "description": "The time at which the most recent occurrence of this event was recorded.", - "$ref": "#/definitions/unversioned.Time" + "$ref": "#/definitions/v1.Time" }, "message": { "description": "A human-readable description of the status of this operation.", @@ -9099,7 +8926,7 @@ }, "metadata": { "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds", - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -9128,6 +8955,23 @@ } } }, + "v1.GroupVersionForDiscovery": { + "description": "GroupVersion contains the \"group/version\" and \"version\" string of a version. It is made a struct to keep extensibility.", + "required": [ + "groupVersion", + "version" + ], + "properties": { + "groupVersion": { + "description": "groupVersion specifies the API group and version in the form \"group/version\"", + "type": "string" + }, + "version": { + "description": "version specifies the version in the form of \"version\". This is to save the clients the trouble of splitting the GroupVersion.", + "type": "string" + } + } + }, "v1.HTTPGetAction": { "description": "HTTPGetAction describes an action based on HTTP Get requests.", "required": [ @@ -9193,6 +9037,49 @@ } } }, + "v1.LabelSelector": { + "description": "A label selector is a label query over a set of resources. The result of matchLabels and matchExpressions are ANDed. An empty label selector matches all objects. A null label selector matches no objects.", + "properties": { + "matchExpressions": { + "description": "matchExpressions is a list of label selector requirements. The requirements are ANDed.", + "type": "array", + "items": { + "$ref": "#/definitions/v1.LabelSelectorRequirement" + } + }, + "matchLabels": { + "description": "matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is \"key\", the operator is \"In\", and the values array contains only \"value\". The requirements are ANDed.", + "type": "object", + "additionalProperties": { + "type": "string" + } + } + } + }, + "v1.LabelSelectorRequirement": { + "description": "A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.", + "required": [ + "key", + "operator" + ], + "properties": { + "key": { + "description": "key is the label key that the selector applies to.", + "type": "string" + }, + "operator": { + "description": "operator represents a key's relationship to a set of values. Valid operators ard In, NotIn, Exists and DoesNotExist.", + "type": "string" + }, + "values": { + "description": "values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.", + "type": "array", + "items": { + "type": "string" + } + } + } + }, "v1.Lifecycle": { "description": "Lifecycle describes actions that the management system should take in response to container lifecycle events. For the PostStart and PreStop lifecycle handlers, management of the container blocks until the action is complete, unless the container process fails, in which case the handler is aborted.", "properties": { @@ -9206,6 +9093,19 @@ } } }, + "v1.ListMeta": { + "description": "ListMeta describes metadata that synthetic resources must have, including lists and various status objects. A resource may have only one of {ObjectMeta, ListMeta}.", + "properties": { + "resourceVersion": { + "description": "String that identifies the server's internal version of this object that can be used by clients to determine when objects have changed. Value must be treated as opaque by clients and passed unmodified back to the server. Populated by the system. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#concurrency-control-and-consistency", + "type": "string" + }, + "selfLink": { + "description": "SelfLink is a URL representing this object. Populated by the system. Read-only.", + "type": "string" + } + } + }, "v1.LoadBalancerIngress": { "description": "LoadBalancerIngress represents the status of a load-balancer ingress point: traffic intended for the service should be sent to an ingress point.", "properties": { @@ -9272,7 +9172,7 @@ }, "metadata": { "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds", - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -9329,7 +9229,7 @@ }, "creationTimestamp": { "description": "CreationTimestamp is a timestamp representing the server time when this object was created. It is not guaranteed to be set in happens-before order across separate operations. Clients may not set this value. It is represented in RFC3339 form and is in UTC.\n\nPopulated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata", - "$ref": "#/definitions/unversioned.Time" + "$ref": "#/definitions/v1.Time" }, "deletionGracePeriodSeconds": { "description": "Number of seconds allowed for this object to gracefully terminate before it will be removed from the system. Only set when deletionTimestamp is also set. May only be shortened. Read-only.", @@ -9338,7 +9238,7 @@ }, "deletionTimestamp": { "description": "DeletionTimestamp is RFC 3339 date and time at which this resource will be deleted. This field is set by the server when a graceful deletion is requested by the user, and is not directly settable by a client. The resource is expected to be deleted (no longer visible from resource lists, and not reachable by name) after the time in this field. Once set, this value may not be unset or be set further into the future, although it may be shortened or the resource may be deleted prior to this time. For example, a user may request that a pod is deleted in 30 seconds. The Kubelet will react by sending a graceful termination signal to the containers in the pod. After that 30 seconds, the Kubelet will send a hard termination signal (SIGKILL) to the container and after cleanup, remove the pod from the API. In the presence of network partitions, this object may still exist after this timestamp, until an administrator or automated process can determine the resource is fully terminated. If not set, graceful deletion of the object has not been requested.\n\nPopulated by the system when a graceful deletion is requested. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata", - "$ref": "#/definitions/unversioned.Time" + "$ref": "#/definitions/v1.Time" }, "finalizers": { "description": "Must be empty before the object is deleted from the registry. Each entry is an identifier for the responsible component that will remove the entry from the list. If the deletionTimestamp of the object is non-nil, entries in this list can only be removed.", @@ -9456,6 +9356,9 @@ } } }, + "v1.Patch": { + "description": "Patch is provided to give a concrete name and type to the Kubernetes PATCH request body." + }, "v1.PodSecurityContext": { "description": "PodSecurityContext holds pod-level security attributes and common container settings. Some fields are also present in container.securityContext. Field values of container.securityContext take precedence over field values of PodSecurityContext.", "properties": { @@ -9744,7 +9647,7 @@ }, "metadata": { "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds", - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -9778,6 +9681,23 @@ } } }, + "v1.ServerAddressByClientCIDR": { + "description": "ServerAddressByClientCIDR helps the client to determine the server address that they should use, depending on the clientCIDR that they match.", + "required": [ + "clientCIDR", + "serverAddress" + ], + "properties": { + "clientCIDR": { + "description": "The CIDR with which clients can match their IP to figure out the server address that they should use.", + "type": "string" + }, + "serverAddress": { + "description": "Address of this server, suitable for a client that matches the above CIDR. This can be a hostname, hostname:port, IP or IP:port.", + "type": "string" + } + } + }, "v1.Service": { "description": "Service is a named abstraction of software service (for example, mysql) consisting of local port (for example 3306) that the proxy listens on, and the selector that determines which pods will answer requests sent through the proxy.", "properties": { @@ -9810,7 +9730,7 @@ }, "metadata": { "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds", - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -9916,6 +9836,82 @@ } } }, + "v1.Status": { + "description": "Status is a return value for calls that don't return other objects.", + "properties": { + "code": { + "description": "Suggested HTTP return code for this status, 0 if not set.", + "type": "integer", + "format": "int32" + }, + "details": { + "description": "Extended data associated with the reason. Each reason may define its own extended details. This field is optional and the data returned is not guaranteed to conform to any schema except that defined by the reason type.", + "$ref": "#/definitions/v1.StatusDetails" + }, + "message": { + "description": "A human-readable description of the status of this operation.", + "type": "string" + }, + "metadata": { + "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds", + "$ref": "#/definitions/v1.ListMeta" + }, + "reason": { + "description": "A machine-readable description of why this operation is in the \"Failure\" status. If this value is empty there is no information available. A Reason clarifies an HTTP status code but does not override it.", + "type": "string" + }, + "status": { + "description": "Status of the operation. One of: \"Success\" or \"Failure\". More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status", + "type": "string" + } + } + }, + "v1.StatusCause": { + "description": "StatusCause provides more information about an api.Status failure, including cases when multiple errors are encountered.", + "properties": { + "field": { + "description": "The field of the resource that has caused this error, as named by its JSON serialization. May include dot and postfix notation for nested attributes. Arrays are zero-indexed. Fields may appear more than once in an array of causes due to fields having multiple errors. Optional.\n\nExamples:\n \"name\" - the field \"name\" on the current resource\n \"items[0].name\" - the field \"name\" on the first array entry in \"items\"", + "type": "string" + }, + "message": { + "description": "A human-readable description of the cause of the error. This field may be presented as-is to a reader.", + "type": "string" + }, + "reason": { + "description": "A machine-readable description of the cause of the error. If this value is empty there is no information available.", + "type": "string" + } + } + }, + "v1.StatusDetails": { + "description": "StatusDetails is a set of additional properties that MAY be set by the server to provide additional information about a response. The Reason field of a Status object defines what attributes will be set. Clients must ignore fields that do not match the defined type of each attribute, and should assume that any attribute may be empty, invalid, or under defined.", + "properties": { + "causes": { + "description": "The Causes array includes more details associated with the StatusReason failure. Not all StatusReasons may provide detailed causes.", + "type": "array", + "items": { + "$ref": "#/definitions/v1.StatusCause" + } + }, + "group": { + "description": "The group attribute of the resource associated with the status StatusReason.", + "type": "string" + }, + "kind": { + "description": "The kind attribute of the resource associated with the status StatusReason. On some operations may differ from the requested resource Kind. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds", + "type": "string" + }, + "name": { + "description": "The name attribute of the resource associated with the status StatusReason (when there is a single name which can be described).", + "type": "string" + }, + "retryAfterSeconds": { + "description": "If specified, the time in seconds before the operation should be retried.", + "type": "integer", + "format": "int32" + } + } + }, "v1.TCPSocketAction": { "description": "TCPSocketAction describes an action based on opening a socket", "required": [ @@ -9928,6 +9924,10 @@ } } }, + "v1.Time": { + "type": "string", + "format": "date-time" + }, "v1.Volume": { "description": "Volume represents a named volume in a pod that may be accessed by any container in the pod.", "required": [ @@ -9991,11 +9991,11 @@ "properties": { "lastProbeTime": { "description": "Last time the condition was checked.", - "$ref": "#/definitions/unversioned.Time" + "$ref": "#/definitions/v1.Time" }, "lastTransitionTime": { "description": "Last time the condition transit from one status to another.", - "$ref": "#/definitions/unversioned.Time" + "$ref": "#/definitions/v1.Time" }, "message": { "description": "Human readable message indicating details about last transition.", @@ -10030,7 +10030,7 @@ }, "metadata": { "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds", - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -10108,7 +10108,7 @@ }, "metadata": { "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata", - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -10120,7 +10120,7 @@ "properties": { "selector": { "description": "Selector is a label query over pods that are managed by the daemon set. Must match in order to be controlled. If empty, defaulted to labels on Pod template. More info: http://kubernetes.io/docs/user-guide/labels#label-selectors", - "$ref": "#/definitions/unversioned.LabelSelector" + "$ref": "#/definitions/v1.LabelSelector" }, "template": { "description": "Template is the object that describes the pod that will be created. The DaemonSet will create exactly one copy of this pod on every node that matches the template's node selector (or on every node if no node selector is specified). More info: http://kubernetes.io/docs/user-guide/replication-controller#pod-template", @@ -10185,11 +10185,11 @@ "properties": { "lastTransitionTime": { "description": "Last time the condition transitioned from one status to another.", - "$ref": "#/definitions/unversioned.Time" + "$ref": "#/definitions/v1.Time" }, "lastUpdateTime": { "description": "The last time this condition was updated.", - "$ref": "#/definitions/unversioned.Time" + "$ref": "#/definitions/v1.Time" }, "message": { "description": "A human readable message indicating details about the transition.", @@ -10224,7 +10224,7 @@ }, "metadata": { "description": "Standard list metadata.", - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -10288,7 +10288,7 @@ }, "selector": { "description": "Label selector for pods. Existing ReplicaSets whose pods are selected by this will be the ones affected by this deployment.", - "$ref": "#/definitions/unversioned.LabelSelector" + "$ref": "#/definitions/v1.LabelSelector" }, "strategy": { "description": "The deployment strategy to use to replace existing pods with new ones.", @@ -10399,7 +10399,7 @@ }, "metadata": { "description": "Standard object's metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata", - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -10486,7 +10486,7 @@ "properties": { "lastTransitionTime": { "description": "The last time the condition transitioned from one status to another.", - "$ref": "#/definitions/unversioned.Time" + "$ref": "#/definitions/v1.Time" }, "message": { "description": "A human readable message indicating details about the transition.", @@ -10521,7 +10521,7 @@ }, "metadata": { "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds", - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -10540,7 +10540,7 @@ }, "selector": { "description": "Selector is a label query over pods that should match the replica count. If the selector is empty, it is defaulted to the labels present on the pod template. Label keys and values that must match in order to be controlled by this replica set. More info: http://kubernetes.io/docs/user-guide/labels#label-selectors", - "$ref": "#/definitions/unversioned.LabelSelector" + "$ref": "#/definitions/v1.LabelSelector" }, "template": { "description": "Template is the object that describes the pod that will be created if insufficient replicas are detected. More info: http://kubernetes.io/docs/user-guide/replication-controller#pod-template", diff --git a/federation/apis/swagger-spec/api.json b/federation/apis/swagger-spec/api.json index 6ec7dba9c8e..1147033c40b 100644 --- a/federation/apis/swagger-spec/api.json +++ b/federation/apis/swagger-spec/api.json @@ -13,7 +13,7 @@ "description": "get available API versions", "operations": [ { - "type": "unversioned.APIVersions", + "type": "v1.APIVersions", "method": "GET", "summary": "get available API versions", "nickname": "getAPIVersions", @@ -33,8 +33,8 @@ } ], "models": { - "unversioned.APIVersions": { - "id": "unversioned.APIVersions", + "v1.APIVersions": { + "id": "v1.APIVersions", "description": "APIVersions lists the versions that are available, to allow clients to discover the API at /api, which is the root path of the legacy v1 API.", "required": [ "versions", @@ -59,14 +59,14 @@ "serverAddressByClientCIDRs": { "type": "array", "items": { - "$ref": "unversioned.ServerAddressByClientCIDR" + "$ref": "v1.ServerAddressByClientCIDR" }, "description": "a map of client CIDR to server address that is serving this group. This is to help clients reach servers in the most network-efficient way possible. Clients can use the appropriate server address as per the CIDR that they match. In case of multiple matches, clients should use the longest matching CIDR. The server returns only those CIDRs that it thinks that the client can match. For example: the master will return an internal IP CIDR only, if the client reaches the server using an internal IP. Server looks at X-Forwarded-For header or X-Real-Ip header or request.RemoteAddr (in that order) to get the client IP." } } }, - "unversioned.ServerAddressByClientCIDR": { - "id": "unversioned.ServerAddressByClientCIDR", + "v1.ServerAddressByClientCIDR": { + "id": "v1.ServerAddressByClientCIDR", "description": "ServerAddressByClientCIDR helps the client to determine the server address that they should use, depending on the clientCIDR that they match.", "required": [ "clientCIDR", diff --git a/federation/apis/swagger-spec/apis.json b/federation/apis/swagger-spec/apis.json index dea7ec02cf7..df729ba5160 100644 --- a/federation/apis/swagger-spec/apis.json +++ b/federation/apis/swagger-spec/apis.json @@ -13,7 +13,7 @@ "description": "get available API versions", "operations": [ { - "type": "unversioned.APIGroupList", + "type": "v1.APIGroupList", "method": "GET", "summary": "get available API versions", "nickname": "getAPIVersions", @@ -33,8 +33,8 @@ } ], "models": { - "unversioned.APIGroupList": { - "id": "unversioned.APIGroupList", + "v1.APIGroupList": { + "id": "v1.APIGroupList", "description": "APIGroupList is a list of APIGroup, to allow clients to discover the API at /apis.", "required": [ "groups" @@ -51,14 +51,14 @@ "groups": { "type": "array", "items": { - "$ref": "unversioned.APIGroup" + "$ref": "v1.APIGroup" }, "description": "groups is a list of APIGroup." } } }, - "unversioned.APIGroup": { - "id": "unversioned.APIGroup", + "v1.APIGroup": { + "id": "v1.APIGroup", "description": "APIGroup contains the name, the supported versions, and the preferred version of a group.", "required": [ "name", @@ -81,25 +81,25 @@ "versions": { "type": "array", "items": { - "$ref": "unversioned.GroupVersionForDiscovery" + "$ref": "v1.GroupVersionForDiscovery" }, "description": "versions are the versions supported in this group." }, "preferredVersion": { - "$ref": "unversioned.GroupVersionForDiscovery", + "$ref": "v1.GroupVersionForDiscovery", "description": "preferredVersion is the version preferred by the API server, which probably is the storage version." }, "serverAddressByClientCIDRs": { "type": "array", "items": { - "$ref": "unversioned.ServerAddressByClientCIDR" + "$ref": "v1.ServerAddressByClientCIDR" }, "description": "a map of client CIDR to server address that is serving this group. This is to help clients reach servers in the most network-efficient way possible. Clients can use the appropriate server address as per the CIDR that they match. In case of multiple matches, clients should use the longest matching CIDR. The server returns only those CIDRs that it thinks that the client can match. For example: the master will return an internal IP CIDR only, if the client reaches the server using an internal IP. Server looks at X-Forwarded-For header or X-Real-Ip header or request.RemoteAddr (in that order) to get the client IP." } } }, - "unversioned.GroupVersionForDiscovery": { - "id": "unversioned.GroupVersionForDiscovery", + "v1.GroupVersionForDiscovery": { + "id": "v1.GroupVersionForDiscovery", "description": "GroupVersion contains the \"group/version\" and \"version\" string of a version. It is made a struct to keep extensibility.", "required": [ "groupVersion", @@ -116,8 +116,8 @@ } } }, - "unversioned.ServerAddressByClientCIDR": { - "id": "unversioned.ServerAddressByClientCIDR", + "v1.ServerAddressByClientCIDR": { + "id": "v1.ServerAddressByClientCIDR", "description": "ServerAddressByClientCIDR helps the client to determine the server address that they should use, depending on the clientCIDR that they match.", "required": [ "clientCIDR", diff --git a/federation/apis/swagger-spec/extensions.json b/federation/apis/swagger-spec/extensions.json index 6d2375f1a61..9ee75d6eb7e 100644 --- a/federation/apis/swagger-spec/extensions.json +++ b/federation/apis/swagger-spec/extensions.json @@ -13,7 +13,7 @@ "description": "get information of a group", "operations": [ { - "type": "unversioned.APIGroup", + "type": "v1.APIGroup", "method": "GET", "summary": "get information of a group", "nickname": "getAPIGroup", @@ -33,8 +33,8 @@ } ], "models": { - "unversioned.APIGroup": { - "id": "unversioned.APIGroup", + "v1.APIGroup": { + "id": "v1.APIGroup", "description": "APIGroup contains the name, the supported versions, and the preferred version of a group.", "required": [ "name", @@ -57,25 +57,25 @@ "versions": { "type": "array", "items": { - "$ref": "unversioned.GroupVersionForDiscovery" + "$ref": "v1.GroupVersionForDiscovery" }, "description": "versions are the versions supported in this group." }, "preferredVersion": { - "$ref": "unversioned.GroupVersionForDiscovery", + "$ref": "v1.GroupVersionForDiscovery", "description": "preferredVersion is the version preferred by the API server, which probably is the storage version." }, "serverAddressByClientCIDRs": { "type": "array", "items": { - "$ref": "unversioned.ServerAddressByClientCIDR" + "$ref": "v1.ServerAddressByClientCIDR" }, "description": "a map of client CIDR to server address that is serving this group. This is to help clients reach servers in the most network-efficient way possible. Clients can use the appropriate server address as per the CIDR that they match. In case of multiple matches, clients should use the longest matching CIDR. The server returns only those CIDRs that it thinks that the client can match. For example: the master will return an internal IP CIDR only, if the client reaches the server using an internal IP. Server looks at X-Forwarded-For header or X-Real-Ip header or request.RemoteAddr (in that order) to get the client IP." } } }, - "unversioned.GroupVersionForDiscovery": { - "id": "unversioned.GroupVersionForDiscovery", + "v1.GroupVersionForDiscovery": { + "id": "v1.GroupVersionForDiscovery", "description": "GroupVersion contains the \"group/version\" and \"version\" string of a version. It is made a struct to keep extensibility.", "required": [ "groupVersion", @@ -92,8 +92,8 @@ } } }, - "unversioned.ServerAddressByClientCIDR": { - "id": "unversioned.ServerAddressByClientCIDR", + "v1.ServerAddressByClientCIDR": { + "id": "v1.ServerAddressByClientCIDR", "description": "ServerAddressByClientCIDR helps the client to determine the server address that they should use, depending on the clientCIDR that they match.", "required": [ "clientCIDR", diff --git a/federation/apis/swagger-spec/extensions_v1beta1.json b/federation/apis/swagger-spec/extensions_v1beta1.json index ed2569f5c21..c4234ca145d 100644 --- a/federation/apis/swagger-spec/extensions_v1beta1.json +++ b/federation/apis/swagger-spec/extensions_v1beta1.json @@ -141,7 +141,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete collection of DaemonSet", "nickname": "deletecollectionNamespacedDaemonSet", @@ -207,7 +207,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -445,7 +445,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -488,7 +488,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete a DaemonSet", "nickname": "deleteNamespacedDaemonSet", @@ -546,7 +546,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -934,7 +934,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -1111,7 +1111,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete collection of Deployment", "nickname": "deletecollectionNamespacedDeployment", @@ -1177,7 +1177,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -1415,7 +1415,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -1458,7 +1458,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete a Deployment", "nickname": "deleteNamespacedDeployment", @@ -1516,7 +1516,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -1965,7 +1965,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -2130,7 +2130,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -2307,7 +2307,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete collection of Ingress", "nickname": "deletecollectionNamespacedIngress", @@ -2373,7 +2373,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -2611,7 +2611,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -2654,7 +2654,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete an Ingress", "nickname": "deleteNamespacedIngress", @@ -2712,7 +2712,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -3100,7 +3100,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -3277,7 +3277,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete collection of ReplicaSet", "nickname": "deletecollectionNamespacedReplicaSet", @@ -3343,7 +3343,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -3581,7 +3581,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -3624,7 +3624,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete a ReplicaSet", "nickname": "deleteNamespacedReplicaSet", @@ -3682,7 +3682,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -4070,7 +4070,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -4235,7 +4235,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -4284,7 +4284,7 @@ "description": "API at /apis/extensions/v1beta1", "operations": [ { - "type": "unversioned.APIResourceList", + "type": "v1.APIResourceList", "method": "GET", "summary": "get available resources", "nickname": "getAPIResources", @@ -4320,7 +4320,7 @@ "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata" }, "items": { @@ -4332,8 +4332,8 @@ } } }, - "unversioned.ListMeta": { - "id": "unversioned.ListMeta", + "v1.ListMeta": { + "id": "v1.ListMeta", "description": "ListMeta describes metadata that synthetic resources must have, including lists and various status objects. A resource may have only one of {ObjectMeta, ListMeta}.", "properties": { "selfLink": { @@ -4407,12 +4407,10 @@ }, "creationTimestamp": { "type": "string", - "format": "date-time", "description": "CreationTimestamp is a timestamp representing the server time when this object was created. It is not guaranteed to be set in happens-before order across separate operations. Clients may not set this value. It is represented in RFC3339 form and is in UTC.\n\nPopulated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata" }, "deletionTimestamp": { "type": "string", - "format": "date-time", "description": "DeletionTimestamp is RFC 3339 date and time at which this resource will be deleted. This field is set by the server when a graceful deletion is requested by the user, and is not directly settable by a client. The resource is expected to be deleted (no longer visible from resource lists, and not reachable by name) after the time in this field. Once set, this value may not be unset or be set further into the future, although it may be shortened or the resource may be deleted prior to this time. For example, a user may request that a pod is deleted in 30 seconds. The Kubelet will react by sending a graceful termination signal to the containers in the pod. After that 30 seconds, the Kubelet will send a hard termination signal (SIGKILL) to the container and after cleanup, remove the pod from the API. In the presence of network partitions, this object may still exist after this timestamp, until an administrator or automated process can determine the resource is fully terminated. If not set, graceful deletion of the object has not been requested.\n\nPopulated by the system when a graceful deletion is requested. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata" }, "deletionGracePeriodSeconds": { @@ -4488,7 +4486,7 @@ ], "properties": { "selector": { - "$ref": "unversioned.LabelSelector", + "$ref": "v1.LabelSelector", "description": "Selector is a label query over pods that are managed by the daemon set. Must match in order to be controlled. If empty, defaulted to labels on Pod template. More info: http://kubernetes.io/docs/user-guide/labels#label-selectors" }, "template": { @@ -4497,8 +4495,8 @@ } } }, - "unversioned.LabelSelector": { - "id": "unversioned.LabelSelector", + "v1.LabelSelector": { + "id": "v1.LabelSelector", "description": "A label selector is a label query over a set of resources. The result of matchLabels and matchExpressions are ANDed. An empty label selector matches all objects. A null label selector matches no objects.", "properties": { "matchLabels": { @@ -4508,14 +4506,14 @@ "matchExpressions": { "type": "array", "items": { - "$ref": "unversioned.LabelSelectorRequirement" + "$ref": "v1.LabelSelectorRequirement" }, "description": "matchExpressions is a list of label selector requirements. The requirements are ANDed." } } }, - "unversioned.LabelSelectorRequirement": { - "id": "unversioned.LabelSelectorRequirement", + "v1.LabelSelectorRequirement": { + "id": "v1.LabelSelectorRequirement", "description": "A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.", "required": [ "key", @@ -5928,8 +5926,8 @@ } } }, - "unversioned.Status": { - "id": "unversioned.Status", + "v1.Status": { + "id": "v1.Status", "description": "Status is a return value for calls that don't return other objects.", "properties": { "kind": { @@ -5941,7 +5939,7 @@ "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds" }, "status": { @@ -5957,7 +5955,7 @@ "description": "A machine-readable description of why this operation is in the \"Failure\" status. If this value is empty there is no information available. A Reason clarifies an HTTP status code but does not override it." }, "details": { - "$ref": "unversioned.StatusDetails", + "$ref": "v1.StatusDetails", "description": "Extended data associated with the reason. Each reason may define its own extended details. This field is optional and the data returned is not guaranteed to conform to any schema except that defined by the reason type." }, "code": { @@ -5967,8 +5965,8 @@ } } }, - "unversioned.StatusDetails": { - "id": "unversioned.StatusDetails", + "v1.StatusDetails": { + "id": "v1.StatusDetails", "description": "StatusDetails is a set of additional properties that MAY be set by the server to provide additional information about a response. The Reason field of a Status object defines what attributes will be set. Clients must ignore fields that do not match the defined type of each attribute, and should assume that any attribute may be empty, invalid, or under defined.", "properties": { "name": { @@ -5986,7 +5984,7 @@ "causes": { "type": "array", "items": { - "$ref": "unversioned.StatusCause" + "$ref": "v1.StatusCause" }, "description": "The Causes array includes more details associated with the StatusReason failure. Not all StatusReasons may provide detailed causes." }, @@ -5997,8 +5995,8 @@ } } }, - "unversioned.StatusCause": { - "id": "unversioned.StatusCause", + "v1.StatusCause": { + "id": "v1.StatusCause", "description": "StatusCause provides more information about an api.Status failure, including cases when multiple errors are encountered.", "properties": { "reason": { @@ -6030,8 +6028,8 @@ } } }, - "unversioned.Patch": { - "id": "unversioned.Patch", + "v1.Patch": { + "id": "v1.Patch", "description": "Patch is provided to give a concrete name and type to the Kubernetes PATCH request body.", "properties": {} }, @@ -6092,7 +6090,7 @@ "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard list metadata." }, "items": { @@ -6143,7 +6141,7 @@ "description": "Number of desired pods. This is a pointer to distinguish between explicit zero and not specified. Defaults to 1." }, "selector": { - "$ref": "unversioned.LabelSelector", + "$ref": "v1.LabelSelector", "description": "Label selector for pods. Existing ReplicaSets whose pods are selected by this will be the ones affected by this deployment." }, "template": { @@ -6199,7 +6197,7 @@ "properties": { "maxUnavailable": { "type": "string", - "description": "The maximum number of pods that can be unavailable during the update. Value can be an absolute number (ex: 5) or a percentage of desired pods (ex: 10%). Absolute number is calculated from percentage by rounding up. This can not be 0 if MaxSurge is 0. By default, a fixed value of 1 is used. Example: when this is set to 30%, the old RC can be scaled down to 70% of desired pods immediately when the rolling update starts. Once new pods are ready, old RC can be scaled down further, followed by scaling up the new RC, ensuring that the total number of pods available at all times during the update is at least 70% of desired pods." + "description": "The maximum number of pods that can be unavailable during the update. Value can be an absolute number (ex: 5) or a percentage of desired pods (ex: 10%). Absolute number is calculated from percentage by rounding down. This can not be 0 if MaxSurge is 0. By default, a fixed value of 1 is used. Example: when this is set to 30%, the old RC can be scaled down to 70% of desired pods immediately when the rolling update starts. Once new pods are ready, old RC can be scaled down further, followed by scaling up the new RC, ensuring that the total number of pods available at all times during the update is at least 70% of desired pods." }, "maxSurge": { "type": "string", @@ -6273,12 +6271,10 @@ }, "lastUpdateTime": { "type": "string", - "format": "date-time", "description": "The last time this condition was updated." }, "lastTransitionTime": { "type": "string", - "format": "date-time", "description": "Last time the condition transitioned from one status to another." }, "reason": { @@ -6396,7 +6392,7 @@ "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard object's metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata" }, "items": { @@ -6592,7 +6588,7 @@ "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds" }, "items": { @@ -6645,7 +6641,7 @@ "description": "Minimum number of seconds for which a newly created pod should be ready without any of its container crashing, for it to be considered available. Defaults to 0 (pod will be considered available as soon as it is ready)" }, "selector": { - "$ref": "unversioned.LabelSelector", + "$ref": "v1.LabelSelector", "description": "Selector is a label query over pods that should match the replica count. If the selector is empty, it is defaulted to the labels present on the pod template. Label keys and values that must match in order to be controlled by this replica set. More info: http://kubernetes.io/docs/user-guide/labels#label-selectors" }, "template": { @@ -6713,7 +6709,6 @@ }, "lastTransitionTime": { "type": "string", - "format": "date-time", "description": "The last time the condition transitioned from one status to another." }, "reason": { @@ -6726,8 +6721,8 @@ } } }, - "unversioned.APIResourceList": { - "id": "unversioned.APIResourceList", + "v1.APIResourceList": { + "id": "v1.APIResourceList", "description": "APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.", "required": [ "groupVersion", @@ -6749,14 +6744,14 @@ "resources": { "type": "array", "items": { - "$ref": "unversioned.APIResource" + "$ref": "v1.APIResource" }, "description": "resources contains the name of the resources and if they are namespaced." } } }, - "unversioned.APIResource": { - "id": "unversioned.APIResource", + "v1.APIResource": { + "id": "v1.APIResource", "description": "APIResource specifies the name of a resource and whether it is namespaced.", "required": [ "name", diff --git a/federation/apis/swagger-spec/federation.json b/federation/apis/swagger-spec/federation.json index 2c133632ffd..0480d406c21 100644 --- a/federation/apis/swagger-spec/federation.json +++ b/federation/apis/swagger-spec/federation.json @@ -13,7 +13,7 @@ "description": "get information of a group", "operations": [ { - "type": "unversioned.APIGroup", + "type": "v1.APIGroup", "method": "GET", "summary": "get information of a group", "nickname": "getAPIGroup", @@ -33,8 +33,8 @@ } ], "models": { - "unversioned.APIGroup": { - "id": "unversioned.APIGroup", + "v1.APIGroup": { + "id": "v1.APIGroup", "description": "APIGroup contains the name, the supported versions, and the preferred version of a group.", "required": [ "name", @@ -57,25 +57,25 @@ "versions": { "type": "array", "items": { - "$ref": "unversioned.GroupVersionForDiscovery" + "$ref": "v1.GroupVersionForDiscovery" }, "description": "versions are the versions supported in this group." }, "preferredVersion": { - "$ref": "unversioned.GroupVersionForDiscovery", + "$ref": "v1.GroupVersionForDiscovery", "description": "preferredVersion is the version preferred by the API server, which probably is the storage version." }, "serverAddressByClientCIDRs": { "type": "array", "items": { - "$ref": "unversioned.ServerAddressByClientCIDR" + "$ref": "v1.ServerAddressByClientCIDR" }, "description": "a map of client CIDR to server address that is serving this group. This is to help clients reach servers in the most network-efficient way possible. Clients can use the appropriate server address as per the CIDR that they match. In case of multiple matches, clients should use the longest matching CIDR. The server returns only those CIDRs that it thinks that the client can match. For example: the master will return an internal IP CIDR only, if the client reaches the server using an internal IP. Server looks at X-Forwarded-For header or X-Real-Ip header or request.RemoteAddr (in that order) to get the client IP." } } }, - "unversioned.GroupVersionForDiscovery": { - "id": "unversioned.GroupVersionForDiscovery", + "v1.GroupVersionForDiscovery": { + "id": "v1.GroupVersionForDiscovery", "description": "GroupVersion contains the \"group/version\" and \"version\" string of a version. It is made a struct to keep extensibility.", "required": [ "groupVersion", @@ -92,8 +92,8 @@ } } }, - "unversioned.ServerAddressByClientCIDR": { - "id": "unversioned.ServerAddressByClientCIDR", + "v1.ServerAddressByClientCIDR": { + "id": "v1.ServerAddressByClientCIDR", "description": "ServerAddressByClientCIDR helps the client to determine the server address that they should use, depending on the clientCIDR that they match.", "required": [ "clientCIDR", diff --git a/federation/apis/swagger-spec/federation_v1beta1.json b/federation/apis/swagger-spec/federation_v1beta1.json index 931eb19eb44..a568dddfdef 100644 --- a/federation/apis/swagger-spec/federation_v1beta1.json +++ b/federation/apis/swagger-spec/federation_v1beta1.json @@ -125,7 +125,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete collection of Cluster", "nickname": "deletecollectionCluster", @@ -183,7 +183,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -397,7 +397,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -432,7 +432,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete a Cluster", "nickname": "deleteCluster", @@ -482,7 +482,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -641,7 +641,7 @@ "description": "API at /apis/federation/v1beta1", "operations": [ { - "type": "unversioned.APIResourceList", + "type": "v1.APIResourceList", "method": "GET", "summary": "get available resources", "nickname": "getAPIResources", @@ -677,7 +677,7 @@ "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds" }, "items": { @@ -689,8 +689,8 @@ } } }, - "unversioned.ListMeta": { - "id": "unversioned.ListMeta", + "v1.ListMeta": { + "id": "v1.ListMeta", "description": "ListMeta describes metadata that synthetic resources must have, including lists and various status objects. A resource may have only one of {ObjectMeta, ListMeta}.", "properties": { "selfLink": { @@ -764,12 +764,10 @@ }, "creationTimestamp": { "type": "string", - "format": "date-time", "description": "CreationTimestamp is a timestamp representing the server time when this object was created. It is not guaranteed to be set in happens-before order across separate operations. Clients may not set this value. It is represented in RFC3339 form and is in UTC.\n\nPopulated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata" }, "deletionTimestamp": { "type": "string", - "format": "date-time", "description": "DeletionTimestamp is RFC 3339 date and time at which this resource will be deleted. This field is set by the server when a graceful deletion is requested by the user, and is not directly settable by a client. The resource is expected to be deleted (no longer visible from resource lists, and not reachable by name) after the time in this field. Once set, this value may not be unset or be set further into the future, although it may be shortened or the resource may be deleted prior to this time. For example, a user may request that a pod is deleted in 30 seconds. The Kubelet will react by sending a graceful termination signal to the containers in the pod. After that 30 seconds, the Kubelet will send a hard termination signal (SIGKILL) to the container and after cleanup, remove the pod from the API. In the presence of network partitions, this object may still exist after this timestamp, until an administrator or automated process can determine the resource is fully terminated. If not set, graceful deletion of the object has not been requested.\n\nPopulated by the system when a graceful deletion is requested. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata" }, "deletionGracePeriodSeconds": { @@ -927,12 +925,10 @@ }, "lastProbeTime": { "type": "string", - "format": "date-time", "description": "Last time the condition was checked." }, "lastTransitionTime": { "type": "string", - "format": "date-time", "description": "Last time the condition transit from one status to another." }, "reason": { @@ -945,8 +941,8 @@ } } }, - "unversioned.Status": { - "id": "unversioned.Status", + "v1.Status": { + "id": "v1.Status", "description": "Status is a return value for calls that don't return other objects.", "properties": { "kind": { @@ -958,7 +954,7 @@ "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds" }, "status": { @@ -974,7 +970,7 @@ "description": "A machine-readable description of why this operation is in the \"Failure\" status. If this value is empty there is no information available. A Reason clarifies an HTTP status code but does not override it." }, "details": { - "$ref": "unversioned.StatusDetails", + "$ref": "v1.StatusDetails", "description": "Extended data associated with the reason. Each reason may define its own extended details. This field is optional and the data returned is not guaranteed to conform to any schema except that defined by the reason type." }, "code": { @@ -984,8 +980,8 @@ } } }, - "unversioned.StatusDetails": { - "id": "unversioned.StatusDetails", + "v1.StatusDetails": { + "id": "v1.StatusDetails", "description": "StatusDetails is a set of additional properties that MAY be set by the server to provide additional information about a response. The Reason field of a Status object defines what attributes will be set. Clients must ignore fields that do not match the defined type of each attribute, and should assume that any attribute may be empty, invalid, or under defined.", "properties": { "name": { @@ -1003,7 +999,7 @@ "causes": { "type": "array", "items": { - "$ref": "unversioned.StatusCause" + "$ref": "v1.StatusCause" }, "description": "The Causes array includes more details associated with the StatusReason failure. Not all StatusReasons may provide detailed causes." }, @@ -1014,8 +1010,8 @@ } } }, - "unversioned.StatusCause": { - "id": "unversioned.StatusCause", + "v1.StatusCause": { + "id": "v1.StatusCause", "description": "StatusCause provides more information about an api.Status failure, including cases when multiple errors are encountered.", "properties": { "reason": { @@ -1047,8 +1043,8 @@ } } }, - "unversioned.Patch": { - "id": "unversioned.Patch", + "v1.Patch": { + "id": "v1.Patch", "description": "Patch is provided to give a concrete name and type to the Kubernetes PATCH request body.", "properties": {} }, @@ -1093,8 +1089,8 @@ "id": "types.UID", "properties": {} }, - "unversioned.APIResourceList": { - "id": "unversioned.APIResourceList", + "v1.APIResourceList": { + "id": "v1.APIResourceList", "description": "APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.", "required": [ "groupVersion", @@ -1116,14 +1112,14 @@ "resources": { "type": "array", "items": { - "$ref": "unversioned.APIResource" + "$ref": "v1.APIResource" }, "description": "resources contains the name of the resources and if they are namespaced." } } }, - "unversioned.APIResource": { - "id": "unversioned.APIResource", + "v1.APIResource": { + "id": "v1.APIResource", "description": "APIResource specifies the name of a resource and whether it is namespaced.", "required": [ "name", diff --git a/federation/apis/swagger-spec/v1.json b/federation/apis/swagger-spec/v1.json index f5448fdf2a6..5c1e09fd4da 100644 --- a/federation/apis/swagger-spec/v1.json +++ b/federation/apis/swagger-spec/v1.json @@ -141,7 +141,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete collection of ConfigMap", "nickname": "deletecollectionNamespacedConfigMap", @@ -207,7 +207,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -445,7 +445,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -488,7 +488,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete a ConfigMap", "nickname": "deleteNamespacedConfigMap", @@ -546,7 +546,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -946,7 +946,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete collection of Event", "nickname": "deletecollectionNamespacedEvent", @@ -1012,7 +1012,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -1250,7 +1250,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -1293,7 +1293,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete an Event", "nickname": "deleteNamespacedEvent", @@ -1351,7 +1351,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -1735,7 +1735,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete collection of Namespace", "nickname": "deletecollectionNamespace", @@ -1793,7 +1793,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -2007,7 +2007,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -2042,7 +2042,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete a Namespace", "nickname": "deleteNamespace", @@ -2092,7 +2092,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -2351,7 +2351,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -2520,7 +2520,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete collection of Secret", "nickname": "deletecollectionNamespacedSecret", @@ -2586,7 +2586,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -2824,7 +2824,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -2867,7 +2867,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete a Secret", "nickname": "deleteNamespacedSecret", @@ -2925,7 +2925,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -3325,7 +3325,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete collection of Service", "nickname": "deletecollectionNamespacedService", @@ -3391,7 +3391,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -3629,7 +3629,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -3672,7 +3672,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete a Service", "nickname": "deleteNamespacedService", @@ -3730,7 +3730,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -4118,7 +4118,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -4167,7 +4167,7 @@ "description": "API at /api/v1", "operations": [ { - "type": "unversioned.APIResourceList", + "type": "v1.APIResourceList", "method": "GET", "summary": "get available resources", "nickname": "getAPIResources", @@ -4203,7 +4203,7 @@ "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata" }, "items": { @@ -4215,8 +4215,8 @@ } } }, - "unversioned.ListMeta": { - "id": "unversioned.ListMeta", + "v1.ListMeta": { + "id": "v1.ListMeta", "description": "ListMeta describes metadata that synthetic resources must have, including lists and various status objects. A resource may have only one of {ObjectMeta, ListMeta}.", "properties": { "selfLink": { @@ -4286,12 +4286,10 @@ }, "creationTimestamp": { "type": "string", - "format": "date-time", "description": "CreationTimestamp is a timestamp representing the server time when this object was created. It is not guaranteed to be set in happens-before order across separate operations. Clients may not set this value. It is represented in RFC3339 form and is in UTC.\n\nPopulated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata" }, "deletionTimestamp": { "type": "string", - "format": "date-time", "description": "DeletionTimestamp is RFC 3339 date and time at which this resource will be deleted. This field is set by the server when a graceful deletion is requested by the user, and is not directly settable by a client. The resource is expected to be deleted (no longer visible from resource lists, and not reachable by name) after the time in this field. Once set, this value may not be unset or be set further into the future, although it may be shortened or the resource may be deleted prior to this time. For example, a user may request that a pod is deleted in 30 seconds. The Kubelet will react by sending a graceful termination signal to the containers in the pod. After that 30 seconds, the Kubelet will send a hard termination signal (SIGKILL) to the container and after cleanup, remove the pod from the API. In the presence of network partitions, this object may still exist after this timestamp, until an administrator or automated process can determine the resource is fully terminated. If not set, graceful deletion of the object has not been requested.\n\nPopulated by the system when a graceful deletion is requested. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata" }, "deletionGracePeriodSeconds": { @@ -4359,8 +4357,8 @@ } } }, - "unversioned.Status": { - "id": "unversioned.Status", + "v1.Status": { + "id": "v1.Status", "description": "Status is a return value for calls that don't return other objects.", "properties": { "kind": { @@ -4372,7 +4370,7 @@ "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds" }, "status": { @@ -4388,7 +4386,7 @@ "description": "A machine-readable description of why this operation is in the \"Failure\" status. If this value is empty there is no information available. A Reason clarifies an HTTP status code but does not override it." }, "details": { - "$ref": "unversioned.StatusDetails", + "$ref": "v1.StatusDetails", "description": "Extended data associated with the reason. Each reason may define its own extended details. This field is optional and the data returned is not guaranteed to conform to any schema except that defined by the reason type." }, "code": { @@ -4398,8 +4396,8 @@ } } }, - "unversioned.StatusDetails": { - "id": "unversioned.StatusDetails", + "v1.StatusDetails": { + "id": "v1.StatusDetails", "description": "StatusDetails is a set of additional properties that MAY be set by the server to provide additional information about a response. The Reason field of a Status object defines what attributes will be set. Clients must ignore fields that do not match the defined type of each attribute, and should assume that any attribute may be empty, invalid, or under defined.", "properties": { "name": { @@ -4417,7 +4415,7 @@ "causes": { "type": "array", "items": { - "$ref": "unversioned.StatusCause" + "$ref": "v1.StatusCause" }, "description": "The Causes array includes more details associated with the StatusReason failure. Not all StatusReasons may provide detailed causes." }, @@ -4428,8 +4426,8 @@ } } }, - "unversioned.StatusCause": { - "id": "unversioned.StatusCause", + "v1.StatusCause": { + "id": "v1.StatusCause", "description": "StatusCause provides more information about an api.Status failure, including cases when multiple errors are encountered.", "properties": { "reason": { @@ -4461,8 +4459,8 @@ } } }, - "unversioned.Patch": { - "id": "unversioned.Patch", + "v1.Patch": { + "id": "v1.Patch", "description": "Patch is provided to give a concrete name and type to the Kubernetes PATCH request body.", "properties": {} }, @@ -4523,7 +4521,7 @@ "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds" }, "items": { @@ -4573,12 +4571,10 @@ }, "firstTimestamp": { "type": "string", - "format": "date-time", "description": "The time at which the event was first recorded. (Time of server receipt is in TypeMeta.)" }, "lastTimestamp": { "type": "string", - "format": "date-time", "description": "The time at which the most recent occurrence of this event was recorded." }, "count": { @@ -4656,7 +4652,7 @@ "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds" }, "items": { @@ -4737,7 +4733,7 @@ "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds" }, "items": { @@ -4795,7 +4791,7 @@ "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds" }, "items": { @@ -4962,8 +4958,8 @@ } } }, - "unversioned.APIResourceList": { - "id": "unversioned.APIResourceList", + "v1.APIResourceList": { + "id": "v1.APIResourceList", "description": "APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.", "required": [ "groupVersion", @@ -4985,14 +4981,14 @@ "resources": { "type": "array", "items": { - "$ref": "unversioned.APIResource" + "$ref": "v1.APIResource" }, "description": "resources contains the name of the resources and if they are namespaced." } } }, - "unversioned.APIResource": { - "id": "unversioned.APIResource", + "v1.APIResource": { + "id": "v1.APIResource", "description": "APIResource specifies the name of a resource and whether it is namespaced.", "required": [ "name", diff --git a/federation/cmd/federation-controller-manager/app/options/options.go b/federation/cmd/federation-controller-manager/app/options/options.go index 96cf227b105..77612bf9390 100644 --- a/federation/cmd/federation-controller-manager/app/options/options.go +++ b/federation/cmd/federation-controller-manager/app/options/options.go @@ -25,8 +25,8 @@ import ( "github.com/spf13/pflag" "k8s.io/kubernetes/federation/pkg/dnsprovider" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/componentconfig" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/leaderelection" ) diff --git a/federation/docs/api-reference/extensions/v1beta1/definitions.html b/federation/docs/api-reference/extensions/v1beta1/definitions.html index ed8cf8c8dca..5347365f3e4 100755 --- a/federation/docs/api-reference/extensions/v1beta1/definitions.html +++ b/federation/docs/api-reference/extensions/v1beta1/definitions.html @@ -474,6 +474,61 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } +
+
+

v1.APIResourceList

+
+

APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

kind

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

apiVersion

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources

false

string

groupVersion

groupVersion is the group and version this APIResourceList is for.

true

string

resources

resources contains the name of the resources and if they are namespaced.

true

v1.APIResource array

+

v1beta1.DaemonSetStatus

@@ -762,6 +817,47 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } +
+
+

v1.LabelSelector

+
+

A label selector is a label query over a set of resources. The result of matchLabels and matchExpressions are ANDed. An empty label selector matches all objects. A null label selector matches no objects.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

matchLabels

matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.

false

object

matchExpressions

matchExpressions is a list of label selector requirements. The requirements are ANDed.

false

v1.LabelSelectorRequirement array

+

v1beta1.IngressBackend

@@ -914,7 +1010,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

-

unversioned.ListMeta

+

v1.ListMeta

@@ -1002,58 +1098,6 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } -
-
-

unversioned.StatusCause

-
-

StatusCause provides more information about an api.Status failure, including cases when multiple errors are encountered.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

reason

A machine-readable description of the cause of the error. If this value is empty there is no information available.

false

string

message

A human-readable description of the cause of the error. This field may be presented as-is to a reader.

false

string

field

The field of the resource that has caused this error, as named by its JSON serialization. May include dot and postfix notation for nested attributes. Arrays are zero-indexed. Fields may appear more than once in an array of causes due to fields having multiple errors. Optional.
-
-Examples:
- "name" - the field "name" on the current resource
- "items[0].name" - the field "name" on the first array entry in "items"

false

string

-

v1beta1.ReplicaSetCondition

@@ -1096,7 +1140,7 @@ Examples:

lastTransitionTime

The last time the condition transitioned from one status to another.

false

-

string (date-time)

+

string

@@ -1200,7 +1244,7 @@ Examples:

maxUnavailable

-

The maximum number of pods that can be unavailable during the update. Value can be an absolute number (ex: 5) or a percentage of desired pods (ex: 10%). Absolute number is calculated from percentage by rounding up. This can not be 0 if MaxSurge is 0. By default, a fixed value of 1 is used. Example: when this is set to 30%, the old RC can be scaled down to 70% of desired pods immediately when the rolling update starts. Once new pods are ready, old RC can be scaled down further, followed by scaling up the new RC, ensuring that the total number of pods available at all times during the update is at least 70% of desired pods.

+

The maximum number of pods that can be unavailable during the update. Value can be an absolute number (ex: 5) or a percentage of desired pods (ex: 10%). Absolute number is calculated from percentage by rounding down. This can not be 0 if MaxSurge is 0. By default, a fixed value of 1 is used. Example: when this is set to 30%, the old RC can be scaled down to 70% of desired pods immediately when the rolling update starts. Once new pods are ready, old RC can be scaled down further, followed by scaling up the new RC, ensuring that the total number of pods available at all times during the update is at least 70% of desired pods.

false

string

@@ -1546,7 +1590,7 @@ Populated by the system. Read-only. Value must be treated as opaque by clients a
Populated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata

false

-

string (date-time)

+

string

@@ -1555,7 +1599,7 @@ Populated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata

false

-

string (date-time)

+

string

@@ -1645,7 +1689,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i

selector

Selector is a label query over pods that should match the replica count. If the selector is empty, it is defaulted to the labels present on the pod template. Label keys and values that must match in order to be controlled by this replica set. More info: http://kubernetes.io/docs/user-guide/labels#label-selectors

false

-

unversioned.LabelSelector

+

v1.LabelSelector

@@ -1686,7 +1730,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i

selector

Selector is a label query over pods that are managed by the daemon set. Must match in order to be controlled. If empty, defaulted to labels on Pod template. More info: http://kubernetes.io/docs/user-guide/labels#label-selectors

false

-

unversioned.LabelSelector

+

v1.LabelSelector

@@ -1958,7 +2002,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i

metadata

Standard object’s metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata

false

-

unversioned.ListMeta

+

v1.ListMeta

@@ -2005,12 +2049,6 @@ Populated by the system when a graceful deletion is requested. Read-only. More i -
-
-

unversioned.Patch

-
-

Patch is provided to give a concrete name and type to the Kubernetes PATCH request body.

-

v1.FlockerVolumeSource

@@ -2052,6 +2090,47 @@ Populated by the system when a graceful deletion is requested. Read-only. More i +
+
+

v1.ListMeta

+
+

ListMeta describes metadata that synthetic resources must have, including lists and various status objects. A resource may have only one of {ObjectMeta, ListMeta}.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

selfLink

SelfLink is a URL representing this object. Populated by the system. Read-only.

false

string

resourceVersion

String that identifies the server’s internal version of this object that can be used by clients to determine when objects have changed. Value must be treated as opaque by clients and passed unmodified back to the server. Populated by the system. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#concurrency-control-and-consistency

false

string

+

v1.PersistentVolumeClaimVolumeSource

@@ -2093,88 +2172,6 @@ Populated by the system when a graceful deletion is requested. Read-only. More i -
-
-

unversioned.ListMeta

-
-

ListMeta describes metadata that synthetic resources must have, including lists and various status objects. A resource may have only one of {ObjectMeta, ListMeta}.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

selfLink

SelfLink is a URL representing this object. Populated by the system. Read-only.

false

string

resourceVersion

String that identifies the server’s internal version of this object that can be used by clients to determine when objects have changed. Value must be treated as opaque by clients and passed unmodified back to the server. Populated by the system. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#concurrency-control-and-consistency

false

string

- -
-
-

unversioned.LabelSelector

-
-

A label selector is a label query over a set of resources. The result of matchLabels and matchExpressions are ANDed. An empty label selector matches all objects. A null label selector matches no objects.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

matchLabels

matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.

false

object

matchExpressions

matchExpressions is a list of label selector requirements. The requirements are ANDed.

false

unversioned.LabelSelectorRequirement array

-

v1beta1.RollbackConfig

@@ -2865,7 +2862,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata

false

-

unversioned.ListMeta

+

v1.ListMeta

@@ -3044,7 +3041,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i

selector

Label selector for pods. Existing ReplicaSets whose pods are selected by this will be the ones affected by this deployment.

false

-

unversioned.LabelSelector

+

v1.LabelSelector

@@ -3099,61 +3096,6 @@ Populated by the system when a graceful deletion is requested. Read-only. More i -
-
-

unversioned.APIResourceList

-
-

APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

kind

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

apiVersion

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources

false

string

groupVersion

groupVersion is the group and version this APIResourceList is for.

true

string

resources

resources contains the name of the resources and if they are namespaced.

true

unversioned.APIResource array

-

v1.SecretKeySelector

@@ -3199,54 +3141,6 @@ Populated by the system when a graceful deletion is requested. Read-only. More i

v1.Capability

-
-
-

unversioned.APIResource

-
-

APIResource specifies the name of a resource and whether it is namespaced.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

name

name is the name of the resource.

true

string

namespaced

namespaced indicates if a resource is namespaced or not.

true

boolean

false

kind

kind is the kind for the resource (e.g. Foo is the kind for a resource foo)

true

string

-

v1.DownwardAPIVolumeFile

@@ -3688,6 +3582,58 @@ Populated by the system when a graceful deletion is requested. Read-only. More i +
+
+

v1.StatusCause

+
+

StatusCause provides more information about an api.Status failure, including cases when multiple errors are encountered.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

reason

A machine-readable description of the cause of the error. If this value is empty there is no information available.

false

string

message

A human-readable description of the cause of the error. This field may be presented as-is to a reader.

false

string

field

The field of the resource that has caused this error, as named by its JSON serialization. May include dot and postfix notation for nested attributes. Arrays are zero-indexed. Fields may appear more than once in an array of causes due to fields having multiple errors. Optional.
+
+Examples:
+ "name" - the field "name" on the current resource
+ "items[0].name" - the field "name" on the first array entry in "items"

false

string

+

v1beta1.Scale

@@ -3912,6 +3858,89 @@ Populated by the system when a graceful deletion is requested. Read-only. More i +
+
+

v1.Status

+
+

Status is a return value for calls that don’t return other objects.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

kind

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

apiVersion

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources

false

string

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

v1.ListMeta

status

Status of the operation. One of: "Success" or "Failure". More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status

false

string

message

A human-readable description of the status of this operation.

false

string

reason

A machine-readable description of why this operation is in the "Failure" status. If this value is empty there is no information available. A Reason clarifies an HTTP status code but does not override it.

false

string

details

Extended data associated with the reason. Each reason may define its own extended details. This field is optional and the data returned is not guaranteed to conform to any schema except that defined by the reason type.

false

v1.StatusDetails

code

Suggested HTTP return code for this status, 0 if not set.

false

integer (int32)

+

v1beta1.ScaleStatus

@@ -4050,7 +4079,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i

metadata

Standard list metadata.

false

-

unversioned.ListMeta

+

v1.ListMeta

@@ -4342,68 +4371,6 @@ Both these may change in the future. Incoming requests are matched against the h -
-
-

unversioned.StatusDetails

-
-

StatusDetails is a set of additional properties that MAY be set by the server to provide additional information about a response. The Reason field of a Status object defines what attributes will be set. Clients must ignore fields that do not match the defined type of each attribute, and should assume that any attribute may be empty, invalid, or under defined.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

name

The name attribute of the resource associated with the status StatusReason (when there is a single name which can be described).

false

string

group

The group attribute of the resource associated with the status StatusReason.

false

string

kind

The kind attribute of the resource associated with the status StatusReason. On some operations may differ from the requested resource Kind. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

causes

The Causes array includes more details associated with the StatusReason failure. Not all StatusReasons may provide detailed causes.

false

unversioned.StatusCause array

retryAfterSeconds

If specified, the time in seconds before the operation should be retried.

false

integer (int32)

-

v1.HTTPGetAction

@@ -4466,6 +4433,68 @@ Both these may change in the future. Incoming requests are matched against the h +
+
+

v1.StatusDetails

+
+

StatusDetails is a set of additional properties that MAY be set by the server to provide additional information about a response. The Reason field of a Status object defines what attributes will be set. Clients must ignore fields that do not match the defined type of each attribute, and should assume that any attribute may be empty, invalid, or under defined.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

name

The name attribute of the resource associated with the status StatusReason (when there is a single name which can be described).

false

string

group

The group attribute of the resource associated with the status StatusReason.

false

string

kind

The kind attribute of the resource associated with the status StatusReason. On some operations may differ from the requested resource Kind. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

causes

The Causes array includes more details associated with the StatusReason failure. Not all StatusReasons may provide detailed causes.

false

v1.StatusCause array

retryAfterSeconds

If specified, the time in seconds before the operation should be retried.

false

integer (int32)

+

v1.LoadBalancerStatus

@@ -4848,6 +4877,54 @@ Both these may change in the future. Incoming requests are matched against the h +
+
+

v1.APIResource

+
+

APIResource specifies the name of a resource and whether it is namespaced.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

name

name is the name of the resource.

true

string

namespaced

namespaced indicates if a resource is namespaced or not.

true

boolean

false

kind

kind is the kind for the resource (e.g. Foo is the kind for a resource foo)

true

string

+

v1.HostPathVolumeSource

@@ -5291,6 +5368,54 @@ Both these may change in the future. Incoming requests are matched against the h +
+
+

v1.LabelSelectorRequirement

+
+

A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

key

key is the label key that the selector applies to.

true

string

operator

operator represents a key’s relationship to a set of values. Valid operators ard In, NotIn, Exists and DoesNotExist.

true

string

values

values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.

false

string array

+

v1.ResourceRequirements

@@ -5373,6 +5498,12 @@ Both these may change in the future. Incoming requests are matched against the h +
+
+

v1.Patch

+
+

Patch is provided to give a concrete name and type to the Kubernetes PATCH request body.

+

v1beta1.DeploymentCondition

@@ -5415,14 +5546,14 @@ Both these may change in the future. Incoming requests are matched against the h

lastUpdateTime

The last time this condition was updated.

false

-

string (date-time)

+

string

lastTransitionTime

Last time the condition transitioned from one status to another.

false

-

string (date-time)

+

string

@@ -5442,137 +5573,6 @@ Both these may change in the future. Incoming requests are matched against the h -
-
-

unversioned.LabelSelectorRequirement

-
-

A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

key

key is the label key that the selector applies to.

true

string

operator

operator represents a key’s relationship to a set of values. Valid operators ard In, NotIn, Exists and DoesNotExist.

true

string

values

values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.

false

string array

- -
-
-

unversioned.Status

-
-

Status is a return value for calls that don’t return other objects.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

kind

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

apiVersion

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources

false

string

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

unversioned.ListMeta

status

Status of the operation. One of: "Success" or "Failure". More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status

false

string

message

A human-readable description of the status of this operation.

false

string

reason

A machine-readable description of why this operation is in the "Failure" status. If this value is empty there is no information available. A Reason clarifies an HTTP status code but does not override it.

false

string

details

Extended data associated with the reason. Each reason may define its own extended details. This field is optional and the data returned is not guaranteed to conform to any schema except that defined by the reason type.

false

unversioned.StatusDetails

code

Suggested HTTP return code for this status, 0 if not set.

false

integer (int32)

-

v1.ConfigMapKeySelector

@@ -5733,7 +5733,7 @@ Both these may change in the future. Incoming requests are matched against the h
diff --git a/federation/docs/api-reference/extensions/v1beta1/operations.html b/federation/docs/api-reference/extensions/v1beta1/operations.html index 02079d04779..bf2d662c743 100755 --- a/federation/docs/api-reference/extensions/v1beta1/operations.html +++ b/federation/docs/api-reference/extensions/v1beta1/operations.html @@ -393,7 +393,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

default

success

-

unversioned.APIResourceList

+

v1.APIResourceList

@@ -1154,7 +1154,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -1678,7 +1678,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -1763,7 +1763,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -2142,7 +2142,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -2498,7 +2498,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -3022,7 +3022,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -3107,7 +3107,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -3613,7 +3613,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -3992,7 +3992,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -4348,7 +4348,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -4872,7 +4872,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -4957,7 +4957,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -5336,7 +5336,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -5692,7 +5692,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -6216,7 +6216,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -6301,7 +6301,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -6680,7 +6680,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -7059,7 +7059,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -9188,7 +9188,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
diff --git a/federation/docs/api-reference/federation/v1beta1/definitions.html b/federation/docs/api-reference/federation/v1beta1/definitions.html index 5a0fec7fd2a..119dc8939c5 100755 --- a/federation/docs/api-reference/federation/v1beta1/definitions.html +++ b/federation/docs/api-reference/federation/v1beta1/definitions.html @@ -383,7 +383,62 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

Definitions

-

unversioned.Patch

+

v1.APIResourceList

+
+

APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

kind

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

apiVersion

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources

false

string

groupVersion

groupVersion is the group and version this APIResourceList is for.

true

string

resources

resources contains the name of the resources and if they are namespaced.

true

v1.APIResource array

+ +
+
+

v1.Patch

Patch is provided to give a concrete name and type to the Kubernetes PATCH request body.

@@ -532,7 +587,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

-

unversioned.ListMeta

+

v1.ListMeta

@@ -547,7 +602,86 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
-

unversioned.StatusDetails

+

versioned.Event

+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

type

true

string

object

true

string

+ +
+
+

v1.ListMeta

+
+

ListMeta describes metadata that synthetic resources must have, including lists and various status objects. A resource may have only one of {ObjectMeta, ListMeta}.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

selfLink

SelfLink is a URL representing this object. Populated by the system. Read-only.

false

string

resourceVersion

String that identifies the server’s internal version of this object that can be used by clients to determine when objects have changed. Value must be treated as opaque by clients and passed unmodified back to the server. Populated by the system. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#concurrency-control-and-consistency

false

string

+ +
+
+

v1.StatusDetails

StatusDetails is a set of additional properties that MAY be set by the server to provide additional information about a response. The Reason field of a Status object defines what attributes will be set. Clients must ignore fields that do not match the defined type of each attribute, and should assume that any attribute may be empty, invalid, or under defined.

@@ -594,7 +728,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

causes

The Causes array includes more details associated with the StatusReason failure. Not all StatusReasons may provide detailed causes.

false

-

unversioned.StatusCause array

+

v1.StatusCause array

@@ -607,85 +741,6 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } -
-
-

versioned.Event

- ------- - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

type

true

string

object

true

string

- -
-
-

unversioned.ListMeta

-
-

ListMeta describes metadata that synthetic resources must have, including lists and various status objects. A resource may have only one of {ObjectMeta, ListMeta}.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

selfLink

SelfLink is a URL representing this object. Populated by the system. Read-only.

false

string

resourceVersion

String that identifies the server’s internal version of this object that can be used by clients to determine when objects have changed. Value must be treated as opaque by clients and passed unmodified back to the server. Populated by the system. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#concurrency-control-and-consistency

false

string

-

v1beta1.ClusterStatus

@@ -804,9 +859,9 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
-

unversioned.APIResourceList

+

v1.Status

-

APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.

+

Status is a return value for calls that don’t return other objects.

@@ -841,17 +896,45 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } - - - + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + @@ -898,137 +981,6 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

groupVersion

groupVersion is the group and version this APIResourceList is for.

true

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

v1.ListMeta

status

Status of the operation. One of: "Success" or "Failure". More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status

false

string

resources

resources contains the name of the resources and if they are namespaced.

true

unversioned.APIResource array

message

A human-readable description of the status of this operation.

false

string

reason

A machine-readable description of why this operation is in the "Failure" status. If this value is empty there is no information available. A Reason clarifies an HTTP status code but does not override it.

false

string

details

Extended data associated with the reason. Each reason may define its own extended details. This field is optional and the data returned is not guaranteed to conform to any schema except that defined by the reason type.

false

v1.StatusDetails

code

Suggested HTTP return code for this status, 0 if not set.

false

integer (int32)

-
-
-

unversioned.Status

-
-

Status is a return value for calls that don’t return other objects.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

kind

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

apiVersion

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources

false

string

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

unversioned.ListMeta

status

Status of the operation. One of: "Success" or "Failure". More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status

false

string

message

A human-readable description of the status of this operation.

false

string

reason

A machine-readable description of why this operation is in the "Failure" status. If this value is empty there is no information available. A Reason clarifies an HTTP status code but does not override it.

false

string

details

Extended data associated with the reason. Each reason may define its own extended details. This field is optional and the data returned is not guaranteed to conform to any schema except that defined by the reason type.

false

unversioned.StatusDetails

code

Suggested HTTP return code for this status, 0 if not set.

false

integer (int32)

- -
-
-

unversioned.APIResource

-
-

APIResource specifies the name of a resource and whether it is namespaced.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

name

name is the name of the resource.

true

string

namespaced

namespaced indicates if a resource is namespaced or not.

true

boolean

false

kind

kind is the kind for the resource (e.g. Foo is the kind for a resource foo)

true

string

-

v1.ObjectMeta

@@ -1118,7 +1070,7 @@ Populated by the system. Read-only. Value must be treated as opaque by clients a
Populated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata

false

-

string (date-time)

+

string

@@ -1127,7 +1079,7 @@ Populated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata

false

-

string (date-time)

+

string

@@ -1279,14 +1231,14 @@ Populated by the system when a graceful deletion is requested. Read-only. More i

lastProbeTime

Last time the condition was checked.

false

-

string (date-time)

+

string

lastTransitionTime

Last time the condition transit from one status to another.

false

-

string (date-time)

+

string

@@ -1306,13 +1258,61 @@ Populated by the system when a graceful deletion is requested. Read-only. More i +
+
+

v1.APIResource

+
+

APIResource specifies the name of a resource and whether it is namespaced.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

name

name is the name of the resource.

true

string

namespaced

namespaced indicates if a resource is namespaced or not.

true

boolean

false

kind

kind is the kind for the resource (e.g. Foo is the kind for a resource foo)

true

string

+

types.UID

-

unversioned.StatusCause

+

v1.StatusCause

StatusCause provides more information about an api.Status failure, including cases when multiple errors are encountered.

@@ -1436,7 +1436,7 @@ Examples:
diff --git a/federation/docs/api-reference/federation/v1beta1/operations.html b/federation/docs/api-reference/federation/v1beta1/operations.html index 54d5c3e7c60..3193418bded 100755 --- a/federation/docs/api-reference/federation/v1beta1/operations.html +++ b/federation/docs/api-reference/federation/v1beta1/operations.html @@ -393,7 +393,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

default

success

-

unversioned.APIResourceList

+

v1.APIResourceList

@@ -691,7 +691,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -1183,7 +1183,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -1268,7 +1268,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -1781,7 +1781,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
diff --git a/federation/docs/api-reference/v1/definitions.html b/federation/docs/api-reference/v1/definitions.html index ebd4b0a3f98..3fe9479bbb9 100755 --- a/federation/docs/api-reference/v1/definitions.html +++ b/federation/docs/api-reference/v1/definitions.html @@ -410,10 +410,59 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

Definitions

-

unversioned.Patch

+

v1.APIResourceList

-

Patch is provided to give a concrete name and type to the Kubernetes PATCH request body.

+

APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.

+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

kind

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

apiVersion

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources

false

string

groupVersion

groupVersion is the group and version this APIResourceList is for.

true

string

resources

resources contains the name of the resources and if they are namespaced.

true

v1.APIResource array

+

v1.NamespaceList

@@ -456,7 +505,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

-

unversioned.ListMeta

+

v1.ListMeta

@@ -507,6 +556,47 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } +
+
+

v1.ListMeta

+
+

ListMeta describes metadata that synthetic resources must have, including lists and various status objects. A resource may have only one of {ObjectMeta, ListMeta}.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

selfLink

SelfLink is a URL representing this object. Populated by the system. Read-only.

false

string

resourceVersion

String that identifies the server’s internal version of this object that can be used by clients to determine when objects have changed. Value must be treated as opaque by clients and passed unmodified back to the server. Populated by the system. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#concurrency-control-and-consistency

false

string

+

v1.Namespace

@@ -569,47 +659,6 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } -
-
-

unversioned.ListMeta

-
-

ListMeta describes metadata that synthetic resources must have, including lists and various status objects. A resource may have only one of {ObjectMeta, ListMeta}.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

selfLink

SelfLink is a URL representing this object. Populated by the system. Read-only.

false

string

resourceVersion

String that identifies the server’s internal version of this object that can be used by clients to determine when objects have changed. Value must be treated as opaque by clients and passed unmodified back to the server. Populated by the system. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#concurrency-control-and-consistency

false

string

-

v1.Preconditions

@@ -644,6 +693,89 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } +
+
+

v1.Status

+
+

Status is a return value for calls that don’t return other objects.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

kind

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

apiVersion

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources

false

string

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

v1.ListMeta

status

Status of the operation. One of: "Success" or "Failure". More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status

false

string

message

A human-readable description of the status of this operation.

false

string

reason

A machine-readable description of why this operation is in the "Failure" status. If this value is empty there is no information available. A Reason clarifies an HTTP status code but does not override it.

false

string

details

Extended data associated with the reason. Each reason may define its own extended details. This field is optional and the data returned is not guaranteed to conform to any schema except that defined by the reason type.

false

v1.StatusDetails

code

Suggested HTTP return code for this status, 0 if not set.

false

integer (int32)

+

v1.ServiceStatus

@@ -824,14 +956,14 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

firstTimestamp

The time at which the event was first recorded. (Time of server receipt is in TypeMeta.)

false

-

string (date-time)

+

string

lastTimestamp

The time at which the most recent occurrence of this event was recorded.

false

-

string (date-time)

+

string

@@ -851,58 +983,6 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } -
-
-

unversioned.StatusCause

-
-

StatusCause provides more information about an api.Status failure, including cases when multiple errors are encountered.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

reason

A machine-readable description of the cause of the error. If this value is empty there is no information available.

false

string

message

A human-readable description of the cause of the error. This field may be presented as-is to a reader.

false

string

field

The field of the resource that has caused this error, as named by its JSON serialization. May include dot and postfix notation for nested attributes. Arrays are zero-indexed. Fields may appear more than once in an array of causes due to fields having multiple errors. Optional.
-
-Examples:
- "name" - the field "name" on the current resource
- "items[0].name" - the field "name" on the first array entry in "items"

false

string

-

v1.LoadBalancerIngress

@@ -1020,7 +1100,7 @@ Examples:

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

-

unversioned.ListMeta

+

v1.ListMeta

@@ -1129,6 +1209,12 @@ Examples:
+
+
+

v1.Patch

+
+

Patch is provided to give a concrete name and type to the Kubernetes PATCH request body.

+

v1.ConfigMapList

@@ -1171,7 +1257,7 @@ Examples:

metadata

More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata

false

-

unversioned.ListMeta

+

v1.ListMeta

@@ -1248,7 +1334,7 @@ Examples:
-

unversioned.StatusDetails

+

v1.StatusDetails

StatusDetails is a set of additional properties that MAY be set by the server to provide additional information about a response. The Reason field of a Status object defines what attributes will be set. Clients must ignore fields that do not match the defined type of each attribute, and should assume that any attribute may be empty, invalid, or under defined.

@@ -1295,7 +1381,7 @@ Examples:

causes

The Causes array includes more details associated with the StatusReason failure. Not all StatusReasons may provide detailed causes.

false

-

unversioned.StatusCause array

+

v1.StatusCause array

@@ -1439,61 +1525,6 @@ Examples:
-
-
-

unversioned.APIResourceList

-
-

APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

kind

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

apiVersion

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources

false

string

groupVersion

groupVersion is the group and version this APIResourceList is for.

true

string

resources

resources contains the name of the resources and if they are namespaced.

true

unversioned.APIResource array

-

v1.LoadBalancerStatus

@@ -1570,7 +1601,7 @@ Examples:

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

-

unversioned.ListMeta

+

v1.ListMeta

@@ -1583,137 +1614,6 @@ Examples:
-
-
-

unversioned.Status

-
-

Status is a return value for calls that don’t return other objects.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

kind

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

apiVersion

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources

false

string

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

unversioned.ListMeta

status

Status of the operation. One of: "Success" or "Failure". More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status

false

string

message

A human-readable description of the status of this operation.

false

string

reason

A machine-readable description of why this operation is in the "Failure" status. If this value is empty there is no information available. A Reason clarifies an HTTP status code but does not override it.

false

string

details

Extended data associated with the reason. Each reason may define its own extended details. This field is optional and the data returned is not guaranteed to conform to any schema except that defined by the reason type.

false

unversioned.StatusDetails

code

Suggested HTTP return code for this status, 0 if not set.

false

integer (int32)

- -
-
-

unversioned.APIResource

-
-

APIResource specifies the name of a resource and whether it is namespaced.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

name

name is the name of the resource.

true

string

namespaced

namespaced indicates if a resource is namespaced or not.

true

boolean

false

kind

kind is the kind for the resource (e.g. Foo is the kind for a resource foo)

true

string

-

v1.FinalizerName

@@ -1931,7 +1831,7 @@ Populated by the system. Read-only. Value must be treated as opaque by clients a
Populated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata

false

-

string (date-time)

+

string

@@ -1940,7 +1840,7 @@ Populated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata

false

-

string (date-time)

+

string

@@ -2030,7 +1930,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

-

unversioned.ListMeta

+

v1.ListMeta

@@ -2043,6 +1943,54 @@ Populated by the system when a graceful deletion is requested. Read-only. More i +
+
+

v1.APIResource

+
+

APIResource specifies the name of a resource and whether it is namespaced.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

name

name is the name of the resource.

true

string

namespaced

namespaced indicates if a resource is namespaced or not.

true

boolean

false

kind

kind is the kind for the resource (e.g. Foo is the kind for a resource foo)

true

string

+

v1.ServiceSpec

@@ -2185,6 +2133,58 @@ Populated by the system when a graceful deletion is requested. Read-only. More i

types.UID

+
+
+

v1.StatusCause

+
+

StatusCause provides more information about an api.Status failure, including cases when multiple errors are encountered.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

reason

A machine-readable description of the cause of the error. If this value is empty there is no information available.

false

string

message

A human-readable description of the cause of the error. This field may be presented as-is to a reader.

false

string

field

The field of the resource that has caused this error, as named by its JSON serialization. May include dot and postfix notation for nested attributes. Arrays are zero-indexed. Fields may appear more than once in an array of causes due to fields having multiple errors. Optional.
+
+Examples:
+ "name" - the field "name" on the current resource
+ "items[0].name" - the field "name" on the first array entry in "items"

false

string

+

any

@@ -2197,7 +2197,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
diff --git a/federation/docs/api-reference/v1/operations.html b/federation/docs/api-reference/v1/operations.html index 0bc75c3bb3b..506933ba18d 100755 --- a/federation/docs/api-reference/v1/operations.html +++ b/federation/docs/api-reference/v1/operations.html @@ -393,7 +393,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

default

success

-

unversioned.APIResourceList

+

v1.APIResourceList

@@ -989,7 +989,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -1408,7 +1408,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -1932,7 +1932,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -2017,7 +2017,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -2373,7 +2373,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -2897,7 +2897,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -2982,7 +2982,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -3338,7 +3338,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -3862,7 +3862,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -3947,7 +3947,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -4303,7 +4303,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -4827,7 +4827,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -4912,7 +4912,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -5291,7 +5291,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -5720,7 +5720,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -5805,7 +5805,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -6279,7 +6279,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -8855,7 +8855,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
diff --git a/federation/pkg/federation-controller/cluster/cluster_client.go b/federation/pkg/federation-controller/cluster/cluster_client.go index 00e0b00da6a..88ae73f185a 100644 --- a/federation/pkg/federation-controller/cluster/cluster_client.go +++ b/federation/pkg/federation-controller/cluster/cluster_client.go @@ -24,8 +24,8 @@ import ( federation_v1beta1 "k8s.io/kubernetes/federation/apis/federation/v1beta1" "k8s.io/kubernetes/federation/pkg/federation-controller/util" "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/client/typed/discovery" diff --git a/federation/pkg/federation-controller/cluster/clustercontroller_test.go b/federation/pkg/federation-controller/cluster/clustercontroller_test.go index 67912636e4b..de1217ec2b9 100644 --- a/federation/pkg/federation-controller/cluster/clustercontroller_test.go +++ b/federation/pkg/federation-controller/cluster/clustercontroller_test.go @@ -27,8 +27,8 @@ import ( federationclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_5" controllerutil "k8s.io/kubernetes/federation/pkg/federation-controller/util" "k8s.io/kubernetes/pkg/api/testapi" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/client/unversioned/clientcmd" clientcmdapi "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api" diff --git a/federation/pkg/federation-controller/daemonset/daemonset_controller_test.go b/federation/pkg/federation-controller/daemonset/daemonset_controller_test.go index 5e8a95068c5..1c1ef85c32f 100644 --- a/federation/pkg/federation-controller/daemonset/daemonset_controller_test.go +++ b/federation/pkg/federation-controller/daemonset/daemonset_controller_test.go @@ -27,9 +27,9 @@ import ( "k8s.io/kubernetes/federation/pkg/federation-controller/util" "k8s.io/kubernetes/federation/pkg/federation-controller/util/deletionhelper" . "k8s.io/kubernetes/federation/pkg/federation-controller/util/test" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" apiv1 "k8s.io/kubernetes/pkg/api/v1" extensionsv1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" kubeclientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" fakekubeclientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/fake" "k8s.io/kubernetes/pkg/runtime" diff --git a/federation/pkg/federation-controller/namespace/namespace_controller_test.go b/federation/pkg/federation-controller/namespace/namespace_controller_test.go index a779f39b963..c32b7881f23 100644 --- a/federation/pkg/federation-controller/namespace/namespace_controller_test.go +++ b/federation/pkg/federation-controller/namespace/namespace_controller_test.go @@ -26,9 +26,9 @@ import ( "k8s.io/kubernetes/federation/pkg/federation-controller/util" "k8s.io/kubernetes/federation/pkg/federation-controller/util/deletionhelper" . "k8s.io/kubernetes/federation/pkg/federation-controller/util/test" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" apiv1 "k8s.io/kubernetes/pkg/api/v1" extensionsv1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" kubeclientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" fakekubeclientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/fake" "k8s.io/kubernetes/pkg/client/testing/core" diff --git a/federation/pkg/federation-controller/util/podanalyzer/pod_helper.go b/federation/pkg/federation-controller/util/podanalyzer/pod_helper.go index a9e88c37576..21670899657 100644 --- a/federation/pkg/federation-controller/util/podanalyzer/pod_helper.go +++ b/federation/pkg/federation-controller/util/podanalyzer/pod_helper.go @@ -21,8 +21,8 @@ import ( "time" "k8s.io/kubernetes/federation/pkg/federation-controller/util" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" api_v1 "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/labels" ) diff --git a/federation/pkg/federation-controller/util/podanalyzer/pod_helper_test.go b/federation/pkg/federation-controller/util/podanalyzer/pod_helper_test.go index 6874e465721..543350cbda6 100644 --- a/federation/pkg/federation-controller/util/podanalyzer/pod_helper_test.go +++ b/federation/pkg/federation-controller/util/podanalyzer/pod_helper_test.go @@ -21,9 +21,9 @@ import ( "time" "k8s.io/kubernetes/federation/pkg/federation-controller/util" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" api_v1 "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "github.com/stretchr/testify/assert" ) diff --git a/federation/pkg/kubefed/init/init_test.go b/federation/pkg/kubefed/init/init_test.go index a407a2d3651..14371807d11 100644 --- a/federation/pkg/kubefed/init/init_test.go +++ b/federation/pkg/kubefed/init/init_test.go @@ -37,9 +37,9 @@ import ( "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/api/testapi" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/restclient/fake" "k8s.io/kubernetes/pkg/client/typed/dynamic" "k8s.io/kubernetes/pkg/client/unversioned/clientcmd" diff --git a/federation/pkg/kubefed/join_test.go b/federation/pkg/kubefed/join_test.go index f9f02419c9c..f01ee2bb82c 100644 --- a/federation/pkg/kubefed/join_test.go +++ b/federation/pkg/kubefed/join_test.go @@ -29,8 +29,8 @@ import ( "k8s.io/kubernetes/federation/pkg/kubefed/util" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/restclient/fake" "k8s.io/kubernetes/pkg/client/typed/dynamic" "k8s.io/kubernetes/pkg/client/unversioned/clientcmd" diff --git a/pkg/api/defaulting_test.go b/pkg/api/defaulting_test.go index 4cc34613834..4423e8c5685 100644 --- a/pkg/api/defaulting_test.go +++ b/pkg/api/defaulting_test.go @@ -25,10 +25,10 @@ import ( "github.com/google/gofuzz" "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" apiv1 "k8s.io/kubernetes/pkg/api/v1" batchv2alpha1 "k8s.io/kubernetes/pkg/apis/batch/v2alpha1" extensionsv1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" "k8s.io/kubernetes/pkg/util/diff" diff --git a/pkg/api/install/install_test.go b/pkg/api/install/install_test.go index 7fdd05d4d92..58013033481 100644 --- a/pkg/api/install/install_test.go +++ b/pkg/api/install/install_test.go @@ -22,8 +22,8 @@ import ( "testing" internal "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" ) diff --git a/pkg/api/meta.go b/pkg/api/meta.go index a0c33030068..851e536c37f 100644 --- a/pkg/api/meta.go +++ b/pkg/api/meta.go @@ -75,19 +75,19 @@ func (obj *ObjectMeta) GetObjectMeta() meta.Object { return obj } // Namespace implements meta.Object for any object with an ObjectMeta typed field. Allows // fast, direct access to metadata fields for API objects. -func (meta *ObjectMeta) GetNamespace() string { return meta.Namespace } -func (meta *ObjectMeta) SetNamespace(namespace string) { meta.Namespace = namespace } -func (meta *ObjectMeta) GetName() string { return meta.Name } -func (meta *ObjectMeta) SetName(name string) { meta.Name = name } -func (meta *ObjectMeta) GetGenerateName() string { return meta.GenerateName } -func (meta *ObjectMeta) SetGenerateName(generateName string) { meta.GenerateName = generateName } -func (meta *ObjectMeta) GetUID() types.UID { return meta.UID } -func (meta *ObjectMeta) SetUID(uid types.UID) { meta.UID = uid } -func (meta *ObjectMeta) GetResourceVersion() string { return meta.ResourceVersion } -func (meta *ObjectMeta) SetResourceVersion(version string) { meta.ResourceVersion = version } -func (meta *ObjectMeta) GetSelfLink() string { return meta.SelfLink } -func (meta *ObjectMeta) SetSelfLink(selfLink string) { meta.SelfLink = selfLink } -func (meta *ObjectMeta) GetCreationTimestamp() metav1.Time { return meta.CreationTimestamp } +func (meta *ObjectMeta) GetNamespace() string { return meta.Namespace } +func (meta *ObjectMeta) SetNamespace(namespace string) { meta.Namespace = namespace } +func (meta *ObjectMeta) GetName() string { return meta.Name } +func (meta *ObjectMeta) SetName(name string) { meta.Name = name } +func (meta *ObjectMeta) GetGenerateName() string { return meta.GenerateName } +func (meta *ObjectMeta) SetGenerateName(generateName string) { meta.GenerateName = generateName } +func (meta *ObjectMeta) GetUID() types.UID { return meta.UID } +func (meta *ObjectMeta) SetUID(uid types.UID) { meta.UID = uid } +func (meta *ObjectMeta) GetResourceVersion() string { return meta.ResourceVersion } +func (meta *ObjectMeta) SetResourceVersion(version string) { meta.ResourceVersion = version } +func (meta *ObjectMeta) GetSelfLink() string { return meta.SelfLink } +func (meta *ObjectMeta) SetSelfLink(selfLink string) { meta.SelfLink = selfLink } +func (meta *ObjectMeta) GetCreationTimestamp() metav1.Time { return meta.CreationTimestamp } func (meta *ObjectMeta) SetCreationTimestamp(creationTimestamp metav1.Time) { meta.CreationTimestamp = creationTimestamp } diff --git a/pkg/api/meta/meta_test.go b/pkg/api/meta/meta_test.go index 5a847235078..7e920a0a1f7 100644 --- a/pkg/api/meta/meta_test.go +++ b/pkg/api/meta/meta_test.go @@ -25,8 +25,8 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/meta" "k8s.io/kubernetes/pkg/api/meta/metatypes" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" "k8s.io/kubernetes/pkg/types" @@ -148,7 +148,7 @@ func TestGenericTypeMeta(t *testing.T) { Name string `json:"name,omitempty"` GenerateName string `json:"generateName,omitempty"` UID string `json:"uid,omitempty"` - CreationTimestamp metav1.Time `json:"creationTimestamp,omitempty"` + CreationTimestamp metav1.Time `json:"creationTimestamp,omitempty"` SelfLink string `json:"selfLink,omitempty"` ResourceVersion string `json:"resourceVersion,omitempty"` APIVersion string `json:"apiVersion,omitempty"` @@ -198,7 +198,7 @@ type InternalTypeMeta struct { Name string `json:"name,omitempty"` GenerateName string `json:"generateName,omitempty"` UID string `json:"uid,omitempty"` - CreationTimestamp metav1.Time `json:"creationTimestamp,omitempty"` + CreationTimestamp metav1.Time `json:"creationTimestamp,omitempty"` SelfLink string `json:"selfLink,omitempty"` ResourceVersion string `json:"resourceVersion,omitempty"` APIVersion string `json:"apiVersion,omitempty"` diff --git a/pkg/api/meta/scheme_test.go b/pkg/api/meta/scheme_test.go index 12f07f941cc..85813d4f25f 100644 --- a/pkg/api/meta/scheme_test.go +++ b/pkg/api/meta/scheme_test.go @@ -93,14 +93,14 @@ type WithoutItemsList struct { type WrongItemsJSONTagList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` - Items []interface{} `json:"items,omitempty"` + Items []interface{} `json:"items,omitempty"` } // If a type has Items, its name should end with "List" type ListWithWrongName struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` - Items []interface{} `json:"items"` + Items []interface{} `json:"items"` } // TestValidateListType verifies the validateListType function reports error on diff --git a/pkg/api/meta_test.go b/pkg/api/meta_test.go index fcf84a235bc..66053fef2c3 100644 --- a/pkg/api/meta_test.go +++ b/pkg/api/meta_test.go @@ -25,8 +25,8 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/meta" "k8s.io/kubernetes/pkg/api/meta/metatypes" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" "k8s.io/kubernetes/pkg/util/uuid" diff --git a/pkg/api/rest/resttest/resttest.go b/pkg/api/rest/resttest/resttest.go index b237251ab13..45a18ce1037 100644 --- a/pkg/api/rest/resttest/resttest.go +++ b/pkg/api/rest/resttest/resttest.go @@ -26,8 +26,8 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/rest" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/validation/path" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/conversion" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" diff --git a/pkg/api/serialization_test.go b/pkg/api/serialization_test.go index f7cb5a770f0..6f002645b73 100644 --- a/pkg/api/serialization_test.go +++ b/pkg/api/serialization_test.go @@ -36,10 +36,10 @@ import ( "k8s.io/kubernetes/pkg/api/meta" "k8s.io/kubernetes/pkg/api/testapi" apitesting "k8s.io/kubernetes/pkg/api/testing" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/conversion" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" diff --git a/pkg/api/testing/fuzzer.go b/pkg/api/testing/fuzzer.go index d3675e50aa2..f9024d47076 100644 --- a/pkg/api/testing/fuzzer.go +++ b/pkg/api/testing/fuzzer.go @@ -27,10 +27,10 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/api/testapi" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/autoscaling" "k8s.io/kubernetes/pkg/apis/batch" "k8s.io/kubernetes/pkg/apis/extensions" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/policy" "k8s.io/kubernetes/pkg/apis/rbac" "k8s.io/kubernetes/pkg/fields" diff --git a/pkg/api/types.generated.go b/pkg/api/types.generated.go index 82f4890488d..697cda6a02a 100644 --- a/pkg/api/types.generated.go +++ b/pkg/api/types.generated.go @@ -26,7 +26,7 @@ import ( "fmt" codec1978 "github.com/ugorji/go/codec" pkg3_resource "k8s.io/kubernetes/pkg/api/resource" - pkg2_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" + pkg2_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" pkg6_fields "k8s.io/kubernetes/pkg/fields" pkg5_labels "k8s.io/kubernetes/pkg/labels" pkg7_runtime "k8s.io/kubernetes/pkg/runtime" @@ -68,7 +68,7 @@ func init() { } if false { // reference the types, but skip this branch at build/run time var v0 pkg3_resource.Quantity - var v1 pkg2_unversioned.Time + var v1 pkg2_v1.Time var v2 pkg6_fields.Selector var v3 pkg5_labels.Selector var v4 pkg7_runtime.Object @@ -678,7 +678,7 @@ func (x *ObjectMeta) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "creationTimestamp": if r.TryDecodeAsNil() { - x.CreationTimestamp = pkg2_unversioned.Time{} + x.CreationTimestamp = pkg2_v1.Time{} } else { yyv62 := &x.CreationTimestamp yym63 := z.DecBinary() @@ -700,7 +700,7 @@ func (x *ObjectMeta) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.DeletionTimestamp == nil { - x.DeletionTimestamp = new(pkg2_unversioned.Time) + x.DeletionTimestamp = new(pkg2_v1.Time) } yym65 := z.DecBinary() _ = yym65 @@ -922,7 +922,7 @@ func (x *ObjectMeta) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.CreationTimestamp = pkg2_unversioned.Time{} + x.CreationTimestamp = pkg2_v1.Time{} } else { yyv85 := &x.CreationTimestamp yym86 := z.DecBinary() @@ -954,7 +954,7 @@ func (x *ObjectMeta) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } else { if x.DeletionTimestamp == nil { - x.DeletionTimestamp = new(pkg2_unversioned.Time) + x.DeletionTimestamp = new(pkg2_v1.Time) } yym88 := z.DecBinary() _ = yym88 @@ -8170,7 +8170,7 @@ func (x *PersistentVolumeList) codecDecodeSelfFromMap(l int, d *codec1978.Decode } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv474 := &x.ListMeta yym475 := z.DecBinary() @@ -8251,7 +8251,7 @@ func (x *PersistentVolumeList) codecDecodeSelfFromArray(l int, d *codec1978.Deco } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv481 := &x.ListMeta yym482 := z.DecBinary() @@ -8857,7 +8857,7 @@ func (x *PersistentVolumeClaimList) codecDecodeSelfFromMap(l int, d *codec1978.D } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv537 := &x.ListMeta yym538 := z.DecBinary() @@ -8938,7 +8938,7 @@ func (x *PersistentVolumeClaimList) codecDecodeSelfFromArray(l int, d *codec1978 } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv544 := &x.ListMeta yym545 := z.DecBinary() @@ -9211,7 +9211,7 @@ func (x *PersistentVolumeClaimSpec) codecDecodeSelfFromMap(l int, d *codec1978.D } } else { if x.Selector == nil { - x.Selector = new(pkg2_unversioned.LabelSelector) + x.Selector = new(pkg2_v1.LabelSelector) } yym568 := z.DecBinary() _ = yym568 @@ -9287,7 +9287,7 @@ func (x *PersistentVolumeClaimSpec) codecDecodeSelfFromArray(l int, d *codec1978 } } else { if x.Selector == nil { - x.Selector = new(pkg2_unversioned.LabelSelector) + x.Selector = new(pkg2_v1.LabelSelector) } yym575 := z.DecBinary() _ = yym575 @@ -23240,7 +23240,7 @@ func (x *ContainerStateRunning) codecDecodeSelfFromMap(l int, d *codec1978.Decod switch yys1684 { case "startedAt": if r.TryDecodeAsNil() { - x.StartedAt = pkg2_unversioned.Time{} + x.StartedAt = pkg2_v1.Time{} } else { yyv1685 := &x.StartedAt yym1686 := z.DecBinary() @@ -23281,7 +23281,7 @@ func (x *ContainerStateRunning) codecDecodeSelfFromArray(l int, d *codec1978.Dec } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.StartedAt = pkg2_unversioned.Time{} + x.StartedAt = pkg2_v1.Time{} } else { yyv1688 := &x.StartedAt yym1689 := z.DecBinary() @@ -23628,7 +23628,7 @@ func (x *ContainerStateTerminated) codecDecodeSelfFromMap(l int, d *codec1978.De } case "startedAt": if r.TryDecodeAsNil() { - x.StartedAt = pkg2_unversioned.Time{} + x.StartedAt = pkg2_v1.Time{} } else { yyv1724 := &x.StartedAt yym1725 := z.DecBinary() @@ -23645,7 +23645,7 @@ func (x *ContainerStateTerminated) codecDecodeSelfFromMap(l int, d *codec1978.De } case "finishedAt": if r.TryDecodeAsNil() { - x.FinishedAt = pkg2_unversioned.Time{} + x.FinishedAt = pkg2_v1.Time{} } else { yyv1726 := &x.FinishedAt yym1727 := z.DecBinary() @@ -23756,7 +23756,7 @@ func (x *ContainerStateTerminated) codecDecodeSelfFromArray(l int, d *codec1978. } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.StartedAt = pkg2_unversioned.Time{} + x.StartedAt = pkg2_v1.Time{} } else { yyv1734 := &x.StartedAt yym1735 := z.DecBinary() @@ -23783,7 +23783,7 @@ func (x *ContainerStateTerminated) codecDecodeSelfFromArray(l int, d *codec1978. } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.FinishedAt = pkg2_unversioned.Time{} + x.FinishedAt = pkg2_v1.Time{} } else { yyv1736 := &x.FinishedAt yym1737 := z.DecBinary() @@ -24880,7 +24880,7 @@ func (x *PodCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "lastProbeTime": if r.TryDecodeAsNil() { - x.LastProbeTime = pkg2_unversioned.Time{} + x.LastProbeTime = pkg2_v1.Time{} } else { yyv1829 := &x.LastProbeTime yym1830 := z.DecBinary() @@ -24897,7 +24897,7 @@ func (x *PodCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "lastTransitionTime": if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg2_unversioned.Time{} + x.LastTransitionTime = pkg2_v1.Time{} } else { yyv1831 := &x.LastTransitionTime yym1832 := z.DecBinary() @@ -24982,7 +24982,7 @@ func (x *PodCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastProbeTime = pkg2_unversioned.Time{} + x.LastProbeTime = pkg2_v1.Time{} } else { yyv1838 := &x.LastProbeTime yym1839 := z.DecBinary() @@ -25009,7 +25009,7 @@ func (x *PodCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg2_unversioned.Time{} + x.LastTransitionTime = pkg2_v1.Time{} } else { yyv1840 := &x.LastTransitionTime yym1841 := z.DecBinary() @@ -25312,7 +25312,7 @@ func (x *PodList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv1867 := &x.ListMeta yym1868 := z.DecBinary() @@ -25393,7 +25393,7 @@ func (x *PodList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv1874 := &x.ListMeta yym1875 := z.DecBinary() @@ -27306,7 +27306,7 @@ func (x *PodAffinityTerm) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.LabelSelector == nil { - x.LabelSelector = new(pkg2_unversioned.LabelSelector) + x.LabelSelector = new(pkg2_v1.LabelSelector) } yym2015 := z.DecBinary() _ = yym2015 @@ -27365,7 +27365,7 @@ func (x *PodAffinityTerm) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } } else { if x.LabelSelector == nil { - x.LabelSelector = new(pkg2_unversioned.LabelSelector) + x.LabelSelector = new(pkg2_v1.LabelSelector) } yym2021 := z.DecBinary() _ = yym2021 @@ -30507,7 +30507,7 @@ func (x *PodStatus) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.StartTime == nil { - x.StartTime = new(pkg2_unversioned.Time) + x.StartTime = new(pkg2_v1.Time) } yym2292 := z.DecBinary() _ = yym2292 @@ -30666,7 +30666,7 @@ func (x *PodStatus) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } else { if x.StartTime == nil { - x.StartTime = new(pkg2_unversioned.Time) + x.StartTime = new(pkg2_v1.Time) } yym2304 := z.DecBinary() _ = yym2304 @@ -32082,7 +32082,7 @@ func (x *PodTemplateList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv2427 := &x.ListMeta yym2428 := z.DecBinary() @@ -32163,7 +32163,7 @@ func (x *PodTemplateList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv2434 := &x.ListMeta yym2435 := z.DecBinary() @@ -33200,7 +33200,7 @@ func (x *ReplicationControllerCondition) codecDecodeSelfFromMap(l int, d *codec1 } case "lastTransitionTime": if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg2_unversioned.Time{} + x.LastTransitionTime = pkg2_v1.Time{} } else { yyv2524 := &x.LastTransitionTime yym2525 := z.DecBinary() @@ -33285,7 +33285,7 @@ func (x *ReplicationControllerCondition) codecDecodeSelfFromArray(l int, d *code } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg2_unversioned.Time{} + x.LastTransitionTime = pkg2_v1.Time{} } else { yyv2531 := &x.LastTransitionTime yym2532 := z.DecBinary() @@ -33905,7 +33905,7 @@ func (x *ReplicationControllerList) codecDecodeSelfFromMap(l int, d *codec1978.D } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv2587 := &x.ListMeta yym2588 := z.DecBinary() @@ -33986,7 +33986,7 @@ func (x *ReplicationControllerList) codecDecodeSelfFromArray(l int, d *codec1978 } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv2594 := &x.ListMeta yym2595 := z.DecBinary() @@ -34249,7 +34249,7 @@ func (x *ServiceList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv2619 := &x.ListMeta yym2620 := z.DecBinary() @@ -34330,7 +34330,7 @@ func (x *ServiceList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv2626 := &x.ListMeta yym2627 := z.DecBinary() @@ -36879,7 +36879,7 @@ func (x *ServiceAccountList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv2849 := &x.ListMeta yym2850 := z.DecBinary() @@ -36960,7 +36960,7 @@ func (x *ServiceAccountList) codecDecodeSelfFromArray(l int, d *codec1978.Decode } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv2856 := &x.ListMeta yym2857 := z.DecBinary() @@ -38418,7 +38418,7 @@ func (x *EndpointsList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv2983 := &x.ListMeta yym2984 := z.DecBinary() @@ -38499,7 +38499,7 @@ func (x *EndpointsList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv2990 := &x.ListMeta yym2991 := z.DecBinary() @@ -41005,7 +41005,7 @@ func (x *PreferAvoidPodsEntry) codecDecodeSelfFromMap(l int, d *codec1978.Decode } case "evictionTime": if r.TryDecodeAsNil() { - x.EvictionTime = pkg2_unversioned.Time{} + x.EvictionTime = pkg2_v1.Time{} } else { yyv3207 := &x.EvictionTime yym3208 := z.DecBinary() @@ -41075,7 +41075,7 @@ func (x *PreferAvoidPodsEntry) codecDecodeSelfFromArray(l int, d *codec1978.Deco } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.EvictionTime = pkg2_unversioned.Time{} + x.EvictionTime = pkg2_v1.Time{} } else { yyv3213 := &x.EvictionTime yym3214 := z.DecBinary() @@ -41848,7 +41848,7 @@ func (x *NodeCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "lastHeartbeatTime": if r.TryDecodeAsNil() { - x.LastHeartbeatTime = pkg2_unversioned.Time{} + x.LastHeartbeatTime = pkg2_v1.Time{} } else { yyv3273 := &x.LastHeartbeatTime yym3274 := z.DecBinary() @@ -41865,7 +41865,7 @@ func (x *NodeCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "lastTransitionTime": if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg2_unversioned.Time{} + x.LastTransitionTime = pkg2_v1.Time{} } else { yyv3275 := &x.LastTransitionTime yym3276 := z.DecBinary() @@ -41950,7 +41950,7 @@ func (x *NodeCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastHeartbeatTime = pkg2_unversioned.Time{} + x.LastHeartbeatTime = pkg2_v1.Time{} } else { yyv3282 := &x.LastHeartbeatTime yym3283 := z.DecBinary() @@ -41977,7 +41977,7 @@ func (x *NodeCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg2_unversioned.Time{} + x.LastTransitionTime = pkg2_v1.Time{} } else { yyv3284 := &x.LastTransitionTime yym3285 := z.DecBinary() @@ -43041,7 +43041,7 @@ func (x *NodeList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv3369 := &x.ListMeta yym3370 := z.DecBinary() @@ -43122,7 +43122,7 @@ func (x *NodeList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv3376 := &x.ListMeta yym3377 := z.DecBinary() @@ -44121,7 +44121,7 @@ func (x *NamespaceList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv3458 := &x.ListMeta yym3459 := z.DecBinary() @@ -44202,7 +44202,7 @@ func (x *NamespaceList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv3465 := &x.ListMeta yym3466 := z.DecBinary() @@ -46073,7 +46073,7 @@ func (x *PodLogOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.SinceTime == nil { - x.SinceTime = new(pkg2_unversioned.Time) + x.SinceTime = new(pkg2_v1.Time) } yym3645 := z.DecBinary() _ = yym3645 @@ -46262,7 +46262,7 @@ func (x *PodLogOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } else { if x.SinceTime == nil { - x.SinceTime = new(pkg2_unversioned.Time) + x.SinceTime = new(pkg2_v1.Time) } yym3660 := z.DecBinary() _ = yym3660 @@ -49960,7 +49960,7 @@ func (x *Event) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "firstTimestamp": if r.TryDecodeAsNil() { - x.FirstTimestamp = pkg2_unversioned.Time{} + x.FirstTimestamp = pkg2_v1.Time{} } else { yyv3991 := &x.FirstTimestamp yym3992 := z.DecBinary() @@ -49977,7 +49977,7 @@ func (x *Event) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "lastTimestamp": if r.TryDecodeAsNil() { - x.LastTimestamp = pkg2_unversioned.Time{} + x.LastTimestamp = pkg2_v1.Time{} } else { yyv3993 := &x.LastTimestamp yym3994 := z.DecBinary() @@ -50145,7 +50145,7 @@ func (x *Event) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.FirstTimestamp = pkg2_unversioned.Time{} + x.FirstTimestamp = pkg2_v1.Time{} } else { yyv4005 := &x.FirstTimestamp yym4006 := z.DecBinary() @@ -50172,7 +50172,7 @@ func (x *Event) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastTimestamp = pkg2_unversioned.Time{} + x.LastTimestamp = pkg2_v1.Time{} } else { yyv4007 := &x.LastTimestamp yym4008 := z.DecBinary() @@ -50449,7 +50449,7 @@ func (x *EventList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv4032 := &x.ListMeta yym4033 := z.DecBinary() @@ -50530,7 +50530,7 @@ func (x *EventList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv4039 := &x.ListMeta yym4040 := z.DecBinary() @@ -50793,7 +50793,7 @@ func (x *List) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv4064 := &x.ListMeta yym4065 := z.DecBinary() @@ -50874,7 +50874,7 @@ func (x *List) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv4071 := &x.ListMeta yym4072 := z.DecBinary() @@ -52045,7 +52045,7 @@ func (x *LimitRangeList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv4161 := &x.ListMeta yym4162 := z.DecBinary() @@ -52126,7 +52126,7 @@ func (x *LimitRangeList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv4168 := &x.ListMeta yym4169 := z.DecBinary() @@ -53212,7 +53212,7 @@ func (x *ResourceQuotaList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv4254 := &x.ListMeta yym4255 := z.DecBinary() @@ -53293,7 +53293,7 @@ func (x *ResourceQuotaList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv4261 := &x.ListMeta yym4262 := z.DecBinary() @@ -53947,7 +53947,7 @@ func (x *SecretList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv4319 := &x.ListMeta yym4320 := z.DecBinary() @@ -54028,7 +54028,7 @@ func (x *SecretList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv4326 := &x.ListMeta yym4327 := z.DecBinary() @@ -54618,7 +54618,7 @@ func (x *ConfigMapList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv4379 := &x.ListMeta yym4380 := z.DecBinary() @@ -54699,7 +54699,7 @@ func (x *ConfigMapList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv4386 := &x.ListMeta yym4387 := z.DecBinary() @@ -55620,7 +55620,7 @@ func (x *ComponentStatusList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv4465 := &x.ListMeta yym4466 := z.DecBinary() @@ -55701,7 +55701,7 @@ func (x *ComponentStatusList) codecDecodeSelfFromArray(l int, d *codec1978.Decod } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv4472 := &x.ListMeta yym4473 := z.DecBinary() diff --git a/pkg/api/types.go b/pkg/api/types.go index 8c1122b8aab..502e7af6938 100644 --- a/pkg/api/types.go +++ b/pkg/api/types.go @@ -432,7 +432,7 @@ type PersistentVolumeList struct { metav1.TypeMeta `json:",inline"` // +optional metav1.ListMeta `json:"metadata,omitempty"` - Items []PersistentVolume `json:"items"` + Items []PersistentVolume `json:"items"` } // +genclient=true @@ -456,7 +456,7 @@ type PersistentVolumeClaimList struct { metav1.TypeMeta `json:",inline"` // +optional metav1.ListMeta `json:"metadata,omitempty"` - Items []PersistentVolumeClaim `json:"items"` + Items []PersistentVolumeClaim `json:"items"` } // PersistentVolumeClaimSpec describes the common attributes of storage devices diff --git a/pkg/api/v1/conversion_test.go b/pkg/api/v1/conversion_test.go index 6ea9da848d6..1060ac55411 100644 --- a/pkg/api/v1/conversion_test.go +++ b/pkg/api/v1/conversion_test.go @@ -24,8 +24,8 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" versioned "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/util/diff" ) diff --git a/pkg/api/v1/generated.pb.go b/pkg/api/v1/generated.pb.go index e8b52d3b09b..23220136a93 100644 --- a/pkg/api/v1/generated.pb.go +++ b/pkg/api/v1/generated.pb.go @@ -190,7 +190,7 @@ import fmt "fmt" import math "math" import k8s_io_kubernetes_pkg_api_resource "k8s.io/kubernetes/pkg/api/resource" -import k8s_io_kubernetes_pkg_api_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" +import k8s_io_kubernetes_pkg_apis_meta_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" import k8s_io_kubernetes_pkg_runtime "k8s.io/kubernetes/pkg/runtime" import k8s_io_kubernetes_pkg_types "k8s.io/kubernetes/pkg/types" @@ -11118,7 +11118,7 @@ func (this *ComponentStatusList) String() string { return "nil" } s := strings.Join([]string{`&ComponentStatusList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "ComponentStatus", "ComponentStatus", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -11161,7 +11161,7 @@ func (this *ConfigMapList) String() string { return "nil" } s := strings.Join([]string{`&ConfigMapList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "ConfigMap", "ConfigMap", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -11248,7 +11248,7 @@ func (this *ContainerStateRunning) String() string { return "nil" } s := strings.Join([]string{`&ContainerStateRunning{`, - `StartedAt:` + strings.Replace(strings.Replace(this.StartedAt.String(), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1), `&`, ``, 1) + `,`, + `StartedAt:` + strings.Replace(strings.Replace(this.StartedAt.String(), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1), `&`, ``, 1) + `,`, `}`, }, "") return s @@ -11262,8 +11262,8 @@ func (this *ContainerStateTerminated) String() string { `Signal:` + fmt.Sprintf("%v", this.Signal) + `,`, `Reason:` + fmt.Sprintf("%v", this.Reason) + `,`, `Message:` + fmt.Sprintf("%v", this.Message) + `,`, - `StartedAt:` + strings.Replace(strings.Replace(this.StartedAt.String(), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1), `&`, ``, 1) + `,`, - `FinishedAt:` + strings.Replace(strings.Replace(this.FinishedAt.String(), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1), `&`, ``, 1) + `,`, + `StartedAt:` + strings.Replace(strings.Replace(this.StartedAt.String(), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1), `&`, ``, 1) + `,`, + `FinishedAt:` + strings.Replace(strings.Replace(this.FinishedAt.String(), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1), `&`, ``, 1) + `,`, `ContainerID:` + fmt.Sprintf("%v", this.ContainerID) + `,`, `}`, }, "") @@ -11406,7 +11406,7 @@ func (this *EndpointsList) String() string { return "nil" } s := strings.Join([]string{`&EndpointsList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "Endpoints", "Endpoints", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -11447,8 +11447,8 @@ func (this *Event) String() string { `Reason:` + fmt.Sprintf("%v", this.Reason) + `,`, `Message:` + fmt.Sprintf("%v", this.Message) + `,`, `Source:` + strings.Replace(strings.Replace(this.Source.String(), "EventSource", "EventSource", 1), `&`, ``, 1) + `,`, - `FirstTimestamp:` + strings.Replace(strings.Replace(this.FirstTimestamp.String(), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1), `&`, ``, 1) + `,`, - `LastTimestamp:` + strings.Replace(strings.Replace(this.LastTimestamp.String(), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1), `&`, ``, 1) + `,`, + `FirstTimestamp:` + strings.Replace(strings.Replace(this.FirstTimestamp.String(), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1), `&`, ``, 1) + `,`, + `LastTimestamp:` + strings.Replace(strings.Replace(this.LastTimestamp.String(), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1), `&`, ``, 1) + `,`, `Count:` + fmt.Sprintf("%v", this.Count) + `,`, `Type:` + fmt.Sprintf("%v", this.Type) + `,`, `}`, @@ -11460,7 +11460,7 @@ func (this *EventList) String() string { return "nil" } s := strings.Join([]string{`&EventList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "Event", "Event", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -11738,7 +11738,7 @@ func (this *LimitRangeList) String() string { return "nil" } s := strings.Join([]string{`&LimitRangeList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "LimitRange", "LimitRange", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -11759,7 +11759,7 @@ func (this *List) String() string { return "nil" } s := strings.Join([]string{`&List{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "RawExtension", "k8s_io_kubernetes_pkg_runtime.RawExtension", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -11839,7 +11839,7 @@ func (this *NamespaceList) String() string { return "nil" } s := strings.Join([]string{`&NamespaceList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "Namespace", "Namespace", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -11906,8 +11906,8 @@ func (this *NodeCondition) String() string { s := strings.Join([]string{`&NodeCondition{`, `Type:` + fmt.Sprintf("%v", this.Type) + `,`, `Status:` + fmt.Sprintf("%v", this.Status) + `,`, - `LastHeartbeatTime:` + strings.Replace(strings.Replace(this.LastHeartbeatTime.String(), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1), `&`, ``, 1) + `,`, - `LastTransitionTime:` + strings.Replace(strings.Replace(this.LastTransitionTime.String(), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1), `&`, ``, 1) + `,`, + `LastHeartbeatTime:` + strings.Replace(strings.Replace(this.LastHeartbeatTime.String(), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1), `&`, ``, 1) + `,`, + `LastTransitionTime:` + strings.Replace(strings.Replace(this.LastTransitionTime.String(), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1), `&`, ``, 1) + `,`, `Reason:` + fmt.Sprintf("%v", this.Reason) + `,`, `Message:` + fmt.Sprintf("%v", this.Message) + `,`, `}`, @@ -11929,7 +11929,7 @@ func (this *NodeList) String() string { return "nil" } s := strings.Join([]string{`&NodeList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "Node", "Node", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -12111,8 +12111,8 @@ func (this *ObjectMeta) String() string { `UID:` + fmt.Sprintf("%v", this.UID) + `,`, `ResourceVersion:` + fmt.Sprintf("%v", this.ResourceVersion) + `,`, `Generation:` + fmt.Sprintf("%v", this.Generation) + `,`, - `CreationTimestamp:` + strings.Replace(strings.Replace(this.CreationTimestamp.String(), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1), `&`, ``, 1) + `,`, - `DeletionTimestamp:` + strings.Replace(fmt.Sprintf("%v", this.DeletionTimestamp), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1) + `,`, + `CreationTimestamp:` + strings.Replace(strings.Replace(this.CreationTimestamp.String(), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1), `&`, ``, 1) + `,`, + `DeletionTimestamp:` + strings.Replace(fmt.Sprintf("%v", this.DeletionTimestamp), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1) + `,`, `DeletionGracePeriodSeconds:` + valueToStringGenerated(this.DeletionGracePeriodSeconds) + `,`, `Labels:` + mapStringForLabels + `,`, `Annotations:` + mapStringForAnnotations + `,`, @@ -12182,7 +12182,7 @@ func (this *PersistentVolumeClaimList) String() string { return "nil" } s := strings.Join([]string{`&PersistentVolumeClaimList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "PersistentVolumeClaim", "PersistentVolumeClaim", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -12196,7 +12196,7 @@ func (this *PersistentVolumeClaimSpec) String() string { `AccessModes:` + fmt.Sprintf("%v", this.AccessModes) + `,`, `Resources:` + strings.Replace(strings.Replace(this.Resources.String(), "ResourceRequirements", "ResourceRequirements", 1), `&`, ``, 1) + `,`, `VolumeName:` + fmt.Sprintf("%v", this.VolumeName) + `,`, - `Selector:` + strings.Replace(fmt.Sprintf("%v", this.Selector), "LabelSelector", "k8s_io_kubernetes_pkg_api_unversioned.LabelSelector", 1) + `,`, + `Selector:` + strings.Replace(fmt.Sprintf("%v", this.Selector), "LabelSelector", "k8s_io_kubernetes_pkg_apis_meta_v1.LabelSelector", 1) + `,`, `}`, }, "") return s @@ -12239,7 +12239,7 @@ func (this *PersistentVolumeList) String() string { return "nil" } s := strings.Join([]string{`&PersistentVolumeList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "PersistentVolume", "PersistentVolume", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -12346,7 +12346,7 @@ func (this *PodAffinityTerm) String() string { return "nil" } s := strings.Join([]string{`&PodAffinityTerm{`, - `LabelSelector:` + strings.Replace(fmt.Sprintf("%v", this.LabelSelector), "LabelSelector", "k8s_io_kubernetes_pkg_api_unversioned.LabelSelector", 1) + `,`, + `LabelSelector:` + strings.Replace(fmt.Sprintf("%v", this.LabelSelector), "LabelSelector", "k8s_io_kubernetes_pkg_apis_meta_v1.LabelSelector", 1) + `,`, `Namespaces:` + fmt.Sprintf("%v", this.Namespaces) + `,`, `TopologyKey:` + fmt.Sprintf("%v", this.TopologyKey) + `,`, `}`, @@ -12385,8 +12385,8 @@ func (this *PodCondition) String() string { s := strings.Join([]string{`&PodCondition{`, `Type:` + fmt.Sprintf("%v", this.Type) + `,`, `Status:` + fmt.Sprintf("%v", this.Status) + `,`, - `LastProbeTime:` + strings.Replace(strings.Replace(this.LastProbeTime.String(), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1), `&`, ``, 1) + `,`, - `LastTransitionTime:` + strings.Replace(strings.Replace(this.LastTransitionTime.String(), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1), `&`, ``, 1) + `,`, + `LastProbeTime:` + strings.Replace(strings.Replace(this.LastProbeTime.String(), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1), `&`, ``, 1) + `,`, + `LastTransitionTime:` + strings.Replace(strings.Replace(this.LastTransitionTime.String(), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1), `&`, ``, 1) + `,`, `Reason:` + fmt.Sprintf("%v", this.Reason) + `,`, `Message:` + fmt.Sprintf("%v", this.Message) + `,`, `}`, @@ -12413,7 +12413,7 @@ func (this *PodList) String() string { return "nil" } s := strings.Join([]string{`&PodList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "Pod", "Pod", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -12428,7 +12428,7 @@ func (this *PodLogOptions) String() string { `Follow:` + fmt.Sprintf("%v", this.Follow) + `,`, `Previous:` + fmt.Sprintf("%v", this.Previous) + `,`, `SinceSeconds:` + valueToStringGenerated(this.SinceSeconds) + `,`, - `SinceTime:` + strings.Replace(fmt.Sprintf("%v", this.SinceTime), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1) + `,`, + `SinceTime:` + strings.Replace(fmt.Sprintf("%v", this.SinceTime), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1) + `,`, `Timestamps:` + fmt.Sprintf("%v", this.Timestamps) + `,`, `TailLines:` + valueToStringGenerated(this.TailLines) + `,`, `LimitBytes:` + valueToStringGenerated(this.LimitBytes) + `,`, @@ -12517,7 +12517,7 @@ func (this *PodStatus) String() string { `Reason:` + fmt.Sprintf("%v", this.Reason) + `,`, `HostIP:` + fmt.Sprintf("%v", this.HostIP) + `,`, `PodIP:` + fmt.Sprintf("%v", this.PodIP) + `,`, - `StartTime:` + strings.Replace(fmt.Sprintf("%v", this.StartTime), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1) + `,`, + `StartTime:` + strings.Replace(fmt.Sprintf("%v", this.StartTime), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1) + `,`, `ContainerStatuses:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.ContainerStatuses), "ContainerStatus", "ContainerStatus", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -12550,7 +12550,7 @@ func (this *PodTemplateList) String() string { return "nil" } s := strings.Join([]string{`&PodTemplateList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "PodTemplate", "PodTemplate", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -12583,7 +12583,7 @@ func (this *PreferAvoidPodsEntry) String() string { } s := strings.Join([]string{`&PreferAvoidPodsEntry{`, `PodSignature:` + strings.Replace(strings.Replace(this.PodSignature.String(), "PodSignature", "PodSignature", 1), `&`, ``, 1) + `,`, - `EvictionTime:` + strings.Replace(strings.Replace(this.EvictionTime.String(), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1), `&`, ``, 1) + `,`, + `EvictionTime:` + strings.Replace(strings.Replace(this.EvictionTime.String(), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1), `&`, ``, 1) + `,`, `Reason:` + fmt.Sprintf("%v", this.Reason) + `,`, `Message:` + fmt.Sprintf("%v", this.Message) + `,`, `}`, @@ -12678,7 +12678,7 @@ func (this *ReplicationControllerCondition) String() string { s := strings.Join([]string{`&ReplicationControllerCondition{`, `Type:` + fmt.Sprintf("%v", this.Type) + `,`, `Status:` + fmt.Sprintf("%v", this.Status) + `,`, - `LastTransitionTime:` + strings.Replace(strings.Replace(this.LastTransitionTime.String(), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1), `&`, ``, 1) + `,`, + `LastTransitionTime:` + strings.Replace(strings.Replace(this.LastTransitionTime.String(), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1), `&`, ``, 1) + `,`, `Reason:` + fmt.Sprintf("%v", this.Reason) + `,`, `Message:` + fmt.Sprintf("%v", this.Message) + `,`, `}`, @@ -12690,7 +12690,7 @@ func (this *ReplicationControllerList) String() string { return "nil" } s := strings.Join([]string{`&ReplicationControllerList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "ReplicationController", "ReplicationController", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -12763,7 +12763,7 @@ func (this *ResourceQuotaList) String() string { return "nil" } s := strings.Join([]string{`&ResourceQuotaList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "ResourceQuota", "ResourceQuota", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -12914,7 +12914,7 @@ func (this *SecretList) String() string { return "nil" } s := strings.Join([]string{`&SecretList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "Secret", "Secret", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -12986,7 +12986,7 @@ func (this *ServiceAccountList) String() string { return "nil" } s := strings.Join([]string{`&ServiceAccountList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "ServiceAccount", "ServiceAccount", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -12997,7 +12997,7 @@ func (this *ServiceList) String() string { return "nil" } s := strings.Join([]string{`&ServiceList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "Service", "Service", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -26009,7 +26009,7 @@ func (m *ObjectMeta) Unmarshal(data []byte) error { return io.ErrUnexpectedEOF } if m.DeletionTimestamp == nil { - m.DeletionTimestamp = &k8s_io_kubernetes_pkg_api_unversioned.Time{} + m.DeletionTimestamp = &k8s_io_kubernetes_pkg_apis_meta_v1.Time{} } if err := m.DeletionTimestamp.Unmarshal(data[iNdEx:postIndex]); err != nil { return err @@ -27342,7 +27342,7 @@ func (m *PersistentVolumeClaimSpec) Unmarshal(data []byte) error { return io.ErrUnexpectedEOF } if m.Selector == nil { - m.Selector = &k8s_io_kubernetes_pkg_api_unversioned.LabelSelector{} + m.Selector = &k8s_io_kubernetes_pkg_apis_meta_v1.LabelSelector{} } if err := m.Selector.Unmarshal(data[iNdEx:postIndex]); err != nil { return err @@ -29254,7 +29254,7 @@ func (m *PodAffinityTerm) Unmarshal(data []byte) error { return io.ErrUnexpectedEOF } if m.LabelSelector == nil { - m.LabelSelector = &k8s_io_kubernetes_pkg_api_unversioned.LabelSelector{} + m.LabelSelector = &k8s_io_kubernetes_pkg_apis_meta_v1.LabelSelector{} } if err := m.LabelSelector.Unmarshal(data[iNdEx:postIndex]); err != nil { return err @@ -30280,7 +30280,7 @@ func (m *PodLogOptions) Unmarshal(data []byte) error { return io.ErrUnexpectedEOF } if m.SinceTime == nil { - m.SinceTime = &k8s_io_kubernetes_pkg_api_unversioned.Time{} + m.SinceTime = &k8s_io_kubernetes_pkg_apis_meta_v1.Time{} } if err := m.SinceTime.Unmarshal(data[iNdEx:postIndex]); err != nil { return err @@ -31515,7 +31515,7 @@ func (m *PodStatus) Unmarshal(data []byte) error { return io.ErrUnexpectedEOF } if m.StartTime == nil { - m.StartTime = &k8s_io_kubernetes_pkg_api_unversioned.Time{} + m.StartTime = &k8s_io_kubernetes_pkg_apis_meta_v1.Time{} } if err := m.StartTime.Unmarshal(data[iNdEx:postIndex]); err != nil { return err @@ -39412,632 +39412,632 @@ var ( ) var fileDescriptorGenerated = []byte{ - // 10023 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xec, 0x7d, 0x6d, 0x6c, 0x25, 0xd7, - 0x75, 0x98, 0xe7, 0x3d, 0x7e, 0xbd, 0xc3, 0xcf, 0xbd, 0xfb, 0x21, 0x8a, 0x96, 0x96, 0xeb, 0x91, - 0x25, 0xaf, 0xa4, 0x15, 0xd7, 0xbb, 0x92, 0x2c, 0xd9, 0x52, 0x65, 0x93, 0x7c, 0xe4, 0x2e, 0xbd, - 0xcb, 0xdd, 0xa7, 0xfb, 0xb8, 0x5a, 0xd9, 0x56, 0x25, 0x0f, 0xdf, 0x5c, 0x92, 0xe3, 0x1d, 0xce, - 0x3c, 0xcd, 0xcc, 0xe3, 0x2e, 0xed, 0x06, 0x48, 0x1d, 0x35, 0x41, 0x11, 0x23, 0x75, 0xd1, 0x1a, - 0x2d, 0xd0, 0x16, 0x75, 0x0b, 0xb4, 0x48, 0x1b, 0x34, 0x8d, 0x53, 0x37, 0xb1, 0x5b, 0xc3, 0x28, - 0xd0, 0xd4, 0x70, 0x3f, 0x52, 0x38, 0x40, 0xd0, 0x04, 0x09, 0xc0, 0x46, 0x0c, 0x8a, 0xfe, 0xe8, - 0x8f, 0x16, 0xe8, 0xaf, 0x12, 0x41, 0x5b, 0xdc, 0xcf, 0xb9, 0x77, 0xde, 0x3c, 0xce, 0x3c, 0x6a, - 0xc9, 0xc8, 0x41, 0xfe, 0xbd, 0x77, 0xce, 0xb9, 0xe7, 0x7e, 0xcc, 0xb9, 0xe7, 0x9e, 0x7b, 0xee, - 0xb9, 0xe7, 0xc2, 0xa5, 0x7b, 0x2f, 0xc7, 0x73, 0x5e, 0x78, 0xf9, 0x5e, 0x67, 0x9d, 0x44, 0x01, - 0x49, 0x48, 0x7c, 0xb9, 0x7d, 0x6f, 0xf3, 0xb2, 0xd3, 0xf6, 0x2e, 0xef, 0x5c, 0xb9, 0xbc, 0x49, - 0x02, 0x12, 0x39, 0x09, 0x71, 0xe7, 0xda, 0x51, 0x98, 0x84, 0xe8, 0x31, 0x4e, 0x3d, 0x97, 0x52, - 0xcf, 0xb5, 0xef, 0x6d, 0xce, 0x39, 0x6d, 0x6f, 0x6e, 0xe7, 0xca, 0xcc, 0x73, 0x9b, 0x5e, 0xb2, - 0xd5, 0x59, 0x9f, 0x6b, 0x85, 0xdb, 0x97, 0x37, 0xc3, 0xcd, 0xf0, 0x32, 0x2b, 0xb4, 0xde, 0xd9, - 0x60, 0xff, 0xd8, 0x1f, 0xf6, 0x8b, 0x33, 0x9b, 0xb9, 0xda, 0xbb, 0xea, 0x88, 0xc4, 0x61, 0x27, - 0x6a, 0x91, 0x6c, 0x03, 0x66, 0x5e, 0xec, 0x5d, 0xa6, 0x13, 0xec, 0x90, 0x28, 0xf6, 0xc2, 0x80, - 0xb8, 0x5d, 0xc5, 0x9e, 0xcb, 0x2f, 0x16, 0x75, 0x82, 0xc4, 0xdb, 0xee, 0xae, 0xe5, 0x85, 0xc3, - 0xc9, 0xe3, 0xd6, 0x16, 0xd9, 0x76, 0xba, 0x4a, 0x5d, 0xc9, 0x2f, 0xd5, 0x49, 0x3c, 0xff, 0xb2, - 0x17, 0x24, 0x71, 0x12, 0x65, 0x8b, 0xd8, 0xbf, 0x67, 0xc1, 0x85, 0xf9, 0xbb, 0xcd, 0x25, 0xdf, - 0x89, 0x13, 0xaf, 0xb5, 0xe0, 0x87, 0xad, 0x7b, 0xcd, 0x24, 0x8c, 0xc8, 0x1b, 0xa1, 0xdf, 0xd9, - 0x26, 0x4d, 0x36, 0x06, 0xe8, 0x12, 0x8c, 0xec, 0xb0, 0xff, 0x2b, 0xf5, 0x69, 0xeb, 0x82, 0x75, - 0xb1, 0xb6, 0x30, 0xf5, 0xe3, 0xbd, 0xd9, 0x8f, 0xec, 0xef, 0xcd, 0x8e, 0xbc, 0x21, 0xe0, 0x58, - 0x51, 0xa0, 0xa7, 0x60, 0x68, 0x23, 0x5e, 0xdb, 0x6d, 0x93, 0xe9, 0x0a, 0xa3, 0x9d, 0x10, 0xb4, - 0x43, 0xcb, 0x4d, 0x0a, 0xc5, 0x02, 0x8b, 0x2e, 0x43, 0xad, 0xed, 0x44, 0x89, 0x97, 0x78, 0x61, - 0x30, 0x5d, 0xbd, 0x60, 0x5d, 0x1c, 0x5c, 0x38, 0x25, 0x48, 0x6b, 0x0d, 0x89, 0xc0, 0x29, 0x0d, - 0x6d, 0x46, 0x44, 0x1c, 0xf7, 0x76, 0xe0, 0xef, 0x4e, 0x0f, 0x5c, 0xb0, 0x2e, 0x8e, 0xa4, 0xcd, - 0xc0, 0x02, 0x8e, 0x15, 0x85, 0xfd, 0xbd, 0x0a, 0x8c, 0xcc, 0x6f, 0x6c, 0x78, 0x81, 0x97, 0xec, - 0xa2, 0x2f, 0xc3, 0x58, 0x10, 0xba, 0x44, 0xfe, 0x67, 0xbd, 0x18, 0xbd, 0xfa, 0xcc, 0xdc, 0x61, - 0xd2, 0x34, 0x77, 0x4b, 0x2b, 0xb1, 0x30, 0xb5, 0xbf, 0x37, 0x3b, 0xa6, 0x43, 0xb0, 0xc1, 0x11, - 0xbd, 0x05, 0xa3, 0xed, 0xd0, 0x55, 0x15, 0x54, 0x58, 0x05, 0x4f, 0x1f, 0x5e, 0x41, 0x23, 0x2d, - 0xb0, 0x30, 0xb9, 0xbf, 0x37, 0x3b, 0xaa, 0x01, 0xb0, 0xce, 0x0e, 0xf9, 0x30, 0x49, 0xff, 0x06, - 0x89, 0xa7, 0x6a, 0xa8, 0xb2, 0x1a, 0x9e, 0x2b, 0xae, 0x41, 0x2b, 0xb4, 0x70, 0x7a, 0x7f, 0x6f, - 0x76, 0x32, 0x03, 0xc4, 0x59, 0xd6, 0xf6, 0x57, 0x61, 0x62, 0x3e, 0x49, 0x9c, 0xd6, 0x16, 0x71, - 0xf9, 0xf7, 0x45, 0x2f, 0xc0, 0x40, 0xe0, 0x6c, 0x13, 0xf1, 0xf5, 0x2f, 0x88, 0x61, 0x1f, 0xb8, - 0xe5, 0x6c, 0x93, 0x83, 0xbd, 0xd9, 0xa9, 0x3b, 0x81, 0xf7, 0x6e, 0x47, 0xc8, 0x0c, 0x85, 0x61, - 0x46, 0x8d, 0xae, 0x02, 0xb8, 0x64, 0xc7, 0x6b, 0x91, 0x86, 0x93, 0x6c, 0x09, 0x69, 0x40, 0xa2, - 0x2c, 0xd4, 0x15, 0x06, 0x6b, 0x54, 0xf6, 0xd7, 0x2d, 0xa8, 0xcd, 0xef, 0x84, 0x9e, 0xdb, 0x08, - 0xdd, 0x18, 0x75, 0x60, 0xb2, 0x1d, 0x91, 0x0d, 0x12, 0x29, 0xd0, 0xb4, 0x75, 0xa1, 0x7a, 0x71, - 0xf4, 0xea, 0xd5, 0x82, 0x7e, 0x9b, 0x85, 0x96, 0x82, 0x24, 0xda, 0x5d, 0x78, 0x44, 0x54, 0x3d, - 0x99, 0xc1, 0xe2, 0x6c, 0x1d, 0xf6, 0x5f, 0xaf, 0xc0, 0xd9, 0xf9, 0xaf, 0x76, 0x22, 0x52, 0xf7, - 0xe2, 0x7b, 0xd9, 0xa9, 0xe0, 0x7a, 0xf1, 0xbd, 0x5b, 0xe9, 0x60, 0x28, 0x19, 0xac, 0x0b, 0x38, - 0x56, 0x14, 0xe8, 0x39, 0x18, 0xa6, 0xbf, 0xef, 0xe0, 0x15, 0xd1, 0xfb, 0xd3, 0x82, 0x78, 0xb4, - 0xee, 0x24, 0x4e, 0x9d, 0xa3, 0xb0, 0xa4, 0x41, 0xab, 0x30, 0xda, 0x72, 0x5a, 0x5b, 0x5e, 0xb0, - 0xb9, 0x1a, 0xba, 0x84, 0x7d, 0xe1, 0xda, 0xc2, 0xb3, 0x94, 0x7c, 0x31, 0x05, 0x1f, 0xec, 0xcd, - 0x4e, 0xf3, 0xb6, 0x09, 0x16, 0x1a, 0x0e, 0xeb, 0xe5, 0x91, 0xad, 0x26, 0xe2, 0x00, 0xe3, 0x04, - 0x39, 0x93, 0xf0, 0xa2, 0x36, 0xa7, 0x06, 0xd9, 0x9c, 0x1a, 0xeb, 0x31, 0x9f, 0xfe, 0xa9, 0x25, - 0xc6, 0x64, 0xd9, 0xf3, 0x4d, 0xf5, 0x70, 0x15, 0x20, 0x26, 0xad, 0x88, 0x24, 0xda, 0xa8, 0xa8, - 0xcf, 0xdc, 0x54, 0x18, 0xac, 0x51, 0xd1, 0xc9, 0x1f, 0x6f, 0x39, 0x11, 0x93, 0x16, 0x31, 0x36, - 0x6a, 0xf2, 0x37, 0x25, 0x02, 0xa7, 0x34, 0xc6, 0xe4, 0xaf, 0x16, 0x4e, 0xfe, 0x7f, 0x65, 0xc1, - 0xf0, 0x82, 0x17, 0xb8, 0x5e, 0xb0, 0x89, 0xde, 0x84, 0x91, 0x6d, 0x92, 0x38, 0xae, 0x93, 0x38, - 0x62, 0xde, 0x5f, 0x3c, 0x5c, 0x78, 0x6e, 0xaf, 0x7f, 0x85, 0xb4, 0x92, 0x55, 0x92, 0x38, 0x69, - 0x37, 0x52, 0x18, 0x56, 0xdc, 0xd0, 0x1d, 0x18, 0x4a, 0x9c, 0x68, 0x93, 0x24, 0x62, 0xba, 0x3f, - 0x57, 0x86, 0x2f, 0xa6, 0xa2, 0x46, 0x82, 0x16, 0x49, 0x15, 0xe3, 0x1a, 0x63, 0x82, 0x05, 0x33, - 0xbb, 0x05, 0x63, 0x8b, 0x4e, 0xdb, 0x59, 0xf7, 0x7c, 0x2f, 0xf1, 0x48, 0x8c, 0x3e, 0x01, 0x55, - 0xc7, 0x75, 0x99, 0xe0, 0xd7, 0x16, 0xce, 0xee, 0xef, 0xcd, 0x56, 0xe7, 0x5d, 0xf7, 0x60, 0x6f, - 0x16, 0x14, 0xd5, 0x2e, 0xa6, 0x14, 0xe8, 0x19, 0x18, 0x70, 0xa3, 0xb0, 0x3d, 0x5d, 0x61, 0x94, - 0xe7, 0xe8, 0x0c, 0xad, 0x47, 0x61, 0x3b, 0x43, 0xca, 0x68, 0xec, 0x7f, 0x57, 0x01, 0xb4, 0x48, - 0xda, 0x5b, 0xcb, 0x4d, 0xe3, 0x5b, 0x5e, 0x84, 0x91, 0xed, 0x30, 0xf0, 0x92, 0x30, 0x8a, 0x45, - 0x85, 0x4c, 0x1e, 0x56, 0x05, 0x0c, 0x2b, 0x2c, 0xba, 0x00, 0x03, 0xed, 0x74, 0x5a, 0x8f, 0x49, - 0x95, 0xc0, 0x26, 0x34, 0xc3, 0x50, 0x8a, 0x4e, 0x4c, 0x22, 0x21, 0xc7, 0x8a, 0xe2, 0x4e, 0x4c, - 0x22, 0xcc, 0x30, 0xa9, 0xe4, 0x50, 0x99, 0x12, 0x52, 0x9a, 0x91, 0x1c, 0x8a, 0xc1, 0x1a, 0x15, - 0x7a, 0x07, 0x6a, 0xfc, 0x1f, 0x26, 0x1b, 0x4c, 0x64, 0x0b, 0x95, 0xc1, 0xcd, 0xb0, 0xe5, 0xf8, - 0xd9, 0xc1, 0x1f, 0x67, 0x92, 0x26, 0x19, 0xe1, 0x94, 0xa7, 0x21, 0x69, 0x43, 0x85, 0x92, 0xf6, - 0xb7, 0x2d, 0x40, 0x8b, 0x5e, 0xe0, 0x92, 0xe8, 0x04, 0x96, 0xcc, 0xfe, 0x26, 0xc1, 0x1f, 0xd2, - 0xa6, 0x85, 0xdb, 0xed, 0x30, 0x20, 0x41, 0xb2, 0x18, 0x06, 0x2e, 0x5f, 0x46, 0x3f, 0x03, 0x03, - 0x09, 0xad, 0x8a, 0x37, 0xeb, 0x29, 0xf9, 0x59, 0x68, 0x05, 0x07, 0x7b, 0xb3, 0xe7, 0xba, 0x4b, - 0xb0, 0x26, 0xb0, 0x32, 0xe8, 0xd3, 0x30, 0x14, 0x27, 0x4e, 0xd2, 0x89, 0x45, 0x43, 0x3f, 0x26, - 0x1b, 0xda, 0x64, 0xd0, 0x83, 0xbd, 0xd9, 0x49, 0x55, 0x8c, 0x83, 0xb0, 0x28, 0x80, 0x9e, 0x86, - 0xe1, 0x6d, 0x12, 0xc7, 0xce, 0xa6, 0x54, 0x6c, 0x93, 0xa2, 0xec, 0xf0, 0x2a, 0x07, 0x63, 0x89, - 0x47, 0x4f, 0xc0, 0x20, 0x89, 0xa2, 0x30, 0x12, 0x12, 0x31, 0x2e, 0x08, 0x07, 0x97, 0x28, 0x10, - 0x73, 0x9c, 0xfd, 0x3b, 0x16, 0x4c, 0xaa, 0xb6, 0xf2, 0xba, 0x8e, 0x71, 0xaa, 0xbb, 0x00, 0x2d, - 0xd9, 0xb1, 0x98, 0x4d, 0xb0, 0xd1, 0xab, 0x9f, 0x3c, 0x9c, 0x77, 0xf7, 0x40, 0xa6, 0x75, 0x28, - 0x50, 0x8c, 0x35, 0xbe, 0xf6, 0x8f, 0x2d, 0x38, 0x9d, 0xe9, 0xd3, 0x4d, 0x2f, 0x4e, 0xd0, 0x5f, - 0xec, 0xea, 0xd7, 0xe5, 0x43, 0xea, 0xd6, 0xec, 0xd0, 0x39, 0x5a, 0x9c, 0x75, 0x4f, 0x09, 0x8a, - 0x84, 0x68, 0x9d, 0xc3, 0x30, 0xe8, 0x25, 0x64, 0x5b, 0xf6, 0xeb, 0xb9, 0x92, 0xfd, 0xe2, 0x0d, - 0x4c, 0x3f, 0xcf, 0x0a, 0xe5, 0x81, 0x39, 0x2b, 0xfb, 0x7f, 0x5b, 0x50, 0x5b, 0x0c, 0x83, 0x0d, - 0x6f, 0x73, 0xd5, 0x69, 0x1f, 0xe3, 0x87, 0x69, 0xc2, 0x00, 0xe3, 0xca, 0x9b, 0x7e, 0xa5, 0xa8, - 0xe9, 0xa2, 0x41, 0x73, 0x74, 0xf1, 0xe4, 0x56, 0x81, 0xd2, 0x4b, 0x14, 0x84, 0x19, 0xb3, 0x99, - 0x97, 0xa0, 0xa6, 0x08, 0xd0, 0x14, 0x54, 0xef, 0x11, 0x6e, 0x32, 0xd6, 0x30, 0xfd, 0x89, 0xce, - 0xc0, 0xe0, 0x8e, 0xe3, 0x77, 0xc4, 0x6c, 0xc5, 0xfc, 0xcf, 0x67, 0x2a, 0x2f, 0x5b, 0xf6, 0x0f, - 0x2c, 0x38, 0xa3, 0x2a, 0xb9, 0x41, 0x76, 0x9b, 0xc4, 0x27, 0xad, 0x24, 0x8c, 0xd0, 0x7b, 0x16, - 0x9c, 0xf1, 0x73, 0xf4, 0x90, 0x18, 0x8d, 0xa3, 0x68, 0xb0, 0xc7, 0x44, 0xc3, 0xcf, 0xe4, 0x61, - 0x71, 0x6e, 0x6d, 0xe8, 0x71, 0xde, 0x17, 0x3e, 0x79, 0x47, 0x05, 0x83, 0xea, 0x0d, 0xb2, 0xcb, - 0x3a, 0x46, 0x9b, 0x3f, 0xae, 0x9a, 0x7f, 0x12, 0x92, 0x77, 0xd3, 0x94, 0xbc, 0x4f, 0x94, 0xfc, - 0x7c, 0x3d, 0x64, 0xee, 0xef, 0x57, 0xe0, 0xac, 0xa2, 0x31, 0xd4, 0xf1, 0x87, 0x64, 0xf8, 0xfb, - 0xeb, 0xee, 0x0d, 0xb2, 0xbb, 0x16, 0xd2, 0xf5, 0x34, 0xbf, 0xbb, 0xe8, 0x0a, 0x8c, 0xba, 0x64, - 0xc3, 0xe9, 0xf8, 0x89, 0x32, 0x17, 0x07, 0xf9, 0x3e, 0xa2, 0x9e, 0x82, 0xb1, 0x4e, 0x63, 0xff, - 0x76, 0x8d, 0xcd, 0xca, 0xc4, 0xf1, 0x02, 0x12, 0xd1, 0x05, 0x5a, 0xb3, 0xea, 0xc7, 0x74, 0xab, - 0x5e, 0x58, 0xf0, 0x4f, 0xc0, 0xa0, 0xb7, 0x4d, 0x55, 0x76, 0xc5, 0xd4, 0xc4, 0x2b, 0x14, 0x88, - 0x39, 0x0e, 0x3d, 0x09, 0xc3, 0xad, 0x70, 0x7b, 0xdb, 0x09, 0xdc, 0xe9, 0x2a, 0x33, 0x19, 0x46, - 0xa9, 0x56, 0x5f, 0xe4, 0x20, 0x2c, 0x71, 0xe8, 0x31, 0x18, 0x70, 0xa2, 0xcd, 0x78, 0x7a, 0x80, - 0xd1, 0x8c, 0xd0, 0x9a, 0xe6, 0xa3, 0xcd, 0x18, 0x33, 0x28, 0x35, 0x05, 0xee, 0x87, 0xd1, 0x3d, - 0x2f, 0xd8, 0xac, 0x7b, 0x11, 0x5b, 0xd7, 0x35, 0x53, 0xe0, 0xae, 0xc2, 0x60, 0x8d, 0x0a, 0x35, - 0x60, 0xb0, 0x1d, 0x46, 0x49, 0x3c, 0x3d, 0xc4, 0x86, 0xf3, 0xd9, 0x42, 0xe9, 0xe1, 0xfd, 0x6e, - 0x84, 0x51, 0x92, 0x76, 0x85, 0xfe, 0x8b, 0x31, 0x67, 0x84, 0x16, 0xa1, 0x4a, 0x82, 0x9d, 0xe9, - 0x61, 0xc6, 0xef, 0xe3, 0x87, 0xf3, 0x5b, 0x0a, 0x76, 0xde, 0x70, 0xa2, 0x74, 0x16, 0x2d, 0x05, - 0x3b, 0x98, 0x96, 0x46, 0x2d, 0xa8, 0x49, 0xf7, 0x41, 0x3c, 0x3d, 0x52, 0x46, 0xc0, 0xb0, 0x20, - 0xc7, 0xe4, 0xdd, 0x8e, 0x17, 0x91, 0x6d, 0x12, 0x24, 0x71, 0x6a, 0x0f, 0x4b, 0x6c, 0x8c, 0x53, - 0xbe, 0xa8, 0x05, 0x63, 0xdc, 0x7c, 0x58, 0x0d, 0x3b, 0x41, 0x12, 0x4f, 0xd7, 0x58, 0x93, 0x0b, - 0x36, 0x9c, 0x6f, 0xa4, 0x25, 0x16, 0xce, 0x08, 0xf6, 0x63, 0x1a, 0x30, 0xc6, 0x06, 0x53, 0xf4, - 0x16, 0x8c, 0xfb, 0xde, 0x0e, 0x09, 0x48, 0x1c, 0x37, 0xa2, 0x70, 0x9d, 0x4c, 0x03, 0xeb, 0xcd, - 0x13, 0x45, 0x9b, 0xaf, 0x70, 0x9d, 0x2c, 0x9c, 0xda, 0xdf, 0x9b, 0x1d, 0xbf, 0xa9, 0x97, 0xc6, - 0x26, 0x33, 0xf4, 0x0e, 0x4c, 0x50, 0x5b, 0xc5, 0x4b, 0xd9, 0x8f, 0x96, 0x67, 0x8f, 0xf6, 0xf7, - 0x66, 0x27, 0xb0, 0x51, 0x1c, 0x67, 0xd8, 0xa1, 0x35, 0xa8, 0xf9, 0xde, 0x06, 0x69, 0xed, 0xb6, - 0x7c, 0x32, 0x3d, 0xc6, 0x78, 0x17, 0x4c, 0xb9, 0x9b, 0x92, 0x9c, 0xdb, 0x87, 0xea, 0x2f, 0x4e, - 0x19, 0xa1, 0x37, 0xe0, 0x5c, 0x42, 0xa2, 0x6d, 0x2f, 0x70, 0xe8, 0xa2, 0x2d, 0x8c, 0x17, 0xb6, - 0xc3, 0x1d, 0x67, 0x52, 0x7b, 0x5e, 0x0c, 0xec, 0xb9, 0xb5, 0x5c, 0x2a, 0xdc, 0xa3, 0x34, 0xba, - 0x0d, 0x93, 0x6c, 0x3e, 0x35, 0x3a, 0xbe, 0xdf, 0x08, 0x7d, 0xaf, 0xb5, 0x3b, 0x3d, 0xc1, 0x18, - 0x3e, 0x29, 0xf7, 0xad, 0x2b, 0x26, 0x9a, 0xda, 0xf5, 0xe9, 0x3f, 0x9c, 0x2d, 0x8d, 0x7c, 0x98, - 0x8c, 0x49, 0xab, 0x13, 0x79, 0xc9, 0x2e, 0x95, 0x7d, 0xf2, 0x20, 0x99, 0x9e, 0x2c, 0xb3, 0x4f, - 0x69, 0x9a, 0x85, 0xb8, 0xd3, 0x20, 0x03, 0xc4, 0x59, 0xd6, 0x54, 0x55, 0xc4, 0x89, 0xeb, 0x05, - 0xd3, 0x53, 0xcc, 0x30, 0x55, 0xf3, 0xab, 0x49, 0x81, 0x98, 0xe3, 0xd8, 0xb6, 0x8f, 0xfe, 0xb8, - 0x4d, 0x75, 0xef, 0x29, 0x46, 0x98, 0x6e, 0xfb, 0x24, 0x02, 0xa7, 0x34, 0x74, 0xc1, 0x4a, 0x92, - 0xdd, 0x69, 0xc4, 0x48, 0xd5, 0x54, 0x5b, 0x5b, 0xfb, 0x02, 0xa6, 0x70, 0x7b, 0x1d, 0x26, 0xd4, - 0xb4, 0x66, 0xa3, 0x83, 0x66, 0x61, 0x90, 0x6a, 0x2e, 0xb9, 0x7b, 0xa9, 0xd1, 0x26, 0x50, 0x85, - 0x16, 0x63, 0x0e, 0x67, 0x4d, 0xf0, 0xbe, 0x4a, 0x16, 0x76, 0x13, 0xc2, 0xad, 0xd8, 0xaa, 0xd6, - 0x04, 0x89, 0xc0, 0x29, 0x8d, 0xfd, 0x7f, 0xf9, 0xa2, 0x98, 0xea, 0x8e, 0x12, 0x7a, 0xf3, 0x12, - 0x8c, 0x6c, 0x85, 0x71, 0x42, 0xa9, 0x59, 0x1d, 0x83, 0xe9, 0x2a, 0x78, 0x5d, 0xc0, 0xb1, 0xa2, - 0x40, 0xaf, 0xc0, 0x78, 0x4b, 0xaf, 0x40, 0xa8, 0xf2, 0xb3, 0xa2, 0x88, 0x59, 0x3b, 0x36, 0x69, - 0xd1, 0xcb, 0x30, 0xc2, 0x5c, 0x79, 0xad, 0xd0, 0x17, 0xf6, 0xb2, 0x5c, 0x99, 0x46, 0x1a, 0x02, - 0x7e, 0xa0, 0xfd, 0xc6, 0x8a, 0x9a, 0xee, 0x3a, 0x68, 0x13, 0x56, 0x1a, 0x42, 0xdd, 0xaa, 0x5d, - 0xc7, 0x75, 0x06, 0xc5, 0x02, 0x6b, 0xff, 0x5a, 0x45, 0x1b, 0x65, 0x6a, 0xf4, 0x11, 0xf4, 0x45, - 0x18, 0xbe, 0xef, 0x78, 0x89, 0x17, 0x6c, 0x8a, 0x15, 0xf4, 0xf9, 0x92, 0xba, 0x97, 0x15, 0xbf, - 0xcb, 0x8b, 0xf2, 0x75, 0x42, 0xfc, 0xc1, 0x92, 0x21, 0xe5, 0x1d, 0x75, 0x82, 0x80, 0xf2, 0xae, - 0xf4, 0xcf, 0x1b, 0xf3, 0xa2, 0x9c, 0xb7, 0xf8, 0x83, 0x25, 0x43, 0xb4, 0x01, 0x20, 0x67, 0x1f, - 0x71, 0x85, 0x0b, 0xed, 0x53, 0xfd, 0xb0, 0x5f, 0x53, 0xa5, 0x17, 0x26, 0xe8, 0xca, 0x94, 0xfe, - 0xc7, 0x1a, 0x67, 0xbb, 0xc3, 0x0c, 0x91, 0xee, 0x66, 0xa1, 0xb7, 0xe8, 0x04, 0x70, 0xa2, 0x84, - 0xb8, 0xf3, 0x89, 0x18, 0xba, 0x67, 0x4b, 0x1a, 0x54, 0x6b, 0xde, 0x36, 0xd1, 0x67, 0x8b, 0xe0, - 0x82, 0x53, 0x86, 0xf6, 0xf7, 0xab, 0x30, 0xdd, 0xab, 0xbd, 0x54, 0x26, 0xc9, 0x03, 0x2f, 0x59, - 0xa4, 0xb6, 0x82, 0x65, 0xca, 0xe4, 0x92, 0x80, 0x63, 0x45, 0x41, 0x85, 0x23, 0xf6, 0x36, 0x03, - 0xc7, 0x17, 0xf2, 0xab, 0x84, 0xa3, 0xc9, 0xa0, 0x58, 0x60, 0x29, 0x5d, 0x44, 0x9c, 0x58, 0xb8, - 0x70, 0x35, 0x21, 0xc2, 0x0c, 0x8a, 0x05, 0x56, 0xdf, 0xfe, 0x0d, 0x14, 0x6c, 0xff, 0x8c, 0x31, - 0x1a, 0x7c, 0xc8, 0x63, 0x84, 0xde, 0x01, 0xd8, 0xf0, 0x02, 0x2f, 0xde, 0x62, 0xec, 0x87, 0xfa, - 0x67, 0xaf, 0xac, 0x92, 0x65, 0xc5, 0x06, 0x6b, 0x2c, 0xd1, 0x8b, 0x30, 0xaa, 0x66, 0xe8, 0x4a, - 0x7d, 0x7a, 0xd8, 0x74, 0xfc, 0xa5, 0xea, 0xaa, 0x8e, 0x75, 0x3a, 0xfb, 0x2b, 0x59, 0x91, 0x11, - 0x13, 0x43, 0x1b, 0x61, 0xab, 0xec, 0x08, 0x57, 0x0e, 0x1f, 0x61, 0xfb, 0xbf, 0x54, 0xe9, 0xde, - 0x59, 0xab, 0xac, 0x13, 0x97, 0x50, 0x6a, 0xaf, 0x53, 0x0d, 0xef, 0x24, 0x44, 0x4c, 0xcb, 0x4b, - 0xfd, 0xcc, 0x1b, 0x7d, 0x3d, 0xa0, 0xd3, 0x81, 0x73, 0x42, 0x5b, 0x50, 0xf3, 0x9d, 0x98, 0xed, - 0x24, 0x89, 0x98, 0x8e, 0xfd, 0xb1, 0x4d, 0xad, 0x70, 0x27, 0x4e, 0xb4, 0x05, 0x97, 0xd7, 0x92, - 0x32, 0xa7, 0xcb, 0x13, 0xb5, 0x0e, 0xe4, 0xc9, 0x81, 0x6a, 0x0e, 0x35, 0x21, 0x76, 0x31, 0xc7, - 0xa1, 0x97, 0x61, 0x2c, 0x22, 0x4c, 0x54, 0x16, 0xa9, 0x01, 0xc4, 0x84, 0x6f, 0x30, 0xb5, 0x94, - 0xb0, 0x86, 0xc3, 0x06, 0x65, 0x6a, 0x28, 0x0f, 0x1d, 0x62, 0x28, 0x3f, 0x0d, 0xc3, 0xec, 0x87, - 0x92, 0x0a, 0xf5, 0x85, 0x56, 0x38, 0x18, 0x4b, 0x7c, 0x56, 0x88, 0x46, 0x4a, 0x0a, 0xd1, 0x33, - 0x30, 0x51, 0x77, 0xc8, 0x76, 0x18, 0x2c, 0x05, 0x6e, 0x3b, 0xf4, 0x82, 0x04, 0x4d, 0xc3, 0x00, - 0x5b, 0x52, 0xf8, 0x8c, 0x1f, 0xa0, 0x1c, 0xf0, 0x00, 0x35, 0x76, 0xed, 0xff, 0x67, 0xc1, 0x78, - 0x9d, 0xf8, 0x24, 0x21, 0xb7, 0xdb, 0xcc, 0xfd, 0x80, 0x96, 0x01, 0x6d, 0x46, 0x4e, 0x8b, 0x34, - 0x48, 0xe4, 0x85, 0x6e, 0x93, 0xb4, 0xc2, 0x80, 0x39, 0xdc, 0xe9, 0x1a, 0x79, 0x6e, 0x7f, 0x6f, - 0x16, 0x5d, 0xeb, 0xc2, 0xe2, 0x9c, 0x12, 0xc8, 0x85, 0xf1, 0x76, 0x44, 0x0c, 0x7f, 0x89, 0x55, - 0x6c, 0x9f, 0x37, 0xf4, 0x22, 0xdc, 0x7c, 0x34, 0x40, 0xd8, 0x64, 0x8a, 0x3e, 0x07, 0x53, 0x61, - 0xd4, 0xde, 0x72, 0x82, 0x3a, 0x69, 0x93, 0xc0, 0xa5, 0x36, 0xb3, 0x70, 0x8a, 0x9d, 0xd9, 0xdf, - 0x9b, 0x9d, 0xba, 0x9d, 0xc1, 0xe1, 0x2e, 0x6a, 0xfb, 0x57, 0x2a, 0x70, 0xb6, 0x1e, 0xde, 0x0f, - 0xee, 0x3b, 0x91, 0x3b, 0xdf, 0x58, 0xe1, 0x86, 0x30, 0x73, 0x32, 0x4a, 0xe7, 0xa6, 0xd5, 0xd3, - 0xb9, 0xf9, 0x25, 0x18, 0xd9, 0xf0, 0x88, 0xef, 0x62, 0xb2, 0x21, 0xba, 0x77, 0xa5, 0x8c, 0x47, - 0x63, 0x99, 0x96, 0x91, 0x5e, 0x01, 0xee, 0x5b, 0x5d, 0x16, 0x6c, 0xb0, 0x62, 0x88, 0x3a, 0x30, - 0x25, 0x2d, 0x7d, 0x89, 0x15, 0xb3, 0xe3, 0xf9, 0x72, 0x1b, 0x09, 0xb3, 0x1a, 0x36, 0x1e, 0x38, - 0xc3, 0x10, 0x77, 0x55, 0x41, 0x77, 0x68, 0xdb, 0x74, 0x75, 0x18, 0x60, 0xb2, 0xc2, 0x76, 0x68, - 0x6c, 0x0b, 0xc9, 0xa0, 0xf6, 0x3f, 0xb6, 0xe0, 0x91, 0xae, 0xd1, 0x12, 0xfb, 0xeb, 0x37, 0xe5, - 0xc6, 0x96, 0x9f, 0xce, 0x14, 0xb4, 0x32, 0x77, 0xcc, 0xcb, 0x6d, 0x72, 0x2b, 0x25, 0x36, 0xb9, - 0xb7, 0xe1, 0xcc, 0xd2, 0x76, 0x3b, 0xd9, 0xad, 0x7b, 0xa6, 0x4f, 0xf6, 0x25, 0x18, 0xda, 0x26, - 0xae, 0xd7, 0xd9, 0x16, 0x9f, 0x75, 0x56, 0x2a, 0xd2, 0x55, 0x06, 0x3d, 0xd8, 0x9b, 0x1d, 0x6f, - 0x26, 0x61, 0xe4, 0x6c, 0x12, 0x0e, 0xc0, 0x82, 0xdc, 0x7e, 0xdf, 0x82, 0x49, 0x39, 0xa1, 0xe6, - 0x5d, 0x37, 0x22, 0x71, 0x8c, 0x66, 0xa0, 0xe2, 0xb5, 0x05, 0x23, 0x10, 0x8c, 0x2a, 0x2b, 0x0d, - 0x5c, 0xf1, 0xda, 0xe8, 0x8b, 0x50, 0xe3, 0xae, 0xfc, 0x54, 0x38, 0xfa, 0x3c, 0x1a, 0x60, 0xbb, - 0x8f, 0x35, 0xc9, 0x03, 0xa7, 0xec, 0xa4, 0x65, 0xc9, 0x54, 0x75, 0xd5, 0x74, 0x2c, 0x5f, 0x17, - 0x70, 0xac, 0x28, 0xd0, 0x45, 0x18, 0x09, 0x42, 0x97, 0x9f, 0xb2, 0xf0, 0x65, 0x97, 0x89, 0xdc, - 0x2d, 0x01, 0xc3, 0x0a, 0x6b, 0x7f, 0xc3, 0x82, 0x31, 0xd9, 0xc7, 0x92, 0x46, 0x2e, 0x9d, 0x24, - 0xa9, 0x81, 0x9b, 0x4e, 0x12, 0x6a, 0xa4, 0x32, 0x8c, 0x61, 0x9b, 0x56, 0xfb, 0xb1, 0x4d, 0xed, - 0xef, 0x57, 0x60, 0x42, 0x36, 0xa7, 0xd9, 0x59, 0x8f, 0x49, 0x82, 0xde, 0x86, 0x9a, 0xc3, 0x07, - 0x9f, 0x48, 0x39, 0x7b, 0xae, 0x68, 0x87, 0x6e, 0x7c, 0xb3, 0xd4, 0x30, 0x98, 0x97, 0x7c, 0x70, - 0xca, 0x12, 0xed, 0xc0, 0xa9, 0x20, 0x4c, 0xd8, 0x7a, 0xa0, 0xf0, 0xe5, 0x3c, 0xa2, 0xd9, 0x7a, - 0x1e, 0x15, 0xf5, 0x9c, 0xba, 0x95, 0xe5, 0x87, 0xbb, 0xab, 0x40, 0xb7, 0xa5, 0x17, 0xa3, 0xca, - 0xea, 0x7a, 0xa6, 0x5c, 0x5d, 0xbd, 0x9d, 0x18, 0xf6, 0x0f, 0x2d, 0xa8, 0x49, 0xb2, 0xe3, 0xf4, - 0x89, 0xdf, 0x85, 0xe1, 0x98, 0x7d, 0x1a, 0x39, 0x4c, 0x97, 0xca, 0x35, 0x9d, 0x7f, 0xcf, 0x74, - 0xf1, 0xe3, 0xff, 0x63, 0x2c, 0xb9, 0x31, 0x37, 0xa4, 0xea, 0xc0, 0x87, 0xcf, 0x0d, 0xa9, 0x9a, - 0xd6, 0xc3, 0x0d, 0xf9, 0xcb, 0x16, 0x0c, 0x71, 0xe7, 0x50, 0x39, 0x0f, 0x9b, 0xe6, 0x4b, 0x4e, - 0x39, 0xbe, 0x41, 0x81, 0xc2, 0xb5, 0x8c, 0xee, 0x42, 0x8d, 0xfd, 0x58, 0x8e, 0xc2, 0x6d, 0xb1, - 0x10, 0x3c, 0x53, 0xc6, 0x39, 0xc5, 0x15, 0x1f, 0xd7, 0x26, 0x6f, 0x48, 0x06, 0x38, 0xe5, 0x65, - 0xff, 0xa0, 0x4a, 0x67, 0x7d, 0x4a, 0x6a, 0x2c, 0x6b, 0xd6, 0x49, 0x2c, 0x6b, 0x95, 0xe3, 0x5f, - 0xd6, 0xde, 0x85, 0xc9, 0x96, 0xe6, 0x93, 0x4f, 0x17, 0xd3, 0xab, 0x25, 0xdd, 0xcd, 0x9a, 0x23, - 0x9f, 0x3b, 0x43, 0x16, 0x4d, 0x76, 0x38, 0xcb, 0x1f, 0x11, 0x18, 0xe3, 0x07, 0x8a, 0xa2, 0xbe, - 0x81, 0x42, 0x99, 0xe5, 0x7e, 0x17, 0x5e, 0x42, 0x55, 0xc6, 0x82, 0x4e, 0x9a, 0x1a, 0x23, 0x6c, - 0xb0, 0xb5, 0xff, 0xe6, 0x20, 0x0c, 0x2e, 0xed, 0x90, 0x20, 0x39, 0xc6, 0x59, 0xbe, 0x0d, 0x13, - 0x5e, 0xb0, 0x13, 0xfa, 0x3b, 0xc4, 0xe5, 0xf8, 0xa3, 0xad, 0x68, 0xe7, 0x44, 0x25, 0x13, 0x2b, - 0x06, 0x33, 0x9c, 0x61, 0x7e, 0x1c, 0xfb, 0xc9, 0xd7, 0x61, 0x88, 0x4b, 0x84, 0xd8, 0x4c, 0x16, - 0x38, 0x49, 0xd9, 0x80, 0x8a, 0x99, 0x93, 0xee, 0x7a, 0xb9, 0x7f, 0x56, 0x30, 0x42, 0xf7, 0x60, - 0x62, 0xc3, 0x8b, 0xe2, 0x84, 0x6e, 0x08, 0xe3, 0xc4, 0xd9, 0x6e, 0x1f, 0x65, 0x23, 0xa9, 0x86, - 0x64, 0xd9, 0x60, 0x85, 0x33, 0xac, 0xd1, 0x16, 0x8c, 0xd3, 0x7d, 0x4c, 0x5a, 0xd7, 0x70, 0xff, - 0x75, 0x29, 0x5f, 0xd2, 0x4d, 0x9d, 0x13, 0x36, 0x19, 0x53, 0x65, 0xd4, 0x62, 0x1b, 0x9f, 0x11, - 0xb6, 0xa4, 0x2b, 0x65, 0xc4, 0x77, 0x3c, 0x1c, 0x47, 0x75, 0x1a, 0x3b, 0x3f, 0xae, 0x99, 0x3a, - 0x2d, 0x3d, 0x25, 0xb6, 0xbf, 0x4b, 0x17, 0x20, 0x3a, 0x8a, 0x27, 0xa1, 0xbb, 0xaf, 0x9b, 0xba, - 0xfb, 0x89, 0x12, 0x1f, 0xb7, 0x87, 0xde, 0xfe, 0x32, 0x8c, 0x6a, 0xdf, 0x1e, 0x5d, 0x86, 0x5a, - 0x4b, 0x1e, 0x75, 0x0a, 0x05, 0xae, 0x0c, 0x08, 0x75, 0x06, 0x8a, 0x53, 0x1a, 0x3a, 0x30, 0xd4, - 0xf0, 0xca, 0x46, 0x44, 0x50, 0xb3, 0x0c, 0x33, 0x8c, 0xfd, 0x3c, 0xc0, 0xd2, 0x03, 0xd2, 0x9a, - 0x6f, 0xb1, 0x83, 0x78, 0xed, 0xdc, 0xc4, 0xea, 0x7d, 0x6e, 0x62, 0x7f, 0xc7, 0x82, 0x89, 0xe5, - 0x45, 0xc3, 0x92, 0x9d, 0x03, 0xe0, 0x16, 0xe1, 0xdd, 0xbb, 0xb7, 0xa4, 0xa7, 0x93, 0xbb, 0xa3, - 0x14, 0x14, 0x6b, 0x14, 0xe8, 0x51, 0xa8, 0xfa, 0x9d, 0x40, 0x18, 0x6a, 0xc3, 0xfb, 0x7b, 0xb3, - 0xd5, 0x9b, 0x9d, 0x00, 0x53, 0x98, 0x16, 0x7a, 0x50, 0x2d, 0x1d, 0x7a, 0x50, 0x1c, 0x7c, 0xf7, - 0xad, 0x2a, 0x4c, 0x2d, 0xfb, 0xe4, 0x81, 0xd1, 0xea, 0xa7, 0x60, 0xc8, 0x8d, 0xbc, 0x1d, 0x12, - 0x65, 0x1d, 0x19, 0x75, 0x06, 0xc5, 0x02, 0x5b, 0x3a, 0x1a, 0xc2, 0x88, 0x04, 0xa9, 0x1e, 0x73, - 0x24, 0x48, 0x61, 0x9f, 0xd1, 0x06, 0x0c, 0x87, 0x7c, 0x23, 0x3d, 0x3d, 0xc8, 0x44, 0xf1, 0x95, - 0xc3, 0x1b, 0x93, 0x1d, 0x9f, 0x39, 0xb1, 0x0d, 0xe7, 0xc7, 0xd2, 0x4a, 0x9d, 0x09, 0x28, 0x96, - 0xcc, 0x67, 0x3e, 0x03, 0x63, 0x3a, 0x65, 0x5f, 0xe7, 0xd3, 0x3f, 0x67, 0xc1, 0xe9, 0x65, 0x3f, - 0x6c, 0xdd, 0xcb, 0x84, 0xab, 0xbc, 0x08, 0xa3, 0x74, 0x32, 0xc5, 0x46, 0x0c, 0x97, 0x11, 0xac, - 0x26, 0x50, 0x58, 0xa7, 0xd3, 0x8a, 0xdd, 0xb9, 0xb3, 0x52, 0xcf, 0x8b, 0x71, 0x13, 0x28, 0xac, - 0xd3, 0xd9, 0xff, 0xd9, 0x82, 0xc7, 0xaf, 0x2d, 0x2e, 0x35, 0xe8, 0x44, 0x8f, 0x13, 0x12, 0x24, - 0x5d, 0x61, 0x76, 0x4f, 0xc1, 0x50, 0xdb, 0xd5, 0x9a, 0xa2, 0x44, 0xa0, 0x51, 0x67, 0xad, 0x10, - 0xd8, 0x0f, 0x4b, 0xac, 0xe9, 0x2f, 0x5b, 0x70, 0xfa, 0x9a, 0x97, 0x60, 0xd2, 0x0e, 0xb3, 0x91, - 0x71, 0x11, 0x69, 0x87, 0xb1, 0x97, 0x84, 0xd1, 0x6e, 0x36, 0x32, 0x0e, 0x2b, 0x0c, 0xd6, 0xa8, - 0x78, 0xcd, 0x3b, 0x1e, 0x55, 0x81, 0xa2, 0x53, 0x5a, 0xcd, 0x1c, 0x8e, 0x15, 0x05, 0xed, 0x98, - 0xeb, 0x45, 0xcc, 0x5a, 0xd8, 0x15, 0x33, 0x58, 0x75, 0xac, 0x2e, 0x11, 0x38, 0xa5, 0xb1, 0xff, - 0xae, 0x05, 0x67, 0xaf, 0xf9, 0x9d, 0x38, 0x21, 0xd1, 0x46, 0x6c, 0x34, 0xf6, 0x79, 0xa8, 0x11, - 0x69, 0xd9, 0x8a, 0xb6, 0xaa, 0x55, 0x43, 0x99, 0xbc, 0x3c, 0x2c, 0x4f, 0xd1, 0x95, 0x88, 0x02, - 0xeb, 0x2f, 0x66, 0xe9, 0x5f, 0x57, 0x60, 0xfc, 0xfa, 0xda, 0x5a, 0xe3, 0x1a, 0x49, 0x84, 0x96, - 0x2c, 0x76, 0xc5, 0x34, 0xb4, 0x7d, 0xe8, 0xe8, 0xd5, 0xb9, 0x1e, 0xb3, 0xae, 0x93, 0x78, 0xfe, - 0x1c, 0x8f, 0x82, 0x9e, 0x5b, 0x09, 0x92, 0xdb, 0x51, 0x33, 0x89, 0xbc, 0x60, 0x33, 0x77, 0xdf, - 0x2a, 0x35, 0x79, 0xb5, 0x97, 0x26, 0x47, 0xcf, 0xc3, 0x10, 0x0b, 0xc2, 0x96, 0xd6, 0xc7, 0x47, - 0x95, 0xa1, 0xc0, 0xa0, 0x07, 0x7b, 0xb3, 0xb5, 0x3b, 0x78, 0x85, 0xff, 0xc1, 0x82, 0x14, 0xbd, - 0x03, 0xa3, 0x5b, 0x49, 0xd2, 0xbe, 0x4e, 0x1c, 0x97, 0x44, 0x52, 0x4b, 0x14, 0xd8, 0x69, 0x74, - 0x30, 0x78, 0x81, 0x74, 0x62, 0xa5, 0xb0, 0x18, 0xeb, 0x1c, 0xed, 0x26, 0x40, 0x8a, 0x7b, 0x48, - 0x9b, 0x0f, 0xfb, 0x2f, 0x57, 0x60, 0xf8, 0xba, 0x13, 0xb8, 0x3e, 0x89, 0xd0, 0x32, 0x0c, 0x90, - 0x07, 0xa4, 0x55, 0xce, 0xc4, 0x4c, 0x97, 0x3a, 0xee, 0x4b, 0xa2, 0xff, 0x31, 0x2b, 0x8f, 0x30, - 0x0c, 0xd3, 0x76, 0x5f, 0x53, 0xa1, 0x93, 0xcf, 0x16, 0x8f, 0x82, 0x12, 0x09, 0xbe, 0x4e, 0x0a, - 0x10, 0x96, 0x8c, 0x98, 0xd7, 0xa5, 0xd5, 0x6e, 0x52, 0xe5, 0x96, 0x94, 0x8b, 0x8e, 0x5e, 0x5b, - 0x6c, 0x70, 0x72, 0xc1, 0x97, 0x7b, 0x5d, 0x24, 0x10, 0xa7, 0xec, 0xec, 0x97, 0xe1, 0x0c, 0x3b, - 0xb7, 0x73, 0x92, 0x2d, 0x63, 0xce, 0x14, 0x0a, 0xa7, 0xfd, 0x0f, 0x2a, 0x70, 0x6a, 0xa5, 0xb9, - 0xd8, 0x34, 0xfd, 0x65, 0x2f, 0xc3, 0x18, 0x5f, 0x9e, 0xa9, 0xd0, 0x39, 0xbe, 0x28, 0xaf, 0x1c, - 0xcd, 0x6b, 0x1a, 0x0e, 0x1b, 0x94, 0xe8, 0x71, 0xa8, 0x7a, 0xef, 0x06, 0xd9, 0x08, 0x9e, 0x95, - 0xd7, 0x6f, 0x61, 0x0a, 0xa7, 0x68, 0xba, 0xd2, 0x73, 0x15, 0xa7, 0xd0, 0x6a, 0xb5, 0x7f, 0x0d, - 0x26, 0xbc, 0xb8, 0x15, 0x7b, 0x2b, 0x01, 0x9d, 0xff, 0x4e, 0x4b, 0x8a, 0x6f, 0x6a, 0x9d, 0xd3, - 0xa6, 0x2a, 0x2c, 0xce, 0x50, 0x6b, 0xfa, 0x76, 0xb0, 0xb4, 0xb5, 0x50, 0x1c, 0x43, 0xf9, 0x15, - 0xa8, 0xa9, 0x58, 0x17, 0x19, 0xa2, 0x64, 0xe5, 0x87, 0x28, 0x95, 0x50, 0x38, 0xd2, 0x8b, 0x59, - 0xcd, 0xf5, 0x62, 0xfe, 0x33, 0x0b, 0xd2, 0x63, 0x7d, 0x84, 0xa1, 0xd6, 0x0e, 0xd9, 0x11, 0x41, - 0x24, 0x8f, 0xe3, 0x9e, 0x2c, 0x90, 0x44, 0x3e, 0x13, 0xb8, 0xac, 0x34, 0x64, 0x59, 0x9c, 0xb2, - 0x41, 0x37, 0x61, 0xb8, 0x1d, 0x91, 0x66, 0xc2, 0x02, 0x71, 0xfb, 0xe0, 0xc8, 0xa4, 0xba, 0xc1, - 0x4b, 0x62, 0xc9, 0xc2, 0xfe, 0x0d, 0x0b, 0xe0, 0xa6, 0xb7, 0xed, 0x25, 0xd8, 0x09, 0x36, 0xc9, - 0x31, 0xee, 0xf3, 0x6e, 0xc1, 0x40, 0xdc, 0x26, 0xad, 0x72, 0x87, 0x3b, 0x69, 0x8b, 0x9a, 0x6d, - 0xd2, 0x4a, 0x3f, 0x03, 0xfd, 0x87, 0x19, 0x1f, 0xfb, 0x57, 0x01, 0x26, 0x52, 0x32, 0x6a, 0x68, - 0xa3, 0xe7, 0x8c, 0xc8, 0xd3, 0x47, 0x33, 0x91, 0xa7, 0x35, 0x46, 0xad, 0x05, 0x9b, 0x26, 0x50, - 0xdd, 0x76, 0x1e, 0x08, 0xbb, 0xfe, 0xc5, 0xb2, 0x0d, 0xa2, 0x35, 0xcd, 0xad, 0x3a, 0x0f, 0xb8, - 0x19, 0xf5, 0xac, 0x14, 0xa0, 0x55, 0xe7, 0xc1, 0x01, 0x3f, 0xc2, 0x61, 0x33, 0x90, 0x6e, 0x24, - 0xbe, 0xfe, 0x5f, 0xd3, 0xff, 0x4c, 0x29, 0xd2, 0xea, 0x58, 0xad, 0x5e, 0x20, 0x9c, 0x71, 0x7d, - 0xd6, 0xea, 0x05, 0xd9, 0x5a, 0xbd, 0xa0, 0x44, 0xad, 0x5e, 0x80, 0xde, 0xb3, 0x60, 0x58, 0xf8, - 0xb0, 0x59, 0x80, 0xd4, 0xe8, 0xd5, 0x4f, 0xf7, 0x55, 0xb5, 0x70, 0x86, 0xf3, 0xea, 0x2f, 0x4b, - 0xdb, 0x51, 0x40, 0x0b, 0x9b, 0x20, 0xab, 0x46, 0xdf, 0xb6, 0x60, 0x42, 0xfc, 0xc6, 0xe4, 0xdd, - 0x0e, 0x89, 0x13, 0xb1, 0x4a, 0x7d, 0xee, 0x28, 0xad, 0x11, 0x2c, 0x78, 0xa3, 0x3e, 0x25, 0x55, - 0x8c, 0x89, 0x2c, 0x6c, 0x5b, 0xa6, 0x3d, 0xe8, 0x7b, 0x16, 0x9c, 0xd9, 0x76, 0x1e, 0xf0, 0x1a, - 0x39, 0x0c, 0x3b, 0x89, 0x17, 0x8a, 0x20, 0xb0, 0xe5, 0x7e, 0xe5, 0xa4, 0x8b, 0x11, 0x6f, 0xee, - 0xab, 0xf2, 0x60, 0x31, 0x8f, 0xa4, 0xb0, 0xd1, 0xb9, 0x2d, 0x9c, 0x71, 0x61, 0x44, 0x0a, 0x66, - 0x8e, 0xd5, 0xbe, 0xa0, 0x2f, 0xc6, 0x87, 0xcf, 0x40, 0xe9, 0xe2, 0x9a, 0x7b, 0xbd, 0xe3, 0x04, - 0x89, 0x97, 0xec, 0x6a, 0x36, 0x3e, 0xab, 0x45, 0x08, 0xe2, 0x31, 0xd6, 0xb2, 0x05, 0x63, 0xba, - 0xcc, 0x1d, 0x63, 0x4d, 0x21, 0x9c, 0xce, 0x91, 0xa7, 0x63, 0xac, 0xb0, 0x03, 0x8f, 0xf6, 0x94, - 0x8b, 0xe3, 0xab, 0xd6, 0xfe, 0xa1, 0xa5, 0x2b, 0xcc, 0x93, 0x70, 0x9d, 0xac, 0x9a, 0xae, 0x93, - 0x8b, 0x65, 0xa7, 0x4e, 0x0f, 0xff, 0xc9, 0x86, 0xde, 0x7e, 0xba, 0x12, 0xa0, 0x35, 0x18, 0xf2, - 0x29, 0x44, 0x9e, 0xd7, 0x5c, 0xea, 0x67, 0x72, 0xa6, 0xc6, 0x05, 0x83, 0xc7, 0x58, 0xf0, 0xb2, - 0x7f, 0xd3, 0x82, 0x81, 0x93, 0x18, 0x9e, 0x86, 0x39, 0x3c, 0xbd, 0x4c, 0x54, 0x71, 0x29, 0x73, - 0x0e, 0x3b, 0xf7, 0x97, 0x1e, 0x24, 0x24, 0x88, 0x99, 0x29, 0x99, 0x3b, 0x42, 0xbf, 0x52, 0x81, - 0x51, 0x5a, 0x91, 0x3c, 0x70, 0x7f, 0x05, 0xc6, 0x7d, 0x67, 0x9d, 0xf8, 0xd2, 0xe1, 0x9b, 0xdd, - 0x76, 0xdd, 0xd4, 0x91, 0xd8, 0xa4, 0xa5, 0x85, 0x37, 0x74, 0x7f, 0xb8, 0x30, 0x89, 0x54, 0x61, - 0xc3, 0x59, 0x8e, 0x4d, 0x5a, 0x6a, 0xf9, 0xdf, 0x77, 0x92, 0xd6, 0x96, 0xd8, 0x92, 0xa9, 0xe6, - 0xde, 0xa5, 0x40, 0xcc, 0x71, 0x68, 0x1e, 0x26, 0xa5, 0xc4, 0xbe, 0xc1, 0x87, 0x4e, 0x98, 0x8b, - 0xea, 0x26, 0x1d, 0x36, 0xd1, 0x38, 0x4b, 0x8f, 0x3e, 0x03, 0x13, 0x74, 0x70, 0xc2, 0x4e, 0x22, - 0xc3, 0x09, 0x06, 0x59, 0x38, 0x01, 0x0b, 0xdf, 0x5c, 0x33, 0x30, 0x38, 0x43, 0x69, 0xbf, 0x03, - 0xa7, 0x6f, 0x86, 0x8e, 0xbb, 0xe0, 0xf8, 0x4e, 0xd0, 0x22, 0xd1, 0x4a, 0xb0, 0x59, 0x78, 0xf2, - 0xaa, 0x9f, 0x8e, 0x56, 0x8a, 0x4e, 0x47, 0xed, 0x08, 0x90, 0x5e, 0x81, 0x08, 0x84, 0x79, 0x0b, - 0x86, 0x3d, 0x5e, 0x95, 0x90, 0xda, 0x2b, 0x45, 0x4e, 0xa5, 0xae, 0x36, 0x6a, 0x81, 0x1d, 0x1c, - 0x80, 0x25, 0x4b, 0xba, 0x93, 0xc8, 0xf3, 0x42, 0x15, 0x6f, 0xd6, 0xec, 0xbf, 0x6a, 0xc1, 0xe4, - 0xad, 0xcc, 0x75, 0xad, 0xa7, 0x60, 0x28, 0x26, 0x51, 0x8e, 0x4b, 0xad, 0xc9, 0xa0, 0x58, 0x60, - 0x1f, 0xfa, 0x36, 0xfd, 0x17, 0x2b, 0x50, 0x63, 0x51, 0x95, 0x6d, 0xa7, 0x75, 0x9c, 0x46, 0xe9, - 0xaa, 0x61, 0x94, 0x16, 0x6c, 0x12, 0x55, 0x83, 0x7a, 0xd9, 0xa4, 0xe8, 0x8e, 0xba, 0xbe, 0x54, - 0x6a, 0x7f, 0x98, 0x32, 0xe4, 0x37, 0x5d, 0x26, 0xcc, 0xdb, 0x4e, 0xf2, 0x6a, 0x13, 0x3b, 0xaf, - 0x54, 0xb4, 0x1f, 0xbe, 0xf3, 0x4a, 0xd5, 0xb4, 0x1e, 0x5a, 0xa9, 0xa1, 0xb5, 0x9e, 0xa9, 0xed, - 0xcf, 0xb2, 0x10, 0x39, 0xc7, 0xf7, 0xbe, 0x4a, 0xd4, 0x35, 0xc0, 0x59, 0x11, 0xf1, 0x26, 0xa0, - 0x07, 0x4c, 0xc1, 0x88, 0x7f, 0xfc, 0x76, 0x67, 0x5a, 0xc4, 0xbe, 0x0e, 0x93, 0x99, 0xb1, 0x43, - 0x2f, 0xc2, 0x60, 0x7b, 0xcb, 0x89, 0x49, 0x26, 0xf6, 0x62, 0xb0, 0x41, 0x81, 0x07, 0x7b, 0xb3, - 0x13, 0xaa, 0x00, 0x83, 0x60, 0x4e, 0x6d, 0xff, 0x89, 0x05, 0x03, 0xb7, 0x42, 0xf7, 0x38, 0x65, - 0xec, 0xba, 0x21, 0x63, 0x4f, 0x15, 0xdf, 0x09, 0xef, 0x29, 0x5e, 0x8d, 0x8c, 0x78, 0x5d, 0x2c, - 0xc1, 0xeb, 0x70, 0xc9, 0xda, 0x86, 0x51, 0x76, 0xe7, 0x5c, 0x04, 0x9d, 0x3c, 0x6f, 0x6c, 0xa0, - 0x66, 0x33, 0x1b, 0xa8, 0x49, 0x8d, 0x54, 0xdb, 0x46, 0x3d, 0x0d, 0xc3, 0x22, 0xc8, 0x21, 0x1b, - 0x17, 0x28, 0x68, 0xb1, 0xc4, 0xdb, 0xbf, 0x5e, 0x05, 0xe3, 0x8e, 0x3b, 0xfa, 0x91, 0x05, 0x73, - 0x11, 0xbf, 0x94, 0xe0, 0xd6, 0x3b, 0x91, 0x17, 0x6c, 0x36, 0x5b, 0x5b, 0xc4, 0xed, 0xf8, 0x5e, - 0xb0, 0xb9, 0xb2, 0x19, 0x84, 0x0a, 0xbc, 0xf4, 0x80, 0xb4, 0x3a, 0xcc, 0xbb, 0x5a, 0xfa, 0x6a, - 0xbd, 0x3a, 0xe5, 0xbc, 0xba, 0xbf, 0x37, 0x3b, 0x87, 0xfb, 0xaa, 0x05, 0xf7, 0xd9, 0x2a, 0xf4, - 0xfb, 0x16, 0x5c, 0xe6, 0xb7, 0xbc, 0xcb, 0xf7, 0xa4, 0xd4, 0xc6, 0xb3, 0x21, 0x99, 0xa6, 0xec, - 0xd6, 0x48, 0xb4, 0xbd, 0xf0, 0x92, 0x18, 0xe4, 0xcb, 0x8d, 0xfe, 0x6a, 0xc5, 0xfd, 0x36, 0xd3, - 0xfe, 0xb7, 0x55, 0x18, 0xa7, 0xe3, 0x99, 0xde, 0xf0, 0x7c, 0xd1, 0x10, 0x93, 0x8f, 0x65, 0xc4, - 0xe4, 0x94, 0x41, 0xfc, 0x70, 0x2e, 0x77, 0x26, 0x70, 0xca, 0x77, 0xe2, 0xe4, 0x3a, 0x71, 0xa2, - 0x64, 0x9d, 0x38, 0xec, 0x48, 0x51, 0x4c, 0x82, 0xbe, 0x8e, 0x29, 0x55, 0xe4, 0xcc, 0xcd, 0x2c, - 0x37, 0xdc, 0x5d, 0x01, 0xba, 0x0f, 0x88, 0x9d, 0x5f, 0x46, 0x4e, 0x10, 0xf3, 0xce, 0x78, 0xc2, - 0x21, 0xdb, 0x67, 0xb5, 0x33, 0xa2, 0x5a, 0x74, 0xb3, 0x8b, 0x1d, 0xce, 0xa9, 0x42, 0x3b, 0xa4, - 0x1e, 0x2c, 0x7b, 0x48, 0x3d, 0x54, 0x10, 0x92, 0xfb, 0xf3, 0x16, 0x9c, 0xa6, 0x1f, 0xc6, 0x0c, - 0xdf, 0x8c, 0x51, 0x08, 0x93, 0xb4, 0x07, 0x3e, 0x49, 0x24, 0x4c, 0xcc, 0xb0, 0x02, 0x5b, 0xda, - 0xe4, 0x93, 0x5a, 0x6c, 0x37, 0x4c, 0x66, 0x38, 0xcb, 0xdd, 0xfe, 0x75, 0x0b, 0x58, 0x7c, 0xd8, - 0x49, 0xac, 0x63, 0xd7, 0xcc, 0x75, 0xcc, 0x2e, 0x56, 0x1a, 0x3d, 0x96, 0xb0, 0x17, 0x60, 0x8a, - 0x62, 0x1b, 0x51, 0xf8, 0x60, 0x57, 0x1a, 0xd7, 0xc5, 0xbe, 0xd9, 0xf7, 0x2a, 0x7c, 0xe6, 0xa8, - 0x0b, 0x56, 0xe8, 0x17, 0x2c, 0x18, 0x69, 0x39, 0x6d, 0xa7, 0xc5, 0x93, 0x84, 0x94, 0xf0, 0xc3, - 0x18, 0xe5, 0xe7, 0x16, 0x45, 0x59, 0xee, 0x43, 0xf8, 0xa4, 0xec, 0xba, 0x04, 0x17, 0xfa, 0x0d, - 0x54, 0xe5, 0x33, 0x1e, 0x8c, 0x1b, 0xcc, 0x8e, 0x71, 0xe3, 0xf9, 0x0b, 0x16, 0xd7, 0xfa, 0x6a, - 0x73, 0x70, 0x1f, 0x4e, 0x05, 0xda, 0x7f, 0xaa, 0xcf, 0xa4, 0x2d, 0x3c, 0x57, 0x5e, 0xaf, 0x33, - 0x35, 0xa8, 0x85, 0xc2, 0x65, 0x18, 0xe2, 0xee, 0x3a, 0xec, 0x7f, 0x68, 0xc1, 0x23, 0x3a, 0xa1, - 0x76, 0x1f, 0xae, 0xc8, 0x2f, 0x5c, 0x87, 0x91, 0xb0, 0x4d, 0x22, 0x27, 0xdd, 0x08, 0x5d, 0x94, - 0xa3, 0x7f, 0x5b, 0xc0, 0x0f, 0xf6, 0x66, 0xcf, 0xe8, 0xdc, 0x25, 0x1c, 0xab, 0x92, 0xc8, 0x86, - 0x21, 0x36, 0x2e, 0xb1, 0xb8, 0xc9, 0xc8, 0x52, 0x66, 0xb0, 0xd3, 0x90, 0x18, 0x0b, 0x8c, 0xfd, - 0xd7, 0x2c, 0x2e, 0x6c, 0x7a, 0xd3, 0xd1, 0xd7, 0x60, 0x6a, 0x9b, 0xee, 0x99, 0x96, 0x1e, 0xb4, - 0xe9, 0x4a, 0xca, 0x4e, 0x81, 0xad, 0x32, 0xeb, 0x47, 0x8f, 0xee, 0x2e, 0x4c, 0x8b, 0xd6, 0x4f, - 0xad, 0x66, 0xd8, 0xe2, 0xae, 0x8a, 0xec, 0x3f, 0x10, 0x53, 0x96, 0x19, 0x6f, 0x4f, 0xc3, 0x70, - 0x3b, 0x74, 0x17, 0x57, 0xea, 0x58, 0x8c, 0x95, 0xd2, 0x39, 0x0d, 0x0e, 0xc6, 0x12, 0x8f, 0xae, - 0x02, 0x90, 0x07, 0x09, 0x89, 0x02, 0xc7, 0x57, 0xa7, 0xb7, 0xca, 0x56, 0x5a, 0x52, 0x18, 0xac, - 0x51, 0xd1, 0x32, 0xed, 0x28, 0xdc, 0xf1, 0x5c, 0x16, 0x97, 0x5e, 0x35, 0xcb, 0x34, 0x14, 0x06, - 0x6b, 0x54, 0x74, 0xa7, 0xda, 0x09, 0x62, 0xbe, 0x8e, 0x39, 0xeb, 0x22, 0xd3, 0xc3, 0x48, 0xba, - 0x53, 0xbd, 0xa3, 0x23, 0xb1, 0x49, 0x6b, 0xff, 0x4e, 0x0d, 0x20, 0xb5, 0x94, 0xd0, 0x7b, 0xdd, - 0x33, 0xf4, 0x53, 0x65, 0xcd, 0xac, 0x87, 0x37, 0x3d, 0xd1, 0x37, 0x2d, 0x18, 0x75, 0x7c, 0x3f, - 0x6c, 0x39, 0x09, 0xeb, 0x51, 0xa5, 0xac, 0xae, 0x10, 0x2d, 0x99, 0x4f, 0xcb, 0xf2, 0xc6, 0x3c, - 0x2f, 0x0f, 0xf7, 0x34, 0x4c, 0x61, 0x7b, 0xf4, 0x26, 0xa0, 0x4f, 0x4a, 0x0b, 0x9b, 0x7f, 0x94, - 0x99, 0xac, 0x85, 0x5d, 0x63, 0x1a, 0x52, 0x33, 0xae, 0xd1, 0x3b, 0x46, 0x52, 0x83, 0x81, 0x32, - 0x97, 0x68, 0x0d, 0xdb, 0xa1, 0x28, 0x9f, 0x01, 0xfa, 0xa2, 0x1e, 0xb2, 0x3b, 0x58, 0xe6, 0x86, - 0xaa, 0x66, 0xc2, 0x16, 0x84, 0xeb, 0x26, 0x30, 0xe9, 0x9a, 0x6b, 0xa5, 0x88, 0xc1, 0xba, 0x52, - 0x5c, 0x43, 0x66, 0x91, 0x4d, 0x57, 0xc7, 0x0c, 0x02, 0x67, 0xab, 0x40, 0x5f, 0xe4, 0x01, 0xd5, - 0x2b, 0xc1, 0x46, 0x28, 0xc2, 0xb0, 0x2e, 0x95, 0xf8, 0xe6, 0xbb, 0x71, 0x42, 0xb6, 0x69, 0x99, - 0x74, 0x35, 0xbc, 0x25, 0xb8, 0x60, 0xc5, 0x0f, 0xad, 0xc1, 0x10, 0xbb, 0xfe, 0x11, 0x4f, 0x8f, - 0x94, 0xf1, 0x96, 0x99, 0x17, 0x1f, 0x53, 0x1b, 0x84, 0xfd, 0x8d, 0xb1, 0xe0, 0x85, 0xae, 0xcb, - 0x8b, 0xc2, 0xf1, 0x4a, 0x70, 0x27, 0x26, 0xec, 0xa2, 0x70, 0x6d, 0xe1, 0xe3, 0xe9, 0xcd, 0x5f, - 0x0e, 0xcf, 0x4d, 0xe3, 0x64, 0x94, 0xa4, 0xa6, 0x88, 0xf8, 0x2f, 0xb3, 0x43, 0x4d, 0x43, 0x99, - 0x86, 0x9a, 0xb9, 0xa4, 0xd2, 0xc1, 0x7e, 0xc3, 0x64, 0x86, 0xb3, 0xdc, 0x4f, 0x70, 0x0d, 0x9c, - 0xf1, 0x61, 0x2a, 0x3b, 0x25, 0x8f, 0x71, 0xc5, 0xfd, 0xe3, 0x01, 0x98, 0x30, 0x05, 0x03, 0x5d, - 0x86, 0xda, 0x36, 0xcb, 0xdd, 0x94, 0x66, 0x8c, 0x51, 0xf2, 0xbf, 0x2a, 0x11, 0x38, 0xa5, 0x61, - 0xb9, 0x73, 0x58, 0x71, 0x2d, 0xf4, 0x26, 0xcd, 0x9d, 0xa3, 0x30, 0x58, 0xa3, 0xa2, 0x76, 0xeb, - 0x7a, 0x18, 0x26, 0x4a, 0x71, 0x2b, 0x99, 0x59, 0x60, 0x50, 0x2c, 0xb0, 0x54, 0x61, 0xdf, 0xa3, - 0x1d, 0xf2, 0x4d, 0xb7, 0x9f, 0x52, 0xd8, 0x37, 0x74, 0x24, 0x36, 0x69, 0xe9, 0x02, 0x14, 0xc6, - 0x4c, 0x08, 0x85, 0x75, 0x9c, 0x86, 0x32, 0x35, 0xf9, 0x75, 0x28, 0x89, 0x47, 0x5f, 0x80, 0x47, - 0xd4, 0xed, 0x25, 0xcc, 0xdd, 0xa8, 0xb2, 0xc6, 0x21, 0x63, 0x8b, 0xfb, 0xc8, 0x62, 0x3e, 0x19, - 0xee, 0x55, 0x1e, 0xbd, 0x06, 0x13, 0xc2, 0xb2, 0x95, 0x1c, 0x87, 0xcd, 0x93, 0xee, 0x1b, 0x06, - 0x16, 0x67, 0xa8, 0x51, 0x1d, 0xa6, 0x28, 0x84, 0x59, 0x94, 0x92, 0x03, 0xbf, 0x85, 0xa5, 0x56, - 0xe6, 0x1b, 0x19, 0x3c, 0xee, 0x2a, 0x81, 0xe6, 0x61, 0x92, 0xdb, 0x16, 0x74, 0x23, 0xc7, 0xbe, - 0x83, 0x08, 0x9b, 0x54, 0x93, 0xe0, 0xb6, 0x89, 0xc6, 0x59, 0x7a, 0xf4, 0x32, 0x8c, 0x39, 0x51, - 0x6b, 0xcb, 0x4b, 0x48, 0x2b, 0xe9, 0x44, 0xfc, 0x0a, 0xbe, 0x16, 0x2a, 0x30, 0xaf, 0xe1, 0xb0, - 0x41, 0x69, 0x7f, 0x15, 0x4e, 0xe7, 0x44, 0x67, 0x53, 0xc1, 0x71, 0xda, 0x9e, 0xec, 0x53, 0x26, - 0x28, 0x69, 0xbe, 0xb1, 0x22, 0x7b, 0xa3, 0x51, 0x51, 0xe9, 0x64, 0xfe, 0x63, 0x2d, 0x91, 0x9b, - 0x92, 0xce, 0x65, 0x89, 0xc0, 0x29, 0x8d, 0xfd, 0x3f, 0x6a, 0xa0, 0x79, 0x5b, 0x4a, 0x84, 0xa2, - 0xbc, 0x0c, 0x63, 0x32, 0x37, 0xa1, 0x96, 0x13, 0x4c, 0x75, 0xf3, 0x9a, 0x86, 0xc3, 0x06, 0x25, - 0x6d, 0x5b, 0x20, 0x7d, 0x47, 0xd9, 0x10, 0x28, 0xe5, 0x54, 0xc2, 0x29, 0x0d, 0xba, 0x04, 0x23, - 0x31, 0xf1, 0x37, 0x6e, 0x7a, 0xc1, 0x3d, 0x21, 0xd8, 0x4a, 0x2b, 0x37, 0x05, 0x1c, 0x2b, 0x0a, - 0xf4, 0x39, 0xa8, 0x76, 0x3c, 0x57, 0x88, 0xf2, 0x9c, 0xb4, 0x3b, 0xef, 0xac, 0xd4, 0x0f, 0xf6, - 0x66, 0x67, 0xf3, 0x13, 0x2e, 0xd2, 0xdd, 0x74, 0x3c, 0x47, 0x27, 0x1f, 0x2d, 0x9a, 0xe7, 0x46, - 0x1f, 0xea, 0xd3, 0x8d, 0x7e, 0x15, 0x40, 0xf4, 0x59, 0x4a, 0x72, 0x35, 0xfd, 0x66, 0xd7, 0x14, - 0x06, 0x6b, 0x54, 0x74, 0x4f, 0xde, 0x8a, 0x88, 0x23, 0x37, 0xad, 0x3c, 0x74, 0x78, 0xe4, 0x03, - 0xec, 0xc9, 0x17, 0xb3, 0xdc, 0x70, 0x77, 0x05, 0xa8, 0x0d, 0xa7, 0x5c, 0x3a, 0x8f, 0x8c, 0x5a, - 0x6b, 0x47, 0x08, 0x58, 0xa6, 0x35, 0xd6, 0xb3, 0x9c, 0x70, 0x37, 0x73, 0xf4, 0x36, 0xcc, 0x48, - 0x60, 0xf7, 0xfd, 0x44, 0x36, 0x5d, 0xaa, 0x0b, 0xe7, 0xf7, 0xf7, 0x66, 0x67, 0xea, 0x3d, 0xa9, - 0xf0, 0x21, 0x1c, 0xd0, 0x5b, 0x30, 0xc4, 0x0e, 0x5e, 0xe2, 0xe9, 0x51, 0xb6, 0xda, 0xbd, 0x50, - 0xd6, 0xef, 0x38, 0xc7, 0x8e, 0x6f, 0x44, 0x3c, 0x67, 0x7a, 0x98, 0xc5, 0x80, 0x58, 0xf0, 0x44, - 0x6d, 0x18, 0x75, 0x82, 0x20, 0x4c, 0x1c, 0x6e, 0x84, 0x8d, 0x95, 0xb1, 0x23, 0xb5, 0x2a, 0xe6, - 0xd3, 0xb2, 0xbc, 0x1e, 0x15, 0x24, 0xa6, 0x61, 0xb0, 0x5e, 0x05, 0x5d, 0xc6, 0xc3, 0xfb, 0x54, - 0x61, 0xca, 0xb3, 0x87, 0x78, 0x7a, 0xbc, 0xcc, 0x32, 0x7e, 0xdb, 0x28, 0xa4, 0x69, 0x30, 0x93, - 0x19, 0xce, 0x72, 0x47, 0x73, 0x86, 0x3b, 0x79, 0x22, 0x8d, 0x56, 0x4e, 0xdd, 0xc9, 0xba, 0xf7, - 0x98, 0xdd, 0x7d, 0xe5, 0x11, 0x8a, 0x4c, 0x13, 0x4c, 0x66, 0xee, 0xbe, 0xa6, 0x28, 0xac, 0xd3, - 0xcd, 0x7c, 0x1a, 0x46, 0xb5, 0x01, 0xef, 0x27, 0x2c, 0x76, 0xe6, 0x35, 0x98, 0xca, 0x0e, 0x64, - 0x5f, 0x61, 0xb5, 0xff, 0xab, 0x02, 0x93, 0x39, 0x07, 0x3a, 0xf7, 0x3c, 0x16, 0xda, 0x6d, 0xa8, - 0xbc, 0x1b, 0x5e, 0xe0, 0x62, 0x86, 0x31, 0x15, 0x57, 0xa5, 0x84, 0xe2, 0x92, 0x5a, 0xb4, 0xda, - 0x53, 0x8b, 0x0a, 0x65, 0x35, 0x70, 0x74, 0x65, 0x65, 0xae, 0x0e, 0x83, 0xa5, 0x56, 0x87, 0x87, - 0xa0, 0xe0, 0x8c, 0x05, 0x66, 0xb8, 0xc4, 0x02, 0x73, 0x60, 0xc1, 0x84, 0x29, 0x79, 0x25, 0x46, - 0xfc, 0xc3, 0x3a, 0x80, 0x73, 0x6c, 0x23, 0x96, 0x44, 0xa1, 0xef, 0x93, 0x48, 0x04, 0xcc, 0x4d, - 0x88, 0x7d, 0x95, 0x80, 0x62, 0x8d, 0xc2, 0xfe, 0x76, 0x05, 0xa6, 0xd2, 0xe8, 0x69, 0x91, 0xa3, - 0xf5, 0xf8, 0x4e, 0x48, 0xd6, 0x8c, 0x13, 0x92, 0xa2, 0xd4, 0xab, 0x99, 0x76, 0xf5, 0x3c, 0x2d, - 0x79, 0x2b, 0x73, 0x5a, 0xf2, 0x42, 0x9f, 0x7c, 0x0f, 0x3f, 0x39, 0xf9, 0xe7, 0x15, 0x38, 0x9b, - 0x2d, 0xb2, 0xe8, 0x3b, 0xde, 0xf6, 0x31, 0x8e, 0xd3, 0x17, 0x8c, 0x71, 0x7a, 0xa9, 0xbf, 0xfe, - 0xb0, 0xc6, 0xf5, 0x1c, 0x2c, 0x27, 0x33, 0x58, 0x9f, 0x3e, 0x0a, 0xf3, 0xc3, 0x47, 0xec, 0x77, - 0x2d, 0x78, 0x34, 0xb7, 0xdc, 0x49, 0x78, 0x82, 0xdf, 0x34, 0x3d, 0xc1, 0xcf, 0x1f, 0xa1, 0x7b, - 0x3d, 0x5c, 0xc3, 0xff, 0xad, 0xd2, 0xa3, 0x5b, 0xcc, 0x5b, 0x76, 0x1b, 0x46, 0x9d, 0x56, 0x8b, - 0xc4, 0xf1, 0x6a, 0xe8, 0xaa, 0xa4, 0x41, 0xcf, 0xb1, 0xf5, 0x33, 0x05, 0x1f, 0xec, 0xcd, 0xce, - 0x64, 0x59, 0xa4, 0x68, 0xac, 0x73, 0x30, 0x93, 0x7f, 0x55, 0x8e, 0x29, 0xf9, 0xd7, 0x55, 0x80, - 0x1d, 0xb5, 0x4b, 0xcf, 0x3a, 0xe1, 0xb4, 0xfd, 0xbb, 0x46, 0x85, 0xde, 0x66, 0x56, 0x2f, 0x8f, - 0x14, 0x19, 0x28, 0x9c, 0x70, 0xc6, 0x07, 0xd4, 0xc3, 0x4e, 0xf8, 0xe5, 0x4e, 0xe5, 0xb1, 0x54, - 0x3c, 0xed, 0xef, 0x56, 0xe1, 0xa3, 0x87, 0x88, 0x1d, 0x9a, 0x37, 0x0f, 0x80, 0x9f, 0xcd, 0xba, - 0xa7, 0x66, 0x72, 0x0b, 0x1b, 0xfe, 0xaa, 0xcc, 0xc7, 0xaa, 0x7c, 0xe0, 0x8f, 0xf5, 0x2d, 0xdd, - 0x99, 0xc8, 0x23, 0x3e, 0xaf, 0x1d, 0x79, 0x62, 0xfd, 0x74, 0x3a, 0xff, 0xbf, 0x6e, 0xc1, 0xc7, - 0x72, 0x3b, 0x65, 0xc4, 0x99, 0x5c, 0x86, 0x5a, 0x8b, 0x02, 0xb5, 0x2b, 0x39, 0xe9, 0x5d, 0x38, - 0x89, 0xc0, 0x29, 0x8d, 0x11, 0x4e, 0x52, 0x29, 0x0c, 0x27, 0xf9, 0x0f, 0x16, 0x9c, 0xc9, 0x36, - 0xe2, 0x24, 0xb4, 0x4e, 0xd3, 0xd4, 0x3a, 0x73, 0xfd, 0x7d, 0xfb, 0x1e, 0x0a, 0xe7, 0xdb, 0xe3, - 0x70, 0xae, 0x6b, 0xb1, 0xe2, 0xc3, 0xf8, 0xb3, 0x16, 0x9c, 0xda, 0x64, 0xfb, 0x0b, 0xed, 0xe2, - 0x93, 0xe8, 0x58, 0xc1, 0x6d, 0xb1, 0x43, 0xef, 0x4b, 0xf1, 0xdd, 0x52, 0x17, 0x09, 0xee, 0xae, - 0x0c, 0x7d, 0xc3, 0x82, 0x33, 0xce, 0xfd, 0xb8, 0x2b, 0xe1, 0xbf, 0x90, 0xa3, 0xd7, 0x0a, 0x5c, - 0x79, 0x05, 0x4f, 0x05, 0x2c, 0x4c, 0xef, 0xef, 0xcd, 0x9e, 0xc9, 0xa3, 0xc2, 0xb9, 0xb5, 0xa2, - 0xb7, 0x44, 0xa2, 0x34, 0x6a, 0xf6, 0x95, 0xba, 0xc2, 0x97, 0x77, 0x0d, 0x83, 0xeb, 0x24, 0x89, - 0xc1, 0x8a, 0x23, 0xfa, 0x32, 0xd4, 0x36, 0xe5, 0x5d, 0x27, 0xa1, 0xf4, 0x0a, 0x56, 0x96, 0xdc, - 0xab, 0x51, 0x3c, 0xd8, 0x5f, 0xa1, 0x70, 0xca, 0x14, 0x5d, 0x87, 0x6a, 0xb0, 0x11, 0x8b, 0x8b, - 0xc5, 0x45, 0xe1, 0x44, 0x66, 0xf0, 0x16, 0xbf, 0x88, 0x79, 0x6b, 0xb9, 0x89, 0x29, 0x0b, 0xca, - 0x29, 0x5a, 0x77, 0x85, 0x0f, 0xbb, 0x80, 0x13, 0x5e, 0xa8, 0x77, 0x73, 0xc2, 0x0b, 0x75, 0x4c, - 0x59, 0xb0, 0xb8, 0xc5, 0xb8, 0x15, 0x7b, 0xc2, 0x41, 0x5d, 0x70, 0xeb, 0xbc, 0xeb, 0x72, 0x0a, - 0xcf, 0x99, 0xc7, 0xc0, 0x98, 0x33, 0x42, 0x6b, 0x30, 0xd4, 0x62, 0x39, 0xae, 0x85, 0xff, 0xa0, - 0x28, 0xf3, 0x71, 0x57, 0x3e, 0x6c, 0x7e, 0x90, 0xc6, 0xe1, 0x58, 0xf0, 0x62, 0x5c, 0x49, 0x7b, - 0x6b, 0x23, 0x16, 0xfe, 0x81, 0x22, 0xae, 0x5d, 0xd9, 0xca, 0x05, 0x57, 0x06, 0xc7, 0x82, 0x17, - 0xaa, 0x43, 0x65, 0xa3, 0x25, 0x12, 0x55, 0x16, 0xec, 0x68, 0xcd, 0x5b, 0xb5, 0x0b, 0x43, 0xfb, - 0x7b, 0xb3, 0x95, 0xe5, 0x45, 0x5c, 0xd9, 0x68, 0xa1, 0x37, 0x61, 0x78, 0x83, 0xdf, 0x93, 0x14, - 0x49, 0x29, 0xaf, 0x14, 0x5d, 0xe6, 0xec, 0xba, 0x54, 0xc9, 0x2f, 0x74, 0x08, 0x04, 0x96, 0xec, - 0xd0, 0xdb, 0x00, 0x1b, 0xea, 0xe6, 0xa7, 0xc8, 0x4a, 0x39, 0xd7, 0xdf, 0x4d, 0x51, 0xb1, 0x7b, - 0x56, 0x50, 0xac, 0x71, 0xa4, 0x32, 0xef, 0xc8, 0x34, 0xfd, 0x2c, 0x23, 0x65, 0xa1, 0xcc, 0xe7, - 0x66, 0xf5, 0xe7, 0x32, 0xaf, 0x50, 0x38, 0x65, 0x8a, 0x3a, 0x30, 0xbe, 0x13, 0xb7, 0xb7, 0x88, - 0x9c, 0xfa, 0x2c, 0x4d, 0xe5, 0xe8, 0xd5, 0x57, 0x0b, 0x72, 0x8f, 0x8a, 0x22, 0x5e, 0x94, 0x74, - 0x1c, 0xbf, 0x4b, 0x83, 0xb1, 0x7c, 0x4f, 0x6f, 0xe8, 0x6c, 0xb1, 0x59, 0x0b, 0xfd, 0x24, 0xef, - 0x76, 0xc2, 0xf5, 0xdd, 0x84, 0x88, 0x34, 0x96, 0x05, 0x9f, 0xe4, 0x75, 0x4e, 0xdc, 0xfd, 0x49, - 0x04, 0x02, 0x4b, 0x76, 0x6a, 0xc8, 0x98, 0x36, 0x9e, 0x2a, 0x3d, 0x64, 0x5d, 0x7d, 0x48, 0x87, - 0x8c, 0x69, 0xdf, 0x94, 0x29, 0xd3, 0xba, 0xed, 0xad, 0x30, 0x09, 0x83, 0x8c, 0xee, 0x3f, 0x55, - 0x46, 0xeb, 0x36, 0x72, 0x4a, 0x76, 0x6b, 0xdd, 0x3c, 0x2a, 0x9c, 0x5b, 0xab, 0xfd, 0x07, 0x83, - 0xdd, 0xeb, 0x2d, 0x33, 0x87, 0x7f, 0xa9, 0xfb, 0x74, 0xf5, 0x73, 0xfd, 0x6f, 0xf7, 0x1e, 0xe2, - 0x39, 0xeb, 0x37, 0x2c, 0x38, 0xd7, 0xce, 0x5d, 0x4c, 0xc5, 0x82, 0xd5, 0xef, 0xae, 0x91, 0x0f, - 0x98, 0xca, 0xd1, 0x9a, 0x8f, 0xc7, 0x3d, 0xea, 0xcc, 0x5a, 0xa0, 0xd5, 0x0f, 0x6c, 0x81, 0xde, - 0x85, 0x11, 0x66, 0x34, 0xa5, 0x49, 0x42, 0xfa, 0xcc, 0xab, 0xc1, 0x96, 0xbe, 0x45, 0xc1, 0x02, - 0x2b, 0x66, 0x74, 0xe0, 0x1e, 0xcf, 0x76, 0x02, 0x13, 0x86, 0x16, 0xc9, 0x65, 0xb9, 0x6b, 0x62, - 0x59, 0x8c, 0xc4, 0xe3, 0x8d, 0xc3, 0x88, 0x0f, 0x8a, 0x08, 0xf0, 0xe1, 0x95, 0x9d, 0xa4, 0x45, - 0xfb, 0x4f, 0xac, 0x1c, 0xfb, 0x8b, 0xef, 0x41, 0x5e, 0x35, 0xf7, 0x20, 0x4f, 0x65, 0xf7, 0x20, - 0x5d, 0x1e, 0x03, 0x63, 0xfb, 0x51, 0x3e, 0xc1, 0x62, 0xd9, 0x2c, 0x26, 0xb6, 0x0f, 0x17, 0x8a, - 0x26, 0x37, 0x8b, 0x63, 0x72, 0xd5, 0xa1, 0x60, 0x1a, 0xc7, 0xe4, 0xae, 0xd4, 0x31, 0xc3, 0x94, - 0xbd, 0x05, 0x6f, 0xff, 0x1f, 0x0b, 0xaa, 0x8d, 0xd0, 0x3d, 0x46, 0x0f, 0xc8, 0x35, 0xc3, 0x03, - 0xf2, 0x64, 0xe1, 0xe3, 0x44, 0x3d, 0xfd, 0x1d, 0xb7, 0x33, 0xfe, 0x8e, 0x4f, 0x14, 0xb3, 0x3a, - 0xdc, 0xbb, 0xf1, 0xbd, 0x2a, 0xe8, 0xcf, 0x2b, 0xa1, 0xdf, 0x3e, 0x4a, 0x64, 0x6b, 0xb5, 0xdc, - 0x8b, 0x4b, 0xa2, 0x0e, 0x16, 0x00, 0x25, 0xaf, 0xbd, 0xfd, 0xd4, 0x06, 0xb8, 0xde, 0x25, 0xde, - 0xe6, 0x56, 0x42, 0xdc, 0x6c, 0xc7, 0x4e, 0x2e, 0xc0, 0xf5, 0xbf, 0x5b, 0x30, 0x99, 0xa9, 0x1d, - 0x6d, 0xe7, 0xdd, 0x9c, 0x39, 0xaa, 0x4b, 0xe3, 0x54, 0xe1, 0x5d, 0x9b, 0x39, 0x00, 0xe5, 0x86, - 0x97, 0x8e, 0x07, 0x66, 0x84, 0x29, 0x3f, 0x7d, 0x8c, 0x35, 0x0a, 0xf4, 0x22, 0x8c, 0x26, 0x61, - 0x3b, 0xf4, 0xc3, 0xcd, 0xdd, 0x1b, 0x44, 0x26, 0x66, 0x50, 0x47, 0x18, 0x6b, 0x29, 0x0a, 0xeb, - 0x74, 0xf6, 0x0f, 0xaa, 0x90, 0x7d, 0x9d, 0xeb, 0xcf, 0x05, 0xf5, 0xa7, 0x47, 0x50, 0x7f, 0xcf, - 0x82, 0x29, 0x5a, 0x3b, 0x8b, 0x5f, 0x91, 0x61, 0xa8, 0x2a, 0x2f, 0xba, 0x75, 0x48, 0x5e, 0xf4, - 0xa7, 0xa8, 0xba, 0x73, 0xc3, 0x4e, 0x22, 0x9c, 0x25, 0x9a, 0x16, 0xa3, 0x50, 0x2c, 0xb0, 0x82, - 0x8e, 0x44, 0x91, 0xb8, 0xa3, 0xa3, 0xd3, 0x91, 0x28, 0xc2, 0x02, 0x2b, 0xd3, 0xa6, 0x0f, 0xe4, - 0xa7, 0x4d, 0xe7, 0xa9, 0x8d, 0x44, 0xdc, 0x84, 0xb0, 0x03, 0xb4, 0xd4, 0x46, 0x32, 0xa0, 0x22, - 0xa5, 0xb1, 0xff, 0x65, 0x15, 0xc6, 0x1a, 0xa1, 0x9b, 0x86, 0x98, 0xbf, 0x60, 0x84, 0x98, 0x5f, - 0xc8, 0x84, 0x98, 0x4f, 0xe9, 0xb4, 0x0f, 0x27, 0xc2, 0x5c, 0x24, 0xc1, 0x62, 0x89, 0xfd, 0x8f, - 0x1a, 0x5d, 0x6e, 0x24, 0xc1, 0x52, 0x9c, 0xb0, 0xc9, 0xf8, 0xcf, 0x54, 0x54, 0xf9, 0x9f, 0x58, - 0x30, 0xd1, 0x08, 0x5d, 0x2a, 0xa2, 0x7f, 0x96, 0xe4, 0x51, 0x4f, 0x9d, 0x35, 0x74, 0x48, 0xea, - 0xac, 0x5f, 0xb3, 0x60, 0xb8, 0x11, 0xba, 0x27, 0xe1, 0x4a, 0x5c, 0x36, 0x5d, 0x89, 0x1f, 0x2b, - 0x54, 0xbe, 0x3d, 0xbc, 0x87, 0xbf, 0x59, 0x85, 0x71, 0xda, 0xe4, 0x70, 0x53, 0x7e, 0x30, 0x63, - 0x70, 0xac, 0x12, 0x83, 0x43, 0xcd, 0xc1, 0xd0, 0xf7, 0xc3, 0xfb, 0xd9, 0x8f, 0xb7, 0xcc, 0xa0, - 0x58, 0x60, 0xd1, 0x25, 0x18, 0x69, 0x47, 0x64, 0xc7, 0x0b, 0x3b, 0x71, 0xf6, 0xca, 0x5f, 0x43, - 0xc0, 0xb1, 0xa2, 0x40, 0x2f, 0xc0, 0x58, 0xec, 0x05, 0x2d, 0x22, 0x03, 0x2b, 0x06, 0x58, 0x60, - 0x05, 0xcf, 0x50, 0xa8, 0xc1, 0xb1, 0x41, 0x85, 0xde, 0x84, 0x1a, 0xfb, 0xcf, 0xe6, 0xd0, 0x11, - 0x72, 0xb9, 0xf3, 0xe4, 0x5c, 0x92, 0x03, 0x4e, 0x99, 0xa1, 0xab, 0x00, 0x89, 0x8c, 0x01, 0x89, - 0xc5, 0x99, 0xa9, 0x32, 0x4e, 0x55, 0x74, 0x48, 0x8c, 0x35, 0x2a, 0xf4, 0x2c, 0xd4, 0x12, 0xc7, - 0xf3, 0x6f, 0x7a, 0x01, 0x89, 0x45, 0x14, 0x8d, 0xc8, 0xb4, 0x2b, 0x80, 0x38, 0xc5, 0xd3, 0x35, - 0x9f, 0x5d, 0x38, 0xe6, 0x2f, 0x45, 0x8c, 0x30, 0x6a, 0xb6, 0xe6, 0xdf, 0x54, 0x50, 0xac, 0x51, - 0xd8, 0xcf, 0xb3, 0xb5, 0xbb, 0xcf, 0x2b, 0x08, 0x3f, 0xa9, 0x00, 0x6a, 0xb0, 0x58, 0x13, 0xe3, - 0x31, 0x8d, 0x2d, 0x98, 0x88, 0xc9, 0x4d, 0x2f, 0xe8, 0x3c, 0x10, 0xac, 0xca, 0x5d, 0xfa, 0x68, - 0x2e, 0xe9, 0x65, 0xf8, 0x25, 0x5b, 0x13, 0x86, 0x33, 0x7c, 0xe9, 0x90, 0x44, 0x9d, 0x60, 0x3e, - 0xbe, 0x13, 0x93, 0x48, 0x3c, 0x87, 0xc1, 0x86, 0x04, 0x4b, 0x20, 0x4e, 0xf1, 0x54, 0x06, 0xd8, - 0x9f, 0x5b, 0x61, 0x80, 0xc3, 0x30, 0x91, 0x52, 0xc3, 0x72, 0xa3, 0x6b, 0x70, 0x6c, 0x50, 0xa1, - 0x65, 0x40, 0x71, 0xa7, 0xdd, 0xf6, 0xd9, 0xd1, 0x96, 0xe3, 0x5f, 0x8b, 0xc2, 0x4e, 0x9b, 0x87, - 0x1b, 0x8b, 0xb4, 0xe2, 0xcd, 0x2e, 0x2c, 0xce, 0x29, 0x41, 0x27, 0xfd, 0x46, 0xcc, 0x7e, 0x8b, - 0x4b, 0xc4, 0xdc, 0xc1, 0xd6, 0x64, 0x20, 0x2c, 0x71, 0x76, 0x87, 0x2d, 0x55, 0xec, 0x99, 0x82, - 0xa4, 0x13, 0x11, 0x44, 0x60, 0xbc, 0xcd, 0x96, 0x23, 0x79, 0xbe, 0x5e, 0x6a, 0x28, 0x33, 0xd1, - 0x2e, 0x3c, 0x1d, 0xb9, 0xce, 0x06, 0x9b, 0x5c, 0xed, 0xff, 0x04, 0x4c, 0xd7, 0x88, 0x53, 0xc5, - 0x61, 0x11, 0xcb, 0x2a, 0x6c, 0xb1, 0x8f, 0x97, 0x79, 0x97, 0x27, 0xd5, 0xe3, 0x22, 0x32, 0x16, - 0x4b, 0x2e, 0xe8, 0x4b, 0x3c, 0x40, 0x80, 0xcd, 0xef, 0xf2, 0x8f, 0x65, 0x71, 0x7a, 0x23, 0x4a, - 0x5b, 0xb0, 0xc0, 0x1a, 0x3b, 0x74, 0x13, 0xc6, 0x45, 0x2e, 0x7b, 0xe1, 0x19, 0xa8, 0x1a, 0xbb, - 0xe3, 0x71, 0xac, 0x23, 0x0f, 0xb2, 0x00, 0x6c, 0x16, 0x46, 0x9b, 0xf0, 0xb8, 0xf6, 0xc0, 0x4d, - 0x4e, 0x44, 0x16, 0x57, 0x1c, 0x1f, 0xdb, 0xdf, 0x9b, 0x7d, 0x7c, 0xed, 0x30, 0x42, 0x7c, 0x38, - 0x1f, 0x74, 0x1b, 0xce, 0x3a, 0xad, 0xc4, 0xdb, 0x21, 0x75, 0xe2, 0xb8, 0xbe, 0x17, 0x10, 0xf3, - 0x86, 0xf9, 0xa3, 0xfb, 0x7b, 0xb3, 0x67, 0xe7, 0xf3, 0x08, 0x70, 0x7e, 0x39, 0xf4, 0x2a, 0xd4, - 0xdc, 0x20, 0x16, 0x63, 0x30, 0x64, 0xbc, 0xe5, 0x53, 0xab, 0xdf, 0x6a, 0xaa, 0xfe, 0xa7, 0x7f, - 0x70, 0x5a, 0x00, 0xbd, 0xcb, 0x9f, 0x18, 0x56, 0x1b, 0x12, 0xfe, 0x86, 0xd4, 0x4b, 0xa5, 0xb6, - 0xc0, 0xc6, 0x2d, 0x10, 0xee, 0x34, 0x53, 0x91, 0x8f, 0xc6, 0x05, 0x11, 0xa3, 0x0a, 0xf4, 0x79, - 0x40, 0x31, 0x89, 0x76, 0xbc, 0x16, 0x99, 0x6f, 0xb1, 0xdc, 0x9c, 0xec, 0x78, 0x6e, 0xc4, 0x08, - 0xff, 0x47, 0xcd, 0x2e, 0x0a, 0x9c, 0x53, 0x0a, 0x5d, 0xa7, 0x1a, 0x47, 0x87, 0x8a, 0x40, 0x55, - 0x69, 0xda, 0x4d, 0xd7, 0x49, 0x3b, 0x22, 0x2d, 0x27, 0x21, 0xae, 0xc9, 0x11, 0x67, 0xca, 0xd1, - 0x65, 0x45, 0xe5, 0x1c, 0x07, 0x33, 0xbc, 0xb2, 0x3b, 0xef, 0x38, 0xdd, 0x29, 0x6d, 0x85, 0x71, - 0x72, 0x8b, 0x24, 0xf7, 0xc3, 0xe8, 0x1e, 0x73, 0xb6, 0x8f, 0x68, 0x99, 0xce, 0x52, 0x14, 0xd6, - 0xe9, 0xa8, 0x0d, 0xc4, 0x4e, 0x79, 0x56, 0xea, 0xcc, 0x85, 0x3e, 0x92, 0xce, 0x9d, 0xeb, 0x1c, - 0x8c, 0x25, 0x5e, 0x92, 0xae, 0x34, 0x16, 0x99, 0x3b, 0x3c, 0x43, 0xba, 0xd2, 0x58, 0xc4, 0x12, - 0x8f, 0xc2, 0xee, 0x17, 0x93, 0x26, 0xca, 0x1c, 0x4d, 0x74, 0x6b, 0xf0, 0x92, 0x8f, 0x26, 0x3d, - 0x80, 0x29, 0xf5, 0x6a, 0x13, 0x4f, 0x41, 0x19, 0x4f, 0x4f, 0x96, 0x79, 0xe0, 0x38, 0x37, 0x93, - 0xa5, 0x8a, 0x4c, 0x5e, 0xc9, 0xf0, 0xc4, 0x5d, 0xb5, 0x18, 0x99, 0x12, 0xa6, 0x0a, 0xf3, 0xc8, - 0x5f, 0x86, 0x5a, 0xdc, 0x59, 0x77, 0xc3, 0x6d, 0xc7, 0x0b, 0x98, 0xcf, 0x5a, 0x7f, 0xae, 0x57, - 0x22, 0x70, 0x4a, 0x33, 0xf3, 0x59, 0x38, 0xd5, 0x25, 0xd3, 0x7d, 0x85, 0xd4, 0xfd, 0xd2, 0x00, - 0xd4, 0x94, 0x57, 0x07, 0x5d, 0x36, 0x1d, 0x77, 0x8f, 0x66, 0x1d, 0x77, 0x23, 0x74, 0xe5, 0xd5, - 0x7d, 0x75, 0x6f, 0xe7, 0xbc, 0xd7, 0xf9, 0x4c, 0xe1, 0x47, 0x2c, 0x7f, 0xb3, 0xa5, 0x8f, 0xd7, - 0x4c, 0x53, 0xb3, 0x7e, 0xe0, 0x50, 0xb3, 0xbe, 0xe4, 0x73, 0x4c, 0xd4, 0x80, 0x6f, 0x87, 0xee, - 0x4a, 0x23, 0xfb, 0xd4, 0x48, 0x83, 0x02, 0x31, 0xc7, 0x31, 0xbb, 0x8b, 0x2a, 0x65, 0x66, 0x77, - 0x0d, 0x1f, 0xd5, 0xee, 0x92, 0x1c, 0x70, 0xca, 0x0c, 0xed, 0xc0, 0xa9, 0x96, 0xf9, 0x74, 0x8c, - 0xba, 0xb0, 0xf2, 0x5c, 0x1f, 0x4f, 0xb7, 0x74, 0xb4, 0x34, 0xf9, 0x8b, 0x59, 0x7e, 0xb8, 0xbb, - 0x0a, 0xfb, 0x07, 0xdc, 0x0b, 0x24, 0xb6, 0x85, 0x24, 0xee, 0xf8, 0xc7, 0x99, 0xf5, 0xfa, 0xb6, - 0xb1, 0x53, 0x7d, 0x08, 0xfe, 0xc7, 0xdf, 0xb2, 0x98, 0xff, 0x71, 0x8d, 0x6c, 0xb7, 0x7d, 0x27, - 0x39, 0xce, 0x68, 0xbd, 0x2f, 0xc1, 0x48, 0x22, 0x6a, 0x29, 0x97, 0xaa, 0x5b, 0x6b, 0x16, 0xf3, - 0xc7, 0x2a, 0x45, 0x20, 0xa1, 0x58, 0x31, 0xb4, 0xff, 0x0d, 0xff, 0x0a, 0x12, 0x73, 0x12, 0x3b, - 0xab, 0x5b, 0xe6, 0xce, 0xea, 0xe9, 0xd2, 0x9d, 0xe9, 0xb1, 0xc3, 0xfa, 0xae, 0xd9, 0x05, 0x66, - 0xb0, 0x7d, 0xf8, 0x3d, 0xe2, 0xf6, 0x2a, 0x98, 0xcf, 0xe1, 0xa0, 0x57, 0x79, 0xa8, 0x2a, 0xd7, - 0x88, 0xcf, 0xf4, 0x19, 0xa6, 0x6a, 0xff, 0x46, 0x05, 0xce, 0xe4, 0xbd, 0x92, 0x8f, 0x5c, 0x18, - 0x6b, 0x6b, 0xe6, 0x73, 0xb9, 0x7c, 0x0e, 0xba, 0xc1, 0x9d, 0x9a, 0x2e, 0x3a, 0x14, 0x1b, 0x5c, - 0x11, 0x81, 0x31, 0xb2, 0xe3, 0xb5, 0x94, 0x7b, 0xa5, 0xd2, 0xbf, 0x8a, 0x52, 0xd5, 0x2c, 0x69, - 0x8c, 0xb0, 0xc1, 0xf6, 0x18, 0xb2, 0xc9, 0xdb, 0xff, 0xc8, 0x82, 0x47, 0x7a, 0x24, 0x7d, 0xa0, - 0xd5, 0xdd, 0x67, 0x5e, 0x48, 0xf1, 0xdc, 0x92, 0xaa, 0x8e, 0xfb, 0x26, 0xb1, 0xc0, 0xa2, 0x75, - 0x00, 0xee, 0x5b, 0x64, 0x6f, 0xd0, 0x56, 0xca, 0xc4, 0x00, 0x74, 0xdd, 0xac, 0xd6, 0x2e, 0xdd, - 0xaa, 0x57, 0x67, 0x35, 0xae, 0xf6, 0x77, 0xaa, 0x30, 0xc8, 0x9f, 0xc1, 0x6c, 0xc0, 0xf0, 0x16, - 0xcf, 0x31, 0xd9, 0x5f, 0x8a, 0xcb, 0xd4, 0x4e, 0xe2, 0x00, 0x2c, 0xd9, 0xa0, 0x55, 0x38, 0xed, - 0x05, 0x5e, 0xe2, 0x39, 0x7e, 0x9d, 0xf8, 0xce, 0xae, 0x34, 0xbc, 0x79, 0x7e, 0x71, 0x99, 0x0a, - 0xf7, 0xf4, 0x4a, 0x37, 0x09, 0xce, 0x2b, 0x87, 0x5e, 0xeb, 0x4a, 0x12, 0xc5, 0x73, 0x77, 0xaa, - 0xbb, 0x5a, 0x87, 0x27, 0x8a, 0x42, 0xaf, 0xc0, 0x78, 0xbb, 0x6b, 0x8b, 0xa1, 0xbd, 0x9f, 0x68, - 0x6e, 0x2b, 0x4c, 0x5a, 0x54, 0x87, 0xa9, 0xb8, 0xc3, 0x4e, 0x64, 0xd7, 0xb6, 0x22, 0x12, 0x6f, - 0x85, 0xbe, 0x2b, 0xde, 0xfd, 0x52, 0xe6, 0x54, 0x33, 0x83, 0xc7, 0x5d, 0x25, 0x28, 0x97, 0x0d, - 0xc7, 0xf3, 0x3b, 0x11, 0x49, 0xb9, 0x0c, 0x99, 0x5c, 0x96, 0x33, 0x78, 0xdc, 0x55, 0xc2, 0xfe, - 0x23, 0x0b, 0x4e, 0xe7, 0x84, 0x2d, 0xf0, 0x68, 0xba, 0x4d, 0x2f, 0x4e, 0x54, 0x16, 0x69, 0x2d, - 0x9a, 0x8e, 0xc3, 0xb1, 0xa2, 0xa0, 0x52, 0xc8, 0xf7, 0x8d, 0xd9, 0xe3, 0x40, 0x71, 0x30, 0x2b, - 0xb0, 0xfd, 0xa5, 0x7c, 0x52, 0xaf, 0xf9, 0x0f, 0xf4, 0x7c, 0xcd, 0xff, 0x09, 0x18, 0xdc, 0x54, - 0xbb, 0x73, 0xcd, 0x30, 0xe1, 0xfb, 0x73, 0x8e, 0xb3, 0xbf, 0x55, 0x85, 0xc9, 0x4c, 0xf8, 0x12, - 0x6d, 0xc8, 0x76, 0x18, 0x78, 0x49, 0xa8, 0xb2, 0x0d, 0x31, 0x97, 0xc2, 0x22, 0x69, 0x6f, 0xad, - 0x0a, 0x38, 0x56, 0x14, 0xe8, 0x29, 0xf3, 0x4d, 0xe2, 0xb4, 0xcd, 0x0b, 0x75, 0xe3, 0xb5, 0xb5, - 0xb2, 0x99, 0xed, 0x9f, 0x80, 0x81, 0x76, 0xa8, 0x1e, 0xcf, 0x54, 0x42, 0x8f, 0x17, 0xea, 0x8d, - 0x30, 0xf4, 0x31, 0x43, 0xa2, 0x27, 0x45, 0xef, 0x33, 0xce, 0x49, 0xec, 0xb8, 0x61, 0xac, 0x0d, - 0xc1, 0xd3, 0x30, 0x7c, 0x8f, 0xec, 0x46, 0x5e, 0xb0, 0x99, 0x75, 0xcd, 0xde, 0xe0, 0x60, 0x2c, - 0xf1, 0x66, 0xf6, 0xfa, 0xe1, 0x63, 0xce, 0x5e, 0x3f, 0x52, 0x18, 0x82, 0xf9, 0xab, 0x16, 0x4c, - 0xb2, 0xd4, 0x7b, 0xe2, 0x1a, 0xac, 0x17, 0x06, 0xc7, 0xb8, 0x2a, 0x3e, 0x01, 0x83, 0x11, 0xad, - 0x2c, 0x9b, 0x78, 0x9a, 0xb5, 0x00, 0x73, 0x1c, 0x7a, 0x4c, 0x3c, 0xed, 0x4e, 0x3f, 0xdf, 0x18, - 0x4f, 0xe4, 0x9b, 0xbe, 0xd1, 0xce, 0x02, 0xfc, 0x31, 0x69, 0xfb, 0x1e, 0x6f, 0x6c, 0xea, 0x89, - 0xf9, 0xb0, 0x04, 0xf8, 0xe7, 0x36, 0xee, 0x61, 0x05, 0xf8, 0xe7, 0x33, 0x3f, 0xdc, 0x04, 0xfd, - 0x9f, 0x15, 0x38, 0x9f, 0x5b, 0x2e, 0x3d, 0xd6, 0x59, 0x36, 0x8e, 0x75, 0xae, 0x66, 0x8e, 0x75, - 0xec, 0xc3, 0x4b, 0x3f, 0x9c, 0x83, 0x9e, 0xfc, 0xe3, 0x97, 0xea, 0x49, 0x1e, 0xbf, 0x0c, 0x94, - 0xb5, 0x15, 0x06, 0x0b, 0x6c, 0x85, 0xdf, 0xb5, 0xe0, 0xd1, 0xdc, 0x31, 0xfb, 0xf0, 0x5d, 0xa9, - 0xc8, 0x6d, 0x66, 0x0f, 0x0b, 0xfa, 0x6f, 0x54, 0x7b, 0x74, 0x8b, 0xd9, 0xd2, 0x17, 0xa9, 0xde, - 0x61, 0xc8, 0x58, 0x98, 0x41, 0x63, 0x5c, 0xe7, 0x70, 0x18, 0x56, 0x58, 0x14, 0x6b, 0x57, 0x12, - 0x78, 0x23, 0x97, 0x8e, 0x38, 0xa5, 0xe6, 0x4c, 0xe7, 0x99, 0x7e, 0x9f, 0x37, 0x73, 0x4f, 0x01, - 0xdd, 0xd5, 0xb6, 0x47, 0xd5, 0xa3, 0x6c, 0x8f, 0xc6, 0xf2, 0xb7, 0x46, 0x68, 0x1e, 0x26, 0xb7, - 0xbd, 0x80, 0x3d, 0xee, 0x66, 0xda, 0x21, 0xea, 0x16, 0xdc, 0xaa, 0x89, 0xc6, 0x59, 0xfa, 0x99, - 0x57, 0x60, 0xfc, 0xe8, 0x1e, 0x93, 0xf7, 0xab, 0xf0, 0xd1, 0x43, 0xd4, 0x02, 0x5f, 0x0f, 0x8c, - 0xef, 0xa2, 0xad, 0x07, 0x5d, 0xdf, 0xa6, 0x01, 0x67, 0x36, 0x3a, 0xbe, 0xbf, 0xcb, 0xc2, 0x22, - 0x88, 0x2b, 0x29, 0x84, 0x8d, 0xa7, 0x9e, 0x5d, 0x5d, 0xce, 0xa1, 0xc1, 0xb9, 0x25, 0xd1, 0xe7, - 0x01, 0x85, 0xeb, 0x2c, 0x1f, 0xa5, 0x9b, 0xde, 0x58, 0x66, 0x9f, 0xa0, 0x9a, 0xce, 0xd5, 0xdb, - 0x5d, 0x14, 0x38, 0xa7, 0x14, 0xb5, 0xf8, 0xd8, 0x8b, 0xad, 0xaa, 0x59, 0x19, 0x8b, 0x0f, 0xeb, - 0x48, 0x6c, 0xd2, 0xa2, 0x6b, 0x70, 0xca, 0xd9, 0x71, 0x3c, 0x9e, 0x6d, 0x46, 0x32, 0xe0, 0x26, - 0x9f, 0x72, 0x49, 0xcc, 0x67, 0x09, 0x70, 0x77, 0x19, 0xd4, 0x36, 0x9c, 0x4c, 0x3c, 0xff, 0xf4, - 0xab, 0x47, 0x90, 0xe0, 0xd2, 0x6e, 0x27, 0xfb, 0x0f, 0x2d, 0xba, 0xe8, 0xe5, 0x3c, 0x86, 0x66, - 0xbc, 0x21, 0xae, 0xdd, 0xd2, 0xe8, 0x7e, 0x43, 0x9c, 0xf9, 0x5f, 0x4d, 0x5a, 0x2e, 0x1a, 0x71, - 0x1a, 0x56, 0x69, 0xd8, 0x97, 0xe2, 0x76, 0x92, 0xa2, 0x40, 0x77, 0x61, 0xd8, 0xf5, 0x76, 0xbc, - 0x38, 0x8c, 0x4a, 0x3c, 0xd9, 0xdb, 0x15, 0xaa, 0x97, 0xaa, 0xcb, 0x3a, 0x67, 0x82, 0x25, 0x37, - 0xfb, 0x6f, 0x55, 0x60, 0x5c, 0xd6, 0xf7, 0x7a, 0x27, 0x64, 0x3a, 0xec, 0xb8, 0x96, 0xf2, 0xd7, - 0x8d, 0xa5, 0xfc, 0x72, 0xb9, 0x2b, 0x5a, 0xac, 0x51, 0x3d, 0x97, 0xf0, 0x2f, 0x64, 0x96, 0xf0, - 0x2b, 0xfd, 0x30, 0x2d, 0xf4, 0x1e, 0x9d, 0x32, 0xe8, 0x3f, 0x44, 0xf9, 0x8f, 0xf3, 0xba, 0xd3, - 0x63, 0xe1, 0xf8, 0x4e, 0x25, 0xd3, 0x0d, 0xb6, 0x60, 0x7c, 0x0d, 0x06, 0xb6, 0x9c, 0xc8, 0x2d, - 0x97, 0x6f, 0xad, 0xab, 0xf8, 0xdc, 0x75, 0x27, 0x72, 0xb9, 0xda, 0xbf, 0xa4, 0x1e, 0x6a, 0x71, - 0x22, 0xb7, 0x30, 0xc8, 0x98, 0x55, 0x8a, 0x5e, 0x86, 0xa1, 0xb8, 0x15, 0xb6, 0x55, 0x54, 0xd7, - 0x05, 0xfe, 0x88, 0x0b, 0x85, 0x1c, 0xec, 0xcd, 0x22, 0xb3, 0x3a, 0x0a, 0xc6, 0x82, 0x7e, 0x86, - 0x40, 0x4d, 0x55, 0x7d, 0x8c, 0xe1, 0xac, 0xef, 0x57, 0xe1, 0x74, 0x8e, 0xa8, 0xa0, 0x9f, 0x31, - 0x46, 0xed, 0x95, 0xbe, 0x65, 0xed, 0x03, 0x8e, 0xdb, 0xcf, 0xb0, 0x0d, 0x91, 0x2b, 0x64, 0xe3, - 0x08, 0xd5, 0xdf, 0x89, 0x49, 0xb6, 0x7a, 0x0a, 0x2a, 0xae, 0x9e, 0x56, 0x7b, 0x42, 0x83, 0x4f, - 0xab, 0x51, 0xed, 0x3c, 0xc6, 0x6f, 0xfc, 0xde, 0x00, 0x9c, 0xc9, 0xbb, 0x06, 0x8a, 0x7e, 0xde, - 0xca, 0x64, 0x50, 0x7f, 0xad, 0xff, 0xbb, 0xa4, 0x3c, 0xad, 0xba, 0x48, 0x0f, 0x31, 0x67, 0xe6, - 0x54, 0x2f, 0x1c, 0x6d, 0x51, 0x3b, 0xbb, 0x18, 0x10, 0xf1, 0x64, 0xf8, 0x52, 0x1f, 0x7c, 0xee, - 0x08, 0x4d, 0x11, 0xf9, 0xf4, 0xe3, 0xcc, 0xc5, 0x00, 0x09, 0x2e, 0xbe, 0x18, 0x20, 0xdb, 0x30, - 0xb3, 0x09, 0xa3, 0x5a, 0xbf, 0x8e, 0x51, 0x04, 0x3c, 0xba, 0x26, 0x69, 0xad, 0x3e, 0x46, 0x31, - 0xf8, 0x3b, 0x16, 0x64, 0xc2, 0x35, 0x94, 0xd7, 0xc5, 0xea, 0xe9, 0x75, 0xb9, 0x00, 0x03, 0x51, - 0xe8, 0x93, 0x6c, 0x6a, 0x6f, 0x1c, 0xfa, 0x04, 0x33, 0x8c, 0x7a, 0xb0, 0xb1, 0xda, 0xeb, 0xc1, - 0x46, 0xba, 0x1d, 0xf7, 0xc9, 0x0e, 0x91, 0x3e, 0x10, 0xa5, 0xbc, 0x6f, 0x52, 0x20, 0xe6, 0x38, - 0xfb, 0x47, 0x55, 0x18, 0xe2, 0x8e, 0x86, 0x63, 0x5c, 0x96, 0x1b, 0x62, 0xcf, 0x5f, 0xea, 0x42, - 0x26, 0x6f, 0xcd, 0x5c, 0xdd, 0x49, 0x1c, 0x2e, 0x50, 0xaa, 0x6f, 0xa9, 0x9f, 0x00, 0xcd, 0x19, - 0xbd, 0x9f, 0xc9, 0x6c, 0x69, 0x81, 0xf3, 0xd0, 0xc6, 0x62, 0x0b, 0x20, 0x66, 0x2f, 0x83, 0x51, - 0x1e, 0x22, 0x29, 0xde, 0x0b, 0xa5, 0xda, 0xd1, 0x54, 0xc5, 0x78, 0x6b, 0xd2, 0x6c, 0x5c, 0x0a, - 0x81, 0x35, 0xde, 0x33, 0x2f, 0x41, 0x4d, 0x11, 0x17, 0x59, 0xfa, 0x63, 0xba, 0x48, 0xfe, 0x05, - 0x98, 0xcc, 0xd4, 0xd5, 0xd7, 0x46, 0xe1, 0xfb, 0x16, 0x9c, 0xea, 0x7a, 0x6b, 0x16, 0xbd, 0x67, - 0xc1, 0x19, 0x3f, 0xc7, 0xc3, 0x24, 0x3e, 0xf0, 0x51, 0x7c, 0x53, 0x6a, 0x97, 0x90, 0x87, 0xc5, - 0xb9, 0xb5, 0xc9, 0x34, 0x9f, 0x95, 0xfc, 0x34, 0x9f, 0xec, 0x39, 0x24, 0xde, 0xf6, 0x93, 0xb0, - 0x80, 0x56, 0x4c, 0x0b, 0xe8, 0xe3, 0x65, 0xc4, 0xa0, 0x87, 0xe9, 0xf3, 0xef, 0x2d, 0x40, 0x9c, - 0x20, 0xfb, 0x42, 0x20, 0xf7, 0xd8, 0x69, 0x36, 0x7b, 0x2a, 0x37, 0x0a, 0x83, 0x35, 0xaa, 0x3e, - 0xb3, 0xbf, 0xab, 0x97, 0xb5, 0xca, 0x3d, 0xb0, 0x5f, 0x2d, 0xf1, 0xc0, 0xfe, 0x6f, 0x55, 0x21, - 0x1b, 0xda, 0x80, 0xbe, 0x0c, 0x63, 0x2d, 0xa7, 0xed, 0xac, 0x7b, 0xbe, 0x97, 0x78, 0x24, 0x2e, - 0x77, 0x6c, 0xb4, 0xa8, 0x95, 0x10, 0x3e, 0x5f, 0x0d, 0x82, 0x0d, 0x8e, 0x68, 0x0e, 0xa0, 0x1d, - 0x79, 0x3b, 0x9e, 0x4f, 0x36, 0x99, 0xdd, 0xa1, 0x92, 0xa4, 0x34, 0x14, 0x14, 0x6b, 0x14, 0x39, - 0x31, 0x74, 0xd5, 0x93, 0x88, 0xa1, 0x1b, 0xe8, 0x33, 0x86, 0x6e, 0xb0, 0x54, 0x0c, 0x1d, 0x86, - 0x73, 0xd2, 0x55, 0x4b, 0xff, 0x2f, 0x7b, 0x3e, 0xe1, 0x79, 0xfd, 0x44, 0xe4, 0xe3, 0xcc, 0xfe, - 0xde, 0xec, 0x39, 0x9c, 0x4b, 0x81, 0x7b, 0x94, 0xb4, 0x3b, 0x70, 0xba, 0x49, 0x22, 0x8f, 0xa5, - 0x5d, 0x72, 0xd3, 0x19, 0xf8, 0x36, 0xd4, 0xa2, 0xcc, 0xe4, 0xef, 0xf3, 0x4e, 0x9a, 0x96, 0xbc, - 0x42, 0x4e, 0xf6, 0x94, 0xa5, 0xfd, 0x57, 0x2a, 0x30, 0x2c, 0x42, 0x88, 0x8e, 0x71, 0x21, 0xb9, - 0x61, 0xec, 0xef, 0x9e, 0x2e, 0x9a, 0xb9, 0xac, 0x39, 0x3d, 0x77, 0x76, 0xcd, 0xcc, 0xce, 0xee, - 0xd9, 0x72, 0xec, 0x0e, 0xdf, 0xd3, 0xfd, 0xb0, 0x02, 0x13, 0x66, 0x28, 0xd5, 0x31, 0x0e, 0xc7, - 0x9b, 0x30, 0x1c, 0x8b, 0xf8, 0xa2, 0x4a, 0x99, 0x58, 0x8d, 0xec, 0x27, 0x4d, 0x1f, 0xeb, 0x17, - 0x11, 0x45, 0x92, 0x5d, 0x6e, 0x08, 0x53, 0xf5, 0x24, 0x42, 0x98, 0xec, 0x1f, 0x31, 0x95, 0xaa, - 0x0f, 0xe0, 0x49, 0xac, 0x09, 0xaf, 0x9b, 0xda, 0xf7, 0x52, 0x29, 0x51, 0x10, 0xed, 0xeb, 0xb1, - 0x36, 0x7c, 0xcf, 0x82, 0x51, 0x41, 0x78, 0x12, 0x3d, 0xf8, 0xbc, 0xd9, 0x83, 0x27, 0x4b, 0xf5, - 0xa0, 0x47, 0xd3, 0xff, 0x5e, 0x45, 0x35, 0xbd, 0x21, 0x5e, 0x4e, 0x2d, 0x4c, 0xf4, 0x38, 0xd2, - 0x8e, 0xc2, 0x24, 0x6c, 0x85, 0xbe, 0x58, 0xe5, 0x1f, 0x4b, 0xa3, 0xce, 0x39, 0xfc, 0x40, 0xfb, - 0x8d, 0x15, 0x35, 0x8b, 0xa6, 0x0e, 0xa3, 0x44, 0x2c, 0x51, 0x79, 0xef, 0xb6, 0xae, 0xcb, 0x77, - 0xb1, 0x29, 0x4c, 0x5c, 0xd9, 0xe8, 0xf7, 0x3d, 0xd8, 0x34, 0x86, 0x5c, 0x71, 0xc2, 0x1a, 0x57, - 0x19, 0xde, 0xc8, 0x6a, 0x18, 0x34, 0xdd, 0xa8, 0xb7, 0x04, 0x1c, 0x2b, 0x0a, 0xfb, 0x25, 0xa6, - 0x63, 0xd9, 0xf0, 0xf4, 0x17, 0x18, 0xfe, 0x8b, 0x43, 0x6a, 0x60, 0x99, 0x93, 0xe4, 0x16, 0x0c, - 0xd2, 0x2e, 0xca, 0x7d, 0x60, 0x39, 0x85, 0x46, 0x9b, 0xa0, 0x07, 0x88, 0x45, 0x49, 0x8c, 0x39, - 0x1b, 0x44, 0xba, 0x7c, 0xef, 0x2f, 0x95, 0xd6, 0x91, 0x7d, 0x78, 0xdb, 0x59, 0xe2, 0x18, 0x96, - 0x2c, 0x63, 0xa5, 0x91, 0x4d, 0xce, 0xb9, 0x28, 0x11, 0x38, 0xa5, 0x41, 0x97, 0x85, 0xb9, 0x6e, - 0x3e, 0xab, 0x2b, 0xcd, 0x75, 0x39, 0x24, 0x9a, 0xbd, 0x7e, 0x05, 0x46, 0x55, 0x7a, 0xf2, 0x06, - 0xcf, 0x32, 0x5d, 0xe3, 0xf6, 0xcb, 0x52, 0x0a, 0xc6, 0x3a, 0x0d, 0x5a, 0x81, 0xd3, 0xae, 0x8a, - 0x66, 0x6d, 0x74, 0xd6, 0x7d, 0xaf, 0x45, 0x8b, 0xf2, 0x9b, 0x24, 0x8f, 0xec, 0xef, 0xcd, 0x9e, - 0xae, 0x77, 0xa3, 0x71, 0x5e, 0x19, 0xb4, 0x06, 0x93, 0x31, 0x4f, 0xc3, 0x2e, 0xef, 0x9c, 0x89, - 0xec, 0x75, 0xcf, 0x48, 0xa7, 0x7f, 0xd3, 0x44, 0x1f, 0x30, 0x10, 0x57, 0x0a, 0x02, 0x84, 0xb3, - 0x2c, 0xd0, 0x6b, 0x30, 0xe1, 0xeb, 0xaf, 0x4a, 0x35, 0x44, 0x50, 0xaf, 0x0a, 0x88, 0x30, 0xde, - 0x9c, 0x6a, 0xe0, 0x0c, 0x35, 0x7a, 0x13, 0xa6, 0x75, 0x88, 0xb8, 0xd4, 0xee, 0x04, 0x9b, 0x24, - 0x16, 0xf9, 0x9f, 0x1f, 0xdb, 0xdf, 0x9b, 0x9d, 0xbe, 0xd9, 0x83, 0x06, 0xf7, 0x2c, 0x8d, 0x5e, - 0x86, 0x31, 0x39, 0x92, 0x5a, 0x80, 0x6f, 0x1a, 0x8a, 0xa3, 0xe1, 0xb0, 0x41, 0xf9, 0xc1, 0xce, - 0x36, 0xbe, 0x46, 0x0b, 0x6b, 0x8b, 0x2a, 0xfa, 0x0a, 0x8c, 0xe9, 0x6d, 0x14, 0x6a, 0xf2, 0x93, - 0xe5, 0x5f, 0xea, 0x12, 0x8b, 0xb3, 0x6a, 0xb9, 0x8e, 0xc3, 0x06, 0x6f, 0xfb, 0x36, 0x0c, 0x35, - 0x77, 0xe3, 0x56, 0xe2, 0x3f, 0xac, 0x17, 0x95, 0x5b, 0x30, 0x99, 0x79, 0x7a, 0x58, 0xbd, 0x61, - 0x6d, 0x3d, 0xac, 0x37, 0xac, 0xed, 0xaf, 0x5b, 0x30, 0xb8, 0xe6, 0x78, 0xc5, 0x2f, 0x27, 0x94, - 0x69, 0x32, 0x7a, 0x11, 0x86, 0xc8, 0xc6, 0x06, 0x69, 0xc9, 0x37, 0xb1, 0x1f, 0x97, 0x46, 0xcd, - 0x12, 0x83, 0xd2, 0xa9, 0xc9, 0x2a, 0xe3, 0x7f, 0xb1, 0x20, 0xb6, 0xff, 0xa3, 0x05, 0xb0, 0x16, - 0xfa, 0xf2, 0xd8, 0xa6, 0xa0, 0x25, 0x0b, 0x5d, 0x6f, 0x38, 0x3c, 0x95, 0xf3, 0x86, 0x03, 0x4a, - 0x19, 0xe6, 0xbc, 0xe0, 0xa0, 0x7a, 0x53, 0x2d, 0xd5, 0x9b, 0x81, 0x7e, 0x7a, 0xf3, 0x4d, 0x0b, - 0x44, 0x0c, 0x4d, 0x09, 0x49, 0x70, 0x65, 0xde, 0x75, 0x23, 0x5d, 0xc5, 0x33, 0x65, 0x2e, 0x82, - 0x88, 0x24, 0x15, 0x4a, 0x36, 0x8d, 0xd4, 0x14, 0x06, 0x57, 0xba, 0x97, 0x1f, 0xe5, 0xe8, 0x55, - 0x66, 0x41, 0x16, 0xb7, 0xab, 0xaf, 0xcc, 0x5c, 0x2c, 0x2d, 0x39, 0x65, 0xac, 0x12, 0x34, 0xe9, - 0x69, 0xc9, 0x25, 0x02, 0xa7, 0x34, 0xe8, 0x69, 0x18, 0x8e, 0x3b, 0xeb, 0x8c, 0x3c, 0x13, 0x50, - 0xd3, 0xe4, 0x60, 0x2c, 0xf1, 0xf6, 0xcf, 0x21, 0x30, 0xba, 0x66, 0x24, 0x83, 0xb2, 0x1e, 0x7a, - 0x32, 0xa8, 0xb7, 0x60, 0x84, 0x6c, 0xb7, 0x93, 0xdd, 0xba, 0x17, 0x95, 0x4b, 0xcc, 0xb7, 0x24, - 0xa8, 0xbb, 0xb9, 0x4b, 0x0c, 0x56, 0x1c, 0x7b, 0xa4, 0xf6, 0xaa, 0x7e, 0x28, 0x52, 0x7b, 0x0d, - 0xfc, 0xa9, 0xa4, 0xf6, 0x7a, 0x13, 0x86, 0x37, 0xbd, 0x04, 0x93, 0x76, 0x28, 0x2e, 0xfe, 0x15, - 0x9c, 0x87, 0x5d, 0xe3, 0xc4, 0xdd, 0xf9, 0x7a, 0x04, 0x02, 0x4b, 0x76, 0x68, 0x0d, 0x86, 0xf8, - 0xee, 0x43, 0x64, 0xcb, 0xfa, 0x64, 0x19, 0xbf, 0x4c, 0x77, 0xe2, 0x28, 0x11, 0x35, 0x25, 0x78, - 0xc9, 0x54, 0x5e, 0xc3, 0x1f, 0x3c, 0x95, 0x97, 0x4a, 0xc0, 0x35, 0xf2, 0xb0, 0x12, 0x70, 0x19, - 0x89, 0xcc, 0x6a, 0xc7, 0x91, 0xc8, 0xec, 0x9b, 0x16, 0x9c, 0x6d, 0xe7, 0xe5, 0x01, 0x14, 0xa9, - 0xb4, 0x3e, 0x7b, 0x84, 0xbc, 0x88, 0x46, 0xd5, 0xec, 0x3e, 0x56, 0x2e, 0x19, 0xce, 0xaf, 0x58, - 0x66, 0x44, 0x1b, 0xfd, 0xe0, 0x19, 0xd1, 0x8e, 0x3b, 0xe7, 0x56, 0x9a, 0x1f, 0x6d, 0xfc, 0x58, - 0xf2, 0xa3, 0x4d, 0x3c, 0xc4, 0xfc, 0x68, 0x5a, 0x66, 0xb3, 0xc9, 0x87, 0x9b, 0xd9, 0x6c, 0x0b, - 0x46, 0xdd, 0xf0, 0x7e, 0x70, 0xdf, 0x89, 0xdc, 0xf9, 0xc6, 0x8a, 0x48, 0xa4, 0x55, 0x90, 0xb4, - 0xa1, 0x9e, 0x16, 0x30, 0x6a, 0xe0, 0x0e, 0xc8, 0x14, 0x89, 0x75, 0xd6, 0x22, 0xc7, 0xdb, 0xa9, - 0x0f, 0x98, 0xe3, 0xcd, 0xc8, 0x94, 0x86, 0x8e, 0x23, 0x53, 0xda, 0x97, 0xd9, 0xd5, 0xed, 0x0d, - 0x6f, 0x73, 0xd5, 0x69, 0x4f, 0x9f, 0x2e, 0x53, 0xc3, 0xa2, 0x24, 0xef, 0xae, 0x41, 0xa1, 0x70, - 0xca, 0xb4, 0x3b, 0x17, 0xdb, 0x99, 0x93, 0xce, 0xc5, 0x76, 0xf6, 0x18, 0x73, 0xb1, 0x9d, 0x3b, - 0xd1, 0x5c, 0x6c, 0x8f, 0xfc, 0xa9, 0xe4, 0x62, 0xfb, 0x4b, 0x70, 0xfe, 0xf0, 0xcf, 0x91, 0x66, - 0xfb, 0x6d, 0xa4, 0x2e, 0x83, 0x4c, 0xb6, 0x5f, 0x66, 0xea, 0x68, 0x54, 0xa5, 0x53, 0x42, 0xfd, - 0x0b, 0x0b, 0x1e, 0xe9, 0x91, 0x38, 0xa5, 0xf4, 0x6d, 0x86, 0x36, 0x4c, 0xb6, 0xcd, 0xa2, 0xa5, - 0xef, 0x1d, 0x19, 0x89, 0x5a, 0x54, 0x9c, 0x5c, 0x06, 0x81, 0xb3, 0xec, 0x17, 0x3e, 0xfe, 0xe3, - 0xf7, 0xcf, 0x7f, 0xe4, 0x27, 0xef, 0x9f, 0xff, 0xc8, 0xef, 0xbf, 0x7f, 0xfe, 0x23, 0x3f, 0xbb, - 0x7f, 0xde, 0xfa, 0xf1, 0xfe, 0x79, 0xeb, 0x27, 0xfb, 0xe7, 0xad, 0x3f, 0xda, 0x3f, 0x6f, 0x7d, - 0xf3, 0x8f, 0xcf, 0x7f, 0xe4, 0x8b, 0x95, 0x9d, 0x2b, 0xff, 0x3f, 0x00, 0x00, 0xff, 0xff, 0x1a, - 0xda, 0xcb, 0x09, 0x5a, 0xb6, 0x00, 0x00, + // 10019 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xec, 0x7d, 0x6d, 0x8c, 0x24, 0xc7, + 0x75, 0x98, 0x7a, 0x66, 0xbf, 0xe6, 0xed, 0xe7, 0xd5, 0x7d, 0x70, 0xb9, 0x22, 0x6f, 0x4f, 0x4d, + 0x91, 0x3a, 0x92, 0xc7, 0x5d, 0xdd, 0x91, 0x14, 0x29, 0x91, 0xa1, 0xb4, 0xbb, 0xb3, 0x7b, 0xb7, + 0xba, 0xdb, 0xbb, 0x61, 0xcd, 0x1e, 0x8f, 0x92, 0x08, 0x49, 0xbd, 0xd3, 0xb5, 0xbb, 0xad, 0xeb, + 0xed, 0x1e, 0x76, 0xf7, 0xec, 0xdd, 0x4a, 0x31, 0xe0, 0xc8, 0x8c, 0x8d, 0x40, 0x82, 0xa3, 0x20, + 0x10, 0x12, 0x20, 0x09, 0xa2, 0x04, 0x48, 0xe0, 0xc4, 0xb0, 0x15, 0x45, 0x4a, 0x20, 0xc5, 0xb2, + 0x81, 0x20, 0xb6, 0xa3, 0x20, 0x71, 0x20, 0xfd, 0x89, 0x0d, 0x1b, 0xd8, 0x98, 0xeb, 0xe4, 0x5f, + 0x7e, 0x04, 0xc8, 0xaf, 0x1c, 0x8c, 0x24, 0xa8, 0xcf, 0xae, 0xea, 0xe9, 0xd9, 0xee, 0x39, 0xde, + 0x9c, 0x4f, 0x46, 0xfe, 0xcd, 0xbc, 0xf7, 0xea, 0xd5, 0x47, 0xbf, 0x7a, 0xf5, 0xea, 0xd5, 0xab, + 0x57, 0x70, 0xe1, 0xf6, 0xab, 0xf1, 0x82, 0x17, 0x2e, 0xde, 0xee, 0x6c, 0x91, 0x28, 0x20, 0x09, + 0x89, 0x17, 0xdb, 0xb7, 0x77, 0x16, 0x9d, 0xb6, 0xb7, 0xb8, 0x7f, 0x71, 0x71, 0x87, 0x04, 0x24, + 0x72, 0x12, 0xe2, 0x2e, 0xb4, 0xa3, 0x30, 0x09, 0xd1, 0x13, 0x9c, 0x7a, 0x21, 0xa5, 0x5e, 0x68, + 0xdf, 0xde, 0x59, 0x70, 0xda, 0xde, 0xc2, 0xfe, 0xc5, 0xb9, 0x17, 0x76, 0xbc, 0x64, 0xb7, 0xb3, + 0xb5, 0xd0, 0x0a, 0xf7, 0x16, 0x77, 0xc2, 0x9d, 0x70, 0x91, 0x15, 0xda, 0xea, 0x6c, 0xb3, 0x7f, + 0xec, 0x0f, 0xfb, 0xc5, 0x99, 0xcd, 0x5d, 0xea, 0x5d, 0x75, 0x44, 0xe2, 0xb0, 0x13, 0xb5, 0x48, + 0xb6, 0x01, 0xc7, 0x94, 0x89, 0x17, 0xf7, 0x48, 0xe2, 0xe4, 0x34, 0x7a, 0xee, 0x85, 0xfc, 0x32, + 0x51, 0x27, 0x48, 0xbc, 0xbd, 0xee, 0x2a, 0x5e, 0x3a, 0x9e, 0x3c, 0x6e, 0xed, 0x92, 0x3d, 0xa7, + 0xab, 0xd4, 0xc5, 0xfc, 0x52, 0x9d, 0xc4, 0xf3, 0x17, 0xbd, 0x20, 0x89, 0x93, 0x28, 0x5b, 0xc4, + 0xfe, 0x43, 0x0b, 0xce, 0x2d, 0xdd, 0x6a, 0xae, 0xfa, 0x4e, 0x9c, 0x78, 0xad, 0x65, 0x3f, 0x6c, + 0xdd, 0x6e, 0x26, 0x61, 0x44, 0xde, 0x0a, 0xfd, 0xce, 0x1e, 0x69, 0xb2, 0x01, 0x40, 0x17, 0x60, + 0x6c, 0x9f, 0xfd, 0x5f, 0xaf, 0xcf, 0x5a, 0xe7, 0xac, 0xf3, 0xb5, 0xe5, 0x99, 0x9f, 0x1c, 0xce, + 0x7f, 0xe8, 0xe8, 0x70, 0x7e, 0xec, 0x2d, 0x01, 0xc7, 0x8a, 0x02, 0x3d, 0x03, 0x23, 0xdb, 0xf1, + 0xe6, 0x41, 0x9b, 0xcc, 0x56, 0x18, 0xed, 0x94, 0xa0, 0x1d, 0x59, 0x6b, 0x52, 0x28, 0x16, 0x58, + 0xb4, 0x08, 0xb5, 0xb6, 0x13, 0x25, 0x5e, 0xe2, 0x85, 0xc1, 0x6c, 0xf5, 0x9c, 0x75, 0x7e, 0x78, + 0xf9, 0x84, 0x20, 0xad, 0x35, 0x24, 0x02, 0xa7, 0x34, 0xb4, 0x19, 0x11, 0x71, 0xdc, 0x1b, 0x81, + 0x7f, 0x30, 0x3b, 0x74, 0xce, 0x3a, 0x3f, 0x96, 0x36, 0x03, 0x0b, 0x38, 0x56, 0x14, 0xf6, 0x0f, + 0x2b, 0x30, 0xb6, 0xb4, 0xbd, 0xed, 0x05, 0x5e, 0x72, 0x80, 0xbe, 0x0c, 0x13, 0x41, 0xe8, 0x12, + 0xf9, 0x9f, 0xf5, 0x62, 0xfc, 0xd2, 0x73, 0x0b, 0xc7, 0x89, 0xd2, 0xc2, 0x75, 0xad, 0xc4, 0xf2, + 0xcc, 0xd1, 0xe1, 0xfc, 0x84, 0x0e, 0xc1, 0x06, 0x47, 0xf4, 0x0e, 0x8c, 0xb7, 0x43, 0x57, 0x55, + 0x50, 0x61, 0x15, 0x3c, 0x7b, 0x7c, 0x05, 0x8d, 0xb4, 0xc0, 0xf2, 0xf4, 0xd1, 0xe1, 0xfc, 0xb8, + 0x06, 0xc0, 0x3a, 0x3b, 0xe4, 0xc3, 0x34, 0xfd, 0x1b, 0x24, 0x9e, 0xaa, 0xa1, 0xca, 0x6a, 0x78, + 0xa1, 0xb8, 0x06, 0xad, 0xd0, 0xf2, 0xc9, 0xa3, 0xc3, 0xf9, 0xe9, 0x0c, 0x10, 0x67, 0x59, 0xdb, + 0x5f, 0x85, 0xa9, 0xa5, 0x24, 0x71, 0x5a, 0xbb, 0xc4, 0xe5, 0xdf, 0x17, 0xbd, 0x04, 0x43, 0x81, + 0xb3, 0x47, 0xc4, 0xd7, 0x3f, 0x27, 0x86, 0x7d, 0xe8, 0xba, 0xb3, 0x47, 0xee, 0x1d, 0xce, 0xcf, + 0xdc, 0x0c, 0xbc, 0x77, 0x3b, 0x42, 0x66, 0x28, 0x0c, 0x33, 0x6a, 0x74, 0x09, 0xc0, 0x25, 0xfb, + 0x5e, 0x8b, 0x34, 0x9c, 0x64, 0x57, 0x48, 0x03, 0x12, 0x65, 0xa1, 0xae, 0x30, 0x58, 0xa3, 0xb2, + 0xbf, 0x6e, 0x41, 0x6d, 0x69, 0x3f, 0xf4, 0xdc, 0x46, 0xe8, 0xc6, 0xa8, 0x03, 0xd3, 0xed, 0x88, + 0x6c, 0x93, 0x48, 0x81, 0x66, 0xad, 0x73, 0xd5, 0xf3, 0xe3, 0x97, 0x2e, 0x15, 0xf4, 0xdb, 0x2c, + 0xb4, 0x1a, 0x24, 0xd1, 0xc1, 0xf2, 0x63, 0xa2, 0xea, 0xe9, 0x0c, 0x16, 0x67, 0xeb, 0xb0, 0xff, + 0x56, 0x05, 0x4e, 0x2f, 0x7d, 0xb5, 0x13, 0x91, 0xba, 0x17, 0xdf, 0xce, 0x4e, 0x05, 0xd7, 0x8b, + 0x6f, 0x5f, 0x4f, 0x07, 0x43, 0xc9, 0x60, 0x5d, 0xc0, 0xb1, 0xa2, 0x40, 0x2f, 0xc0, 0x28, 0xfd, + 0x7d, 0x13, 0xaf, 0x8b, 0xde, 0x9f, 0x14, 0xc4, 0xe3, 0x75, 0x27, 0x71, 0xea, 0x1c, 0x85, 0x25, + 0x0d, 0xda, 0x80, 0xf1, 0x96, 0xd3, 0xda, 0xf5, 0x82, 0x9d, 0x8d, 0xd0, 0x25, 0xec, 0x0b, 0xd7, + 0x96, 0x9f, 0xa7, 0xe4, 0x2b, 0x29, 0xf8, 0xde, 0xe1, 0xfc, 0x2c, 0x6f, 0x9b, 0x60, 0xa1, 0xe1, + 0xb0, 0x5e, 0x1e, 0xd9, 0x6a, 0x22, 0x0e, 0x31, 0x4e, 0x90, 0x33, 0x09, 0xcf, 0x6b, 0x73, 0x6a, + 0x98, 0xcd, 0xa9, 0x89, 0x1e, 0xf3, 0xe9, 0x9f, 0x5b, 0x62, 0x4c, 0xd6, 0x3c, 0xdf, 0x54, 0x0f, + 0x97, 0x00, 0x62, 0xd2, 0x8a, 0x48, 0xa2, 0x8d, 0x8a, 0xfa, 0xcc, 0x4d, 0x85, 0xc1, 0x1a, 0x15, + 0x9d, 0xfc, 0xf1, 0xae, 0x13, 0x31, 0x69, 0x11, 0x63, 0xa3, 0x26, 0x7f, 0x53, 0x22, 0x70, 0x4a, + 0x63, 0x4c, 0xfe, 0x6a, 0xe1, 0xe4, 0xff, 0x37, 0x16, 0x8c, 0x2e, 0x7b, 0x81, 0xeb, 0x05, 0x3b, + 0xe8, 0x6d, 0x18, 0xa3, 0x5a, 0xd9, 0x75, 0x12, 0x47, 0xcc, 0xfb, 0xf3, 0xc7, 0x0b, 0xcf, 0x8d, + 0xad, 0xaf, 0x90, 0x56, 0xb2, 0x41, 0x12, 0x27, 0xed, 0x46, 0x0a, 0xc3, 0x8a, 0x1b, 0xba, 0x09, + 0x23, 0x89, 0x13, 0xed, 0x90, 0x44, 0x4c, 0xf7, 0x17, 0xca, 0xf0, 0xc5, 0x54, 0xd4, 0x48, 0xd0, + 0x22, 0xa9, 0x62, 0xdc, 0x64, 0x4c, 0xb0, 0x60, 0x66, 0xb7, 0x60, 0x62, 0xc5, 0x69, 0x3b, 0x5b, + 0x9e, 0xef, 0x25, 0x1e, 0x89, 0xd1, 0xc7, 0xa0, 0xea, 0xb8, 0x2e, 0x13, 0xfc, 0xda, 0xf2, 0xe9, + 0xa3, 0xc3, 0xf9, 0xea, 0x92, 0xeb, 0xde, 0x3b, 0x9c, 0x07, 0x45, 0x75, 0x80, 0x29, 0x05, 0x7a, + 0x0e, 0x86, 0xdc, 0x28, 0x6c, 0xcf, 0x56, 0x18, 0xe5, 0x19, 0x3a, 0x43, 0xeb, 0x51, 0xd8, 0xce, + 0x90, 0x32, 0x1a, 0xfb, 0xf7, 0x2a, 0x80, 0x56, 0x48, 0x7b, 0x77, 0xad, 0x69, 0x7c, 0xcb, 0xf3, + 0x30, 0xb6, 0x17, 0x06, 0x5e, 0x12, 0x46, 0xb1, 0xa8, 0x90, 0xc9, 0xc3, 0x86, 0x80, 0x61, 0x85, + 0x45, 0xe7, 0x60, 0xa8, 0x9d, 0x4e, 0xeb, 0x09, 0xa9, 0x12, 0xd8, 0x84, 0x66, 0x18, 0x4a, 0xd1, + 0x89, 0x49, 0x24, 0xe4, 0x58, 0x51, 0xdc, 0x8c, 0x49, 0x84, 0x19, 0x26, 0x95, 0x1c, 0x2a, 0x53, + 0x42, 0x4a, 0x33, 0x92, 0x43, 0x31, 0x58, 0xa3, 0x42, 0x5f, 0x82, 0x1a, 0xff, 0x87, 0xc9, 0x36, + 0x13, 0xd9, 0x42, 0x65, 0x70, 0x2d, 0x6c, 0x39, 0x7e, 0x76, 0xf0, 0x27, 0x99, 0xa4, 0x49, 0x46, + 0x38, 0xe5, 0x69, 0x48, 0xda, 0x48, 0xa1, 0xa4, 0xfd, 0x5d, 0x0b, 0xd0, 0x8a, 0x17, 0xb8, 0x24, + 0x7a, 0x08, 0x4b, 0x66, 0x7f, 0x93, 0xe0, 0x4f, 0x68, 0xd3, 0xc2, 0xbd, 0x76, 0x18, 0x90, 0x20, + 0x59, 0x09, 0x03, 0x97, 0x2f, 0xa3, 0x9f, 0x82, 0xa1, 0x84, 0x56, 0xc5, 0x9b, 0xf5, 0x8c, 0xfc, + 0x2c, 0xb4, 0x82, 0x7b, 0x87, 0xf3, 0x67, 0xba, 0x4b, 0xb0, 0x26, 0xb0, 0x32, 0xe8, 0x93, 0x30, + 0x12, 0x27, 0x4e, 0xd2, 0x89, 0x45, 0x43, 0x3f, 0x22, 0x1b, 0xda, 0x64, 0xd0, 0x7b, 0x87, 0xf3, + 0xd3, 0xaa, 0x18, 0x07, 0x61, 0x51, 0x00, 0x3d, 0x0b, 0xa3, 0x7b, 0x24, 0x8e, 0x9d, 0x1d, 0xa9, + 0xd8, 0xa6, 0x45, 0xd9, 0xd1, 0x0d, 0x0e, 0xc6, 0x12, 0x8f, 0x9e, 0x82, 0x61, 0x12, 0x45, 0x61, + 0x24, 0x24, 0x62, 0x52, 0x10, 0x0e, 0xaf, 0x52, 0x20, 0xe6, 0x38, 0xfb, 0x67, 0x16, 0x4c, 0xab, + 0xb6, 0xf2, 0xba, 0x06, 0x38, 0xd5, 0x5d, 0x80, 0x96, 0xec, 0x58, 0xcc, 0x26, 0xd8, 0xf8, 0xa5, + 0x8f, 0x1f, 0xcf, 0xbb, 0x7b, 0x20, 0xd3, 0x3a, 0x14, 0x28, 0xc6, 0x1a, 0x5f, 0xfb, 0xf7, 0x2c, + 0x38, 0x99, 0xe9, 0xd3, 0x35, 0x2f, 0x4e, 0xd0, 0xe7, 0xbb, 0xfa, 0x75, 0xa1, 0x77, 0xdd, 0xf1, + 0x02, 0xa5, 0x65, 0x82, 0xef, 0xc5, 0xbc, 0x6f, 0x4a, 0x4a, 0x24, 0x44, 0xeb, 0x19, 0x86, 0x61, + 0x2f, 0x21, 0x7b, 0xb2, 0x53, 0x2f, 0x94, 0xec, 0x14, 0x6f, 0x5d, 0xfa, 0x6d, 0xd6, 0x29, 0x0f, + 0xcc, 0x59, 0xd9, 0xff, 0xcb, 0x82, 0xda, 0x4a, 0x18, 0x6c, 0x7b, 0x3b, 0x1b, 0x4e, 0x7b, 0x80, + 0x5f, 0xa5, 0x09, 0x43, 0x8c, 0x2b, 0x6f, 0xfa, 0xc5, 0xa2, 0xa6, 0x8b, 0x06, 0x2d, 0xd0, 0x95, + 0x93, 0x9b, 0x04, 0x4a, 0x29, 0x51, 0x10, 0x66, 0xcc, 0xe6, 0x5e, 0x81, 0x9a, 0x22, 0x40, 0x33, + 0x50, 0xbd, 0x4d, 0xb8, 0xbd, 0x58, 0xc3, 0xf4, 0x27, 0x3a, 0x05, 0xc3, 0xfb, 0x8e, 0xdf, 0x11, + 0x53, 0x15, 0xf3, 0x3f, 0x9f, 0xaa, 0xbc, 0x6a, 0xd9, 0x3f, 0xb6, 0xe0, 0x94, 0xaa, 0xe4, 0x2a, + 0x39, 0x68, 0x12, 0x9f, 0xb4, 0x92, 0x30, 0x42, 0xef, 0x59, 0x70, 0xca, 0xcf, 0x51, 0x42, 0x62, + 0x34, 0xee, 0x47, 0x7d, 0x3d, 0x21, 0x1a, 0x7e, 0x2a, 0x0f, 0x8b, 0x73, 0x6b, 0x43, 0x4f, 0xf2, + 0xbe, 0xf0, 0x99, 0x3b, 0x2e, 0x18, 0x54, 0xaf, 0x92, 0x03, 0xd6, 0x31, 0xfb, 0x47, 0x16, 0x4c, + 0xaa, 0xe6, 0x0f, 0x5c, 0xec, 0xae, 0x99, 0x62, 0xf7, 0xb1, 0x92, 0xdf, 0xae, 0x87, 0xc0, 0xfd, + 0xc3, 0x0a, 0x9c, 0x56, 0x34, 0x86, 0x22, 0x7e, 0x44, 0xc6, 0xbe, 0xbf, 0xee, 0x5e, 0x25, 0x07, + 0x9b, 0x21, 0x5d, 0x49, 0xf3, 0xbb, 0x8b, 0x2e, 0xc2, 0xb8, 0x4b, 0xb6, 0x9d, 0x8e, 0x9f, 0x28, + 0x43, 0x71, 0x98, 0xef, 0x20, 0xea, 0x29, 0x18, 0xeb, 0x34, 0xf6, 0x1f, 0xd4, 0xd8, 0x94, 0x4c, + 0x1c, 0x2f, 0x20, 0x11, 0x5d, 0x9a, 0x35, 0x7b, 0x7e, 0x42, 0xb7, 0xe7, 0x85, 0xed, 0xfe, 0x14, + 0x0c, 0x7b, 0x7b, 0x54, 0x59, 0x57, 0x4c, 0x1d, 0xbc, 0x4e, 0x81, 0x98, 0xe3, 0xd0, 0xd3, 0x30, + 0xda, 0x0a, 0xf7, 0xf6, 0x9c, 0xc0, 0x9d, 0xad, 0x32, 0x63, 0x61, 0x9c, 0xea, 0xf3, 0x15, 0x0e, + 0xc2, 0x12, 0x87, 0x9e, 0x80, 0x21, 0x27, 0xda, 0x89, 0x67, 0x87, 0x18, 0xcd, 0x18, 0xad, 0x69, + 0x29, 0xda, 0x89, 0x31, 0x83, 0x52, 0x23, 0xe0, 0x4e, 0x18, 0xdd, 0xf6, 0x82, 0x9d, 0xba, 0x17, + 0xb1, 0x15, 0x5d, 0x33, 0x02, 0x6e, 0x29, 0x0c, 0xd6, 0xa8, 0x50, 0x03, 0x86, 0xdb, 0x61, 0x94, + 0xc4, 0xb3, 0x23, 0x6c, 0x38, 0x9f, 0x2f, 0x94, 0x1e, 0xde, 0xef, 0x46, 0x18, 0x25, 0x69, 0x57, + 0xe8, 0xbf, 0x18, 0x73, 0x46, 0x68, 0x05, 0xaa, 0x24, 0xd8, 0x9f, 0x1d, 0x65, 0xfc, 0x3e, 0x7a, + 0x3c, 0xbf, 0xd5, 0x60, 0xff, 0x2d, 0x27, 0x4a, 0xa7, 0xd0, 0x6a, 0xb0, 0x8f, 0x69, 0x69, 0xd4, + 0x82, 0x9a, 0xf4, 0x1a, 0xc4, 0xb3, 0x63, 0x65, 0x04, 0x0c, 0x0b, 0x72, 0x4c, 0xde, 0xed, 0x78, + 0x11, 0xd9, 0x23, 0x41, 0x12, 0xa7, 0x96, 0xb0, 0xc4, 0xc6, 0x38, 0xe5, 0x8b, 0x5a, 0x30, 0xc1, + 0x0d, 0x87, 0x8d, 0xb0, 0x13, 0x24, 0xf1, 0x6c, 0x8d, 0x35, 0xb9, 0x60, 0xab, 0xf9, 0x56, 0x5a, + 0x62, 0xf9, 0x94, 0x60, 0x3f, 0xa1, 0x01, 0x63, 0x6c, 0x30, 0x45, 0xef, 0xc0, 0xa4, 0xef, 0xed, + 0x93, 0x80, 0xc4, 0x71, 0x23, 0x0a, 0xb7, 0xc8, 0x2c, 0xb0, 0xde, 0x3c, 0x55, 0xb4, 0xed, 0x0a, + 0xb7, 0xc8, 0xf2, 0x89, 0xa3, 0xc3, 0xf9, 0xc9, 0x6b, 0x7a, 0x69, 0x6c, 0x32, 0x43, 0x5f, 0x82, + 0x29, 0x6a, 0xa5, 0x78, 0x29, 0xfb, 0xf1, 0xf2, 0xec, 0xd1, 0xd1, 0xe1, 0xfc, 0x14, 0x36, 0x8a, + 0xe3, 0x0c, 0x3b, 0xb4, 0x09, 0x35, 0xdf, 0xdb, 0x26, 0xad, 0x83, 0x96, 0x4f, 0x66, 0x27, 0x18, + 0xef, 0x82, 0x29, 0x77, 0x4d, 0x92, 0x73, 0xcb, 0x50, 0xfd, 0xc5, 0x29, 0x23, 0xf4, 0x16, 0x9c, + 0x49, 0x48, 0xb4, 0xe7, 0x05, 0x0e, 0x5d, 0xae, 0x85, 0xd9, 0xc2, 0xf6, 0xb6, 0x93, 0x4c, 0x6a, + 0xcf, 0x8a, 0x81, 0x3d, 0xb3, 0x99, 0x4b, 0x85, 0x7b, 0x94, 0x46, 0x37, 0x60, 0x9a, 0xcd, 0xa7, + 0x46, 0xc7, 0xf7, 0x1b, 0xa1, 0xef, 0xb5, 0x0e, 0x66, 0xa7, 0x18, 0xc3, 0xa7, 0xe5, 0x8e, 0x75, + 0xdd, 0x44, 0x53, 0x8b, 0x3e, 0xfd, 0x87, 0xb3, 0xa5, 0x91, 0x0f, 0xd3, 0x31, 0x69, 0x75, 0x22, + 0x2f, 0x39, 0xa0, 0xb2, 0x4f, 0xee, 0x26, 0xb3, 0xd3, 0x65, 0x76, 0x28, 0x4d, 0xb3, 0x10, 0x77, + 0x17, 0x64, 0x80, 0x38, 0xcb, 0x9a, 0xaa, 0x8a, 0x38, 0x71, 0xbd, 0x60, 0x76, 0x86, 0x99, 0xa4, + 0x6a, 0x7e, 0x35, 0x29, 0x10, 0x73, 0x1c, 0xdb, 0xf0, 0xd1, 0x1f, 0x37, 0xa8, 0xee, 0x3d, 0xc1, + 0x08, 0xd3, 0x0d, 0x9f, 0x44, 0xe0, 0x94, 0x86, 0xae, 0x56, 0x49, 0x72, 0x30, 0x8b, 0x18, 0xa9, + 0x9a, 0x6a, 0x9b, 0x9b, 0x9f, 0xc3, 0x14, 0x6e, 0x6f, 0xc1, 0x94, 0x9a, 0xd6, 0x6c, 0x74, 0xd0, + 0x3c, 0x0c, 0x53, 0xcd, 0x25, 0xf7, 0x2d, 0x35, 0xda, 0x04, 0xaa, 0xd0, 0x62, 0xcc, 0xe1, 0xac, + 0x09, 0xde, 0x57, 0xc9, 0xf2, 0x41, 0x42, 0xb8, 0xfd, 0x5a, 0xd5, 0x9a, 0x20, 0x11, 0x38, 0xa5, + 0xb1, 0xff, 0x0f, 0x5f, 0x11, 0x53, 0xdd, 0x51, 0x42, 0x6f, 0x5e, 0x80, 0xb1, 0xdd, 0x30, 0x4e, + 0x28, 0x35, 0xab, 0x63, 0x38, 0x5d, 0x05, 0xaf, 0x08, 0x38, 0x56, 0x14, 0xe8, 0x35, 0x98, 0x6c, + 0xe9, 0x15, 0x08, 0x55, 0x7e, 0x5a, 0x14, 0x31, 0x6b, 0xc7, 0x26, 0x2d, 0x7a, 0x15, 0xc6, 0x98, + 0x13, 0xaf, 0x15, 0xfa, 0xc2, 0x52, 0x96, 0x2b, 0xd3, 0x58, 0x43, 0xc0, 0xef, 0x69, 0xbf, 0xb1, + 0xa2, 0xa6, 0xfb, 0x0d, 0xda, 0x84, 0xf5, 0x86, 0x50, 0xb7, 0x6a, 0xbf, 0x71, 0x85, 0x41, 0xb1, + 0xc0, 0xda, 0xff, 0xa2, 0xa2, 0x8d, 0x32, 0xb5, 0xf8, 0x08, 0xfa, 0x3c, 0x8c, 0xde, 0x71, 0xbc, + 0xc4, 0x0b, 0x76, 0xc4, 0x0a, 0xfa, 0x62, 0x49, 0xdd, 0xcb, 0x8a, 0xdf, 0xe2, 0x45, 0xf9, 0x3a, + 0x21, 0xfe, 0x60, 0xc9, 0x90, 0xf2, 0x8e, 0x3a, 0x41, 0x40, 0x79, 0x57, 0xfa, 0xe7, 0x8d, 0x79, + 0x51, 0xce, 0x5b, 0xfc, 0xc1, 0x92, 0x21, 0xda, 0x06, 0x90, 0xb3, 0x8f, 0xb8, 0xc2, 0x79, 0xf6, + 0x89, 0x7e, 0xd8, 0x6f, 0xaa, 0xd2, 0xcb, 0x53, 0x74, 0x65, 0x4a, 0xff, 0x63, 0x8d, 0xb3, 0x1d, + 0x31, 0x43, 0xa4, 0xbb, 0x59, 0xe8, 0x73, 0x74, 0x02, 0x38, 0x51, 0x42, 0xdc, 0xa5, 0xa4, 0xd8, + 0x0c, 0x4e, 0xad, 0xa9, 0x4d, 0x6f, 0x8f, 0xe8, 0x53, 0x45, 0xb0, 0xc0, 0x29, 0x37, 0xfb, 0xfb, + 0x55, 0x98, 0xed, 0xd5, 0x58, 0x2a, 0x90, 0xe4, 0xae, 0x97, 0xac, 0x50, 0x43, 0xc1, 0x32, 0x05, + 0x72, 0x55, 0xc0, 0xb1, 0xa2, 0xa0, 0x92, 0x11, 0x7b, 0x3b, 0x81, 0xe3, 0x0b, 0xe1, 0x55, 0x92, + 0xd1, 0x64, 0x50, 0x2c, 0xb0, 0x94, 0x2e, 0x22, 0x4e, 0x2c, 0x3c, 0xb7, 0x9a, 0x04, 0x61, 0x06, + 0xc5, 0x02, 0xab, 0xef, 0xfa, 0x86, 0x0a, 0x76, 0x7d, 0xc6, 0x00, 0x0d, 0x3f, 0xc8, 0x01, 0x42, + 0xef, 0x00, 0x6c, 0x7b, 0x81, 0x17, 0xef, 0x32, 0xde, 0x23, 0x7d, 0xf2, 0x56, 0xc6, 0xc8, 0x9a, + 0xe2, 0x81, 0x35, 0x7e, 0xe8, 0x65, 0x18, 0x57, 0x13, 0x73, 0xbd, 0x3e, 0x3b, 0x6a, 0x7a, 0xfa, + 0x52, 0x2d, 0x55, 0xc7, 0x3a, 0x9d, 0xfd, 0x95, 0xac, 0xa4, 0x88, 0xf9, 0xa0, 0x8d, 0xad, 0x55, + 0x76, 0x6c, 0x2b, 0xc7, 0x8f, 0xad, 0xfd, 0x5f, 0xaa, 0x74, 0xb3, 0xac, 0x55, 0xd6, 0x89, 0x4b, + 0xe8, 0xb2, 0x37, 0xa9, 0x62, 0x77, 0x12, 0x22, 0x66, 0xe3, 0x85, 0x7e, 0xa6, 0x8b, 0xbe, 0x0c, + 0xd0, 0x59, 0xc0, 0x39, 0xa1, 0x5d, 0xa8, 0xf9, 0x4e, 0xcc, 0x76, 0x8f, 0x44, 0xcc, 0xc2, 0xfe, + 0xd8, 0xa6, 0xc6, 0xb7, 0x13, 0x27, 0xda, 0x3a, 0xcb, 0x6b, 0x49, 0x99, 0xd3, 0x55, 0x89, 0x1a, + 0x05, 0xf2, 0xa8, 0x40, 0x35, 0x87, 0x5a, 0x0e, 0x07, 0x98, 0xe3, 0xd0, 0xab, 0x30, 0x11, 0x11, + 0x26, 0x27, 0x2b, 0xd4, 0xee, 0x61, 0x62, 0x37, 0x9c, 0x1a, 0x48, 0x58, 0xc3, 0x61, 0x83, 0x32, + 0xb5, 0x8f, 0x47, 0x8e, 0xb1, 0x8f, 0x9f, 0x85, 0x51, 0xf6, 0x43, 0x49, 0x85, 0xfa, 0x42, 0xeb, + 0x1c, 0x8c, 0x25, 0x3e, 0x2b, 0x44, 0x63, 0x25, 0x85, 0xe8, 0x39, 0x98, 0xaa, 0x3b, 0x64, 0x2f, + 0x0c, 0x56, 0x03, 0xb7, 0x1d, 0x7a, 0x41, 0x82, 0x66, 0x61, 0x88, 0xad, 0x24, 0x7c, 0xae, 0x0f, + 0x51, 0x0e, 0x78, 0x88, 0xda, 0xb8, 0xf6, 0xff, 0xb5, 0x60, 0xb2, 0x4e, 0x7c, 0x92, 0x90, 0x1b, + 0x6d, 0xe6, 0x6f, 0x40, 0x6b, 0x80, 0x76, 0x22, 0xa7, 0x45, 0x1a, 0x24, 0xf2, 0x42, 0xb7, 0x49, + 0x5a, 0x61, 0xc0, 0x3c, 0xec, 0x74, 0x69, 0x3c, 0x73, 0x74, 0x38, 0x8f, 0x2e, 0x77, 0x61, 0x71, + 0x4e, 0x09, 0xe4, 0xc2, 0x64, 0x3b, 0x22, 0x86, 0x83, 0xc4, 0x2a, 0x36, 0xcb, 0x1b, 0x7a, 0x11, + 0x6e, 0x35, 0x1a, 0x20, 0x6c, 0x32, 0x45, 0x9f, 0x81, 0x99, 0x30, 0x6a, 0xef, 0x3a, 0x41, 0x9d, + 0xb4, 0x49, 0xe0, 0x52, 0x53, 0x59, 0x78, 0xc1, 0x4e, 0x1d, 0x1d, 0xce, 0xcf, 0xdc, 0xc8, 0xe0, + 0x70, 0x17, 0xb5, 0xfd, 0xeb, 0x15, 0x38, 0x5d, 0x0f, 0xef, 0x04, 0x77, 0x9c, 0xc8, 0x5d, 0x6a, + 0xac, 0x73, 0xfb, 0x97, 0x79, 0x15, 0xa5, 0x37, 0xd3, 0xea, 0xe9, 0xcd, 0xfc, 0x02, 0x8c, 0x6d, + 0x7b, 0xc4, 0x77, 0x31, 0xd9, 0x16, 0xdd, 0xbb, 0x58, 0xc6, 0x8b, 0xb1, 0x46, 0xcb, 0x48, 0x4f, + 0x00, 0x77, 0xa6, 0xae, 0x09, 0x36, 0x58, 0x31, 0x44, 0x1d, 0x98, 0x91, 0x06, 0xbe, 0xc4, 0x8a, + 0xd9, 0xf1, 0x62, 0xb9, 0xfd, 0x83, 0x59, 0x0d, 0x1b, 0x0f, 0x9c, 0x61, 0x88, 0xbb, 0xaa, 0xa0, + 0x1b, 0xb3, 0x3d, 0xba, 0x2e, 0x0c, 0x31, 0x59, 0x61, 0x1b, 0x33, 0xb6, 0x73, 0x64, 0x50, 0xfb, + 0x9f, 0x5a, 0xf0, 0x58, 0xd7, 0x68, 0x89, 0x6d, 0xf5, 0xdb, 0x72, 0x3f, 0xcb, 0x8f, 0x63, 0x0a, + 0x5a, 0x99, 0x3b, 0xe6, 0xe5, 0xf6, 0xb6, 0x95, 0x12, 0x7b, 0xdb, 0x1b, 0x70, 0x6a, 0x75, 0xaf, + 0x9d, 0x1c, 0xd4, 0x3d, 0xd3, 0x09, 0xfb, 0x0a, 0x8c, 0xec, 0x11, 0xd7, 0xeb, 0xec, 0x89, 0xcf, + 0x3a, 0x2f, 0x15, 0xe9, 0x06, 0x83, 0xde, 0x3b, 0x9c, 0x9f, 0x6c, 0x26, 0x61, 0xe4, 0xec, 0x10, + 0x0e, 0xc0, 0x82, 0xdc, 0x7e, 0xdf, 0x82, 0x69, 0x39, 0xa1, 0x96, 0x5c, 0x37, 0x22, 0x71, 0x8c, + 0xe6, 0xa0, 0xe2, 0xb5, 0x05, 0x23, 0x10, 0x8c, 0x2a, 0xeb, 0x0d, 0x5c, 0xf1, 0xda, 0xe8, 0xf3, + 0x50, 0xe3, 0xbe, 0xfb, 0x54, 0x38, 0xfa, 0x3c, 0x0b, 0x60, 0x9b, 0x8e, 0x4d, 0xc9, 0x03, 0xa7, + 0xec, 0xa4, 0x41, 0xc9, 0x54, 0x75, 0xd5, 0xf4, 0x24, 0x5f, 0x11, 0x70, 0xac, 0x28, 0xd0, 0x79, + 0x18, 0x0b, 0x42, 0x97, 0x1f, 0xab, 0xf0, 0x05, 0x97, 0x89, 0xdc, 0x75, 0x01, 0xc3, 0x0a, 0x6b, + 0x7f, 0xd3, 0x82, 0x09, 0xd9, 0xc7, 0x92, 0xb6, 0x2d, 0x9d, 0x24, 0xa9, 0x5d, 0x9b, 0x4e, 0x12, + 0x6a, 0x9b, 0x32, 0x8c, 0x61, 0x92, 0x56, 0xfb, 0x31, 0x49, 0xed, 0x1f, 0x55, 0x60, 0x4a, 0x36, + 0xa7, 0xd9, 0xd9, 0x8a, 0x49, 0x82, 0xbe, 0x08, 0x35, 0x87, 0x0f, 0x3e, 0x91, 0x72, 0xf6, 0x42, + 0xd1, 0xc6, 0xdc, 0xf8, 0x66, 0xa9, 0x55, 0xb0, 0x24, 0xf9, 0xe0, 0x94, 0x25, 0xda, 0x87, 0x13, + 0x41, 0x98, 0xb0, 0xf5, 0x40, 0xe1, 0xcb, 0x79, 0x41, 0xb3, 0xf5, 0x3c, 0x2e, 0xea, 0x39, 0x71, + 0x3d, 0xcb, 0x0f, 0x77, 0x57, 0x81, 0x6e, 0x48, 0xe7, 0x45, 0x95, 0xd5, 0xf5, 0x5c, 0xb9, 0xba, + 0x7a, 0xfb, 0x2e, 0xec, 0xdf, 0xb1, 0xa0, 0x26, 0xc9, 0x06, 0xe9, 0x04, 0xbf, 0x05, 0xa3, 0x31, + 0xfb, 0x34, 0x72, 0x98, 0x2e, 0x94, 0x6b, 0x3a, 0xff, 0x9e, 0xe9, 0xe2, 0xc7, 0xff, 0xc7, 0x58, + 0x72, 0x63, 0xae, 0x47, 0xd5, 0x81, 0x47, 0xcc, 0xf5, 0xa8, 0xda, 0xd5, 0xc3, 0xf5, 0xf8, 0x6b, + 0x16, 0x8c, 0x70, 0x87, 0x50, 0x39, 0xaf, 0x9a, 0xe6, 0x3c, 0x4e, 0x39, 0xbe, 0x45, 0x81, 0xc2, + 0x97, 0x8c, 0x6e, 0x41, 0x8d, 0xfd, 0x58, 0x8b, 0xc2, 0x3d, 0xb1, 0x0a, 0x3c, 0x57, 0xc6, 0x21, + 0xc5, 0xb5, 0x1e, 0x57, 0x25, 0x6f, 0x49, 0x06, 0x38, 0xe5, 0x65, 0xff, 0xb8, 0x4a, 0xa7, 0x7c, + 0x4a, 0x6a, 0xac, 0x69, 0xd6, 0xc3, 0x58, 0xd3, 0x2a, 0x83, 0x5f, 0xd3, 0xde, 0x85, 0xe9, 0x96, + 0xe6, 0x84, 0x4f, 0x57, 0xd2, 0x4b, 0x25, 0x5d, 0xcc, 0x9a, 0xe7, 0x9e, 0x3b, 0x40, 0x56, 0x4c, + 0x76, 0x38, 0xcb, 0x1f, 0x11, 0x98, 0xe0, 0xc7, 0x87, 0xa2, 0xbe, 0x21, 0x56, 0xdf, 0x62, 0xa1, + 0xaf, 0x85, 0x97, 0x50, 0x95, 0xb1, 0x10, 0x93, 0xa6, 0xc6, 0x08, 0x1b, 0x6c, 0xed, 0x5f, 0x1d, + 0x86, 0xe1, 0xd5, 0x7d, 0x12, 0x24, 0x03, 0x9c, 0xe2, 0x7b, 0x30, 0xe5, 0x05, 0xfb, 0xa1, 0xbf, + 0x4f, 0x5c, 0x8e, 0xbf, 0xbf, 0xe5, 0xec, 0x8c, 0xa8, 0x64, 0x6a, 0xdd, 0x60, 0x86, 0x33, 0xcc, + 0x07, 0xb1, 0x8d, 0x7c, 0x13, 0x46, 0xb8, 0x44, 0x88, 0x3d, 0x64, 0x81, 0x63, 0x94, 0x0d, 0xa8, + 0x98, 0x39, 0xe9, 0x66, 0x97, 0xfb, 0x64, 0x05, 0x23, 0xb4, 0x0b, 0x53, 0xdb, 0x5e, 0x14, 0x27, + 0x74, 0x37, 0x18, 0x27, 0xce, 0x5e, 0xbb, 0xef, 0x2d, 0xa4, 0x1a, 0x8f, 0x35, 0x83, 0x0f, 0xce, + 0xf0, 0x45, 0x04, 0x26, 0xe9, 0x0e, 0x26, 0xad, 0x68, 0xb4, 0xcf, 0x8a, 0x94, 0xe7, 0xe8, 0x9a, + 0xce, 0x06, 0x9b, 0x5c, 0xa9, 0x1a, 0x6a, 0xb1, 0xfd, 0xce, 0x18, 0x5b, 0xc9, 0x95, 0x1a, 0xe2, + 0x1b, 0x1d, 0x8e, 0xa3, 0xda, 0x8c, 0x9d, 0x13, 0xd7, 0x4c, 0x6d, 0x96, 0x9e, 0x06, 0xdb, 0xdf, + 0xa3, 0xeb, 0x0e, 0x1d, 0xbf, 0x81, 0xab, 0xec, 0x2b, 0xa6, 0xca, 0x7e, 0xaa, 0xc4, 0x37, 0xed, + 0xa1, 0xae, 0xbf, 0x0c, 0xe3, 0xda, 0x27, 0x47, 0x8b, 0x50, 0x6b, 0xc9, 0x23, 0x4d, 0xa1, 0xb7, + 0x95, 0xd1, 0xa0, 0xce, 0x3a, 0x71, 0x4a, 0x43, 0x47, 0x85, 0x1a, 0x5b, 0xd9, 0xb0, 0x07, 0x6a, + 0x8a, 0x61, 0x86, 0xb1, 0x5f, 0x04, 0x58, 0xbd, 0x4b, 0x5a, 0x4b, 0x2d, 0x76, 0xda, 0xae, 0x1d, + 0x91, 0x58, 0xbd, 0x8f, 0x48, 0xe8, 0x50, 0x4e, 0xad, 0xad, 0x18, 0xd6, 0xeb, 0x02, 0x00, 0xb7, + 0x02, 0x6f, 0xdd, 0xba, 0x2e, 0x9d, 0x9a, 0xdc, 0xf3, 0xa4, 0xa0, 0x58, 0xa3, 0x40, 0x8f, 0x43, + 0xd5, 0xef, 0x04, 0xc2, 0x38, 0x1b, 0x3d, 0x3a, 0x9c, 0xaf, 0x5e, 0xeb, 0x04, 0x98, 0xc2, 0xb4, + 0xf8, 0x82, 0x6a, 0xe9, 0xf8, 0x82, 0xe2, 0x08, 0xbb, 0x6f, 0x57, 0x61, 0x66, 0xcd, 0x27, 0x77, + 0x8d, 0x56, 0x3f, 0x03, 0x23, 0x6e, 0xe4, 0xed, 0x93, 0x28, 0xeb, 0xbc, 0xa8, 0x33, 0x28, 0x16, + 0xd8, 0xd2, 0x21, 0x0f, 0x46, 0xb8, 0x47, 0x75, 0xc0, 0xe1, 0x1e, 0x85, 0x7d, 0x46, 0xdb, 0x30, + 0x1a, 0xf2, 0xcd, 0xf3, 0xec, 0x30, 0x13, 0xc5, 0xd7, 0x8e, 0x6f, 0x4c, 0x76, 0x7c, 0x16, 0xc4, + 0xd6, 0x9b, 0x1f, 0x3f, 0x2b, 0x2d, 0x26, 0xa0, 0x58, 0x32, 0x9f, 0xfb, 0x14, 0x4c, 0xe8, 0x94, + 0x7d, 0x9d, 0x43, 0xff, 0x92, 0x05, 0x27, 0xd7, 0xfc, 0xb0, 0x75, 0x3b, 0x13, 0x93, 0xf2, 0x32, + 0x8c, 0xd3, 0xc9, 0x14, 0x1b, 0x81, 0x5a, 0x46, 0x44, 0x9a, 0x40, 0x61, 0x9d, 0x4e, 0x2b, 0x76, + 0xf3, 0xe6, 0x7a, 0x3d, 0x2f, 0x90, 0x4d, 0xa0, 0xb0, 0x4e, 0x67, 0xff, 0x67, 0x0b, 0x9e, 0xbc, + 0xbc, 0xb2, 0xda, 0x20, 0x51, 0xec, 0xc5, 0x09, 0x09, 0x92, 0xae, 0x58, 0xba, 0x67, 0x60, 0xa4, + 0xed, 0x6a, 0x4d, 0x51, 0x22, 0xd0, 0xa8, 0xb3, 0x56, 0x08, 0xec, 0xa3, 0x12, 0x50, 0xfa, 0x6b, + 0x16, 0x9c, 0xbc, 0xec, 0x25, 0x98, 0xb4, 0xc3, 0x6c, 0xf8, 0x5b, 0x44, 0xda, 0x61, 0xec, 0x25, + 0x61, 0x74, 0x90, 0x0d, 0x7f, 0xc3, 0x0a, 0x83, 0x35, 0x2a, 0x5e, 0xf3, 0xbe, 0x17, 0xd3, 0x96, + 0x56, 0xcc, 0x4d, 0x1d, 0x16, 0x70, 0xac, 0x28, 0x68, 0xc7, 0x5c, 0x2f, 0x62, 0x46, 0xc2, 0x81, + 0x98, 0xc1, 0xaa, 0x63, 0x75, 0x89, 0xc0, 0x29, 0x8d, 0xfd, 0xf7, 0x2d, 0x38, 0x7d, 0xd9, 0xef, + 0xc4, 0x09, 0x89, 0xb6, 0x63, 0xa3, 0xb1, 0x2f, 0x42, 0x8d, 0x48, 0x83, 0x56, 0xb4, 0x55, 0x2d, + 0x19, 0xca, 0xd2, 0xe5, 0xb1, 0x77, 0x8a, 0xae, 0x44, 0xa8, 0x57, 0x7f, 0x81, 0x49, 0xbf, 0x55, + 0x81, 0xc9, 0x2b, 0x9b, 0x9b, 0x8d, 0xcb, 0x24, 0x11, 0x5a, 0xb2, 0xd8, 0xfd, 0xd2, 0xd0, 0xf6, + 0x9e, 0xe3, 0x97, 0x16, 0x7a, 0xcc, 0xba, 0x4e, 0xe2, 0xf9, 0x0b, 0x3c, 0xd4, 0x79, 0x61, 0x3d, + 0x48, 0x6e, 0x44, 0xcd, 0x24, 0xf2, 0x82, 0x9d, 0xdc, 0xbd, 0xaa, 0xd4, 0xe4, 0xd5, 0x5e, 0x9a, + 0x1c, 0xbd, 0x08, 0x23, 0x2c, 0xd2, 0x5a, 0x1a, 0x1d, 0x1f, 0x56, 0xf6, 0x01, 0x83, 0xde, 0x3b, + 0x9c, 0xaf, 0xdd, 0xc4, 0xeb, 0xfc, 0x0f, 0x16, 0xa4, 0xe8, 0x4b, 0x30, 0xbe, 0x9b, 0x24, 0xed, + 0x2b, 0xc4, 0x71, 0x49, 0x24, 0xb5, 0x44, 0x81, 0x79, 0x46, 0x07, 0x83, 0x17, 0x48, 0x27, 0x56, + 0x0a, 0x8b, 0xb1, 0xce, 0xd1, 0x6e, 0x02, 0xa4, 0xb8, 0x07, 0xb4, 0xe7, 0xb0, 0xff, 0x5a, 0x05, + 0x46, 0xaf, 0x38, 0x81, 0xeb, 0x93, 0x08, 0xad, 0xc1, 0x10, 0xb9, 0x4b, 0x5a, 0xe5, 0x2c, 0xcb, + 0x74, 0xa9, 0xe3, 0xfe, 0x23, 0xfa, 0x1f, 0xb3, 0xf2, 0x08, 0xc3, 0x28, 0x6d, 0xf7, 0x65, 0x15, + 0x1f, 0xf9, 0x7c, 0xf1, 0x28, 0x28, 0x91, 0xe0, 0xeb, 0xa4, 0x00, 0x61, 0xc9, 0x88, 0x79, 0x5a, + 0x5a, 0xed, 0x26, 0x55, 0x6e, 0x49, 0xb9, 0x10, 0xe8, 0xcd, 0x95, 0x06, 0x27, 0x17, 0x7c, 0xb9, + 0xa7, 0x45, 0x02, 0x71, 0xca, 0xce, 0x7e, 0x15, 0x4e, 0xb1, 0x23, 0x3a, 0x27, 0xd9, 0x35, 0xe6, + 0x4c, 0xa1, 0x70, 0xda, 0xff, 0xa8, 0x02, 0x27, 0xd6, 0x9b, 0x2b, 0x4d, 0xd3, 0x47, 0xf6, 0x2a, + 0x4c, 0xf0, 0xe5, 0x99, 0x0a, 0x9d, 0xe3, 0x8b, 0xf2, 0xca, 0xb9, 0xbc, 0xa9, 0xe1, 0xb0, 0x41, + 0x89, 0x9e, 0x84, 0xaa, 0xf7, 0x6e, 0x90, 0x8d, 0xd4, 0x59, 0x7f, 0xf3, 0x3a, 0xa6, 0x70, 0x8a, + 0xa6, 0x2b, 0x3d, 0x57, 0x71, 0x0a, 0xad, 0x56, 0xfb, 0x37, 0x60, 0xca, 0x8b, 0x5b, 0xb1, 0xb7, + 0x1e, 0xd0, 0xf9, 0xef, 0xb4, 0xa4, 0xf8, 0xa6, 0x46, 0x39, 0x6d, 0xaa, 0xc2, 0xe2, 0x0c, 0xb5, + 0xa6, 0x6f, 0x87, 0x4b, 0x5b, 0x0b, 0xc5, 0x81, 0x92, 0x5f, 0x81, 0x9a, 0x0a, 0x6b, 0x91, 0xa1, + 0x48, 0x56, 0x7e, 0x28, 0x52, 0x09, 0x85, 0x23, 0x3d, 0x97, 0xd5, 0x5c, 0xcf, 0xe5, 0x6f, 0x58, + 0x90, 0x9e, 0xe0, 0x23, 0x0c, 0xb5, 0x76, 0xc8, 0x8e, 0x05, 0x22, 0x79, 0xf2, 0xf6, 0x74, 0x81, + 0x24, 0xf2, 0x99, 0xc0, 0x65, 0xa5, 0x21, 0xcb, 0xe2, 0x94, 0x0d, 0xba, 0x06, 0xa3, 0xed, 0x88, + 0x34, 0x13, 0x16, 0x6d, 0xdb, 0x07, 0x47, 0x26, 0xd5, 0x0d, 0x5e, 0x12, 0x4b, 0x16, 0xf6, 0xbf, + 0xb6, 0x00, 0xae, 0x79, 0x7b, 0x5e, 0x82, 0x9d, 0x60, 0x87, 0x0c, 0x70, 0x7b, 0x77, 0x1d, 0x86, + 0xe2, 0x36, 0x69, 0x95, 0x3b, 0xd0, 0x49, 0x5b, 0xd4, 0x6c, 0x93, 0x56, 0xfa, 0x19, 0xe8, 0x3f, + 0xcc, 0xf8, 0xd8, 0xbf, 0x09, 0x30, 0x95, 0x92, 0x51, 0x43, 0x1b, 0xbd, 0x60, 0x84, 0x97, 0x3e, + 0x9e, 0x09, 0x2f, 0xad, 0x31, 0x6a, 0x2d, 0xa2, 0x34, 0x81, 0xea, 0x9e, 0x73, 0x57, 0xd8, 0xf5, + 0x2f, 0x97, 0x6d, 0x10, 0xad, 0x69, 0x61, 0xc3, 0xb9, 0xcb, 0xcd, 0xa8, 0xe7, 0xa5, 0x00, 0x6d, + 0x38, 0x77, 0xef, 0xf1, 0x63, 0x1b, 0x36, 0x03, 0xe9, 0x46, 0xe2, 0xeb, 0xff, 0x35, 0xfd, 0xcf, + 0x94, 0x22, 0xad, 0x8e, 0xd5, 0xea, 0x05, 0xc2, 0x01, 0xd7, 0x67, 0xad, 0x5e, 0x90, 0xad, 0xd5, + 0x0b, 0x4a, 0xd4, 0xea, 0x05, 0xe8, 0x3d, 0x0b, 0x46, 0x85, 0xdf, 0x9a, 0xc5, 0x42, 0x8d, 0x5f, + 0xfa, 0x64, 0x5f, 0x55, 0x0b, 0x07, 0x38, 0xaf, 0x7e, 0x51, 0xda, 0x8e, 0x02, 0x5a, 0xd8, 0x04, + 0x59, 0x35, 0xfa, 0x8e, 0x05, 0x53, 0xe2, 0x37, 0x26, 0xef, 0x76, 0x48, 0x9c, 0x88, 0x55, 0xea, + 0x33, 0xf7, 0xd3, 0x1a, 0xc1, 0x82, 0x37, 0xea, 0x13, 0x52, 0xc5, 0x98, 0xc8, 0xc2, 0xb6, 0x65, + 0xda, 0x83, 0x7e, 0x68, 0xc1, 0xa9, 0x3d, 0xe7, 0x2e, 0xaf, 0x91, 0xc3, 0xb0, 0x93, 0x78, 0xa1, + 0x88, 0xf7, 0x5a, 0xeb, 0x57, 0x4e, 0xba, 0x18, 0xf1, 0xe6, 0xbe, 0x2e, 0x0f, 0x13, 0xf3, 0x48, + 0x0a, 0x1b, 0x9d, 0xdb, 0xc2, 0x39, 0x17, 0xc6, 0xa4, 0x60, 0xe6, 0x58, 0xed, 0xcb, 0xfa, 0x62, + 0x7c, 0xfc, 0x0c, 0x94, 0x9e, 0xad, 0x85, 0x37, 0x3b, 0x4e, 0x90, 0x78, 0xc9, 0x81, 0x66, 0xe3, + 0xb3, 0x5a, 0x84, 0x20, 0x0e, 0xb0, 0x96, 0x5d, 0x98, 0xd0, 0x65, 0x6e, 0x80, 0x35, 0x85, 0x70, + 0x32, 0x47, 0x9e, 0x06, 0x58, 0x61, 0x07, 0x1e, 0xef, 0x29, 0x17, 0x83, 0xab, 0xd6, 0xfe, 0x2d, + 0x4b, 0x57, 0x98, 0x03, 0xf7, 0x9b, 0x6c, 0x98, 0x7e, 0x93, 0xf3, 0x65, 0xe7, 0x4d, 0x0f, 0xe7, + 0xc9, 0xb6, 0xde, 0x78, 0xba, 0x0c, 0xa0, 0x4d, 0x18, 0xf1, 0x29, 0x44, 0x1e, 0xd0, 0x5c, 0xe8, + 0x67, 0x66, 0xa6, 0x96, 0x05, 0x83, 0xc7, 0x58, 0xf0, 0xb2, 0x7f, 0x60, 0xc1, 0xd0, 0xc0, 0xc7, + 0xa6, 0x61, 0x8e, 0x4d, 0x2f, 0xe3, 0x54, 0xdc, 0xb9, 0x5c, 0xc0, 0xce, 0x9d, 0xd5, 0xbb, 0x09, + 0x09, 0x62, 0x66, 0x44, 0xe6, 0x0e, 0xcf, 0xaf, 0x57, 0x60, 0x9c, 0x56, 0x24, 0x8f, 0xd7, 0x5f, + 0x83, 0x49, 0xdf, 0xd9, 0x22, 0xbe, 0xf4, 0xf0, 0x66, 0x37, 0x5c, 0xd7, 0x74, 0x24, 0x36, 0x69, + 0x69, 0xe1, 0x6d, 0xdd, 0x01, 0x2e, 0x8c, 0x21, 0x55, 0xd8, 0xf0, 0x8e, 0x63, 0x93, 0x96, 0xda, + 0xfc, 0x77, 0x9c, 0xa4, 0xb5, 0x2b, 0x36, 0x63, 0xaa, 0xb9, 0xb7, 0x28, 0x10, 0x73, 0x1c, 0x5a, + 0x82, 0x69, 0x29, 0xab, 0x6f, 0xd1, 0x5d, 0x7a, 0x18, 0x08, 0x43, 0x51, 0x5d, 0x94, 0xc3, 0x26, + 0x1a, 0x67, 0xe9, 0xd1, 0xa7, 0x60, 0x8a, 0x0e, 0x4e, 0xd8, 0x49, 0x64, 0xf0, 0xc0, 0x30, 0x0b, + 0x1e, 0x60, 0x31, 0x9a, 0x9b, 0x06, 0x06, 0x67, 0x28, 0xed, 0x2f, 0xc1, 0xc9, 0x6b, 0xa1, 0xe3, + 0x2e, 0x3b, 0xbe, 0x13, 0xb4, 0x48, 0xb4, 0x1e, 0xec, 0x14, 0x9e, 0xb3, 0xea, 0x67, 0xa1, 0x95, + 0xa2, 0xb3, 0x50, 0x3b, 0x02, 0xa4, 0x57, 0x20, 0xc2, 0x5e, 0xde, 0x81, 0x51, 0x8f, 0x57, 0x25, + 0x44, 0xf6, 0x62, 0x91, 0x3b, 0xa9, 0xab, 0x8d, 0x5a, 0x18, 0x07, 0x07, 0x60, 0xc9, 0x92, 0xee, + 0x21, 0xf2, 0xfc, 0x4f, 0xc5, 0xdb, 0x34, 0xfb, 0x6f, 0x58, 0x30, 0x7d, 0x3d, 0x73, 0x1b, 0xeb, + 0x19, 0x18, 0x89, 0x49, 0x94, 0xe3, 0x4c, 0x6b, 0x32, 0x28, 0x16, 0xd8, 0x07, 0xbe, 0x41, 0xff, + 0x46, 0x05, 0x6a, 0x2c, 0x74, 0xb2, 0xed, 0xb4, 0x06, 0x69, 0x8e, 0x6e, 0x18, 0xe6, 0x68, 0xc1, + 0xf6, 0x50, 0x35, 0xa8, 0x97, 0x35, 0x8a, 0x6e, 0xaa, 0xdb, 0x49, 0xa5, 0x76, 0x86, 0x29, 0x43, + 0x7e, 0x97, 0x65, 0xca, 0xbc, 0xcc, 0x24, 0x6f, 0x2e, 0xb1, 0xd3, 0x49, 0x45, 0xfb, 0x88, 0x9d, + 0x4e, 0xaa, 0x76, 0xf5, 0x50, 0x49, 0x0d, 0xad, 0xe9, 0x4c, 0x61, 0x7f, 0x9a, 0x85, 0xc2, 0x39, + 0xbe, 0xf7, 0x55, 0xa2, 0xae, 0xf8, 0xcd, 0x8b, 0xe0, 0x36, 0x01, 0xbd, 0xc7, 0xb4, 0x8b, 0xf8, + 0xc7, 0x6f, 0x6e, 0xa6, 0x45, 0xec, 0x2b, 0x30, 0x9d, 0x19, 0x38, 0xf4, 0x32, 0x0c, 0xb7, 0x77, + 0x9d, 0x98, 0x64, 0xc2, 0x2c, 0x86, 0x1b, 0x14, 0x78, 0xef, 0x70, 0x7e, 0x4a, 0x15, 0x60, 0x10, + 0xcc, 0xa9, 0xed, 0x3f, 0xb7, 0x60, 0xe8, 0x7a, 0xe8, 0x0e, 0x52, 0xc0, 0xae, 0x18, 0x02, 0xf6, + 0x4c, 0xf1, 0x7d, 0xef, 0x9e, 0xb2, 0xd5, 0xc8, 0xc8, 0xd6, 0xf9, 0x12, 0xbc, 0x8e, 0x17, 0xab, + 0x3d, 0x18, 0x67, 0xf7, 0xc9, 0x45, 0x7c, 0xc9, 0x8b, 0xc6, 0xbe, 0x69, 0x3e, 0xb3, 0x6f, 0x9a, + 0xd6, 0x48, 0xb5, 0xdd, 0xd3, 0xb3, 0x30, 0x2a, 0xe2, 0x19, 0xb2, 0x21, 0x80, 0x82, 0x16, 0x4b, + 0xbc, 0xfd, 0x2f, 0xab, 0x60, 0xdc, 0x5f, 0x47, 0xbf, 0x6f, 0xc1, 0x42, 0xc4, 0xaf, 0x1d, 0xb8, + 0xf5, 0x4e, 0xe4, 0x05, 0x3b, 0xcd, 0xd6, 0x2e, 0x71, 0x3b, 0xbe, 0x17, 0xec, 0xac, 0xef, 0x04, + 0xa1, 0x02, 0xaf, 0xde, 0x25, 0xad, 0x0e, 0x73, 0xaa, 0x96, 0xbe, 0x36, 0xaf, 0xce, 0x34, 0x2f, + 0x1d, 0x1d, 0xce, 0x2f, 0xe0, 0xbe, 0x6a, 0xc1, 0x7d, 0xb6, 0x0a, 0xfd, 0x91, 0x05, 0x8b, 0xfc, + 0x06, 0x77, 0xf9, 0x9e, 0x94, 0xda, 0x6f, 0x36, 0x24, 0xd3, 0x94, 0xdd, 0x26, 0x89, 0xf6, 0x96, + 0x5f, 0x11, 0x83, 0xbc, 0xd8, 0xe8, 0xaf, 0x56, 0xdc, 0x6f, 0x33, 0xed, 0xdf, 0xae, 0xc2, 0x24, + 0x1d, 0xcf, 0xf4, 0xf6, 0xe6, 0xcb, 0x86, 0x98, 0x7c, 0x24, 0x23, 0x26, 0x27, 0x0c, 0xe2, 0x07, + 0x73, 0x71, 0xf3, 0x5d, 0x38, 0xe1, 0x3b, 0x71, 0x72, 0x85, 0x38, 0x51, 0xb2, 0x45, 0x1c, 0x76, + 0x8c, 0x58, 0x3c, 0x09, 0x32, 0xe7, 0x92, 0x2a, 0x42, 0xe6, 0x5a, 0x96, 0x15, 0xee, 0xe6, 0x8e, + 0x12, 0x40, 0xec, 0xc0, 0x32, 0x72, 0x82, 0x98, 0xf7, 0xc4, 0x13, 0x4e, 0xd8, 0x7e, 0xea, 0x9c, + 0x13, 0x75, 0xa2, 0x6b, 0x5d, 0xbc, 0x70, 0x0e, 0x7f, 0xed, 0x30, 0x7a, 0xb8, 0xec, 0x61, 0xf4, + 0x48, 0x41, 0xdc, 0xed, 0x2f, 0x5b, 0x70, 0x92, 0x7e, 0x12, 0x33, 0x46, 0x33, 0x46, 0x21, 0x4c, + 0xd3, 0xe6, 0xfb, 0x24, 0x91, 0xb0, 0xe2, 0x75, 0x84, 0x05, 0xd2, 0x19, 0x7c, 0x52, 0x43, 0xed, + 0xaa, 0xc9, 0x0c, 0x67, 0xb9, 0xdb, 0xdf, 0xb5, 0x80, 0x05, 0x81, 0x0d, 0x7c, 0xf9, 0xba, 0x6c, + 0x2e, 0x5f, 0x76, 0xb1, 0xae, 0xe8, 0xb1, 0x72, 0xbd, 0x04, 0x33, 0x14, 0xdb, 0x88, 0xc2, 0xbb, + 0x07, 0xd2, 0xa0, 0x2e, 0xf6, 0xc4, 0xbe, 0x57, 0xe1, 0x13, 0x46, 0xdd, 0x9c, 0x42, 0xbf, 0x62, + 0xc1, 0x58, 0xcb, 0x69, 0x3b, 0x2d, 0x9e, 0xf7, 0xa3, 0x84, 0xd7, 0xc5, 0x28, 0xbf, 0xb0, 0x22, + 0xca, 0x72, 0x8f, 0xc1, 0xc7, 0x65, 0xd7, 0x25, 0xb8, 0xd0, 0x4b, 0xa0, 0x2a, 0x9f, 0xf3, 0x60, + 0xd2, 0x60, 0x36, 0xc0, 0x6d, 0xe6, 0xaf, 0x58, 0x5c, 0xd9, 0xab, 0x0d, 0xc1, 0x1d, 0x38, 0x11, + 0x68, 0xff, 0xa9, 0x1a, 0x93, 0xf6, 0xef, 0x42, 0x79, 0x75, 0xce, 0xb4, 0x9f, 0x16, 0xec, 0x96, + 0x61, 0x88, 0xbb, 0xeb, 0xb0, 0xff, 0xb1, 0x05, 0x8f, 0xe9, 0x84, 0xda, 0x45, 0xb7, 0x22, 0x2f, + 0x70, 0x1d, 0xc6, 0xc2, 0x36, 0x89, 0x9c, 0x74, 0xf3, 0x73, 0x5e, 0x8e, 0xfe, 0x0d, 0x01, 0xbf, + 0x77, 0x38, 0x7f, 0x4a, 0xe7, 0x2e, 0xe1, 0x58, 0x95, 0x44, 0x36, 0x8c, 0xb0, 0x71, 0x89, 0xc5, + 0x15, 0x45, 0x96, 0x05, 0x83, 0x9d, 0x7d, 0xc4, 0x58, 0x60, 0xec, 0xbf, 0x69, 0x71, 0x61, 0xd3, + 0x9b, 0x8e, 0xbe, 0x06, 0x33, 0x7b, 0x74, 0x9f, 0xb4, 0x7a, 0xb7, 0x4d, 0x17, 0x50, 0x76, 0xe6, + 0x6b, 0x95, 0x59, 0x36, 0x7a, 0x74, 0x77, 0x79, 0x56, 0xb4, 0x7e, 0x66, 0x23, 0xc3, 0x16, 0x77, + 0x55, 0x64, 0xff, 0xb1, 0x98, 0xaf, 0xcc, 0x66, 0x7b, 0x16, 0x46, 0xdb, 0xa1, 0xbb, 0xb2, 0x5e, + 0xc7, 0x62, 0xac, 0x94, 0xc2, 0x69, 0x70, 0x30, 0x96, 0x78, 0x74, 0x09, 0x80, 0xdc, 0x4d, 0x48, + 0x14, 0x38, 0xbe, 0x3a, 0xab, 0x55, 0x26, 0xd2, 0xaa, 0xc2, 0x60, 0x8d, 0x8a, 0x96, 0x69, 0x47, + 0xe1, 0xbe, 0xe7, 0xb2, 0xc8, 0xf3, 0xaa, 0x59, 0xa6, 0xa1, 0x30, 0x58, 0xa3, 0xa2, 0xbb, 0xd3, + 0x4e, 0x10, 0xf3, 0xe5, 0xcb, 0xd9, 0x12, 0xc9, 0x1b, 0xc6, 0xd2, 0xdd, 0xe9, 0x4d, 0x1d, 0x89, + 0x4d, 0x5a, 0xfb, 0x67, 0x35, 0x80, 0xd4, 0x40, 0x42, 0xef, 0x75, 0xcf, 0xd0, 0x4f, 0x94, 0xb5, + 0xae, 0x1e, 0xdc, 0xf4, 0x44, 0xdf, 0xb2, 0x60, 0xdc, 0xf1, 0xfd, 0xb0, 0xe5, 0x24, 0xac, 0x47, + 0x95, 0xb2, 0xba, 0x42, 0xb4, 0x64, 0x29, 0x2d, 0xcb, 0x1b, 0xf3, 0xa2, 0x3c, 0xca, 0xd3, 0x30, + 0x85, 0xed, 0xd1, 0x9b, 0x80, 0x3e, 0x2e, 0x0d, 0x6b, 0xfe, 0x51, 0xe6, 0xb2, 0x86, 0x75, 0x8d, + 0x69, 0x48, 0xcd, 0xa6, 0x46, 0x5f, 0x32, 0xf2, 0x14, 0x0c, 0x95, 0xb9, 0x1d, 0x6b, 0x98, 0x0c, + 0x45, 0x29, 0x0a, 0xd0, 0xe7, 0xf5, 0xa0, 0xdc, 0xe1, 0x32, 0x57, 0x4f, 0x35, 0xcb, 0xb5, 0x20, + 0x20, 0x37, 0x81, 0x69, 0xd7, 0x5c, 0x28, 0x45, 0xa0, 0xd5, 0xc5, 0xe2, 0x1a, 0x32, 0x2b, 0x6c, + 0xba, 0x34, 0x66, 0x10, 0x38, 0x5b, 0x05, 0x5d, 0x0d, 0xa9, 0xda, 0x5a, 0x0f, 0xb6, 0x43, 0x11, + 0x6e, 0x75, 0xa1, 0xc4, 0x37, 0x3f, 0x88, 0x13, 0xb2, 0x47, 0xcb, 0xa4, 0xab, 0xe1, 0x75, 0xc1, + 0x05, 0x2b, 0x7e, 0x68, 0x13, 0x46, 0xd8, 0x05, 0x8f, 0x78, 0x76, 0xac, 0x8c, 0x7b, 0xcc, 0xbc, + 0xd1, 0x98, 0x1a, 0x20, 0xec, 0x6f, 0x8c, 0x05, 0x2f, 0x74, 0x45, 0xde, 0x00, 0x8e, 0xd7, 0x83, + 0x9b, 0x31, 0x61, 0x37, 0x80, 0x6b, 0xcb, 0x1f, 0x4d, 0xaf, 0xf4, 0x72, 0x78, 0x6e, 0x66, 0x26, + 0xa3, 0x24, 0xb5, 0x43, 0xc4, 0x7f, 0x99, 0xf0, 0x69, 0x16, 0xca, 0x34, 0xd4, 0x4c, 0x0f, 0x95, + 0x0e, 0xf6, 0x5b, 0x26, 0x33, 0x9c, 0xe5, 0xfe, 0x10, 0xd7, 0xc0, 0x39, 0x1f, 0x66, 0xb2, 0x53, + 0x72, 0x80, 0x2b, 0xee, 0x9f, 0x0d, 0xc1, 0x94, 0x29, 0x18, 0x68, 0x11, 0x6a, 0x7b, 0x2c, 0x1d, + 0x53, 0x9a, 0x04, 0x46, 0xc9, 0xff, 0x86, 0x44, 0xe0, 0x94, 0x86, 0xa5, 0xc3, 0x61, 0xc5, 0xb5, + 0x40, 0x9b, 0x34, 0x1d, 0x8e, 0xc2, 0x60, 0x8d, 0x8a, 0x1a, 0xad, 0x5b, 0x61, 0x98, 0x28, 0xc5, + 0xad, 0x64, 0x66, 0x99, 0x41, 0xb1, 0xc0, 0x52, 0x85, 0x7d, 0x9b, 0x76, 0xc8, 0x37, 0x5d, 0x7d, + 0x4a, 0x61, 0x5f, 0xd5, 0x91, 0xd8, 0xa4, 0xa5, 0x0b, 0x50, 0x18, 0x33, 0x21, 0x14, 0xa6, 0x71, + 0x1a, 0xb8, 0xd4, 0xe4, 0x17, 0x9e, 0x24, 0x1e, 0x7d, 0x0e, 0x1e, 0x53, 0xf7, 0x93, 0x30, 0x77, + 0x9d, 0xca, 0x1a, 0x47, 0x8c, 0x9d, 0xed, 0x63, 0x2b, 0xf9, 0x64, 0xb8, 0x57, 0x79, 0xf4, 0x06, + 0x4c, 0x09, 0xb3, 0x56, 0x72, 0x1c, 0x35, 0xcf, 0xb5, 0xaf, 0x1a, 0x58, 0x9c, 0xa1, 0x46, 0x75, + 0x98, 0xa1, 0x10, 0x66, 0x51, 0x4a, 0x0e, 0xfc, 0x9e, 0x95, 0x5a, 0x99, 0xaf, 0x66, 0xf0, 0xb8, + 0xab, 0x04, 0x5a, 0x82, 0x69, 0x6e, 0x5b, 0xd0, 0xfd, 0x1b, 0xfb, 0x0e, 0x22, 0x42, 0x52, 0x4d, + 0x82, 0x1b, 0x26, 0x1a, 0x67, 0xe9, 0xd1, 0xab, 0x30, 0xe1, 0x44, 0xad, 0x5d, 0x2f, 0x21, 0xad, + 0xa4, 0x13, 0xf1, 0xbb, 0xf5, 0x5a, 0x60, 0xc0, 0x92, 0x86, 0xc3, 0x06, 0xa5, 0xfd, 0x55, 0x38, + 0x99, 0x13, 0x82, 0x4d, 0x05, 0xc7, 0x69, 0x7b, 0xb2, 0x4f, 0x99, 0x10, 0xa4, 0xa5, 0xc6, 0xba, + 0xec, 0x8d, 0x46, 0x45, 0xa5, 0x93, 0xf9, 0x8c, 0xb5, 0xdc, 0x6c, 0x4a, 0x3a, 0xd7, 0x24, 0x02, + 0xa7, 0x34, 0xf6, 0x7f, 0xaf, 0x81, 0xe6, 0x64, 0x29, 0x11, 0x78, 0xf2, 0x2a, 0x4c, 0xc8, 0x74, + 0x83, 0x5a, 0x9a, 0x2f, 0xd5, 0xcd, 0xcb, 0x1a, 0x0e, 0x1b, 0x94, 0xb4, 0x6d, 0x81, 0x74, 0x19, + 0x65, 0x03, 0x9e, 0x94, 0x2f, 0x09, 0xa7, 0x34, 0xe8, 0x02, 0x8c, 0xc5, 0xc4, 0xdf, 0xbe, 0xe6, + 0x05, 0xb7, 0x85, 0x60, 0x2b, 0xad, 0xdc, 0x14, 0x70, 0xac, 0x28, 0xd0, 0x67, 0xa0, 0xda, 0xf1, + 0x5c, 0x21, 0xca, 0x0b, 0xd2, 0xee, 0xbc, 0xb9, 0x5e, 0xbf, 0x77, 0x38, 0x3f, 0x9f, 0x9f, 0x43, + 0x91, 0x6e, 0xa2, 0xe3, 0x05, 0x3a, 0xf9, 0x68, 0xd1, 0x3c, 0xd7, 0xf9, 0x48, 0x9f, 0xae, 0xf3, + 0x4b, 0x00, 0xa2, 0xcf, 0x52, 0x92, 0xab, 0xe9, 0x37, 0xbb, 0xac, 0x30, 0x58, 0xa3, 0xa2, 0x5b, + 0xf1, 0x56, 0x44, 0x1c, 0xb9, 0x63, 0xe5, 0x21, 0xc2, 0x63, 0xf7, 0xbb, 0x15, 0x5f, 0xc9, 0xb2, + 0xc2, 0xdd, 0xdc, 0xd1, 0x1e, 0x9c, 0x70, 0xe9, 0x24, 0x32, 0xaa, 0xac, 0xf5, 0x1b, 0x95, 0x4c, + 0xab, 0xab, 0x67, 0xd9, 0xe0, 0x6e, 0xce, 0xe8, 0x8b, 0x30, 0x27, 0x81, 0xdd, 0x77, 0x0f, 0xd9, + 0x44, 0xa9, 0x2e, 0x9f, 0x3d, 0x3a, 0x9c, 0x9f, 0xab, 0xf7, 0xa4, 0xc2, 0xc7, 0x70, 0x40, 0xef, + 0xc0, 0x08, 0x3b, 0x66, 0x89, 0x67, 0xc7, 0xd9, 0x3a, 0xf7, 0x52, 0x59, 0x47, 0xe3, 0x02, 0x3b, + 0xac, 0x11, 0x71, 0x9b, 0xe9, 0xb9, 0x15, 0x03, 0x62, 0xc1, 0x13, 0xb5, 0x61, 0xdc, 0x09, 0x82, + 0x30, 0x71, 0xb8, 0xf9, 0x35, 0x51, 0xc6, 0x82, 0xd4, 0xaa, 0x58, 0x4a, 0xcb, 0xf2, 0x7a, 0x54, + 0x30, 0x98, 0x86, 0xc1, 0x7a, 0x15, 0x74, 0x01, 0x0f, 0xef, 0x50, 0x55, 0x29, 0x4f, 0x1a, 0xe2, + 0xd9, 0xc9, 0x32, 0x0b, 0xf8, 0x0d, 0xa3, 0x90, 0xa6, 0xbb, 0x4c, 0x66, 0x38, 0xcb, 0x1d, 0x2d, + 0x18, 0xfe, 0xe3, 0xa9, 0x34, 0x2a, 0x39, 0xf5, 0x1f, 0xeb, 0xee, 0x62, 0x76, 0xaf, 0x95, 0x47, + 0x22, 0x32, 0x1d, 0x30, 0x9d, 0xb9, 0xd7, 0x9a, 0xa2, 0xb0, 0x4e, 0x37, 0xf7, 0x49, 0x18, 0xd7, + 0x06, 0xbc, 0x9f, 0xf0, 0xd7, 0xb9, 0x37, 0x60, 0x26, 0x3b, 0x90, 0x7d, 0x85, 0xcf, 0xfe, 0xcf, + 0x0a, 0x4c, 0xe7, 0x1c, 0xdf, 0xdc, 0xf6, 0x58, 0x08, 0xb7, 0xa1, 0xec, 0xae, 0x7a, 0x81, 0x8b, + 0x19, 0xc6, 0x54, 0x59, 0x95, 0x12, 0x2a, 0x4b, 0xea, 0xcf, 0x6a, 0x4f, 0xfd, 0x29, 0xd4, 0xd4, + 0xd0, 0xfd, 0xab, 0x29, 0x73, 0x5d, 0x18, 0x2e, 0xb5, 0x2e, 0x3c, 0x00, 0xd5, 0x66, 0x2c, 0x2d, + 0xa3, 0x25, 0x96, 0x96, 0x7b, 0x16, 0x4c, 0x99, 0x92, 0x57, 0x62, 0xc4, 0x1f, 0xd5, 0x01, 0x5c, + 0x60, 0x5b, 0xb0, 0x24, 0x0a, 0x7d, 0x9f, 0x44, 0x22, 0x30, 0x6e, 0x4a, 0xec, 0xa8, 0x04, 0x14, + 0x6b, 0x14, 0xf6, 0x77, 0x2a, 0x30, 0x93, 0x46, 0x49, 0x8b, 0x84, 0xab, 0x83, 0x3b, 0x12, 0xd9, + 0x34, 0x8e, 0x44, 0x8a, 0xf2, 0xa8, 0x66, 0xda, 0xd5, 0xf3, 0x78, 0xe4, 0x9d, 0xcc, 0xf1, 0xc8, + 0x4b, 0x7d, 0xf2, 0x3d, 0xfe, 0xa8, 0xe4, 0xbb, 0x15, 0x38, 0x9d, 0x2d, 0xb2, 0xe2, 0x3b, 0xde, + 0xde, 0x00, 0xc7, 0xe9, 0x73, 0xc6, 0x38, 0xbd, 0xd2, 0x5f, 0x7f, 0x58, 0xe3, 0x7a, 0x0e, 0x96, + 0x93, 0x19, 0xac, 0x4f, 0xde, 0x0f, 0xf3, 0xe3, 0x47, 0xec, 0x67, 0x16, 0x3c, 0x9e, 0x5b, 0x6e, + 0xe0, 0x0e, 0xe0, 0xb7, 0x4d, 0x07, 0xf0, 0x8b, 0xf7, 0xd1, 0xb7, 0x1e, 0x1e, 0xe1, 0xa3, 0x4a, + 0x8f, 0x3e, 0x31, 0x27, 0xd9, 0x0d, 0x18, 0x77, 0x5a, 0x2d, 0x12, 0xc7, 0x1b, 0xa1, 0xab, 0x92, + 0x00, 0xbd, 0xc0, 0x16, 0xcf, 0x14, 0x7c, 0xef, 0x70, 0x7e, 0x2e, 0xcb, 0x22, 0x45, 0x63, 0x9d, + 0x83, 0x99, 0xcc, 0xab, 0x32, 0xa0, 0x64, 0x5e, 0x97, 0x00, 0xf6, 0xd5, 0xe6, 0x3c, 0xeb, 0x7b, + 0xd3, 0xb6, 0xed, 0x1a, 0x15, 0xfa, 0x02, 0x33, 0x76, 0x79, 0x50, 0xc8, 0x50, 0x91, 0x7f, 0x44, + 0xfb, 0x7a, 0x7a, 0x78, 0x09, 0xbf, 0xb5, 0xa9, 0xbc, 0x94, 0x8a, 0xa1, 0xfd, 0x83, 0x2a, 0x7c, + 0xf8, 0x18, 0x81, 0x43, 0x4b, 0xe6, 0x59, 0xef, 0xf3, 0x59, 0x97, 0xd4, 0x5c, 0x6e, 0x61, 0xc3, + 0x47, 0x95, 0xf9, 0x52, 0x95, 0x0f, 0xfc, 0xa5, 0xbe, 0xad, 0x3b, 0x10, 0x79, 0x4c, 0xe7, 0xe5, + 0xfb, 0x9e, 0x52, 0x3f, 0x9f, 0x0e, 0xff, 0xaf, 0x5b, 0xf0, 0x91, 0xdc, 0x4e, 0x19, 0xf1, 0x24, + 0x8b, 0x50, 0x6b, 0x51, 0xa0, 0x76, 0xe9, 0x26, 0xbd, 0xed, 0x26, 0x11, 0x38, 0xa5, 0x31, 0xc2, + 0x46, 0x2a, 0x85, 0x61, 0x23, 0xff, 0xde, 0x82, 0x53, 0xd9, 0x46, 0x0c, 0x5c, 0xdf, 0x34, 0x4d, + 0x7d, 0xb3, 0xd0, 0xdf, 0x87, 0xef, 0xa1, 0x6a, 0xbe, 0x33, 0x09, 0x67, 0xba, 0xd6, 0x28, 0x3e, + 0x86, 0xbf, 0x68, 0xc1, 0x89, 0x1d, 0xb6, 0xad, 0xd0, 0xee, 0x35, 0x89, 0x5e, 0x15, 0x5c, 0x06, + 0x3b, 0xf6, 0x3a, 0x14, 0xdf, 0x24, 0x75, 0x91, 0xe0, 0xee, 0xca, 0xd0, 0x37, 0x2d, 0x38, 0xe5, + 0xdc, 0x89, 0xbb, 0x92, 0xf6, 0x0b, 0x21, 0x7a, 0xa3, 0xc0, 0x77, 0x57, 0x90, 0xee, 0x7f, 0x79, + 0xf6, 0xe8, 0x70, 0xfe, 0x54, 0x1e, 0x15, 0xce, 0xad, 0x15, 0xbd, 0x23, 0x52, 0x9e, 0x51, 0x6b, + 0xaf, 0xd4, 0x0d, 0xbd, 0xbc, 0x5b, 0x16, 0x5c, 0x21, 0x49, 0x0c, 0x56, 0x1c, 0xd1, 0x97, 0xa1, + 0xb6, 0x23, 0xaf, 0x32, 0x09, 0x75, 0x57, 0xb0, 0xa6, 0xe4, 0xde, 0x7c, 0xe2, 0xb1, 0xfc, 0x0a, + 0x85, 0x53, 0xa6, 0xe8, 0x0a, 0x54, 0x83, 0xed, 0x58, 0x5c, 0x17, 0x2e, 0x8a, 0x19, 0x32, 0x23, + 0xb4, 0xf8, 0x3d, 0xcb, 0xeb, 0x6b, 0x4d, 0x4c, 0x59, 0x50, 0x4e, 0xd1, 0x96, 0x2b, 0x9c, 0xd6, + 0x05, 0x9c, 0xf0, 0x72, 0xbd, 0x9b, 0x13, 0x5e, 0xae, 0x63, 0xca, 0x82, 0x05, 0x27, 0xc6, 0xad, + 0xd8, 0x13, 0x1e, 0xe9, 0x82, 0xbb, 0xe4, 0x5d, 0x77, 0x4f, 0x78, 0xf6, 0x3b, 0x06, 0xc6, 0x9c, + 0x11, 0xda, 0x84, 0x91, 0x16, 0xcb, 0x53, 0x2d, 0x1c, 0x06, 0x45, 0xd9, 0x8b, 0xbb, 0x72, 0x5a, + 0xf3, 0x93, 0x33, 0x0e, 0xc7, 0x82, 0x17, 0xe3, 0x4a, 0xda, 0xbb, 0xdb, 0xb1, 0xf0, 0x09, 0x14, + 0x71, 0xed, 0xca, 0x38, 0x2e, 0xb8, 0x32, 0x38, 0x16, 0xbc, 0x50, 0x1d, 0x2a, 0xdb, 0x2d, 0x91, + 0x72, 0xb2, 0x60, 0x23, 0x6b, 0x5e, 0x9a, 0x5d, 0x1e, 0x39, 0x3a, 0x9c, 0xaf, 0xac, 0xad, 0xe0, + 0xca, 0x76, 0x0b, 0xbd, 0x0d, 0xa3, 0xdb, 0xfc, 0x1a, 0xa4, 0x48, 0x2f, 0x79, 0xb1, 0xe8, 0xae, + 0x66, 0xd7, 0x9d, 0x49, 0x7e, 0x5f, 0x43, 0x20, 0xb0, 0x64, 0x87, 0xbe, 0x08, 0xb0, 0xad, 0x2e, + 0x76, 0x8a, 0xfc, 0x92, 0x0b, 0xfd, 0x5d, 0x04, 0x15, 0x9b, 0x66, 0x05, 0xc5, 0x1a, 0x47, 0x2a, + 0xf3, 0x8e, 0x4c, 0xb5, 0xcf, 0x72, 0x4b, 0x16, 0xca, 0x7c, 0x6e, 0x66, 0x7e, 0x2e, 0xf3, 0x0a, + 0x85, 0x53, 0xa6, 0xa8, 0x03, 0x93, 0xfb, 0x71, 0x7b, 0x97, 0xc8, 0xa9, 0xcf, 0x12, 0x4e, 0x8e, + 0x5f, 0x7a, 0xbd, 0x20, 0x8b, 0xa8, 0x28, 0xe2, 0x45, 0x49, 0xc7, 0xf1, 0xbb, 0x34, 0x18, 0x4b, + 0xe1, 0xf4, 0x96, 0xce, 0x16, 0x9b, 0xb5, 0xd0, 0x4f, 0xf2, 0x6e, 0x27, 0xdc, 0x3a, 0x48, 0x88, + 0x48, 0x48, 0x59, 0xf0, 0x49, 0xde, 0xe4, 0xc4, 0xdd, 0x9f, 0x44, 0x20, 0xb0, 0x64, 0xa7, 0x86, + 0x8c, 0x69, 0xe3, 0x99, 0xd2, 0x43, 0xd6, 0xd5, 0x87, 0x74, 0xc8, 0x98, 0xf6, 0x4d, 0x99, 0x32, + 0xad, 0xdb, 0xde, 0x0d, 0x93, 0x30, 0xc8, 0xe8, 0xfe, 0x13, 0x65, 0xb4, 0x6e, 0x23, 0xa7, 0x64, + 0xb7, 0xd6, 0xcd, 0xa3, 0xc2, 0xb9, 0xb5, 0xda, 0x7f, 0x3c, 0xdc, 0xbd, 0xd8, 0x32, 0x43, 0xf8, + 0x57, 0xbb, 0x8f, 0x53, 0x3f, 0xd3, 0xff, 0x2e, 0xef, 0x01, 0x1e, 0xac, 0x7e, 0xd3, 0x82, 0x33, + 0xed, 0xdc, 0xc5, 0x54, 0x2c, 0x58, 0xfd, 0x6e, 0x16, 0xf9, 0x80, 0xa9, 0x6c, 0xab, 0xf9, 0x78, + 0xdc, 0xa3, 0xce, 0xac, 0xf9, 0x59, 0xfd, 0xc0, 0xe6, 0xe7, 0x2d, 0x18, 0x63, 0x16, 0x53, 0x9a, + 0xfa, 0xa3, 0xcf, 0x6c, 0x19, 0x6c, 0xe9, 0x5b, 0x11, 0x2c, 0xb0, 0x62, 0x46, 0x07, 0xee, 0xc9, + 0x6c, 0x27, 0x30, 0x61, 0x68, 0x91, 0x26, 0x96, 0x7b, 0x24, 0xd6, 0xc4, 0x48, 0x3c, 0xd9, 0x38, + 0x8e, 0xf8, 0x5e, 0x11, 0x01, 0x3e, 0xbe, 0xb2, 0x87, 0x69, 0xce, 0xfe, 0x33, 0x2b, 0xc7, 0xfe, + 0xe2, 0x1b, 0x90, 0xd7, 0xcd, 0x0d, 0xc8, 0x33, 0xd9, 0x0d, 0x48, 0x97, 0xa3, 0xc0, 0xd8, 0x7b, + 0x94, 0xcf, 0x99, 0x58, 0x36, 0x37, 0x89, 0xed, 0xc3, 0xb9, 0xa2, 0xc9, 0xcd, 0x02, 0x97, 0x5c, + 0x75, 0x0a, 0x98, 0x06, 0x2e, 0xb9, 0xeb, 0x75, 0xcc, 0x30, 0x65, 0x2f, 0xb9, 0xdb, 0xff, 0xdb, + 0x82, 0x6a, 0x23, 0x74, 0x07, 0xe8, 0xf8, 0xb8, 0x6c, 0x38, 0x3e, 0x9e, 0x2e, 0x7c, 0x60, 0xa8, + 0xa7, 0x9b, 0xe3, 0x46, 0xc6, 0xcd, 0xf1, 0xb1, 0x62, 0x56, 0xc7, 0x3b, 0x35, 0x7e, 0x58, 0x05, + 0xfd, 0x89, 0x24, 0xf4, 0x07, 0xf7, 0x13, 0xc1, 0x5a, 0x2d, 0xf7, 0x6a, 0x92, 0xa8, 0x83, 0x45, + 0x3c, 0xc9, 0x5b, 0x6d, 0x3f, 0xb7, 0x81, 0xac, 0xb7, 0x88, 0xb7, 0xb3, 0x9b, 0x10, 0x37, 0xdb, + 0xb1, 0x87, 0x17, 0xc8, 0xfa, 0xdf, 0x2c, 0x98, 0xce, 0xd4, 0x8e, 0xbe, 0x92, 0x77, 0x3d, 0xe6, + 0xbe, 0x9c, 0x19, 0x27, 0x0a, 0x6f, 0xd3, 0x2c, 0x00, 0x28, 0xd7, 0xbb, 0x74, 0x39, 0x30, 0x0b, + 0x4c, 0xf9, 0xe6, 0x63, 0xac, 0x51, 0xa0, 0x97, 0x61, 0x3c, 0x09, 0xdb, 0xa1, 0x1f, 0xee, 0x1c, + 0x5c, 0x25, 0x32, 0xe9, 0x82, 0x3a, 0xb6, 0xd8, 0x4c, 0x51, 0x58, 0xa7, 0xb3, 0x7f, 0x5c, 0x85, + 0xec, 0xf3, 0x5a, 0xff, 0x5f, 0x4a, 0x7f, 0x7e, 0xa4, 0xf4, 0x0f, 0x2d, 0x98, 0xa1, 0xb5, 0xb3, + 0x68, 0x15, 0x19, 0x74, 0xaa, 0xd2, 0x9b, 0x5b, 0xc7, 0xa4, 0x37, 0x7f, 0x86, 0xea, 0x3a, 0x37, + 0xec, 0x24, 0xc2, 0x4d, 0xa2, 0xa9, 0x30, 0x0a, 0xc5, 0x02, 0x2b, 0xe8, 0x48, 0x14, 0x89, 0x5b, + 0x38, 0x3a, 0x1d, 0x89, 0x22, 0x2c, 0xb0, 0x32, 0xfb, 0xf9, 0x50, 0x7e, 0xf6, 0x73, 0x9e, 0xb6, + 0x48, 0x44, 0x49, 0x08, 0x23, 0x40, 0x4b, 0x5b, 0x24, 0xc3, 0x27, 0x52, 0x1a, 0xfb, 0xbb, 0x55, + 0x98, 0x68, 0x84, 0x6e, 0x1a, 0x47, 0xfe, 0x92, 0x11, 0x47, 0x7e, 0x2e, 0x13, 0x47, 0x3e, 0xa3, + 0xd3, 0x3e, 0x98, 0x30, 0x72, 0x91, 0xda, 0x8a, 0xe5, 0xe7, 0xbf, 0xaf, 0x10, 0x72, 0x23, 0xb5, + 0x95, 0x62, 0x83, 0x4d, 0xae, 0x7f, 0x79, 0x42, 0xc7, 0xff, 0xdc, 0x82, 0xa9, 0x46, 0xe8, 0x52, + 0xe1, 0xfc, 0xcb, 0x24, 0x89, 0x7a, 0x42, 0xac, 0x91, 0x63, 0x12, 0x62, 0xfd, 0x86, 0x05, 0xa3, + 0x8d, 0xd0, 0x1d, 0xb8, 0xfb, 0x70, 0xcd, 0x74, 0x1f, 0x7e, 0xa4, 0x50, 0xe7, 0xf6, 0xf0, 0x18, + 0xfe, 0xa0, 0x0a, 0x93, 0xb4, 0xbd, 0xe1, 0x8e, 0xfc, 0x5a, 0xc6, 0xc8, 0x58, 0x25, 0x46, 0x86, + 0x9a, 0x80, 0xa1, 0xef, 0x87, 0x77, 0xb2, 0x5f, 0x6e, 0x8d, 0x41, 0xb1, 0xc0, 0xa2, 0x0b, 0x30, + 0xd6, 0x8e, 0xc8, 0xbe, 0x17, 0x76, 0xe2, 0xec, 0x5d, 0xbe, 0x86, 0x80, 0x63, 0x45, 0x81, 0x5e, + 0x82, 0x89, 0xd8, 0x0b, 0x5a, 0x44, 0xc6, 0x50, 0x0c, 0xb1, 0x18, 0x0a, 0x9e, 0x6b, 0x50, 0x83, + 0x63, 0x83, 0x0a, 0xdd, 0x84, 0x1a, 0xfb, 0xcf, 0x66, 0x4f, 0xbf, 0xc9, 0xd8, 0x79, 0xb2, 0x2d, + 0x59, 0x1c, 0xa7, 0x9c, 0xd0, 0x25, 0x80, 0x44, 0xc6, 0x7a, 0xc4, 0xe2, 0x6c, 0x54, 0x59, 0xa3, + 0x2a, 0x0a, 0x24, 0xc6, 0x1a, 0x15, 0x7a, 0x1e, 0x6a, 0x89, 0xe3, 0xf9, 0xd7, 0xbc, 0x80, 0xc4, + 0x22, 0x4e, 0x46, 0x64, 0xcb, 0x15, 0x40, 0x9c, 0xe2, 0xe9, 0x3a, 0xcf, 0xee, 0x10, 0xf3, 0x47, + 0x1e, 0xc6, 0x18, 0x35, 0x5b, 0xe7, 0xaf, 0x29, 0x28, 0xd6, 0x28, 0xec, 0x17, 0xd9, 0x7a, 0xdd, + 0xe7, 0x25, 0x83, 0x9f, 0x56, 0x00, 0x35, 0x58, 0x4c, 0x89, 0xf1, 0x0e, 0xc6, 0x2e, 0x4c, 0xc5, + 0xe4, 0x9a, 0x17, 0x74, 0xee, 0x0a, 0x56, 0xe5, 0xee, 0x74, 0x34, 0x57, 0xf5, 0x32, 0xfc, 0xea, + 0xac, 0x09, 0xc3, 0x19, 0xbe, 0x74, 0x48, 0xa2, 0x4e, 0xb0, 0x14, 0xdf, 0x8c, 0x49, 0x24, 0x5e, + 0xb2, 0x60, 0x43, 0x82, 0x25, 0x10, 0xa7, 0x78, 0x2a, 0x00, 0xec, 0xcf, 0xf5, 0x30, 0xc0, 0x61, + 0x98, 0x48, 0x91, 0x61, 0xf9, 0xcd, 0x35, 0x38, 0x36, 0xa8, 0xd0, 0x1a, 0xa0, 0xb8, 0xd3, 0x6e, + 0xfb, 0xec, 0x14, 0xcb, 0xf1, 0x2f, 0x47, 0x61, 0xa7, 0xcd, 0x03, 0x8a, 0x45, 0x6a, 0xf0, 0x66, + 0x17, 0x16, 0xe7, 0x94, 0xa0, 0xd3, 0x7d, 0x3b, 0x66, 0xbf, 0xc5, 0xd5, 0x60, 0xee, 0x51, 0x6b, + 0x32, 0x10, 0x96, 0x38, 0xbb, 0xc3, 0x96, 0x27, 0xf6, 0xc8, 0x40, 0xd2, 0x89, 0x08, 0x5d, 0x2d, + 0xda, 0x6c, 0x09, 0x92, 0xe7, 0xe8, 0xa5, 0x86, 0x32, 0x13, 0xd5, 0xc2, 0x53, 0x8a, 0xeb, 0x6c, + 0xb0, 0xc9, 0xd5, 0xfe, 0x4f, 0xc0, 0xb4, 0x8c, 0x38, 0x40, 0x1c, 0x15, 0xd1, 0xaa, 0xc2, 0xfe, + 0xfa, 0x68, 0x99, 0x27, 0x75, 0x52, 0x0d, 0x2e, 0x62, 0x5f, 0xb1, 0xe4, 0x82, 0xbe, 0xc0, 0x03, + 0x01, 0xd8, 0xe4, 0x2e, 0xff, 0xce, 0x15, 0xa7, 0x37, 0xe2, 0xb0, 0x05, 0x0b, 0xac, 0xb1, 0x43, + 0xd7, 0x60, 0x52, 0xe4, 0xa3, 0x17, 0xae, 0x80, 0xaa, 0xb1, 0x1d, 0x9e, 0xc4, 0x3a, 0xf2, 0x5e, + 0x16, 0x80, 0xcd, 0xc2, 0x68, 0x07, 0x9e, 0xd4, 0xde, 0xa6, 0xc9, 0x89, 0xbc, 0xe2, 0x5a, 0xe3, + 0x23, 0x47, 0x87, 0xf3, 0x4f, 0x6e, 0x1e, 0x47, 0x88, 0x8f, 0xe7, 0x83, 0x6e, 0xc0, 0x69, 0xa7, + 0x95, 0x78, 0xfb, 0xa4, 0x4e, 0x1c, 0xd7, 0xf7, 0x02, 0x62, 0xde, 0x1b, 0x7f, 0xfc, 0xe8, 0x70, + 0xfe, 0xf4, 0x52, 0x1e, 0x01, 0xce, 0x2f, 0x87, 0x5e, 0x87, 0x9a, 0x1b, 0xc4, 0x62, 0x0c, 0x46, + 0x8c, 0x67, 0x78, 0x6a, 0xf5, 0xeb, 0x4d, 0xd5, 0xff, 0xf4, 0x0f, 0x4e, 0x0b, 0xa0, 0x77, 0xf9, + 0xbb, 0xc0, 0x6a, 0x07, 0xc2, 0x9f, 0x7f, 0x7a, 0xa5, 0xd4, 0x9e, 0xd7, 0xb8, 0xe7, 0xc1, 0xbd, + 0x64, 0x2a, 0xb6, 0xd1, 0xb8, 0x02, 0x62, 0x54, 0x81, 0x3e, 0x0b, 0x28, 0x26, 0xd1, 0xbe, 0xd7, + 0x22, 0x4b, 0x2d, 0x96, 0x68, 0x93, 0x1d, 0xc6, 0x8d, 0x19, 0x01, 0xfe, 0xa8, 0xd9, 0x45, 0x81, + 0x73, 0x4a, 0xa1, 0x2b, 0x54, 0xe3, 0xe8, 0x50, 0x11, 0x8a, 0x2a, 0xcd, 0xb9, 0xd9, 0x3a, 0x69, + 0x47, 0xa4, 0xe5, 0x24, 0xc4, 0x35, 0x39, 0xe2, 0x4c, 0x39, 0xba, 0xa6, 0xa8, 0xbc, 0xe1, 0x60, + 0x06, 0x50, 0x76, 0xe7, 0x0e, 0xa7, 0xbb, 0xa3, 0xdd, 0x30, 0x4e, 0xae, 0x93, 0xe4, 0x4e, 0x18, + 0xdd, 0x66, 0xde, 0xf5, 0x31, 0x2d, 0x73, 0x59, 0x8a, 0xc2, 0x3a, 0x1d, 0xb5, 0x7e, 0xd8, 0xb1, + 0xce, 0x7a, 0x9d, 0xf9, 0xcc, 0xc7, 0xd2, 0xb9, 0x73, 0x85, 0x83, 0xb1, 0xc4, 0x4b, 0xd2, 0xf5, + 0xc6, 0x0a, 0xf3, 0x7f, 0x67, 0x48, 0xd7, 0x1b, 0x2b, 0x58, 0xe2, 0x51, 0xd8, 0xfd, 0xd8, 0xd1, + 0x54, 0x99, 0xb3, 0x88, 0x6e, 0x0d, 0x5e, 0xf2, 0xbd, 0xa3, 0xbb, 0x30, 0xa3, 0x1e, 0x5c, 0xe2, + 0x29, 0x25, 0xe3, 0xd9, 0xe9, 0x32, 0xaf, 0x12, 0xe7, 0x66, 0xa6, 0x54, 0xb1, 0xc7, 0xeb, 0x19, + 0x9e, 0xb8, 0xab, 0x16, 0x23, 0xff, 0xc1, 0x4c, 0x61, 0x2e, 0xf8, 0x45, 0xa8, 0xc5, 0x9d, 0x2d, + 0x37, 0xdc, 0x73, 0xbc, 0x80, 0x39, 0xa9, 0xf5, 0x37, 0x76, 0x25, 0x02, 0xa7, 0x34, 0x73, 0x9f, + 0x86, 0x13, 0x5d, 0x32, 0xdd, 0x57, 0xe8, 0xdc, 0x37, 0x86, 0xa0, 0xa6, 0xdc, 0x38, 0x68, 0xd1, + 0xf4, 0xd4, 0x3d, 0x9e, 0xf5, 0xd4, 0x8d, 0xd1, 0x95, 0x57, 0x77, 0xce, 0x7d, 0x31, 0xe7, 0x91, + 0xcd, 0xe7, 0x0a, 0x3f, 0x62, 0xf9, 0xbb, 0x2b, 0x7d, 0x3c, 0x41, 0x9a, 0x1a, 0xf4, 0x43, 0xc7, + 0x1a, 0xf4, 0x25, 0x5f, 0x52, 0xa2, 0xa6, 0x7b, 0x3b, 0x74, 0xd7, 0x1b, 0xd9, 0xe7, 0x42, 0x1a, + 0x14, 0x88, 0x39, 0x8e, 0x19, 0x5d, 0x54, 0x29, 0x33, 0xa3, 0x6b, 0xf4, 0xbe, 0x8c, 0x2e, 0x59, + 0x1c, 0xa7, 0x9c, 0xd0, 0x3e, 0x9c, 0x68, 0x99, 0x6f, 0xbf, 0xa8, 0xfb, 0x28, 0x2f, 0xf4, 0xf1, + 0xf6, 0x4a, 0x47, 0xcb, 0x73, 0xbf, 0x92, 0xe5, 0x87, 0xbb, 0xab, 0xb0, 0x7f, 0xcc, 0x7d, 0x3e, + 0x62, 0x1f, 0x48, 0xe2, 0x8e, 0x3f, 0xc8, 0xcc, 0xd5, 0x37, 0x8c, 0xad, 0xe9, 0x03, 0xf0, 0x36, + 0xfe, 0xae, 0xc5, 0xbc, 0x8d, 0x9b, 0x64, 0xaf, 0xed, 0x3b, 0xc9, 0x20, 0x43, 0xf2, 0xbe, 0x00, + 0x63, 0x89, 0xa8, 0xa5, 0x5c, 0xba, 0x6d, 0xad, 0x59, 0xcc, 0xfb, 0xaa, 0xb4, 0x80, 0x84, 0x62, + 0xc5, 0xd0, 0xfe, 0x6d, 0xfe, 0x15, 0x24, 0x66, 0xe0, 0x1b, 0xaa, 0xeb, 0xe6, 0x86, 0xea, 0xd9, + 0xd2, 0x3d, 0xe9, 0xb5, 0xb1, 0x32, 0xdb, 0xcf, 0x4c, 0xb5, 0x47, 0xdf, 0xf9, 0x6d, 0x6f, 0x80, + 0xf9, 0x98, 0x0d, 0x7a, 0x9d, 0x07, 0xa3, 0x72, 0x5d, 0xf8, 0x5c, 0x9f, 0x81, 0xa8, 0xf6, 0xf7, + 0x2b, 0x70, 0x2a, 0xef, 0x51, 0x7b, 0xe4, 0xc2, 0x44, 0x5b, 0x33, 0x9c, 0xcb, 0xa5, 0x68, 0xd0, + 0x4d, 0xed, 0xd4, 0x68, 0xd1, 0xa1, 0xd8, 0xe0, 0x8a, 0xb6, 0x60, 0x82, 0xec, 0x7b, 0x2d, 0xe5, + 0x4f, 0xa9, 0xf4, 0xa9, 0x9c, 0x54, 0x1d, 0xab, 0x1a, 0x17, 0x6c, 0xf0, 0x1c, 0x40, 0x2e, 0x78, + 0xfb, 0x9f, 0x58, 0xf0, 0x58, 0x8f, 0x24, 0x0e, 0xb4, 0xba, 0x3b, 0xcc, 0xe1, 0x28, 0x5e, 0x4a, + 0x52, 0xd5, 0x71, 0x37, 0x24, 0x16, 0x58, 0xb4, 0x05, 0xc0, 0xdd, 0x88, 0xec, 0xd5, 0xd8, 0x4a, + 0x99, 0xb3, 0xfe, 0xae, 0x2b, 0xd3, 0xda, 0x6d, 0x5a, 0xf5, 0x4e, 0xac, 0xc6, 0xd5, 0xfe, 0x5e, + 0x15, 0x86, 0xf9, 0xc3, 0x95, 0x0d, 0x18, 0xdd, 0xe5, 0xa9, 0x22, 0xfb, 0xcb, 0x54, 0x99, 0x9a, + 0x47, 0x1c, 0x80, 0x25, 0x1b, 0xb4, 0x01, 0x27, 0xbd, 0xc0, 0x4b, 0x3c, 0xc7, 0xaf, 0x13, 0xdf, + 0x39, 0x90, 0xf6, 0x36, 0x4f, 0x13, 0x2e, 0x33, 0xda, 0x9e, 0x5c, 0xef, 0x26, 0xc1, 0x79, 0xe5, + 0xd0, 0x1b, 0x5d, 0x19, 0x9f, 0x78, 0x0a, 0x4e, 0x75, 0x09, 0xeb, 0xf8, 0xac, 0x4f, 0xe8, 0x35, + 0x98, 0x6c, 0x77, 0xed, 0x2c, 0xb4, 0x17, 0x0f, 0xcd, 0xdd, 0x84, 0x49, 0x8b, 0xea, 0x30, 0x13, + 0x77, 0xd8, 0xc9, 0xeb, 0xe6, 0x6e, 0x44, 0xe2, 0xdd, 0xd0, 0x77, 0xc5, 0x93, 0x5d, 0xca, 0x8a, + 0x6a, 0x66, 0xf0, 0xb8, 0xab, 0x04, 0xe5, 0xb2, 0xed, 0x78, 0x7e, 0x27, 0x22, 0x29, 0x97, 0x11, + 0x93, 0xcb, 0x5a, 0x06, 0x8f, 0xbb, 0x4a, 0xd8, 0x7f, 0x6a, 0xc1, 0xc9, 0x9c, 0xf0, 0x04, 0x1e, + 0x32, 0xb7, 0xe3, 0xc5, 0x89, 0x4a, 0x06, 0xad, 0x85, 0xcc, 0x71, 0x38, 0x56, 0x14, 0x54, 0x0a, + 0xf9, 0x76, 0x31, 0x7b, 0xec, 0x27, 0x0e, 0x60, 0x05, 0xb6, 0xbf, 0xfc, 0x4d, 0xea, 0xe5, 0xfd, + 0xa1, 0x9e, 0x2f, 0xef, 0x3f, 0x05, 0xc3, 0x3b, 0x6a, 0x53, 0xae, 0xd9, 0x23, 0x7c, 0x5b, 0xce, + 0x71, 0xf6, 0xb7, 0xab, 0x30, 0x9d, 0x09, 0x53, 0xa2, 0x0d, 0xd9, 0x0b, 0x03, 0x2f, 0x09, 0x55, + 0xf6, 0x20, 0xe6, 0x49, 0x58, 0x21, 0xed, 0xdd, 0x0d, 0x01, 0xc7, 0x8a, 0x02, 0x3d, 0x63, 0xbe, + 0x22, 0x9c, 0xb6, 0x79, 0xb9, 0x6e, 0x3c, 0x94, 0x56, 0x36, 0x41, 0xfd, 0x53, 0x30, 0xd4, 0x0e, + 0xd5, 0x73, 0x97, 0x4a, 0xe8, 0xf1, 0x72, 0xbd, 0x11, 0x86, 0x3e, 0x66, 0x48, 0xf4, 0xb4, 0xe8, + 0x7d, 0xc6, 0x1b, 0x89, 0x1d, 0x37, 0x8c, 0xb5, 0x21, 0x78, 0x16, 0x46, 0x6f, 0x93, 0x83, 0xc8, + 0x0b, 0x76, 0xb2, 0xbe, 0xd8, 0xab, 0x1c, 0x8c, 0x25, 0xde, 0x4c, 0x42, 0x3f, 0x3a, 0xe0, 0x24, + 0xf4, 0x63, 0x85, 0x71, 0x96, 0xbf, 0x69, 0xc1, 0x34, 0x4b, 0xa2, 0x27, 0xee, 0xb7, 0x7a, 0x61, + 0x30, 0xc0, 0x25, 0xf1, 0x29, 0x18, 0x8e, 0x68, 0x65, 0xd9, 0xfc, 0xd1, 0xac, 0x05, 0x98, 0xe3, + 0xd0, 0x13, 0xe2, 0x25, 0x76, 0xfa, 0xf9, 0x26, 0x78, 0x3e, 0xde, 0xf4, 0x49, 0x75, 0x16, 0xbf, + 0x8f, 0x49, 0xdb, 0xf7, 0x78, 0x63, 0x53, 0x07, 0xcc, 0xa3, 0x12, 0xbf, 0x9f, 0xdb, 0xb8, 0x07, + 0x15, 0xbf, 0x9f, 0xcf, 0xfc, 0x78, 0xe3, 0xf3, 0x7f, 0x54, 0xe0, 0x6c, 0x6e, 0xb9, 0xf4, 0x04, + 0x67, 0xcd, 0x38, 0xc1, 0xb9, 0x94, 0x39, 0xc1, 0xb1, 0x8f, 0x2f, 0xfd, 0x60, 0xce, 0x74, 0xf2, + 0x0f, 0x5b, 0xaa, 0x0f, 0xed, 0xb0, 0x65, 0xa8, 0xac, 0xa1, 0x30, 0x5c, 0x60, 0x28, 0xfc, 0xcc, + 0x82, 0xc7, 0x73, 0x07, 0xec, 0x11, 0xbb, 0x2e, 0x91, 0xdb, 0xc6, 0x1e, 0x86, 0xf3, 0xdf, 0xae, + 0xf6, 0xe8, 0x13, 0x33, 0xa1, 0xcf, 0x53, 0x8d, 0xc3, 0x90, 0xb1, 0x30, 0x80, 0x26, 0xb8, 0xb6, + 0xe1, 0x30, 0xac, 0xb0, 0x28, 0xd6, 0xae, 0x1b, 0xf0, 0x46, 0xae, 0xde, 0xe7, 0x64, 0x5a, 0x30, + 0xbd, 0x65, 0xfa, 0x15, 0xdd, 0xcc, 0x35, 0x04, 0x74, 0x4b, 0xdb, 0x12, 0x55, 0xef, 0x67, 0x4b, + 0x34, 0x91, 0xbf, 0x1d, 0x42, 0x4b, 0x30, 0xbd, 0xe7, 0x05, 0xec, 0x45, 0x36, 0xd3, 0x02, 0x51, + 0xd7, 0xdb, 0x36, 0x4c, 0x34, 0xce, 0xd2, 0xcf, 0xbd, 0x06, 0x93, 0xf7, 0xef, 0x22, 0x79, 0xbf, + 0x0a, 0x1f, 0x3e, 0x46, 0x21, 0xf0, 0x95, 0xc0, 0xf8, 0x2e, 0xda, 0x4a, 0xd0, 0xf5, 0x6d, 0x1a, + 0x70, 0x6a, 0xbb, 0xe3, 0xfb, 0x07, 0x2c, 0xf6, 0x81, 0xb8, 0x92, 0x42, 0x58, 0x77, 0xea, 0xad, + 0xd4, 0xb5, 0x1c, 0x1a, 0x9c, 0x5b, 0x12, 0x7d, 0x16, 0x50, 0xb8, 0xc5, 0xd2, 0x4a, 0xba, 0xe9, + 0x25, 0x64, 0xf6, 0x09, 0xaa, 0xe9, 0x44, 0xbd, 0xd1, 0x45, 0x81, 0x73, 0x4a, 0x51, 0x5b, 0x8f, + 0x3d, 0xb3, 0xaa, 0x9a, 0x95, 0xb1, 0xf5, 0xb0, 0x8e, 0xc4, 0x26, 0x2d, 0xba, 0x0c, 0x27, 0x9c, + 0x7d, 0xc7, 0xe3, 0x09, 0x64, 0x24, 0x03, 0x6e, 0xec, 0x29, 0x37, 0xc4, 0x52, 0x96, 0x00, 0x77, + 0x97, 0x41, 0x6d, 0xc3, 0xab, 0xc4, 0x13, 0x48, 0xbf, 0x7e, 0x1f, 0x12, 0x5c, 0xda, 0xcf, 0x64, + 0xff, 0x89, 0x45, 0x97, 0xbb, 0x9c, 0x47, 0xcc, 0x8c, 0xf7, 0xbe, 0xb5, 0x4b, 0x18, 0xdd, 0xef, + 0x7d, 0x33, 0x87, 0xab, 0x49, 0xcb, 0x45, 0x23, 0x4e, 0x03, 0x27, 0x0d, 0xcb, 0x52, 0xdc, 0x3c, + 0x52, 0x14, 0xe8, 0x16, 0x8c, 0xba, 0xde, 0xbe, 0x17, 0x87, 0x51, 0x89, 0x77, 0x76, 0xbb, 0x82, + 0xf1, 0x52, 0x5d, 0x59, 0xe7, 0x4c, 0xb0, 0xe4, 0x66, 0xff, 0x9d, 0x0a, 0x4c, 0xca, 0xfa, 0xde, + 0xec, 0x84, 0x4c, 0x87, 0x0d, 0x6a, 0x11, 0x7f, 0xd3, 0x58, 0xc4, 0x17, 0xcb, 0x5d, 0xbf, 0x62, + 0x8d, 0xea, 0xb9, 0x78, 0x7f, 0x2e, 0xb3, 0x78, 0x5f, 0xec, 0x87, 0xe9, 0xf1, 0x8b, 0xf6, 0xbf, + 0xb5, 0xe0, 0x84, 0x41, 0xff, 0xa8, 0xe4, 0x30, 0xce, 0xeb, 0x4b, 0x8f, 0x55, 0xe3, 0x7b, 0x95, + 0x4c, 0x1f, 0xd8, 0x6a, 0xf1, 0x35, 0x18, 0xda, 0x75, 0x22, 0xb7, 0x5c, 0xfe, 0xb4, 0xae, 0xe2, + 0x0b, 0x57, 0x9c, 0xc8, 0xe5, 0x3a, 0xff, 0x82, 0x7a, 0x66, 0xc5, 0x89, 0xdc, 0xc2, 0x18, 0x62, + 0x56, 0x29, 0x7a, 0x15, 0x46, 0xe2, 0x56, 0xd8, 0x56, 0x71, 0x5b, 0xe7, 0xf8, 0x13, 0x2c, 0x14, + 0x72, 0xef, 0x70, 0x1e, 0x99, 0xd5, 0x51, 0x30, 0x16, 0xf4, 0x73, 0x04, 0x6a, 0xaa, 0xea, 0x01, + 0x46, 0xab, 0xbe, 0x5f, 0x85, 0x93, 0x39, 0x72, 0x82, 0x7e, 0xc1, 0x18, 0xb5, 0xd7, 0xfa, 0x16, + 0xb4, 0x0f, 0x38, 0x6e, 0xbf, 0xc0, 0xf6, 0x41, 0xae, 0x90, 0x8d, 0xfb, 0xa8, 0xfe, 0x66, 0x4c, + 0xb2, 0xd5, 0x53, 0x50, 0x71, 0xf5, 0xb4, 0xda, 0x87, 0x34, 0xf8, 0xb4, 0x1a, 0xd5, 0xce, 0x01, + 0x7e, 0xe3, 0xf7, 0x86, 0xe0, 0x54, 0xde, 0xfd, 0x4e, 0xf4, 0xcb, 0x56, 0x26, 0x05, 0xfa, 0x1b, + 0xfd, 0x5f, 0x12, 0xe5, 0x79, 0xd1, 0x45, 0xd2, 0x87, 0x05, 0x33, 0x29, 0x7a, 0xe1, 0x68, 0x8b, + 0xda, 0x59, 0xdc, 0x7f, 0xc4, 0x53, 0xd9, 0x4b, 0x7d, 0xf0, 0x99, 0xfb, 0x68, 0x8a, 0xc8, 0x86, + 0x1f, 0x67, 0xe2, 0xfe, 0x25, 0xb8, 0x38, 0xee, 0x5f, 0xb6, 0x61, 0x6e, 0x07, 0xc6, 0xb5, 0x7e, + 0x0d, 0x50, 0x04, 0x3c, 0xba, 0x20, 0x69, 0xad, 0x1e, 0xa0, 0x18, 0xfc, 0x3d, 0x0b, 0x32, 0xc1, + 0x19, 0xca, 0xd9, 0x62, 0xf5, 0x74, 0xb6, 0x9c, 0x83, 0xa1, 0x28, 0xf4, 0x49, 0x36, 0x3d, 0x37, + 0x0e, 0x7d, 0x82, 0x19, 0x46, 0xbd, 0xb5, 0x58, 0xed, 0xf5, 0xd6, 0x22, 0xdd, 0x85, 0xfb, 0x64, + 0x9f, 0x48, 0xd7, 0x87, 0x52, 0xde, 0xd7, 0x28, 0x10, 0x73, 0x9c, 0xfd, 0xfb, 0x55, 0x18, 0xe1, + 0xfe, 0x85, 0x01, 0xae, 0xc9, 0x0d, 0xb1, 0xd5, 0x2f, 0x75, 0xdf, 0x92, 0xb7, 0x66, 0xa1, 0xee, + 0x24, 0x0e, 0x17, 0x28, 0xd5, 0xb7, 0xd4, 0x3d, 0x80, 0x16, 0x8c, 0xde, 0xcf, 0x65, 0x76, 0xb2, + 0xc0, 0x79, 0x68, 0x63, 0xb1, 0x0b, 0x10, 0xb3, 0x77, 0xbd, 0x28, 0x0f, 0x91, 0xe4, 0xee, 0xa5, + 0x52, 0xed, 0x68, 0xaa, 0x62, 0xbc, 0x35, 0x69, 0x76, 0x2d, 0x85, 0xc0, 0x1a, 0xef, 0xb9, 0x57, + 0xa0, 0xa6, 0x88, 0x8b, 0xcc, 0xfc, 0x09, 0x5d, 0x24, 0xff, 0x0a, 0x4c, 0x67, 0xea, 0xea, 0x6b, + 0x97, 0xf0, 0x23, 0x0b, 0x4e, 0x74, 0x3d, 0x10, 0x8b, 0xde, 0xb3, 0xe0, 0x94, 0x9f, 0xe3, 0x58, + 0x12, 0x1f, 0xf8, 0x7e, 0x5c, 0x52, 0x6a, 0x8b, 0x90, 0x87, 0xc5, 0xb9, 0xb5, 0xc9, 0xb4, 0x9d, + 0x95, 0xfc, 0xb4, 0x9d, 0xf6, 0xf7, 0x2d, 0x10, 0x9f, 0x6c, 0xe0, 0xe6, 0xcf, 0xba, 0x69, 0xfe, + 0x7c, 0xb4, 0x8c, 0x0c, 0xf4, 0xb0, 0x7b, 0xfe, 0x83, 0x05, 0x88, 0x13, 0x64, 0x1f, 0xf7, 0xe3, + 0x5e, 0x3a, 0xcd, 0x5a, 0x4f, 0x85, 0x46, 0x61, 0xb0, 0x46, 0xd5, 0x67, 0x06, 0x77, 0xf5, 0x28, + 0x56, 0xb9, 0xf7, 0xf0, 0xab, 0x25, 0xde, 0xc3, 0xff, 0xdd, 0x2a, 0x64, 0xa3, 0x18, 0xd0, 0x97, + 0x61, 0xa2, 0xe5, 0xb4, 0x9d, 0x2d, 0xcf, 0xf7, 0x12, 0x8f, 0xc4, 0xe5, 0xce, 0x89, 0x56, 0xb4, + 0x12, 0xc2, 0xcf, 0xab, 0x41, 0xb0, 0xc1, 0x11, 0x2d, 0x00, 0xb4, 0x23, 0x6f, 0xdf, 0xf3, 0xc9, + 0x0e, 0x33, 0x3a, 0x54, 0xde, 0x93, 0x86, 0x82, 0x62, 0x8d, 0x22, 0x27, 0x5c, 0xae, 0xfa, 0x30, + 0xc2, 0xe5, 0x86, 0xfa, 0x0c, 0x97, 0x1b, 0x2e, 0x15, 0x2e, 0x87, 0xe1, 0x8c, 0x74, 0xcf, 0xd2, + 0xff, 0x6b, 0x9e, 0x4f, 0x78, 0x92, 0x3e, 0x11, 0xe4, 0x38, 0x77, 0x74, 0x38, 0x7f, 0x06, 0xe7, + 0x52, 0xe0, 0x1e, 0x25, 0xed, 0x0e, 0x9c, 0x6c, 0x92, 0xc8, 0x63, 0x99, 0x94, 0xdc, 0x74, 0xfa, + 0x7d, 0x11, 0x6a, 0x51, 0x66, 0xe6, 0xf7, 0x79, 0xdf, 0x4c, 0x4b, 0x49, 0x21, 0x67, 0x7a, 0xca, + 0xd2, 0xfe, 0xeb, 0x15, 0x18, 0x15, 0xd1, 0x42, 0x03, 0x5c, 0x45, 0xae, 0x1a, 0x3b, 0xbb, 0x67, + 0x8b, 0x66, 0x2e, 0x6b, 0x4e, 0xcf, 0x3d, 0x5d, 0x33, 0xb3, 0xa7, 0x7b, 0xbe, 0x1c, 0xbb, 0xe3, + 0x77, 0x73, 0xbf, 0x53, 0x81, 0x29, 0x33, 0x6a, 0x6a, 0x80, 0xc3, 0xf1, 0x36, 0x8c, 0xc6, 0x22, + 0x94, 0xa8, 0x52, 0x26, 0x32, 0x23, 0xfb, 0x49, 0xd3, 0xb7, 0xf5, 0x45, 0xf0, 0x90, 0x64, 0x97, + 0x1b, 0xad, 0x54, 0x7d, 0x18, 0xd1, 0x4a, 0xf6, 0xbf, 0x63, 0x2a, 0x55, 0x1f, 0xc0, 0x81, 0x2f, + 0x08, 0x6f, 0x9a, 0xaa, 0xf7, 0x42, 0x29, 0x39, 0x10, 0x8d, 0xeb, 0xb1, 0x30, 0xfc, 0x2b, 0x0b, + 0xc6, 0x05, 0xe1, 0xc0, 0x9b, 0xff, 0x59, 0xb3, 0xf9, 0x4f, 0x97, 0x6a, 0x7e, 0x8f, 0x76, 0xff, + 0x83, 0x8a, 0x6a, 0x77, 0x43, 0x3c, 0x77, 0x5a, 0x98, 0xaf, 0x71, 0xac, 0x1d, 0x85, 0x49, 0xd8, + 0x0a, 0x7d, 0xb1, 0xb8, 0x3f, 0x91, 0xc6, 0x95, 0x73, 0xf8, 0x3d, 0xed, 0x37, 0x56, 0xd4, 0x2c, + 0x64, 0x3a, 0x8c, 0x12, 0xb1, 0x38, 0xe5, 0x3d, 0xb6, 0xba, 0x25, 0x1f, 0xb3, 0xa6, 0x30, 0x71, + 0x1d, 0xa3, 0xdf, 0x47, 0x5c, 0xd3, 0x40, 0x71, 0xc5, 0x09, 0x6b, 0x5c, 0x65, 0x0c, 0x23, 0xab, + 0x61, 0xd8, 0x74, 0x9d, 0x5e, 0x17, 0x70, 0xac, 0x28, 0xec, 0x57, 0x98, 0x76, 0x65, 0xc3, 0xd3, + 0x5f, 0xf4, 0xf7, 0x37, 0x46, 0xd4, 0xc0, 0x32, 0xdf, 0xc8, 0x75, 0x18, 0xa6, 0x5d, 0x94, 0xdb, + 0xbf, 0x72, 0xaa, 0x8c, 0x36, 0x41, 0x8f, 0x02, 0x8b, 0x92, 0x18, 0x73, 0x36, 0x88, 0x74, 0xf9, + 0xdb, 0x5f, 0x29, 0xad, 0x1d, 0xfb, 0xf0, 0xb0, 0xb3, 0x5c, 0x30, 0x2c, 0x05, 0xc6, 0x7a, 0x23, + 0x9b, 0x63, 0x73, 0x45, 0x22, 0x70, 0x4a, 0x83, 0x16, 0x85, 0x95, 0x6e, 0xbe, 0x85, 0x2b, 0xad, + 0x74, 0x39, 0x24, 0x9a, 0x99, 0x7e, 0x11, 0xc6, 0x55, 0x96, 0xf1, 0x06, 0x4f, 0x16, 0x5d, 0xe3, + 0x96, 0xcb, 0x6a, 0x0a, 0xc6, 0x3a, 0x0d, 0x5a, 0x87, 0x93, 0xae, 0x0a, 0x59, 0x6d, 0x74, 0xb6, + 0x7c, 0xaf, 0x45, 0x8b, 0xf2, 0x8b, 0x22, 0x8f, 0x1d, 0x1d, 0xce, 0x9f, 0xac, 0x77, 0xa3, 0x71, + 0x5e, 0x19, 0xb4, 0x09, 0xd3, 0x31, 0xcf, 0xa6, 0x2e, 0x2f, 0x93, 0x89, 0x54, 0x74, 0xcf, 0x49, + 0x47, 0x7f, 0xd3, 0x44, 0xdf, 0x63, 0x20, 0xae, 0x11, 0x04, 0x08, 0x67, 0x59, 0xa0, 0x37, 0x60, + 0xca, 0xd7, 0x1f, 0x84, 0x6a, 0x88, 0xc8, 0x5d, 0x15, 0xfe, 0x60, 0x3c, 0x17, 0xd5, 0xc0, 0x19, + 0x6a, 0xf4, 0x36, 0xcc, 0xea, 0x10, 0x71, 0x55, 0xdd, 0x09, 0x76, 0x48, 0x2c, 0xd2, 0x38, 0x3f, + 0x71, 0x74, 0x38, 0x3f, 0x7b, 0xad, 0x07, 0x0d, 0xee, 0x59, 0x1a, 0xbd, 0x0a, 0x13, 0x72, 0x24, + 0xb5, 0x28, 0xde, 0x34, 0xf0, 0x46, 0xc3, 0x61, 0x83, 0xf2, 0x83, 0x9d, 0x67, 0x7c, 0x8d, 0x16, + 0xd6, 0x96, 0x53, 0xf4, 0x15, 0x98, 0xd0, 0xdb, 0x28, 0x74, 0xe4, 0xc7, 0xcb, 0x3f, 0xb2, 0x25, + 0x96, 0x65, 0xd5, 0x72, 0x1d, 0x87, 0x0d, 0xde, 0xf6, 0x0d, 0x18, 0x69, 0x1e, 0xc4, 0xad, 0xc4, + 0x7f, 0x50, 0xcf, 0x20, 0xb7, 0x60, 0x3a, 0xf3, 0x5e, 0xb0, 0x7a, 0x78, 0xda, 0x7a, 0x50, 0x0f, + 0x4f, 0xdb, 0x5f, 0xb7, 0x60, 0x78, 0xd3, 0xf1, 0x8a, 0x1f, 0x40, 0x28, 0xd3, 0x64, 0xf4, 0x32, + 0x8c, 0x90, 0xed, 0x6d, 0xd2, 0x92, 0x0f, 0x59, 0x3f, 0x29, 0xcd, 0x99, 0x55, 0x06, 0xa5, 0x53, + 0x93, 0x55, 0xc6, 0xff, 0x62, 0x41, 0x6c, 0xff, 0x47, 0x0b, 0x60, 0x33, 0xf4, 0xe5, 0x51, 0x4d, + 0x41, 0x4b, 0x96, 0xbb, 0x9e, 0x62, 0x78, 0x26, 0xe7, 0x29, 0x06, 0x94, 0x32, 0xcc, 0x79, 0x88, + 0x41, 0xf5, 0xa6, 0x5a, 0xaa, 0x37, 0x43, 0xfd, 0xf4, 0xe6, 0x5b, 0x16, 0x88, 0x88, 0x99, 0x12, + 0x92, 0xe0, 0xca, 0xf4, 0xe9, 0x46, 0x12, 0x8a, 0xe7, 0xca, 0xdc, 0xf6, 0x10, 0xa9, 0x27, 0x94, + 0x6c, 0x1a, 0x09, 0x27, 0x0c, 0xae, 0x74, 0x0b, 0x3f, 0xce, 0xd1, 0x1b, 0xcc, 0x76, 0x2c, 0x6e, + 0x57, 0x5f, 0xc9, 0xb6, 0x58, 0x76, 0x71, 0xca, 0x58, 0xa5, 0x5d, 0xd2, 0xb3, 0x8b, 0x4b, 0x04, + 0x4e, 0x69, 0xd0, 0xb3, 0x30, 0x1a, 0x77, 0xb6, 0x18, 0x79, 0x26, 0x7c, 0xa6, 0xc9, 0xc1, 0x58, + 0xe2, 0xed, 0x5f, 0x42, 0x60, 0x74, 0xcd, 0x48, 0xf1, 0x64, 0x3d, 0xf0, 0x14, 0x4f, 0xef, 0xc0, + 0x18, 0xd9, 0x6b, 0x27, 0x07, 0x75, 0x2f, 0x2a, 0x97, 0x68, 0x6f, 0x55, 0x50, 0x77, 0x73, 0x97, + 0x18, 0xac, 0x38, 0xf6, 0x48, 0xd8, 0x55, 0x7d, 0x24, 0x12, 0x76, 0x0d, 0xfd, 0x85, 0x24, 0xec, + 0x7a, 0x1b, 0x46, 0x77, 0xbc, 0x04, 0x93, 0x76, 0x28, 0xae, 0xf6, 0x15, 0x9c, 0x81, 0x5d, 0xe6, + 0xc4, 0xdd, 0x59, 0x78, 0x04, 0x02, 0x4b, 0x76, 0x68, 0x13, 0x46, 0xf8, 0xbe, 0x43, 0xe4, 0xc0, + 0xfa, 0x78, 0x19, 0x8f, 0x4c, 0x77, 0x3a, 0x28, 0x11, 0x23, 0x25, 0x78, 0xc9, 0x04, 0x5d, 0xa3, + 0x1f, 0x3c, 0x41, 0x97, 0x4a, 0xab, 0x35, 0xf6, 0xa0, 0xd2, 0x6a, 0x19, 0xe9, 0xc9, 0x6a, 0x83, + 0x48, 0x4f, 0xf6, 0x2d, 0x0b, 0x4e, 0xb7, 0xf3, 0x52, 0xfb, 0x89, 0x04, 0x59, 0x9f, 0xbe, 0x8f, + 0x54, 0x87, 0x46, 0xd5, 0xec, 0xd2, 0x55, 0x2e, 0x19, 0xce, 0xaf, 0x58, 0xe6, 0x39, 0x1b, 0xff, + 0xe0, 0x79, 0xce, 0x06, 0x9d, 0x49, 0x2b, 0xcd, 0x7a, 0x36, 0x39, 0x90, 0xac, 0x67, 0x53, 0x0f, + 0x30, 0xeb, 0x99, 0x96, 0xaf, 0x6c, 0xfa, 0xc1, 0xe6, 0x2b, 0xdb, 0x85, 0x71, 0x37, 0xbc, 0x13, + 0xdc, 0x71, 0x22, 0x77, 0xa9, 0xb1, 0x2e, 0xd2, 0x63, 0x15, 0x64, 0x63, 0xa8, 0xa7, 0x05, 0x8c, + 0x1a, 0xb8, 0xeb, 0x31, 0x45, 0x62, 0x9d, 0xb5, 0xc8, 0xdc, 0x76, 0xe2, 0x03, 0x66, 0x6e, 0x33, + 0xf2, 0x9f, 0xa1, 0x41, 0xe4, 0x3f, 0xfb, 0x32, 0xbb, 0x9c, 0xbd, 0xed, 0xed, 0x6c, 0x38, 0xed, + 0xd9, 0x93, 0x65, 0x6a, 0x58, 0x91, 0xe4, 0xdd, 0x35, 0x28, 0x14, 0x4e, 0x99, 0x76, 0x67, 0x58, + 0x3b, 0xf5, 0xb0, 0x33, 0xac, 0x9d, 0x1e, 0x60, 0x86, 0xb5, 0x33, 0x0f, 0x35, 0xc3, 0xda, 0x63, + 0x7f, 0x21, 0x19, 0xd6, 0xfe, 0x2a, 0x9c, 0x3d, 0xfe, 0x73, 0xa4, 0xd9, 0x7b, 0x1b, 0xa9, 0xcb, + 0x20, 0x93, 0xbd, 0x97, 0x99, 0x3a, 0x1a, 0x55, 0xe9, 0x44, 0x4f, 0xdf, 0xb7, 0xe0, 0xb1, 0x1e, + 0x19, 0x51, 0x4a, 0xdf, 0x5d, 0x68, 0xc3, 0x74, 0xdb, 0x2c, 0x5a, 0xfa, 0x7e, 0x91, 0x91, 0x81, + 0x45, 0xc5, 0xc6, 0x65, 0x10, 0x38, 0xcb, 0x7e, 0xf9, 0xa3, 0x3f, 0x79, 0xff, 0xec, 0x87, 0x7e, + 0xfa, 0xfe, 0xd9, 0x0f, 0xfd, 0xd1, 0xfb, 0x67, 0x3f, 0xf4, 0x8b, 0x47, 0x67, 0xad, 0x9f, 0x1c, + 0x9d, 0xb5, 0x7e, 0x7a, 0x74, 0xd6, 0xfa, 0xd3, 0xa3, 0xb3, 0xd6, 0xb7, 0xfe, 0xec, 0xec, 0x87, + 0x3e, 0x5f, 0xd9, 0xbf, 0xf8, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0x69, 0x61, 0x78, 0x3b, 0xf1, + 0xb5, 0x00, 0x00, } diff --git a/pkg/api/v1/generated.proto b/pkg/api/v1/generated.proto index c536f6abe83..d0d79528cf7 100644 --- a/pkg/api/v1/generated.proto +++ b/pkg/api/v1/generated.proto @@ -22,7 +22,7 @@ syntax = 'proto2'; package k8s.io.kubernetes.pkg.api.v1; import "k8s.io/kubernetes/pkg/api/resource/generated.proto"; -import "k8s.io/kubernetes/pkg/api/unversioned/generated.proto"; +import "k8s.io/kubernetes/pkg/apis/meta/v1/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/schema/generated.proto"; import "k8s.io/kubernetes/pkg/util/intstr/generated.proto"; @@ -252,7 +252,7 @@ message ComponentStatusList { // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // List of ComponentStatus objects. repeated ComponentStatus items = 2; @@ -284,7 +284,7 @@ message ConfigMapKeySelector { message ConfigMapList { // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // Items is the list of ConfigMaps. repeated ConfigMap items = 2; @@ -508,7 +508,7 @@ message ContainerState { message ContainerStateRunning { // Time at which the container was last (re-)started // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time startedAt = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time startedAt = 1; } // ContainerStateTerminated is a terminated state of a container. @@ -530,11 +530,11 @@ message ContainerStateTerminated { // Time at which previous execution of the container started // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time startedAt = 5; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time startedAt = 5; // Time at which the container last terminated // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time finishedAt = 6; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time finishedAt = 6; // Container's ID in the format 'docker://' // +optional @@ -765,7 +765,7 @@ message EndpointsList { // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // List of endpoints. repeated Endpoints items = 2; @@ -840,11 +840,11 @@ message Event { // The time at which the event was first recorded. (Time of server receipt is in TypeMeta.) // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time firstTimestamp = 6; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time firstTimestamp = 6; // The time at which the most recent occurrence of this event was recorded. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time lastTimestamp = 7; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time lastTimestamp = 7; // The number of times this event has occurred. // +optional @@ -860,7 +860,7 @@ message EventList { // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // List of events repeated Event items = 2; @@ -1205,7 +1205,7 @@ message LimitRangeList { // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // Items is a list of LimitRange objects. // More info: http://releases.k8s.io/HEAD/docs/design/admission_control_limit_range.md @@ -1223,7 +1223,7 @@ message List { // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // List of objects repeated k8s.io.kubernetes.pkg.runtime.RawExtension items = 2; @@ -1331,7 +1331,7 @@ message NamespaceList { // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // Items is the list of Namespace objects in the list. // More info: http://kubernetes.io/docs/user-guide/namespaces @@ -1417,11 +1417,11 @@ message NodeCondition { // Last time we got an update on a given condition. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time lastHeartbeatTime = 3; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time lastHeartbeatTime = 3; // Last time the condition transit from one status to another. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time lastTransitionTime = 4; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time lastTransitionTime = 4; // (brief) reason for the condition's last transition. // +optional @@ -1444,7 +1444,7 @@ message NodeList { // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // List of nodes repeated Node items = 2; @@ -1700,7 +1700,7 @@ message ObjectMeta { // Null for lists. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time creationTimestamp = 8; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time creationTimestamp = 8; // DeletionTimestamp is RFC 3339 date and time at which this resource will be deleted. This // field is set by the server when a graceful deletion is requested by the user, and is not @@ -1720,7 +1720,7 @@ message ObjectMeta { // Read-only. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time deletionTimestamp = 9; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time deletionTimestamp = 9; // Number of seconds allowed for this object to gracefully terminate before // it will be removed from the system. Only set when deletionTimestamp is also set. @@ -1878,7 +1878,7 @@ message PersistentVolumeClaimList { // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // A list of persistent volume claims. // More info: http://kubernetes.io/docs/user-guide/persistent-volumes#persistentvolumeclaims @@ -1895,7 +1895,7 @@ message PersistentVolumeClaimSpec { // A label query over volumes to consider for binding. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.LabelSelector selector = 4; + optional k8s.io.kubernetes.pkg.apis.meta.v1.LabelSelector selector = 4; // Resources represents the minimum resources the volume should have. // More info: http://kubernetes.io/docs/user-guide/persistent-volumes#resources @@ -1943,7 +1943,7 @@ message PersistentVolumeList { // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // List of persistent volumes. // More info: http://kubernetes.io/docs/user-guide/persistent-volumes @@ -2161,7 +2161,7 @@ message PodAffinity { message PodAffinityTerm { // A label query over a set of resources, in this case pods. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.LabelSelector labelSelector = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.LabelSelector labelSelector = 1; // namespaces specifies which namespaces the labelSelector applies to (matches against); // nil list means "this pod's namespace," empty list means "all namespaces" @@ -2262,11 +2262,11 @@ message PodCondition { // Last time we probed the condition. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time lastProbeTime = 3; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time lastProbeTime = 3; // Last time the condition transitioned from one status to another. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time lastTransitionTime = 4; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time lastTransitionTime = 4; // Unique, one-word, CamelCase reason for the condition's last transition. // +optional @@ -2316,7 +2316,7 @@ message PodList { // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // List of pods. // More info: http://kubernetes.io/docs/user-guide/pods @@ -2349,7 +2349,7 @@ message PodLogOptions { // If this value is in the future, no logs will be returned. // Only one of sinceSeconds or sinceTime may be specified. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time sinceTime = 5; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time sinceTime = 5; // If true, add an RFC3339 or RFC3339Nano timestamp at the beginning of every line // of log output. Defaults to false. @@ -2573,7 +2573,7 @@ message PodStatus { // RFC 3339 date and time at which the object was acknowledged by the Kubelet. // This is before the Kubelet pulled the container image(s) for the pod. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time startTime = 7; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time startTime = 7; // The list has one entry per container in the manifest. Each entry is currently the output // of `docker inspect`. @@ -2616,7 +2616,7 @@ message PodTemplateList { // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // List of pod templates repeated PodTemplate items = 2; @@ -2649,7 +2649,7 @@ message PreferAvoidPodsEntry { // Time at which this entry was added to the list. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time evictionTime = 2; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time evictionTime = 2; // (brief) reason why this entry was added to the list. // +optional @@ -2827,7 +2827,7 @@ message ReplicationControllerCondition { // The last time the condition transitioned from one status to another. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time lastTransitionTime = 3; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time lastTransitionTime = 3; // The reason for the condition's last transition. // +optional @@ -2843,7 +2843,7 @@ message ReplicationControllerList { // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // List of replication controllers. // More info: http://kubernetes.io/docs/user-guide/replication-controller @@ -2945,7 +2945,7 @@ message ResourceQuotaList { // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // Items is a list of ResourceQuota objects. // More info: http://releases.k8s.io/HEAD/docs/design/admission_control_resource_quota.md#admissioncontrol-plugin-resourcequota @@ -3054,7 +3054,7 @@ message SecretList { // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // Items is a list of secret objects. // More info: http://kubernetes.io/docs/user-guide/secrets @@ -3192,7 +3192,7 @@ message ServiceAccountList { // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // List of ServiceAccounts. // More info: http://releases.k8s.io/HEAD/docs/design/service_accounts.md#service-accounts @@ -3204,7 +3204,7 @@ message ServiceList { // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // List of services repeated Service items = 2; diff --git a/pkg/api/v1/meta.go b/pkg/api/v1/meta.go index 7c13814b126..dde646c4eee 100644 --- a/pkg/api/v1/meta.go +++ b/pkg/api/v1/meta.go @@ -27,19 +27,19 @@ func (obj *ObjectMeta) GetObjectMeta() meta.Object { return obj } // Namespace implements meta.Object for any object with an ObjectMeta typed field. Allows // fast, direct access to metadata fields for API objects. -func (meta *ObjectMeta) GetNamespace() string { return meta.Namespace } -func (meta *ObjectMeta) SetNamespace(namespace string) { meta.Namespace = namespace } -func (meta *ObjectMeta) GetName() string { return meta.Name } -func (meta *ObjectMeta) SetName(name string) { meta.Name = name } -func (meta *ObjectMeta) GetGenerateName() string { return meta.GenerateName } -func (meta *ObjectMeta) SetGenerateName(generateName string) { meta.GenerateName = generateName } -func (meta *ObjectMeta) GetUID() types.UID { return meta.UID } -func (meta *ObjectMeta) SetUID(uid types.UID) { meta.UID = uid } -func (meta *ObjectMeta) GetResourceVersion() string { return meta.ResourceVersion } -func (meta *ObjectMeta) SetResourceVersion(version string) { meta.ResourceVersion = version } -func (meta *ObjectMeta) GetSelfLink() string { return meta.SelfLink } -func (meta *ObjectMeta) SetSelfLink(selfLink string) { meta.SelfLink = selfLink } -func (meta *ObjectMeta) GetCreationTimestamp() metav1.Time { return meta.CreationTimestamp } +func (meta *ObjectMeta) GetNamespace() string { return meta.Namespace } +func (meta *ObjectMeta) SetNamespace(namespace string) { meta.Namespace = namespace } +func (meta *ObjectMeta) GetName() string { return meta.Name } +func (meta *ObjectMeta) SetName(name string) { meta.Name = name } +func (meta *ObjectMeta) GetGenerateName() string { return meta.GenerateName } +func (meta *ObjectMeta) SetGenerateName(generateName string) { meta.GenerateName = generateName } +func (meta *ObjectMeta) GetUID() types.UID { return meta.UID } +func (meta *ObjectMeta) SetUID(uid types.UID) { meta.UID = uid } +func (meta *ObjectMeta) GetResourceVersion() string { return meta.ResourceVersion } +func (meta *ObjectMeta) SetResourceVersion(version string) { meta.ResourceVersion = version } +func (meta *ObjectMeta) GetSelfLink() string { return meta.SelfLink } +func (meta *ObjectMeta) SetSelfLink(selfLink string) { meta.SelfLink = selfLink } +func (meta *ObjectMeta) GetCreationTimestamp() metav1.Time { return meta.CreationTimestamp } func (meta *ObjectMeta) SetCreationTimestamp(creationTimestamp metav1.Time) { meta.CreationTimestamp = creationTimestamp } diff --git a/pkg/api/v1/types.generated.go b/pkg/api/v1/types.generated.go index 914207638ec..11c42a9bc66 100644 --- a/pkg/api/v1/types.generated.go +++ b/pkg/api/v1/types.generated.go @@ -26,7 +26,7 @@ import ( "fmt" codec1978 "github.com/ugorji/go/codec" pkg3_resource "k8s.io/kubernetes/pkg/api/resource" - pkg2_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" + pkg2_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" pkg5_runtime "k8s.io/kubernetes/pkg/runtime" pkg1_types "k8s.io/kubernetes/pkg/types" pkg4_intstr "k8s.io/kubernetes/pkg/util/intstr" @@ -66,7 +66,7 @@ func init() { } if false { // reference the types, but skip this branch at build/run time var v0 pkg3_resource.Quantity - var v1 pkg2_unversioned.Time + var v1 pkg2_v1.Time var v2 pkg5_runtime.RawExtension var v3 pkg1_types.UID var v4 pkg4_intstr.IntOrString @@ -674,7 +674,7 @@ func (x *ObjectMeta) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "creationTimestamp": if r.TryDecodeAsNil() { - x.CreationTimestamp = pkg2_unversioned.Time{} + x.CreationTimestamp = pkg2_v1.Time{} } else { yyv62 := &x.CreationTimestamp yym63 := z.DecBinary() @@ -696,7 +696,7 @@ func (x *ObjectMeta) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.DeletionTimestamp == nil { - x.DeletionTimestamp = new(pkg2_unversioned.Time) + x.DeletionTimestamp = new(pkg2_v1.Time) } yym65 := z.DecBinary() _ = yym65 @@ -918,7 +918,7 @@ func (x *ObjectMeta) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.CreationTimestamp = pkg2_unversioned.Time{} + x.CreationTimestamp = pkg2_v1.Time{} } else { yyv85 := &x.CreationTimestamp yym86 := z.DecBinary() @@ -950,7 +950,7 @@ func (x *ObjectMeta) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } else { if x.DeletionTimestamp == nil { - x.DeletionTimestamp = new(pkg2_unversioned.Time) + x.DeletionTimestamp = new(pkg2_v1.Time) } yym88 := z.DecBinary() _ = yym88 @@ -8173,7 +8173,7 @@ func (x *PersistentVolumeList) codecDecodeSelfFromMap(l int, d *codec1978.Decode } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv474 := &x.ListMeta yym475 := z.DecBinary() @@ -8254,7 +8254,7 @@ func (x *PersistentVolumeList) codecDecodeSelfFromArray(l int, d *codec1978.Deco } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv481 := &x.ListMeta yym482 := z.DecBinary() @@ -8860,7 +8860,7 @@ func (x *PersistentVolumeClaimList) codecDecodeSelfFromMap(l int, d *codec1978.D } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv537 := &x.ListMeta yym538 := z.DecBinary() @@ -8941,7 +8941,7 @@ func (x *PersistentVolumeClaimList) codecDecodeSelfFromArray(l int, d *codec1978 } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv544 := &x.ListMeta yym545 := z.DecBinary() @@ -9214,7 +9214,7 @@ func (x *PersistentVolumeClaimSpec) codecDecodeSelfFromMap(l int, d *codec1978.D } } else { if x.Selector == nil { - x.Selector = new(pkg2_unversioned.LabelSelector) + x.Selector = new(pkg2_v1.LabelSelector) } yym568 := z.DecBinary() _ = yym568 @@ -9290,7 +9290,7 @@ func (x *PersistentVolumeClaimSpec) codecDecodeSelfFromArray(l int, d *codec1978 } } else { if x.Selector == nil { - x.Selector = new(pkg2_unversioned.LabelSelector) + x.Selector = new(pkg2_v1.LabelSelector) } yym575 := z.DecBinary() _ = yym575 @@ -22631,7 +22631,7 @@ func (x *ContainerStateRunning) codecDecodeSelfFromMap(l int, d *codec1978.Decod switch yys1636 { case "startedAt": if r.TryDecodeAsNil() { - x.StartedAt = pkg2_unversioned.Time{} + x.StartedAt = pkg2_v1.Time{} } else { yyv1637 := &x.StartedAt yym1638 := z.DecBinary() @@ -22672,7 +22672,7 @@ func (x *ContainerStateRunning) codecDecodeSelfFromArray(l int, d *codec1978.Dec } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.StartedAt = pkg2_unversioned.Time{} + x.StartedAt = pkg2_v1.Time{} } else { yyv1640 := &x.StartedAt yym1641 := z.DecBinary() @@ -23019,7 +23019,7 @@ func (x *ContainerStateTerminated) codecDecodeSelfFromMap(l int, d *codec1978.De } case "startedAt": if r.TryDecodeAsNil() { - x.StartedAt = pkg2_unversioned.Time{} + x.StartedAt = pkg2_v1.Time{} } else { yyv1676 := &x.StartedAt yym1677 := z.DecBinary() @@ -23036,7 +23036,7 @@ func (x *ContainerStateTerminated) codecDecodeSelfFromMap(l int, d *codec1978.De } case "finishedAt": if r.TryDecodeAsNil() { - x.FinishedAt = pkg2_unversioned.Time{} + x.FinishedAt = pkg2_v1.Time{} } else { yyv1678 := &x.FinishedAt yym1679 := z.DecBinary() @@ -23147,7 +23147,7 @@ func (x *ContainerStateTerminated) codecDecodeSelfFromArray(l int, d *codec1978. } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.StartedAt = pkg2_unversioned.Time{} + x.StartedAt = pkg2_v1.Time{} } else { yyv1686 := &x.StartedAt yym1687 := z.DecBinary() @@ -23174,7 +23174,7 @@ func (x *ContainerStateTerminated) codecDecodeSelfFromArray(l int, d *codec1978. } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.FinishedAt = pkg2_unversioned.Time{} + x.FinishedAt = pkg2_v1.Time{} } else { yyv1688 := &x.FinishedAt yym1689 := z.DecBinary() @@ -24271,7 +24271,7 @@ func (x *PodCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "lastProbeTime": if r.TryDecodeAsNil() { - x.LastProbeTime = pkg2_unversioned.Time{} + x.LastProbeTime = pkg2_v1.Time{} } else { yyv1781 := &x.LastProbeTime yym1782 := z.DecBinary() @@ -24288,7 +24288,7 @@ func (x *PodCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "lastTransitionTime": if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg2_unversioned.Time{} + x.LastTransitionTime = pkg2_v1.Time{} } else { yyv1783 := &x.LastTransitionTime yym1784 := z.DecBinary() @@ -24373,7 +24373,7 @@ func (x *PodCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastProbeTime = pkg2_unversioned.Time{} + x.LastProbeTime = pkg2_v1.Time{} } else { yyv1790 := &x.LastProbeTime yym1791 := z.DecBinary() @@ -24400,7 +24400,7 @@ func (x *PodCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg2_unversioned.Time{} + x.LastTransitionTime = pkg2_v1.Time{} } else { yyv1792 := &x.LastTransitionTime yym1793 := z.DecBinary() @@ -26353,7 +26353,7 @@ func (x *PodAffinityTerm) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.LabelSelector == nil { - x.LabelSelector = new(pkg2_unversioned.LabelSelector) + x.LabelSelector = new(pkg2_v1.LabelSelector) } yym1935 := z.DecBinary() _ = yym1935 @@ -26412,7 +26412,7 @@ func (x *PodAffinityTerm) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } } else { if x.LabelSelector == nil { - x.LabelSelector = new(pkg2_unversioned.LabelSelector) + x.LabelSelector = new(pkg2_v1.LabelSelector) } yym1941 := z.DecBinary() _ = yym1941 @@ -29413,7 +29413,7 @@ func (x *PodStatus) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.StartTime == nil { - x.StartTime = new(pkg2_unversioned.Time) + x.StartTime = new(pkg2_v1.Time) } yym2201 := z.DecBinary() _ = yym2201 @@ -29572,7 +29572,7 @@ func (x *PodStatus) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } else { if x.StartTime == nil { - x.StartTime = new(pkg2_unversioned.Time) + x.StartTime = new(pkg2_v1.Time) } yym2213 := z.DecBinary() _ = yym2213 @@ -30482,7 +30482,7 @@ func (x *PodList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv2294 := &x.ListMeta yym2295 := z.DecBinary() @@ -30563,7 +30563,7 @@ func (x *PodList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv2301 := &x.ListMeta yym2302 := z.DecBinary() @@ -31332,7 +31332,7 @@ func (x *PodTemplateList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv2368 := &x.ListMeta yym2369 := z.DecBinary() @@ -31413,7 +31413,7 @@ func (x *PodTemplateList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv2375 := &x.ListMeta yym2376 := z.DecBinary() @@ -32494,7 +32494,7 @@ func (x *ReplicationControllerCondition) codecDecodeSelfFromMap(l int, d *codec1 } case "lastTransitionTime": if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg2_unversioned.Time{} + x.LastTransitionTime = pkg2_v1.Time{} } else { yyv2469 := &x.LastTransitionTime yym2470 := z.DecBinary() @@ -32579,7 +32579,7 @@ func (x *ReplicationControllerCondition) codecDecodeSelfFromArray(l int, d *code } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg2_unversioned.Time{} + x.LastTransitionTime = pkg2_v1.Time{} } else { yyv2476 := &x.LastTransitionTime yym2477 := z.DecBinary() @@ -33199,7 +33199,7 @@ func (x *ReplicationControllerList) codecDecodeSelfFromMap(l int, d *codec1978.D } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv2532 := &x.ListMeta yym2533 := z.DecBinary() @@ -33280,7 +33280,7 @@ func (x *ReplicationControllerList) codecDecodeSelfFromArray(l int, d *codec1978 } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv2539 := &x.ListMeta yym2540 := z.DecBinary() @@ -35551,7 +35551,7 @@ func (x *ServiceList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv2734 := &x.ListMeta yym2735 := z.DecBinary() @@ -35632,7 +35632,7 @@ func (x *ServiceList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv2741 := &x.ListMeta yym2742 := z.DecBinary() @@ -36290,7 +36290,7 @@ func (x *ServiceAccountList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv2801 := &x.ListMeta yym2802 := z.DecBinary() @@ -36371,7 +36371,7 @@ func (x *ServiceAccountList) codecDecodeSelfFromArray(l int, d *codec1978.Decode } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv2808 := &x.ListMeta yym2809 := z.DecBinary() @@ -37871,7 +37871,7 @@ func (x *EndpointsList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv2935 := &x.ListMeta yym2936 := z.DecBinary() @@ -37952,7 +37952,7 @@ func (x *EndpointsList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv2942 := &x.ListMeta yym2943 := z.DecBinary() @@ -40458,7 +40458,7 @@ func (x *PreferAvoidPodsEntry) codecDecodeSelfFromMap(l int, d *codec1978.Decode } case "evictionTime": if r.TryDecodeAsNil() { - x.EvictionTime = pkg2_unversioned.Time{} + x.EvictionTime = pkg2_v1.Time{} } else { yyv3159 := &x.EvictionTime yym3160 := z.DecBinary() @@ -40528,7 +40528,7 @@ func (x *PreferAvoidPodsEntry) codecDecodeSelfFromArray(l int, d *codec1978.Deco } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.EvictionTime = pkg2_unversioned.Time{} + x.EvictionTime = pkg2_v1.Time{} } else { yyv3165 := &x.EvictionTime yym3166 := z.DecBinary() @@ -41301,7 +41301,7 @@ func (x *NodeCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "lastHeartbeatTime": if r.TryDecodeAsNil() { - x.LastHeartbeatTime = pkg2_unversioned.Time{} + x.LastHeartbeatTime = pkg2_v1.Time{} } else { yyv3225 := &x.LastHeartbeatTime yym3226 := z.DecBinary() @@ -41318,7 +41318,7 @@ func (x *NodeCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "lastTransitionTime": if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg2_unversioned.Time{} + x.LastTransitionTime = pkg2_v1.Time{} } else { yyv3227 := &x.LastTransitionTime yym3228 := z.DecBinary() @@ -41403,7 +41403,7 @@ func (x *NodeCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastHeartbeatTime = pkg2_unversioned.Time{} + x.LastHeartbeatTime = pkg2_v1.Time{} } else { yyv3234 := &x.LastHeartbeatTime yym3235 := z.DecBinary() @@ -41430,7 +41430,7 @@ func (x *NodeCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg2_unversioned.Time{} + x.LastTransitionTime = pkg2_v1.Time{} } else { yyv3236 := &x.LastTransitionTime yym3237 := z.DecBinary() @@ -42325,7 +42325,7 @@ func (x *NodeList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv3312 := &x.ListMeta yym3313 := z.DecBinary() @@ -42406,7 +42406,7 @@ func (x *NodeList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv3319 := &x.ListMeta yym3320 := z.DecBinary() @@ -43412,7 +43412,7 @@ func (x *NamespaceList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv3401 := &x.ListMeta yym3402 := z.DecBinary() @@ -43493,7 +43493,7 @@ func (x *NamespaceList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv3408 := &x.ListMeta yym3409 := z.DecBinary() @@ -45407,7 +45407,7 @@ func (x *PodLogOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.SinceTime == nil { - x.SinceTime = new(pkg2_unversioned.Time) + x.SinceTime = new(pkg2_v1.Time) } yym3584 := z.DecBinary() _ = yym3584 @@ -45596,7 +45596,7 @@ func (x *PodLogOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } else { if x.SinceTime == nil { - x.SinceTime = new(pkg2_unversioned.Time) + x.SinceTime = new(pkg2_v1.Time) } yym3599 := z.DecBinary() _ = yym3599 @@ -49343,7 +49343,7 @@ func (x *Event) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "firstTimestamp": if r.TryDecodeAsNil() { - x.FirstTimestamp = pkg2_unversioned.Time{} + x.FirstTimestamp = pkg2_v1.Time{} } else { yyv3930 := &x.FirstTimestamp yym3931 := z.DecBinary() @@ -49360,7 +49360,7 @@ func (x *Event) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "lastTimestamp": if r.TryDecodeAsNil() { - x.LastTimestamp = pkg2_unversioned.Time{} + x.LastTimestamp = pkg2_v1.Time{} } else { yyv3932 := &x.LastTimestamp yym3933 := z.DecBinary() @@ -49528,7 +49528,7 @@ func (x *Event) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.FirstTimestamp = pkg2_unversioned.Time{} + x.FirstTimestamp = pkg2_v1.Time{} } else { yyv3944 := &x.FirstTimestamp yym3945 := z.DecBinary() @@ -49555,7 +49555,7 @@ func (x *Event) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastTimestamp = pkg2_unversioned.Time{} + x.LastTimestamp = pkg2_v1.Time{} } else { yyv3946 := &x.LastTimestamp yym3947 := z.DecBinary() @@ -49832,7 +49832,7 @@ func (x *EventList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv3971 := &x.ListMeta yym3972 := z.DecBinary() @@ -49913,7 +49913,7 @@ func (x *EventList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv3978 := &x.ListMeta yym3979 := z.DecBinary() @@ -50176,7 +50176,7 @@ func (x *List) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv4003 := &x.ListMeta yym4004 := z.DecBinary() @@ -50257,7 +50257,7 @@ func (x *List) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv4010 := &x.ListMeta yym4011 := z.DecBinary() @@ -51428,7 +51428,7 @@ func (x *LimitRangeList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv4100 := &x.ListMeta yym4101 := z.DecBinary() @@ -51509,7 +51509,7 @@ func (x *LimitRangeList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv4107 := &x.ListMeta yym4108 := z.DecBinary() @@ -52595,7 +52595,7 @@ func (x *ResourceQuotaList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv4193 := &x.ListMeta yym4194 := z.DecBinary() @@ -52676,7 +52676,7 @@ func (x *ResourceQuotaList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv4200 := &x.ListMeta yym4201 := z.DecBinary() @@ -53398,7 +53398,7 @@ func (x *SecretList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv4265 := &x.ListMeta yym4266 := z.DecBinary() @@ -53479,7 +53479,7 @@ func (x *SecretList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv4272 := &x.ListMeta yym4273 := z.DecBinary() @@ -54069,7 +54069,7 @@ func (x *ConfigMapList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv4325 := &x.ListMeta yym4326 := z.DecBinary() @@ -54150,7 +54150,7 @@ func (x *ConfigMapList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv4332 := &x.ListMeta yym4333 := z.DecBinary() @@ -55045,7 +55045,7 @@ func (x *ComponentStatusList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv4409 := &x.ListMeta yym4410 := z.DecBinary() @@ -55126,7 +55126,7 @@ func (x *ComponentStatusList) codecDecodeSelfFromArray(l int, d *codec1978.Decod } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv4416 := &x.ListMeta yym4417 := z.DecBinary() diff --git a/pkg/api/validation/validation.go b/pkg/api/validation/validation.go index 0ab490b0220..6537c627a4e 100644 --- a/pkg/api/validation/validation.go +++ b/pkg/api/validation/validation.go @@ -32,8 +32,8 @@ import ( utilpod "k8s.io/kubernetes/pkg/api/pod" "k8s.io/kubernetes/pkg/api/resource" apiservice "k8s.io/kubernetes/pkg/api/service" - unversionedvalidation "k8s.io/kubernetes/pkg/apis/meta/v1/validation" "k8s.io/kubernetes/pkg/api/v1" + unversionedvalidation "k8s.io/kubernetes/pkg/apis/meta/v1/validation" storageutil "k8s.io/kubernetes/pkg/apis/storage/util" "k8s.io/kubernetes/pkg/capabilities" "k8s.io/kubernetes/pkg/labels" diff --git a/pkg/api/validation/validation_test.go b/pkg/api/validation/validation_test.go index 0c0c46eb75b..463e45ef870 100644 --- a/pkg/api/validation/validation_test.go +++ b/pkg/api/validation/validation_test.go @@ -26,8 +26,8 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/api/service" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" storageutil "k8s.io/kubernetes/pkg/apis/storage/util" "k8s.io/kubernetes/pkg/capabilities" "k8s.io/kubernetes/pkg/security/apparmor" diff --git a/pkg/apis/abac/types.go b/pkg/apis/abac/types.go index d848b907510..1a192f21802 100644 --- a/pkg/apis/abac/types.go +++ b/pkg/apis/abac/types.go @@ -17,7 +17,9 @@ limitations under the License. // +k8s:openapi-gen=true package abac -import ( metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" ) +import ( + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" +) // Policy contains a single ABAC policy rule type Policy struct { diff --git a/pkg/apis/abac/v0/types.go b/pkg/apis/abac/v0/types.go index e3867023e5d..a656e05132c 100644 --- a/pkg/apis/abac/v0/types.go +++ b/pkg/apis/abac/v0/types.go @@ -17,7 +17,9 @@ limitations under the License. // +k8s:openapi-gen=true package v0 -import ( metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" ) +import ( + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" +) // Policy contains a single ABAC policy rule type Policy struct { diff --git a/pkg/apis/abac/v1beta1/types.go b/pkg/apis/abac/v1beta1/types.go index a7898001943..793243b9dfb 100644 --- a/pkg/apis/abac/v1beta1/types.go +++ b/pkg/apis/abac/v1beta1/types.go @@ -17,7 +17,9 @@ limitations under the License. // +k8s:openapi-gen=true package v1beta1 -import ( metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" ) +import ( + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" +) // Policy contains a single ABAC policy rule type Policy struct { diff --git a/pkg/apis/apps/types.generated.go b/pkg/apis/apps/types.generated.go index 5fe8db386d1..b0da09e459c 100644 --- a/pkg/apis/apps/types.generated.go +++ b/pkg/apis/apps/types.generated.go @@ -27,7 +27,7 @@ import ( codec1978 "github.com/ugorji/go/codec" pkg2_api "k8s.io/kubernetes/pkg/api" pkg4_resource "k8s.io/kubernetes/pkg/api/resource" - pkg1_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" + pkg1_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" pkg3_types "k8s.io/kubernetes/pkg/types" pkg5_intstr "k8s.io/kubernetes/pkg/util/intstr" "reflect" @@ -67,7 +67,7 @@ func init() { if false { // reference the types, but skip this branch at build/run time var v0 pkg2_api.ObjectMeta var v1 pkg4_resource.Quantity - var v2 pkg1_unversioned.TypeMeta + var v2 pkg1_v1.TypeMeta var v3 pkg3_types.UID var v4 pkg5_intstr.IntOrString var v5 time.Time @@ -648,7 +648,7 @@ func (x *StatefulSetSpec) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.Selector == nil { - x.Selector = new(pkg1_unversioned.LabelSelector) + x.Selector = new(pkg1_v1.LabelSelector) } yym54 := z.DecBinary() _ = yym54 @@ -730,7 +730,7 @@ func (x *StatefulSetSpec) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } } else { if x.Selector == nil { - x.Selector = new(pkg1_unversioned.LabelSelector) + x.Selector = new(pkg1_v1.LabelSelector) } yym62 := z.DecBinary() _ = yym62 @@ -1265,7 +1265,7 @@ func (x *StatefulSetList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv108 := &x.ListMeta yym109 := z.DecBinary() @@ -1346,7 +1346,7 @@ func (x *StatefulSetList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv115 := &x.ListMeta yym116 := z.DecBinary() diff --git a/pkg/apis/apps/types.go b/pkg/apis/apps/types.go index 0b5de623973..b9402708c6a 100644 --- a/pkg/apis/apps/types.go +++ b/pkg/apis/apps/types.go @@ -99,5 +99,5 @@ type StatefulSetList struct { metav1.TypeMeta `json:",inline"` // +optional metav1.ListMeta `json:"metadata,omitempty"` - Items []StatefulSet `json:"items"` + Items []StatefulSet `json:"items"` } diff --git a/pkg/apis/apps/v1beta1/conversion.go b/pkg/apis/apps/v1beta1/conversion.go index 0998225ae2b..2f84ba29299 100644 --- a/pkg/apis/apps/v1beta1/conversion.go +++ b/pkg/apis/apps/v1beta1/conversion.go @@ -20,9 +20,9 @@ import ( "fmt" "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" v1 "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apis/apps" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/conversion" "k8s.io/kubernetes/pkg/runtime" ) diff --git a/pkg/apis/apps/v1beta1/generated.pb.go b/pkg/apis/apps/v1beta1/generated.pb.go index d2e9bdf7910..14272ac1829 100644 --- a/pkg/apis/apps/v1beta1/generated.pb.go +++ b/pkg/apis/apps/v1beta1/generated.pb.go @@ -36,8 +36,8 @@ import proto "github.com/gogo/protobuf/proto" import fmt "fmt" import math "math" -import k8s_io_kubernetes_pkg_api_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" import k8s_io_kubernetes_pkg_api_v1 "k8s.io/kubernetes/pkg/api/v1" +import k8s_io_kubernetes_pkg_apis_meta_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" import strings "strings" import reflect "reflect" @@ -354,7 +354,7 @@ func (this *StatefulSetList) String() string { return "nil" } s := strings.Join([]string{`&StatefulSetList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "StatefulSet", "StatefulSet", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -366,7 +366,7 @@ func (this *StatefulSetSpec) String() string { } s := strings.Join([]string{`&StatefulSetSpec{`, `Replicas:` + valueToStringGenerated(this.Replicas) + `,`, - `Selector:` + strings.Replace(fmt.Sprintf("%v", this.Selector), "LabelSelector", "k8s_io_kubernetes_pkg_api_unversioned.LabelSelector", 1) + `,`, + `Selector:` + strings.Replace(fmt.Sprintf("%v", this.Selector), "LabelSelector", "k8s_io_kubernetes_pkg_apis_meta_v1.LabelSelector", 1) + `,`, `Template:` + strings.Replace(strings.Replace(this.Template.String(), "PodTemplateSpec", "k8s_io_kubernetes_pkg_api_v1.PodTemplateSpec", 1), `&`, ``, 1) + `,`, `VolumeClaimTemplates:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.VolumeClaimTemplates), "PersistentVolumeClaim", "k8s_io_kubernetes_pkg_api_v1.PersistentVolumeClaim", 1), `&`, ``, 1) + `,`, `ServiceName:` + fmt.Sprintf("%v", this.ServiceName) + `,`, @@ -720,7 +720,7 @@ func (m *StatefulSetSpec) Unmarshal(data []byte) error { return io.ErrUnexpectedEOF } if m.Selector == nil { - m.Selector = &k8s_io_kubernetes_pkg_api_unversioned.LabelSelector{} + m.Selector = &k8s_io_kubernetes_pkg_apis_meta_v1.LabelSelector{} } if err := m.Selector.Unmarshal(data[iNdEx:postIndex]); err != nil { return err @@ -1032,45 +1032,45 @@ var ( ) var fileDescriptorGenerated = []byte{ - // 637 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x9c, 0x93, 0xcd, 0x6e, 0xd3, 0x4c, - 0x14, 0x86, 0xe3, 0xa4, 0xe9, 0x97, 0x6f, 0x52, 0xfe, 0x86, 0x0a, 0x45, 0x11, 0x72, 0xab, 0x6c, - 0x08, 0x52, 0x3b, 0x56, 0x4a, 0x2b, 0x2a, 0x96, 0x46, 0x02, 0x21, 0x01, 0x45, 0x0e, 0xaa, 0xa0, - 0x08, 0xa4, 0xb1, 0x73, 0x9a, 0x9a, 0xd8, 0x1e, 0xcb, 0x73, 0x9c, 0x35, 0x1b, 0x16, 0xec, 0xb8, - 0x0b, 0x2e, 0x81, 0x5b, 0xa8, 0xc4, 0xa6, 0x4b, 0x56, 0x15, 0x0d, 0x37, 0x82, 0x3c, 0x99, 0x24, - 0xa6, 0x4e, 0x4a, 0xd5, 0x9d, 0xcf, 0xcc, 0x79, 0x9f, 0xf3, 0x33, 0xaf, 0xc9, 0xc3, 0xc1, 0xae, - 0x64, 0xbe, 0xb0, 0x06, 0xa9, 0x0b, 0x49, 0x04, 0x08, 0xd2, 0x8a, 0x07, 0x7d, 0x8b, 0xc7, 0xbe, - 0xb4, 0x78, 0x1c, 0x4b, 0x6b, 0xd8, 0x71, 0x01, 0x79, 0xc7, 0xea, 0x43, 0x04, 0x09, 0x47, 0xe8, - 0xb1, 0x38, 0x11, 0x28, 0xe8, 0xbd, 0xb1, 0x90, 0xcd, 0x84, 0x2c, 0x1e, 0xf4, 0x59, 0x26, 0x64, - 0x99, 0x90, 0x69, 0x61, 0x73, 0xb3, 0xef, 0xe3, 0x51, 0xea, 0x32, 0x4f, 0x84, 0x56, 0x5f, 0xf4, - 0x85, 0xa5, 0xf4, 0x6e, 0x7a, 0xa8, 0x22, 0x15, 0xa8, 0xaf, 0x31, 0xb7, 0xb9, 0xb5, 0xb0, 0x21, - 0x2b, 0x01, 0x29, 0xd2, 0xc4, 0x83, 0xf3, 0xbd, 0x34, 0x77, 0x16, 0x6b, 0xd2, 0x68, 0x08, 0x89, - 0xf4, 0x45, 0x04, 0xbd, 0x82, 0x6c, 0x63, 0xb1, 0x6c, 0x58, 0x18, 0xb8, 0xb9, 0x39, 0x3f, 0x3b, - 0x49, 0x23, 0xf4, 0xc3, 0x62, 0x4f, 0xdb, 0x17, 0xa7, 0x4b, 0xef, 0x08, 0x42, 0x5e, 0x50, 0x75, - 0xe6, 0xab, 0x52, 0xf4, 0x03, 0xcb, 0x8f, 0x50, 0x62, 0x72, 0x5e, 0xd2, 0xfa, 0x56, 0x26, 0xf5, - 0x2e, 0x72, 0x84, 0xc3, 0x34, 0xe8, 0x02, 0xd2, 0x37, 0xa4, 0x16, 0x02, 0xf2, 0x1e, 0x47, 0xde, - 0x30, 0xd6, 0x8d, 0x76, 0x7d, 0xab, 0xcd, 0x16, 0xbe, 0x15, 0x1b, 0x76, 0xd8, 0x9e, 0xfb, 0x11, - 0x3c, 0x7c, 0x01, 0xc8, 0x6d, 0x7a, 0x7c, 0xba, 0x56, 0x1a, 0x9d, 0xae, 0x91, 0xd9, 0x99, 0x33, - 0xa5, 0xd1, 0x03, 0xb2, 0x24, 0x63, 0xf0, 0x1a, 0x65, 0x45, 0xdd, 0x65, 0x97, 0x74, 0x00, 0xcb, - 0x75, 0xd7, 0x8d, 0xc1, 0xb3, 0x57, 0x74, 0x95, 0xa5, 0x2c, 0x72, 0x14, 0x93, 0xba, 0x64, 0x59, - 0x22, 0xc7, 0x54, 0x36, 0x2a, 0x8a, 0xfe, 0xe8, 0x4a, 0x74, 0x45, 0xb0, 0xaf, 0x6b, 0xfe, 0xf2, - 0x38, 0x76, 0x34, 0xb9, 0xf5, 0xc3, 0x20, 0x37, 0x72, 0xd9, 0xcf, 0x7d, 0x89, 0xf4, 0x7d, 0x61, - 0x5b, 0xd6, 0x05, 0xdb, 0xca, 0xb9, 0x89, 0x65, 0x72, 0xb5, 0xb4, 0x9b, 0xba, 0x5c, 0x6d, 0x72, - 0x92, 0x5b, 0xd9, 0x5b, 0x52, 0xf5, 0x11, 0x42, 0xd9, 0x28, 0xaf, 0x57, 0xda, 0xf5, 0xad, 0xed, - 0xab, 0x4c, 0x65, 0x5f, 0xd3, 0x05, 0xaa, 0xcf, 0x32, 0x94, 0x33, 0x26, 0xb6, 0xbe, 0x57, 0xfe, - 0x9a, 0x26, 0xdb, 0x25, 0x6d, 0x93, 0x5a, 0x02, 0x71, 0xe0, 0x7b, 0x5c, 0xaa, 0x69, 0xaa, 0xf6, - 0x4a, 0xd6, 0x98, 0xa3, 0xcf, 0x9c, 0xe9, 0x2d, 0xfd, 0x40, 0x6a, 0x12, 0x02, 0xf0, 0x50, 0x24, - 0xfa, 0x3d, 0xb7, 0x2f, 0x3b, 0x37, 0x77, 0x21, 0xe8, 0x6a, 0xed, 0x98, 0x3f, 0x89, 0x9c, 0x29, - 0x93, 0xbe, 0x23, 0x35, 0x84, 0x30, 0x0e, 0x38, 0x82, 0x7e, 0xd1, 0xcd, 0x8b, 0x5d, 0xf8, 0x4a, - 0xf4, 0x5e, 0x6b, 0x81, 0x32, 0xc9, 0x74, 0xab, 0x93, 0x53, 0x67, 0x0a, 0xa4, 0x9f, 0x0d, 0xb2, - 0x3a, 0x14, 0x41, 0x1a, 0xc2, 0xe3, 0x80, 0xfb, 0xe1, 0x24, 0x43, 0x36, 0x96, 0xd4, 0x96, 0x1f, - 0xfc, 0xa3, 0x52, 0x36, 0x8a, 0x44, 0x88, 0x70, 0x7f, 0xc6, 0xb0, 0xef, 0xea, 0x7a, 0xab, 0xfb, - 0x73, 0xc0, 0xce, 0xdc, 0x72, 0x74, 0x87, 0xd4, 0x25, 0x24, 0x43, 0xdf, 0x83, 0x97, 0x3c, 0x84, - 0x46, 0x75, 0xdd, 0x68, 0xff, 0x6f, 0xdf, 0xd6, 0xa0, 0x7a, 0x77, 0x76, 0xe5, 0xe4, 0xf3, 0x5a, - 0x5f, 0x0c, 0x72, 0xab, 0xe0, 0x5a, 0xfa, 0x84, 0x50, 0xe1, 0x66, 0x69, 0xd0, 0x7b, 0x3a, 0xfe, - 0xc5, 0x7d, 0x11, 0xa9, 0x57, 0xac, 0xd8, 0x77, 0x46, 0xa7, 0x6b, 0x74, 0xaf, 0x70, 0xeb, 0xcc, - 0x51, 0xd0, 0x8d, 0x9c, 0x07, 0xca, 0xca, 0x03, 0xd3, 0x55, 0x16, 0x7d, 0x60, 0xdf, 0x3f, 0x3e, - 0x33, 0x4b, 0x27, 0x67, 0x66, 0xe9, 0xe7, 0x99, 0x59, 0xfa, 0x34, 0x32, 0x8d, 0xe3, 0x91, 0x69, - 0x9c, 0x8c, 0x4c, 0xe3, 0xd7, 0xc8, 0x34, 0xbe, 0xfe, 0x36, 0x4b, 0x07, 0xff, 0x69, 0x4b, 0xfe, - 0x09, 0x00, 0x00, 0xff, 0xff, 0x64, 0x32, 0x5a, 0xad, 0x2b, 0x06, 0x00, 0x00, + // 627 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x9c, 0x93, 0xcb, 0x6e, 0xd3, 0x4c, + 0x14, 0xc7, 0xe3, 0xa4, 0xe9, 0x97, 0x6f, 0x52, 0x6e, 0x43, 0x85, 0xa2, 0x0a, 0xb9, 0x55, 0x36, + 0x04, 0xa9, 0x1d, 0x2b, 0xa5, 0x88, 0x8a, 0xa5, 0x91, 0x40, 0x48, 0x40, 0x91, 0x83, 0x2a, 0x28, + 0xab, 0xb1, 0x73, 0x9a, 0x0e, 0xb1, 0x63, 0xcb, 0x73, 0x9c, 0x35, 0x1b, 0x16, 0xec, 0x78, 0x0b, + 0x5e, 0x80, 0x87, 0xc8, 0xb2, 0x4b, 0x56, 0x15, 0x0d, 0x2f, 0x82, 0x66, 0x32, 0xb9, 0x50, 0xbb, + 0xa1, 0xea, 0xce, 0xe7, 0xcc, 0xf9, 0xff, 0xce, 0xd5, 0xe4, 0x49, 0x7f, 0x5f, 0x32, 0x11, 0x3b, + 0xfd, 0xcc, 0x87, 0x74, 0x00, 0x08, 0xd2, 0x49, 0xfa, 0x3d, 0x87, 0x27, 0x42, 0x3a, 0x3c, 0x49, + 0xa4, 0x33, 0x6c, 0xfb, 0x80, 0xbc, 0xed, 0xf4, 0x60, 0x00, 0x29, 0x47, 0xe8, 0xb2, 0x24, 0x8d, + 0x31, 0xa6, 0x0f, 0x26, 0x42, 0x36, 0x17, 0xb2, 0xa4, 0xdf, 0x63, 0x4a, 0xc8, 0x94, 0x90, 0x19, + 0xe1, 0xc6, 0x4e, 0x4f, 0xe0, 0x49, 0xe6, 0xb3, 0x20, 0x8e, 0x9c, 0x5e, 0xdc, 0x8b, 0x1d, 0xad, + 0xf7, 0xb3, 0x63, 0x6d, 0x69, 0x43, 0x7f, 0x4d, 0xb8, 0x1b, 0xbb, 0x97, 0x16, 0xe4, 0xa4, 0x20, + 0xe3, 0x2c, 0x0d, 0xe0, 0x62, 0x2d, 0x1b, 0xdb, 0x97, 0x6b, 0x86, 0xb9, 0xca, 0x97, 0x64, 0x90, + 0x4e, 0x04, 0xc8, 0x8b, 0x34, 0x3b, 0xc5, 0x9a, 0x34, 0x1b, 0xa0, 0x88, 0xf2, 0x05, 0xed, 0x2d, + 0x0f, 0x97, 0xc1, 0x09, 0x44, 0x3c, 0xa7, 0x6a, 0x17, 0xab, 0x32, 0x14, 0xa1, 0x23, 0x06, 0x28, + 0x31, 0xbd, 0x28, 0x69, 0x7e, 0x2f, 0x93, 0x7a, 0x07, 0x39, 0xc2, 0x71, 0x16, 0x76, 0x00, 0xe9, + 0x7b, 0x52, 0x53, 0x2d, 0x74, 0x39, 0xf2, 0x86, 0xb5, 0x65, 0xb5, 0xea, 0xbb, 0x2d, 0x76, 0xe9, + 0xa2, 0xd8, 0xb0, 0xcd, 0x0e, 0xfc, 0x4f, 0x10, 0xe0, 0x6b, 0x40, 0xee, 0xd2, 0xd1, 0xd9, 0x66, + 0x69, 0x7c, 0xb6, 0x49, 0xe6, 0x3e, 0x6f, 0x46, 0xa3, 0x47, 0x64, 0x45, 0x26, 0x10, 0x34, 0xca, + 0x9a, 0xba, 0xcf, 0xae, 0xb8, 0x7e, 0xb6, 0x50, 0x5d, 0x27, 0x81, 0xc0, 0x5d, 0x33, 0x59, 0x56, + 0x94, 0xe5, 0x69, 0x26, 0xf5, 0xc9, 0xaa, 0x44, 0x8e, 0x99, 0x6c, 0x54, 0x34, 0xfd, 0xe9, 0xb5, + 0xe8, 0x9a, 0xe0, 0xde, 0x34, 0xfc, 0xd5, 0x89, 0xed, 0x19, 0x72, 0x73, 0x64, 0x91, 0x5b, 0x0b, + 0xd1, 0xaf, 0x84, 0x44, 0x7a, 0x94, 0x9b, 0xd6, 0xf6, 0xb2, 0xcc, 0x2a, 0x56, 0xcd, 0x4c, 0x69, + 0xf5, 0xc4, 0x6e, 0x9b, 0x5c, 0xb5, 0xa9, 0x67, 0x61, 0x5e, 0x1f, 0x48, 0x55, 0x20, 0x44, 0xb2, + 0x51, 0xde, 0xaa, 0xb4, 0xea, 0xbb, 0x7b, 0xd7, 0x69, 0xc9, 0xbd, 0x61, 0x12, 0x54, 0x5f, 0x2a, + 0x94, 0x37, 0x21, 0x36, 0x7f, 0x54, 0xfe, 0x6a, 0x45, 0x0d, 0x92, 0xb6, 0x48, 0x2d, 0x85, 0x24, + 0x14, 0x01, 0x97, 0xba, 0x95, 0xaa, 0xbb, 0xa6, 0x0a, 0xf3, 0x8c, 0xcf, 0x9b, 0xbd, 0xd2, 0x8f, + 0xa4, 0x26, 0x21, 0x84, 0x00, 0xe3, 0xd4, 0x2c, 0xb3, 0x7d, 0xa5, 0xa6, 0xb9, 0x0f, 0x61, 0xc7, + 0x08, 0x27, 0xf0, 0xa9, 0xe5, 0xcd, 0x80, 0x0a, 0x8e, 0x10, 0x25, 0x21, 0x47, 0x30, 0xbb, 0xdc, + 0x59, 0x7e, 0x7f, 0x6f, 0xe3, 0xee, 0x3b, 0x23, 0xd0, 0xe7, 0x31, 0x1b, 0xe9, 0xd4, 0xeb, 0xcd, + 0x80, 0xf4, 0x8b, 0x45, 0xd6, 0x87, 0x71, 0x98, 0x45, 0xf0, 0x2c, 0xe4, 0x22, 0x9a, 0x46, 0xc8, + 0xc6, 0x8a, 0x1e, 0xf1, 0xa3, 0x7f, 0x64, 0x82, 0x54, 0x0a, 0x89, 0x30, 0xc0, 0xc3, 0x39, 0xc3, + 0xbd, 0x6f, 0xf2, 0xad, 0x1f, 0x16, 0x80, 0xbd, 0xc2, 0x74, 0xf4, 0x31, 0xa9, 0x4b, 0x48, 0x87, + 0x22, 0x80, 0x37, 0x3c, 0x82, 0x46, 0x75, 0xcb, 0x6a, 0xfd, 0xef, 0xde, 0x35, 0xa0, 0x7a, 0x67, + 0xfe, 0xe4, 0x2d, 0xc6, 0x35, 0xbf, 0x5a, 0xe4, 0x4e, 0xee, 0x5e, 0xe9, 0x73, 0x42, 0x63, 0x5f, + 0x85, 0x41, 0xf7, 0xc5, 0xe4, 0xe7, 0x16, 0xf1, 0x40, 0xaf, 0xb0, 0xe2, 0xde, 0x1b, 0x9f, 0x6d, + 0xd2, 0x83, 0xdc, 0xab, 0x57, 0xa0, 0xa0, 0xdb, 0x0b, 0x07, 0x50, 0xd6, 0x07, 0x30, 0x1b, 0x65, + 0xfe, 0x08, 0xdc, 0x87, 0xa3, 0x73, 0xbb, 0x74, 0x7a, 0x6e, 0x97, 0x7e, 0x9e, 0xdb, 0xa5, 0xcf, + 0x63, 0xdb, 0x1a, 0x8d, 0x6d, 0xeb, 0x74, 0x6c, 0x5b, 0xbf, 0xc6, 0xb6, 0xf5, 0xed, 0xb7, 0x5d, + 0x3a, 0xfa, 0xcf, 0xdc, 0xe3, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x0f, 0x47, 0x2a, 0x55, 0x22, + 0x06, 0x00, 0x00, } diff --git a/pkg/apis/apps/v1beta1/generated.proto b/pkg/apis/apps/v1beta1/generated.proto index 960c5e6b5c3..0e58bfd78d7 100644 --- a/pkg/apis/apps/v1beta1/generated.proto +++ b/pkg/apis/apps/v1beta1/generated.proto @@ -22,8 +22,8 @@ syntax = 'proto2'; package k8s.io.kubernetes.pkg.apis.apps.v1beta1; import "k8s.io/kubernetes/pkg/api/resource/generated.proto"; -import "k8s.io/kubernetes/pkg/api/unversioned/generated.proto"; import "k8s.io/kubernetes/pkg/api/v1/generated.proto"; +import "k8s.io/kubernetes/pkg/apis/meta/v1/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/schema/generated.proto"; import "k8s.io/kubernetes/pkg/util/intstr/generated.proto"; @@ -54,7 +54,7 @@ message StatefulSet { // StatefulSetList is a collection of StatefulSets. message StatefulSetList { // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; repeated StatefulSet items = 2; } @@ -73,7 +73,7 @@ message StatefulSetSpec { // If empty, defaulted to labels on the pod template. // More info: http://kubernetes.io/docs/user-guide/labels#label-selectors // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.LabelSelector selector = 2; + optional k8s.io.kubernetes.pkg.apis.meta.v1.LabelSelector selector = 2; // Template is the object that describes the pod that will be created if // insufficient replicas are detected. Each pod stamped out by the StatefulSet diff --git a/pkg/apis/apps/v1beta1/register.go b/pkg/apis/apps/v1beta1/register.go index e99fe0aa12f..81b8a383288 100644 --- a/pkg/apis/apps/v1beta1/register.go +++ b/pkg/apis/apps/v1beta1/register.go @@ -17,8 +17,8 @@ limitations under the License. package v1beta1 import ( - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" versionedwatch "k8s.io/kubernetes/pkg/watch/versioned" diff --git a/pkg/apis/apps/v1beta1/types.generated.go b/pkg/apis/apps/v1beta1/types.generated.go index 99e788e8f1e..71ee844caaa 100644 --- a/pkg/apis/apps/v1beta1/types.generated.go +++ b/pkg/apis/apps/v1beta1/types.generated.go @@ -26,8 +26,8 @@ import ( "fmt" codec1978 "github.com/ugorji/go/codec" pkg4_resource "k8s.io/kubernetes/pkg/api/resource" - pkg1_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" pkg2_v1 "k8s.io/kubernetes/pkg/api/v1" + pkg1_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" pkg3_types "k8s.io/kubernetes/pkg/types" pkg5_intstr "k8s.io/kubernetes/pkg/util/intstr" "reflect" @@ -66,8 +66,8 @@ func init() { } if false { // reference the types, but skip this branch at build/run time var v0 pkg4_resource.Quantity - var v1 pkg1_unversioned.TypeMeta - var v2 pkg2_v1.ObjectMeta + var v1 pkg2_v1.ObjectMeta + var v2 pkg1_v1.TypeMeta var v3 pkg3_types.UID var v4 pkg5_intstr.IntOrString var v5 time.Time @@ -668,7 +668,7 @@ func (x *StatefulSetSpec) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.Selector == nil { - x.Selector = new(pkg1_unversioned.LabelSelector) + x.Selector = new(pkg1_v1.LabelSelector) } yym57 := z.DecBinary() _ = yym57 @@ -760,7 +760,7 @@ func (x *StatefulSetSpec) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } } else { if x.Selector == nil { - x.Selector = new(pkg1_unversioned.LabelSelector) + x.Selector = new(pkg1_v1.LabelSelector) } yym66 := z.DecBinary() _ = yym66 @@ -1295,7 +1295,7 @@ func (x *StatefulSetList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv112 := &x.ListMeta yym113 := z.DecBinary() @@ -1376,7 +1376,7 @@ func (x *StatefulSetList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv119 := &x.ListMeta yym120 := z.DecBinary() diff --git a/pkg/apis/apps/v1beta1/types.go b/pkg/apis/apps/v1beta1/types.go index 49f4343d74c..edf434ca8bc 100644 --- a/pkg/apis/apps/v1beta1/types.go +++ b/pkg/apis/apps/v1beta1/types.go @@ -17,8 +17,8 @@ limitations under the License. package v1beta1 import ( - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" ) // +genclient=true @@ -99,5 +99,5 @@ type StatefulSetList struct { metav1.TypeMeta `json:",inline"` // +optional metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` - Items []StatefulSet `json:"items" protobuf:"bytes,2,rep,name=items"` + Items []StatefulSet `json:"items" protobuf:"bytes,2,rep,name=items"` } diff --git a/pkg/apis/apps/validation/validation.go b/pkg/apis/apps/validation/validation.go index 00c573be11e..13a10e6a99f 100644 --- a/pkg/apis/apps/validation/validation.go +++ b/pkg/apis/apps/validation/validation.go @@ -20,10 +20,10 @@ import ( "reflect" "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" - unversionedvalidation "k8s.io/kubernetes/pkg/apis/meta/v1/validation" apivalidation "k8s.io/kubernetes/pkg/api/validation" "k8s.io/kubernetes/pkg/apis/apps" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" + unversionedvalidation "k8s.io/kubernetes/pkg/apis/meta/v1/validation" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/util/validation/field" ) diff --git a/pkg/apis/apps/validation/validation_test.go b/pkg/apis/apps/validation/validation_test.go index 38f97c33abb..418378af61f 100644 --- a/pkg/apis/apps/validation/validation_test.go +++ b/pkg/apis/apps/validation/validation_test.go @@ -21,8 +21,8 @@ import ( "testing" "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/apps" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" ) func TestValidateStatefulSet(t *testing.T) { diff --git a/pkg/apis/authentication/types.generated.go b/pkg/apis/authentication/types.generated.go index f5b26081527..aed4784ea5b 100644 --- a/pkg/apis/authentication/types.generated.go +++ b/pkg/apis/authentication/types.generated.go @@ -26,7 +26,7 @@ import ( "fmt" codec1978 "github.com/ugorji/go/codec" pkg2_api "k8s.io/kubernetes/pkg/api" - pkg1_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" + pkg1_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" pkg3_types "k8s.io/kubernetes/pkg/types" "reflect" "runtime" @@ -64,7 +64,7 @@ func init() { } if false { // reference the types, but skip this branch at build/run time var v0 pkg2_api.ObjectMeta - var v1 pkg1_unversioned.TypeMeta + var v1 pkg1_v1.TypeMeta var v2 pkg3_types.UID var v3 time.Time _, _, _, _ = v0, v1, v2, v3 @@ -784,7 +784,7 @@ func (x *TokenReview) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "creationTimestamp": if r.TryDecodeAsNil() { - x.CreationTimestamp = pkg1_unversioned.Time{} + x.CreationTimestamp = pkg1_v1.Time{} } else { yyv76 := &x.CreationTimestamp yym77 := z.DecBinary() @@ -801,7 +801,7 @@ func (x *TokenReview) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "deletionTimestamp": if x.ObjectMeta.DeletionTimestamp == nil { - x.ObjectMeta.DeletionTimestamp = new(pkg1_unversioned.Time) + x.ObjectMeta.DeletionTimestamp = new(pkg1_v1.Time) } if r.TryDecodeAsNil() { if x.DeletionTimestamp != nil { @@ -809,7 +809,7 @@ func (x *TokenReview) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.DeletionTimestamp == nil { - x.DeletionTimestamp = new(pkg1_unversioned.Time) + x.DeletionTimestamp = new(pkg1_v1.Time) } yym79 := z.DecBinary() _ = yym79 @@ -1080,7 +1080,7 @@ func (x *TokenReview) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.CreationTimestamp = pkg1_unversioned.Time{} + x.CreationTimestamp = pkg1_v1.Time{} } else { yyv103 := &x.CreationTimestamp yym104 := z.DecBinary() @@ -1096,7 +1096,7 @@ func (x *TokenReview) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } if x.ObjectMeta.DeletionTimestamp == nil { - x.ObjectMeta.DeletionTimestamp = new(pkg1_unversioned.Time) + x.ObjectMeta.DeletionTimestamp = new(pkg1_v1.Time) } yyj93++ if yyhl93 { @@ -1115,7 +1115,7 @@ func (x *TokenReview) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } else { if x.DeletionTimestamp == nil { - x.DeletionTimestamp = new(pkg1_unversioned.Time) + x.DeletionTimestamp = new(pkg1_v1.Time) } yym106 := z.DecBinary() _ = yym106 diff --git a/pkg/apis/authentication/v1beta1/generated.pb.go b/pkg/apis/authentication/v1beta1/generated.pb.go index e14bb106041..d3382aa3d5f 100644 --- a/pkg/apis/authentication/v1beta1/generated.pb.go +++ b/pkg/apis/authentication/v1beta1/generated.pb.go @@ -1236,46 +1236,46 @@ var ( ) var fileDescriptorGenerated = []byte{ - // 654 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xa4, 0x93, 0xcd, 0x6e, 0xd3, 0x4a, - 0x14, 0xc7, 0xed, 0x7c, 0xf4, 0x26, 0x93, 0xdb, 0x7b, 0xcb, 0x48, 0x48, 0x51, 0x24, 0x9c, 0x28, - 0x6c, 0x82, 0xd4, 0x8e, 0x95, 0x8a, 0x8f, 0xaa, 0x15, 0x8b, 0x5a, 0x2d, 0xa8, 0x0b, 0x84, 0x34, - 0xa5, 0x08, 0x21, 0xb1, 0x98, 0x38, 0xa7, 0xae, 0x71, 0x63, 0x5b, 0xe3, 0x99, 0x94, 0xee, 0xfa, - 0x08, 0x2c, 0x59, 0xf2, 0x1e, 0xbc, 0x40, 0x97, 0x5d, 0xb0, 0x60, 0x81, 0x2a, 0x12, 0x5e, 0x04, - 0xcd, 0x78, 0x68, 0xd2, 0xa6, 0x41, 0xa2, 0xdd, 0x79, 0xfe, 0x73, 0xfe, 0xbf, 0xf3, 0x31, 0x3e, - 0x68, 0x33, 0x5a, 0xcb, 0x48, 0x98, 0xb8, 0x91, 0xec, 0x01, 0x8f, 0x41, 0x40, 0xe6, 0xa6, 0x51, - 0xe0, 0xb2, 0x34, 0xcc, 0x5c, 0x26, 0xc5, 0x01, 0xc4, 0x22, 0xf4, 0x99, 0x08, 0x93, 0xd8, 0x1d, - 0x76, 0x7b, 0x20, 0x58, 0xd7, 0x0d, 0x20, 0x06, 0xce, 0x04, 0xf4, 0x49, 0xca, 0x13, 0x91, 0xe0, - 0x6e, 0x8e, 0x20, 0x13, 0x04, 0x49, 0xa3, 0x80, 0x28, 0x04, 0xb9, 0x8c, 0x20, 0x06, 0xd1, 0x58, - 0x09, 0x42, 0x71, 0x20, 0x7b, 0xc4, 0x4f, 0x06, 0x6e, 0x90, 0x04, 0x89, 0xab, 0x49, 0x3d, 0xb9, - 0xaf, 0x4f, 0xfa, 0xa0, 0xbf, 0xf2, 0x0c, 0x8d, 0xd5, 0xb9, 0x45, 0xba, 0x1c, 0xb2, 0x44, 0x72, - 0x1f, 0xae, 0x56, 0xd5, 0x78, 0x34, 0xdf, 0x23, 0xe3, 0x21, 0xf0, 0x2c, 0x4c, 0x62, 0xe8, 0xcf, - 0xd8, 0x96, 0xe7, 0xdb, 0x86, 0x33, 0xad, 0x37, 0x56, 0xae, 0x8f, 0xe6, 0x32, 0x16, 0xe1, 0x60, - 0xb6, 0xa6, 0x87, 0x7f, 0x0e, 0xcf, 0xfc, 0x03, 0x18, 0xb0, 0x19, 0x57, 0xf7, 0x7a, 0x97, 0x14, - 0xe1, 0xa1, 0x1b, 0xc6, 0x22, 0x13, 0xfc, 0xaa, 0xa5, 0xfd, 0x04, 0xa1, 0xed, 0x0f, 0x82, 0xb3, - 0xd7, 0xec, 0x50, 0x02, 0x6e, 0xa2, 0x72, 0x28, 0x60, 0x90, 0xd5, 0xed, 0x56, 0xb1, 0x53, 0xf5, - 0xaa, 0xe3, 0xf3, 0x66, 0x79, 0x47, 0x09, 0x34, 0xd7, 0xd7, 0x2b, 0x9f, 0x3e, 0x37, 0xad, 0x93, - 0xef, 0x2d, 0xab, 0xfd, 0xa5, 0x80, 0x6a, 0xaf, 0x92, 0x08, 0x62, 0x0a, 0xc3, 0x10, 0x8e, 0xf0, - 0x1b, 0x54, 0x19, 0x80, 0x60, 0x7d, 0x26, 0x58, 0xdd, 0x6e, 0xd9, 0x9d, 0xda, 0x6a, 0x87, 0xcc, - 0x7d, 0x6e, 0x32, 0xec, 0x92, 0x97, 0xbd, 0xf7, 0xe0, 0x8b, 0x17, 0x20, 0x98, 0x87, 0x4f, 0xcf, - 0x9b, 0xd6, 0xf8, 0xbc, 0x89, 0x26, 0x1a, 0xbd, 0xa0, 0xe1, 0x3e, 0x2a, 0x65, 0x29, 0xf8, 0xf5, - 0x82, 0xa6, 0x7a, 0xe4, 0xaf, 0x7f, 0x22, 0x32, 0x55, 0xe7, 0x6e, 0x0a, 0xbe, 0xf7, 0xaf, 0xc9, - 0x57, 0x52, 0x27, 0xaa, 0xe9, 0xf8, 0x10, 0x2d, 0x64, 0x82, 0x09, 0x99, 0xd5, 0x8b, 0x3a, 0xcf, - 0xd6, 0x2d, 0xf3, 0x68, 0x96, 0xf7, 0x9f, 0xc9, 0xb4, 0x90, 0x9f, 0xa9, 0xc9, 0xd1, 0x7e, 0x8c, - 0xfe, 0xbf, 0x52, 0x14, 0xbe, 0x8f, 0xca, 0x42, 0x49, 0x7a, 0x7a, 0x55, 0x6f, 0xd1, 0x38, 0xcb, - 0x79, 0x5c, 0x7e, 0xd7, 0xfe, 0x6a, 0xa3, 0x3b, 0x33, 0x59, 0xf0, 0x06, 0x5a, 0x9c, 0xaa, 0x08, - 0xfa, 0x1a, 0x51, 0xf1, 0xee, 0x1a, 0xc4, 0xe2, 0xe6, 0xf4, 0x25, 0xbd, 0x1c, 0x8b, 0xdf, 0xa1, - 0x92, 0xcc, 0x80, 0x9b, 0xf1, 0x6e, 0xdc, 0xa0, 0xed, 0xbd, 0x0c, 0xf8, 0x4e, 0xbc, 0x9f, 0x4c, - 0xe6, 0xaa, 0x14, 0xaa, 0xb1, 0xaa, 0x2d, 0xe0, 0x3c, 0xe1, 0x7a, 0xac, 0x53, 0x6d, 0x6d, 0x2b, - 0x91, 0xe6, 0x77, 0xed, 0x51, 0x01, 0x55, 0x7e, 0x53, 0xf0, 0x32, 0xaa, 0x28, 0x67, 0xcc, 0x06, - 0x60, 0x66, 0xb1, 0x64, 0x4c, 0x3a, 0x46, 0xe9, 0xf4, 0x22, 0x02, 0xdf, 0x43, 0x45, 0x19, 0xf6, - 0x75, 0xf5, 0x55, 0xaf, 0x66, 0x02, 0x8b, 0x7b, 0x3b, 0x5b, 0x54, 0xe9, 0xb8, 0x8d, 0x16, 0x02, - 0x9e, 0xc8, 0x54, 0x3d, 0xab, 0xfa, 0xa5, 0x91, 0x7a, 0x8c, 0xe7, 0x5a, 0xa1, 0xe6, 0x06, 0x47, - 0xa8, 0x0c, 0x6a, 0x07, 0xea, 0xa5, 0x56, 0xb1, 0x53, 0x5b, 0x7d, 0x76, 0x8b, 0x11, 0x10, 0xbd, - 0x4c, 0xdb, 0xb1, 0xe0, 0xc7, 0x53, 0xad, 0x2a, 0x8d, 0xe6, 0x39, 0x1a, 0x47, 0x66, 0xe1, 0x74, - 0x0c, 0x5e, 0x42, 0xc5, 0x08, 0x8e, 0xf3, 0x36, 0xa9, 0xfa, 0xc4, 0xbb, 0xa8, 0x3c, 0x54, 0xbb, - 0x68, 0xde, 0xe3, 0xe9, 0x0d, 0x8a, 0x99, 0x2c, 0x34, 0xcd, 0x59, 0xeb, 0x85, 0x35, 0xdb, 0x7b, - 0x70, 0x3a, 0x72, 0xac, 0xb3, 0x91, 0x63, 0x7d, 0x1b, 0x39, 0xd6, 0xc9, 0xd8, 0xb1, 0x4f, 0xc7, - 0x8e, 0x7d, 0x36, 0x76, 0xec, 0x1f, 0x63, 0xc7, 0xfe, 0xf8, 0xd3, 0xb1, 0xde, 0xfe, 0x63, 0x00, - 0xbf, 0x02, 0x00, 0x00, 0xff, 0xff, 0xce, 0xcd, 0xc2, 0x6f, 0xeb, 0x05, 0x00, 0x00, + // 644 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xa4, 0x53, 0x4f, 0x4f, 0x13, 0x41, + 0x14, 0xdf, 0xed, 0x1f, 0x6c, 0xa7, 0xa2, 0x38, 0x89, 0x49, 0xd3, 0xc4, 0x6d, 0x53, 0x2f, 0x35, + 0x81, 0xd9, 0x94, 0x18, 0x25, 0x10, 0x0f, 0x6c, 0x40, 0xc3, 0xc1, 0x98, 0x0c, 0x62, 0x8c, 0x89, + 0x87, 0xe9, 0xf6, 0xb1, 0xac, 0x4b, 0x77, 0x37, 0x33, 0xb3, 0x45, 0x6e, 0x7c, 0x04, 0x8f, 0x1e, + 0xfd, 0x1e, 0x7e, 0x01, 0x8e, 0x1c, 0x3c, 0x78, 0x30, 0xc4, 0xd6, 0x2f, 0x62, 0x66, 0x76, 0xa4, + 0x85, 0x02, 0x89, 0x70, 0xdb, 0xf9, 0xcd, 0xfb, 0xfd, 0x79, 0x6f, 0xf6, 0xa1, 0xf5, 0x68, 0x45, + 0x90, 0x30, 0x71, 0xa3, 0xac, 0x07, 0x3c, 0x06, 0x09, 0xc2, 0x4d, 0xa3, 0xc0, 0x65, 0x69, 0x28, + 0x5c, 0x96, 0xc9, 0x3d, 0x88, 0x65, 0xe8, 0x33, 0x19, 0x26, 0xb1, 0x3b, 0xec, 0xf6, 0x40, 0xb2, + 0xae, 0x1b, 0x40, 0x0c, 0x9c, 0x49, 0xe8, 0x93, 0x94, 0x27, 0x32, 0xc1, 0xdd, 0x5c, 0x82, 0x4c, + 0x24, 0x48, 0x1a, 0x05, 0x44, 0x49, 0x90, 0xf3, 0x12, 0xc4, 0x48, 0x34, 0x96, 0x82, 0x50, 0xee, + 0x65, 0x3d, 0xe2, 0x27, 0x03, 0x37, 0x48, 0x82, 0xc4, 0xd5, 0x4a, 0xbd, 0x6c, 0x57, 0x9f, 0xf4, + 0x41, 0x7f, 0xe5, 0x0e, 0x8d, 0xe5, 0x2b, 0x43, 0xba, 0x1c, 0x44, 0x92, 0x71, 0x1f, 0x2e, 0xa6, + 0x6a, 0x2c, 0x5e, 0xcd, 0x19, 0xce, 0xf4, 0x70, 0x8d, 0x83, 0x70, 0x07, 0x20, 0xd9, 0x65, 0x9c, + 0xa5, 0xcb, 0x39, 0x3c, 0x8b, 0x65, 0x38, 0x98, 0x0d, 0xf4, 0xf4, 0xfa, 0x72, 0xe1, 0xef, 0xc1, + 0x80, 0xcd, 0xb0, 0xba, 0x97, 0xb3, 0x32, 0x19, 0xee, 0xbb, 0x61, 0x2c, 0x85, 0xe4, 0x17, 0x29, + 0xed, 0xe7, 0x08, 0x6d, 0x7e, 0x96, 0x9c, 0xbd, 0x63, 0xfb, 0x19, 0xe0, 0x26, 0x2a, 0x87, 0x12, + 0x06, 0xa2, 0x6e, 0xb7, 0x8a, 0x9d, 0xaa, 0x57, 0x1d, 0x9f, 0x36, 0xcb, 0x5b, 0x0a, 0xa0, 0x39, + 0xbe, 0x5a, 0xf9, 0xfa, 0xad, 0x69, 0x1d, 0xfd, 0x6a, 0x59, 0xed, 0xef, 0x05, 0x54, 0x7b, 0x9b, + 0x44, 0x10, 0x53, 0x18, 0x86, 0x70, 0x80, 0xdf, 0xa3, 0x8a, 0xea, 0xbd, 0xcf, 0x24, 0xab, 0xdb, + 0x2d, 0xbb, 0x53, 0x5b, 0xee, 0x90, 0x2b, 0xdf, 0x9a, 0x0c, 0xbb, 0xe4, 0x4d, 0xef, 0x13, 0xf8, + 0xf2, 0x35, 0x48, 0xe6, 0xe1, 0xe3, 0xd3, 0xa6, 0x35, 0x3e, 0x6d, 0xa2, 0x09, 0x46, 0xcf, 0xd4, + 0x70, 0x1f, 0x95, 0x44, 0x0a, 0x7e, 0xbd, 0xa0, 0x55, 0x3d, 0xf2, 0xdf, 0x7f, 0x10, 0x99, 0xca, + 0xb9, 0x9d, 0x82, 0xef, 0xdd, 0x35, 0x7e, 0x25, 0x75, 0xa2, 0x5a, 0x1d, 0xef, 0xa3, 0x39, 0x21, + 0x99, 0xcc, 0x44, 0xbd, 0xa8, 0x7d, 0x36, 0x6e, 0xe9, 0xa3, 0xb5, 0xbc, 0x7b, 0xc6, 0x69, 0x2e, + 0x3f, 0x53, 0xe3, 0xd1, 0x7e, 0x86, 0xee, 0x5f, 0x08, 0x85, 0x1f, 0xa3, 0xb2, 0x54, 0x90, 0x9e, + 0x5e, 0xd5, 0x9b, 0x37, 0xcc, 0x72, 0x5e, 0x97, 0xdf, 0xb5, 0x7f, 0xd8, 0xe8, 0xc1, 0x8c, 0x0b, + 0x5e, 0x43, 0xf3, 0x53, 0x89, 0xa0, 0xaf, 0x25, 0x2a, 0xde, 0x43, 0x23, 0x31, 0xbf, 0x3e, 0x7d, + 0x49, 0xcf, 0xd7, 0xe2, 0x8f, 0xa8, 0x94, 0x09, 0xe0, 0x66, 0xbc, 0x6b, 0x37, 0x68, 0x7b, 0x47, + 0x00, 0xdf, 0x8a, 0x77, 0x93, 0xc9, 0x5c, 0x15, 0x42, 0xb5, 0xac, 0x6a, 0x0b, 0x38, 0x4f, 0xb8, + 0x1e, 0xeb, 0x54, 0x5b, 0x9b, 0x0a, 0xa4, 0xf9, 0x5d, 0x7b, 0x54, 0x40, 0x95, 0x7f, 0x2a, 0x78, + 0x11, 0x55, 0x14, 0x33, 0x66, 0x03, 0x30, 0xb3, 0x58, 0x30, 0x24, 0x5d, 0xa3, 0x70, 0x7a, 0x56, + 0x81, 0x1f, 0xa1, 0x62, 0x16, 0xf6, 0x75, 0xfa, 0xaa, 0x57, 0x33, 0x85, 0xc5, 0x9d, 0xad, 0x0d, + 0xaa, 0x70, 0xdc, 0x46, 0x73, 0x01, 0x4f, 0xb2, 0x54, 0x3d, 0xab, 0xfa, 0xa5, 0x91, 0x7a, 0x8c, + 0x57, 0x1a, 0xa1, 0xe6, 0x06, 0x47, 0xa8, 0x0c, 0x6a, 0x07, 0xea, 0xa5, 0x56, 0xb1, 0x53, 0x5b, + 0x7e, 0x79, 0x8b, 0x11, 0x10, 0xbd, 0x4c, 0x9b, 0xb1, 0xe4, 0x87, 0x53, 0xad, 0x2a, 0x8c, 0xe6, + 0x1e, 0x8d, 0x03, 0xb3, 0x70, 0xba, 0x06, 0x2f, 0xa0, 0x62, 0x04, 0x87, 0x79, 0x9b, 0x54, 0x7d, + 0xe2, 0x6d, 0x54, 0x1e, 0xaa, 0x5d, 0x34, 0xef, 0xf1, 0xe2, 0x06, 0x61, 0x26, 0x0b, 0x4d, 0x73, + 0xad, 0xd5, 0xc2, 0x8a, 0xed, 0x3d, 0x39, 0x1e, 0x39, 0xd6, 0xc9, 0xc8, 0xb1, 0x7e, 0x8e, 0x1c, + 0xeb, 0x68, 0xec, 0xd8, 0xc7, 0x63, 0xc7, 0x3e, 0x19, 0x3b, 0xf6, 0xef, 0xb1, 0x63, 0x7f, 0xf9, + 0xe3, 0x58, 0x1f, 0xee, 0x18, 0x81, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0xb6, 0x1c, 0x7a, 0x75, + 0xe8, 0x05, 0x00, 0x00, } diff --git a/pkg/apis/authentication/v1beta1/generated.proto b/pkg/apis/authentication/v1beta1/generated.proto index 2fd8b0e2089..9aa00ff1067 100644 --- a/pkg/apis/authentication/v1beta1/generated.proto +++ b/pkg/apis/authentication/v1beta1/generated.proto @@ -22,8 +22,8 @@ syntax = 'proto2'; package k8s.io.kubernetes.pkg.apis.authentication.v1beta1; import "k8s.io/kubernetes/pkg/api/resource/generated.proto"; -import "k8s.io/kubernetes/pkg/api/unversioned/generated.proto"; import "k8s.io/kubernetes/pkg/api/v1/generated.proto"; +import "k8s.io/kubernetes/pkg/apis/meta/v1/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/schema/generated.proto"; import "k8s.io/kubernetes/pkg/util/intstr/generated.proto"; diff --git a/pkg/apis/authentication/v1beta1/register.go b/pkg/apis/authentication/v1beta1/register.go index 08fcb917c76..b61149dfea8 100644 --- a/pkg/apis/authentication/v1beta1/register.go +++ b/pkg/apis/authentication/v1beta1/register.go @@ -17,8 +17,8 @@ limitations under the License. package v1beta1 import ( - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" ) diff --git a/pkg/apis/authentication/v1beta1/types.generated.go b/pkg/apis/authentication/v1beta1/types.generated.go index 1b4b4f1c87e..c381d58c8d0 100644 --- a/pkg/apis/authentication/v1beta1/types.generated.go +++ b/pkg/apis/authentication/v1beta1/types.generated.go @@ -25,8 +25,8 @@ import ( "errors" "fmt" codec1978 "github.com/ugorji/go/codec" - pkg1_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" pkg2_v1 "k8s.io/kubernetes/pkg/api/v1" + pkg1_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" pkg3_types "k8s.io/kubernetes/pkg/types" "reflect" "runtime" @@ -63,8 +63,8 @@ func init() { panic(err) } if false { // reference the types, but skip this branch at build/run time - var v0 pkg1_unversioned.TypeMeta - var v1 pkg2_v1.ObjectMeta + var v0 pkg2_v1.ObjectMeta + var v1 pkg1_v1.TypeMeta var v2 pkg3_types.UID var v3 time.Time _, _, _, _ = v0, v1, v2, v3 diff --git a/pkg/apis/authentication/v1beta1/types.go b/pkg/apis/authentication/v1beta1/types.go index 7220e24ec42..4d41942271c 100644 --- a/pkg/apis/authentication/v1beta1/types.go +++ b/pkg/apis/authentication/v1beta1/types.go @@ -19,8 +19,8 @@ package v1beta1 import ( "fmt" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" ) // +genclient=true diff --git a/pkg/apis/authorization/types.generated.go b/pkg/apis/authorization/types.generated.go index fe2735d2988..5dbf1c9bfc8 100644 --- a/pkg/apis/authorization/types.generated.go +++ b/pkg/apis/authorization/types.generated.go @@ -26,7 +26,7 @@ import ( "fmt" codec1978 "github.com/ugorji/go/codec" pkg2_api "k8s.io/kubernetes/pkg/api" - pkg1_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" + pkg1_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" pkg3_types "k8s.io/kubernetes/pkg/types" "reflect" "runtime" @@ -64,7 +64,7 @@ func init() { } if false { // reference the types, but skip this branch at build/run time var v0 pkg2_api.ObjectMeta - var v1 pkg1_unversioned.TypeMeta + var v1 pkg1_v1.TypeMeta var v2 pkg3_types.UID var v3 time.Time _, _, _, _ = v0, v1, v2, v3 @@ -784,7 +784,7 @@ func (x *SubjectAccessReview) codecDecodeSelfFromMap(l int, d *codec1978.Decoder } case "creationTimestamp": if r.TryDecodeAsNil() { - x.CreationTimestamp = pkg1_unversioned.Time{} + x.CreationTimestamp = pkg1_v1.Time{} } else { yyv76 := &x.CreationTimestamp yym77 := z.DecBinary() @@ -801,7 +801,7 @@ func (x *SubjectAccessReview) codecDecodeSelfFromMap(l int, d *codec1978.Decoder } case "deletionTimestamp": if x.ObjectMeta.DeletionTimestamp == nil { - x.ObjectMeta.DeletionTimestamp = new(pkg1_unversioned.Time) + x.ObjectMeta.DeletionTimestamp = new(pkg1_v1.Time) } if r.TryDecodeAsNil() { if x.DeletionTimestamp != nil { @@ -809,7 +809,7 @@ func (x *SubjectAccessReview) codecDecodeSelfFromMap(l int, d *codec1978.Decoder } } else { if x.DeletionTimestamp == nil { - x.DeletionTimestamp = new(pkg1_unversioned.Time) + x.DeletionTimestamp = new(pkg1_v1.Time) } yym79 := z.DecBinary() _ = yym79 @@ -1080,7 +1080,7 @@ func (x *SubjectAccessReview) codecDecodeSelfFromArray(l int, d *codec1978.Decod } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.CreationTimestamp = pkg1_unversioned.Time{} + x.CreationTimestamp = pkg1_v1.Time{} } else { yyv103 := &x.CreationTimestamp yym104 := z.DecBinary() @@ -1096,7 +1096,7 @@ func (x *SubjectAccessReview) codecDecodeSelfFromArray(l int, d *codec1978.Decod } } if x.ObjectMeta.DeletionTimestamp == nil { - x.ObjectMeta.DeletionTimestamp = new(pkg1_unversioned.Time) + x.ObjectMeta.DeletionTimestamp = new(pkg1_v1.Time) } yyj93++ if yyhl93 { @@ -1115,7 +1115,7 @@ func (x *SubjectAccessReview) codecDecodeSelfFromArray(l int, d *codec1978.Decod } } else { if x.DeletionTimestamp == nil { - x.DeletionTimestamp = new(pkg1_unversioned.Time) + x.DeletionTimestamp = new(pkg1_v1.Time) } yym106 := z.DecBinary() _ = yym106 @@ -2025,7 +2025,7 @@ func (x *SelfSubjectAccessReview) codecDecodeSelfFromMap(l int, d *codec1978.Dec } case "creationTimestamp": if r.TryDecodeAsNil() { - x.CreationTimestamp = pkg1_unversioned.Time{} + x.CreationTimestamp = pkg1_v1.Time{} } else { yyv195 := &x.CreationTimestamp yym196 := z.DecBinary() @@ -2042,7 +2042,7 @@ func (x *SelfSubjectAccessReview) codecDecodeSelfFromMap(l int, d *codec1978.Dec } case "deletionTimestamp": if x.ObjectMeta.DeletionTimestamp == nil { - x.ObjectMeta.DeletionTimestamp = new(pkg1_unversioned.Time) + x.ObjectMeta.DeletionTimestamp = new(pkg1_v1.Time) } if r.TryDecodeAsNil() { if x.DeletionTimestamp != nil { @@ -2050,7 +2050,7 @@ func (x *SelfSubjectAccessReview) codecDecodeSelfFromMap(l int, d *codec1978.Dec } } else { if x.DeletionTimestamp == nil { - x.DeletionTimestamp = new(pkg1_unversioned.Time) + x.DeletionTimestamp = new(pkg1_v1.Time) } yym198 := z.DecBinary() _ = yym198 @@ -2321,7 +2321,7 @@ func (x *SelfSubjectAccessReview) codecDecodeSelfFromArray(l int, d *codec1978.D } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.CreationTimestamp = pkg1_unversioned.Time{} + x.CreationTimestamp = pkg1_v1.Time{} } else { yyv222 := &x.CreationTimestamp yym223 := z.DecBinary() @@ -2337,7 +2337,7 @@ func (x *SelfSubjectAccessReview) codecDecodeSelfFromArray(l int, d *codec1978.D } } if x.ObjectMeta.DeletionTimestamp == nil { - x.ObjectMeta.DeletionTimestamp = new(pkg1_unversioned.Time) + x.ObjectMeta.DeletionTimestamp = new(pkg1_v1.Time) } yyj212++ if yyhl212 { @@ -2356,7 +2356,7 @@ func (x *SelfSubjectAccessReview) codecDecodeSelfFromArray(l int, d *codec1978.D } } else { if x.DeletionTimestamp == nil { - x.DeletionTimestamp = new(pkg1_unversioned.Time) + x.DeletionTimestamp = new(pkg1_v1.Time) } yym225 := z.DecBinary() _ = yym225 @@ -3266,7 +3266,7 @@ func (x *LocalSubjectAccessReview) codecDecodeSelfFromMap(l int, d *codec1978.De } case "creationTimestamp": if r.TryDecodeAsNil() { - x.CreationTimestamp = pkg1_unversioned.Time{} + x.CreationTimestamp = pkg1_v1.Time{} } else { yyv314 := &x.CreationTimestamp yym315 := z.DecBinary() @@ -3283,7 +3283,7 @@ func (x *LocalSubjectAccessReview) codecDecodeSelfFromMap(l int, d *codec1978.De } case "deletionTimestamp": if x.ObjectMeta.DeletionTimestamp == nil { - x.ObjectMeta.DeletionTimestamp = new(pkg1_unversioned.Time) + x.ObjectMeta.DeletionTimestamp = new(pkg1_v1.Time) } if r.TryDecodeAsNil() { if x.DeletionTimestamp != nil { @@ -3291,7 +3291,7 @@ func (x *LocalSubjectAccessReview) codecDecodeSelfFromMap(l int, d *codec1978.De } } else { if x.DeletionTimestamp == nil { - x.DeletionTimestamp = new(pkg1_unversioned.Time) + x.DeletionTimestamp = new(pkg1_v1.Time) } yym317 := z.DecBinary() _ = yym317 @@ -3562,7 +3562,7 @@ func (x *LocalSubjectAccessReview) codecDecodeSelfFromArray(l int, d *codec1978. } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.CreationTimestamp = pkg1_unversioned.Time{} + x.CreationTimestamp = pkg1_v1.Time{} } else { yyv341 := &x.CreationTimestamp yym342 := z.DecBinary() @@ -3578,7 +3578,7 @@ func (x *LocalSubjectAccessReview) codecDecodeSelfFromArray(l int, d *codec1978. } } if x.ObjectMeta.DeletionTimestamp == nil { - x.ObjectMeta.DeletionTimestamp = new(pkg1_unversioned.Time) + x.ObjectMeta.DeletionTimestamp = new(pkg1_v1.Time) } yyj331++ if yyhl331 { @@ -3597,7 +3597,7 @@ func (x *LocalSubjectAccessReview) codecDecodeSelfFromArray(l int, d *codec1978. } } else { if x.DeletionTimestamp == nil { - x.DeletionTimestamp = new(pkg1_unversioned.Time) + x.DeletionTimestamp = new(pkg1_v1.Time) } yym344 := z.DecBinary() _ = yym344 diff --git a/pkg/apis/authorization/v1beta1/generated.pb.go b/pkg/apis/authorization/v1beta1/generated.pb.go index fa155f9cb84..a7c030140b3 100644 --- a/pkg/apis/authorization/v1beta1/generated.pb.go +++ b/pkg/apis/authorization/v1beta1/generated.pb.go @@ -2283,61 +2283,60 @@ var ( ) var fileDescriptorGenerated = []byte{ - // 884 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xec, 0x56, 0x41, 0x8f, 0xdb, 0x44, - 0x14, 0x8e, 0x93, 0x78, 0x37, 0x99, 0x05, 0xb6, 0x4c, 0x55, 0xd6, 0x0d, 0x92, 0x13, 0x05, 0x09, - 0x6d, 0xa5, 0xd6, 0x66, 0x57, 0x54, 0x54, 0x15, 0x07, 0xd6, 0x62, 0x55, 0x55, 0xd0, 0x82, 0x66, - 0x61, 0x85, 0xe0, 0x34, 0xf6, 0xbe, 0x26, 0x26, 0x89, 0xc7, 0x9a, 0x19, 0xbb, 0x2c, 0xa7, 0xfe, - 0x00, 0x0e, 0x1c, 0x7b, 0xe4, 0x2f, 0xf0, 0x07, 0xb8, 0xb2, 0xc7, 0x72, 0x41, 0x20, 0xa1, 0x88, - 0x35, 0xff, 0x82, 0x13, 0xf2, 0x78, 0x12, 0x37, 0x1b, 0xa7, 0x68, 0x61, 0x85, 0x38, 0xec, 0xcd, - 0xf3, 0xde, 0xf7, 0xde, 0xfb, 0x66, 0xe6, 0x1b, 0xbf, 0x87, 0xde, 0x1b, 0xdd, 0x11, 0x4e, 0xc8, - 0xdc, 0x51, 0xe2, 0x03, 0x8f, 0x40, 0x82, 0x70, 0xe3, 0xd1, 0xc0, 0xa5, 0x71, 0x28, 0x5c, 0x9a, - 0xc8, 0x21, 0xe3, 0xe1, 0xd7, 0x54, 0x86, 0x2c, 0x72, 0xd3, 0x1d, 0x1f, 0x24, 0xdd, 0x71, 0x07, - 0x10, 0x01, 0xa7, 0x12, 0x8e, 0x9c, 0x98, 0x33, 0xc9, 0xf0, 0x5b, 0x45, 0x06, 0xa7, 0xcc, 0xe0, - 0xc4, 0xa3, 0x81, 0x93, 0x67, 0x70, 0x16, 0x32, 0x38, 0x3a, 0x43, 0xe7, 0xd6, 0x20, 0x94, 0xc3, - 0xc4, 0x77, 0x02, 0x36, 0x71, 0x07, 0x6c, 0xc0, 0x5c, 0x95, 0xc8, 0x4f, 0x1e, 0xa9, 0x95, 0x5a, - 0xa8, 0xaf, 0xa2, 0x40, 0x67, 0x77, 0x25, 0x45, 0x97, 0x83, 0x60, 0x09, 0x0f, 0xe0, 0x2c, 0xa9, - 0xce, 0xed, 0xd5, 0x31, 0x49, 0x94, 0x02, 0x17, 0x21, 0x8b, 0xe0, 0x68, 0x29, 0xec, 0xe6, 0xea, - 0xb0, 0x74, 0x69, 0xe7, 0x9d, 0x5b, 0xd5, 0x68, 0x9e, 0x44, 0x32, 0x9c, 0x2c, 0x73, 0x7a, 0xfb, - 0xc5, 0x70, 0x11, 0x0c, 0x61, 0x42, 0x97, 0xa2, 0x76, 0xaa, 0xa3, 0x12, 0x19, 0x8e, 0xdd, 0x30, - 0x92, 0x42, 0xf2, 0xb3, 0x21, 0xfd, 0x77, 0x10, 0xda, 0xff, 0x4a, 0x72, 0x7a, 0x48, 0xc7, 0x09, - 0xe0, 0x2e, 0x32, 0x43, 0x09, 0x13, 0x61, 0x19, 0xbd, 0xc6, 0x76, 0xdb, 0x6b, 0x67, 0xd3, 0xae, - 0x79, 0x3f, 0x37, 0x90, 0xc2, 0x7e, 0xb7, 0xf5, 0xf4, 0xbb, 0x6e, 0xed, 0xc9, 0x6f, 0xbd, 0x5a, - 0xff, 0xe7, 0x3a, 0xb2, 0x3e, 0x64, 0x01, 0x1d, 0x1f, 0x24, 0xfe, 0x97, 0x10, 0xc8, 0xbd, 0x20, - 0x00, 0x21, 0x08, 0xa4, 0x21, 0x3c, 0xc6, 0x9f, 0xa1, 0xd6, 0x04, 0x24, 0x3d, 0xa2, 0x92, 0x5a, - 0x46, 0xcf, 0xd8, 0xde, 0xd8, 0xdd, 0x76, 0x56, 0x5e, 0xbd, 0x93, 0xee, 0x38, 0x1f, 0xa9, 0x1c, - 0x0f, 0x40, 0x52, 0x0f, 0x9f, 0x4c, 0xbb, 0xb5, 0x6c, 0xda, 0x45, 0xa5, 0x8d, 0xcc, 0xb3, 0xe1, - 0x11, 0x6a, 0x8a, 0x18, 0x02, 0xab, 0xae, 0xb2, 0xde, 0x77, 0xce, 0x2b, 0x28, 0xa7, 0x82, 0xee, - 0x41, 0x0c, 0x81, 0xf7, 0x92, 0x2e, 0xdb, 0xcc, 0x57, 0x44, 0x15, 0xc1, 0x02, 0xad, 0x09, 0x49, - 0x65, 0x22, 0xac, 0x86, 0x2a, 0xf7, 0xc1, 0xc5, 0x94, 0x53, 0x29, 0xbd, 0x57, 0x74, 0xc1, 0xb5, - 0x62, 0x4d, 0x74, 0xa9, 0xfe, 0x17, 0xe8, 0xda, 0x43, 0x16, 0x11, 0xad, 0xd6, 0x3d, 0x29, 0x79, - 0xe8, 0x27, 0x12, 0x04, 0xee, 0xa1, 0x66, 0x4c, 0xe5, 0x50, 0x1d, 0x68, 0xbb, 0xe4, 0xfb, 0x31, - 0x95, 0x43, 0xa2, 0x3c, 0x39, 0x22, 0x05, 0xee, 0xab, 0xc3, 0x79, 0x0e, 0x71, 0x08, 0xdc, 0x27, - 0xca, 0xd3, 0xff, 0xa1, 0x8e, 0x70, 0x45, 0x6a, 0x17, 0xb5, 0x23, 0x3a, 0x01, 0x11, 0xd3, 0x00, - 0x74, 0xfe, 0x57, 0x75, 0x74, 0xfb, 0xe1, 0xcc, 0x41, 0x4a, 0xcc, 0xdf, 0x57, 0xc2, 0x6f, 0x20, - 0x73, 0xc0, 0x59, 0x12, 0xab, 0xa3, 0x6b, 0x7b, 0x2f, 0x6b, 0x88, 0x79, 0x2f, 0x37, 0x92, 0xc2, - 0x87, 0x6f, 0xa0, 0x75, 0xfd, 0xc0, 0xac, 0xa6, 0x82, 0x6d, 0x6a, 0xd8, 0xfa, 0x61, 0x61, 0x26, - 0x33, 0x3f, 0xbe, 0x89, 0x5a, 0xb3, 0x17, 0x6c, 0x99, 0x0a, 0x7b, 0x45, 0x63, 0x5b, 0xb3, 0x0d, - 0x91, 0x39, 0x02, 0xdf, 0x46, 0x1b, 0x22, 0xf1, 0xe7, 0x01, 0x6b, 0x2a, 0xe0, 0xaa, 0x0e, 0xd8, - 0x38, 0x28, 0x5d, 0xe4, 0x79, 0x5c, 0xbe, 0xad, 0x7c, 0x8f, 0xd6, 0xfa, 0xe2, 0xb6, 0xf2, 0x23, - 0x20, 0xca, 0xd3, 0xff, 0xb5, 0x8e, 0xb6, 0x0e, 0x60, 0xfc, 0xe8, 0xbf, 0x55, 0x3d, 0x5b, 0x50, - 0xfd, 0x83, 0x7f, 0x20, 0xc3, 0x6a, 0xca, 0xff, 0x2f, 0xe5, 0xff, 0x58, 0x47, 0xaf, 0xbf, 0x80, - 0x28, 0xfe, 0xc6, 0x40, 0x98, 0x2f, 0x89, 0x57, 0x1f, 0xf5, 0xfb, 0xe7, 0x67, 0xb8, 0xfc, 0x10, - 0xbc, 0xd7, 0xb2, 0x69, 0xb7, 0xe2, 0x81, 0x90, 0x8a, 0xba, 0xf8, 0xa9, 0x81, 0xae, 0x45, 0x55, - 0x2f, 0x55, 0x5f, 0xd3, 0xbd, 0xf3, 0x33, 0xaa, 0x7c, 0xf8, 0xde, 0xf5, 0x6c, 0xda, 0xad, 0xfe, - 0x27, 0x90, 0x6a, 0x02, 0xfd, 0x9f, 0xea, 0xe8, 0xea, 0xe5, 0x7f, 0xf9, 0x62, 0xd5, 0xf9, 0x67, - 0x13, 0x6d, 0x5d, 0x2a, 0xf3, 0x5f, 0x2a, 0x73, 0xde, 0x38, 0x1a, 0x8b, 0x7f, 0xd8, 0x4f, 0x05, - 0x70, 0xdd, 0x38, 0x7a, 0xb3, 0xc6, 0xd1, 0x54, 0x33, 0x08, 0xca, 0xaf, 0x42, 0x35, 0x0d, 0x31, - 0xeb, 0x1a, 0xc7, 0xc8, 0x84, 0x7c, 0x66, 0xb1, 0xcc, 0x5e, 0x63, 0x7b, 0x63, 0xf7, 0x93, 0x0b, - 0x13, 0x9b, 0xa3, 0x46, 0xa1, 0xfd, 0x48, 0xf2, 0xe3, 0xb2, 0x61, 0x29, 0x1b, 0x29, 0x2a, 0x76, - 0x52, 0x3d, 0x2e, 0x29, 0x0c, 0xbe, 0x82, 0x1a, 0x23, 0x38, 0x2e, 0x1a, 0x26, 0xc9, 0x3f, 0x31, - 0x41, 0x66, 0x9a, 0x4f, 0x52, 0xfa, 0xa0, 0xdf, 0x3d, 0x3f, 0xb5, 0x72, 0x1a, 0x23, 0x45, 0xaa, - 0xbb, 0xf5, 0x3b, 0x46, 0xff, 0x7b, 0x03, 0x5d, 0x5f, 0x29, 0xd9, 0xbc, 0x8d, 0xd2, 0xf1, 0x98, - 0x3d, 0x86, 0x23, 0xc5, 0xa5, 0x55, 0xb6, 0xd1, 0xbd, 0xc2, 0x4c, 0x66, 0x7e, 0xfc, 0x26, 0x5a, - 0xe3, 0x40, 0x05, 0x8b, 0x74, 0xeb, 0x9e, 0xab, 0x9d, 0x28, 0x2b, 0xd1, 0x5e, 0xbc, 0x87, 0x36, - 0x21, 0x2f, 0xaf, 0xc8, 0xed, 0x73, 0xce, 0xb8, 0xbe, 0xb2, 0x2d, 0x1d, 0xb0, 0xb9, 0xbf, 0xe8, - 0x26, 0x67, 0xf1, 0xde, 0x8d, 0x93, 0x53, 0xbb, 0xf6, 0xec, 0xd4, 0xae, 0xfd, 0x72, 0x6a, 0xd7, - 0x9e, 0x64, 0xb6, 0x71, 0x92, 0xd9, 0xc6, 0xb3, 0xcc, 0x36, 0x7e, 0xcf, 0x6c, 0xe3, 0xdb, 0x3f, - 0xec, 0xda, 0xe7, 0xeb, 0x7a, 0xd3, 0x7f, 0x05, 0x00, 0x00, 0xff, 0xff, 0x06, 0x55, 0x79, 0xe0, - 0x5a, 0x0c, 0x00, 0x00, + // 880 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xec, 0x56, 0x4f, 0x8f, 0xdb, 0x44, + 0x14, 0x8f, 0x93, 0x78, 0x37, 0x99, 0x05, 0xb6, 0x4c, 0x55, 0xd6, 0x5d, 0x24, 0x27, 0x0a, 0x12, + 0xda, 0x4a, 0xad, 0xcd, 0xae, 0x40, 0x54, 0x15, 0x07, 0xd6, 0x62, 0x55, 0x55, 0xd0, 0x82, 0x66, + 0x61, 0x85, 0xe0, 0x34, 0xf6, 0xbe, 0x26, 0x26, 0x89, 0xc7, 0x9a, 0x19, 0xbb, 0x2c, 0xa7, 0x7e, + 0x00, 0x0e, 0x1c, 0x7b, 0xe4, 0x2b, 0xf0, 0x05, 0xb8, 0xb2, 0xc7, 0x72, 0x41, 0x20, 0xa1, 0x88, + 0x35, 0xdf, 0x82, 0x13, 0xf2, 0x78, 0x12, 0x37, 0x1b, 0x67, 0x51, 0x60, 0x85, 0x7a, 0xe8, 0xcd, + 0xf3, 0xfe, 0xfc, 0xde, 0x6f, 0xde, 0xfc, 0xc6, 0x6f, 0xd0, 0xfb, 0xc3, 0xdb, 0xc2, 0x09, 0x99, + 0x3b, 0x4c, 0x7c, 0xe0, 0x11, 0x48, 0x10, 0x6e, 0x3c, 0xec, 0xbb, 0x34, 0x0e, 0x85, 0x4b, 0x13, + 0x39, 0x60, 0x3c, 0xfc, 0x86, 0xca, 0x90, 0x45, 0x6e, 0xba, 0xeb, 0x83, 0xa4, 0xbb, 0x6e, 0x1f, + 0x22, 0xe0, 0x54, 0xc2, 0xb1, 0x13, 0x73, 0x26, 0x19, 0x7e, 0xab, 0x40, 0x70, 0x4a, 0x04, 0x27, + 0x1e, 0xf6, 0x9d, 0x1c, 0xc1, 0x99, 0x43, 0x70, 0x34, 0xc2, 0xf6, 0xad, 0x7e, 0x28, 0x07, 0x89, + 0xef, 0x04, 0x6c, 0xec, 0xf6, 0x59, 0x9f, 0xb9, 0x0a, 0xc8, 0x4f, 0x1e, 0xaa, 0x95, 0x5a, 0xa8, + 0xaf, 0xa2, 0xc0, 0xf6, 0xde, 0x52, 0x8a, 0x2e, 0x07, 0xc1, 0x12, 0x1e, 0xc0, 0x79, 0x52, 0xdb, + 0x37, 0x97, 0xe7, 0xa4, 0x0b, 0x5b, 0xb8, 0xa0, 0x82, 0x70, 0xc7, 0x20, 0x69, 0x55, 0xce, 0xad, + 0xea, 0x1c, 0x9e, 0x44, 0x32, 0x1c, 0x2f, 0x12, 0x7a, 0xfb, 0xe2, 0x70, 0x11, 0x0c, 0x60, 0x4c, + 0x17, 0xb2, 0x76, 0xab, 0xb3, 0x12, 0x19, 0x8e, 0xdc, 0x30, 0x92, 0x42, 0xf2, 0xf3, 0x29, 0xbd, + 0x77, 0x11, 0x3a, 0xf8, 0x5a, 0x72, 0x7a, 0x44, 0x47, 0x09, 0xe0, 0x0e, 0x32, 0x43, 0x09, 0x63, + 0x61, 0x19, 0xdd, 0xc6, 0x4e, 0xdb, 0x6b, 0x67, 0x93, 0x8e, 0x79, 0x2f, 0x37, 0x90, 0xc2, 0x7e, + 0xa7, 0xf5, 0xe4, 0xfb, 0x4e, 0xed, 0xf1, 0xef, 0xdd, 0x5a, 0xef, 0x97, 0x3a, 0xb2, 0x3e, 0x62, + 0x01, 0x1d, 0x1d, 0x26, 0xfe, 0x57, 0x10, 0xc8, 0xfd, 0x20, 0x00, 0x21, 0x08, 0xa4, 0x21, 0x3c, + 0xc2, 0x9f, 0xa3, 0x56, 0xde, 0x88, 0x63, 0x2a, 0xa9, 0x65, 0x74, 0x8d, 0x9d, 0x8d, 0xbd, 0x1d, + 0x67, 0xe9, 0xb9, 0x3b, 0xe9, 0xae, 0xf3, 0xb1, 0xc2, 0xb8, 0x0f, 0x92, 0x7a, 0xf8, 0x74, 0xd2, + 0xa9, 0x65, 0x93, 0x0e, 0x2a, 0x6d, 0x64, 0x86, 0x86, 0x87, 0xa8, 0x29, 0x62, 0x08, 0xac, 0xba, + 0x42, 0xbd, 0xe7, 0xac, 0xaa, 0x26, 0xa7, 0x82, 0xee, 0x61, 0x0c, 0x81, 0xf7, 0x92, 0x2e, 0xdb, + 0xcc, 0x57, 0x44, 0x15, 0xc1, 0x02, 0xad, 0x09, 0x49, 0x65, 0x22, 0xac, 0x86, 0x2a, 0xf7, 0xe1, + 0xe5, 0x94, 0x53, 0x90, 0xde, 0x2b, 0xba, 0xe0, 0x5a, 0xb1, 0x26, 0xba, 0x54, 0xef, 0x4b, 0x74, + 0xed, 0x01, 0x8b, 0x88, 0x96, 0xea, 0xbe, 0x94, 0x3c, 0xf4, 0x13, 0x09, 0x02, 0x77, 0x51, 0x33, + 0xa6, 0x72, 0xa0, 0x1a, 0xda, 0x2e, 0xf9, 0x7e, 0x42, 0xe5, 0x80, 0x28, 0x4f, 0x1e, 0x91, 0x02, + 0xf7, 0x55, 0x73, 0x9e, 0x89, 0x38, 0x02, 0xee, 0x13, 0xe5, 0xe9, 0xfd, 0x58, 0x47, 0xb8, 0x02, + 0xda, 0x45, 0xed, 0x88, 0x8e, 0x41, 0xc4, 0x34, 0x00, 0x8d, 0xff, 0xaa, 0xce, 0x6e, 0x3f, 0x98, + 0x3a, 0x48, 0x19, 0xf3, 0xcf, 0x95, 0xf0, 0x1b, 0xc8, 0xec, 0x73, 0x96, 0xc4, 0xaa, 0x75, 0x6d, + 0xef, 0x65, 0x1d, 0x62, 0xde, 0xcd, 0x8d, 0xa4, 0xf0, 0xe1, 0x1b, 0x68, 0x3d, 0x05, 0x2e, 0x42, + 0x16, 0x59, 0x4d, 0x15, 0xb6, 0xa9, 0xc3, 0xd6, 0x8f, 0x0a, 0x33, 0x99, 0xfa, 0xf1, 0x4d, 0xd4, + 0x9a, 0x5e, 0x5f, 0xcb, 0x54, 0xb1, 0x57, 0x74, 0x6c, 0x6b, 0xba, 0x21, 0x32, 0x8b, 0xc0, 0xef, + 0xa0, 0x0d, 0x91, 0xf8, 0xb3, 0x84, 0x35, 0x95, 0x70, 0x55, 0x27, 0x6c, 0x1c, 0x96, 0x2e, 0xf2, + 0x6c, 0x5c, 0xbe, 0xad, 0x7c, 0x8f, 0xd6, 0xfa, 0xfc, 0xb6, 0xf2, 0x16, 0x10, 0xe5, 0xe9, 0xfd, + 0x56, 0x47, 0x5b, 0x87, 0x30, 0x7a, 0xf8, 0xff, 0xaa, 0x9e, 0xcd, 0xa9, 0xfe, 0xfe, 0xbf, 0x90, + 0x61, 0x35, 0xe5, 0xe7, 0x4b, 0xf9, 0x3f, 0xd5, 0xd1, 0xeb, 0x17, 0x10, 0xc5, 0xdf, 0x1a, 0x08, + 0xf3, 0x05, 0xf1, 0xea, 0x56, 0x7f, 0xb0, 0x3a, 0xc3, 0xc5, 0x8b, 0xe0, 0xbd, 0x96, 0x4d, 0x3a, + 0x15, 0x17, 0x84, 0x54, 0xd4, 0xc5, 0x4f, 0x0c, 0x74, 0x2d, 0xaa, 0xba, 0xa9, 0xfa, 0x98, 0xee, + 0xae, 0xce, 0xa8, 0xf2, 0xe2, 0x7b, 0xd7, 0xb3, 0x49, 0xa7, 0xfa, 0x9f, 0x40, 0xaa, 0x09, 0xf4, + 0x7e, 0xae, 0xa3, 0xab, 0x2f, 0xfe, 0xcb, 0x97, 0xab, 0xce, 0xbf, 0x9a, 0x68, 0xeb, 0x85, 0x32, + 0xff, 0xa3, 0x32, 0x67, 0x83, 0xa3, 0x31, 0xff, 0x87, 0xfd, 0x4c, 0x00, 0xd7, 0x83, 0xa3, 0x3b, + 0x1d, 0x1c, 0x4d, 0xf5, 0x06, 0x41, 0xf9, 0x51, 0xa8, 0xa1, 0x21, 0xa6, 0x53, 0xe3, 0x04, 0x99, + 0x90, 0xbf, 0x59, 0x2c, 0xb3, 0xdb, 0xd8, 0xd9, 0xd8, 0xfb, 0xf4, 0xd2, 0xc4, 0xe6, 0xa8, 0xa7, + 0xd0, 0x41, 0x24, 0xf9, 0x49, 0x39, 0xb0, 0x94, 0x8d, 0x14, 0x15, 0xb7, 0x53, 0xfd, 0x5c, 0x52, + 0x31, 0xf8, 0x0a, 0x6a, 0x0c, 0xe1, 0xa4, 0x18, 0x98, 0x24, 0xff, 0xc4, 0x04, 0x99, 0x69, 0xfe, + 0x92, 0xd2, 0x8d, 0x7e, 0x6f, 0x75, 0x6a, 0xe5, 0x6b, 0x8c, 0x14, 0x50, 0x77, 0xea, 0xb7, 0x8d, + 0xde, 0x0f, 0x06, 0xba, 0xbe, 0x54, 0xb2, 0xf9, 0x18, 0xa5, 0xa3, 0x11, 0x7b, 0x04, 0xc7, 0x8a, + 0x4b, 0xab, 0x1c, 0xa3, 0xfb, 0x85, 0x99, 0x4c, 0xfd, 0xf8, 0x4d, 0xb4, 0xc6, 0x81, 0x0a, 0x16, + 0xe9, 0xd1, 0x3d, 0x53, 0x3b, 0x51, 0x56, 0xa2, 0xbd, 0x78, 0x1f, 0x6d, 0x42, 0x5e, 0x5e, 0x91, + 0x3b, 0xe0, 0x9c, 0x71, 0x7d, 0x64, 0x5b, 0x3a, 0x61, 0xf3, 0x60, 0xde, 0x4d, 0xce, 0xc7, 0x7b, + 0x37, 0x4e, 0xcf, 0xec, 0xda, 0xd3, 0x33, 0xbb, 0xf6, 0xeb, 0x99, 0x5d, 0x7b, 0x9c, 0xd9, 0xc6, + 0x69, 0x66, 0x1b, 0x4f, 0x33, 0xdb, 0xf8, 0x23, 0xb3, 0x8d, 0xef, 0xfe, 0xb4, 0x6b, 0x5f, 0xac, + 0xeb, 0x4d, 0xff, 0x1d, 0x00, 0x00, 0xff, 0xff, 0xb9, 0x8f, 0xa4, 0x81, 0x57, 0x0c, 0x00, 0x00, } diff --git a/pkg/apis/authorization/v1beta1/generated.proto b/pkg/apis/authorization/v1beta1/generated.proto index 137e8c632ab..8552ead252e 100644 --- a/pkg/apis/authorization/v1beta1/generated.proto +++ b/pkg/apis/authorization/v1beta1/generated.proto @@ -22,8 +22,8 @@ syntax = 'proto2'; package k8s.io.kubernetes.pkg.apis.authorization.v1beta1; import "k8s.io/kubernetes/pkg/api/resource/generated.proto"; -import "k8s.io/kubernetes/pkg/api/unversioned/generated.proto"; import "k8s.io/kubernetes/pkg/api/v1/generated.proto"; +import "k8s.io/kubernetes/pkg/apis/meta/v1/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/schema/generated.proto"; import "k8s.io/kubernetes/pkg/util/intstr/generated.proto"; diff --git a/pkg/apis/authorization/v1beta1/register.go b/pkg/apis/authorization/v1beta1/register.go index 72abc46dba1..33ac83c4f99 100644 --- a/pkg/apis/authorization/v1beta1/register.go +++ b/pkg/apis/authorization/v1beta1/register.go @@ -17,8 +17,8 @@ limitations under the License. package v1beta1 import ( - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" versionedwatch "k8s.io/kubernetes/pkg/watch/versioned" diff --git a/pkg/apis/authorization/v1beta1/types.generated.go b/pkg/apis/authorization/v1beta1/types.generated.go index 69ccda875c9..fbc4764e988 100644 --- a/pkg/apis/authorization/v1beta1/types.generated.go +++ b/pkg/apis/authorization/v1beta1/types.generated.go @@ -25,8 +25,8 @@ import ( "errors" "fmt" codec1978 "github.com/ugorji/go/codec" - pkg1_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" pkg2_v1 "k8s.io/kubernetes/pkg/api/v1" + pkg1_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" pkg3_types "k8s.io/kubernetes/pkg/types" "reflect" "runtime" @@ -63,8 +63,8 @@ func init() { panic(err) } if false { // reference the types, but skip this branch at build/run time - var v0 pkg1_unversioned.TypeMeta - var v1 pkg2_v1.ObjectMeta + var v0 pkg2_v1.ObjectMeta + var v1 pkg1_v1.TypeMeta var v2 pkg3_types.UID var v3 time.Time _, _, _, _ = v0, v1, v2, v3 diff --git a/pkg/apis/authorization/v1beta1/types.go b/pkg/apis/authorization/v1beta1/types.go index 6fe1b6e7cae..4f13fbeab1f 100644 --- a/pkg/apis/authorization/v1beta1/types.go +++ b/pkg/apis/authorization/v1beta1/types.go @@ -19,8 +19,8 @@ package v1beta1 import ( "fmt" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" ) // +genclient=true diff --git a/pkg/apis/autoscaling/types.generated.go b/pkg/apis/autoscaling/types.generated.go index 7a67c084d3f..9ed2e9f6449 100644 --- a/pkg/apis/autoscaling/types.generated.go +++ b/pkg/apis/autoscaling/types.generated.go @@ -26,7 +26,7 @@ import ( "fmt" codec1978 "github.com/ugorji/go/codec" pkg2_api "k8s.io/kubernetes/pkg/api" - pkg1_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" + pkg1_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" pkg3_types "k8s.io/kubernetes/pkg/types" "reflect" "runtime" @@ -64,7 +64,7 @@ func init() { } if false { // reference the types, but skip this branch at build/run time var v0 pkg2_api.ObjectMeta - var v1 pkg1_unversioned.TypeMeta + var v1 pkg1_v1.TypeMeta var v2 pkg3_types.UID var v3 time.Time _, _, _, _ = v0, v1, v2, v3 @@ -1665,7 +1665,7 @@ func (x *HorizontalPodAutoscalerStatus) codecDecodeSelfFromMap(l int, d *codec19 } } else { if x.LastScaleTime == nil { - x.LastScaleTime = new(pkg1_unversioned.Time) + x.LastScaleTime = new(pkg1_v1.Time) } yym141 := z.DecBinary() _ = yym141 @@ -1764,7 +1764,7 @@ func (x *HorizontalPodAutoscalerStatus) codecDecodeSelfFromArray(l int, d *codec } } else { if x.LastScaleTime == nil { - x.LastScaleTime = new(pkg1_unversioned.Time) + x.LastScaleTime = new(pkg1_v1.Time) } yym150 := z.DecBinary() _ = yym150 @@ -2409,7 +2409,7 @@ func (x *HorizontalPodAutoscalerList) codecDecodeSelfFromMap(l int, d *codec1978 } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv207 := &x.ListMeta yym208 := z.DecBinary() @@ -2490,7 +2490,7 @@ func (x *HorizontalPodAutoscalerList) codecDecodeSelfFromArray(l int, d *codec19 } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv214 := &x.ListMeta yym215 := z.DecBinary() diff --git a/pkg/apis/autoscaling/v1/generated.pb.go b/pkg/apis/autoscaling/v1/generated.pb.go index 54b74a0cb8e..1faa606e344 100644 --- a/pkg/apis/autoscaling/v1/generated.pb.go +++ b/pkg/apis/autoscaling/v1/generated.pb.go @@ -40,7 +40,7 @@ import proto "github.com/gogo/protobuf/proto" import fmt "fmt" import math "math" -import k8s_io_kubernetes_pkg_api_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" +import k8s_io_kubernetes_pkg_apis_meta_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" import strings "strings" import reflect "reflect" @@ -555,7 +555,7 @@ func (this *HorizontalPodAutoscalerList) String() string { return "nil" } s := strings.Join([]string{`&HorizontalPodAutoscalerList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "HorizontalPodAutoscaler", "HorizontalPodAutoscaler", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -580,7 +580,7 @@ func (this *HorizontalPodAutoscalerStatus) String() string { } s := strings.Join([]string{`&HorizontalPodAutoscalerStatus{`, `ObservedGeneration:` + valueToStringGenerated(this.ObservedGeneration) + `,`, - `LastScaleTime:` + strings.Replace(fmt.Sprintf("%v", this.LastScaleTime), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1) + `,`, + `LastScaleTime:` + strings.Replace(fmt.Sprintf("%v", this.LastScaleTime), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1) + `,`, `CurrentReplicas:` + fmt.Sprintf("%v", this.CurrentReplicas) + `,`, `DesiredReplicas:` + fmt.Sprintf("%v", this.DesiredReplicas) + `,`, `CurrentCPUUtilizationPercentage:` + valueToStringGenerated(this.CurrentCPUUtilizationPercentage) + `,`, @@ -1232,7 +1232,7 @@ func (m *HorizontalPodAutoscalerStatus) Unmarshal(data []byte) error { return io.ErrUnexpectedEOF } if m.LastScaleTime == nil { - m.LastScaleTime = &k8s_io_kubernetes_pkg_api_unversioned.Time{} + m.LastScaleTime = &k8s_io_kubernetes_pkg_apis_meta_v1.Time{} } if err := m.LastScaleTime.Unmarshal(data[iNdEx:postIndex]); err != nil { return err @@ -1730,58 +1730,58 @@ var ( ) var fileDescriptorGenerated = []byte{ - // 845 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xb4, 0x55, 0xcd, 0x8f, 0xdb, 0x44, - 0x14, 0x8f, 0xf3, 0x51, 0x6d, 0xc7, 0xec, 0x2e, 0x0c, 0x52, 0x1b, 0x6d, 0x85, 0xbd, 0x0a, 0x1c, - 0x16, 0xd1, 0xda, 0x4a, 0xd4, 0x22, 0x7a, 0x5c, 0x2f, 0x2a, 0xad, 0xe8, 0xd2, 0xd5, 0x6c, 0x5b, - 0x21, 0x24, 0x90, 0x26, 0xf6, 0xab, 0x77, 0x9a, 0xf8, 0x43, 0x33, 0xe3, 0x08, 0xf5, 0xc4, 0x89, - 0x33, 0x17, 0x0e, 0xfc, 0x3b, 0x9c, 0xf6, 0x46, 0x8f, 0x9c, 0x22, 0xd6, 0x88, 0xff, 0x82, 0x03, - 0xf2, 0x64, 0xea, 0x38, 0xc9, 0x3a, 0xdd, 0x08, 0xb8, 0x65, 0xe6, 0xfd, 0x3e, 0xde, 0x7b, 0xf3, - 0xfc, 0x82, 0xee, 0x8f, 0x3e, 0x13, 0x0e, 0x4b, 0xdc, 0x51, 0x36, 0x04, 0x1e, 0x83, 0x04, 0xe1, - 0xa6, 0xa3, 0xd0, 0xa5, 0x29, 0x13, 0x2e, 0xcd, 0x64, 0x22, 0x7c, 0x3a, 0x66, 0x71, 0xe8, 0x4e, - 0xfa, 0x6e, 0x08, 0x31, 0x70, 0x2a, 0x21, 0x70, 0x52, 0x9e, 0xc8, 0x04, 0x7f, 0x3c, 0xa3, 0x3a, - 0x73, 0xaa, 0x93, 0x8e, 0x42, 0xa7, 0xa0, 0x3a, 0x15, 0xaa, 0x33, 0xe9, 0xef, 0xdd, 0x09, 0x99, - 0x3c, 0xcb, 0x86, 0x8e, 0x9f, 0x44, 0x6e, 0x98, 0x84, 0x89, 0xab, 0x14, 0x86, 0xd9, 0x0b, 0x75, - 0x52, 0x07, 0xf5, 0x6b, 0xa6, 0xbc, 0x37, 0xa8, 0x4d, 0xca, 0xe5, 0x20, 0x92, 0x8c, 0xfb, 0xb0, - 0x9c, 0xcd, 0xde, 0xbd, 0x7a, 0x4e, 0x16, 0x4f, 0x80, 0x0b, 0x96, 0xc4, 0x10, 0xac, 0xd0, 0x6e, - 0xd7, 0xd3, 0x56, 0x4b, 0xde, 0xbb, 0x73, 0x39, 0x9a, 0x67, 0xb1, 0x64, 0xd1, 0x6a, 0x4e, 0x77, - 0xd7, 0xc3, 0x85, 0x7f, 0x06, 0x11, 0x5d, 0x61, 0xf5, 0x2f, 0x67, 0x65, 0x92, 0x8d, 0x5d, 0x16, - 0x4b, 0x21, 0xf9, 0x32, 0xa5, 0xf7, 0xb3, 0x81, 0x6e, 0x1d, 0xf1, 0x44, 0x88, 0xe7, 0xb3, 0x42, - 0x9f, 0x0c, 0x5f, 0x82, 0x2f, 0x09, 0xbc, 0x00, 0x0e, 0xb1, 0x0f, 0x78, 0x1f, 0xb5, 0x47, 0x2c, - 0x0e, 0xba, 0xc6, 0xbe, 0x71, 0x70, 0xdd, 0x7b, 0xe7, 0x7c, 0x6a, 0x37, 0xf2, 0xa9, 0xdd, 0xfe, - 0x92, 0xc5, 0x01, 0x51, 0x91, 0x02, 0x11, 0xd3, 0x08, 0xba, 0xcd, 0x45, 0xc4, 0x57, 0x34, 0x02, - 0xa2, 0x22, 0x78, 0x80, 0x10, 0x4d, 0x99, 0x36, 0xe8, 0xb6, 0x14, 0x0e, 0x6b, 0x1c, 0x3a, 0x3c, - 0x79, 0xa4, 0x23, 0xa4, 0x82, 0xea, 0xfd, 0xd6, 0x44, 0x37, 0x1f, 0x26, 0x9c, 0xbd, 0x4a, 0x62, - 0x49, 0xc7, 0x27, 0x49, 0x70, 0xa8, 0xe7, 0x02, 0x38, 0xfe, 0x1a, 0x6d, 0x45, 0x20, 0x69, 0x40, - 0x25, 0x55, 0x79, 0x99, 0x83, 0x03, 0xa7, 0x76, 0xa2, 0x9c, 0x49, 0xdf, 0x99, 0x15, 0x75, 0x0c, - 0x92, 0xce, 0x7d, 0xe7, 0x77, 0xa4, 0x54, 0xc3, 0x67, 0xa8, 0x2d, 0x52, 0xf0, 0x55, 0x2d, 0xe6, - 0xe0, 0x81, 0x73, 0xe5, 0x39, 0x75, 0x6a, 0x72, 0x3d, 0x4d, 0xc1, 0x9f, 0xf7, 0xa4, 0x38, 0x11, - 0xe5, 0x80, 0x53, 0x74, 0x4d, 0x48, 0x2a, 0x33, 0xa1, 0xfa, 0x61, 0x0e, 0x1e, 0xfe, 0x07, 0x5e, - 0x4a, 0xcf, 0xdb, 0xd1, 0x6e, 0xd7, 0x66, 0x67, 0xa2, 0x7d, 0x7a, 0x7f, 0x19, 0xe8, 0x56, 0x0d, - 0xf3, 0x31, 0x13, 0x12, 0x7f, 0xbb, 0xd2, 0x55, 0x77, 0x4d, 0x57, 0x2b, 0x5f, 0x86, 0x53, 0xd0, - 0x55, 0x73, 0xdf, 0xd5, 0xd6, 0x5b, 0x6f, 0x6e, 0x2a, 0xad, 0x0d, 0x51, 0x87, 0x49, 0x88, 0x44, - 0xb7, 0xb9, 0xdf, 0x3a, 0x30, 0x07, 0xde, 0xbf, 0xaf, 0xd7, 0xdb, 0xd6, 0x76, 0x9d, 0x47, 0x85, - 0x30, 0x99, 0xe9, 0xf7, 0xfe, 0x6e, 0xd6, 0xd6, 0x59, 0xf4, 0x1f, 0xff, 0x68, 0xa0, 0x1d, 0x75, - 0x7c, 0x4a, 0x79, 0x08, 0xc5, 0xa8, 0xeb, 0x72, 0x37, 0x79, 0xee, 0x35, 0x9f, 0x8c, 0x77, 0x43, - 0xa7, 0xb5, 0x73, 0xba, 0xe0, 0x42, 0x96, 0x5c, 0x71, 0x1f, 0x99, 0x11, 0x8b, 0x09, 0xa4, 0x63, - 0xe6, 0x53, 0xa1, 0x66, 0xae, 0xe3, 0xed, 0xe6, 0x53, 0xdb, 0x3c, 0x9e, 0x5f, 0x93, 0x2a, 0x06, - 0xdf, 0x43, 0x66, 0x44, 0xbf, 0x2f, 0x29, 0x2d, 0x45, 0x79, 0x5f, 0xfb, 0x99, 0xc7, 0xf3, 0x10, - 0xa9, 0xe2, 0xf0, 0x4b, 0x64, 0x49, 0x65, 0x7b, 0x74, 0xf2, 0xec, 0x99, 0x64, 0x63, 0xf6, 0x8a, - 0x4a, 0x96, 0xc4, 0x27, 0xc0, 0x7d, 0x88, 0x25, 0x0d, 0xa1, 0xdb, 0x56, 0x4a, 0xbd, 0x7c, 0x6a, - 0x5b, 0x4f, 0xd7, 0x22, 0xc9, 0x5b, 0x94, 0x7a, 0xbf, 0xb6, 0xd0, 0x07, 0x6b, 0x07, 0x14, 0x3f, - 0x40, 0x38, 0x19, 0x0a, 0xe0, 0x13, 0x08, 0xbe, 0x98, 0x6d, 0xa3, 0x62, 0x2d, 0x14, 0x6f, 0xd0, - 0xf2, 0x6e, 0xe4, 0x53, 0x1b, 0x3f, 0x59, 0x89, 0x92, 0x4b, 0x18, 0x38, 0x40, 0xdb, 0x63, 0x2a, - 0xe4, 0xac, 0xcb, 0x4c, 0x6f, 0x20, 0x73, 0xf0, 0xc9, 0x15, 0xa7, 0xb6, 0xa0, 0x78, 0xef, 0xe5, - 0x53, 0x7b, 0xfb, 0x71, 0x55, 0x85, 0x2c, 0x8a, 0xe2, 0x43, 0xb4, 0xeb, 0x67, 0x9c, 0x43, 0x2c, - 0x97, 0xda, 0x7e, 0x53, 0xb7, 0x7d, 0xf7, 0x68, 0x31, 0x4c, 0x96, 0xf1, 0x85, 0x44, 0x00, 0x82, - 0x71, 0x08, 0x4a, 0x89, 0xf6, 0xa2, 0xc4, 0xe7, 0x8b, 0x61, 0xb2, 0x8c, 0xc7, 0x11, 0xb2, 0xb5, - 0x6a, 0xed, 0x13, 0x76, 0x94, 0xe4, 0x87, 0xf9, 0xd4, 0xb6, 0x8f, 0xd6, 0x43, 0xc9, 0xdb, 0xb4, - 0x7a, 0xbf, 0x34, 0x51, 0x47, 0xb5, 0xe0, 0x7f, 0xdc, 0xb5, 0xcf, 0x17, 0x76, 0xed, 0xdd, 0x0d, - 0x3e, 0x3e, 0x95, 0x59, 0xed, 0x66, 0xfd, 0x6e, 0x69, 0xb3, 0x7e, 0xba, 0xb1, 0xf2, 0xfa, 0x3d, - 0x7a, 0x1f, 0x5d, 0x2f, 0x13, 0xc0, 0xb7, 0xd1, 0x16, 0x7f, 0xf3, 0xa6, 0x86, 0x7a, 0x80, 0x72, - 0x07, 0x96, 0x8f, 0x59, 0x22, 0x7a, 0x0c, 0x99, 0x15, 0x87, 0xcd, 0xc8, 0x05, 0x5a, 0xc0, 0x18, - 0x7c, 0x99, 0x70, 0xfd, 0x5f, 0x5b, 0xa2, 0x4f, 0xf5, 0x3d, 0x29, 0x11, 0xde, 0x47, 0xe7, 0x17, - 0x56, 0xe3, 0xf5, 0x85, 0xd5, 0xf8, 0xfd, 0xc2, 0x6a, 0xfc, 0x90, 0x5b, 0xc6, 0x79, 0x6e, 0x19, - 0xaf, 0x73, 0xcb, 0xf8, 0x23, 0xb7, 0x8c, 0x9f, 0xfe, 0xb4, 0x1a, 0xdf, 0x34, 0x27, 0xfd, 0x7f, - 0x02, 0x00, 0x00, 0xff, 0xff, 0x11, 0x6a, 0xc0, 0x63, 0xc4, 0x09, 0x00, 0x00, + // 838 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xb4, 0x55, 0xcd, 0x6f, 0xdc, 0x44, + 0x14, 0x5f, 0xef, 0x47, 0x95, 0x8e, 0x49, 0x02, 0x83, 0xd4, 0xae, 0x52, 0x61, 0x47, 0x0b, 0x87, + 0x20, 0xa5, 0xb6, 0x76, 0x55, 0x10, 0x3d, 0xc6, 0x41, 0xa5, 0x15, 0x0d, 0x8d, 0x26, 0x6d, 0x85, + 0x7a, 0x40, 0x9a, 0xf5, 0xbe, 0x3a, 0xd3, 0x5d, 0x7b, 0xac, 0x99, 0xf1, 0x0a, 0xf5, 0xc4, 0x89, + 0x33, 0x17, 0x0e, 0xfc, 0x35, 0x5c, 0x73, 0xa3, 0x47, 0x4e, 0x2b, 0x62, 0xfe, 0x0d, 0x0e, 0xc8, + 0xb3, 0x53, 0xef, 0x57, 0xec, 0x12, 0x01, 0xb7, 0x9d, 0x79, 0xbf, 0x8f, 0x37, 0xef, 0x3d, 0xbf, + 0x45, 0xf7, 0xc7, 0x5f, 0x48, 0x8f, 0x71, 0x7f, 0x9c, 0x0d, 0x41, 0x24, 0xa0, 0x40, 0xfa, 0xe9, + 0x38, 0xf2, 0x69, 0xca, 0xa4, 0x4f, 0x33, 0xc5, 0x65, 0x48, 0x27, 0x2c, 0x89, 0xfc, 0x69, 0xdf, + 0x8f, 0x20, 0x01, 0x41, 0x15, 0x8c, 0xbc, 0x54, 0x70, 0xc5, 0xf1, 0xa7, 0x73, 0xaa, 0xb7, 0xa0, + 0x7a, 0xe9, 0x38, 0xf2, 0x0a, 0xaa, 0xb7, 0x44, 0xf5, 0xa6, 0xfd, 0xbd, 0xbb, 0x11, 0x53, 0xe7, + 0xd9, 0xd0, 0x0b, 0x79, 0xec, 0x47, 0x3c, 0xe2, 0xbe, 0x56, 0x18, 0x66, 0x2f, 0xf5, 0x49, 0x1f, + 0xf4, 0xaf, 0xb9, 0xf2, 0xde, 0xa0, 0x32, 0x29, 0x5f, 0x80, 0xe4, 0x99, 0x08, 0x61, 0x3d, 0x9b, + 0xbd, 0xc3, 0x6a, 0xce, 0x66, 0xee, 0x35, 0x0e, 0xd2, 0x8f, 0x41, 0xd1, 0xab, 0x38, 0x77, 0xaf, + 0xe6, 0x88, 0x2c, 0x51, 0x2c, 0xde, 0x4c, 0xe8, 0x5e, 0x3d, 0x5c, 0x86, 0xe7, 0x10, 0xd3, 0x0d, + 0x56, 0xff, 0x6a, 0x56, 0xa6, 0xd8, 0xc4, 0x67, 0x89, 0x92, 0x4a, 0xac, 0x53, 0x7a, 0x3f, 0x5b, + 0xe8, 0xce, 0xb1, 0xe0, 0x52, 0x3e, 0x07, 0x21, 0x19, 0x4f, 0x9e, 0x0c, 0x5f, 0x41, 0xa8, 0x08, + 0xbc, 0x04, 0x01, 0x49, 0x08, 0x78, 0x1f, 0xb5, 0xc7, 0x2c, 0x19, 0x75, 0xad, 0x7d, 0xeb, 0xe0, + 0x66, 0xf0, 0xde, 0xc5, 0xcc, 0x6d, 0xe4, 0x33, 0xb7, 0xfd, 0x35, 0x4b, 0x46, 0x44, 0x47, 0x0a, + 0x44, 0x42, 0x63, 0xe8, 0x36, 0x57, 0x11, 0xdf, 0xd0, 0x18, 0x88, 0x8e, 0xe0, 0x01, 0x42, 0x34, + 0x65, 0xc6, 0xa0, 0xdb, 0xd2, 0x38, 0x6c, 0x70, 0xe8, 0xe8, 0xf4, 0x91, 0x89, 0x90, 0x25, 0x54, + 0xef, 0xb7, 0x26, 0xba, 0xfd, 0x90, 0x0b, 0xf6, 0x9a, 0x27, 0x8a, 0x4e, 0x4e, 0xf9, 0xe8, 0xc8, + 0x0c, 0x05, 0x08, 0xfc, 0x2d, 0xda, 0x2a, 0xca, 0x3c, 0xa2, 0x8a, 0xea, 0xbc, 0xec, 0xc1, 0x81, + 0x57, 0x39, 0x4e, 0xde, 0xb4, 0xef, 0xcd, 0x1f, 0x75, 0x02, 0x8a, 0x2e, 0x7c, 0x17, 0x77, 0xa4, + 0x54, 0xc3, 0xe7, 0xa8, 0x2d, 0x53, 0x08, 0xf5, 0x5b, 0xec, 0xc1, 0x03, 0xef, 0x1f, 0x0f, 0xa9, + 0x57, 0x91, 0xeb, 0x59, 0x0a, 0xe1, 0xa2, 0x26, 0xc5, 0x89, 0x68, 0x07, 0x9c, 0xa2, 0x1b, 0x52, + 0x51, 0x95, 0x49, 0x5d, 0x0f, 0x7b, 0xf0, 0xf0, 0x3f, 0xf0, 0xd2, 0x7a, 0xc1, 0x8e, 0x71, 0xbb, + 0x31, 0x3f, 0x13, 0xe3, 0xd3, 0xcb, 0x2d, 0x74, 0xa7, 0x82, 0xf9, 0x98, 0x49, 0x85, 0x5f, 0x6c, + 0x54, 0xf5, 0xb0, 0x2e, 0xa7, 0x02, 0x5b, 0x24, 0x53, 0x70, 0x75, 0x65, 0xdf, 0x37, 0xbe, 0x5b, + 0x6f, 0x6f, 0x96, 0xea, 0x1a, 0xa1, 0x0e, 0x53, 0x10, 0xcb, 0x6e, 0x73, 0xbf, 0x75, 0x60, 0x0f, + 0x82, 0x7f, 0xff, 0xd8, 0x60, 0xdb, 0xd8, 0x75, 0x1e, 0x15, 0xc2, 0x64, 0xae, 0xdf, 0xfb, 0xab, + 0x59, 0xf9, 0xc8, 0xa2, 0xf8, 0xf8, 0x47, 0x0b, 0xed, 0xe8, 0xe3, 0x53, 0x2a, 0x22, 0x28, 0xe6, + 0xdc, 0xbc, 0xf5, 0x3a, 0xbd, 0xae, 0xf9, 0x5e, 0x82, 0x5b, 0x26, 0xad, 0x9d, 0xb3, 0x15, 0x17, + 0xb2, 0xe6, 0x8a, 0xfb, 0xc8, 0x8e, 0x59, 0x42, 0x20, 0x9d, 0xb0, 0x90, 0x4a, 0x3d, 0x70, 0x9d, + 0x60, 0x37, 0x9f, 0xb9, 0xf6, 0xc9, 0xe2, 0x9a, 0x2c, 0x63, 0xf0, 0x67, 0xc8, 0x8e, 0xe9, 0xf7, + 0x25, 0xa5, 0xa5, 0x29, 0x1f, 0x1a, 0x3f, 0xfb, 0x64, 0x11, 0x22, 0xcb, 0x38, 0xfc, 0x0a, 0x39, + 0x4a, 0xdb, 0x1e, 0x9f, 0x3e, 0x7b, 0xa6, 0xd8, 0x84, 0xbd, 0xa6, 0x8a, 0xf1, 0xe4, 0x14, 0x44, + 0x08, 0x89, 0xa2, 0x11, 0x74, 0xdb, 0x5a, 0xa9, 0x97, 0xcf, 0x5c, 0xe7, 0x69, 0x2d, 0x92, 0xbc, + 0x43, 0xa9, 0xf7, 0x6b, 0x0b, 0x7d, 0x54, 0x3b, 0x9d, 0xf8, 0x01, 0xc2, 0x7c, 0x28, 0x41, 0x4c, + 0x61, 0xf4, 0xd5, 0x7c, 0x15, 0x15, 0x3b, 0xa1, 0xe8, 0x41, 0x2b, 0xb8, 0x95, 0xcf, 0x5c, 0xfc, + 0x64, 0x23, 0x4a, 0xae, 0x60, 0x60, 0x8a, 0xb6, 0x27, 0x54, 0xaa, 0x79, 0x95, 0x99, 0x59, 0x3f, + 0xb5, 0x8b, 0x60, 0x31, 0xb2, 0x05, 0x3e, 0xf8, 0x20, 0x9f, 0xb9, 0xdb, 0x8f, 0x97, 0x25, 0xc8, + 0xaa, 0x22, 0x3e, 0x42, 0xbb, 0x61, 0x26, 0x04, 0x24, 0x6a, 0xad, 0xe6, 0xb7, 0x4d, 0xcd, 0x77, + 0x8f, 0x57, 0xc3, 0x64, 0x1d, 0x5f, 0x48, 0x8c, 0x40, 0x32, 0x01, 0xa3, 0x52, 0xa2, 0xbd, 0x2a, + 0xf1, 0xe5, 0x6a, 0x98, 0xac, 0xe3, 0x71, 0x8c, 0x5c, 0xa3, 0x5a, 0xd9, 0xbf, 0x8e, 0x96, 0xfc, + 0x38, 0x9f, 0xb9, 0xee, 0x71, 0x3d, 0x94, 0xbc, 0x4b, 0xab, 0xf7, 0x4b, 0x13, 0x75, 0x74, 0x09, + 0xfe, 0xc7, 0x2d, 0xfb, 0x7c, 0x65, 0xcb, 0xde, 0xbb, 0xc6, 0x97, 0xa7, 0x33, 0xab, 0xdc, 0xa9, + 0xdf, 0xad, 0xed, 0xd4, 0xcf, 0xaf, 0xad, 0x5c, 0xbf, 0x41, 0xef, 0xa3, 0x9b, 0x65, 0x02, 0xf8, + 0x10, 0x6d, 0x89, 0xb7, 0x3d, 0xb5, 0x74, 0x03, 0xca, 0x05, 0x58, 0x36, 0xb3, 0x44, 0xf4, 0x18, + 0xb2, 0x97, 0x1c, 0xae, 0x47, 0x2e, 0xd0, 0x12, 0x26, 0x10, 0x2a, 0x2e, 0xcc, 0xbf, 0x6c, 0x89, + 0x3e, 0x33, 0xf7, 0xa4, 0x44, 0x04, 0x9f, 0x5c, 0x5c, 0x3a, 0x8d, 0x37, 0x97, 0x4e, 0xe3, 0xf7, + 0x4b, 0xa7, 0xf1, 0x43, 0xee, 0x58, 0x17, 0xb9, 0x63, 0xbd, 0xc9, 0x1d, 0xeb, 0x8f, 0xdc, 0xb1, + 0x7e, 0xfa, 0xd3, 0x69, 0xbc, 0x68, 0x4e, 0xfb, 0x7f, 0x07, 0x00, 0x00, 0xff, 0xff, 0x1c, 0x62, + 0x6b, 0x34, 0xbb, 0x09, 0x00, 0x00, } diff --git a/pkg/apis/autoscaling/v1/generated.proto b/pkg/apis/autoscaling/v1/generated.proto index 249ce57252b..20f864c1aa2 100644 --- a/pkg/apis/autoscaling/v1/generated.proto +++ b/pkg/apis/autoscaling/v1/generated.proto @@ -22,8 +22,8 @@ syntax = 'proto2'; package k8s.io.kubernetes.pkg.apis.autoscaling.v1; import "k8s.io/kubernetes/pkg/api/resource/generated.proto"; -import "k8s.io/kubernetes/pkg/api/unversioned/generated.proto"; import "k8s.io/kubernetes/pkg/api/v1/generated.proto"; +import "k8s.io/kubernetes/pkg/apis/meta/v1/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/schema/generated.proto"; import "k8s.io/kubernetes/pkg/util/intstr/generated.proto"; @@ -63,7 +63,7 @@ message HorizontalPodAutoscaler { message HorizontalPodAutoscalerList { // Standard list metadata. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // list of horizontal pod autoscaler objects. repeated HorizontalPodAutoscaler items = 2; @@ -97,7 +97,7 @@ message HorizontalPodAutoscalerStatus { // last time the HorizontalPodAutoscaler scaled the number of pods; // used by the autoscaler to control how often the number of pods is changed. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time lastScaleTime = 2; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time lastScaleTime = 2; // current number of replicas of pods managed by this autoscaler. optional int32 currentReplicas = 3; diff --git a/pkg/apis/autoscaling/v1/register.go b/pkg/apis/autoscaling/v1/register.go index 89b4b552ca7..1eee20f39cf 100644 --- a/pkg/apis/autoscaling/v1/register.go +++ b/pkg/apis/autoscaling/v1/register.go @@ -17,8 +17,8 @@ limitations under the License. package v1 import ( - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" versionedwatch "k8s.io/kubernetes/pkg/watch/versioned" diff --git a/pkg/apis/autoscaling/v1/types.generated.go b/pkg/apis/autoscaling/v1/types.generated.go index 29cb4e957bf..cc488868426 100644 --- a/pkg/apis/autoscaling/v1/types.generated.go +++ b/pkg/apis/autoscaling/v1/types.generated.go @@ -25,8 +25,8 @@ import ( "errors" "fmt" codec1978 "github.com/ugorji/go/codec" - pkg1_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" pkg2_v1 "k8s.io/kubernetes/pkg/api/v1" + pkg1_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" pkg3_types "k8s.io/kubernetes/pkg/types" "reflect" "runtime" @@ -63,8 +63,8 @@ func init() { panic(err) } if false { // reference the types, but skip this branch at build/run time - var v0 pkg1_unversioned.Time - var v1 pkg2_v1.ObjectMeta + var v0 pkg2_v1.ObjectMeta + var v1 pkg1_v1.Time var v2 pkg3_types.UID var v3 time.Time _, _, _, _ = v0, v1, v2, v3 @@ -943,7 +943,7 @@ func (x *HorizontalPodAutoscalerStatus) codecDecodeSelfFromMap(l int, d *codec19 } } else { if x.LastScaleTime == nil { - x.LastScaleTime = new(pkg1_unversioned.Time) + x.LastScaleTime = new(pkg1_v1.Time) } yym83 := z.DecBinary() _ = yym83 @@ -1042,7 +1042,7 @@ func (x *HorizontalPodAutoscalerStatus) codecDecodeSelfFromArray(l int, d *codec } } else { if x.LastScaleTime == nil { - x.LastScaleTime = new(pkg1_unversioned.Time) + x.LastScaleTime = new(pkg1_v1.Time) } yym92 := z.DecBinary() _ = yym92 @@ -1687,7 +1687,7 @@ func (x *HorizontalPodAutoscalerList) codecDecodeSelfFromMap(l int, d *codec1978 } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv149 := &x.ListMeta yym150 := z.DecBinary() @@ -1768,7 +1768,7 @@ func (x *HorizontalPodAutoscalerList) codecDecodeSelfFromArray(l int, d *codec19 } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv156 := &x.ListMeta yym157 := z.DecBinary() diff --git a/pkg/apis/autoscaling/v1/types.go b/pkg/apis/autoscaling/v1/types.go index 5f5cf98ddfa..74790cae7a2 100644 --- a/pkg/apis/autoscaling/v1/types.go +++ b/pkg/apis/autoscaling/v1/types.go @@ -17,8 +17,8 @@ limitations under the License. package v1 import ( - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" ) // CrossVersionObjectReference contains enough information to let you identify the referred resource. diff --git a/pkg/apis/batch/types.generated.go b/pkg/apis/batch/types.generated.go index 376960cbcc9..1a80bff3e6f 100644 --- a/pkg/apis/batch/types.generated.go +++ b/pkg/apis/batch/types.generated.go @@ -27,7 +27,7 @@ import ( codec1978 "github.com/ugorji/go/codec" pkg2_api "k8s.io/kubernetes/pkg/api" pkg4_resource "k8s.io/kubernetes/pkg/api/resource" - pkg1_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" + pkg1_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" pkg3_types "k8s.io/kubernetes/pkg/types" pkg5_intstr "k8s.io/kubernetes/pkg/util/intstr" "reflect" @@ -67,7 +67,7 @@ func init() { if false { // reference the types, but skip this branch at build/run time var v0 pkg2_api.ObjectMeta var v1 pkg4_resource.Quantity - var v2 pkg1_unversioned.TypeMeta + var v2 pkg1_v1.TypeMeta var v3 pkg3_types.UID var v4 pkg5_intstr.IntOrString var v5 time.Time @@ -632,7 +632,7 @@ func (x *JobList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv53 := &x.ListMeta yym54 := z.DecBinary() @@ -713,7 +713,7 @@ func (x *JobList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv60 := &x.ListMeta yym61 := z.DecBinary() @@ -1605,7 +1605,7 @@ func (x *JobSpec) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.Selector == nil { - x.Selector = new(pkg1_unversioned.LabelSelector) + x.Selector = new(pkg1_v1.LabelSelector) } yym144 := z.DecBinary() _ = yym144 @@ -1747,7 +1747,7 @@ func (x *JobSpec) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } else { if x.Selector == nil { - x.Selector = new(pkg1_unversioned.LabelSelector) + x.Selector = new(pkg1_v1.LabelSelector) } yym156 := z.DecBinary() _ = yym156 @@ -2126,7 +2126,7 @@ func (x *JobStatus) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.StartTime == nil { - x.StartTime = new(pkg1_unversioned.Time) + x.StartTime = new(pkg1_v1.Time) } yym186 := z.DecBinary() _ = yym186 @@ -2147,7 +2147,7 @@ func (x *JobStatus) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.CompletionTime == nil { - x.CompletionTime = new(pkg1_unversioned.Time) + x.CompletionTime = new(pkg1_v1.Time) } yym188 := z.DecBinary() _ = yym188 @@ -2232,7 +2232,7 @@ func (x *JobStatus) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } else { if x.StartTime == nil { - x.StartTime = new(pkg1_unversioned.Time) + x.StartTime = new(pkg1_v1.Time) } yym196 := z.DecBinary() _ = yym196 @@ -2263,7 +2263,7 @@ func (x *JobStatus) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } else { if x.CompletionTime == nil { - x.CompletionTime = new(pkg1_unversioned.Time) + x.CompletionTime = new(pkg1_v1.Time) } yym198 := z.DecBinary() _ = yym198 @@ -2630,7 +2630,7 @@ func (x *JobCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "lastProbeTime": if r.TryDecodeAsNil() { - x.LastProbeTime = pkg1_unversioned.Time{} + x.LastProbeTime = pkg1_v1.Time{} } else { yyv231 := &x.LastProbeTime yym232 := z.DecBinary() @@ -2647,7 +2647,7 @@ func (x *JobCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "lastTransitionTime": if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg1_unversioned.Time{} + x.LastTransitionTime = pkg1_v1.Time{} } else { yyv233 := &x.LastTransitionTime yym234 := z.DecBinary() @@ -2732,7 +2732,7 @@ func (x *JobCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastProbeTime = pkg1_unversioned.Time{} + x.LastProbeTime = pkg1_v1.Time{} } else { yyv240 := &x.LastProbeTime yym241 := z.DecBinary() @@ -2759,7 +2759,7 @@ func (x *JobCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg1_unversioned.Time{} + x.LastTransitionTime = pkg1_v1.Time{} } else { yyv242 := &x.LastTransitionTime yym243 := z.DecBinary() @@ -3379,7 +3379,7 @@ func (x *CronJobList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv298 := &x.ListMeta yym299 := z.DecBinary() @@ -3460,7 +3460,7 @@ func (x *CronJobList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv305 := &x.ListMeta yym306 := z.DecBinary() @@ -4114,7 +4114,7 @@ func (x *CronJobStatus) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.LastScheduleTime == nil { - x.LastScheduleTime = new(pkg1_unversioned.Time) + x.LastScheduleTime = new(pkg1_v1.Time) } yym362 := z.DecBinary() _ = yym362 @@ -4181,7 +4181,7 @@ func (x *CronJobStatus) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } else { if x.LastScheduleTime == nil { - x.LastScheduleTime = new(pkg1_unversioned.Time) + x.LastScheduleTime = new(pkg1_v1.Time) } yym367 := z.DecBinary() _ = yym367 diff --git a/pkg/apis/batch/v1/generated.pb.go b/pkg/apis/batch/v1/generated.pb.go index 1bebc216552..5b197f67231 100644 --- a/pkg/apis/batch/v1/generated.pb.go +++ b/pkg/apis/batch/v1/generated.pb.go @@ -37,8 +37,8 @@ import proto "github.com/gogo/protobuf/proto" import fmt "fmt" import math "math" -import k8s_io_kubernetes_pkg_api_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" import k8s_io_kubernetes_pkg_api_v1 "k8s.io/kubernetes/pkg/api/v1" +import k8s_io_kubernetes_pkg_apis_meta_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" import strings "strings" import reflect "reflect" @@ -481,8 +481,8 @@ func (this *JobCondition) String() string { s := strings.Join([]string{`&JobCondition{`, `Type:` + fmt.Sprintf("%v", this.Type) + `,`, `Status:` + fmt.Sprintf("%v", this.Status) + `,`, - `LastProbeTime:` + strings.Replace(strings.Replace(this.LastProbeTime.String(), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1), `&`, ``, 1) + `,`, - `LastTransitionTime:` + strings.Replace(strings.Replace(this.LastTransitionTime.String(), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1), `&`, ``, 1) + `,`, + `LastProbeTime:` + strings.Replace(strings.Replace(this.LastProbeTime.String(), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1), `&`, ``, 1) + `,`, + `LastTransitionTime:` + strings.Replace(strings.Replace(this.LastTransitionTime.String(), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1), `&`, ``, 1) + `,`, `Reason:` + fmt.Sprintf("%v", this.Reason) + `,`, `Message:` + fmt.Sprintf("%v", this.Message) + `,`, `}`, @@ -494,7 +494,7 @@ func (this *JobList) String() string { return "nil" } s := strings.Join([]string{`&JobList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "Job", "Job", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -508,7 +508,7 @@ func (this *JobSpec) String() string { `Parallelism:` + valueToStringGenerated(this.Parallelism) + `,`, `Completions:` + valueToStringGenerated(this.Completions) + `,`, `ActiveDeadlineSeconds:` + valueToStringGenerated(this.ActiveDeadlineSeconds) + `,`, - `Selector:` + strings.Replace(fmt.Sprintf("%v", this.Selector), "LabelSelector", "k8s_io_kubernetes_pkg_api_unversioned.LabelSelector", 1) + `,`, + `Selector:` + strings.Replace(fmt.Sprintf("%v", this.Selector), "LabelSelector", "k8s_io_kubernetes_pkg_apis_meta_v1.LabelSelector", 1) + `,`, `ManualSelector:` + valueToStringGenerated(this.ManualSelector) + `,`, `Template:` + strings.Replace(strings.Replace(this.Template.String(), "PodTemplateSpec", "k8s_io_kubernetes_pkg_api_v1.PodTemplateSpec", 1), `&`, ``, 1) + `,`, `}`, @@ -521,8 +521,8 @@ func (this *JobStatus) String() string { } s := strings.Join([]string{`&JobStatus{`, `Conditions:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Conditions), "JobCondition", "JobCondition", 1), `&`, ``, 1) + `,`, - `StartTime:` + strings.Replace(fmt.Sprintf("%v", this.StartTime), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1) + `,`, - `CompletionTime:` + strings.Replace(fmt.Sprintf("%v", this.CompletionTime), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1) + `,`, + `StartTime:` + strings.Replace(fmt.Sprintf("%v", this.StartTime), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1) + `,`, + `CompletionTime:` + strings.Replace(fmt.Sprintf("%v", this.CompletionTime), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1) + `,`, `Active:` + fmt.Sprintf("%v", this.Active) + `,`, `Succeeded:` + fmt.Sprintf("%v", this.Succeeded) + `,`, `Failed:` + fmt.Sprintf("%v", this.Failed) + `,`, @@ -1131,7 +1131,7 @@ func (m *JobSpec) Unmarshal(data []byte) error { return io.ErrUnexpectedEOF } if m.Selector == nil { - m.Selector = &k8s_io_kubernetes_pkg_api_unversioned.LabelSelector{} + m.Selector = &k8s_io_kubernetes_pkg_apis_meta_v1.LabelSelector{} } if err := m.Selector.Unmarshal(data[iNdEx:postIndex]); err != nil { return err @@ -1296,7 +1296,7 @@ func (m *JobStatus) Unmarshal(data []byte) error { return io.ErrUnexpectedEOF } if m.StartTime == nil { - m.StartTime = &k8s_io_kubernetes_pkg_api_unversioned.Time{} + m.StartTime = &k8s_io_kubernetes_pkg_apis_meta_v1.Time{} } if err := m.StartTime.Unmarshal(data[iNdEx:postIndex]); err != nil { return err @@ -1329,7 +1329,7 @@ func (m *JobStatus) Unmarshal(data []byte) error { return io.ErrUnexpectedEOF } if m.CompletionTime == nil { - m.CompletionTime = &k8s_io_kubernetes_pkg_api_unversioned.Time{} + m.CompletionTime = &k8s_io_kubernetes_pkg_apis_meta_v1.Time{} } if err := m.CompletionTime.Unmarshal(data[iNdEx:postIndex]); err != nil { return err @@ -1519,60 +1519,59 @@ var ( ) var fileDescriptorGenerated = []byte{ - // 872 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x9c, 0x54, 0xcf, 0x6f, 0xe3, 0x44, - 0x14, 0xce, 0x8f, 0xa6, 0x4d, 0xa6, 0x3f, 0x76, 0x19, 0xa9, 0x52, 0xc8, 0x21, 0x59, 0x05, 0x84, - 0x16, 0xb1, 0x1d, 0x2b, 0xa5, 0x48, 0x88, 0x03, 0x12, 0x2e, 0x42, 0xa2, 0x6a, 0xd9, 0x6a, 0x52, - 0xa1, 0x15, 0x08, 0xa4, 0xb1, 0xfd, 0x36, 0x1d, 0x6a, 0x7b, 0x2c, 0xcf, 0x38, 0x68, 0x6f, 0xdc, - 0xb8, 0xf2, 0xd7, 0x80, 0xf8, 0x0f, 0x7a, 0x5c, 0x71, 0xe2, 0x14, 0x51, 0xf3, 0x5f, 0xec, 0x09, - 0x79, 0x3c, 0xb1, 0x9d, 0x26, 0x8d, 0xb2, 0xdc, 0x3c, 0xef, 0x7d, 0xdf, 0xf7, 0x9e, 0xe7, 0x7d, - 0xf3, 0xd0, 0xc7, 0x37, 0x9f, 0x4a, 0xc2, 0x85, 0x75, 0x93, 0x38, 0x10, 0x87, 0xa0, 0x40, 0x5a, - 0xd1, 0xcd, 0xc4, 0x62, 0x11, 0x97, 0x96, 0xc3, 0x94, 0x7b, 0x6d, 0x4d, 0x47, 0xd6, 0x04, 0x42, - 0x88, 0x99, 0x02, 0x8f, 0x44, 0xb1, 0x50, 0x02, 0xbf, 0x97, 0x93, 0x48, 0x49, 0x22, 0xd1, 0xcd, - 0x84, 0x64, 0x24, 0xa2, 0x49, 0x64, 0x3a, 0xea, 0x1d, 0x4d, 0xb8, 0xba, 0x4e, 0x1c, 0xe2, 0x8a, - 0xc0, 0x9a, 0x88, 0x89, 0xb0, 0x34, 0xd7, 0x49, 0x5e, 0xea, 0x93, 0x3e, 0xe8, 0xaf, 0x5c, 0xb3, - 0x77, 0xfc, 0x60, 0x23, 0x56, 0x0c, 0x52, 0x24, 0xb1, 0x0b, 0xf7, 0xfb, 0xe8, 0x7d, 0xf2, 0x30, - 0x27, 0x09, 0xa7, 0x10, 0x4b, 0x2e, 0x42, 0xf0, 0x96, 0x68, 0xcf, 0x1e, 0xa6, 0x2d, 0xff, 0x6c, - 0xef, 0x68, 0x35, 0x3a, 0x4e, 0x42, 0xc5, 0x83, 0xe5, 0x9e, 0x4e, 0xd6, 0xc3, 0xa5, 0x7b, 0x0d, - 0x01, 0x5b, 0x62, 0x8d, 0x56, 0xb3, 0x12, 0xc5, 0x7d, 0x8b, 0x87, 0x4a, 0xaa, 0xf8, 0x3e, 0x65, - 0xf8, 0x6b, 0x03, 0x35, 0xcf, 0x84, 0x83, 0x5f, 0xa0, 0x76, 0x00, 0x8a, 0x79, 0x4c, 0xb1, 0x6e, - 0xfd, 0x49, 0xfd, 0xe9, 0xee, 0xf1, 0x53, 0xf2, 0xe0, 0x7c, 0xc8, 0x74, 0x44, 0x9e, 0x3b, 0x3f, - 0x81, 0xab, 0x2e, 0x40, 0x31, 0x1b, 0xdf, 0xce, 0x06, 0xb5, 0x74, 0x36, 0x40, 0x65, 0x8c, 0x16, - 0x6a, 0xf8, 0x1b, 0xb4, 0x25, 0x23, 0x70, 0xbb, 0x0d, 0xad, 0xfa, 0x8c, 0x6c, 0x30, 0x75, 0x72, - 0x26, 0x9c, 0x71, 0x04, 0xae, 0xbd, 0x67, 0x94, 0xb7, 0xb2, 0x13, 0xd5, 0x3a, 0xf8, 0x5b, 0xb4, - 0x2d, 0x15, 0x53, 0x89, 0xec, 0x36, 0xb5, 0x22, 0xd9, 0x58, 0x51, 0xb3, 0xec, 0x03, 0xa3, 0xb9, - 0x9d, 0x9f, 0xa9, 0x51, 0x1b, 0xfe, 0xd5, 0x44, 0x7b, 0x67, 0xc2, 0x39, 0x15, 0xa1, 0xc7, 0x15, - 0x17, 0x21, 0x3e, 0x41, 0x5b, 0xea, 0x55, 0x04, 0xfa, 0x3a, 0x3a, 0xf6, 0x93, 0x79, 0x2b, 0x57, - 0xaf, 0x22, 0x78, 0x33, 0x1b, 0x3c, 0xae, 0x62, 0xb3, 0x18, 0xd5, 0xe8, 0x4a, 0x7b, 0x0d, 0xcd, - 0xfb, 0x7c, 0xb1, 0xdc, 0x9b, 0xd9, 0x60, 0xad, 0x71, 0x48, 0xa1, 0xb9, 0xd8, 0x1e, 0xbe, 0x46, - 0xfb, 0x3e, 0x93, 0xea, 0x32, 0x16, 0x0e, 0x5c, 0xf1, 0x00, 0xcc, 0xdf, 0x7f, 0xb4, 0x66, 0x4a, - 0x15, 0xf7, 0x92, 0x8c, 0x62, 0x1f, 0x9a, 0x5e, 0xf6, 0xcf, 0xab, 0x4a, 0x74, 0x51, 0x18, 0xff, - 0x8c, 0x70, 0x16, 0xb8, 0x8a, 0x59, 0x28, 0xf3, 0xbf, 0xcb, 0xca, 0x6d, 0xbd, 0x7d, 0xb9, 0x9e, - 0x29, 0x87, 0xcf, 0x97, 0xe4, 0xe8, 0x8a, 0x12, 0xf8, 0x03, 0xb4, 0x1d, 0x03, 0x93, 0x22, 0xec, - 0xb6, 0xf4, 0xd5, 0x15, 0x93, 0xa2, 0x3a, 0x4a, 0x4d, 0x16, 0x7f, 0x88, 0x76, 0x02, 0x90, 0x92, - 0x4d, 0xa0, 0xbb, 0xad, 0x81, 0x8f, 0x0c, 0x70, 0xe7, 0x22, 0x0f, 0xd3, 0x79, 0x7e, 0xf8, 0x47, - 0x1d, 0xed, 0x9c, 0x09, 0xe7, 0x9c, 0x4b, 0x85, 0x7f, 0x58, 0xb2, 0xb8, 0xb5, 0xe1, 0xdf, 0x64, - 0x74, 0xed, 0xf4, 0xc7, 0xa6, 0x50, 0x7b, 0x1e, 0xa9, 0xf8, 0xfc, 0x02, 0xb5, 0xb8, 0x82, 0x20, - 0x9b, 0x7b, 0x73, 0xfd, 0xf3, 0x59, 0xb4, 0xa5, 0xbd, 0x6f, 0x44, 0x5b, 0x5f, 0x67, 0x74, 0x9a, - 0xab, 0x0c, 0xff, 0x6c, 0xea, 0xce, 0x33, 0xe3, 0xe3, 0x11, 0xda, 0x8d, 0x58, 0xcc, 0x7c, 0x1f, - 0x7c, 0x2e, 0x03, 0xdd, 0x7c, 0xcb, 0x7e, 0x94, 0xce, 0x06, 0xbb, 0x97, 0x65, 0x98, 0x56, 0x31, - 0x19, 0xc5, 0x15, 0x41, 0xe4, 0x43, 0x76, 0xbb, 0xb9, 0x17, 0x0d, 0xe5, 0xb4, 0x0c, 0xd3, 0x2a, - 0x06, 0x3f, 0x47, 0x87, 0xcc, 0x55, 0x7c, 0x0a, 0x5f, 0x02, 0xf3, 0x7c, 0x1e, 0xc2, 0x18, 0x5c, - 0x11, 0x7a, 0xf9, 0x3b, 0x6b, 0xda, 0xef, 0xa6, 0xb3, 0xc1, 0xe1, 0x17, 0xab, 0x00, 0x74, 0x35, - 0x0f, 0xff, 0x88, 0xda, 0x12, 0x7c, 0x70, 0x95, 0x88, 0x8d, 0x7d, 0x4e, 0x36, 0xbd, 0x70, 0xe6, - 0x80, 0x3f, 0x36, 0x5c, 0x7b, 0x2f, 0xbb, 0xf1, 0xf9, 0x89, 0x16, 0x9a, 0xf8, 0x33, 0x74, 0x10, - 0xb0, 0x30, 0x61, 0x05, 0x52, 0xfb, 0xa6, 0x6d, 0xe3, 0x74, 0x36, 0x38, 0xb8, 0x58, 0xc8, 0xd0, - 0x7b, 0x48, 0xfc, 0x3d, 0x6a, 0x2b, 0x08, 0x22, 0x9f, 0xa9, 0xdc, 0x44, 0xbb, 0xc7, 0x47, 0xeb, - 0xf7, 0xdd, 0xa5, 0xf0, 0xae, 0x0c, 0x41, 0xaf, 0xa6, 0xc2, 0x0a, 0xf3, 0x28, 0x2d, 0x04, 0x87, - 0xbf, 0x37, 0x51, 0xa7, 0x58, 0x38, 0x18, 0x10, 0x72, 0xe7, 0x8f, 0x5a, 0x76, 0xeb, 0xda, 0x1d, - 0xa3, 0x4d, 0xdd, 0x51, 0xac, 0x83, 0x72, 0xcb, 0x16, 0x21, 0x49, 0x2b, 0xc2, 0xf8, 0x05, 0xea, - 0x48, 0xc5, 0x62, 0xa5, 0x5f, 0x6b, 0xe3, 0xed, 0x5f, 0xeb, 0x7e, 0x3a, 0x1b, 0x74, 0xc6, 0x73, - 0x05, 0x5a, 0x8a, 0xe1, 0x09, 0x3a, 0x28, 0x7d, 0xf2, 0x7f, 0x77, 0x8f, 0x1e, 0xca, 0xe9, 0x82, - 0x0c, 0xbd, 0x27, 0x9b, 0x2d, 0x80, 0xdc, 0x49, 0xda, 0x2e, 0xad, 0x72, 0x01, 0xe4, 0xb6, 0xa3, - 0x26, 0x8b, 0x2d, 0xd4, 0x91, 0x89, 0xeb, 0x02, 0x78, 0xe0, 0xe9, 0x99, 0xb7, 0xec, 0x77, 0x0c, - 0xb4, 0x33, 0x9e, 0x27, 0x68, 0x89, 0xc9, 0x84, 0x5f, 0x32, 0xee, 0x83, 0xa7, 0x67, 0x5d, 0x11, - 0xfe, 0x4a, 0x47, 0xa9, 0xc9, 0xda, 0xef, 0xdf, 0xde, 0xf5, 0x6b, 0xaf, 0xef, 0xfa, 0xb5, 0xbf, - 0xef, 0xfa, 0xb5, 0x5f, 0xd2, 0x7e, 0xfd, 0x36, 0xed, 0xd7, 0x5f, 0xa7, 0xfd, 0xfa, 0x3f, 0x69, - 0xbf, 0xfe, 0xdb, 0xbf, 0xfd, 0xda, 0x77, 0x8d, 0xe9, 0xe8, 0xbf, 0x00, 0x00, 0x00, 0xff, 0xff, - 0x9f, 0xc8, 0x32, 0x84, 0xee, 0x08, 0x00, 0x00, + // 863 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x9c, 0x54, 0x4d, 0x6f, 0xe3, 0x44, + 0x18, 0xce, 0x47, 0xd3, 0x36, 0xd3, 0x8f, 0x5d, 0x46, 0xaa, 0x14, 0x7a, 0x48, 0x56, 0x01, 0xa1, + 0x22, 0xb5, 0xb6, 0x5c, 0xf6, 0x80, 0x38, 0x20, 0xe1, 0x22, 0x24, 0xaa, 0x96, 0xad, 0x26, 0x05, + 0xa1, 0xe5, 0x34, 0xb6, 0xdf, 0x4d, 0x4d, 0x6d, 0x8f, 0xe5, 0x19, 0x47, 0xda, 0x1b, 0x37, 0xae, + 0xfc, 0x14, 0x0e, 0x88, 0xdf, 0xd0, 0x03, 0x87, 0x3d, 0x72, 0xb2, 0xa8, 0xf9, 0x17, 0x7b, 0x42, + 0x33, 0x1e, 0x7f, 0xa4, 0x49, 0x43, 0x76, 0x6f, 0xf6, 0x3b, 0xcf, 0xf3, 0xcc, 0x33, 0xf3, 0x3e, + 0xf3, 0xa2, 0xcf, 0x6e, 0x3f, 0xe7, 0x86, 0xcf, 0xcc, 0xdb, 0xd4, 0x81, 0x24, 0x02, 0x01, 0xdc, + 0x8c, 0x6f, 0xa7, 0x26, 0x8d, 0x7d, 0x6e, 0x3a, 0x54, 0xb8, 0x37, 0xe6, 0xcc, 0x32, 0xa7, 0x10, + 0x41, 0x42, 0x05, 0x78, 0x46, 0x9c, 0x30, 0xc1, 0xf0, 0x47, 0x05, 0xc9, 0xa8, 0x49, 0x46, 0x7c, + 0x3b, 0x35, 0x24, 0xc9, 0x50, 0x24, 0x63, 0x66, 0x1d, 0x9e, 0x4c, 0x7d, 0x71, 0x93, 0x3a, 0x86, + 0xcb, 0x42, 0x73, 0xca, 0xa6, 0xcc, 0x54, 0x5c, 0x27, 0x7d, 0xa5, 0xfe, 0xd4, 0x8f, 0xfa, 0x2a, + 0x34, 0x0f, 0x4f, 0x1f, 0x35, 0x62, 0x26, 0xc0, 0x59, 0x9a, 0xb8, 0xf0, 0xd0, 0xc7, 0xe1, 0xf1, + 0xe3, 0x9c, 0x45, 0xd7, 0x2b, 0x76, 0xe0, 0x66, 0x08, 0x82, 0x2e, 0xe3, 0x9c, 0x2c, 0xe7, 0x24, + 0x69, 0x24, 0xfc, 0x70, 0xd1, 0xd0, 0xf3, 0xd5, 0x70, 0xee, 0xde, 0x40, 0x48, 0x17, 0x58, 0xd6, + 0x72, 0x56, 0x2a, 0xfc, 0xc0, 0xf4, 0x23, 0xc1, 0x45, 0xf2, 0x90, 0x32, 0xfe, 0xb5, 0x83, 0xba, + 0xe7, 0xcc, 0xc1, 0x3f, 0xa2, 0x6d, 0x69, 0xdd, 0xa3, 0x82, 0x0e, 0xda, 0xcf, 0xda, 0x47, 0x3b, + 0xa7, 0x47, 0xc6, 0xa3, 0xcd, 0x31, 0x66, 0x96, 0xf1, 0xc2, 0xf9, 0x19, 0x5c, 0x71, 0x09, 0x82, + 0xda, 0xf8, 0x2e, 0x1b, 0xb5, 0xf2, 0x6c, 0x84, 0xea, 0x1a, 0xa9, 0xd4, 0xf0, 0x77, 0x68, 0x83, + 0xc7, 0xe0, 0x0e, 0x3a, 0x4a, 0xf5, 0xd8, 0x58, 0xa3, 0xe5, 0xc6, 0x39, 0x73, 0x26, 0x31, 0xb8, + 0xf6, 0xae, 0x56, 0xde, 0x90, 0x7f, 0x44, 0xe9, 0xe0, 0x1f, 0xd0, 0x26, 0x17, 0x54, 0xa4, 0x7c, + 0xd0, 0x55, 0x8a, 0xc6, 0xda, 0x8a, 0x8a, 0x65, 0xef, 0x6b, 0xcd, 0xcd, 0xe2, 0x9f, 0x68, 0xb5, + 0xf1, 0x5f, 0x5d, 0xb4, 0x7b, 0xce, 0x9c, 0x33, 0x16, 0x79, 0xbe, 0xf0, 0x59, 0x84, 0x9f, 0xa3, + 0x0d, 0xf1, 0x3a, 0x06, 0x75, 0x1d, 0x7d, 0xfb, 0x59, 0x69, 0xe5, 0xfa, 0x75, 0x0c, 0x6f, 0xb3, + 0xd1, 0xd3, 0x26, 0x56, 0xd6, 0x88, 0x42, 0x37, 0xec, 0x75, 0x14, 0xef, 0xcb, 0xf9, 0xed, 0xde, + 0x66, 0xa3, 0x95, 0x61, 0x33, 0x2a, 0xcd, 0x79, 0x7b, 0x18, 0xd0, 0x5e, 0x40, 0xb9, 0xb8, 0x4a, + 0x98, 0x03, 0xd7, 0x7e, 0x08, 0xfa, 0xf4, 0x47, 0xab, 0x4e, 0x2f, 0x7b, 0x20, 0x0f, 0x2f, 0xf1, + 0xf6, 0x81, 0x36, 0xb2, 0x77, 0xd1, 0x94, 0x21, 0xf3, 0xaa, 0x58, 0x20, 0x2c, 0x0b, 0xd7, 0x09, + 0x8d, 0x78, 0x71, 0x34, 0xb9, 0xd7, 0xc6, 0x3b, 0xee, 0x75, 0xa8, 0xf7, 0xc2, 0x17, 0x0b, 0x5a, + 0x64, 0x89, 0x3e, 0xfe, 0x04, 0x6d, 0x26, 0x40, 0x39, 0x8b, 0x06, 0x3d, 0x75, 0x69, 0x55, 0x8f, + 0x88, 0xaa, 0x12, 0xbd, 0x8a, 0x3f, 0x45, 0x5b, 0x21, 0x70, 0x4e, 0xa7, 0x30, 0xd8, 0x54, 0xc0, + 0x27, 0x1a, 0xb8, 0x75, 0x59, 0x94, 0x49, 0xb9, 0x3e, 0xfe, 0xa3, 0x8d, 0xb6, 0xce, 0x99, 0x73, + 0xe1, 0x73, 0x81, 0x5f, 0x2e, 0x84, 0xfb, 0x78, 0x9d, 0xa3, 0x48, 0xae, 0x0a, 0xf8, 0x53, 0xbd, + 0xcb, 0x76, 0x59, 0x69, 0xc4, 0xfb, 0x12, 0xf5, 0x7c, 0x01, 0xa1, 0x6c, 0x77, 0xf7, 0xff, 0xee, + 0xa8, 0x99, 0x46, 0x7b, 0x4f, 0x8b, 0xf6, 0xbe, 0x95, 0x74, 0x52, 0xa8, 0x8c, 0xff, 0xec, 0x2a, + 0xdb, 0x32, 0xef, 0xd8, 0x42, 0x3b, 0x31, 0x4d, 0x68, 0x10, 0x40, 0xe0, 0xf3, 0x50, 0x39, 0xef, + 0xd9, 0x4f, 0xf2, 0x6c, 0xb4, 0x73, 0x55, 0x97, 0x49, 0x13, 0x23, 0x29, 0x2e, 0x0b, 0xe3, 0x00, + 0xe4, 0xd5, 0x16, 0x11, 0xd4, 0x94, 0xb3, 0xba, 0x4c, 0x9a, 0x18, 0xfc, 0x02, 0x1d, 0x50, 0x57, + 0xf8, 0x33, 0xf8, 0x1a, 0xa8, 0x17, 0xf8, 0x11, 0x4c, 0xc0, 0x65, 0x91, 0x57, 0x3c, 0xaf, 0xae, + 0xfd, 0x61, 0x9e, 0x8d, 0x0e, 0xbe, 0x5a, 0x06, 0x20, 0xcb, 0x79, 0xf8, 0x27, 0xb4, 0xcd, 0x21, + 0x00, 0x57, 0xb0, 0x44, 0x07, 0xc7, 0x5a, 0xeb, 0xb6, 0xa9, 0x03, 0xc1, 0x44, 0x13, 0xed, 0x5d, + 0x79, 0xdd, 0xe5, 0x1f, 0xa9, 0x04, 0xf1, 0x17, 0x68, 0x3f, 0xa4, 0x51, 0x4a, 0x2b, 0xa4, 0x4a, + 0xcc, 0xb6, 0x8d, 0xf3, 0x6c, 0xb4, 0x7f, 0x39, 0xb7, 0x42, 0x1e, 0x20, 0xa5, 0x31, 0x01, 0x61, + 0x1c, 0x50, 0x51, 0xc4, 0x67, 0xe7, 0xf4, 0x64, 0xf5, 0x8c, 0xbb, 0x62, 0xde, 0xb5, 0x26, 0xa8, + 0x71, 0x54, 0xe5, 0xa0, 0xac, 0x92, 0x4a, 0x70, 0xfc, 0x7b, 0x17, 0xf5, 0xab, 0x21, 0x83, 0x01, + 0x21, 0xb7, 0x7c, 0xc8, 0x7c, 0xd0, 0x56, 0xd1, 0xb0, 0xd6, 0x8d, 0x46, 0x35, 0x02, 0xea, 0xc9, + 0x5a, 0x95, 0x38, 0x69, 0x08, 0xe3, 0xef, 0x51, 0x9f, 0x0b, 0x9a, 0x08, 0xf5, 0x48, 0x3b, 0xef, + 0xf8, 0x48, 0xf7, 0xf2, 0x6c, 0xd4, 0x9f, 0x94, 0x74, 0x52, 0x2b, 0x61, 0x0f, 0xed, 0xd7, 0x09, + 0x79, 0xaf, 0x61, 0xa3, 0xda, 0x71, 0x36, 0xa7, 0x41, 0x1e, 0x68, 0xca, 0x47, 0x5f, 0x04, 0x48, + 0xa5, 0xa4, 0x57, 0x3f, 0xfa, 0x22, 0x6d, 0x44, 0xaf, 0x62, 0x13, 0xf5, 0x79, 0xea, 0xba, 0x00, + 0x1e, 0x78, 0xaa, 0xdb, 0x3d, 0xfb, 0x03, 0x0d, 0xed, 0x4f, 0xca, 0x05, 0x52, 0x63, 0xa4, 0xf0, + 0x2b, 0xea, 0x07, 0xe0, 0xa9, 0x2e, 0x37, 0x84, 0xbf, 0x51, 0x55, 0xa2, 0x57, 0xed, 0x8f, 0xef, + 0xee, 0x87, 0xad, 0x37, 0xf7, 0xc3, 0xd6, 0xdf, 0xf7, 0xc3, 0xd6, 0x2f, 0xf9, 0xb0, 0x7d, 0x97, + 0x0f, 0xdb, 0x6f, 0xf2, 0x61, 0xfb, 0x9f, 0x7c, 0xd8, 0xfe, 0xed, 0xdf, 0x61, 0xeb, 0x65, 0x67, + 0x66, 0xfd, 0x17, 0x00, 0x00, 0xff, 0xff, 0x9b, 0x37, 0xe1, 0x87, 0xd9, 0x08, 0x00, 0x00, } diff --git a/pkg/apis/batch/v1/generated.proto b/pkg/apis/batch/v1/generated.proto index 25957a999d0..62122e211ec 100644 --- a/pkg/apis/batch/v1/generated.proto +++ b/pkg/apis/batch/v1/generated.proto @@ -22,8 +22,8 @@ syntax = 'proto2'; package k8s.io.kubernetes.pkg.apis.batch.v1; import "k8s.io/kubernetes/pkg/api/resource/generated.proto"; -import "k8s.io/kubernetes/pkg/api/unversioned/generated.proto"; import "k8s.io/kubernetes/pkg/api/v1/generated.proto"; +import "k8s.io/kubernetes/pkg/apis/meta/v1/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/schema/generated.proto"; import "k8s.io/kubernetes/pkg/util/intstr/generated.proto"; @@ -59,11 +59,11 @@ message JobCondition { // Last time the condition was checked. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time lastProbeTime = 3; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time lastProbeTime = 3; // Last time the condition transit from one status to another. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time lastTransitionTime = 4; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time lastTransitionTime = 4; // (brief) reason for the condition's last transition. // +optional @@ -79,7 +79,7 @@ message JobList { // Standard list metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // Items is the list of Job. repeated Job items = 2; @@ -113,7 +113,7 @@ message JobSpec { // Normally, the system sets this field for you. // More info: http://kubernetes.io/docs/user-guide/labels#label-selectors // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.LabelSelector selector = 4; + optional k8s.io.kubernetes.pkg.apis.meta.v1.LabelSelector selector = 4; // ManualSelector controls generation of pod labels and pod selectors. // Leave `manualSelector` unset unless you are certain what you are doing. @@ -145,13 +145,13 @@ message JobStatus { // It is not guaranteed to be set in happens-before order across separate operations. // It is represented in RFC3339 form and is in UTC. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time startTime = 2; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time startTime = 2; // CompletionTime represents time when the job was completed. It is not guaranteed to // be set in happens-before order across separate operations. // It is represented in RFC3339 form and is in UTC. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time completionTime = 3; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time completionTime = 3; // Active is the number of actively running pods. // +optional diff --git a/pkg/apis/batch/v1/register.go b/pkg/apis/batch/v1/register.go index 539210e4807..5af162b46db 100644 --- a/pkg/apis/batch/v1/register.go +++ b/pkg/apis/batch/v1/register.go @@ -17,8 +17,8 @@ limitations under the License. package v1 import ( - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" versionedwatch "k8s.io/kubernetes/pkg/watch/versioned" diff --git a/pkg/apis/batch/v1/types.generated.go b/pkg/apis/batch/v1/types.generated.go index 0f8b73c0da0..7242a724186 100644 --- a/pkg/apis/batch/v1/types.generated.go +++ b/pkg/apis/batch/v1/types.generated.go @@ -26,8 +26,8 @@ import ( "fmt" codec1978 "github.com/ugorji/go/codec" pkg4_resource "k8s.io/kubernetes/pkg/api/resource" - pkg1_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" pkg2_v1 "k8s.io/kubernetes/pkg/api/v1" + pkg1_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" pkg3_types "k8s.io/kubernetes/pkg/types" pkg5_intstr "k8s.io/kubernetes/pkg/util/intstr" "reflect" @@ -66,8 +66,8 @@ func init() { } if false { // reference the types, but skip this branch at build/run time var v0 pkg4_resource.Quantity - var v1 pkg1_unversioned.TypeMeta - var v2 pkg2_v1.ObjectMeta + var v1 pkg2_v1.ObjectMeta + var v2 pkg1_v1.TypeMeta var v3 pkg3_types.UID var v4 pkg5_intstr.IntOrString var v5 time.Time @@ -632,7 +632,7 @@ func (x *JobList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv53 := &x.ListMeta yym54 := z.DecBinary() @@ -713,7 +713,7 @@ func (x *JobList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv60 := &x.ListMeta yym61 := z.DecBinary() @@ -1099,7 +1099,7 @@ func (x *JobSpec) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.Selector == nil { - x.Selector = new(pkg1_unversioned.LabelSelector) + x.Selector = new(pkg1_v1.LabelSelector) } yym102 := z.DecBinary() _ = yym102 @@ -1241,7 +1241,7 @@ func (x *JobSpec) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } else { if x.Selector == nil { - x.Selector = new(pkg1_unversioned.LabelSelector) + x.Selector = new(pkg1_v1.LabelSelector) } yym114 := z.DecBinary() _ = yym114 @@ -1620,7 +1620,7 @@ func (x *JobStatus) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.StartTime == nil { - x.StartTime = new(pkg1_unversioned.Time) + x.StartTime = new(pkg1_v1.Time) } yym144 := z.DecBinary() _ = yym144 @@ -1641,7 +1641,7 @@ func (x *JobStatus) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.CompletionTime == nil { - x.CompletionTime = new(pkg1_unversioned.Time) + x.CompletionTime = new(pkg1_v1.Time) } yym146 := z.DecBinary() _ = yym146 @@ -1726,7 +1726,7 @@ func (x *JobStatus) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } else { if x.StartTime == nil { - x.StartTime = new(pkg1_unversioned.Time) + x.StartTime = new(pkg1_v1.Time) } yym154 := z.DecBinary() _ = yym154 @@ -1757,7 +1757,7 @@ func (x *JobStatus) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } else { if x.CompletionTime == nil { - x.CompletionTime = new(pkg1_unversioned.Time) + x.CompletionTime = new(pkg1_v1.Time) } yym156 := z.DecBinary() _ = yym156 @@ -2124,7 +2124,7 @@ func (x *JobCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "lastProbeTime": if r.TryDecodeAsNil() { - x.LastProbeTime = pkg1_unversioned.Time{} + x.LastProbeTime = pkg1_v1.Time{} } else { yyv189 := &x.LastProbeTime yym190 := z.DecBinary() @@ -2141,7 +2141,7 @@ func (x *JobCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "lastTransitionTime": if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg1_unversioned.Time{} + x.LastTransitionTime = pkg1_v1.Time{} } else { yyv191 := &x.LastTransitionTime yym192 := z.DecBinary() @@ -2226,7 +2226,7 @@ func (x *JobCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastProbeTime = pkg1_unversioned.Time{} + x.LastProbeTime = pkg1_v1.Time{} } else { yyv198 := &x.LastProbeTime yym199 := z.DecBinary() @@ -2253,7 +2253,7 @@ func (x *JobCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg1_unversioned.Time{} + x.LastTransitionTime = pkg1_v1.Time{} } else { yyv200 := &x.LastTransitionTime yym201 := z.DecBinary() diff --git a/pkg/apis/batch/v1/types.go b/pkg/apis/batch/v1/types.go index 6d549a91ff6..b3dd42adc83 100644 --- a/pkg/apis/batch/v1/types.go +++ b/pkg/apis/batch/v1/types.go @@ -17,8 +17,8 @@ limitations under the License. package v1 import ( - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" ) // +genclient=true diff --git a/pkg/apis/batch/v2alpha1/generated.pb.go b/pkg/apis/batch/v2alpha1/generated.pb.go index 67ebb92298f..a4d8e36af98 100644 --- a/pkg/apis/batch/v2alpha1/generated.pb.go +++ b/pkg/apis/batch/v2alpha1/generated.pb.go @@ -43,8 +43,8 @@ import proto "github.com/gogo/protobuf/proto" import fmt "fmt" import math "math" -import k8s_io_kubernetes_pkg_api_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" import k8s_io_kubernetes_pkg_api_v1 "k8s.io/kubernetes/pkg/api/v1" +import k8s_io_kubernetes_pkg_apis_meta_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" import strings "strings" import reflect "reflect" @@ -832,7 +832,7 @@ func (this *CronJobList) String() string { return "nil" } s := strings.Join([]string{`&CronJobList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "CronJob", "CronJob", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -858,7 +858,7 @@ func (this *CronJobStatus) String() string { } s := strings.Join([]string{`&CronJobStatus{`, `Active:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Active), "ObjectReference", "k8s_io_kubernetes_pkg_api_v1.ObjectReference", 1), `&`, ``, 1) + `,`, - `LastScheduleTime:` + strings.Replace(fmt.Sprintf("%v", this.LastScheduleTime), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1) + `,`, + `LastScheduleTime:` + strings.Replace(fmt.Sprintf("%v", this.LastScheduleTime), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1) + `,`, `}`, }, "") return s @@ -882,8 +882,8 @@ func (this *JobCondition) String() string { s := strings.Join([]string{`&JobCondition{`, `Type:` + fmt.Sprintf("%v", this.Type) + `,`, `Status:` + fmt.Sprintf("%v", this.Status) + `,`, - `LastProbeTime:` + strings.Replace(strings.Replace(this.LastProbeTime.String(), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1), `&`, ``, 1) + `,`, - `LastTransitionTime:` + strings.Replace(strings.Replace(this.LastTransitionTime.String(), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1), `&`, ``, 1) + `,`, + `LastProbeTime:` + strings.Replace(strings.Replace(this.LastProbeTime.String(), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1), `&`, ``, 1) + `,`, + `LastTransitionTime:` + strings.Replace(strings.Replace(this.LastTransitionTime.String(), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1), `&`, ``, 1) + `,`, `Reason:` + fmt.Sprintf("%v", this.Reason) + `,`, `Message:` + fmt.Sprintf("%v", this.Message) + `,`, `}`, @@ -895,7 +895,7 @@ func (this *JobList) String() string { return "nil" } s := strings.Join([]string{`&JobList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "Job", "Job", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -909,7 +909,7 @@ func (this *JobSpec) String() string { `Parallelism:` + valueToStringGenerated(this.Parallelism) + `,`, `Completions:` + valueToStringGenerated(this.Completions) + `,`, `ActiveDeadlineSeconds:` + valueToStringGenerated(this.ActiveDeadlineSeconds) + `,`, - `Selector:` + strings.Replace(fmt.Sprintf("%v", this.Selector), "LabelSelector", "k8s_io_kubernetes_pkg_api_unversioned.LabelSelector", 1) + `,`, + `Selector:` + strings.Replace(fmt.Sprintf("%v", this.Selector), "LabelSelector", "k8s_io_kubernetes_pkg_apis_meta_v1.LabelSelector", 1) + `,`, `ManualSelector:` + valueToStringGenerated(this.ManualSelector) + `,`, `Template:` + strings.Replace(strings.Replace(this.Template.String(), "PodTemplateSpec", "k8s_io_kubernetes_pkg_api_v1.PodTemplateSpec", 1), `&`, ``, 1) + `,`, `}`, @@ -922,8 +922,8 @@ func (this *JobStatus) String() string { } s := strings.Join([]string{`&JobStatus{`, `Conditions:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Conditions), "JobCondition", "JobCondition", 1), `&`, ``, 1) + `,`, - `StartTime:` + strings.Replace(fmt.Sprintf("%v", this.StartTime), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1) + `,`, - `CompletionTime:` + strings.Replace(fmt.Sprintf("%v", this.CompletionTime), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1) + `,`, + `StartTime:` + strings.Replace(fmt.Sprintf("%v", this.StartTime), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1) + `,`, + `CompletionTime:` + strings.Replace(fmt.Sprintf("%v", this.CompletionTime), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1) + `,`, `Active:` + fmt.Sprintf("%v", this.Active) + `,`, `Succeeded:` + fmt.Sprintf("%v", this.Succeeded) + `,`, `Failed:` + fmt.Sprintf("%v", this.Failed) + `,`, @@ -1478,7 +1478,7 @@ func (m *CronJobStatus) Unmarshal(data []byte) error { return io.ErrUnexpectedEOF } if m.LastScheduleTime == nil { - m.LastScheduleTime = &k8s_io_kubernetes_pkg_api_unversioned.Time{} + m.LastScheduleTime = &k8s_io_kubernetes_pkg_apis_meta_v1.Time{} } if err := m.LastScheduleTime.Unmarshal(data[iNdEx:postIndex]); err != nil { return err @@ -2098,7 +2098,7 @@ func (m *JobSpec) Unmarshal(data []byte) error { return io.ErrUnexpectedEOF } if m.Selector == nil { - m.Selector = &k8s_io_kubernetes_pkg_api_unversioned.LabelSelector{} + m.Selector = &k8s_io_kubernetes_pkg_apis_meta_v1.LabelSelector{} } if err := m.Selector.Unmarshal(data[iNdEx:postIndex]); err != nil { return err @@ -2263,7 +2263,7 @@ func (m *JobStatus) Unmarshal(data []byte) error { return io.ErrUnexpectedEOF } if m.StartTime == nil { - m.StartTime = &k8s_io_kubernetes_pkg_api_unversioned.Time{} + m.StartTime = &k8s_io_kubernetes_pkg_apis_meta_v1.Time{} } if err := m.StartTime.Unmarshal(data[iNdEx:postIndex]); err != nil { return err @@ -2296,7 +2296,7 @@ func (m *JobStatus) Unmarshal(data []byte) error { return io.ErrUnexpectedEOF } if m.CompletionTime == nil { - m.CompletionTime = &k8s_io_kubernetes_pkg_api_unversioned.Time{} + m.CompletionTime = &k8s_io_kubernetes_pkg_apis_meta_v1.Time{} } if err := m.CompletionTime.Unmarshal(data[iNdEx:postIndex]); err != nil { return err @@ -2706,77 +2706,77 @@ var ( ) var fileDescriptorGenerated = []byte{ - // 1149 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xd4, 0x56, 0x4d, 0x6f, 0xe3, 0x44, - 0x18, 0xae, 0x93, 0x36, 0x1f, 0x93, 0xed, 0xd7, 0x40, 0xb5, 0xa1, 0x48, 0x49, 0x15, 0x09, 0xd4, - 0x85, 0xad, 0xad, 0x46, 0x05, 0x96, 0x3d, 0x20, 0xad, 0x8b, 0x90, 0xa8, 0x5a, 0x6d, 0x35, 0xe9, - 0x42, 0x05, 0x0b, 0x62, 0x62, 0x4f, 0x13, 0x6f, 0x6d, 0x8f, 0xf1, 0x8c, 0x8b, 0x7a, 0xe3, 0xcc, - 0x09, 0x89, 0x1f, 0xc0, 0xef, 0x40, 0x82, 0x03, 0x07, 0xa4, 0x1e, 0x17, 0x24, 0x24, 0x4e, 0x11, - 0x35, 0xff, 0xa2, 0x27, 0xe4, 0xf1, 0xf8, 0x23, 0x5f, 0xa5, 0x29, 0x5a, 0x24, 0x6e, 0xf1, 0x3b, - 0xcf, 0xf3, 0xcc, 0x3b, 0xf3, 0x3e, 0xf3, 0xbe, 0x01, 0xef, 0x9e, 0x3e, 0x60, 0xaa, 0x45, 0xb5, - 0xd3, 0xa0, 0x4b, 0x7c, 0x97, 0x70, 0xc2, 0x34, 0xef, 0xb4, 0xa7, 0x61, 0xcf, 0x62, 0x5a, 0x17, - 0x73, 0xa3, 0xaf, 0x9d, 0xb5, 0xb1, 0xed, 0xf5, 0xf1, 0xb6, 0xd6, 0x23, 0x2e, 0xf1, 0x31, 0x27, - 0xa6, 0xea, 0xf9, 0x94, 0x53, 0x78, 0x2f, 0xa6, 0xaa, 0x19, 0x55, 0xf5, 0x4e, 0x7b, 0x6a, 0x44, - 0x55, 0x05, 0x55, 0x4d, 0xa8, 0xeb, 0x5b, 0x3d, 0x8b, 0xf7, 0x83, 0xae, 0x6a, 0x50, 0x47, 0xeb, - 0xd1, 0x1e, 0xd5, 0x84, 0x42, 0x37, 0x38, 0x11, 0x5f, 0xe2, 0x43, 0xfc, 0x8a, 0x95, 0xd7, 0xdb, - 0x53, 0x93, 0xd2, 0x7c, 0xc2, 0x68, 0xe0, 0x1b, 0x64, 0x34, 0x9b, 0xf5, 0xb7, 0xa6, 0x73, 0x02, - 0xf7, 0x8c, 0xf8, 0xcc, 0xa2, 0x2e, 0x31, 0xc7, 0x68, 0xf7, 0xa7, 0xd3, 0xce, 0xc6, 0x8e, 0xbc, - 0xbe, 0x35, 0x19, 0xed, 0x07, 0x2e, 0xb7, 0x9c, 0xf1, 0x9c, 0x76, 0xae, 0x87, 0x33, 0xa3, 0x4f, - 0x1c, 0x3c, 0xc6, 0xda, 0x9e, 0xcc, 0x0a, 0xb8, 0x65, 0x6b, 0x96, 0xcb, 0x19, 0xf7, 0x47, 0x29, - 0xad, 0xef, 0x0b, 0xa0, 0xbc, 0xeb, 0x53, 0x77, 0x8f, 0x76, 0xe1, 0x31, 0xa8, 0x38, 0x84, 0x63, - 0x13, 0x73, 0x5c, 0x57, 0x36, 0x94, 0xcd, 0x5a, 0x7b, 0x53, 0x9d, 0x5a, 0x29, 0xf5, 0x6c, 0x5b, - 0x7d, 0xdc, 0x7d, 0x46, 0x0c, 0x7e, 0x40, 0x38, 0xd6, 0xe1, 0xc5, 0xa0, 0x39, 0x17, 0x0e, 0x9a, - 0x20, 0x8b, 0xa1, 0x54, 0x0d, 0x1e, 0x83, 0x79, 0xe6, 0x11, 0xa3, 0x5e, 0x10, 0xaa, 0x6f, 0xab, - 0x37, 0xae, 0xbf, 0x2a, 0x73, 0xeb, 0x78, 0xc4, 0xd0, 0xef, 0xc8, 0x3d, 0xe6, 0xa3, 0x2f, 0x24, - 0x14, 0xe1, 0x17, 0xa0, 0xc4, 0x38, 0xe6, 0x01, 0xab, 0x17, 0x85, 0xf6, 0x83, 0x5b, 0x68, 0x0b, - 0xbe, 0xbe, 0x24, 0xd5, 0x4b, 0xf1, 0x37, 0x92, 0xba, 0xad, 0x5f, 0x14, 0x50, 0x93, 0xc8, 0x7d, - 0x8b, 0x71, 0xf8, 0xd9, 0xd8, 0x2d, 0x69, 0xd7, 0xdc, 0x52, 0xce, 0x41, 0x6a, 0x44, 0x17, 0x97, - 0xb5, 0x22, 0xb7, 0xaa, 0x24, 0x91, 0xdc, 0x55, 0x7d, 0x0c, 0x16, 0x2c, 0x4e, 0x1c, 0x56, 0x2f, - 0x6c, 0x14, 0x37, 0x6b, 0xed, 0xf6, 0xec, 0xe7, 0xd1, 0x17, 0xa5, 0xfc, 0xc2, 0x87, 0x91, 0x10, - 0x8a, 0xf5, 0x5a, 0xdf, 0x14, 0xd3, 0x73, 0x44, 0xf7, 0x07, 0xef, 0x83, 0x4a, 0x64, 0x23, 0x33, - 0xb0, 0x89, 0x38, 0x47, 0x35, 0x4b, 0xab, 0x23, 0xe3, 0x28, 0x45, 0xc0, 0x27, 0xe0, 0x2e, 0xe3, - 0xd8, 0xe7, 0x96, 0xdb, 0x7b, 0x9f, 0x60, 0xd3, 0xb6, 0x5c, 0xd2, 0x21, 0x06, 0x75, 0x4d, 0x26, - 0x8a, 0x5a, 0xd4, 0x5f, 0x0d, 0x07, 0xcd, 0xbb, 0x9d, 0xc9, 0x10, 0x34, 0x8d, 0x0b, 0x9f, 0x82, - 0x55, 0x83, 0xba, 0x46, 0xe0, 0xfb, 0xc4, 0x35, 0xce, 0x0f, 0xa9, 0x6d, 0x19, 0xe7, 0xa2, 0x92, - 0x55, 0x5d, 0x95, 0xd9, 0xac, 0xee, 0x8e, 0x02, 0xae, 0x26, 0x05, 0xd1, 0xb8, 0x10, 0x7c, 0x0d, - 0x94, 0x59, 0xc0, 0x3c, 0xe2, 0x9a, 0xf5, 0xf9, 0x0d, 0x65, 0xb3, 0xa2, 0xd7, 0xc2, 0x41, 0xb3, - 0xdc, 0x89, 0x43, 0x28, 0x59, 0x83, 0x5f, 0x82, 0xda, 0x33, 0xda, 0x3d, 0x22, 0x8e, 0x67, 0x63, - 0x4e, 0xea, 0x0b, 0xa2, 0xa8, 0x0f, 0x67, 0xb8, 0xf8, 0xbd, 0x8c, 0x2d, 0x8c, 0xfa, 0x92, 0x4c, - 0xbd, 0x96, 0x5b, 0x40, 0xf9, 0x3d, 0x5a, 0xbf, 0x2b, 0x60, 0x71, 0xc8, 0x7e, 0xf0, 0x09, 0x28, - 0x61, 0x83, 0x5b, 0x67, 0x51, 0x31, 0xa2, 0xc2, 0x6f, 0xdd, 0xe4, 0xe9, 0x21, 0x72, 0x42, 0xa2, - 0x03, 0x93, 0xcc, 0xbd, 0x8f, 0x84, 0x08, 0x92, 0x62, 0xd0, 0x01, 0x2b, 0x36, 0x66, 0x3c, 0xa9, - 0xe8, 0x91, 0xe5, 0x10, 0x71, 0x17, 0xb5, 0xf6, 0x9b, 0x37, 0x74, 0x6d, 0x44, 0xd1, 0x5f, 0x0e, - 0x07, 0xcd, 0x95, 0xfd, 0x11, 0x21, 0x34, 0x26, 0xdd, 0xfa, 0xae, 0x00, 0x8a, 0x2f, 0xb6, 0x95, - 0x1c, 0x0d, 0xb5, 0x92, 0xf6, 0x6c, 0x55, 0x9a, 0xda, 0x46, 0x9e, 0x8e, 0xb4, 0x91, 0x9d, 0x19, - 0x75, 0xaf, 0x6f, 0x21, 0xbf, 0x15, 0xc1, 0x9d, 0x3d, 0xda, 0xdd, 0xa5, 0xae, 0x69, 0x71, 0x8b, - 0xba, 0x70, 0x07, 0xcc, 0xf3, 0x73, 0x2f, 0x79, 0x77, 0x1b, 0x49, 0x42, 0x47, 0xe7, 0x1e, 0xb9, - 0x1a, 0x34, 0x57, 0xf2, 0xd8, 0x28, 0x86, 0x04, 0x1a, 0x7e, 0x94, 0x26, 0x59, 0x10, 0xbc, 0xf7, - 0x86, 0xb7, 0xbb, 0x1a, 0x34, 0xaf, 0x9d, 0x49, 0x6a, 0xaa, 0x39, 0x9c, 0x1e, 0xec, 0x83, 0xc5, - 0xa8, 0x90, 0x87, 0x3e, 0xed, 0xc6, 0x06, 0x29, 0xce, 0x6e, 0x90, 0x35, 0x99, 0xcb, 0xe2, 0x7e, - 0x5e, 0x09, 0x0d, 0x0b, 0xc3, 0xaf, 0x00, 0x8c, 0x02, 0x47, 0x3e, 0x76, 0x59, 0x7c, 0xba, 0x5b, - 0xfa, 0x71, 0x5d, 0x6e, 0x07, 0xf7, 0xc7, 0xe4, 0xd0, 0x84, 0x2d, 0xe0, 0xeb, 0xa0, 0xe4, 0x13, - 0xcc, 0xa8, 0x2b, 0x5e, 0x77, 0x35, 0xab, 0x14, 0x12, 0x51, 0x24, 0x57, 0xe1, 0x3d, 0x50, 0x76, - 0x08, 0x63, 0xb8, 0x47, 0xea, 0x25, 0x01, 0x5c, 0x96, 0xc0, 0xf2, 0x41, 0x1c, 0x46, 0xc9, 0x7a, - 0xeb, 0x27, 0x05, 0x94, 0xff, 0xa3, 0x99, 0xd0, 0x19, 0x9e, 0x09, 0xea, 0x6c, 0xe6, 0x9c, 0x32, - 0x0f, 0x7e, 0x28, 0x8a, 0xfc, 0xc5, 0x2c, 0xd8, 0x06, 0x35, 0x0f, 0xfb, 0xd8, 0xb6, 0x89, 0x6d, - 0x31, 0x47, 0x1c, 0x61, 0x41, 0x5f, 0x8e, 0x3a, 0xd8, 0x61, 0x16, 0x46, 0x79, 0x4c, 0x44, 0x31, - 0xa8, 0xe3, 0xd9, 0x24, 0xba, 0xe3, 0xd8, 0x91, 0x92, 0xb2, 0x9b, 0x85, 0x51, 0x1e, 0x03, 0x1f, - 0x83, 0xb5, 0xb8, 0x2b, 0x8d, 0x4e, 0x90, 0xa2, 0x98, 0x20, 0xaf, 0x84, 0x83, 0xe6, 0xda, 0xa3, - 0x49, 0x00, 0x34, 0x99, 0x07, 0x3f, 0x07, 0x15, 0x46, 0x6c, 0x62, 0x70, 0xea, 0x4b, 0x13, 0xed, - 0xdc, 0xf4, 0xda, 0x71, 0x97, 0xd8, 0x1d, 0xc9, 0xd5, 0xef, 0x88, 0xa1, 0x27, 0xbf, 0x50, 0xaa, - 0x09, 0x1f, 0x82, 0x25, 0x07, 0xbb, 0x01, 0x4e, 0x91, 0xc2, 0x3d, 0x15, 0x1d, 0x86, 0x83, 0xe6, - 0xd2, 0xc1, 0xd0, 0x0a, 0x1a, 0x41, 0xc2, 0x4f, 0x41, 0x85, 0x27, 0x13, 0xa5, 0x24, 0x72, 0xfb, - 0x87, 0x8e, 0x7e, 0x48, 0xcd, 0xa1, 0x21, 0x92, 0x1a, 0x22, 0x9d, 0x20, 0xa9, 0x60, 0xeb, 0xc7, - 0x22, 0xa8, 0x66, 0xa3, 0xe3, 0x14, 0x00, 0x23, 0x79, 0xda, 0x4c, 0x8e, 0x8f, 0x77, 0x66, 0xf3, - 0x48, 0xda, 0x1a, 0xb2, 0xee, 0x9b, 0x86, 0x18, 0xca, 0xc9, 0xc3, 0x63, 0x50, 0x15, 0xc3, 0x5c, - 0xbc, 0xdc, 0xc2, 0xec, 0x2f, 0x77, 0x31, 0x1c, 0x34, 0xab, 0x9d, 0x44, 0x01, 0x65, 0x62, 0xb0, - 0x07, 0x96, 0x32, 0xb7, 0xdc, 0xb6, 0x0f, 0x89, 0xd2, 0xec, 0x0e, 0xc9, 0xa0, 0x11, 0xd9, 0xa8, - 0x19, 0xc8, 0x51, 0x3b, 0x2f, 0x5c, 0x3b, 0x6d, 0x76, 0x6a, 0xa0, 0xca, 0x02, 0xc3, 0x20, 0xc4, - 0x24, 0xa6, 0xa8, 0xfc, 0x82, 0xbe, 0x2a, 0xa1, 0xd5, 0x4e, 0xb2, 0x80, 0x32, 0x4c, 0x24, 0x7c, - 0x82, 0x2d, 0x9b, 0x98, 0xa2, 0xe2, 0x39, 0xe1, 0x0f, 0x44, 0x14, 0xc9, 0xd5, 0xd6, 0xaf, 0x0a, - 0xc8, 0xff, 0x35, 0x78, 0x81, 0xd3, 0xb2, 0x9f, 0x73, 0x61, 0xe1, 0x5f, 0xff, 0xaf, 0xb9, 0xce, - 0x92, 0x3f, 0x2b, 0x60, 0x79, 0x04, 0xff, 0x7f, 0xfb, 0x17, 0xa0, 0xbf, 0x71, 0x71, 0xd9, 0x98, - 0x7b, 0x7e, 0xd9, 0x98, 0xfb, 0xe3, 0xb2, 0x31, 0xf7, 0x75, 0xd8, 0x50, 0x2e, 0xc2, 0x86, 0xf2, - 0x3c, 0x6c, 0x28, 0x7f, 0x86, 0x0d, 0xe5, 0xdb, 0xbf, 0x1a, 0x73, 0x9f, 0x54, 0x12, 0x9d, 0xbf, - 0x03, 0x00, 0x00, 0xff, 0xff, 0x74, 0x47, 0xe8, 0xb0, 0xff, 0x0e, 0x00, 0x00, + // 1137 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xd4, 0x56, 0x4b, 0x6f, 0x23, 0x45, + 0x17, 0x4d, 0xdb, 0x89, 0x1f, 0xe5, 0x3c, 0xeb, 0xfb, 0xa2, 0x31, 0x41, 0xb2, 0x23, 0x4b, 0xa0, + 0x0c, 0x4a, 0xba, 0x15, 0x2b, 0x82, 0x61, 0x16, 0x48, 0xd3, 0x41, 0x48, 0x44, 0x89, 0x26, 0x2a, + 0x27, 0x30, 0x1a, 0x66, 0x41, 0xb9, 0xbb, 0xe2, 0x74, 0xd2, 0xee, 0x6a, 0xba, 0xaa, 0x23, 0x65, + 0xc7, 0x9a, 0x15, 0x12, 0x3f, 0x80, 0x7f, 0xc1, 0x82, 0x1d, 0xac, 0xb2, 0x60, 0x31, 0xb0, 0x62, + 0x65, 0x91, 0xe6, 0x5f, 0x64, 0x85, 0xaa, 0x5c, 0xfd, 0xf0, 0x93, 0x38, 0x68, 0x90, 0xd8, 0xb9, + 0x6f, 0x9d, 0x73, 0xea, 0x56, 0xdd, 0x53, 0xf7, 0x1a, 0x7c, 0x78, 0xf9, 0x84, 0xe9, 0x0e, 0x35, + 0x2e, 0xc3, 0x36, 0x09, 0x3c, 0xc2, 0x09, 0x33, 0xfc, 0xcb, 0x8e, 0x81, 0x7d, 0x87, 0x19, 0x6d, + 0xcc, 0xad, 0x73, 0xe3, 0xaa, 0x89, 0x5d, 0xff, 0x1c, 0xef, 0x1a, 0x1d, 0xe2, 0x91, 0x00, 0x73, + 0x62, 0xeb, 0x7e, 0x40, 0x39, 0x85, 0x8f, 0xfb, 0x54, 0x3d, 0xa5, 0xea, 0xfe, 0x65, 0x47, 0x17, + 0x54, 0x5d, 0x52, 0xf5, 0x98, 0xba, 0xb1, 0xd3, 0x71, 0xf8, 0x79, 0xd8, 0xd6, 0x2d, 0xda, 0x35, + 0x3a, 0xb4, 0x43, 0x0d, 0xa9, 0xd0, 0x0e, 0xcf, 0xe4, 0x97, 0xfc, 0x90, 0xbf, 0xfa, 0xca, 0x1b, + 0xcd, 0x89, 0x49, 0x19, 0x01, 0x61, 0x34, 0x0c, 0x2c, 0x32, 0x9c, 0xcd, 0xc6, 0xf6, 0x64, 0xce, + 0xd5, 0x48, 0xee, 0x53, 0x76, 0x60, 0x46, 0x97, 0x70, 0x3c, 0x8e, 0xb3, 0x33, 0x9e, 0x13, 0x84, + 0x1e, 0x77, 0xba, 0xa3, 0x09, 0xed, 0x4d, 0x87, 0x33, 0xeb, 0x9c, 0x74, 0xf1, 0x08, 0x6b, 0x77, + 0x3c, 0x2b, 0xe4, 0x8e, 0x6b, 0x38, 0x1e, 0x67, 0x3c, 0x18, 0xa6, 0x34, 0xbe, 0xcf, 0x81, 0xe2, + 0x7e, 0x40, 0xbd, 0x03, 0xda, 0x86, 0x2f, 0x40, 0x49, 0xa4, 0x6f, 0x63, 0x8e, 0xab, 0xda, 0xa6, + 0xb6, 0x55, 0x69, 0x6e, 0xe9, 0x13, 0xcb, 0xa4, 0x5f, 0xed, 0xea, 0xcf, 0xdb, 0x17, 0xc4, 0xe2, + 0x47, 0x84, 0x63, 0x13, 0xde, 0xf4, 0xea, 0x73, 0x51, 0xaf, 0x0e, 0xd2, 0x18, 0x4a, 0xd4, 0xe0, + 0x0b, 0x30, 0xcf, 0x7c, 0x62, 0x55, 0x73, 0x52, 0xf5, 0x7d, 0xfd, 0xde, 0xc5, 0xd7, 0x55, 0x6e, + 0x2d, 0x9f, 0x58, 0xe6, 0xa2, 0xda, 0x63, 0x5e, 0x7c, 0x21, 0xa9, 0x08, 0xbf, 0x04, 0x05, 0xc6, + 0x31, 0x0f, 0x59, 0x35, 0x2f, 0xb5, 0x9f, 0x3c, 0x40, 0x5b, 0xf2, 0xcd, 0x65, 0xa5, 0x5e, 0xe8, + 0x7f, 0x23, 0xa5, 0xdb, 0xf8, 0x59, 0x03, 0x15, 0x85, 0x3c, 0x74, 0x18, 0x87, 0x2f, 0x47, 0x6e, + 0x69, 0x7b, 0xda, 0x9e, 0x02, 0x2b, 0xee, 0x4a, 0x70, 0xe5, 0x4d, 0xad, 0xaa, 0x7d, 0x4a, 0x71, + 0x24, 0x73, 0x4f, 0x9f, 0x83, 0x05, 0x87, 0x93, 0x2e, 0xab, 0xe6, 0x36, 0xf3, 0x5b, 0x95, 0x66, + 0x73, 0xf6, 0xc3, 0x98, 0x4b, 0x4a, 0x7e, 0xe1, 0x53, 0x21, 0x84, 0xfa, 0x7a, 0x8d, 0x6f, 0xf2, + 0xc9, 0x21, 0xc4, 0xe5, 0xc1, 0x6d, 0x50, 0x12, 0x1e, 0xb2, 0x43, 0x97, 0xc8, 0x43, 0x94, 0xd3, + 0xb4, 0x5a, 0x2a, 0x8e, 0x12, 0x04, 0x3c, 0x05, 0x8f, 0x18, 0xc7, 0x01, 0x77, 0xbc, 0xce, 0xc7, + 0x04, 0xdb, 0xae, 0xe3, 0x91, 0x16, 0xb1, 0xa8, 0x67, 0x33, 0x59, 0xd1, 0xbc, 0xf9, 0x76, 0xd4, + 0xab, 0x3f, 0x6a, 0x8d, 0x87, 0xa0, 0x49, 0x5c, 0xf8, 0x0a, 0xac, 0x59, 0xd4, 0xb3, 0xc2, 0x20, + 0x20, 0x9e, 0x75, 0x7d, 0x4c, 0x5d, 0xc7, 0xba, 0x96, 0x65, 0x2c, 0x9b, 0xba, 0xca, 0x66, 0x6d, + 0x7f, 0x18, 0x70, 0x37, 0x2e, 0x88, 0x46, 0x85, 0xe0, 0x3b, 0xa0, 0xc8, 0x42, 0xe6, 0x13, 0xcf, + 0xae, 0xce, 0x6f, 0x6a, 0x5b, 0x25, 0xb3, 0x12, 0xf5, 0xea, 0xc5, 0x56, 0x3f, 0x84, 0xe2, 0x35, + 0xf8, 0x15, 0xa8, 0x5c, 0xd0, 0xf6, 0x09, 0xe9, 0xfa, 0x2e, 0xe6, 0xa4, 0xba, 0x20, 0x2b, 0xfa, + 0x74, 0x86, 0x8b, 0x3f, 0x48, 0xd9, 0xd2, 0xa5, 0xff, 0x53, 0xa9, 0x57, 0x32, 0x0b, 0x28, 0xbb, + 0x47, 0xe3, 0x37, 0x0d, 0x2c, 0x0d, 0x78, 0x0f, 0x9e, 0x82, 0x02, 0xb6, 0xb8, 0x73, 0x25, 0x8a, + 0x21, 0x0a, 0xbf, 0x73, 0x9f, 0x77, 0x87, 0xc8, 0x19, 0x11, 0x07, 0x26, 0xa9, 0x75, 0x9f, 0x49, + 0x11, 0xa4, 0xc4, 0xe0, 0x05, 0x58, 0x75, 0x31, 0xe3, 0x71, 0x45, 0x4f, 0x9c, 0x2e, 0x91, 0x77, + 0x31, 0xf5, 0x61, 0xa7, 0x96, 0x15, 0x78, 0xf3, 0xff, 0x51, 0xaf, 0xbe, 0x7a, 0x38, 0xa4, 0x82, + 0x46, 0x74, 0x1b, 0xdf, 0xe5, 0x40, 0xfe, 0xcd, 0x36, 0x91, 0x93, 0x81, 0x26, 0xd2, 0x9c, 0xad, + 0x44, 0x13, 0x1b, 0xc8, 0xab, 0xa1, 0x06, 0xb2, 0x37, 0xa3, 0xee, 0xf4, 0xe6, 0xf1, 0x4b, 0x1e, + 0x2c, 0x1e, 0xd0, 0xf6, 0x3e, 0xf5, 0x6c, 0x87, 0x3b, 0xd4, 0x83, 0x7b, 0x60, 0x9e, 0x5f, 0xfb, + 0xf1, 0xa3, 0xdb, 0x8c, 0x13, 0x3a, 0xb9, 0xf6, 0xc9, 0x5d, 0xaf, 0xbe, 0x9a, 0xc5, 0x8a, 0x18, + 0x92, 0x68, 0xf8, 0x59, 0x92, 0x64, 0x4e, 0xf2, 0x3e, 0x1a, 0xdc, 0xee, 0xae, 0x57, 0x9f, 0x3a, + 0xc1, 0xf4, 0x44, 0x73, 0x30, 0x3d, 0x48, 0xc0, 0x92, 0x28, 0xe4, 0x71, 0x40, 0xdb, 0x7d, 0x77, + 0xe4, 0x67, 0x74, 0xc7, 0xba, 0x4a, 0x64, 0xe9, 0x30, 0x2b, 0x83, 0x06, 0x55, 0x21, 0x07, 0x50, + 0x04, 0x4e, 0x02, 0xec, 0xb1, 0xfe, 0xd1, 0x1e, 0xe2, 0xc4, 0x0d, 0xb5, 0x17, 0x3c, 0x1c, 0xd1, + 0x42, 0x63, 0xf4, 0xe1, 0xbb, 0xa0, 0x10, 0x10, 0xcc, 0xa8, 0x27, 0x1f, 0x75, 0x39, 0xad, 0x11, + 0x92, 0x51, 0xa4, 0x56, 0xe1, 0x63, 0x50, 0xec, 0x12, 0xc6, 0x70, 0x87, 0x54, 0x0b, 0x12, 0xb8, + 0xa2, 0x80, 0xc5, 0xa3, 0x7e, 0x18, 0xc5, 0xeb, 0x8d, 0x1f, 0x35, 0x50, 0xfc, 0x37, 0xe6, 0x40, + 0x6b, 0x70, 0x0e, 0xe8, 0xb3, 0x79, 0x72, 0xc2, 0x0c, 0xf8, 0x21, 0x2f, 0x93, 0x97, 0xfd, 0x7f, + 0x17, 0x54, 0x7c, 0x1c, 0x60, 0xd7, 0x25, 0xae, 0xc3, 0xba, 0x32, 0xff, 0x05, 0x73, 0x45, 0x74, + 0xad, 0xe3, 0x34, 0x8c, 0xb2, 0x18, 0x41, 0xb1, 0x68, 0xd7, 0x77, 0x89, 0xb8, 0xe0, 0xbe, 0x11, + 0x15, 0x65, 0x3f, 0x0d, 0xa3, 0x2c, 0x06, 0x3e, 0x07, 0xeb, 0xfd, 0x4e, 0x34, 0x3c, 0x35, 0xf2, + 0x72, 0x6a, 0xbc, 0x15, 0xf5, 0xea, 0xeb, 0xcf, 0xc6, 0x01, 0xd0, 0x78, 0x1e, 0xfc, 0x02, 0x94, + 0x18, 0x71, 0x89, 0xc5, 0x69, 0xa0, 0xec, 0xb3, 0x7b, 0xaf, 0x3b, 0xc7, 0x6d, 0xe2, 0xb6, 0x14, + 0xd1, 0x5c, 0x94, 0x53, 0x4e, 0x7d, 0xa1, 0x44, 0x10, 0x3e, 0x05, 0xcb, 0x5d, 0xec, 0x85, 0x38, + 0x41, 0x4a, 0xdf, 0x94, 0x4c, 0x18, 0xf5, 0xea, 0xcb, 0x47, 0x03, 0x2b, 0x68, 0x08, 0x29, 0x12, + 0xe3, 0xf1, 0x08, 0x29, 0xc8, 0xc4, 0xfe, 0xa6, 0x85, 0x1f, 0x53, 0x7b, 0x60, 0x6a, 0x24, 0x6e, + 0x48, 0x46, 0x46, 0x22, 0x28, 0x0a, 0x57, 0x4e, 0x67, 0xc5, 0x25, 0x00, 0x56, 0xfc, 0x9c, 0x99, + 0x9a, 0x17, 0x1f, 0xcc, 0x66, 0x90, 0xa4, 0x1d, 0xa4, 0x1d, 0x37, 0x09, 0x31, 0x94, 0x91, 0x87, + 0xa7, 0xa0, 0x2c, 0xa7, 0xb7, 0x7c, 0xb0, 0xb9, 0x19, 0x1f, 0xec, 0x52, 0xd4, 0xab, 0x97, 0x5b, + 0x31, 0x1d, 0xa5, 0x4a, 0xd0, 0x06, 0xcb, 0xa9, 0x4f, 0x1e, 0xd4, 0x78, 0x64, 0x51, 0xf6, 0x07, + 0x34, 0xd0, 0x90, 0xa6, 0x68, 0x00, 0x6a, 0xaa, 0xce, 0x4b, 0xb3, 0x4e, 0x1a, 0x93, 0x06, 0x28, + 0xb3, 0xd0, 0xb2, 0x08, 0xb1, 0x89, 0x2d, 0x6b, 0xbe, 0x60, 0xae, 0x29, 0x68, 0xb9, 0x15, 0x2f, + 0xa0, 0x14, 0x23, 0x84, 0xcf, 0xb0, 0xe3, 0x12, 0x5b, 0xd6, 0x3a, 0x23, 0xfc, 0x89, 0x8c, 0x22, + 0xb5, 0xda, 0xf8, 0x55, 0x03, 0xd9, 0x7f, 0x01, 0x6f, 0x70, 0x36, 0x9e, 0x67, 0xfc, 0x97, 0xfb, + 0xc7, 0x7f, 0x61, 0xa6, 0x99, 0xf1, 0x27, 0x0d, 0xac, 0x0c, 0xe1, 0xff, 0x6b, 0x33, 0xdf, 0x7c, + 0xef, 0xe6, 0xb6, 0x36, 0xf7, 0xfa, 0xb6, 0x36, 0xf7, 0xfb, 0x6d, 0x6d, 0xee, 0xeb, 0xa8, 0xa6, + 0xdd, 0x44, 0x35, 0xed, 0x75, 0x54, 0xd3, 0xfe, 0x88, 0x6a, 0xda, 0xb7, 0x7f, 0xd6, 0xe6, 0x5e, + 0x96, 0x62, 0x9d, 0xbf, 0x02, 0x00, 0x00, 0xff, 0xff, 0xf5, 0x1c, 0xb0, 0x5a, 0xe4, 0x0e, 0x00, + 0x00, } diff --git a/pkg/apis/batch/v2alpha1/generated.proto b/pkg/apis/batch/v2alpha1/generated.proto index ffa7f5ae4f9..46d1223c1e2 100644 --- a/pkg/apis/batch/v2alpha1/generated.proto +++ b/pkg/apis/batch/v2alpha1/generated.proto @@ -22,8 +22,8 @@ syntax = 'proto2'; package k8s.io.kubernetes.pkg.apis.batch.v2alpha1; import "k8s.io/kubernetes/pkg/api/resource/generated.proto"; -import "k8s.io/kubernetes/pkg/api/unversioned/generated.proto"; import "k8s.io/kubernetes/pkg/api/v1/generated.proto"; +import "k8s.io/kubernetes/pkg/apis/meta/v1/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/schema/generated.proto"; import "k8s.io/kubernetes/pkg/util/intstr/generated.proto"; @@ -54,7 +54,7 @@ message CronJobList { // Standard list metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // Items is the list of CronJob. repeated CronJob items = 2; @@ -92,7 +92,7 @@ message CronJobStatus { // LastScheduleTime keeps information of when was the last time the job was successfully scheduled. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time lastScheduleTime = 4; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time lastScheduleTime = 4; } // Job represents the configuration of a single job. @@ -123,11 +123,11 @@ message JobCondition { // Last time the condition was checked. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time lastProbeTime = 3; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time lastProbeTime = 3; // Last time the condition transit from one status to another. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time lastTransitionTime = 4; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time lastTransitionTime = 4; // (brief) reason for the condition's last transition. // +optional @@ -143,7 +143,7 @@ message JobList { // Standard list metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // Items is the list of Job. repeated Job items = 2; @@ -177,7 +177,7 @@ message JobSpec { // Normally, the system sets this field for you. // More info: http://kubernetes.io/docs/user-guide/labels#label-selectors // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.LabelSelector selector = 4; + optional k8s.io.kubernetes.pkg.apis.meta.v1.LabelSelector selector = 4; // ManualSelector controls generation of pod labels and pod selectors. // Leave `manualSelector` unset unless you are certain what you are doing. @@ -209,13 +209,13 @@ message JobStatus { // It is not guaranteed to be set in happens-before order across separate operations. // It is represented in RFC3339 form and is in UTC. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time startTime = 2; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time startTime = 2; // CompletionTime represents time when the job was completed. It is not guaranteed to // be set in happens-before order across separate operations. // It is represented in RFC3339 form and is in UTC. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time completionTime = 3; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time completionTime = 3; // Active is the number of actively running pods. // +optional diff --git a/pkg/apis/batch/v2alpha1/types.generated.go b/pkg/apis/batch/v2alpha1/types.generated.go index 8c4daef5dd2..c69dc1effc2 100644 --- a/pkg/apis/batch/v2alpha1/types.generated.go +++ b/pkg/apis/batch/v2alpha1/types.generated.go @@ -26,8 +26,8 @@ import ( "fmt" codec1978 "github.com/ugorji/go/codec" pkg4_resource "k8s.io/kubernetes/pkg/api/resource" - pkg1_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" pkg2_v1 "k8s.io/kubernetes/pkg/api/v1" + pkg1_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" pkg3_types "k8s.io/kubernetes/pkg/types" pkg5_intstr "k8s.io/kubernetes/pkg/util/intstr" "reflect" @@ -66,8 +66,8 @@ func init() { } if false { // reference the types, but skip this branch at build/run time var v0 pkg4_resource.Quantity - var v1 pkg1_unversioned.TypeMeta - var v2 pkg2_v1.ObjectMeta + var v1 pkg2_v1.ObjectMeta + var v2 pkg1_v1.TypeMeta var v3 pkg3_types.UID var v4 pkg5_intstr.IntOrString var v5 time.Time @@ -632,7 +632,7 @@ func (x *JobList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv53 := &x.ListMeta yym54 := z.DecBinary() @@ -713,7 +713,7 @@ func (x *JobList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv60 := &x.ListMeta yym61 := z.DecBinary() @@ -1605,7 +1605,7 @@ func (x *JobSpec) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.Selector == nil { - x.Selector = new(pkg1_unversioned.LabelSelector) + x.Selector = new(pkg1_v1.LabelSelector) } yym144 := z.DecBinary() _ = yym144 @@ -1747,7 +1747,7 @@ func (x *JobSpec) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } else { if x.Selector == nil { - x.Selector = new(pkg1_unversioned.LabelSelector) + x.Selector = new(pkg1_v1.LabelSelector) } yym156 := z.DecBinary() _ = yym156 @@ -2126,7 +2126,7 @@ func (x *JobStatus) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.StartTime == nil { - x.StartTime = new(pkg1_unversioned.Time) + x.StartTime = new(pkg1_v1.Time) } yym186 := z.DecBinary() _ = yym186 @@ -2147,7 +2147,7 @@ func (x *JobStatus) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.CompletionTime == nil { - x.CompletionTime = new(pkg1_unversioned.Time) + x.CompletionTime = new(pkg1_v1.Time) } yym188 := z.DecBinary() _ = yym188 @@ -2232,7 +2232,7 @@ func (x *JobStatus) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } else { if x.StartTime == nil { - x.StartTime = new(pkg1_unversioned.Time) + x.StartTime = new(pkg1_v1.Time) } yym196 := z.DecBinary() _ = yym196 @@ -2263,7 +2263,7 @@ func (x *JobStatus) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } else { if x.CompletionTime == nil { - x.CompletionTime = new(pkg1_unversioned.Time) + x.CompletionTime = new(pkg1_v1.Time) } yym198 := z.DecBinary() _ = yym198 @@ -2630,7 +2630,7 @@ func (x *JobCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "lastProbeTime": if r.TryDecodeAsNil() { - x.LastProbeTime = pkg1_unversioned.Time{} + x.LastProbeTime = pkg1_v1.Time{} } else { yyv231 := &x.LastProbeTime yym232 := z.DecBinary() @@ -2647,7 +2647,7 @@ func (x *JobCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "lastTransitionTime": if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg1_unversioned.Time{} + x.LastTransitionTime = pkg1_v1.Time{} } else { yyv233 := &x.LastTransitionTime yym234 := z.DecBinary() @@ -2732,7 +2732,7 @@ func (x *JobCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastProbeTime = pkg1_unversioned.Time{} + x.LastProbeTime = pkg1_v1.Time{} } else { yyv240 := &x.LastProbeTime yym241 := z.DecBinary() @@ -2759,7 +2759,7 @@ func (x *JobCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg1_unversioned.Time{} + x.LastTransitionTime = pkg1_v1.Time{} } else { yyv242 := &x.LastTransitionTime yym243 := z.DecBinary() @@ -3379,7 +3379,7 @@ func (x *CronJobList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv298 := &x.ListMeta yym299 := z.DecBinary() @@ -3460,7 +3460,7 @@ func (x *CronJobList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv305 := &x.ListMeta yym306 := z.DecBinary() @@ -4114,7 +4114,7 @@ func (x *CronJobStatus) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.LastScheduleTime == nil { - x.LastScheduleTime = new(pkg1_unversioned.Time) + x.LastScheduleTime = new(pkg1_v1.Time) } yym362 := z.DecBinary() _ = yym362 @@ -4181,7 +4181,7 @@ func (x *CronJobStatus) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } else { if x.LastScheduleTime == nil { - x.LastScheduleTime = new(pkg1_unversioned.Time) + x.LastScheduleTime = new(pkg1_v1.Time) } yym367 := z.DecBinary() _ = yym367 diff --git a/pkg/apis/batch/v2alpha1/types.go b/pkg/apis/batch/v2alpha1/types.go index 18d73912b49..f83fff4cad0 100644 --- a/pkg/apis/batch/v2alpha1/types.go +++ b/pkg/apis/batch/v2alpha1/types.go @@ -17,8 +17,8 @@ limitations under the License. package v2alpha1 import ( - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" ) // +genclient=true diff --git a/pkg/apis/batch/validation/validation.go b/pkg/apis/batch/validation/validation.go index 22f72b8bdfd..c60696935a9 100644 --- a/pkg/apis/batch/validation/validation.go +++ b/pkg/apis/batch/validation/validation.go @@ -20,10 +20,10 @@ import ( "github.com/robfig/cron" "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" - unversionedvalidation "k8s.io/kubernetes/pkg/apis/meta/v1/validation" apivalidation "k8s.io/kubernetes/pkg/api/validation" "k8s.io/kubernetes/pkg/apis/batch" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" + unversionedvalidation "k8s.io/kubernetes/pkg/apis/meta/v1/validation" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/util/validation/field" ) diff --git a/pkg/apis/batch/validation/validation_test.go b/pkg/apis/batch/validation/validation_test.go index 0c7b00663cb..016b9440ba9 100644 --- a/pkg/apis/batch/validation/validation_test.go +++ b/pkg/apis/batch/validation/validation_test.go @@ -21,8 +21,8 @@ import ( "testing" "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/batch" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/types" ) diff --git a/pkg/apis/certificates/types.generated.go b/pkg/apis/certificates/types.generated.go index 262d23819d1..fbc108750c4 100644 --- a/pkg/apis/certificates/types.generated.go +++ b/pkg/apis/certificates/types.generated.go @@ -26,7 +26,7 @@ import ( "fmt" codec1978 "github.com/ugorji/go/codec" pkg2_api "k8s.io/kubernetes/pkg/api" - pkg1_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" + pkg1_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" pkg3_types "k8s.io/kubernetes/pkg/types" "reflect" "runtime" @@ -64,7 +64,7 @@ func init() { } if false { // reference the types, but skip this branch at build/run time var v0 pkg2_api.ObjectMeta - var v1 pkg1_unversioned.TypeMeta + var v1 pkg1_v1.TypeMeta var v2 pkg3_types.UID var v3 time.Time _, _, _, _ = v0, v1, v2, v3 @@ -1253,7 +1253,7 @@ func (x *CertificateSigningRequestCondition) codecDecodeSelfFromMap(l int, d *co } case "lastUpdateTime": if r.TryDecodeAsNil() { - x.LastUpdateTime = pkg1_unversioned.Time{} + x.LastUpdateTime = pkg1_v1.Time{} } else { yyv104 := &x.LastUpdateTime yym105 := z.DecBinary() @@ -1342,7 +1342,7 @@ func (x *CertificateSigningRequestCondition) codecDecodeSelfFromArray(l int, d * } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastUpdateTime = pkg1_unversioned.Time{} + x.LastUpdateTime = pkg1_v1.Time{} } else { yyv110 := &x.LastUpdateTime yym111 := z.DecBinary() @@ -1594,7 +1594,7 @@ func (x *CertificateSigningRequestList) codecDecodeSelfFromMap(l int, d *codec19 } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv133 := &x.ListMeta yym134 := z.DecBinary() @@ -1675,7 +1675,7 @@ func (x *CertificateSigningRequestList) codecDecodeSelfFromArray(l int, d *codec } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv140 := &x.ListMeta yym141 := z.DecBinary() diff --git a/pkg/apis/certificates/v1alpha1/generated.pb.go b/pkg/apis/certificates/v1alpha1/generated.pb.go index c6f2e1d7412..b8e8e12e7e8 100644 --- a/pkg/apis/certificates/v1alpha1/generated.pb.go +++ b/pkg/apis/certificates/v1alpha1/generated.pb.go @@ -425,7 +425,7 @@ func (this *CertificateSigningRequestCondition) String() string { `Type:` + fmt.Sprintf("%v", this.Type) + `,`, `Reason:` + fmt.Sprintf("%v", this.Reason) + `,`, `Message:` + fmt.Sprintf("%v", this.Message) + `,`, - `LastUpdateTime:` + strings.Replace(strings.Replace(this.LastUpdateTime.String(), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1), `&`, ``, 1) + `,`, + `LastUpdateTime:` + strings.Replace(strings.Replace(this.LastUpdateTime.String(), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1), `&`, ``, 1) + `,`, `}`, }, "") return s @@ -435,7 +435,7 @@ func (this *CertificateSigningRequestList) String() string { return "nil" } s := strings.Join([]string{`&CertificateSigningRequestList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "CertificateSigningRequest", "CertificateSigningRequest", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -1277,49 +1277,49 @@ var ( ) var fileDescriptorGenerated = []byte{ - // 700 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xac, 0x54, 0x4f, 0x4f, 0x13, 0x41, - 0x14, 0xef, 0xb6, 0xa5, 0xb4, 0x53, 0x04, 0x33, 0x31, 0xa6, 0x36, 0x61, 0x4b, 0x1a, 0x35, 0x55, - 0x61, 0xd6, 0x12, 0x4d, 0x38, 0x9a, 0xc5, 0xc4, 0x10, 0x21, 0xc4, 0x01, 0x12, 0x63, 0xe2, 0x61, - 0xba, 0x7d, 0x2c, 0x63, 0xd9, 0x3f, 0xec, 0xcc, 0x36, 0xe1, 0xe6, 0xd1, 0xa3, 0x9f, 0xc0, 0xaf, - 0xe1, 0x57, 0xe0, 0xc8, 0xd1, 0x53, 0x95, 0xf2, 0x05, 0x3c, 0x7b, 0x32, 0x3b, 0x9d, 0xfe, 0xb1, - 0x65, 0x51, 0x13, 0x6e, 0xfb, 0x7e, 0xf3, 0x7e, 0xbf, 0xdf, 0x7b, 0x6f, 0xde, 0x2c, 0x7a, 0xd1, - 0xd9, 0x10, 0x84, 0x07, 0x56, 0x27, 0x6e, 0x41, 0xe4, 0x83, 0x04, 0x61, 0x85, 0x1d, 0xd7, 0x62, - 0x21, 0x17, 0x96, 0x03, 0x91, 0xe4, 0x87, 0xdc, 0x61, 0x09, 0xda, 0x6d, 0xb2, 0xe3, 0xf0, 0x88, - 0x35, 0x2d, 0x17, 0x7c, 0x88, 0x98, 0x84, 0x36, 0x09, 0xa3, 0x40, 0x06, 0xf8, 0xe9, 0x40, 0x81, - 0x8c, 0x15, 0x48, 0xd8, 0x71, 0x49, 0xa2, 0x40, 0x26, 0x15, 0xc8, 0x50, 0xa1, 0xba, 0xe6, 0x72, - 0x79, 0x14, 0xb7, 0x88, 0x13, 0x78, 0x96, 0x1b, 0xb8, 0x81, 0xa5, 0x84, 0x5a, 0xf1, 0xa1, 0x8a, - 0x54, 0xa0, 0xbe, 0x06, 0x06, 0xd5, 0xf5, 0xd4, 0x12, 0xad, 0x08, 0x44, 0x10, 0x47, 0x0e, 0x4c, - 0x17, 0x55, 0x7d, 0x9e, 0xce, 0x89, 0xfd, 0x2e, 0x44, 0x82, 0x07, 0x3e, 0xb4, 0x67, 0x68, 0xab, - 0xe9, 0xb4, 0xee, 0x4c, 0xe7, 0xd5, 0xb5, 0xab, 0xb3, 0xa3, 0xd8, 0x97, 0xdc, 0x9b, 0xad, 0xe9, - 0xd9, 0xf5, 0xe9, 0xc2, 0x39, 0x02, 0x8f, 0xcd, 0xb0, 0x9a, 0x57, 0xb3, 0x62, 0xc9, 0x8f, 0x2d, - 0xee, 0x4b, 0x21, 0xa3, 0x69, 0x4a, 0xfd, 0x32, 0x8b, 0xee, 0x6d, 0x8e, 0x27, 0xbf, 0xc7, 0x5d, - 0x9f, 0xfb, 0x2e, 0x85, 0x93, 0x18, 0x84, 0xc4, 0x6f, 0x51, 0xd1, 0x03, 0xc9, 0xda, 0x4c, 0xb2, - 0x8a, 0xb1, 0x62, 0x34, 0xca, 0xeb, 0x0d, 0x92, 0x7a, 0x85, 0xa4, 0xdb, 0x24, 0xbb, 0xad, 0x0f, - 0xe0, 0xc8, 0x1d, 0x90, 0xcc, 0xc6, 0x67, 0xbd, 0x5a, 0xa6, 0xdf, 0xab, 0xa1, 0x31, 0x46, 0x47, - 0x6a, 0xf8, 0x04, 0xe5, 0x45, 0x08, 0x4e, 0x25, 0xab, 0x54, 0x77, 0xc9, 0xff, 0x2e, 0x06, 0x49, - 0x2d, 0x7a, 0x2f, 0x04, 0xc7, 0x5e, 0xd0, 0xe6, 0xf9, 0x24, 0xa2, 0xca, 0x0a, 0x9f, 0xa2, 0x82, - 0x90, 0x4c, 0xc6, 0xa2, 0x92, 0x53, 0xa6, 0x6f, 0x6e, 0xd2, 0x54, 0x09, 0xdb, 0x8b, 0xda, 0xb6, - 0x30, 0x88, 0xa9, 0x36, 0xac, 0x7f, 0xc9, 0xa2, 0x7a, 0x2a, 0x77, 0x33, 0xf0, 0xdb, 0x5c, 0xf2, - 0xc0, 0xc7, 0x1b, 0x28, 0x2f, 0x4f, 0x43, 0x50, 0xa3, 0x2e, 0xd9, 0xf7, 0x87, 0x3d, 0xec, 0x9f, - 0x86, 0xf0, 0xab, 0x57, 0xbb, 0x33, 0x9d, 0x9f, 0xe0, 0x54, 0x31, 0xf0, 0x43, 0x54, 0x88, 0x80, - 0x89, 0xc0, 0x57, 0x03, 0x2d, 0x8d, 0x0b, 0xa1, 0x0a, 0xa5, 0xfa, 0x14, 0x3f, 0x42, 0xf3, 0x1e, - 0x08, 0xc1, 0x5c, 0x50, 0x43, 0x28, 0xd9, 0x4b, 0x3a, 0x71, 0x7e, 0x67, 0x00, 0xd3, 0xe1, 0x39, - 0xee, 0xa0, 0xc5, 0x63, 0x26, 0xe4, 0x41, 0xd8, 0x66, 0x12, 0xf6, 0xb9, 0x07, 0x95, 0xbc, 0x1a, - 0xdb, 0x93, 0x6b, 0x36, 0x60, 0xe2, 0xbd, 0x90, 0x84, 0x62, 0xdf, 0xd5, 0xf2, 0x8b, 0xdb, 0x7f, - 0x48, 0xd1, 0x29, 0xe9, 0xfa, 0x4f, 0x03, 0x2d, 0xa7, 0x0e, 0x68, 0x9b, 0x0b, 0x89, 0xdf, 0xcf, - 0xac, 0xa2, 0xf5, 0x8f, 0x85, 0x24, 0x74, 0xb5, 0x91, 0xb7, 0x75, 0x31, 0xc5, 0x21, 0x32, 0xb1, - 0x8f, 0x21, 0x9a, 0xe3, 0x12, 0x3c, 0x51, 0xc9, 0xae, 0xe4, 0x1a, 0xe5, 0xf5, 0xd7, 0x37, 0xb8, - 0x1b, 0xf6, 0x2d, 0xed, 0x3b, 0xb7, 0x95, 0x38, 0xd0, 0x81, 0x51, 0xfd, 0xeb, 0x75, 0x2d, 0x27, - 0x6b, 0x8b, 0x1f, 0xa0, 0xf9, 0x68, 0x10, 0xaa, 0x8e, 0x17, 0xec, 0x72, 0x72, 0x51, 0x3a, 0x83, - 0x0e, 0xcf, 0xf0, 0x2a, 0x2a, 0xc6, 0x02, 0x22, 0x9f, 0x79, 0xa0, 0x6f, 0x7f, 0xd4, 0xe8, 0x81, - 0xc6, 0xe9, 0x28, 0x03, 0x2f, 0xa3, 0x5c, 0xcc, 0xdb, 0xfa, 0xf6, 0xcb, 0x3a, 0x31, 0x77, 0xb0, - 0xf5, 0x92, 0x26, 0x38, 0xae, 0xa3, 0x82, 0x1b, 0x05, 0x71, 0x28, 0x2a, 0xf9, 0x95, 0x5c, 0xa3, - 0x64, 0xa3, 0x64, 0x89, 0x5e, 0x29, 0x84, 0xea, 0x93, 0xfa, 0x77, 0x03, 0xd5, 0xfe, 0xf2, 0x12, - 0xf0, 0x27, 0x03, 0x21, 0x67, 0xb8, 0xa8, 0xa2, 0x62, 0xa8, 0xa9, 0xee, 0xdf, 0xe0, 0x54, 0x47, - 0xaf, 0x60, 0xfc, 0xa3, 0x19, 0x41, 0x82, 0x4e, 0x78, 0xe3, 0x26, 0x2a, 0x4f, 0x68, 0xab, 0x11, - 0x2d, 0xd8, 0x4b, 0xfd, 0x5e, 0xad, 0x3c, 0x21, 0x4e, 0x27, 0x73, 0xec, 0xc7, 0x67, 0x17, 0x66, - 0xe6, 0xfc, 0xc2, 0xcc, 0x7c, 0xbb, 0x30, 0x33, 0x1f, 0xfb, 0xa6, 0x71, 0xd6, 0x37, 0x8d, 0xf3, - 0xbe, 0x69, 0xfc, 0xe8, 0x9b, 0xc6, 0xe7, 0x4b, 0x33, 0xf3, 0xae, 0x38, 0xac, 0xf0, 0x77, 0x00, - 0x00, 0x00, 0xff, 0xff, 0xa5, 0xb0, 0x36, 0xc9, 0x16, 0x07, 0x00, 0x00, + // 691 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xac, 0x54, 0x4f, 0x4f, 0x13, 0x4f, + 0x18, 0xee, 0xb6, 0xa5, 0xb4, 0x53, 0x7e, 0xf0, 0xcb, 0xc4, 0x98, 0x4a, 0xc2, 0x96, 0x34, 0x6a, + 0xaa, 0x81, 0x59, 0x4b, 0x3c, 0x70, 0x34, 0x8b, 0x89, 0x21, 0x42, 0x88, 0x03, 0x24, 0x86, 0xdb, + 0x74, 0xfb, 0xb2, 0x1d, 0xcb, 0xfe, 0x61, 0x67, 0x96, 0x84, 0x9b, 0x47, 0x8f, 0xde, 0xfd, 0x20, + 0x7e, 0x05, 0x8e, 0x1c, 0x3d, 0x55, 0x29, 0x67, 0xbf, 0x80, 0x27, 0x33, 0xd3, 0xe9, 0x1f, 0x5b, + 0x0a, 0x9a, 0x70, 0xeb, 0xfb, 0xcc, 0xfb, 0x3e, 0xcf, 0xfb, 0xe7, 0xe9, 0xa2, 0x57, 0x9d, 0x4d, + 0x41, 0x78, 0xe4, 0x74, 0xd2, 0x26, 0x24, 0x21, 0x48, 0x10, 0x4e, 0xdc, 0xf1, 0x1d, 0x16, 0x73, + 0xe1, 0x78, 0x90, 0x48, 0x7e, 0xcc, 0x3d, 0xa6, 0xd0, 0xb3, 0x06, 0x3b, 0x89, 0xdb, 0xac, 0xe1, + 0xf8, 0x10, 0x42, 0xc2, 0x24, 0xb4, 0x48, 0x9c, 0x44, 0x32, 0xc2, 0x2f, 0xfa, 0x0c, 0x64, 0xc4, + 0x40, 0xe2, 0x8e, 0x4f, 0x14, 0x03, 0x19, 0x67, 0x20, 0x03, 0x86, 0xe5, 0x75, 0x9f, 0xcb, 0x76, + 0xda, 0x24, 0x5e, 0x14, 0x38, 0x7e, 0xe4, 0x47, 0x8e, 0x26, 0x6a, 0xa6, 0xc7, 0x3a, 0xd2, 0x81, + 0xfe, 0xd5, 0x17, 0x58, 0xde, 0x98, 0xd9, 0xa2, 0x93, 0x80, 0x88, 0xd2, 0xc4, 0x83, 0xc9, 0xa6, + 0x96, 0xd7, 0x66, 0xd7, 0x9c, 0x4d, 0x8d, 0x70, 0x8b, 0x82, 0x70, 0x02, 0x90, 0xec, 0xa6, 0x9a, + 0xf5, 0x9b, 0x6b, 0x92, 0x34, 0x94, 0x3c, 0x98, 0x6e, 0xe8, 0xe5, 0xed, 0xe9, 0xc2, 0x6b, 0x43, + 0xc0, 0xa6, 0xaa, 0x1a, 0x37, 0x57, 0xa5, 0x92, 0x9f, 0x38, 0x3c, 0x94, 0x42, 0x26, 0x93, 0x25, + 0xb5, 0xeb, 0x2c, 0x7a, 0xb4, 0x35, 0x5a, 0xfb, 0x3e, 0xf7, 0x43, 0x1e, 0xfa, 0x14, 0x4e, 0x53, + 0x10, 0x12, 0xbf, 0x47, 0x45, 0x35, 0x50, 0x8b, 0x49, 0x56, 0xb1, 0x56, 0xad, 0x7a, 0x79, 0xa3, + 0x4e, 0x66, 0xde, 0x8f, 0x9c, 0x35, 0xc8, 0x5e, 0xf3, 0x03, 0x78, 0x72, 0x17, 0x24, 0x73, 0xf1, + 0x45, 0xb7, 0x9a, 0xe9, 0x75, 0xab, 0x68, 0x84, 0xd1, 0x21, 0x1b, 0x3e, 0x45, 0x79, 0x11, 0x83, + 0x57, 0xc9, 0x6a, 0xd6, 0x3d, 0xf2, 0xaf, 0xae, 0x20, 0x33, 0x9b, 0xde, 0x8f, 0xc1, 0x73, 0x17, + 0x8c, 0x78, 0x5e, 0x45, 0x54, 0x4b, 0xe1, 0x73, 0x54, 0x10, 0x92, 0xc9, 0x54, 0x54, 0x72, 0x5a, + 0xf4, 0xdd, 0x7d, 0x8a, 0x6a, 0x62, 0x77, 0xd1, 0xc8, 0x16, 0xfa, 0x31, 0x35, 0x82, 0xb5, 0x2f, + 0x59, 0x54, 0x9b, 0x59, 0xbb, 0x15, 0x85, 0x2d, 0x2e, 0x79, 0x14, 0xe2, 0x4d, 0x94, 0x97, 0xe7, + 0x31, 0xe8, 0x55, 0x97, 0xdc, 0xc7, 0x83, 0x19, 0x0e, 0xce, 0x63, 0xf8, 0xd5, 0xad, 0x3e, 0x98, + 0xcc, 0x57, 0x38, 0xd5, 0x15, 0xf8, 0x29, 0x2a, 0x24, 0xc0, 0x44, 0x14, 0xea, 0x85, 0x96, 0x46, + 0x8d, 0x50, 0x8d, 0x52, 0xf3, 0x8a, 0x9f, 0xa1, 0xf9, 0x00, 0x84, 0x60, 0x3e, 0xe8, 0x25, 0x94, + 0xdc, 0x25, 0x93, 0x38, 0xbf, 0xdb, 0x87, 0xe9, 0xe0, 0x1d, 0xb7, 0xd1, 0xe2, 0x09, 0x13, 0xf2, + 0x30, 0x6e, 0x31, 0x09, 0x07, 0x3c, 0x80, 0x4a, 0xfe, 0x2e, 0x07, 0x08, 0xa2, 0xee, 0xab, 0x7c, + 0xa0, 0xf2, 0xdd, 0x87, 0x86, 0x7b, 0x71, 0xe7, 0x0f, 0x1e, 0x3a, 0xc1, 0x5b, 0xfb, 0x69, 0xa1, + 0x95, 0x99, 0xdb, 0xd9, 0xe1, 0x42, 0xe2, 0xa3, 0x29, 0x1f, 0xae, 0xfd, 0x4d, 0x17, 0xaa, 0x56, + 0x7b, 0xf1, 0x7f, 0xd3, 0x49, 0x71, 0x80, 0x8c, 0x39, 0x31, 0x46, 0x73, 0x5c, 0x42, 0x20, 0x2a, + 0xd9, 0xd5, 0x5c, 0xbd, 0xbc, 0xf1, 0xf6, 0x1e, 0x5d, 0xe1, 0xfe, 0x67, 0x74, 0xe7, 0xb6, 0x95, + 0x02, 0xed, 0x0b, 0xd5, 0xbe, 0xde, 0x36, 0xaf, 0x32, 0x2c, 0x7e, 0x82, 0xe6, 0x93, 0x7e, 0xa8, + 0xc7, 0x5d, 0x70, 0xcb, 0xea, 0x44, 0x26, 0x83, 0x0e, 0xde, 0xf0, 0x1a, 0x2a, 0xa6, 0x02, 0x92, + 0x90, 0x05, 0x60, 0xee, 0x3e, 0x1c, 0xf4, 0xd0, 0xe0, 0x74, 0x98, 0x81, 0x57, 0x50, 0x2e, 0xe5, + 0x2d, 0x73, 0xf7, 0xb2, 0x49, 0xcc, 0x1d, 0x6e, 0xbf, 0xa6, 0x0a, 0xc7, 0x35, 0x54, 0xf0, 0x93, + 0x28, 0x8d, 0x45, 0x25, 0xbf, 0x9a, 0xab, 0x97, 0x5c, 0xa4, 0xec, 0xf3, 0x46, 0x23, 0xd4, 0xbc, + 0xd4, 0xbe, 0x5b, 0xa8, 0x7a, 0xc7, 0x7f, 0x00, 0x7f, 0xb2, 0x10, 0xf2, 0x06, 0x16, 0x15, 0x15, + 0x4b, 0x6f, 0xf5, 0xe0, 0x1e, 0xb7, 0x3a, 0xf4, 0xff, 0xe8, 0x13, 0x33, 0x84, 0x04, 0x1d, 0xd3, + 0xc6, 0x0d, 0x54, 0x1e, 0xe3, 0xd6, 0x2b, 0x5a, 0x70, 0x97, 0x7a, 0xdd, 0x6a, 0x79, 0x8c, 0x9c, + 0x8e, 0xe7, 0xb8, 0xcf, 0x2f, 0xae, 0xec, 0xcc, 0xe5, 0x95, 0x9d, 0xf9, 0x76, 0x65, 0x67, 0x3e, + 0xf6, 0x6c, 0xeb, 0xa2, 0x67, 0x5b, 0x97, 0x3d, 0xdb, 0xfa, 0xd1, 0xb3, 0xad, 0xcf, 0xd7, 0x76, + 0xe6, 0xa8, 0x38, 0xe8, 0xf0, 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, 0xc4, 0x02, 0x0e, 0x3c, 0x0d, + 0x07, 0x00, 0x00, } diff --git a/pkg/apis/certificates/v1alpha1/generated.proto b/pkg/apis/certificates/v1alpha1/generated.proto index 6939a912fa3..ae88f9f6e9e 100644 --- a/pkg/apis/certificates/v1alpha1/generated.proto +++ b/pkg/apis/certificates/v1alpha1/generated.proto @@ -22,8 +22,8 @@ syntax = 'proto2'; package k8s.io.kubernetes.pkg.apis.certificates.v1alpha1; import "k8s.io/kubernetes/pkg/api/resource/generated.proto"; -import "k8s.io/kubernetes/pkg/api/unversioned/generated.proto"; import "k8s.io/kubernetes/pkg/api/v1/generated.proto"; +import "k8s.io/kubernetes/pkg/apis/meta/v1/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/schema/generated.proto"; import "k8s.io/kubernetes/pkg/util/intstr/generated.proto"; @@ -59,12 +59,12 @@ message CertificateSigningRequestCondition { // timestamp for the last update to this condition // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time lastUpdateTime = 4; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time lastUpdateTime = 4; } message CertificateSigningRequestList { // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; repeated CertificateSigningRequest items = 2; } diff --git a/pkg/apis/certificates/v1alpha1/register.go b/pkg/apis/certificates/v1alpha1/register.go index 6cc4ce41261..04798dd6fb3 100644 --- a/pkg/apis/certificates/v1alpha1/register.go +++ b/pkg/apis/certificates/v1alpha1/register.go @@ -17,8 +17,8 @@ limitations under the License. package v1alpha1 import ( - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" versionedwatch "k8s.io/kubernetes/pkg/watch/versioned" diff --git a/pkg/apis/certificates/v1alpha1/types.generated.go b/pkg/apis/certificates/v1alpha1/types.generated.go index a0d7b735f15..44658c2bdd5 100644 --- a/pkg/apis/certificates/v1alpha1/types.generated.go +++ b/pkg/apis/certificates/v1alpha1/types.generated.go @@ -25,8 +25,8 @@ import ( "errors" "fmt" codec1978 "github.com/ugorji/go/codec" - pkg1_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" pkg2_v1 "k8s.io/kubernetes/pkg/api/v1" + pkg1_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" pkg3_types "k8s.io/kubernetes/pkg/types" "reflect" "runtime" @@ -63,8 +63,8 @@ func init() { panic(err) } if false { // reference the types, but skip this branch at build/run time - var v0 pkg1_unversioned.TypeMeta - var v1 pkg2_v1.ObjectMeta + var v0 pkg2_v1.ObjectMeta + var v1 pkg1_v1.TypeMeta var v2 pkg3_types.UID var v3 time.Time _, _, _, _ = v0, v1, v2, v3 @@ -1253,7 +1253,7 @@ func (x *CertificateSigningRequestCondition) codecDecodeSelfFromMap(l int, d *co } case "lastUpdateTime": if r.TryDecodeAsNil() { - x.LastUpdateTime = pkg1_unversioned.Time{} + x.LastUpdateTime = pkg1_v1.Time{} } else { yyv104 := &x.LastUpdateTime yym105 := z.DecBinary() @@ -1342,7 +1342,7 @@ func (x *CertificateSigningRequestCondition) codecDecodeSelfFromArray(l int, d * } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastUpdateTime = pkg1_unversioned.Time{} + x.LastUpdateTime = pkg1_v1.Time{} } else { yyv110 := &x.LastUpdateTime yym111 := z.DecBinary() @@ -1587,7 +1587,7 @@ func (x *CertificateSigningRequestList) codecDecodeSelfFromMap(l int, d *codec19 } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv133 := &x.ListMeta yym134 := z.DecBinary() @@ -1668,7 +1668,7 @@ func (x *CertificateSigningRequestList) codecDecodeSelfFromArray(l int, d *codec } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv140 := &x.ListMeta yym141 := z.DecBinary() diff --git a/pkg/apis/certificates/v1alpha1/types.go b/pkg/apis/certificates/v1alpha1/types.go index 2b04da43816..cf9e4f09022 100644 --- a/pkg/apis/certificates/v1alpha1/types.go +++ b/pkg/apis/certificates/v1alpha1/types.go @@ -17,8 +17,8 @@ limitations under the License. package v1alpha1 import ( - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" ) // +genclient=true diff --git a/pkg/apis/componentconfig/types.generated.go b/pkg/apis/componentconfig/types.generated.go index be357cb7efe..e2375601186 100644 --- a/pkg/apis/componentconfig/types.generated.go +++ b/pkg/apis/componentconfig/types.generated.go @@ -25,7 +25,7 @@ import ( "errors" "fmt" codec1978 "github.com/ugorji/go/codec" - pkg1_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" + pkg1_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" pkg2_config "k8s.io/kubernetes/pkg/util/config" "reflect" "runtime" @@ -62,7 +62,7 @@ func init() { panic(err) } if false { // reference the types, but skip this branch at build/run time - var v0 pkg1_unversioned.TypeMeta + var v0 pkg1_v1.TypeMeta var v1 pkg2_config.ConfigurationMap var v2 time.Duration _, _, _ = v0, v1, v2 @@ -721,7 +721,7 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Deco } case "iptablesSyncPeriodSeconds": if r.TryDecodeAsNil() { - x.IPTablesSyncPeriod = pkg1_unversioned.Duration{} + x.IPTablesSyncPeriod = pkg1_v1.Duration{} } else { yyv96 := &x.IPTablesSyncPeriod yym97 := z.DecBinary() @@ -736,7 +736,7 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Deco } case "iptablesMinSyncPeriodSeconds": if r.TryDecodeAsNil() { - x.IPTablesMinSyncPeriod = pkg1_unversioned.Duration{} + x.IPTablesMinSyncPeriod = pkg1_v1.Duration{} } else { yyv98 := &x.IPTablesMinSyncPeriod yym99 := z.DecBinary() @@ -803,7 +803,7 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Deco } case "udpTimeoutMilliseconds": if r.TryDecodeAsNil() { - x.UDPIdleTimeout = pkg1_unversioned.Duration{} + x.UDPIdleTimeout = pkg1_v1.Duration{} } else { yyv108 := &x.UDPIdleTimeout yym109 := z.DecBinary() @@ -836,7 +836,7 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Deco } case "conntrackTCPEstablishedTimeout": if r.TryDecodeAsNil() { - x.ConntrackTCPEstablishedTimeout = pkg1_unversioned.Duration{} + x.ConntrackTCPEstablishedTimeout = pkg1_v1.Duration{} } else { yyv113 := &x.ConntrackTCPEstablishedTimeout yym114 := z.DecBinary() @@ -851,7 +851,7 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Deco } case "conntrackTCPCloseWaitTimeout": if r.TryDecodeAsNil() { - x.ConntrackTCPCloseWaitTimeout = pkg1_unversioned.Duration{} + x.ConntrackTCPCloseWaitTimeout = pkg1_v1.Duration{} } else { yyv115 := &x.ConntrackTCPCloseWaitTimeout yym116 := z.DecBinary() @@ -1028,7 +1028,7 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.De } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.IPTablesSyncPeriod = pkg1_unversioned.Duration{} + x.IPTablesSyncPeriod = pkg1_v1.Duration{} } else { yyv127 := &x.IPTablesSyncPeriod yym128 := z.DecBinary() @@ -1053,7 +1053,7 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.De } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.IPTablesMinSyncPeriod = pkg1_unversioned.Duration{} + x.IPTablesMinSyncPeriod = pkg1_v1.Duration{} } else { yyv129 := &x.IPTablesMinSyncPeriod yym130 := z.DecBinary() @@ -1200,7 +1200,7 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.De } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.UDPIdleTimeout = pkg1_unversioned.Duration{} + x.UDPIdleTimeout = pkg1_v1.Duration{} } else { yyv139 := &x.UDPIdleTimeout yym140 := z.DecBinary() @@ -1273,7 +1273,7 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.De } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ConntrackTCPEstablishedTimeout = pkg1_unversioned.Duration{} + x.ConntrackTCPEstablishedTimeout = pkg1_v1.Duration{} } else { yyv144 := &x.ConntrackTCPEstablishedTimeout yym145 := z.DecBinary() @@ -1298,7 +1298,7 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.De } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ConntrackTCPCloseWaitTimeout = pkg1_unversioned.Duration{} + x.ConntrackTCPCloseWaitTimeout = pkg1_v1.Duration{} } else { yyv146 := &x.ConntrackTCPCloseWaitTimeout yym147 := z.DecBinary() @@ -3958,7 +3958,7 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode } case "syncFrequency": if r.TryDecodeAsNil() { - x.SyncFrequency = pkg1_unversioned.Duration{} + x.SyncFrequency = pkg1_v1.Duration{} } else { yyv521 := &x.SyncFrequency yym522 := z.DecBinary() @@ -3973,7 +3973,7 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode } case "fileCheckFrequency": if r.TryDecodeAsNil() { - x.FileCheckFrequency = pkg1_unversioned.Duration{} + x.FileCheckFrequency = pkg1_v1.Duration{} } else { yyv523 := &x.FileCheckFrequency yym524 := z.DecBinary() @@ -3988,7 +3988,7 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode } case "httpCheckFrequency": if r.TryDecodeAsNil() { - x.HTTPCheckFrequency = pkg1_unversioned.Duration{} + x.HTTPCheckFrequency = pkg1_v1.Duration{} } else { yyv525 := &x.HTTPCheckFrequency yym526 := z.DecBinary() @@ -4173,7 +4173,7 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode } case "minimumGCAge": if r.TryDecodeAsNil() { - x.MinimumGCAge = pkg1_unversioned.Duration{} + x.MinimumGCAge = pkg1_v1.Duration{} } else { yyv555 := &x.MinimumGCAge yym556 := z.DecBinary() @@ -4248,7 +4248,7 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode } case "streamingConnectionIdleTimeout": if r.TryDecodeAsNil() { - x.StreamingConnectionIdleTimeout = pkg1_unversioned.Duration{} + x.StreamingConnectionIdleTimeout = pkg1_v1.Duration{} } else { yyv567 := &x.StreamingConnectionIdleTimeout yym568 := z.DecBinary() @@ -4263,7 +4263,7 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode } case "nodeStatusUpdateFrequency": if r.TryDecodeAsNil() { - x.NodeStatusUpdateFrequency = pkg1_unversioned.Duration{} + x.NodeStatusUpdateFrequency = pkg1_v1.Duration{} } else { yyv569 := &x.NodeStatusUpdateFrequency yym570 := z.DecBinary() @@ -4278,7 +4278,7 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode } case "imageMinimumGCAge": if r.TryDecodeAsNil() { - x.ImageMinimumGCAge = pkg1_unversioned.Duration{} + x.ImageMinimumGCAge = pkg1_v1.Duration{} } else { yyv571 := &x.ImageMinimumGCAge yym572 := z.DecBinary() @@ -4311,7 +4311,7 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode } case "volumeStatsAggPeriod": if r.TryDecodeAsNil() { - x.VolumeStatsAggPeriod = pkg1_unversioned.Duration{} + x.VolumeStatsAggPeriod = pkg1_v1.Duration{} } else { yyv576 := &x.VolumeStatsAggPeriod yym577 := z.DecBinary() @@ -4428,7 +4428,7 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode } case "runtimeRequestTimeout": if r.TryDecodeAsNil() { - x.RuntimeRequestTimeout = pkg1_unversioned.Duration{} + x.RuntimeRequestTimeout = pkg1_v1.Duration{} } else { yyv595 := &x.RuntimeRequestTimeout yym596 := z.DecBinary() @@ -4575,7 +4575,7 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode } case "outOfDiskTransitionFrequency": if r.TryDecodeAsNil() { - x.OutOfDiskTransitionFrequency = pkg1_unversioned.Duration{} + x.OutOfDiskTransitionFrequency = pkg1_v1.Duration{} } else { yyv619 := &x.OutOfDiskTransitionFrequency yym620 := z.DecBinary() @@ -4638,7 +4638,7 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode } case "evictionPressureTransitionPeriod": if r.TryDecodeAsNil() { - x.EvictionPressureTransitionPeriod = pkg1_unversioned.Duration{} + x.EvictionPressureTransitionPeriod = pkg1_v1.Duration{} } else { yyv629 := &x.EvictionPressureTransitionPeriod yym630 := z.DecBinary() @@ -4835,7 +4835,7 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.SyncFrequency = pkg1_unversioned.Duration{} + x.SyncFrequency = pkg1_v1.Duration{} } else { yyv653 := &x.SyncFrequency yym654 := z.DecBinary() @@ -4860,7 +4860,7 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.FileCheckFrequency = pkg1_unversioned.Duration{} + x.FileCheckFrequency = pkg1_v1.Duration{} } else { yyv655 := &x.FileCheckFrequency yym656 := z.DecBinary() @@ -4885,7 +4885,7 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.HTTPCheckFrequency = pkg1_unversioned.Duration{} + x.HTTPCheckFrequency = pkg1_v1.Duration{} } else { yyv657 := &x.HTTPCheckFrequency yym658 := z.DecBinary() @@ -5330,7 +5330,7 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.MinimumGCAge = pkg1_unversioned.Duration{} + x.MinimumGCAge = pkg1_v1.Duration{} } else { yyv687 := &x.MinimumGCAge yym688 := z.DecBinary() @@ -5515,7 +5515,7 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.StreamingConnectionIdleTimeout = pkg1_unversioned.Duration{} + x.StreamingConnectionIdleTimeout = pkg1_v1.Duration{} } else { yyv699 := &x.StreamingConnectionIdleTimeout yym700 := z.DecBinary() @@ -5540,7 +5540,7 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.NodeStatusUpdateFrequency = pkg1_unversioned.Duration{} + x.NodeStatusUpdateFrequency = pkg1_v1.Duration{} } else { yyv701 := &x.NodeStatusUpdateFrequency yym702 := z.DecBinary() @@ -5565,7 +5565,7 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ImageMinimumGCAge = pkg1_unversioned.Duration{} + x.ImageMinimumGCAge = pkg1_v1.Duration{} } else { yyv703 := &x.ImageMinimumGCAge yym704 := z.DecBinary() @@ -5638,7 +5638,7 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.VolumeStatsAggPeriod = pkg1_unversioned.Duration{} + x.VolumeStatsAggPeriod = pkg1_v1.Duration{} } else { yyv708 := &x.VolumeStatsAggPeriod yym709 := z.DecBinary() @@ -5935,7 +5935,7 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.RuntimeRequestTimeout = pkg1_unversioned.Duration{} + x.RuntimeRequestTimeout = pkg1_v1.Duration{} } else { yyv727 := &x.RuntimeRequestTimeout yym728 := z.DecBinary() @@ -6312,7 +6312,7 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.OutOfDiskTransitionFrequency = pkg1_unversioned.Duration{} + x.OutOfDiskTransitionFrequency = pkg1_v1.Duration{} } else { yyv751 := &x.OutOfDiskTransitionFrequency yym752 := z.DecBinary() @@ -6455,7 +6455,7 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.EvictionPressureTransitionPeriod = pkg1_unversioned.Duration{} + x.EvictionPressureTransitionPeriod = pkg1_v1.Duration{} } else { yyv761 := &x.EvictionPressureTransitionPeriod yym762 := z.DecBinary() @@ -7104,7 +7104,7 @@ func (x *KubeletWebhookAuthorization) codecDecodeSelfFromMap(l int, d *codec1978 switch yys811 { case "cacheAuthorizedTTL": if r.TryDecodeAsNil() { - x.CacheAuthorizedTTL = pkg1_unversioned.Duration{} + x.CacheAuthorizedTTL = pkg1_v1.Duration{} } else { yyv812 := &x.CacheAuthorizedTTL yym813 := z.DecBinary() @@ -7119,7 +7119,7 @@ func (x *KubeletWebhookAuthorization) codecDecodeSelfFromMap(l int, d *codec1978 } case "cacheUnauthorizedTTL": if r.TryDecodeAsNil() { - x.CacheUnauthorizedTTL = pkg1_unversioned.Duration{} + x.CacheUnauthorizedTTL = pkg1_v1.Duration{} } else { yyv814 := &x.CacheUnauthorizedTTL yym815 := z.DecBinary() @@ -7158,7 +7158,7 @@ func (x *KubeletWebhookAuthorization) codecDecodeSelfFromArray(l int, d *codec19 } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.CacheAuthorizedTTL = pkg1_unversioned.Duration{} + x.CacheAuthorizedTTL = pkg1_v1.Duration{} } else { yyv817 := &x.CacheAuthorizedTTL yym818 := z.DecBinary() @@ -7183,7 +7183,7 @@ func (x *KubeletWebhookAuthorization) codecDecodeSelfFromArray(l int, d *codec19 } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.CacheUnauthorizedTTL = pkg1_unversioned.Duration{} + x.CacheUnauthorizedTTL = pkg1_v1.Duration{} } else { yyv819 := &x.CacheUnauthorizedTTL yym820 := z.DecBinary() @@ -7745,7 +7745,7 @@ func (x *KubeletWebhookAuthentication) codecDecodeSelfFromMap(l int, d *codec197 } case "cacheTTL": if r.TryDecodeAsNil() { - x.CacheTTL = pkg1_unversioned.Duration{} + x.CacheTTL = pkg1_v1.Duration{} } else { yyv867 := &x.CacheTTL yym868 := z.DecBinary() @@ -7800,7 +7800,7 @@ func (x *KubeletWebhookAuthentication) codecDecodeSelfFromArray(l int, d *codec1 } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.CacheTTL = pkg1_unversioned.Duration{} + x.CacheTTL = pkg1_v1.Duration{} } else { yyv871 := &x.CacheTTL yym872 := z.DecBinary() @@ -8934,7 +8934,7 @@ func (x *LeaderElectionConfiguration) codecDecodeSelfFromMap(l int, d *codec1978 } case "leaseDuration": if r.TryDecodeAsNil() { - x.LeaseDuration = pkg1_unversioned.Duration{} + x.LeaseDuration = pkg1_v1.Duration{} } else { yyv989 := &x.LeaseDuration yym990 := z.DecBinary() @@ -8949,7 +8949,7 @@ func (x *LeaderElectionConfiguration) codecDecodeSelfFromMap(l int, d *codec1978 } case "renewDeadline": if r.TryDecodeAsNil() { - x.RenewDeadline = pkg1_unversioned.Duration{} + x.RenewDeadline = pkg1_v1.Duration{} } else { yyv991 := &x.RenewDeadline yym992 := z.DecBinary() @@ -8964,7 +8964,7 @@ func (x *LeaderElectionConfiguration) codecDecodeSelfFromMap(l int, d *codec1978 } case "retryPeriod": if r.TryDecodeAsNil() { - x.RetryPeriod = pkg1_unversioned.Duration{} + x.RetryPeriod = pkg1_v1.Duration{} } else { yyv993 := &x.RetryPeriod yym994 := z.DecBinary() @@ -9019,7 +9019,7 @@ func (x *LeaderElectionConfiguration) codecDecodeSelfFromArray(l int, d *codec19 } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LeaseDuration = pkg1_unversioned.Duration{} + x.LeaseDuration = pkg1_v1.Duration{} } else { yyv997 := &x.LeaseDuration yym998 := z.DecBinary() @@ -9044,7 +9044,7 @@ func (x *LeaderElectionConfiguration) codecDecodeSelfFromArray(l int, d *codec19 } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.RenewDeadline = pkg1_unversioned.Duration{} + x.RenewDeadline = pkg1_v1.Duration{} } else { yyv999 := &x.RenewDeadline yym1000 := z.DecBinary() @@ -9069,7 +9069,7 @@ func (x *LeaderElectionConfiguration) codecDecodeSelfFromArray(l int, d *codec19 } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.RetryPeriod = pkg1_unversioned.Duration{} + x.RetryPeriod = pkg1_v1.Duration{} } else { yyv1001 := &x.RetryPeriod yym1002 := z.DecBinary() @@ -10580,7 +10580,7 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromMap(l int, d *co } case "serviceSyncPeriod": if r.TryDecodeAsNil() { - x.ServiceSyncPeriod = pkg1_unversioned.Duration{} + x.ServiceSyncPeriod = pkg1_v1.Duration{} } else { yyv1239 := &x.ServiceSyncPeriod yym1240 := z.DecBinary() @@ -10595,7 +10595,7 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromMap(l int, d *co } case "nodeSyncPeriod": if r.TryDecodeAsNil() { - x.NodeSyncPeriod = pkg1_unversioned.Duration{} + x.NodeSyncPeriod = pkg1_v1.Duration{} } else { yyv1241 := &x.NodeSyncPeriod yym1242 := z.DecBinary() @@ -10610,7 +10610,7 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromMap(l int, d *co } case "routeReconciliationPeriod": if r.TryDecodeAsNil() { - x.RouteReconciliationPeriod = pkg1_unversioned.Duration{} + x.RouteReconciliationPeriod = pkg1_v1.Duration{} } else { yyv1243 := &x.RouteReconciliationPeriod yym1244 := z.DecBinary() @@ -10625,7 +10625,7 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromMap(l int, d *co } case "resourceQuotaSyncPeriod": if r.TryDecodeAsNil() { - x.ResourceQuotaSyncPeriod = pkg1_unversioned.Duration{} + x.ResourceQuotaSyncPeriod = pkg1_v1.Duration{} } else { yyv1245 := &x.ResourceQuotaSyncPeriod yym1246 := z.DecBinary() @@ -10640,7 +10640,7 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromMap(l int, d *co } case "namespaceSyncPeriod": if r.TryDecodeAsNil() { - x.NamespaceSyncPeriod = pkg1_unversioned.Duration{} + x.NamespaceSyncPeriod = pkg1_v1.Duration{} } else { yyv1247 := &x.NamespaceSyncPeriod yym1248 := z.DecBinary() @@ -10655,7 +10655,7 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromMap(l int, d *co } case "pvClaimBinderSyncPeriod": if r.TryDecodeAsNil() { - x.PVClaimBinderSyncPeriod = pkg1_unversioned.Duration{} + x.PVClaimBinderSyncPeriod = pkg1_v1.Duration{} } else { yyv1249 := &x.PVClaimBinderSyncPeriod yym1250 := z.DecBinary() @@ -10670,7 +10670,7 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromMap(l int, d *co } case "minResyncPeriod": if r.TryDecodeAsNil() { - x.MinResyncPeriod = pkg1_unversioned.Duration{} + x.MinResyncPeriod = pkg1_v1.Duration{} } else { yyv1251 := &x.MinResyncPeriod yym1252 := z.DecBinary() @@ -10691,7 +10691,7 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromMap(l int, d *co } case "horizontalPodAutoscalerSyncPeriod": if r.TryDecodeAsNil() { - x.HorizontalPodAutoscalerSyncPeriod = pkg1_unversioned.Duration{} + x.HorizontalPodAutoscalerSyncPeriod = pkg1_v1.Duration{} } else { yyv1254 := &x.HorizontalPodAutoscalerSyncPeriod yym1255 := z.DecBinary() @@ -10706,7 +10706,7 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromMap(l int, d *co } case "deploymentControllerSyncPeriod": if r.TryDecodeAsNil() { - x.DeploymentControllerSyncPeriod = pkg1_unversioned.Duration{} + x.DeploymentControllerSyncPeriod = pkg1_v1.Duration{} } else { yyv1256 := &x.DeploymentControllerSyncPeriod yym1257 := z.DecBinary() @@ -10721,7 +10721,7 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromMap(l int, d *co } case "podEvictionTimeout": if r.TryDecodeAsNil() { - x.PodEvictionTimeout = pkg1_unversioned.Duration{} + x.PodEvictionTimeout = pkg1_v1.Duration{} } else { yyv1258 := &x.PodEvictionTimeout yym1259 := z.DecBinary() @@ -10748,7 +10748,7 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromMap(l int, d *co } case "nodeMonitorGracePeriod": if r.TryDecodeAsNil() { - x.NodeMonitorGracePeriod = pkg1_unversioned.Duration{} + x.NodeMonitorGracePeriod = pkg1_v1.Duration{} } else { yyv1262 := &x.NodeMonitorGracePeriod yym1263 := z.DecBinary() @@ -10769,7 +10769,7 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromMap(l int, d *co } case "nodeStartupGracePeriod": if r.TryDecodeAsNil() { - x.NodeStartupGracePeriod = pkg1_unversioned.Duration{} + x.NodeStartupGracePeriod = pkg1_v1.Duration{} } else { yyv1265 := &x.NodeStartupGracePeriod yym1266 := z.DecBinary() @@ -10784,7 +10784,7 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromMap(l int, d *co } case "nodeMonitorPeriod": if r.TryDecodeAsNil() { - x.NodeMonitorPeriod = pkg1_unversioned.Duration{} + x.NodeMonitorPeriod = pkg1_v1.Duration{} } else { yyv1267 := &x.NodeMonitorPeriod yym1268 := z.DecBinary() @@ -10903,7 +10903,7 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromMap(l int, d *co } case "controllerStartInterval": if r.TryDecodeAsNil() { - x.ControllerStartInterval = pkg1_unversioned.Duration{} + x.ControllerStartInterval = pkg1_v1.Duration{} } else { yyv1286 := &x.ControllerStartInterval yym1287 := z.DecBinary() @@ -11298,7 +11298,7 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ServiceSyncPeriod = pkg1_unversioned.Duration{} + x.ServiceSyncPeriod = pkg1_v1.Duration{} } else { yyv1315 := &x.ServiceSyncPeriod yym1316 := z.DecBinary() @@ -11323,7 +11323,7 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.NodeSyncPeriod = pkg1_unversioned.Duration{} + x.NodeSyncPeriod = pkg1_v1.Duration{} } else { yyv1317 := &x.NodeSyncPeriod yym1318 := z.DecBinary() @@ -11348,7 +11348,7 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.RouteReconciliationPeriod = pkg1_unversioned.Duration{} + x.RouteReconciliationPeriod = pkg1_v1.Duration{} } else { yyv1319 := &x.RouteReconciliationPeriod yym1320 := z.DecBinary() @@ -11373,7 +11373,7 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ResourceQuotaSyncPeriod = pkg1_unversioned.Duration{} + x.ResourceQuotaSyncPeriod = pkg1_v1.Duration{} } else { yyv1321 := &x.ResourceQuotaSyncPeriod yym1322 := z.DecBinary() @@ -11398,7 +11398,7 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.NamespaceSyncPeriod = pkg1_unversioned.Duration{} + x.NamespaceSyncPeriod = pkg1_v1.Duration{} } else { yyv1323 := &x.NamespaceSyncPeriod yym1324 := z.DecBinary() @@ -11423,7 +11423,7 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.PVClaimBinderSyncPeriod = pkg1_unversioned.Duration{} + x.PVClaimBinderSyncPeriod = pkg1_v1.Duration{} } else { yyv1325 := &x.PVClaimBinderSyncPeriod yym1326 := z.DecBinary() @@ -11448,7 +11448,7 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.MinResyncPeriod = pkg1_unversioned.Duration{} + x.MinResyncPeriod = pkg1_v1.Duration{} } else { yyv1327 := &x.MinResyncPeriod yym1328 := z.DecBinary() @@ -11489,7 +11489,7 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.HorizontalPodAutoscalerSyncPeriod = pkg1_unversioned.Duration{} + x.HorizontalPodAutoscalerSyncPeriod = pkg1_v1.Duration{} } else { yyv1330 := &x.HorizontalPodAutoscalerSyncPeriod yym1331 := z.DecBinary() @@ -11514,7 +11514,7 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.DeploymentControllerSyncPeriod = pkg1_unversioned.Duration{} + x.DeploymentControllerSyncPeriod = pkg1_v1.Duration{} } else { yyv1332 := &x.DeploymentControllerSyncPeriod yym1333 := z.DecBinary() @@ -11539,7 +11539,7 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.PodEvictionTimeout = pkg1_unversioned.Duration{} + x.PodEvictionTimeout = pkg1_v1.Duration{} } else { yyv1334 := &x.PodEvictionTimeout yym1335 := z.DecBinary() @@ -11596,7 +11596,7 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.NodeMonitorGracePeriod = pkg1_unversioned.Duration{} + x.NodeMonitorGracePeriod = pkg1_v1.Duration{} } else { yyv1338 := &x.NodeMonitorGracePeriod yym1339 := z.DecBinary() @@ -11637,7 +11637,7 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.NodeStartupGracePeriod = pkg1_unversioned.Duration{} + x.NodeStartupGracePeriod = pkg1_v1.Duration{} } else { yyv1341 := &x.NodeStartupGracePeriod yym1342 := z.DecBinary() @@ -11662,7 +11662,7 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.NodeMonitorPeriod = pkg1_unversioned.Duration{} + x.NodeMonitorPeriod = pkg1_v1.Duration{} } else { yyv1343 := &x.NodeMonitorPeriod yym1344 := z.DecBinary() @@ -11961,7 +11961,7 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ControllerStartInterval = pkg1_unversioned.Duration{} + x.ControllerStartInterval = pkg1_v1.Duration{} } else { yyv1362 := &x.ControllerStartInterval yym1363 := z.DecBinary() diff --git a/pkg/apis/componentconfig/v1alpha1/types.go b/pkg/apis/componentconfig/v1alpha1/types.go index 5ecd0eccf67..24514b8f515 100644 --- a/pkg/apis/componentconfig/v1alpha1/types.go +++ b/pkg/apis/componentconfig/v1alpha1/types.go @@ -16,7 +16,9 @@ limitations under the License. package v1alpha1 -import ( metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" ) +import ( + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" +) type KubeProxyConfiguration struct { metav1.TypeMeta diff --git a/pkg/apis/extensions/register.go b/pkg/apis/extensions/register.go index 993e7449d35..e29ad885a50 100644 --- a/pkg/apis/extensions/register.go +++ b/pkg/apis/extensions/register.go @@ -18,9 +18,9 @@ package extensions import ( "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/autoscaling" "k8s.io/kubernetes/pkg/apis/batch" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" ) diff --git a/pkg/apis/extensions/types.generated.go b/pkg/apis/extensions/types.generated.go index 61937a334cd..008807d9582 100644 --- a/pkg/apis/extensions/types.generated.go +++ b/pkg/apis/extensions/types.generated.go @@ -27,7 +27,7 @@ import ( codec1978 "github.com/ugorji/go/codec" pkg2_api "k8s.io/kubernetes/pkg/api" pkg4_resource "k8s.io/kubernetes/pkg/api/resource" - pkg1_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" + pkg1_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" pkg3_types "k8s.io/kubernetes/pkg/types" pkg5_intstr "k8s.io/kubernetes/pkg/util/intstr" "reflect" @@ -67,7 +67,7 @@ func init() { if false { // reference the types, but skip this branch at build/run time var v0 pkg2_api.ObjectMeta var v1 pkg4_resource.Quantity - var v2 pkg1_unversioned.LabelSelector + var v2 pkg1_v1.LabelSelector var v3 pkg3_types.UID var v4 pkg5_intstr.IntOrString var v5 time.Time @@ -403,7 +403,7 @@ func (x *ScaleStatus) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.Selector == nil { - x.Selector = new(pkg1_unversioned.LabelSelector) + x.Selector = new(pkg1_v1.LabelSelector) } yym25 := z.DecBinary() _ = yym25 @@ -460,7 +460,7 @@ func (x *ScaleStatus) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } else { if x.Selector == nil { - x.Selector = new(pkg1_unversioned.LabelSelector) + x.Selector = new(pkg1_v1.LabelSelector) } yym29 := z.DecBinary() _ = yym29 @@ -2457,7 +2457,7 @@ func (x *ThirdPartyResourceList) codecDecodeSelfFromMap(l int, d *codec1978.Deco } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv197 := &x.ListMeta yym198 := z.DecBinary() @@ -2538,7 +2538,7 @@ func (x *ThirdPartyResourceList) codecDecodeSelfFromArray(l int, d *codec1978.De } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv204 := &x.ListMeta yym205 := z.DecBinary() @@ -3769,7 +3769,7 @@ func (x *DeploymentSpec) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.Selector == nil { - x.Selector = new(pkg1_unversioned.LabelSelector) + x.Selector = new(pkg1_v1.LabelSelector) } yym314 := z.DecBinary() _ = yym314 @@ -3895,7 +3895,7 @@ func (x *DeploymentSpec) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } else { if x.Selector == nil { - x.Selector = new(pkg1_unversioned.LabelSelector) + x.Selector = new(pkg1_v1.LabelSelector) } yym327 := z.DecBinary() _ = yym327 @@ -5818,7 +5818,7 @@ func (x *DeploymentCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder } case "lastUpdateTime": if r.TryDecodeAsNil() { - x.LastUpdateTime = pkg1_unversioned.Time{} + x.LastUpdateTime = pkg1_v1.Time{} } else { yyv486 := &x.LastUpdateTime yym487 := z.DecBinary() @@ -5835,7 +5835,7 @@ func (x *DeploymentCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder } case "lastTransitionTime": if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg1_unversioned.Time{} + x.LastTransitionTime = pkg1_v1.Time{} } else { yyv488 := &x.LastTransitionTime yym489 := z.DecBinary() @@ -5920,7 +5920,7 @@ func (x *DeploymentCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decod } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastUpdateTime = pkg1_unversioned.Time{} + x.LastUpdateTime = pkg1_v1.Time{} } else { yyv495 := &x.LastUpdateTime yym496 := z.DecBinary() @@ -5947,7 +5947,7 @@ func (x *DeploymentCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decod } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg1_unversioned.Time{} + x.LastTransitionTime = pkg1_v1.Time{} } else { yyv497 := &x.LastTransitionTime yym498 := z.DecBinary() @@ -6224,7 +6224,7 @@ func (x *DeploymentList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv522 := &x.ListMeta yym523 := z.DecBinary() @@ -6305,7 +6305,7 @@ func (x *DeploymentList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv529 := &x.ListMeta yym530 := z.DecBinary() @@ -6499,7 +6499,7 @@ func (x *DaemonSetSpec) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.Selector == nil { - x.Selector = new(pkg1_unversioned.LabelSelector) + x.Selector = new(pkg1_v1.LabelSelector) } yym545 := z.DecBinary() _ = yym545 @@ -6547,7 +6547,7 @@ func (x *DaemonSetSpec) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } else { if x.Selector == nil { - x.Selector = new(pkg1_unversioned.LabelSelector) + x.Selector = new(pkg1_v1.LabelSelector) } yym549 := z.DecBinary() _ = yym549 @@ -7432,7 +7432,7 @@ func (x *DaemonSetList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv629 := &x.ListMeta yym630 := z.DecBinary() @@ -7513,7 +7513,7 @@ func (x *DaemonSetList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv636 := &x.ListMeta yym637 := z.DecBinary() @@ -7776,7 +7776,7 @@ func (x *ThirdPartyResourceDataList) codecDecodeSelfFromMap(l int, d *codec1978. } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv661 := &x.ListMeta yym662 := z.DecBinary() @@ -7857,7 +7857,7 @@ func (x *ThirdPartyResourceDataList) codecDecodeSelfFromArray(l int, d *codec197 } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv668 := &x.ListMeta yym669 := z.DecBinary() @@ -8463,7 +8463,7 @@ func (x *IngressList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv724 := &x.ListMeta yym725 := z.DecBinary() @@ -8544,7 +8544,7 @@ func (x *IngressList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv731 := &x.ListMeta yym732 := z.DecBinary() @@ -10900,7 +10900,7 @@ func (x *ReplicaSetList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv911 := &x.ListMeta yym912 := z.DecBinary() @@ -10981,7 +10981,7 @@ func (x *ReplicaSetList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv918 := &x.ListMeta yym919 := z.DecBinary() @@ -11239,7 +11239,7 @@ func (x *ReplicaSetSpec) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.Selector == nil { - x.Selector = new(pkg1_unversioned.LabelSelector) + x.Selector = new(pkg1_v1.LabelSelector) } yym942 := z.DecBinary() _ = yym942 @@ -11319,7 +11319,7 @@ func (x *ReplicaSetSpec) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } else { if x.Selector == nil { - x.Selector = new(pkg1_unversioned.LabelSelector) + x.Selector = new(pkg1_v1.LabelSelector) } yym948 := z.DecBinary() _ = yym948 @@ -12035,7 +12035,7 @@ func (x *ReplicaSetCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder } case "lastTransitionTime": if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg1_unversioned.Time{} + x.LastTransitionTime = pkg1_v1.Time{} } else { yyv1012 := &x.LastTransitionTime yym1013 := z.DecBinary() @@ -12120,7 +12120,7 @@ func (x *ReplicaSetCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decod } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg1_unversioned.Time{} + x.LastTransitionTime = pkg1_v1.Time{} } else { yyv1019 := &x.LastTransitionTime yym1020 := z.DecBinary() @@ -14957,7 +14957,7 @@ func (x *PodSecurityPolicyList) codecDecodeSelfFromMap(l int, d *codec1978.Decod } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv1258 := &x.ListMeta yym1259 := z.DecBinary() @@ -15038,7 +15038,7 @@ func (x *PodSecurityPolicyList) codecDecodeSelfFromArray(l int, d *codec1978.Dec } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv1265 := &x.ListMeta yym1266 := z.DecBinary() @@ -15538,7 +15538,7 @@ func (x *NetworkPolicySpec) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) switch yys1307 { case "podSelector": if r.TryDecodeAsNil() { - x.PodSelector = pkg1_unversioned.LabelSelector{} + x.PodSelector = pkg1_v1.LabelSelector{} } else { yyv1308 := &x.PodSelector yym1309 := z.DecBinary() @@ -15587,7 +15587,7 @@ func (x *NetworkPolicySpec) codecDecodeSelfFromArray(l int, d *codec1978.Decoder } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.PodSelector = pkg1_unversioned.LabelSelector{} + x.PodSelector = pkg1_v1.LabelSelector{} } else { yyv1313 := &x.PodSelector yym1314 := z.DecBinary() @@ -16342,7 +16342,7 @@ func (x *NetworkPolicyPeer) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) } } else { if x.PodSelector == nil { - x.PodSelector = new(pkg1_unversioned.LabelSelector) + x.PodSelector = new(pkg1_v1.LabelSelector) } yym1369 := z.DecBinary() _ = yym1369 @@ -16359,7 +16359,7 @@ func (x *NetworkPolicyPeer) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) } } else { if x.NamespaceSelector == nil { - x.NamespaceSelector = new(pkg1_unversioned.LabelSelector) + x.NamespaceSelector = new(pkg1_v1.LabelSelector) } yym1371 := z.DecBinary() _ = yym1371 @@ -16400,7 +16400,7 @@ func (x *NetworkPolicyPeer) codecDecodeSelfFromArray(l int, d *codec1978.Decoder } } else { if x.PodSelector == nil { - x.PodSelector = new(pkg1_unversioned.LabelSelector) + x.PodSelector = new(pkg1_v1.LabelSelector) } yym1374 := z.DecBinary() _ = yym1374 @@ -16427,7 +16427,7 @@ func (x *NetworkPolicyPeer) codecDecodeSelfFromArray(l int, d *codec1978.Decoder } } else { if x.NamespaceSelector == nil { - x.NamespaceSelector = new(pkg1_unversioned.LabelSelector) + x.NamespaceSelector = new(pkg1_v1.LabelSelector) } yym1376 := z.DecBinary() _ = yym1376 @@ -16667,7 +16667,7 @@ func (x *NetworkPolicyList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv1398 := &x.ListMeta yym1399 := z.DecBinary() @@ -16748,7 +16748,7 @@ func (x *NetworkPolicyList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv1405 := &x.ListMeta yym1406 := z.DecBinary() diff --git a/pkg/apis/extensions/v1beta1/conversion.go b/pkg/apis/extensions/v1beta1/conversion.go index 75d0f5dcb1d..0a8fa482dfd 100644 --- a/pkg/apis/extensions/v1beta1/conversion.go +++ b/pkg/apis/extensions/v1beta1/conversion.go @@ -20,11 +20,11 @@ import ( "fmt" "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" v1 "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apis/autoscaling" "k8s.io/kubernetes/pkg/apis/batch" "k8s.io/kubernetes/pkg/apis/extensions" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/conversion" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/util/intstr" diff --git a/pkg/apis/extensions/v1beta1/defaults.go b/pkg/apis/extensions/v1beta1/defaults.go index 43b76f47ec1..19bac99fb87 100644 --- a/pkg/apis/extensions/v1beta1/defaults.go +++ b/pkg/apis/extensions/v1beta1/defaults.go @@ -17,8 +17,8 @@ limitations under the License. package v1beta1 import ( - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/util/intstr" ) diff --git a/pkg/apis/extensions/v1beta1/defaults_test.go b/pkg/apis/extensions/v1beta1/defaults_test.go index 1403a81f989..1bf8046c77d 100644 --- a/pkg/apis/extensions/v1beta1/defaults_test.go +++ b/pkg/apis/extensions/v1beta1/defaults_test.go @@ -23,10 +23,10 @@ import ( "k8s.io/kubernetes/pkg/api" _ "k8s.io/kubernetes/pkg/api/install" "k8s.io/kubernetes/pkg/api/resource" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" _ "k8s.io/kubernetes/pkg/apis/extensions/install" . "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/util/intstr" ) diff --git a/pkg/apis/extensions/v1beta1/generated.pb.go b/pkg/apis/extensions/v1beta1/generated.pb.go index 0ced69f5686..52aa5f6fd9c 100644 --- a/pkg/apis/extensions/v1beta1/generated.pb.go +++ b/pkg/apis/extensions/v1beta1/generated.pb.go @@ -99,8 +99,8 @@ import proto "github.com/gogo/protobuf/proto" import fmt "fmt" import math "math" -import k8s_io_kubernetes_pkg_api_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" import k8s_io_kubernetes_pkg_api_v1 "k8s.io/kubernetes/pkg/api/v1" +import k8s_io_kubernetes_pkg_apis_meta_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" import k8s_io_kubernetes_pkg_util_intstr "k8s.io/kubernetes/pkg/util/intstr" @@ -4155,7 +4155,7 @@ func (this *DaemonSetList) String() string { return "nil" } s := strings.Join([]string{`&DaemonSetList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "DaemonSet", "DaemonSet", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -4166,7 +4166,7 @@ func (this *DaemonSetSpec) String() string { return "nil" } s := strings.Join([]string{`&DaemonSetSpec{`, - `Selector:` + strings.Replace(fmt.Sprintf("%v", this.Selector), "LabelSelector", "k8s_io_kubernetes_pkg_api_unversioned.LabelSelector", 1) + `,`, + `Selector:` + strings.Replace(fmt.Sprintf("%v", this.Selector), "LabelSelector", "k8s_io_kubernetes_pkg_apis_meta_v1.LabelSelector", 1) + `,`, `Template:` + strings.Replace(strings.Replace(this.Template.String(), "PodTemplateSpec", "k8s_io_kubernetes_pkg_api_v1.PodTemplateSpec", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -4206,8 +4206,8 @@ func (this *DeploymentCondition) String() string { `Status:` + fmt.Sprintf("%v", this.Status) + `,`, `Reason:` + fmt.Sprintf("%v", this.Reason) + `,`, `Message:` + fmt.Sprintf("%v", this.Message) + `,`, - `LastUpdateTime:` + strings.Replace(strings.Replace(this.LastUpdateTime.String(), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1), `&`, ``, 1) + `,`, - `LastTransitionTime:` + strings.Replace(strings.Replace(this.LastTransitionTime.String(), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1), `&`, ``, 1) + `,`, + `LastUpdateTime:` + strings.Replace(strings.Replace(this.LastUpdateTime.String(), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1), `&`, ``, 1) + `,`, + `LastTransitionTime:` + strings.Replace(strings.Replace(this.LastTransitionTime.String(), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1), `&`, ``, 1) + `,`, `}`, }, "") return s @@ -4217,7 +4217,7 @@ func (this *DeploymentList) String() string { return "nil" } s := strings.Join([]string{`&DeploymentList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "Deployment", "Deployment", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -4251,7 +4251,7 @@ func (this *DeploymentSpec) String() string { } s := strings.Join([]string{`&DeploymentSpec{`, `Replicas:` + valueToStringGenerated(this.Replicas) + `,`, - `Selector:` + strings.Replace(fmt.Sprintf("%v", this.Selector), "LabelSelector", "k8s_io_kubernetes_pkg_api_unversioned.LabelSelector", 1) + `,`, + `Selector:` + strings.Replace(fmt.Sprintf("%v", this.Selector), "LabelSelector", "k8s_io_kubernetes_pkg_apis_meta_v1.LabelSelector", 1) + `,`, `Template:` + strings.Replace(strings.Replace(this.Template.String(), "PodTemplateSpec", "k8s_io_kubernetes_pkg_api_v1.PodTemplateSpec", 1), `&`, ``, 1) + `,`, `Strategy:` + strings.Replace(strings.Replace(this.Strategy.String(), "DeploymentStrategy", "DeploymentStrategy", 1), `&`, ``, 1) + `,`, `MinReadySeconds:` + fmt.Sprintf("%v", this.MinReadySeconds) + `,`, @@ -4338,7 +4338,7 @@ func (this *HorizontalPodAutoscalerList) String() string { return "nil" } s := strings.Join([]string{`&HorizontalPodAutoscalerList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "HorizontalPodAutoscaler", "HorizontalPodAutoscaler", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -4363,7 +4363,7 @@ func (this *HorizontalPodAutoscalerStatus) String() string { } s := strings.Join([]string{`&HorizontalPodAutoscalerStatus{`, `ObservedGeneration:` + valueToStringGenerated(this.ObservedGeneration) + `,`, - `LastScaleTime:` + strings.Replace(fmt.Sprintf("%v", this.LastScaleTime), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1) + `,`, + `LastScaleTime:` + strings.Replace(fmt.Sprintf("%v", this.LastScaleTime), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1) + `,`, `CurrentReplicas:` + fmt.Sprintf("%v", this.CurrentReplicas) + `,`, `DesiredReplicas:` + fmt.Sprintf("%v", this.DesiredReplicas) + `,`, `CurrentCPUUtilizationPercentage:` + valueToStringGenerated(this.CurrentCPUUtilizationPercentage) + `,`, @@ -4421,7 +4421,7 @@ func (this *IngressList) String() string { return "nil" } s := strings.Join([]string{`&IngressList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "Ingress", "Ingress", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -4500,8 +4500,8 @@ func (this *JobCondition) String() string { s := strings.Join([]string{`&JobCondition{`, `Type:` + fmt.Sprintf("%v", this.Type) + `,`, `Status:` + fmt.Sprintf("%v", this.Status) + `,`, - `LastProbeTime:` + strings.Replace(strings.Replace(this.LastProbeTime.String(), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1), `&`, ``, 1) + `,`, - `LastTransitionTime:` + strings.Replace(strings.Replace(this.LastTransitionTime.String(), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1), `&`, ``, 1) + `,`, + `LastProbeTime:` + strings.Replace(strings.Replace(this.LastProbeTime.String(), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1), `&`, ``, 1) + `,`, + `LastTransitionTime:` + strings.Replace(strings.Replace(this.LastTransitionTime.String(), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1), `&`, ``, 1) + `,`, `Reason:` + fmt.Sprintf("%v", this.Reason) + `,`, `Message:` + fmt.Sprintf("%v", this.Message) + `,`, `}`, @@ -4513,7 +4513,7 @@ func (this *JobList) String() string { return "nil" } s := strings.Join([]string{`&JobList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "Job", "Job", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -4527,7 +4527,7 @@ func (this *JobSpec) String() string { `Parallelism:` + valueToStringGenerated(this.Parallelism) + `,`, `Completions:` + valueToStringGenerated(this.Completions) + `,`, `ActiveDeadlineSeconds:` + valueToStringGenerated(this.ActiveDeadlineSeconds) + `,`, - `Selector:` + strings.Replace(fmt.Sprintf("%v", this.Selector), "LabelSelector", "k8s_io_kubernetes_pkg_api_unversioned.LabelSelector", 1) + `,`, + `Selector:` + strings.Replace(fmt.Sprintf("%v", this.Selector), "LabelSelector", "k8s_io_kubernetes_pkg_apis_meta_v1.LabelSelector", 1) + `,`, `AutoSelector:` + valueToStringGenerated(this.AutoSelector) + `,`, `Template:` + strings.Replace(strings.Replace(this.Template.String(), "PodTemplateSpec", "k8s_io_kubernetes_pkg_api_v1.PodTemplateSpec", 1), `&`, ``, 1) + `,`, `}`, @@ -4540,8 +4540,8 @@ func (this *JobStatus) String() string { } s := strings.Join([]string{`&JobStatus{`, `Conditions:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Conditions), "JobCondition", "JobCondition", 1), `&`, ``, 1) + `,`, - `StartTime:` + strings.Replace(fmt.Sprintf("%v", this.StartTime), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1) + `,`, - `CompletionTime:` + strings.Replace(fmt.Sprintf("%v", this.CompletionTime), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1) + `,`, + `StartTime:` + strings.Replace(fmt.Sprintf("%v", this.StartTime), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1) + `,`, + `CompletionTime:` + strings.Replace(fmt.Sprintf("%v", this.CompletionTime), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1) + `,`, `Active:` + fmt.Sprintf("%v", this.Active) + `,`, `Succeeded:` + fmt.Sprintf("%v", this.Succeeded) + `,`, `Failed:` + fmt.Sprintf("%v", this.Failed) + `,`, @@ -4576,7 +4576,7 @@ func (this *NetworkPolicyList) String() string { return "nil" } s := strings.Join([]string{`&NetworkPolicyList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "NetworkPolicy", "NetworkPolicy", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -4587,8 +4587,8 @@ func (this *NetworkPolicyPeer) String() string { return "nil" } s := strings.Join([]string{`&NetworkPolicyPeer{`, - `PodSelector:` + strings.Replace(fmt.Sprintf("%v", this.PodSelector), "LabelSelector", "k8s_io_kubernetes_pkg_api_unversioned.LabelSelector", 1) + `,`, - `NamespaceSelector:` + strings.Replace(fmt.Sprintf("%v", this.NamespaceSelector), "LabelSelector", "k8s_io_kubernetes_pkg_api_unversioned.LabelSelector", 1) + `,`, + `PodSelector:` + strings.Replace(fmt.Sprintf("%v", this.PodSelector), "LabelSelector", "k8s_io_kubernetes_pkg_apis_meta_v1.LabelSelector", 1) + `,`, + `NamespaceSelector:` + strings.Replace(fmt.Sprintf("%v", this.NamespaceSelector), "LabelSelector", "k8s_io_kubernetes_pkg_apis_meta_v1.LabelSelector", 1) + `,`, `}`, }, "") return s @@ -4609,7 +4609,7 @@ func (this *NetworkPolicySpec) String() string { return "nil" } s := strings.Join([]string{`&NetworkPolicySpec{`, - `PodSelector:` + strings.Replace(strings.Replace(this.PodSelector.String(), "LabelSelector", "k8s_io_kubernetes_pkg_api_unversioned.LabelSelector", 1), `&`, ``, 1) + `,`, + `PodSelector:` + strings.Replace(strings.Replace(this.PodSelector.String(), "LabelSelector", "k8s_io_kubernetes_pkg_apis_meta_v1.LabelSelector", 1), `&`, ``, 1) + `,`, `Ingress:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Ingress), "NetworkPolicyIngressRule", "NetworkPolicyIngressRule", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -4631,7 +4631,7 @@ func (this *PodSecurityPolicyList) String() string { return "nil" } s := strings.Join([]string{`&PodSecurityPolicyList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "PodSecurityPolicy", "PodSecurityPolicy", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -4679,7 +4679,7 @@ func (this *ReplicaSetCondition) String() string { s := strings.Join([]string{`&ReplicaSetCondition{`, `Type:` + fmt.Sprintf("%v", this.Type) + `,`, `Status:` + fmt.Sprintf("%v", this.Status) + `,`, - `LastTransitionTime:` + strings.Replace(strings.Replace(this.LastTransitionTime.String(), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1), `&`, ``, 1) + `,`, + `LastTransitionTime:` + strings.Replace(strings.Replace(this.LastTransitionTime.String(), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1), `&`, ``, 1) + `,`, `Reason:` + fmt.Sprintf("%v", this.Reason) + `,`, `Message:` + fmt.Sprintf("%v", this.Message) + `,`, `}`, @@ -4691,7 +4691,7 @@ func (this *ReplicaSetList) String() string { return "nil" } s := strings.Join([]string{`&ReplicaSetList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "ReplicaSet", "ReplicaSet", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -4703,7 +4703,7 @@ func (this *ReplicaSetSpec) String() string { } s := strings.Join([]string{`&ReplicaSetSpec{`, `Replicas:` + valueToStringGenerated(this.Replicas) + `,`, - `Selector:` + strings.Replace(fmt.Sprintf("%v", this.Selector), "LabelSelector", "k8s_io_kubernetes_pkg_api_unversioned.LabelSelector", 1) + `,`, + `Selector:` + strings.Replace(fmt.Sprintf("%v", this.Selector), "LabelSelector", "k8s_io_kubernetes_pkg_apis_meta_v1.LabelSelector", 1) + `,`, `Template:` + strings.Replace(strings.Replace(this.Template.String(), "PodTemplateSpec", "k8s_io_kubernetes_pkg_api_v1.PodTemplateSpec", 1), `&`, ``, 1) + `,`, `MinReadySeconds:` + fmt.Sprintf("%v", this.MinReadySeconds) + `,`, `}`, @@ -4873,7 +4873,7 @@ func (this *ThirdPartyResourceDataList) String() string { return "nil" } s := strings.Join([]string{`&ThirdPartyResourceDataList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "ThirdPartyResourceData", "ThirdPartyResourceData", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -4884,7 +4884,7 @@ func (this *ThirdPartyResourceList) String() string { return "nil" } s := strings.Join([]string{`&ThirdPartyResourceList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "ThirdPartyResource", "ThirdPartyResource", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -5733,7 +5733,7 @@ func (m *DaemonSetSpec) Unmarshal(data []byte) error { return io.ErrUnexpectedEOF } if m.Selector == nil { - m.Selector = &k8s_io_kubernetes_pkg_api_unversioned.LabelSelector{} + m.Selector = &k8s_io_kubernetes_pkg_apis_meta_v1.LabelSelector{} } if err := m.Selector.Unmarshal(data[iNdEx:postIndex]); err != nil { return err @@ -6689,7 +6689,7 @@ func (m *DeploymentSpec) Unmarshal(data []byte) error { return io.ErrUnexpectedEOF } if m.Selector == nil { - m.Selector = &k8s_io_kubernetes_pkg_api_unversioned.LabelSelector{} + m.Selector = &k8s_io_kubernetes_pkg_apis_meta_v1.LabelSelector{} } if err := m.Selector.Unmarshal(data[iNdEx:postIndex]); err != nil { return err @@ -7955,7 +7955,7 @@ func (m *HorizontalPodAutoscalerStatus) Unmarshal(data []byte) error { return io.ErrUnexpectedEOF } if m.LastScaleTime == nil { - m.LastScaleTime = &k8s_io_kubernetes_pkg_api_unversioned.Time{} + m.LastScaleTime = &k8s_io_kubernetes_pkg_apis_meta_v1.Time{} } if err := m.LastScaleTime.Unmarshal(data[iNdEx:postIndex]); err != nil { return err @@ -9694,7 +9694,7 @@ func (m *JobSpec) Unmarshal(data []byte) error { return io.ErrUnexpectedEOF } if m.Selector == nil { - m.Selector = &k8s_io_kubernetes_pkg_api_unversioned.LabelSelector{} + m.Selector = &k8s_io_kubernetes_pkg_apis_meta_v1.LabelSelector{} } if err := m.Selector.Unmarshal(data[iNdEx:postIndex]); err != nil { return err @@ -9859,7 +9859,7 @@ func (m *JobStatus) Unmarshal(data []byte) error { return io.ErrUnexpectedEOF } if m.StartTime == nil { - m.StartTime = &k8s_io_kubernetes_pkg_api_unversioned.Time{} + m.StartTime = &k8s_io_kubernetes_pkg_apis_meta_v1.Time{} } if err := m.StartTime.Unmarshal(data[iNdEx:postIndex]); err != nil { return err @@ -9892,7 +9892,7 @@ func (m *JobStatus) Unmarshal(data []byte) error { return io.ErrUnexpectedEOF } if m.CompletionTime == nil { - m.CompletionTime = &k8s_io_kubernetes_pkg_api_unversioned.Time{} + m.CompletionTime = &k8s_io_kubernetes_pkg_apis_meta_v1.Time{} } if err := m.CompletionTime.Unmarshal(data[iNdEx:postIndex]); err != nil { return err @@ -10365,7 +10365,7 @@ func (m *NetworkPolicyPeer) Unmarshal(data []byte) error { return io.ErrUnexpectedEOF } if m.PodSelector == nil { - m.PodSelector = &k8s_io_kubernetes_pkg_api_unversioned.LabelSelector{} + m.PodSelector = &k8s_io_kubernetes_pkg_apis_meta_v1.LabelSelector{} } if err := m.PodSelector.Unmarshal(data[iNdEx:postIndex]); err != nil { return err @@ -10398,7 +10398,7 @@ func (m *NetworkPolicyPeer) Unmarshal(data []byte) error { return io.ErrUnexpectedEOF } if m.NamespaceSelector == nil { - m.NamespaceSelector = &k8s_io_kubernetes_pkg_api_unversioned.LabelSelector{} + m.NamespaceSelector = &k8s_io_kubernetes_pkg_apis_meta_v1.LabelSelector{} } if err := m.NamespaceSelector.Unmarshal(data[iNdEx:postIndex]); err != nil { return err @@ -11810,7 +11810,7 @@ func (m *ReplicaSetSpec) Unmarshal(data []byte) error { return io.ErrUnexpectedEOF } if m.Selector == nil { - m.Selector = &k8s_io_kubernetes_pkg_api_unversioned.LabelSelector{} + m.Selector = &k8s_io_kubernetes_pkg_apis_meta_v1.LabelSelector{} } if err := m.Selector.Unmarshal(data[iNdEx:postIndex]); err != nil { return err @@ -13792,248 +13792,247 @@ var ( ) var fileDescriptorGenerated = []byte{ - // 3876 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe4, 0x5b, 0x5d, 0x6c, 0x24, 0xd9, - 0x55, 0x9e, 0xea, 0x76, 0x8f, 0xbb, 0x4f, 0x8f, 0x3d, 0x9e, 0x3b, 0x1e, 0x4f, 0xaf, 0x77, 0xd7, - 0x3d, 0xa9, 0x88, 0x64, 0x22, 0x76, 0xdb, 0xcc, 0xb0, 0x13, 0x36, 0xbb, 0x9b, 0x4d, 0xdc, 0xf6, - 0xfc, 0x62, 0xcf, 0x74, 0x6e, 0xdb, 0x93, 0x21, 0x3f, 0x1b, 0xaa, 0xbb, 0xae, 0xdb, 0xb5, 0xae, - 0xbf, 0xad, 0xba, 0xe5, 0x9d, 0x4e, 0x84, 0x12, 0x09, 0xf1, 0x1a, 0xf2, 0x06, 0x12, 0xf0, 0xc0, - 0x03, 0xe2, 0x89, 0x88, 0x08, 0xa4, 0x48, 0x3c, 0x01, 0x02, 0x31, 0x48, 0x20, 0x02, 0x12, 0x82, - 0x07, 0xe8, 0x65, 0x1d, 0xa1, 0x15, 0xef, 0x08, 0xa4, 0xe1, 0x05, 0xdd, 0x5b, 0xb7, 0x7e, 0xbb, - 0xaa, 0xc7, 0xd5, 0xfe, 0x91, 0x10, 0x6f, 0xdd, 0xf7, 0x9e, 0xf3, 0x9d, 0x73, 0x6e, 0x9d, 0x3a, - 0xe7, 0xdc, 0x7b, 0x4f, 0xc1, 0x17, 0xf7, 0xdf, 0x74, 0x5b, 0x9a, 0xb5, 0xba, 0xef, 0xf5, 0x88, - 0x63, 0x12, 0x4a, 0xdc, 0x55, 0x7b, 0x7f, 0xb0, 0xaa, 0xd8, 0x9a, 0xbb, 0x4a, 0x9e, 0x52, 0x62, - 0xba, 0x9a, 0x65, 0xba, 0xab, 0x07, 0x37, 0x7a, 0x84, 0x2a, 0x37, 0x56, 0x07, 0xc4, 0x24, 0x8e, - 0x42, 0x89, 0xda, 0xb2, 0x1d, 0x8b, 0x5a, 0xe8, 0x75, 0x9f, 0xbd, 0x15, 0xb1, 0xb7, 0xec, 0xfd, - 0x41, 0x8b, 0xb1, 0xb7, 0x22, 0xf6, 0x96, 0x60, 0x5f, 0x7e, 0x7d, 0xa0, 0xd1, 0x3d, 0xaf, 0xd7, - 0xea, 0x5b, 0xc6, 0xea, 0xc0, 0x1a, 0x58, 0xab, 0x1c, 0xa5, 0xe7, 0xed, 0xf2, 0x7f, 0xfc, 0x0f, - 0xff, 0xe5, 0xa3, 0x2f, 0xdf, 0xcc, 0x55, 0x6e, 0xd5, 0x21, 0xae, 0xe5, 0x39, 0x7d, 0x92, 0xd6, - 0x68, 0xf9, 0x56, 0x3e, 0x8f, 0x67, 0x1e, 0x10, 0x87, 0x29, 0x44, 0xd4, 0x31, 0xb6, 0xd7, 0xf2, - 0xd9, 0x0e, 0xc6, 0xcc, 0x5e, 0x7e, 0x3d, 0x9b, 0xda, 0xf1, 0x4c, 0xaa, 0x19, 0xe3, 0x3a, 0xbd, - 0x31, 0x99, 0xdc, 0xed, 0xef, 0x11, 0x43, 0x19, 0xe3, 0xba, 0x91, 0xcd, 0xe5, 0x51, 0x4d, 0x5f, - 0xd5, 0x4c, 0xea, 0x52, 0x27, 0xcd, 0x22, 0xb7, 0x00, 0xd6, 0x3a, 0xf7, 0x1f, 0xfb, 0x56, 0xa2, - 0x6b, 0x30, 0x63, 0x2a, 0x06, 0x69, 0x48, 0xd7, 0xa4, 0xeb, 0xb5, 0xf6, 0x85, 0x67, 0xa3, 0xe6, - 0xb9, 0xc3, 0x51, 0x73, 0xe6, 0xa1, 0x62, 0x10, 0xcc, 0x67, 0xe4, 0x6f, 0xc0, 0xe2, 0x7a, 0x67, - 0x67, 0x5b, 0x71, 0x06, 0x84, 0xee, 0x50, 0x4d, 0xd7, 0xbe, 0xad, 0x50, 0xc6, 0xb9, 0x01, 0x0b, - 0x94, 0x0f, 0x76, 0x88, 0xd3, 0x27, 0x26, 0x55, 0x06, 0x3e, 0x4a, 0xa5, 0xdd, 0x10, 0x28, 0x0b, - 0xdb, 0xa9, 0x79, 0x3c, 0xc6, 0x21, 0xff, 0x86, 0x04, 0x2f, 0xad, 0x7b, 0x2e, 0xb5, 0x8c, 0x2d, - 0x42, 0x1d, 0xad, 0xbf, 0xee, 0x39, 0x0e, 0x31, 0x69, 0x97, 0x2a, 0xd4, 0x73, 0x5f, 0xac, 0x1d, - 0x7a, 0x02, 0x95, 0x03, 0x45, 0xf7, 0x48, 0xa3, 0x74, 0x4d, 0xba, 0x5e, 0xbf, 0xf9, 0x5a, 0x2b, - 0xd7, 0xd9, 0x5a, 0x81, 0x3b, 0xb4, 0xbe, 0xe2, 0x29, 0x26, 0xd5, 0xe8, 0xb0, 0xbd, 0x28, 0x00, - 0x2f, 0x08, 0xa9, 0x8f, 0x19, 0x12, 0xf6, 0x01, 0xe5, 0xef, 0x4b, 0xf0, 0x6a, 0xae, 0x66, 0x9b, - 0x9a, 0x4b, 0x91, 0x01, 0x15, 0x8d, 0x12, 0xc3, 0x6d, 0x48, 0xd7, 0xca, 0xd7, 0xeb, 0x37, 0xef, - 0xb5, 0x0a, 0x39, 0x7a, 0x2b, 0x17, 0xbc, 0x3d, 0x27, 0xf4, 0xaa, 0xdc, 0x67, 0xf0, 0xd8, 0x97, - 0x22, 0xff, 0xba, 0x04, 0x28, 0xce, 0xe3, 0xaf, 0xee, 0x11, 0xd6, 0xe8, 0xab, 0xc7, 0x59, 0xa3, - 0xcb, 0x02, 0xb0, 0xee, 0x8b, 0x4b, 0x2c, 0xd1, 0xf7, 0x24, 0x58, 0x1a, 0xd7, 0x88, 0xaf, 0xcd, - 0x6e, 0x72, 0x6d, 0xd6, 0x8e, 0xb1, 0x36, 0x3e, 0x6a, 0xce, 0xa2, 0xfc, 0x41, 0x09, 0x6a, 0x1b, - 0x0a, 0x31, 0x2c, 0xb3, 0x4b, 0x28, 0x7a, 0x02, 0x55, 0x83, 0x50, 0x45, 0x55, 0xa8, 0xc2, 0xd7, - 0xa3, 0x7e, 0xf3, 0xfa, 0x04, 0x63, 0x0f, 0x6e, 0xb4, 0x1e, 0xf5, 0xde, 0x27, 0x7d, 0xba, 0x45, - 0xa8, 0xd2, 0x46, 0x02, 0x1f, 0xa2, 0x31, 0x1c, 0xa2, 0xa1, 0xf7, 0x60, 0xc6, 0xb5, 0x49, 0x5f, - 0x2c, 0xe1, 0x3b, 0x05, 0xcd, 0x09, 0x35, 0xec, 0xda, 0xa4, 0x1f, 0x3d, 0x23, 0xf6, 0x0f, 0x73, - 0x5c, 0xb4, 0x0b, 0xe7, 0x5d, 0xfe, 0xf0, 0x1b, 0x65, 0x2e, 0xe1, 0xdd, 0xa9, 0x25, 0xf8, 0x2e, - 0x34, 0x2f, 0x64, 0x9c, 0xf7, 0xff, 0x63, 0x81, 0x2e, 0xff, 0xad, 0x04, 0x73, 0x21, 0x2d, 0x7f, - 0x52, 0xdf, 0x1c, 0x5b, 0xb3, 0xd5, 0x09, 0x6b, 0x16, 0x8b, 0x8f, 0x2d, 0xc6, 0xce, 0x97, 0x6e, - 0x41, 0x08, 0xab, 0x06, 0x23, 0xb1, 0x85, 0xfb, 0x66, 0xe0, 0x08, 0x25, 0xee, 0x08, 0x6f, 0x4e, - 0x6b, 0x57, 0xce, 0xf3, 0xff, 0x9b, 0xb8, 0x3d, 0x6c, 0x3d, 0xd1, 0x7b, 0x50, 0x75, 0x89, 0x4e, - 0xfa, 0xd4, 0x72, 0x84, 0x3d, 0x6f, 0x1c, 0xd5, 0x1e, 0xa5, 0x47, 0xf4, 0xae, 0xe0, 0x6d, 0x5f, - 0x60, 0x06, 0x05, 0xff, 0x70, 0x88, 0x89, 0xbe, 0x0e, 0x55, 0x4a, 0x0c, 0x5b, 0x57, 0x68, 0xf0, - 0x42, 0xbd, 0x3e, 0xd9, 0xc7, 0x3a, 0x96, 0xba, 0x2d, 0x18, 0xf8, 0xe3, 0x0f, 0x57, 0x2b, 0x18, - 0xc5, 0x21, 0xa0, 0xfc, 0x17, 0x25, 0xb8, 0x98, 0x7a, 0x94, 0xe8, 0x31, 0x2c, 0xf5, 0xfd, 0xf0, - 0xf0, 0xd0, 0x33, 0x7a, 0xc4, 0xe9, 0xf6, 0xf7, 0x88, 0xea, 0xe9, 0x44, 0x15, 0xe1, 0x76, 0x45, - 0xe0, 0x2d, 0xad, 0x67, 0x52, 0xe1, 0x1c, 0x6e, 0xf4, 0x00, 0x90, 0xc9, 0x87, 0xb6, 0x34, 0xd7, - 0x0d, 0x31, 0x4b, 0x1c, 0x73, 0x59, 0x60, 0xa2, 0x87, 0x63, 0x14, 0x38, 0x83, 0x8b, 0xe9, 0xa8, - 0x12, 0x57, 0x73, 0x88, 0x9a, 0xd6, 0xb1, 0x9c, 0xd4, 0x71, 0x23, 0x93, 0x0a, 0xe7, 0x70, 0xa3, - 0x5b, 0x50, 0xf7, 0xa5, 0x61, 0xa2, 0xa8, 0xc3, 0xc6, 0x0c, 0x07, 0x0b, 0x43, 0xd2, 0xc3, 0x68, - 0x0a, 0xc7, 0xe9, 0xe4, 0x3f, 0x2c, 0x01, 0x6c, 0x10, 0x5b, 0xb7, 0x86, 0x06, 0x31, 0x4f, 0x33, - 0x2c, 0x7c, 0x2b, 0x11, 0x16, 0xbe, 0x58, 0xd4, 0xb9, 0x43, 0x15, 0x73, 0xe3, 0xc2, 0x20, 0x15, - 0x17, 0xbe, 0x34, 0xbd, 0x88, 0xc9, 0x81, 0xe1, 0xa7, 0x65, 0xb8, 0x1c, 0x11, 0xaf, 0x5b, 0xa6, - 0xaa, 0xf1, 0x34, 0xff, 0x36, 0xcc, 0xd0, 0xa1, 0x1d, 0xa4, 0x97, 0xcf, 0x06, 0x2a, 0x6e, 0x0f, - 0x6d, 0xf2, 0x7c, 0xd4, 0xbc, 0x9a, 0xc1, 0xc2, 0xa6, 0x30, 0x67, 0x42, 0x8f, 0x43, 0xed, 0x4b, - 0x9c, 0xfd, 0xdd, 0xa4, 0xf0, 0xe7, 0xa3, 0xe6, 0xc4, 0x9a, 0xaa, 0x15, 0x62, 0x26, 0x95, 0x45, - 0x9f, 0x81, 0xf3, 0x0e, 0x51, 0x5c, 0xcb, 0xe4, 0x1e, 0x51, 0x8b, 0x8c, 0xc2, 0x7c, 0x14, 0x8b, - 0x59, 0xf4, 0x39, 0x98, 0x35, 0x88, 0xeb, 0xb2, 0xd2, 0xa4, 0xc2, 0x09, 0x2f, 0x0a, 0xc2, 0xd9, - 0x2d, 0x7f, 0x18, 0x07, 0xf3, 0x68, 0x1f, 0xe6, 0x75, 0xc5, 0xa5, 0x3b, 0xb6, 0xaa, 0x50, 0xb2, - 0xad, 0x19, 0xa4, 0x71, 0x9e, 0x2f, 0xf8, 0xcf, 0x1e, 0x31, 0x78, 0x30, 0x96, 0xf6, 0x92, 0x80, - 0x9f, 0xdf, 0x4c, 0x40, 0xe1, 0x14, 0x34, 0xfa, 0x10, 0x10, 0x1b, 0xd9, 0x76, 0x14, 0xd3, 0xf5, - 0xd7, 0x8c, 0x09, 0x9c, 0x2d, 0x2e, 0x30, 0x7c, 0x4f, 0x37, 0xc7, 0xe0, 0x70, 0x86, 0x08, 0xf9, - 0xef, 0x24, 0x98, 0x8f, 0x1e, 0xd9, 0x59, 0xc4, 0xff, 0xf7, 0x92, 0xf1, 0xff, 0x0b, 0x53, 0xfb, - 0x6f, 0x4e, 0x02, 0xf8, 0xcd, 0x32, 0xa0, 0x88, 0x08, 0x5b, 0xba, 0xde, 0x53, 0xfa, 0xfb, 0x47, - 0xa8, 0x8a, 0x7e, 0x4f, 0x02, 0xe4, 0xf1, 0x47, 0xa2, 0xae, 0x99, 0xa6, 0x45, 0x79, 0x55, 0x1b, - 0xa8, 0xf9, 0x4b, 0x53, 0xab, 0x19, 0x68, 0xd0, 0xda, 0x19, 0xc3, 0xbe, 0x6d, 0x52, 0x67, 0x18, - 0x3d, 0xb2, 0x71, 0x02, 0x9c, 0xa1, 0x10, 0xfa, 0x00, 0xc0, 0x11, 0x98, 0xdb, 0x96, 0x88, 0x02, - 0x45, 0x03, 0x4d, 0xa0, 0xd4, 0xba, 0x65, 0xee, 0x6a, 0x83, 0x28, 0xa6, 0xe1, 0x10, 0x18, 0xc7, - 0x84, 0x2c, 0xdf, 0x86, 0xab, 0x39, 0xda, 0xa3, 0x05, 0x28, 0xef, 0x93, 0xa1, 0xbf, 0xac, 0x98, - 0xfd, 0x44, 0x8b, 0xf1, 0xea, 0xb2, 0x26, 0x4a, 0xc3, 0xb7, 0x4a, 0x6f, 0x4a, 0xf2, 0x27, 0x95, - 0xb8, 0xb3, 0xf1, 0xe4, 0x7c, 0x1d, 0xaa, 0x0e, 0xb1, 0x75, 0xad, 0xaf, 0xb8, 0x22, 0x7b, 0xf1, - 0x34, 0x8b, 0xc5, 0x18, 0x0e, 0x67, 0x13, 0x69, 0xbc, 0x74, 0xca, 0x69, 0xbc, 0x7c, 0xc2, 0x69, - 0x1c, 0x59, 0x50, 0x75, 0x29, 0xdb, 0x74, 0x0d, 0xfc, 0x9c, 0x55, 0xbc, 0x00, 0x8e, 0xc7, 0x6d, - 0x1f, 0x28, 0x12, 0x18, 0x8c, 0xe0, 0x50, 0x08, 0x5a, 0x83, 0x8b, 0x86, 0x66, 0xf2, 0xe4, 0xd7, - 0x25, 0x7d, 0xcb, 0x54, 0x5d, 0x1e, 0xf0, 0x2a, 0xed, 0xab, 0x82, 0xe9, 0xe2, 0x56, 0x72, 0x1a, - 0xa7, 0xe9, 0xd1, 0x26, 0x2c, 0x3a, 0xe4, 0x40, 0x63, 0x6a, 0xdc, 0xd3, 0x5c, 0x6a, 0x39, 0xc3, - 0x4d, 0xcd, 0xd0, 0x28, 0x0f, 0x83, 0x95, 0x76, 0xe3, 0x70, 0xd4, 0x5c, 0xc4, 0x19, 0xf3, 0x38, - 0x93, 0x8b, 0x45, 0x68, 0x5b, 0xf1, 0x5c, 0xa2, 0xf2, 0xa8, 0x56, 0x8d, 0x22, 0x74, 0x87, 0x8f, - 0x62, 0x31, 0x8b, 0x8c, 0x84, 0x77, 0x57, 0x4f, 0xc2, 0xbb, 0xe7, 0xf3, 0x3d, 0x1b, 0xed, 0xc0, - 0x55, 0xdb, 0xb1, 0x06, 0x0e, 0x71, 0xdd, 0x0d, 0xa2, 0xa8, 0xba, 0x66, 0x92, 0x60, 0xbd, 0x6a, - 0xdc, 0xce, 0x97, 0x0f, 0x47, 0xcd, 0xab, 0x9d, 0x6c, 0x12, 0x9c, 0xc7, 0x2b, 0x7f, 0x54, 0x86, - 0x85, 0x74, 0xa6, 0x65, 0xf5, 0x95, 0xd5, 0x73, 0x89, 0x73, 0x40, 0xd4, 0xbb, 0xfe, 0x1e, 0x5c, - 0xb3, 0x4c, 0xee, 0xf5, 0xe5, 0x28, 0x08, 0x3c, 0x1a, 0xa3, 0xc0, 0x19, 0x5c, 0xe8, 0xb5, 0xd8, - 0x7b, 0xe3, 0x57, 0x68, 0xa1, 0x37, 0x64, 0xbc, 0x3b, 0x6b, 0x70, 0x51, 0x04, 0x92, 0x60, 0x52, - 0x94, 0x61, 0xa1, 0x37, 0xec, 0x24, 0xa7, 0x71, 0x9a, 0x1e, 0xdd, 0x85, 0x4b, 0xca, 0x81, 0xa2, - 0xe9, 0x4a, 0x4f, 0x27, 0x21, 0x88, 0x5f, 0x7e, 0xbd, 0x24, 0x40, 0x2e, 0xad, 0xa5, 0x09, 0xf0, - 0x38, 0x0f, 0xda, 0x82, 0xcb, 0x9e, 0x39, 0x0e, 0xe5, 0x7b, 0xe7, 0xcb, 0x02, 0xea, 0xf2, 0xce, - 0x38, 0x09, 0xce, 0xe2, 0x43, 0x07, 0x00, 0xfd, 0xa0, 0x28, 0x70, 0x1b, 0xe7, 0x79, 0xb0, 0x6e, - 0x4f, 0xfd, 0x6e, 0x85, 0xf5, 0x45, 0x14, 0x12, 0xc3, 0x21, 0x17, 0xc7, 0x24, 0xc9, 0x7f, 0x2f, - 0xc5, 0xd3, 0x4c, 0xf0, 0x06, 0xa2, 0xb7, 0x12, 0xd5, 0xd1, 0x67, 0x52, 0xd5, 0xd1, 0xd2, 0x38, - 0x47, 0xac, 0x38, 0xfa, 0x2e, 0xcc, 0x31, 0xcf, 0xd4, 0xcc, 0x81, 0xff, 0x34, 0x44, 0x98, 0xbb, - 0x33, 0x85, 0xf7, 0x87, 0x18, 0xb1, 0x74, 0x79, 0xe9, 0x70, 0xd4, 0x9c, 0x4b, 0x4c, 0xe2, 0xa4, - 0x3c, 0xf9, 0x47, 0x12, 0x2c, 0xdd, 0xe9, 0xde, 0x75, 0x2c, 0xcf, 0x0e, 0xd4, 0x7b, 0x64, 0xfb, - 0x49, 0xe7, 0x17, 0x60, 0xc6, 0xf1, 0xf4, 0xc0, 0xae, 0x4f, 0x07, 0x76, 0x61, 0x4f, 0x67, 0x76, - 0x5d, 0x4e, 0x71, 0xf9, 0x46, 0x31, 0x06, 0xf4, 0x1e, 0x9c, 0x77, 0x14, 0x73, 0x40, 0x82, 0x44, - 0xfa, 0xf9, 0x82, 0xd6, 0xdc, 0xdf, 0xc0, 0x8c, 0x3d, 0x56, 0xd1, 0x71, 0x34, 0x2c, 0x50, 0xe5, - 0xdf, 0x91, 0xe0, 0xe2, 0xbd, 0xed, 0xed, 0xce, 0x7d, 0x93, 0xbf, 0x88, 0x1d, 0x85, 0xee, 0xb1, - 0x5c, 0x6f, 0x2b, 0x74, 0x2f, 0x9d, 0xeb, 0xd9, 0x1c, 0xe6, 0x33, 0x68, 0x0f, 0x66, 0x59, 0x00, - 0x20, 0xa6, 0x3a, 0x65, 0xa5, 0x2e, 0xc4, 0xb5, 0x7d, 0x90, 0xa8, 0x8c, 0x14, 0x03, 0x38, 0x80, - 0x97, 0xbf, 0x03, 0x8b, 0x31, 0xf5, 0xd8, 0x7a, 0xf1, 0x13, 0x13, 0xd4, 0x87, 0x0a, 0xd3, 0x24, - 0x38, 0x0f, 0x29, 0xba, 0xbd, 0x4f, 0x99, 0x1c, 0xd5, 0x42, 0xec, 0x9f, 0x8b, 0x7d, 0x6c, 0xf9, - 0x9f, 0x4a, 0x70, 0xf5, 0x9e, 0xe5, 0x68, 0xdf, 0xb6, 0x4c, 0xaa, 0xe8, 0x1d, 0x4b, 0x5d, 0xf3, - 0xa8, 0xe5, 0xf6, 0x15, 0x9d, 0x38, 0xa7, 0xb8, 0x07, 0xd2, 0x13, 0x7b, 0xa0, 0x07, 0x45, 0x2d, - 0xcb, 0xd6, 0x37, 0x77, 0x43, 0x44, 0x53, 0x1b, 0xa2, 0xcd, 0x13, 0x92, 0x37, 0x79, 0x77, 0xf4, - 0x1f, 0x12, 0xbc, 0x9c, 0xc3, 0x79, 0x16, 0x45, 0xf4, 0x7e, 0xb2, 0x88, 0xbe, 0x73, 0x32, 0x36, - 0xe7, 0x54, 0xd4, 0xff, 0x53, 0xca, 0xb5, 0x95, 0xd7, 0x70, 0x1f, 0x40, 0x95, 0xff, 0xc3, 0x64, - 0x57, 0xd8, 0xba, 0x5e, 0x50, 0x9f, 0xae, 0xd7, 0x0b, 0x0e, 0x1a, 0x31, 0xd9, 0x25, 0x0e, 0x31, - 0xfb, 0x24, 0x56, 0xde, 0x08, 0x70, 0x1c, 0x8a, 0x41, 0x37, 0xa0, 0xce, 0xcb, 0x95, 0x44, 0x06, - 0xbc, 0x78, 0x38, 0x6a, 0xd6, 0xb7, 0xa2, 0x61, 0x1c, 0xa7, 0x41, 0xb7, 0xa0, 0x6e, 0x28, 0x4f, - 0x53, 0xf9, 0x2f, 0x3c, 0x39, 0xd8, 0x8a, 0xa6, 0x70, 0x9c, 0x0e, 0x7d, 0x17, 0xe6, 0xfb, 0xb6, - 0x17, 0x3b, 0xe7, 0x16, 0xf5, 0x5b, 0x51, 0x13, 0xb3, 0x8e, 0xcc, 0xdb, 0x88, 0x6d, 0x0d, 0xd7, - 0x3b, 0x3b, 0xb1, 0x31, 0x9c, 0x12, 0x27, 0xff, 0x79, 0x19, 0x5e, 0x9d, 0xe8, 0xa3, 0xe8, 0xce, - 0x84, 0xba, 0x62, 0xa9, 0x40, 0x4d, 0xa1, 0xc2, 0x1c, 0xdb, 0x21, 0xf2, 0xe5, 0xe6, 0xfb, 0xcf, - 0x52, 0xf1, 0xfd, 0x27, 0x4f, 0x32, 0x9b, 0x71, 0x14, 0x9c, 0x04, 0x65, 0xb5, 0x88, 0x38, 0x7f, - 0xca, 0xab, 0x45, 0xd6, 0x93, 0xd3, 0x38, 0x4d, 0xcf, 0x20, 0xc4, 0xf1, 0x50, 0xaa, 0x12, 0x09, - 0x21, 0x36, 0x92, 0xd3, 0x38, 0x4d, 0x8f, 0x0c, 0x68, 0x0a, 0xd4, 0xe4, 0xf2, 0xc7, 0xee, 0x2e, - 0xfc, 0x8a, 0xe4, 0xd3, 0x87, 0xa3, 0x66, 0x73, 0x7d, 0x32, 0x29, 0x7e, 0x11, 0x96, 0xbc, 0x05, - 0x73, 0xf7, 0x2c, 0x97, 0x76, 0x2c, 0x87, 0xf2, 0xfc, 0x85, 0x5e, 0x85, 0xb2, 0xa1, 0x99, 0x62, - 0xcb, 0x53, 0x17, 0x6a, 0x97, 0x99, 0xf3, 0xb2, 0x71, 0x3e, 0xad, 0x3c, 0x15, 0x7e, 0x1d, 0x4d, - 0x2b, 0x4f, 0x31, 0x1b, 0x97, 0xef, 0xc2, 0xac, 0xc8, 0x8b, 0x71, 0xa0, 0xf2, 0x64, 0xa0, 0x72, - 0x06, 0xd0, 0xef, 0x97, 0x60, 0x56, 0xa4, 0x91, 0x53, 0x4c, 0x08, 0xdf, 0x48, 0x24, 0x84, 0xb7, - 0xa6, 0x4b, 0xb5, 0xb9, 0x09, 0x40, 0x4d, 0x25, 0x80, 0x77, 0xa6, 0xc4, 0x9f, 0x1c, 0xf0, 0x7f, - 0x28, 0xc1, 0x7c, 0x32, 0xe9, 0xb3, 0x88, 0xc2, 0xde, 0x21, 0xad, 0x4f, 0x1e, 0x46, 0x27, 0x0b, - 0x61, 0x44, 0xe9, 0x46, 0x53, 0x38, 0x4e, 0x87, 0x48, 0xc8, 0xc6, 0xdc, 0x41, 0x2c, 0x4a, 0x2b, - 0x47, 0x69, 0x8f, 0x6a, 0x7a, 0xcb, 0xbf, 0xb8, 0x6b, 0xdd, 0x37, 0xe9, 0x23, 0xa7, 0x4b, 0x1d, - 0xcd, 0x1c, 0x8c, 0x89, 0xe1, 0x9e, 0x15, 0xc7, 0x95, 0xff, 0x5a, 0x82, 0xba, 0x50, 0xf8, 0x2c, - 0x32, 0xd2, 0xd7, 0x93, 0x19, 0xe9, 0xf3, 0x53, 0xd6, 0x53, 0xd9, 0x19, 0xe8, 0xc7, 0x91, 0x2d, - 0xac, 0x82, 0x62, 0x05, 0xde, 0x9e, 0xe5, 0xd2, 0x74, 0x81, 0xc7, 0x5e, 0x31, 0xcc, 0x67, 0xd0, - 0xaf, 0x49, 0xb0, 0xa0, 0xa5, 0x6a, 0x2e, 0xb1, 0xd4, 0x5f, 0x9a, 0x4e, 0xb5, 0x10, 0x26, 0xba, - 0xce, 0x4c, 0xcf, 0xe0, 0x31, 0x91, 0xb2, 0x07, 0x63, 0x54, 0x48, 0x81, 0x99, 0x3d, 0x4a, 0xed, - 0x29, 0x73, 0x65, 0x56, 0x35, 0xd9, 0xae, 0x72, 0xf3, 0xb7, 0xb7, 0x3b, 0x98, 0x43, 0xcb, 0x3f, - 0x2c, 0x85, 0x0b, 0xd6, 0xf5, 0xdf, 0x91, 0xb0, 0xde, 0x95, 0x4e, 0xa2, 0xde, 0xad, 0x67, 0xd5, - 0xba, 0xe8, 0x09, 0x94, 0xa9, 0x3e, 0xed, 0xc1, 0x9e, 0x90, 0xb0, 0xbd, 0xd9, 0x8d, 0xe2, 0xd4, - 0xf6, 0x66, 0x17, 0x33, 0x48, 0xf4, 0x2d, 0xa8, 0xb0, 0xdd, 0x04, 0x7b, 0xc5, 0xcb, 0xd3, 0x87, - 0x10, 0xb6, 0x5e, 0x91, 0x87, 0xb1, 0x7f, 0x2e, 0xf6, 0x71, 0xe5, 0xef, 0xc0, 0x5c, 0x22, 0x0e, - 0xa0, 0xf7, 0xe1, 0x82, 0x6e, 0x29, 0x6a, 0x5b, 0xd1, 0x15, 0xb3, 0x4f, 0x82, 0x9b, 0xa3, 0x9f, - 0x9b, 0x1c, 0x11, 0x37, 0x63, 0x1c, 0x22, 0x9e, 0x84, 0x57, 0xca, 0xf1, 0x39, 0x9c, 0xc0, 0x96, - 0x15, 0x80, 0xc8, 0x7a, 0xd4, 0x84, 0x0a, 0x73, 0x61, 0x7f, 0x67, 0x50, 0x6b, 0xd7, 0x98, 0xae, - 0xcc, 0xb3, 0x5d, 0xec, 0x8f, 0xa3, 0x9b, 0x00, 0x2e, 0xe9, 0x3b, 0x84, 0xf2, 0xb0, 0xe3, 0x1f, - 0xa4, 0x87, 0x01, 0xb8, 0x1b, 0xce, 0xe0, 0x18, 0x95, 0xfc, 0x5b, 0x25, 0x28, 0x3f, 0xb0, 0x7a, - 0xa7, 0x18, 0xe4, 0x9f, 0x24, 0x82, 0x7c, 0xd1, 0xf7, 0xff, 0x81, 0xd5, 0xcb, 0x0d, 0xf0, 0xbf, - 0x9c, 0x0a, 0xf0, 0x6f, 0x4e, 0x81, 0x3d, 0x39, 0xb8, 0xff, 0x43, 0x19, 0x2e, 0x3c, 0xb0, 0x7a, - 0xd1, 0x25, 0xc7, 0x1b, 0x89, 0x6d, 0xfc, 0xb5, 0xd4, 0x36, 0x7e, 0x21, 0x4e, 0x7b, 0x06, 0xb7, - 0x1b, 0x7b, 0x7e, 0x61, 0xd6, 0x71, 0xac, 0x9e, 0x5f, 0x98, 0x95, 0x8b, 0x17, 0x66, 0x57, 0x84, - 0x2e, 0xbc, 0x38, 0x0b, 0x91, 0x70, 0x12, 0x38, 0xe7, 0x1e, 0x62, 0xe6, 0xd4, 0xef, 0x21, 0x62, - 0x17, 0x38, 0x95, 0xa3, 0x5e, 0xe0, 0x9c, 0x9f, 0x7c, 0x81, 0x23, 0xff, 0x99, 0x04, 0xb3, 0x0f, - 0xac, 0xde, 0x59, 0x24, 0xbf, 0xaf, 0x26, 0x93, 0xdf, 0xcd, 0xe2, 0x0e, 0x9a, 0x93, 0xf8, 0xfe, - 0xa8, 0xcc, 0x6d, 0xe0, 0x31, 0xfc, 0x06, 0xd4, 0x6d, 0xc5, 0x51, 0x74, 0x9d, 0xe8, 0x9a, 0x6b, - 0x88, 0xd2, 0x91, 0xef, 0x79, 0x3a, 0xd1, 0x30, 0x8e, 0xd3, 0x30, 0x96, 0xbe, 0x65, 0xd8, 0x3a, - 0x09, 0xae, 0x32, 0x42, 0x96, 0xf5, 0x68, 0x18, 0xc7, 0x69, 0xd0, 0x23, 0xb8, 0xa2, 0xf4, 0xa9, - 0x76, 0x40, 0xd2, 0xc7, 0xa1, 0x65, 0x5e, 0x42, 0xbe, 0x74, 0x38, 0x6a, 0x5e, 0x59, 0xcb, 0x22, - 0xc0, 0xd9, 0x7c, 0x89, 0x73, 0xfb, 0x99, 0x53, 0x38, 0xb7, 0x7f, 0x03, 0x2e, 0x28, 0x1e, 0xb5, - 0x82, 0x19, 0xee, 0x3f, 0xd5, 0xf6, 0x02, 0x0b, 0xb9, 0x6b, 0xb1, 0x71, 0x9c, 0xa0, 0x4a, 0x9c, - 0xf6, 0x9f, 0x3f, 0xe9, 0x4b, 0xfb, 0x3f, 0x2d, 0x43, 0x2d, 0x0c, 0x3a, 0xc8, 0x4a, 0x9c, 0x50, - 0xfa, 0xc7, 0x3d, 0x6f, 0x17, 0xf7, 0x90, 0x23, 0x1f, 0x4d, 0xa2, 0x27, 0x50, 0x73, 0xa9, 0xe2, - 0xd0, 0x69, 0xf7, 0x70, 0x73, 0x87, 0xa3, 0x66, 0xad, 0x1b, 0x20, 0xe0, 0x08, 0x0c, 0x0d, 0x60, - 0x3e, 0xf2, 0x95, 0x69, 0x23, 0x91, 0xbf, 0xe9, 0x4d, 0xc0, 0xe0, 0x14, 0x2c, 0x0b, 0x07, 0xbe, - 0x37, 0x89, 0x8d, 0x5d, 0x18, 0x0e, 0x7c, 0xd7, 0xc3, 0x62, 0x16, 0xad, 0x42, 0xcd, 0xf5, 0xfa, - 0x7d, 0x42, 0x54, 0xa2, 0x8a, 0x0d, 0xdb, 0x25, 0x41, 0x5a, 0xeb, 0x06, 0x13, 0x38, 0xa2, 0x61, - 0xc0, 0xbb, 0x8a, 0xa6, 0x13, 0x55, 0x5c, 0x63, 0x84, 0xc0, 0x77, 0xf8, 0x28, 0x16, 0xb3, 0xbc, - 0x2d, 0xe6, 0x21, 0xa1, 0x1f, 0x5a, 0xce, 0x7e, 0xc7, 0xd2, 0xb5, 0xfe, 0xf0, 0x14, 0x33, 0x67, - 0x2f, 0x91, 0x39, 0xbf, 0x5c, 0xd0, 0x35, 0x12, 0x5a, 0xe6, 0xe5, 0x50, 0xf9, 0xdf, 0x25, 0x68, - 0x24, 0x28, 0xe3, 0xe5, 0x34, 0x81, 0x8a, 0x6d, 0x39, 0x34, 0x70, 0xce, 0x63, 0x69, 0xc0, 0xf6, - 0x1e, 0xb1, 0xd3, 0x48, 0x06, 0x8b, 0x7d, 0x74, 0x66, 0xe7, 0xae, 0x63, 0x19, 0x22, 0x48, 0x1e, - 0x4f, 0x0a, 0x21, 0x4e, 0x64, 0xe7, 0x1d, 0xc7, 0x32, 0x30, 0xc7, 0x96, 0xff, 0x51, 0x82, 0x4b, - 0x09, 0xca, 0xb3, 0x08, 0xff, 0x4a, 0x32, 0xfc, 0xbf, 0x73, 0x1c, 0xcb, 0x72, 0x12, 0xc1, 0x7f, - 0xa7, 0xed, 0x62, 0x2b, 0x80, 0x06, 0x50, 0xb7, 0x2d, 0xb5, 0x7b, 0x12, 0xdd, 0x4d, 0x7e, 0x22, - 0x89, 0xc0, 0x70, 0x1c, 0x19, 0x0d, 0xe1, 0x92, 0xa9, 0x18, 0xc4, 0xb5, 0x95, 0x3e, 0xe9, 0x9e, - 0xc4, 0x2d, 0xec, 0x95, 0xc3, 0x51, 0xf3, 0xd2, 0xc3, 0x34, 0x24, 0x1e, 0x97, 0x22, 0xff, 0xf1, - 0x98, 0xe5, 0x96, 0x43, 0xd1, 0x57, 0xa0, 0xca, 0xbb, 0x57, 0xfb, 0x96, 0x2e, 0x8a, 0xb4, 0x5b, - 0xec, 0xe1, 0x74, 0xc4, 0xd8, 0xf3, 0x51, 0xf3, 0x67, 0x26, 0x96, 0x5a, 0x01, 0x21, 0x0e, 0x61, - 0xd0, 0x26, 0xcc, 0xd8, 0xd3, 0x6f, 0xc8, 0xf9, 0x0e, 0x8c, 0xef, 0xc2, 0x39, 0x8a, 0xfc, 0x9f, - 0x69, 0xb5, 0x79, 0x0e, 0xdf, 0x3f, 0xb9, 0x07, 0x16, 0x9e, 0x00, 0xe4, 0x3e, 0x34, 0x07, 0x66, - 0xc5, 0x7e, 0x54, 0x38, 0xe6, 0xdd, 0xe3, 0x38, 0x66, 0x7c, 0x0f, 0x15, 0x16, 0x5d, 0xc1, 0x60, - 0x20, 0x88, 0xbf, 0x7f, 0x5c, 0xa1, 0xbe, 0xe7, 0x68, 0x74, 0x78, 0xea, 0xb1, 0x73, 0x37, 0x11, - 0x3b, 0x37, 0x0a, 0x1a, 0x38, 0xa6, 0x69, 0x6e, 0xfc, 0xfc, 0x57, 0x09, 0xae, 0x8c, 0x51, 0x9f, - 0x45, 0x6c, 0x21, 0xc9, 0xd8, 0xf2, 0xe5, 0xe3, 0x5a, 0x98, 0x13, 0x5f, 0x9e, 0x41, 0x86, 0x7d, - 0xdc, 0x65, 0x6f, 0x02, 0xd8, 0x8e, 0x76, 0xa0, 0xe9, 0x64, 0x20, 0x3a, 0x0c, 0xab, 0xd1, 0x33, - 0xe9, 0x84, 0x33, 0x38, 0x46, 0x85, 0x7e, 0x05, 0x96, 0x54, 0xb2, 0xab, 0x78, 0x3a, 0x5d, 0x53, - 0xd5, 0x75, 0xc5, 0x56, 0x7a, 0x9a, 0xae, 0x51, 0x4d, 0x5c, 0x02, 0xd6, 0xda, 0xb7, 0xfd, 0xce, - 0xbf, 0x2c, 0x8a, 0xe7, 0xa3, 0xe6, 0x67, 0x27, 0x6f, 0x92, 0x02, 0xe2, 0x21, 0xce, 0x11, 0x82, - 0x7e, 0x55, 0x82, 0x86, 0x43, 0x3e, 0xf0, 0x34, 0x87, 0xa8, 0x1b, 0x8e, 0x65, 0x27, 0x34, 0x28, - 0x73, 0x0d, 0xee, 0x1e, 0x8e, 0x9a, 0x0d, 0x9c, 0x43, 0x53, 0x44, 0x87, 0x5c, 0x41, 0x88, 0xc2, - 0x65, 0x45, 0xd7, 0xad, 0x0f, 0x49, 0x72, 0x05, 0x66, 0xb8, 0xfc, 0xf6, 0xe1, 0xa8, 0x79, 0x79, - 0x6d, 0x7c, 0xba, 0x88, 0xe8, 0x2c, 0x78, 0xb4, 0x0a, 0xb3, 0x07, 0x96, 0xee, 0x19, 0xc4, 0x6d, - 0x54, 0xb8, 0x24, 0x16, 0x69, 0x67, 0x1f, 0xfb, 0x43, 0xcf, 0x59, 0xa1, 0xd3, 0xe5, 0x3b, 0xd6, - 0x80, 0x0a, 0xdd, 0x82, 0xfa, 0x9e, 0xe5, 0x52, 0xf1, 0xae, 0xf3, 0xb2, 0xa8, 0x1a, 0x05, 0x97, - 0x7b, 0xd1, 0x14, 0x8e, 0xd3, 0x21, 0x03, 0x6a, 0x7b, 0xe2, 0x44, 0xdb, 0x6d, 0xcc, 0x4e, 0x95, - 0xf7, 0x12, 0x27, 0xe2, 0x51, 0xdd, 0x16, 0x0c, 0xbb, 0x38, 0x92, 0xc0, 0xf6, 0x7d, 0xfc, 0xcf, - 0xfd, 0x0d, 0xde, 0x13, 0x52, 0x8d, 0x42, 0xd0, 0x3d, 0x7f, 0x18, 0x07, 0xf3, 0x01, 0xe9, 0xfd, - 0xce, 0x3a, 0x6f, 0xe1, 0x48, 0x91, 0xde, 0xef, 0xac, 0xe3, 0x60, 0x1e, 0xd9, 0x30, 0xeb, 0x92, - 0x4d, 0xcd, 0xf4, 0x9e, 0x36, 0x80, 0xbf, 0xba, 0xb7, 0x8b, 0x5e, 0x5c, 0xdd, 0xe6, 0xdc, 0xa9, - 0xdb, 0xf2, 0x48, 0xa2, 0x98, 0xc7, 0x81, 0x18, 0xf4, 0x14, 0x6a, 0x8e, 0x67, 0xae, 0xb9, 0x3b, - 0x2e, 0x71, 0x1a, 0x75, 0x2e, 0xb3, 0x68, 0x54, 0xc6, 0x01, 0x7f, 0x5a, 0x6a, 0xb8, 0x82, 0x21, - 0x05, 0x8e, 0x84, 0xa1, 0xdf, 0x96, 0x00, 0xb9, 0x9e, 0x6d, 0xeb, 0xc4, 0x20, 0x26, 0x55, 0x74, - 0x7e, 0x61, 0xef, 0x36, 0x2e, 0x70, 0x1d, 0x3a, 0x85, 0x2f, 0xec, 0xd2, 0x40, 0x69, 0x65, 0xc2, - 0x03, 0x80, 0x71, 0x52, 0x9c, 0xa1, 0x07, 0x7b, 0x14, 0xbb, 0x2e, 0xff, 0xdd, 0x98, 0x9b, 0xea, - 0x51, 0x64, 0x37, 0x2e, 0x44, 0x8f, 0x42, 0xcc, 0xe3, 0x40, 0x0c, 0x7a, 0x0c, 0x4b, 0x0e, 0x51, - 0xd4, 0x47, 0xa6, 0x3e, 0xc4, 0x96, 0x45, 0xef, 0x68, 0x3a, 0x71, 0x87, 0x2e, 0x25, 0x46, 0x63, - 0x9e, 0xbb, 0x4d, 0xd8, 0xa2, 0x8c, 0x33, 0xa9, 0x70, 0x0e, 0x37, 0xef, 0x35, 0x16, 0xf7, 0x4c, - 0xa7, 0xfb, 0x09, 0xc2, 0xf1, 0x7a, 0x8d, 0x23, 0x15, 0x4f, 0xad, 0xd7, 0x38, 0x26, 0x62, 0xf2, - 0xf9, 0xdb, 0x7f, 0x95, 0xe0, 0x72, 0x44, 0x7c, 0xe4, 0x5e, 0xe3, 0x0c, 0x96, 0x33, 0x38, 0x8d, - 0xcb, 0x3e, 0x23, 0x2b, 0x9f, 0xe5, 0x19, 0xd9, 0x49, 0x35, 0x39, 0xf3, 0xf6, 0xdf, 0x68, 0x15, - 0xff, 0x0f, 0xb4, 0xff, 0x46, 0xca, 0xe6, 0x14, 0x32, 0x7f, 0x52, 0x8a, 0x5b, 0xf4, 0xff, 0xa9, - 0xc7, 0x34, 0xa3, 0xe5, 0x73, 0xa6, 0x58, 0xcb, 0xa7, 0xfc, 0x2f, 0x65, 0x58, 0x48, 0xbf, 0xb4, - 0x89, 0x56, 0x43, 0xe9, 0x85, 0xad, 0x86, 0x1d, 0x58, 0xdc, 0xf5, 0x74, 0x7d, 0xc8, 0x17, 0x24, - 0x76, 0x41, 0xef, 0x9f, 0x3d, 0xbe, 0x22, 0x38, 0x17, 0xef, 0x64, 0xd0, 0xe0, 0x4c, 0xce, 0x9c, - 0xb6, 0xc9, 0xf2, 0x54, 0x6d, 0x93, 0x6f, 0xc3, 0x9c, 0xc3, 0xbf, 0x0e, 0x49, 0xf6, 0x0d, 0x84, - 0x87, 0xe3, 0x38, 0x3e, 0x89, 0x93, 0xb4, 0xd9, 0x2d, 0x90, 0x95, 0x29, 0x5a, 0x20, 0x4f, 0xa2, - 0x67, 0x31, 0x23, 0xf6, 0xbd, 0xb0, 0x67, 0xf1, 0x15, 0x58, 0x16, 0x6c, 0xec, 0xff, 0xba, 0x65, - 0x52, 0xc7, 0xd2, 0x75, 0xe2, 0x6c, 0x78, 0x86, 0x31, 0x94, 0xdf, 0x85, 0xf9, 0x64, 0xe3, 0xac, - 0xff, 0xe4, 0xfd, 0x5e, 0x5e, 0xd1, 0x60, 0x10, 0x7b, 0xf2, 0xfe, 0x38, 0x0e, 0x29, 0xe4, 0x8f, - 0x24, 0xb8, 0x9a, 0xd3, 0x7b, 0x88, 0xde, 0x87, 0x79, 0x43, 0x79, 0x1a, 0x6b, 0xea, 0x14, 0xa1, - 0xa5, 0xe8, 0x2e, 0x9b, 0x9f, 0x1d, 0x6e, 0x25, 0x90, 0x70, 0x0a, 0x99, 0x27, 0x5c, 0xe5, 0x69, - 0xd7, 0x73, 0x06, 0x64, 0xca, 0xbd, 0x3c, 0x7f, 0x7d, 0xb7, 0x04, 0x06, 0x0e, 0xd1, 0xe4, 0x1f, - 0x49, 0xd0, 0xc8, 0xab, 0xbe, 0xd0, 0xad, 0x44, 0x87, 0xe4, 0xa7, 0x52, 0x1d, 0x92, 0x97, 0xc6, - 0xf8, 0xce, 0xa8, 0x3f, 0xf2, 0xc7, 0x12, 0x2c, 0x65, 0x57, 0xa9, 0xe8, 0xe7, 0x13, 0x1a, 0x37, - 0x53, 0x1a, 0x5f, 0x4c, 0x71, 0x09, 0x7d, 0xf7, 0x60, 0x5e, 0xd4, 0xb2, 0x02, 0xe6, 0x08, 0x1f, - 0x91, 0x1e, 0x84, 0x85, 0x72, 0x50, 0x95, 0xf1, 0xe7, 0x98, 0x1c, 0xc3, 0x29, 0x5c, 0xf9, 0x77, - 0x4b, 0x50, 0xe1, 0x6d, 0x43, 0xa7, 0x58, 0x42, 0x7d, 0x2d, 0x51, 0x42, 0x15, 0xbd, 0x58, 0xe4, - 0xda, 0xe5, 0x56, 0x4f, 0xbd, 0x54, 0xf5, 0xf4, 0xd6, 0x54, 0xe8, 0x93, 0x0b, 0xa7, 0x2f, 0x40, - 0x2d, 0x54, 0xa2, 0x58, 0xa0, 0x66, 0x65, 0x6a, 0x3d, 0x26, 0xa2, 0x60, 0x98, 0x3f, 0x48, 0x64, - 0xca, 0x69, 0xbe, 0x76, 0x8e, 0xc9, 0x6e, 0x05, 0xa9, 0xd2, 0xff, 0x20, 0x26, 0x6a, 0xfc, 0x1b, - 0xcf, 0xa0, 0xef, 0xc2, 0xbc, 0xff, 0xc9, 0x78, 0x78, 0x86, 0x56, 0xe6, 0xde, 0x1b, 0x7e, 0x68, - 0xb5, 0x9d, 0x98, 0xc5, 0x29, 0xea, 0xe5, 0xb7, 0x61, 0x2e, 0x21, 0xac, 0xd0, 0xf7, 0x2b, 0x7f, - 0x29, 0xc1, 0x62, 0x56, 0xab, 0x22, 0xba, 0x06, 0x33, 0xfb, 0x9a, 0xe8, 0xad, 0x88, 0xf5, 0xa3, - 0xfc, 0xa2, 0x66, 0xaa, 0x98, 0xcf, 0x84, 0x9f, 0x1f, 0x95, 0x72, 0x3f, 0x3f, 0xba, 0x09, 0xa0, - 0xd8, 0x9a, 0xf8, 0x0c, 0x5f, 0x58, 0x15, 0x3a, 0x6f, 0xf4, 0x81, 0x3e, 0x8e, 0x51, 0xf1, 0x0e, - 0xa4, 0x48, 0x1f, 0x51, 0x16, 0x46, 0xad, 0x41, 0x31, 0x55, 0xe3, 0x74, 0xf2, 0x5f, 0x49, 0xf0, - 0xa9, 0x17, 0xee, 0xe0, 0x50, 0x3b, 0x11, 0x1e, 0x5a, 0xa9, 0xf0, 0xb0, 0x92, 0x0f, 0x70, 0x86, - 0xdd, 0xdf, 0xdf, 0x2f, 0x01, 0xda, 0xde, 0xd3, 0x1c, 0xb5, 0xa3, 0x38, 0x74, 0x88, 0x85, 0x81, - 0xa7, 0x18, 0x30, 0x6e, 0x41, 0x5d, 0x25, 0x6e, 0xdf, 0xd1, 0xf8, 0x22, 0x89, 0xc7, 0x19, 0xae, - 0xf8, 0x46, 0x34, 0x85, 0xe3, 0x74, 0x68, 0x00, 0x55, 0x51, 0x2b, 0x06, 0x2d, 0x2c, 0x45, 0x0b, - 0xdf, 0xc8, 0x03, 0xa2, 0xf7, 0x43, 0x0c, 0xb8, 0x38, 0x04, 0x97, 0x7f, 0x20, 0xc1, 0xd2, 0xf8, - 0x82, 0x6c, 0xf8, 0x0d, 0x1a, 0xa7, 0xb5, 0x28, 0xaf, 0xc0, 0x0c, 0x47, 0x65, 0xab, 0x71, 0xc1, - 0x3f, 0x09, 0x67, 0x12, 0x31, 0x1f, 0x95, 0x3f, 0x91, 0x60, 0x39, 0x5b, 0xa5, 0xb3, 0xd8, 0x6f, - 0xbc, 0x9f, 0xdc, 0x6f, 0x14, 0x3d, 0x55, 0xc8, 0x56, 0x3c, 0x67, 0xef, 0xf1, 0x51, 0xe6, 0xe2, - 0x9f, 0x85, 0x95, 0xbb, 0x49, 0x2b, 0xd7, 0x8e, 0x6d, 0x65, 0xb6, 0x85, 0xed, 0xcf, 0x3d, 0xfb, - 0x78, 0xe5, 0xdc, 0x4f, 0x3e, 0x5e, 0x39, 0xf7, 0xcf, 0x1f, 0xaf, 0x9c, 0xfb, 0xde, 0xe1, 0x8a, - 0xf4, 0xec, 0x70, 0x45, 0xfa, 0xc9, 0xe1, 0x8a, 0xf4, 0x6f, 0x87, 0x2b, 0xd2, 0x0f, 0x7e, 0xba, - 0x72, 0xee, 0x6b, 0xb3, 0x02, 0xf3, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x14, 0xb2, 0x70, 0xfe, - 0x25, 0x46, 0x00, 0x00, + // 3866 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe4, 0x5b, 0x4d, 0x6c, 0x1c, 0xc9, + 0x75, 0x56, 0xcf, 0x90, 0x22, 0xf9, 0x46, 0xa4, 0xc8, 0x12, 0x45, 0xcd, 0x6a, 0x77, 0x39, 0x72, + 0x1b, 0xb1, 0x65, 0x60, 0x77, 0x18, 0x29, 0x2b, 0x67, 0xbd, 0xbb, 0x5e, 0x9b, 0x43, 0xea, 0x37, + 0xa4, 0x34, 0xae, 0x21, 0xe5, 0xcd, 0xda, 0x59, 0xa7, 0x66, 0xba, 0x38, 0xec, 0x65, 0xff, 0x6d, + 0x77, 0x35, 0xcd, 0xb1, 0x11, 0xd8, 0x40, 0x90, 0xab, 0xe3, 0x5b, 0x02, 0x24, 0x39, 0xe4, 0x10, + 0xe4, 0x14, 0xc3, 0x06, 0x02, 0x18, 0xc8, 0x21, 0xb9, 0xe4, 0x47, 0x09, 0x1c, 0xc0, 0x09, 0x10, + 0x24, 0x08, 0x1c, 0x3a, 0xcb, 0x38, 0xb9, 0x07, 0xb9, 0x29, 0x97, 0xa0, 0xaa, 0xab, 0x7f, 0xa7, + 0x7b, 0xa4, 0x1e, 0x72, 0x84, 0x00, 0xbe, 0xcd, 0x54, 0xbd, 0xf7, 0xbd, 0x57, 0x55, 0xaf, 0xde, + 0x7b, 0x55, 0xf5, 0x1a, 0x3e, 0x7f, 0xf0, 0xa6, 0xd7, 0xd4, 0xed, 0xb5, 0x03, 0xbf, 0x4b, 0x5d, + 0x8b, 0x32, 0xea, 0xad, 0x39, 0x07, 0xfd, 0x35, 0xe2, 0xe8, 0xde, 0x1a, 0x3d, 0x62, 0xd4, 0xf2, + 0x74, 0xdb, 0xf2, 0xd6, 0x0e, 0x6f, 0x74, 0x29, 0x23, 0x37, 0xd6, 0xfa, 0xd4, 0xa2, 0x2e, 0x61, + 0x54, 0x6b, 0x3a, 0xae, 0xcd, 0x6c, 0xf4, 0x7a, 0xc0, 0xde, 0x8c, 0xd9, 0x9b, 0xce, 0x41, 0xbf, + 0xc9, 0xd9, 0x9b, 0x31, 0x7b, 0x53, 0xb2, 0x5f, 0x7d, 0xbd, 0xaf, 0xb3, 0x7d, 0xbf, 0xdb, 0xec, + 0xd9, 0xe6, 0x5a, 0xdf, 0xee, 0xdb, 0x6b, 0x02, 0xa5, 0xeb, 0xef, 0x89, 0x7f, 0xe2, 0x8f, 0xf8, + 0x15, 0xa0, 0x5f, 0xbd, 0x59, 0xa8, 0xdc, 0x9a, 0x4b, 0x3d, 0xdb, 0x77, 0x7b, 0x34, 0xab, 0xd1, + 0xd5, 0xd7, 0x8a, 0x79, 0x0e, 0x87, 0xf4, 0x1f, 0x21, 0xc1, 0x5b, 0x33, 0x29, 0x23, 0x79, 0x3c, + 0xaf, 0xe7, 0xf3, 0xb8, 0xbe, 0xc5, 0x74, 0x73, 0x58, 0xa1, 0x37, 0x46, 0x93, 0x7b, 0xbd, 0x7d, + 0x6a, 0x92, 0x21, 0xae, 0x1b, 0xf9, 0x5c, 0x3e, 0xd3, 0x8d, 0x35, 0xdd, 0x62, 0x1e, 0x73, 0xb3, + 0x2c, 0x6a, 0x13, 0x60, 0xbd, 0x7d, 0xff, 0x31, 0x75, 0xf9, 0x9c, 0xa3, 0x6b, 0x30, 0x65, 0x11, + 0x93, 0xd6, 0x95, 0x6b, 0xca, 0xf5, 0xb9, 0xd6, 0x85, 0x27, 0xc7, 0x8d, 0x73, 0x27, 0xc7, 0x8d, + 0xa9, 0x87, 0xc4, 0xa4, 0x58, 0xf4, 0xa8, 0x5f, 0x85, 0xe5, 0x8d, 0xf6, 0xee, 0x0e, 0x71, 0xfb, + 0x94, 0xed, 0x32, 0xdd, 0xd0, 0xbf, 0x41, 0x18, 0xe7, 0xdc, 0x84, 0x45, 0x26, 0x1a, 0xdb, 0xd4, + 0xed, 0x51, 0x8b, 0x91, 0x7e, 0x80, 0x32, 0xdd, 0xaa, 0x4b, 0x94, 0xc5, 0x9d, 0x4c, 0x3f, 0x1e, + 0xe2, 0x50, 0x7f, 0x47, 0x81, 0x97, 0x36, 0x7c, 0x8f, 0xd9, 0xe6, 0x36, 0x65, 0xae, 0xde, 0xdb, + 0xf0, 0x5d, 0x97, 0x5a, 0xac, 0xc3, 0x08, 0xf3, 0xbd, 0x67, 0x6b, 0x87, 0xde, 0x83, 0xe9, 0x43, + 0x62, 0xf8, 0xb4, 0x5e, 0xb9, 0xa6, 0x5c, 0xaf, 0xdd, 0x7c, 0xad, 0x59, 0x68, 0x69, 0xcd, 0xd0, + 0x16, 0x9a, 0x5f, 0xf2, 0x89, 0xc5, 0x74, 0x36, 0x68, 0x2d, 0x4b, 0xc0, 0x0b, 0x52, 0xea, 0x63, + 0x8e, 0x84, 0x03, 0x40, 0xf5, 0x3b, 0x0a, 0xbc, 0x5a, 0xa8, 0xd9, 0x96, 0xee, 0x31, 0x64, 0xc2, + 0xb4, 0xce, 0xa8, 0xe9, 0xd5, 0x95, 0x6b, 0xd5, 0xeb, 0xb5, 0x9b, 0xf7, 0x9a, 0xa5, 0xac, 0xbc, + 0x59, 0x08, 0xde, 0x9a, 0x97, 0x7a, 0x4d, 0xdf, 0xe7, 0xf0, 0x38, 0x90, 0xa2, 0xfe, 0xb6, 0x02, + 0x28, 0xc9, 0x13, 0xcc, 0xee, 0x73, 0xcc, 0xd1, 0x97, 0x4f, 0x33, 0x47, 0x97, 0x24, 0x60, 0x2d, + 0x10, 0x97, 0x9a, 0xa2, 0x6f, 0x2b, 0xb0, 0x32, 0xac, 0x91, 0x98, 0x9b, 0xbd, 0xf4, 0xdc, 0xac, + 0x9f, 0x62, 0x6e, 0x02, 0xd4, 0x82, 0x49, 0xf9, 0x93, 0x0a, 0xcc, 0x6d, 0x12, 0x6a, 0xda, 0x56, + 0x87, 0x32, 0xf4, 0x1e, 0xcc, 0xf2, 0xed, 0xa8, 0x11, 0x46, 0xc4, 0x7c, 0xd4, 0x6e, 0x5e, 0x1f, + 0x31, 0xd8, 0xc3, 0x1b, 0xcd, 0x47, 0xdd, 0x0f, 0x69, 0x8f, 0x6d, 0x53, 0x46, 0x5a, 0x48, 0xe2, + 0x43, 0xdc, 0x86, 0x23, 0x34, 0xf4, 0x01, 0x4c, 0x79, 0x0e, 0xed, 0xc9, 0x29, 0x7c, 0xa7, 0xe4, + 0x70, 0x22, 0x0d, 0x3b, 0x0e, 0xed, 0xc5, 0x6b, 0xc4, 0xff, 0x61, 0x81, 0x8b, 0xf6, 0xe0, 0xbc, + 0x27, 0x16, 0xbf, 0x5e, 0x15, 0x12, 0xde, 0x1d, 0x5b, 0x42, 0x60, 0x42, 0x0b, 0x52, 0xc6, 0xf9, + 0xe0, 0x3f, 0x96, 0xe8, 0xea, 0xdf, 0x29, 0x30, 0x1f, 0xd1, 0x8a, 0x95, 0x7a, 0x7f, 0x68, 0xce, + 0x5e, 0x1b, 0x25, 0x9b, 0xd3, 0xf2, 0x99, 0xe3, 0xbc, 0x62, 0xde, 0x16, 0xa5, 0xa4, 0xd9, 0xb0, + 0x25, 0x31, 0x6b, 0xbf, 0x16, 0x5a, 0x41, 0x45, 0x58, 0xc1, 0x9b, 0xe3, 0x0e, 0xaa, 0x60, 0xf1, + 0xff, 0x36, 0x39, 0x18, 0x3e, 0x99, 0xe8, 0x2b, 0x30, 0xeb, 0x51, 0x83, 0xf6, 0x98, 0xed, 0xca, + 0xc1, 0xdc, 0x78, 0xae, 0xc1, 0x90, 0x2e, 0x35, 0x3a, 0x92, 0xb1, 0x75, 0x81, 0x8f, 0x26, 0xfc, + 0x87, 0x23, 0x40, 0x0e, 0xce, 0xa8, 0xe9, 0x18, 0x84, 0x85, 0x5b, 0xe9, 0xf5, 0xd1, 0xd6, 0xd5, + 0xb6, 0xb5, 0x1d, 0xc9, 0x20, 0x16, 0x3e, 0x9a, 0xaa, 0xb0, 0x15, 0x47, 0x80, 0xea, 0x5f, 0x56, + 0xe0, 0x62, 0x66, 0x11, 0xd1, 0x63, 0x58, 0xe9, 0x05, 0x8e, 0xe1, 0xa1, 0x6f, 0x76, 0xa9, 0xdb, + 0xe9, 0xed, 0x53, 0xcd, 0x37, 0xa8, 0x26, 0x1d, 0xed, 0xaa, 0xc4, 0x5b, 0xd9, 0xc8, 0xa5, 0xc2, + 0x05, 0xdc, 0xe8, 0x01, 0x20, 0x4b, 0x34, 0x6d, 0xeb, 0x9e, 0x17, 0x61, 0x56, 0x04, 0xe6, 0x55, + 0x89, 0x89, 0x1e, 0x0e, 0x51, 0xe0, 0x1c, 0x2e, 0xae, 0xa3, 0x46, 0x3d, 0xdd, 0xa5, 0x5a, 0x56, + 0xc7, 0x6a, 0x5a, 0xc7, 0xcd, 0x5c, 0x2a, 0x5c, 0xc0, 0x8d, 0x6e, 0x41, 0x2d, 0x90, 0x86, 0x29, + 0xd1, 0x06, 0xf5, 0x29, 0x01, 0x16, 0x39, 0xa3, 0x87, 0x71, 0x17, 0x4e, 0xd2, 0xa9, 0xdf, 0xaf, + 0x00, 0x6c, 0x52, 0xc7, 0xb0, 0x07, 0x26, 0xb5, 0x26, 0xe9, 0x10, 0xbe, 0x96, 0x72, 0x08, 0x9f, + 0x2f, 0x6b, 0xd9, 0x91, 0x8a, 0x85, 0x1e, 0xa1, 0x9f, 0xf1, 0x08, 0x5f, 0x18, 0x5f, 0xc4, 0x68, + 0x97, 0xf0, 0x6f, 0x55, 0xb8, 0x14, 0x13, 0x6f, 0xd8, 0x96, 0xa6, 0x8b, 0x00, 0xff, 0x36, 0x4c, + 0xb1, 0x81, 0x13, 0x06, 0x96, 0x4f, 0x87, 0x2a, 0xee, 0x0c, 0x1c, 0xfa, 0xf4, 0xb8, 0x71, 0x25, + 0x87, 0x85, 0x77, 0x61, 0xc1, 0x84, 0x1e, 0x47, 0xda, 0x57, 0x04, 0xfb, 0xbb, 0x69, 0xe1, 0x4f, + 0x8f, 0x1b, 0x23, 0x33, 0xb0, 0x66, 0x84, 0x99, 0x56, 0x16, 0x7d, 0x0a, 0xce, 0xbb, 0x94, 0x78, + 0xb6, 0x25, 0x2c, 0x62, 0x2e, 0x1e, 0x14, 0x16, 0xad, 0x58, 0xf6, 0xa2, 0xcf, 0xc0, 0x8c, 0x49, + 0x3d, 0x8f, 0x27, 0x25, 0xd3, 0x82, 0xf0, 0xa2, 0x24, 0x9c, 0xd9, 0x0e, 0x9a, 0x71, 0xd8, 0x8f, + 0xf6, 0x61, 0xc1, 0x20, 0x1e, 0xdb, 0x75, 0x34, 0xc2, 0xe8, 0x8e, 0x6e, 0xd2, 0xfa, 0xf9, 0x67, + 0x59, 0x4a, 0xec, 0x39, 0x38, 0x7d, 0x6b, 0x45, 0x62, 0x2f, 0x6c, 0xa5, 0x70, 0x70, 0x06, 0x17, + 0x31, 0x40, 0xbc, 0x65, 0xc7, 0x25, 0x96, 0x17, 0x4c, 0x18, 0x97, 0x36, 0x53, 0x52, 0x5a, 0xb4, + 0x43, 0xb7, 0x86, 0xb0, 0x70, 0x0e, 0xbe, 0xfa, 0x23, 0x05, 0x16, 0xe2, 0xc5, 0x9a, 0xb8, 0xcf, + 0xff, 0x20, 0xed, 0xf3, 0x3f, 0x37, 0xb6, 0xd9, 0x16, 0x38, 0xfd, 0xdf, 0xad, 0x02, 0x8a, 0x89, + 0xb0, 0x6d, 0x18, 0x5d, 0xd2, 0x3b, 0x78, 0x8e, 0x34, 0xe8, 0x8f, 0x14, 0x40, 0xbe, 0x58, 0x0c, + 0x6d, 0xdd, 0xb2, 0x6c, 0x26, 0xd2, 0xd8, 0x50, 0xcd, 0x5f, 0x1d, 0x5b, 0xcd, 0x50, 0x83, 0xe6, + 0xee, 0x10, 0xf6, 0x6d, 0x8b, 0xb9, 0x83, 0x78, 0xbd, 0x86, 0x09, 0x70, 0x8e, 0x42, 0xe8, 0x23, + 0x00, 0x57, 0x62, 0xee, 0xd8, 0x72, 0xf3, 0x97, 0xf5, 0x2f, 0xa1, 0x52, 0x1b, 0xb6, 0xb5, 0xa7, + 0xf7, 0x63, 0x57, 0x86, 0x23, 0x60, 0x9c, 0x10, 0x72, 0xf5, 0x36, 0x5c, 0x29, 0xd0, 0x1e, 0x2d, + 0x42, 0xf5, 0x80, 0x0e, 0x82, 0x69, 0xc5, 0xfc, 0x27, 0x5a, 0x4e, 0xa6, 0x93, 0x73, 0x32, 0x17, + 0x7c, 0xab, 0xf2, 0xa6, 0xa2, 0xfe, 0x6c, 0x3a, 0x69, 0x69, 0x22, 0x20, 0x5f, 0x87, 0x59, 0x97, + 0x3a, 0x86, 0xde, 0x23, 0x9e, 0x0c, 0x5a, 0x22, 0xba, 0x62, 0xd9, 0x86, 0xa3, 0xde, 0x54, 0xe8, + 0xae, 0x4c, 0x32, 0x74, 0x57, 0xcf, 0x38, 0x74, 0x23, 0x1b, 0x66, 0x3d, 0xc6, 0x8f, 0x58, 0xfd, + 0x20, 0x4e, 0x95, 0x4f, 0x77, 0x93, 0xbe, 0x3a, 0x00, 0x8a, 0x05, 0x86, 0x2d, 0x38, 0x12, 0x82, + 0xd6, 0xe1, 0xa2, 0xa9, 0x5b, 0x22, 0xe0, 0x75, 0x68, 0xcf, 0xb6, 0x34, 0x4f, 0x38, 0xb9, 0xe9, + 0xd6, 0x15, 0xc9, 0x74, 0x71, 0x3b, 0xdd, 0x8d, 0xb3, 0xf4, 0x68, 0x0b, 0x96, 0x5d, 0x7a, 0xa8, + 0x73, 0x35, 0xee, 0xe9, 0x1e, 0xb3, 0xdd, 0xc1, 0x96, 0x6e, 0xea, 0x4c, 0xb8, 0xbe, 0xe9, 0x56, + 0xfd, 0xe4, 0xb8, 0xb1, 0x8c, 0x73, 0xfa, 0x71, 0x2e, 0x17, 0xf7, 0xca, 0x0e, 0xf1, 0x3d, 0xaa, + 0x09, 0x67, 0x36, 0x1b, 0x7b, 0xe5, 0xb6, 0x68, 0xc5, 0xb2, 0x17, 0x99, 0x29, 0xd3, 0x9e, 0x3d, + 0x0b, 0xd3, 0x5e, 0x28, 0x36, 0x6b, 0xb4, 0x0b, 0x57, 0x1c, 0xd7, 0xee, 0xbb, 0xd4, 0xf3, 0x36, + 0x29, 0xd1, 0x0c, 0xdd, 0xa2, 0xe1, 0x7c, 0xcd, 0x89, 0x71, 0xbe, 0x7c, 0x72, 0xdc, 0xb8, 0xd2, + 0xce, 0x27, 0xc1, 0x45, 0xbc, 0xea, 0x4f, 0xab, 0xb0, 0x98, 0x8d, 0xae, 0x3c, 0xa7, 0xb2, 0xbb, + 0x1e, 0x75, 0x0f, 0xa9, 0x76, 0x37, 0x38, 0x71, 0xeb, 0xb6, 0x25, 0x4c, 0xbe, 0x1a, 0x7b, 0x80, + 0x47, 0x43, 0x14, 0x38, 0x87, 0x0b, 0xbd, 0x96, 0xd8, 0x34, 0x41, 0x56, 0x16, 0x59, 0x43, 0xce, + 0xc6, 0x59, 0x87, 0x8b, 0xd2, 0x8b, 0x84, 0x9d, 0x32, 0xf5, 0x8a, 0xac, 0x61, 0x37, 0xdd, 0x8d, + 0xb3, 0xf4, 0xe8, 0x2e, 0x2c, 0x91, 0x43, 0xa2, 0x1b, 0xa4, 0x6b, 0xd0, 0x08, 0x24, 0x48, 0xb9, + 0x5e, 0x92, 0x20, 0x4b, 0xeb, 0x59, 0x02, 0x3c, 0xcc, 0x83, 0xb6, 0xe1, 0x92, 0x6f, 0x0d, 0x43, + 0x05, 0xd6, 0xf9, 0xb2, 0x84, 0xba, 0xb4, 0x3b, 0x4c, 0x82, 0xf3, 0xf8, 0xd0, 0x21, 0x40, 0x2f, + 0x4c, 0x04, 0xbc, 0xfa, 0x79, 0xe1, 0xa9, 0x5b, 0x63, 0xef, 0xad, 0x28, 0xa7, 0x88, 0xfd, 0x61, + 0xd4, 0xe4, 0xe1, 0x84, 0x24, 0xf5, 0x1f, 0x94, 0x64, 0x8c, 0x09, 0x77, 0x20, 0x7a, 0x2b, 0x95, + 0x11, 0x7d, 0x2a, 0x93, 0x11, 0xad, 0x0c, 0x73, 0x24, 0x12, 0xa2, 0x6f, 0xc1, 0x3c, 0xb7, 0x4c, + 0xdd, 0xea, 0x07, 0xab, 0x21, 0x7d, 0xdc, 0x9d, 0x31, 0xac, 0x3f, 0xc2, 0x48, 0xc4, 0xca, 0xa5, + 0x93, 0xe3, 0xc6, 0x7c, 0xaa, 0x13, 0xa7, 0xe5, 0xa9, 0x3f, 0x50, 0x60, 0xe5, 0x4e, 0xe7, 0xae, + 0x6b, 0xfb, 0x4e, 0xa8, 0xde, 0x23, 0x27, 0x88, 0x38, 0xbf, 0x0c, 0x53, 0xae, 0x6f, 0x84, 0xe3, + 0xfa, 0x64, 0x38, 0x2e, 0xec, 0x1b, 0x7c, 0x5c, 0x97, 0x32, 0x5c, 0xc1, 0xa0, 0x38, 0x03, 0xfa, + 0x00, 0xce, 0xbb, 0xc4, 0xea, 0xd3, 0x30, 0x8a, 0x7e, 0xb6, 0xe4, 0x68, 0xee, 0x6f, 0x62, 0xce, + 0x9e, 0xc8, 0xe2, 0x04, 0x1a, 0x96, 0xa8, 0xea, 0x1f, 0x28, 0x70, 0xf1, 0xde, 0xce, 0x4e, 0xfb, + 0xbe, 0x25, 0x36, 0x62, 0x9b, 0xb0, 0x7d, 0x1e, 0xe8, 0x1d, 0xc2, 0xf6, 0xb3, 0x81, 0x9e, 0xf7, + 0x61, 0xd1, 0x83, 0xf6, 0x61, 0x86, 0x3b, 0x00, 0x6a, 0x69, 0x63, 0x66, 0xe7, 0x52, 0x5c, 0x2b, + 0x00, 0x89, 0x53, 0x47, 0xd9, 0x80, 0x43, 0x78, 0xf5, 0x9b, 0xb0, 0x9c, 0x50, 0x8f, 0xcf, 0x97, + 0xb8, 0x1f, 0x41, 0x3d, 0x98, 0xe6, 0x9a, 0x84, 0xb7, 0x1f, 0x65, 0x0f, 0xf3, 0x99, 0x21, 0xc7, + 0x89, 0x10, 0xff, 0xe7, 0xe1, 0x00, 0x5b, 0xfd, 0xe7, 0x0a, 0x5c, 0xb9, 0x67, 0xbb, 0xfa, 0x37, + 0x6c, 0x8b, 0x11, 0xa3, 0x6d, 0x6b, 0xeb, 0x3e, 0xb3, 0xbd, 0x1e, 0x31, 0xa8, 0x3b, 0xc1, 0x73, + 0x8f, 0x91, 0x3a, 0xf7, 0x3c, 0x28, 0x3b, 0xb2, 0x7c, 0x7d, 0x0b, 0x0f, 0x41, 0x2c, 0x73, 0x08, + 0xda, 0x3a, 0x23, 0x79, 0xa3, 0x4f, 0x44, 0xff, 0xa5, 0xc0, 0xcb, 0x05, 0x9c, 0x13, 0x4f, 0x9f, + 0x0f, 0xd2, 0xe9, 0xf3, 0x9d, 0xb3, 0x19, 0x70, 0x41, 0x2e, 0xfd, 0xbf, 0x95, 0xc2, 0x81, 0x8a, + 0xec, 0xed, 0x23, 0x98, 0x15, 0xff, 0x30, 0xdd, 0x93, 0x03, 0xdd, 0x28, 0xa9, 0x4f, 0xc7, 0xef, + 0x86, 0x77, 0x8a, 0x98, 0xee, 0x51, 0x97, 0x5a, 0x3d, 0x9a, 0xc8, 0x6d, 0x24, 0x38, 0x8e, 0xc4, + 0xa0, 0x1b, 0x50, 0x13, 0xb9, 0x4a, 0x2a, 0xfc, 0x5d, 0xe4, 0x67, 0xfe, 0xed, 0xb8, 0x19, 0x27, + 0x69, 0xd0, 0x2d, 0xa8, 0x99, 0xe4, 0x28, 0x13, 0xfc, 0xa2, 0xab, 0x82, 0xed, 0xb8, 0x0b, 0x27, + 0xe9, 0xd0, 0xb7, 0x60, 0xa1, 0xe7, 0xf8, 0x89, 0x2b, 0x6d, 0x99, 0xbc, 0x95, 0x1d, 0x62, 0xde, + 0xed, 0x78, 0x0b, 0xf1, 0xe3, 0xe0, 0x46, 0x7b, 0x37, 0xd1, 0x86, 0x33, 0xe2, 0xd4, 0xbf, 0xa8, + 0xc2, 0xab, 0x23, 0x0d, 0x14, 0xdd, 0x19, 0x91, 0x54, 0xac, 0x94, 0x48, 0x28, 0x08, 0xcc, 0xf3, + 0x83, 0xa1, 0x98, 0x6e, 0x71, 0xe6, 0xac, 0x94, 0x3c, 0x73, 0x8a, 0xf0, 0xb2, 0x95, 0x84, 0xc0, + 0x69, 0x44, 0x9e, 0x85, 0xc8, 0xdb, 0xa6, 0xa2, 0x2c, 0x64, 0x23, 0xdd, 0x8d, 0xb3, 0xf4, 0x1c, + 0x42, 0x5e, 0x06, 0x65, 0x72, 0x90, 0x08, 0x62, 0x33, 0xdd, 0x8d, 0xb3, 0xf4, 0xc8, 0x84, 0x86, + 0x44, 0x4d, 0xcf, 0x7d, 0xe2, 0x8d, 0x22, 0xc8, 0x45, 0x3e, 0x79, 0x72, 0xdc, 0x68, 0x6c, 0x8c, + 0x26, 0xc5, 0xcf, 0xc2, 0x52, 0xb7, 0x61, 0xfe, 0x9e, 0xed, 0xb1, 0xb6, 0xed, 0x32, 0x11, 0xb9, + 0xd0, 0xab, 0x50, 0x35, 0x75, 0x4b, 0x9e, 0x74, 0x6a, 0x52, 0xed, 0x2a, 0xb7, 0x5c, 0xde, 0x2e, + 0xba, 0xc9, 0x91, 0x34, 0xea, 0xb8, 0x9b, 0x1c, 0x61, 0xde, 0xae, 0xde, 0x85, 0x19, 0x19, 0x11, + 0x93, 0x40, 0xd5, 0xd1, 0x40, 0xd5, 0x1c, 0xa0, 0x3f, 0xae, 0xc0, 0x8c, 0x0c, 0x20, 0x13, 0x0c, + 0x05, 0x5f, 0x4d, 0x85, 0x82, 0xb7, 0xc6, 0x0b, 0xb2, 0x85, 0xae, 0x5f, 0xcb, 0xb8, 0xfe, 0x77, + 0xc6, 0xc4, 0x1f, 0xed, 0xea, 0xbf, 0xa7, 0xc0, 0x42, 0x3a, 0xdc, 0x73, 0x77, 0xc2, 0x37, 0x90, + 0xde, 0xa3, 0x0f, 0xe3, 0x0b, 0x85, 0xc8, 0x9d, 0x74, 0xe2, 0x2e, 0x9c, 0xa4, 0x43, 0x34, 0x62, + 0xe3, 0xe6, 0x20, 0x27, 0xa5, 0x59, 0xa0, 0xb4, 0xcf, 0x74, 0xa3, 0x19, 0x3c, 0xd0, 0x35, 0xef, + 0x5b, 0xec, 0x91, 0xdb, 0x61, 0xae, 0x6e, 0xf5, 0x87, 0xc4, 0x08, 0xcb, 0x4a, 0xe2, 0xaa, 0x7f, + 0xad, 0x40, 0x4d, 0x2a, 0x3c, 0xf1, 0x58, 0xf4, 0x95, 0x74, 0x2c, 0xfa, 0xec, 0x98, 0x69, 0x54, + 0x7e, 0xec, 0xf9, 0x61, 0x3c, 0x10, 0x9e, 0x38, 0xf1, 0xbc, 0x6e, 0xdf, 0xf6, 0x58, 0x36, 0xaf, + 0xe3, 0xfb, 0x0b, 0x8b, 0x1e, 0xf4, 0x5b, 0x0a, 0x2c, 0xea, 0x99, 0x54, 0x4b, 0xce, 0xf3, 0x17, + 0xc6, 0x53, 0x2d, 0x82, 0x89, 0xdf, 0x2c, 0xb3, 0x3d, 0x78, 0x48, 0xa4, 0xea, 0xc3, 0x10, 0x15, + 0x22, 0x30, 0xb5, 0xcf, 0x98, 0x33, 0x66, 0x94, 0xcc, 0x4b, 0x22, 0x5b, 0xb3, 0x62, 0xf8, 0x3b, + 0x3b, 0x6d, 0x2c, 0xa0, 0xd5, 0xef, 0x55, 0xa2, 0x09, 0xeb, 0x04, 0x1b, 0x24, 0x4a, 0x73, 0x95, + 0xb3, 0x48, 0x73, 0x6b, 0x79, 0x29, 0x2e, 0x7a, 0x0f, 0xaa, 0xcc, 0x18, 0xf7, 0x32, 0x4f, 0x4a, + 0xd8, 0xd9, 0xea, 0xc4, 0x4e, 0x6a, 0x67, 0xab, 0x83, 0x39, 0x24, 0xfa, 0x1a, 0x4c, 0xf3, 0x43, + 0x04, 0xdf, 0xdf, 0xd5, 0xf1, 0xfd, 0x07, 0x9f, 0xaf, 0xd8, 0xc2, 0xf8, 0x3f, 0x0f, 0x07, 0xb8, + 0xea, 0x37, 0x61, 0x3e, 0xe5, 0x04, 0xd0, 0x87, 0x70, 0xc1, 0xb0, 0x89, 0xd6, 0x22, 0x06, 0xb1, + 0x7a, 0x34, 0x7c, 0x21, 0xfa, 0xc5, 0xd1, 0xee, 0x70, 0x2b, 0xc1, 0x21, 0x9d, 0x49, 0xf4, 0x6e, + 0x9c, 0xec, 0xc3, 0x29, 0x6c, 0x95, 0x00, 0xc4, 0xa3, 0x47, 0x0d, 0x98, 0xe6, 0x26, 0x1c, 0x1c, + 0x08, 0xe6, 0x5a, 0x73, 0x5c, 0x57, 0x6e, 0xd9, 0x1e, 0x0e, 0xda, 0xd1, 0x4d, 0x00, 0x8f, 0xf6, + 0x5c, 0xca, 0x84, 0xcf, 0x09, 0xee, 0xcc, 0x23, 0xef, 0xdb, 0x89, 0x7a, 0x70, 0x82, 0x4a, 0xfd, + 0xbd, 0x0a, 0x54, 0x1f, 0xd8, 0xdd, 0x09, 0x7a, 0xf8, 0xf7, 0x52, 0x1e, 0xbe, 0xec, 0xfe, 0x7f, + 0x60, 0x77, 0x0b, 0xbd, 0xfb, 0xaf, 0x67, 0xbc, 0xfb, 0x9b, 0x63, 0x60, 0x8f, 0xf6, 0xec, 0x3f, + 0xaa, 0xc2, 0x85, 0x07, 0x76, 0x37, 0x7e, 0xcf, 0x78, 0x23, 0x75, 0x7a, 0xbf, 0x96, 0x39, 0xbd, + 0x2f, 0x26, 0x69, 0x5f, 0xc0, 0x43, 0x06, 0x0d, 0x52, 0xb2, 0xb6, 0x6b, 0x77, 0x83, 0x94, 0xac, + 0x5a, 0x32, 0x25, 0xbb, 0x2c, 0x15, 0x11, 0x69, 0x59, 0x04, 0x83, 0xd3, 0xa8, 0x05, 0x4f, 0x0e, + 0x53, 0x93, 0x7d, 0x72, 0x48, 0xbc, 0xd2, 0x4c, 0x3f, 0xef, 0x2b, 0xcd, 0xf9, 0xd1, 0xaf, 0x34, + 0xea, 0x9f, 0x2b, 0x30, 0xf3, 0xc0, 0xee, 0x4e, 0x3c, 0xe6, 0x7d, 0x39, 0x1d, 0xf3, 0x6e, 0x96, + 0xb7, 0xcb, 0x82, 0x78, 0xf7, 0xfd, 0xaa, 0x18, 0x80, 0x70, 0xdd, 0x37, 0xa0, 0xe6, 0x10, 0x97, + 0x18, 0x06, 0x35, 0x74, 0xcf, 0x94, 0xe9, 0xa2, 0x38, 0xe4, 0xb4, 0xe3, 0x66, 0x9c, 0xa4, 0xe1, + 0x2c, 0x3d, 0xdb, 0x74, 0x0c, 0x1a, 0xbe, 0x5a, 0x44, 0x2c, 0x1b, 0x71, 0x33, 0x4e, 0xd2, 0xa0, + 0x47, 0x70, 0x99, 0xf4, 0x98, 0x7e, 0x48, 0xb3, 0x97, 0x9f, 0x55, 0x91, 0x36, 0xbe, 0x74, 0x72, + 0xdc, 0xb8, 0xbc, 0x9e, 0x47, 0x80, 0xf3, 0xf9, 0x52, 0x57, 0xf4, 0x53, 0x67, 0x7d, 0x45, 0xff, + 0x06, 0x5c, 0x20, 0x3e, 0xb3, 0xc3, 0x1e, 0x61, 0x39, 0xb3, 0xad, 0x45, 0xee, 0x66, 0xd7, 0x13, + 0xed, 0x38, 0x45, 0x95, 0xba, 0xd8, 0x3f, 0x7f, 0xd6, 0x6f, 0xf2, 0x7f, 0x56, 0x85, 0xb9, 0xc8, + 0xd1, 0x20, 0x3b, 0x75, 0x19, 0x19, 0xdc, 0xec, 0xbc, 0x5d, 0xde, 0x3c, 0x9e, 0xfb, 0x16, 0x12, + 0xed, 0xc2, 0x9c, 0xc7, 0x88, 0xcb, 0xc6, 0x3a, 0xb1, 0xcd, 0x9f, 0x1c, 0x37, 0xe6, 0x3a, 0x21, + 0x3b, 0x8e, 0x91, 0x90, 0x06, 0x0b, 0xb1, 0x95, 0x8c, 0xe5, 0x7a, 0x82, 0xc3, 0x6d, 0x0a, 0x03, + 0x67, 0x30, 0xb9, 0x0b, 0x08, 0x8c, 0x48, 0x9e, 0xe1, 0x22, 0x17, 0x10, 0x58, 0x1c, 0x96, 0xbd, + 0x68, 0x0d, 0xe6, 0x3c, 0xbf, 0xd7, 0xa3, 0x54, 0xa3, 0x9a, 0x3c, 0x9b, 0x2d, 0x49, 0xd2, 0xb9, + 0x4e, 0xd8, 0x81, 0x63, 0x1a, 0x0e, 0xbc, 0x47, 0x74, 0x83, 0x6a, 0xf2, 0xad, 0x22, 0x02, 0xbe, + 0x23, 0x5a, 0xb1, 0xec, 0x55, 0xff, 0x5e, 0x81, 0xf9, 0x87, 0x94, 0x7d, 0xdd, 0x76, 0x0f, 0xda, + 0xb6, 0xa1, 0xf7, 0x06, 0x13, 0x8c, 0x93, 0xdd, 0x54, 0x9c, 0xfc, 0x62, 0x49, 0xa3, 0x48, 0x69, + 0x59, 0x14, 0x31, 0xd5, 0xff, 0x54, 0xa0, 0x9e, 0xa2, 0x4c, 0x26, 0xcf, 0x14, 0xa6, 0x1d, 0xdb, + 0x65, 0xa1, 0x59, 0x9e, 0x4a, 0x03, 0x7e, 0xcc, 0x48, 0x5c, 0x39, 0x72, 0x58, 0x1c, 0xa0, 0xf3, + 0x71, 0xee, 0xb9, 0xb6, 0x29, 0x7d, 0xe3, 0xe9, 0xa4, 0x50, 0xea, 0xc6, 0xe3, 0xbc, 0xe3, 0xda, + 0x26, 0x16, 0xd8, 0xea, 0x3f, 0x2a, 0xb0, 0x94, 0xa2, 0x9c, 0xb8, 0xcb, 0x27, 0x69, 0x97, 0xff, + 0xce, 0x69, 0x86, 0x55, 0xe0, 0xfc, 0xff, 0x3b, 0x3b, 0x28, 0x3e, 0x7c, 0xa4, 0x41, 0xcd, 0xb1, + 0xb5, 0xce, 0xa9, 0x0b, 0x96, 0x82, 0xc8, 0x11, 0x23, 0xe1, 0x24, 0x2c, 0x3a, 0x84, 0x25, 0x8b, + 0x98, 0xd4, 0x73, 0x48, 0x8f, 0x76, 0x4e, 0xfd, 0xc2, 0x7a, 0xf9, 0xe4, 0xb8, 0xb1, 0xf4, 0x30, + 0x8b, 0x87, 0x87, 0x45, 0xa8, 0x7f, 0x3a, 0x34, 0x66, 0xdb, 0x65, 0xe8, 0x4b, 0x30, 0x2b, 0xea, + 0x50, 0x7b, 0xb6, 0x21, 0x33, 0xb1, 0x5b, 0x7c, 0x59, 0xda, 0xb2, 0xed, 0xe9, 0x71, 0xe3, 0x17, + 0x46, 0xe6, 0x53, 0x21, 0x21, 0x8e, 0x60, 0xd0, 0x16, 0x4c, 0x39, 0xe3, 0x1f, 0xb9, 0xc5, 0x31, + 0x4b, 0x9c, 0xb3, 0x05, 0xca, 0xf0, 0x52, 0x89, 0x88, 0xbd, 0x7f, 0x46, 0x4b, 0x15, 0x1d, 0xf0, + 0x0b, 0x97, 0xcb, 0x85, 0x19, 0x79, 0xe2, 0x94, 0xf6, 0x78, 0xf7, 0x34, 0xf6, 0x98, 0x3c, 0x25, + 0x45, 0xc9, 0x55, 0xd8, 0x18, 0x0a, 0x52, 0xff, 0x49, 0x81, 0x25, 0xa1, 0x50, 0xcf, 0x77, 0x75, + 0x36, 0x98, 0xb8, 0xbf, 0xdc, 0x4b, 0xf9, 0xcb, 0xcd, 0x92, 0x03, 0x1c, 0xd2, 0xb4, 0xd0, 0x67, + 0xfe, 0xab, 0x02, 0x97, 0x87, 0xa8, 0x27, 0xee, 0x4f, 0x68, 0xda, 0x9f, 0x7c, 0xf1, 0xb4, 0xc3, + 0x2b, 0xf0, 0x29, 0x4f, 0x20, 0x67, 0x70, 0xc2, 0x58, 0x6f, 0x02, 0x38, 0xae, 0x7e, 0xa8, 0x1b, + 0xb4, 0x2f, 0x6b, 0x05, 0x67, 0xe3, 0x05, 0x69, 0x47, 0x3d, 0x38, 0x41, 0x85, 0x7e, 0x03, 0x56, + 0x34, 0xba, 0x47, 0x7c, 0x83, 0xad, 0x6b, 0xda, 0x06, 0x71, 0x48, 0x57, 0x37, 0x74, 0xa6, 0xcb, + 0xa7, 0xbd, 0xb9, 0xd6, 0xed, 0xa0, 0x86, 0x2f, 0x8f, 0xe2, 0xe9, 0x71, 0xe3, 0xd3, 0xa3, 0xcf, + 0x40, 0x21, 0xf1, 0x00, 0x17, 0x08, 0x41, 0xbf, 0xa9, 0x40, 0xdd, 0xa5, 0x1f, 0xf9, 0xba, 0x4b, + 0xb5, 0x4d, 0xd7, 0x76, 0x52, 0x1a, 0x54, 0x85, 0x06, 0x77, 0x4f, 0x8e, 0x1b, 0x75, 0x5c, 0x40, + 0x53, 0x46, 0x87, 0x42, 0x41, 0x88, 0xc1, 0x25, 0x62, 0x18, 0xf6, 0xd7, 0x69, 0x7a, 0x06, 0xa6, + 0x84, 0xfc, 0xd6, 0xc9, 0x71, 0xe3, 0xd2, 0xfa, 0x70, 0x77, 0x19, 0xd1, 0x79, 0xf0, 0x68, 0x0d, + 0x66, 0x0e, 0x6d, 0xc3, 0x37, 0xa9, 0x57, 0x9f, 0x16, 0x92, 0xb8, 0x8f, 0x9d, 0x79, 0x1c, 0x34, + 0x3d, 0xe5, 0x99, 0x4d, 0x47, 0x1c, 0x48, 0x43, 0x2a, 0x74, 0x0b, 0x6a, 0xfb, 0xb6, 0xc7, 0xe4, + 0x46, 0x17, 0x79, 0xd0, 0x6c, 0xec, 0x59, 0xee, 0xc5, 0x5d, 0x38, 0x49, 0x87, 0x4c, 0x98, 0xdb, + 0x97, 0xb7, 0xd5, 0x5e, 0x7d, 0x66, 0xac, 0x58, 0x97, 0xba, 0xed, 0x8e, 0x13, 0xb5, 0xb0, 0xd9, + 0xc3, 0xb1, 0x04, 0x7e, 0xb8, 0x13, 0x7f, 0xee, 0x6f, 0x8a, 0x4a, 0x8f, 0xd9, 0xd8, 0xff, 0xdc, + 0x0b, 0x9a, 0x71, 0xd8, 0x1f, 0x92, 0xde, 0x6f, 0x6f, 0x88, 0xc2, 0x8c, 0x0c, 0xe9, 0xfd, 0xf6, + 0x06, 0x0e, 0xfb, 0x91, 0x03, 0x33, 0x1e, 0xdd, 0xd2, 0x2d, 0xff, 0xa8, 0x0e, 0x62, 0xdf, 0xde, + 0x2e, 0xfb, 0x22, 0x75, 0x5b, 0x70, 0x67, 0xde, 0xc0, 0x63, 0x89, 0xb2, 0x1f, 0x87, 0x62, 0xd0, + 0x11, 0xcc, 0xb9, 0xbe, 0xb5, 0xee, 0xed, 0x7a, 0xd4, 0xad, 0xd7, 0x84, 0xcc, 0xb2, 0x2e, 0x19, + 0x87, 0xfc, 0x59, 0xa9, 0xd1, 0x0c, 0x46, 0x14, 0x38, 0x16, 0x86, 0x7e, 0x5f, 0x01, 0xe4, 0xf9, + 0x8e, 0x63, 0x50, 0x93, 0x5a, 0x8c, 0x18, 0xe2, 0x19, 0xde, 0xab, 0x5f, 0x10, 0x3a, 0xb4, 0x4b, + 0xbf, 0xc4, 0x65, 0x81, 0xb2, 0xca, 0x44, 0xa7, 0xfc, 0x61, 0x52, 0x9c, 0xa3, 0x07, 0x5f, 0x8a, + 0x3d, 0x4f, 0xfc, 0xae, 0xcf, 0x8f, 0xb5, 0x14, 0xf9, 0xe5, 0x08, 0xf1, 0x52, 0xc8, 0x7e, 0x1c, + 0x8a, 0x41, 0x8f, 0x61, 0xc5, 0xa5, 0x44, 0x7b, 0x64, 0x19, 0x03, 0x6c, 0xdb, 0xec, 0x8e, 0x6e, + 0x50, 0x6f, 0xe0, 0x31, 0x6a, 0xd6, 0x17, 0x84, 0xd9, 0x44, 0xc5, 0xc6, 0x38, 0x97, 0x0a, 0x17, + 0x70, 0x8b, 0xaa, 0x61, 0xf9, 0x86, 0x34, 0xd9, 0xcf, 0x08, 0x4e, 0x57, 0x35, 0x1c, 0xab, 0x38, + 0xb1, 0xaa, 0xe1, 0x84, 0x88, 0xd1, 0xd7, 0x6b, 0xff, 0x53, 0x81, 0x4b, 0x31, 0xf1, 0x73, 0x57, + 0x0d, 0xe7, 0xb0, 0xbc, 0x80, 0xcb, 0xb6, 0xfc, 0x5b, 0xb0, 0xea, 0x0b, 0xbb, 0x05, 0x3b, 0xab, + 0x5a, 0x65, 0x51, 0xcb, 0x1b, 0x4f, 0xe1, 0xff, 0xf7, 0x5a, 0xde, 0x58, 0xd3, 0xa2, 0x37, 0xa0, + 0x4a, 0x72, 0x38, 0x3f, 0x37, 0x05, 0xa3, 0x39, 0xf5, 0x9b, 0x53, 0xe5, 0xea, 0x37, 0xd5, 0x9f, + 0x54, 0x61, 0x31, 0xbb, 0x57, 0x53, 0x75, 0x83, 0xca, 0x33, 0xeb, 0x06, 0xdb, 0xb0, 0xbc, 0xe7, + 0x1b, 0xc6, 0x40, 0x4c, 0x48, 0xe2, 0xcd, 0x3d, 0xb8, 0x5a, 0x7c, 0x45, 0x72, 0x2e, 0xdf, 0xc9, + 0xa1, 0xc1, 0xb9, 0x9c, 0x05, 0x35, 0x90, 0xd5, 0xb1, 0x6a, 0x20, 0xdf, 0x86, 0x79, 0x57, 0x7c, + 0xde, 0x91, 0x2e, 0x05, 0x88, 0x6e, 0xbd, 0x71, 0xb2, 0x13, 0xa7, 0x69, 0xf3, 0xeb, 0x19, 0xa7, + 0xc7, 0xa8, 0x67, 0x3c, 0x8b, 0x02, 0xc4, 0x1c, 0x97, 0xf7, 0xcc, 0x02, 0xc4, 0x57, 0xe0, 0xaa, + 0x64, 0xe3, 0xff, 0x37, 0x6c, 0x8b, 0xb9, 0xb6, 0x61, 0x50, 0x77, 0xd3, 0x37, 0xcd, 0x81, 0xfa, + 0x2e, 0x2c, 0xa4, 0xab, 0x60, 0x83, 0x95, 0x0f, 0x0a, 0x73, 0x65, 0xcd, 0x40, 0x62, 0xe5, 0x83, + 0x76, 0x1c, 0x51, 0xa8, 0x3f, 0x55, 0xe0, 0x4a, 0x41, 0x21, 0x21, 0xfa, 0x10, 0x16, 0x4c, 0x72, + 0x94, 0xa8, 0xd0, 0x94, 0x4e, 0xa5, 0xec, 0xb1, 0x5a, 0xdc, 0x11, 0x6e, 0xa7, 0x90, 0x70, 0x06, + 0x59, 0xc4, 0x59, 0x72, 0xd4, 0xf1, 0xdd, 0x3e, 0x1d, 0xf3, 0xf0, 0x2e, 0xb6, 0xef, 0xb6, 0xc4, + 0xc0, 0x11, 0x9a, 0xfa, 0x03, 0x05, 0xea, 0x45, 0x49, 0x17, 0xba, 0x95, 0x2a, 0x77, 0xfc, 0x44, + 0xa6, 0xdc, 0x71, 0x69, 0x88, 0xef, 0x05, 0x15, 0x3b, 0xfe, 0x50, 0x81, 0x95, 0xfc, 0xe4, 0x14, + 0xfd, 0x52, 0x4a, 0xe3, 0x46, 0x46, 0xe3, 0x8b, 0x19, 0x2e, 0xa9, 0xef, 0x3e, 0x2c, 0xc8, 0x14, + 0x56, 0xc2, 0x3c, 0xc7, 0xf7, 0x9f, 0x87, 0x51, 0x7e, 0x1c, 0x26, 0x63, 0x62, 0x1d, 0xd3, 0x6d, + 0x38, 0x83, 0xab, 0xfe, 0x61, 0x05, 0xa6, 0x45, 0x25, 0xd0, 0x04, 0x33, 0xa7, 0xf7, 0x53, 0x99, + 0x53, 0xd9, 0xe7, 0x42, 0xa1, 0x5d, 0x61, 0xd2, 0xd4, 0xcd, 0x24, 0x4d, 0x6f, 0x8d, 0x85, 0x3e, + 0x3a, 0x5f, 0xfa, 0x1c, 0xcc, 0x45, 0x4a, 0x94, 0x73, 0xd4, 0x3c, 0x3b, 0xad, 0x25, 0x44, 0x94, + 0x74, 0xf3, 0x87, 0xa9, 0x30, 0x39, 0xce, 0x87, 0xca, 0x09, 0xd9, 0xcd, 0x30, 0x54, 0x06, 0x9f, + 0xb6, 0xc4, 0x85, 0x7c, 0xc3, 0x11, 0xf4, 0x5d, 0x58, 0x08, 0xbe, 0xf6, 0x8e, 0x2e, 0xcd, 0xaa, + 0xc2, 0x7a, 0xa3, 0x8f, 0xa5, 0x76, 0x52, 0xbd, 0x38, 0x43, 0x7d, 0xf5, 0x6d, 0x98, 0x4f, 0x09, + 0x2b, 0xf5, 0x25, 0xca, 0x5f, 0x29, 0xb0, 0x9c, 0x57, 0x7a, 0x88, 0xae, 0xc1, 0xd4, 0x81, 0x2e, + 0x2b, 0x26, 0x12, 0x55, 0x26, 0xbf, 0xa2, 0x5b, 0x1a, 0x16, 0x3d, 0xd1, 0x87, 0x44, 0x95, 0xc2, + 0x0f, 0x89, 0x6e, 0x02, 0x10, 0x47, 0x97, 0x5f, 0xd0, 0xcb, 0x51, 0x45, 0xc6, 0x1b, 0x7f, 0x5b, + 0x8f, 0x13, 0x54, 0xa2, 0xa8, 0x28, 0xd6, 0x47, 0x26, 0x84, 0x71, 0xb5, 0x4f, 0x42, 0xd5, 0x24, + 0x9d, 0xfa, 0x37, 0x0a, 0x7c, 0xe2, 0x99, 0x07, 0x37, 0xd4, 0x4a, 0xb9, 0x87, 0x66, 0xc6, 0x3d, + 0xac, 0x16, 0x03, 0xbc, 0xc0, 0x52, 0xee, 0xef, 0x54, 0x00, 0xed, 0xec, 0xeb, 0xae, 0xd6, 0x26, + 0x2e, 0x1b, 0x60, 0x39, 0xc0, 0x09, 0x3a, 0x8c, 0x5b, 0x50, 0xd3, 0xa8, 0xd7, 0x73, 0x75, 0x31, + 0x49, 0x72, 0x39, 0xa3, 0x19, 0xdf, 0x8c, 0xbb, 0x70, 0x92, 0x0e, 0xf5, 0x61, 0xf6, 0x30, 0x58, + 0xb3, 0xb0, 0x30, 0xa5, 0x6c, 0xd6, 0x1b, 0x5b, 0x40, 0xbc, 0x3f, 0x64, 0x83, 0x87, 0x23, 0x70, + 0xf5, 0xbb, 0x0a, 0xac, 0x0c, 0x4f, 0xc8, 0x66, 0x50, 0x76, 0x31, 0xa9, 0x49, 0x79, 0x05, 0xa6, + 0x04, 0x2a, 0x9f, 0x8d, 0x0b, 0xc1, 0xd5, 0x37, 0x97, 0x88, 0x45, 0xab, 0xfa, 0x33, 0x05, 0xae, + 0xe6, 0xab, 0x34, 0xf1, 0x93, 0xc6, 0x87, 0xe9, 0x93, 0x46, 0xd9, 0x9b, 0x84, 0x7c, 0xad, 0x0b, + 0x4e, 0x1d, 0x3f, 0xc9, 0x9d, 0xf9, 0x89, 0x0f, 0x71, 0x2f, 0x3d, 0xc4, 0xf5, 0x53, 0x0f, 0x31, + 0x7f, 0x78, 0xad, 0xcf, 0x3c, 0xf9, 0x78, 0xf5, 0xdc, 0x8f, 0x3f, 0x5e, 0x3d, 0xf7, 0x2f, 0x1f, + 0xaf, 0x9e, 0xfb, 0xf6, 0xc9, 0xaa, 0xf2, 0xe4, 0x64, 0x55, 0xf9, 0xf1, 0xc9, 0xaa, 0xf2, 0xef, + 0x27, 0xab, 0xca, 0x77, 0xff, 0x63, 0xf5, 0xdc, 0xfb, 0x33, 0x12, 0xf3, 0xff, 0x02, 0x00, 0x00, + 0xff, 0xff, 0xfb, 0xcc, 0x56, 0x9a, 0xd7, 0x45, 0x00, 0x00, } diff --git a/pkg/apis/extensions/v1beta1/generated.proto b/pkg/apis/extensions/v1beta1/generated.proto index f5043e24229..865877f66aa 100644 --- a/pkg/apis/extensions/v1beta1/generated.proto +++ b/pkg/apis/extensions/v1beta1/generated.proto @@ -22,8 +22,8 @@ syntax = 'proto2'; package k8s.io.kubernetes.pkg.apis.extensions.v1beta1; import "k8s.io/kubernetes/pkg/api/resource/generated.proto"; -import "k8s.io/kubernetes/pkg/api/unversioned/generated.proto"; import "k8s.io/kubernetes/pkg/api/v1/generated.proto"; +import "k8s.io/kubernetes/pkg/apis/meta/v1/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/schema/generated.proto"; import "k8s.io/kubernetes/pkg/util/intstr/generated.proto"; @@ -95,7 +95,7 @@ message DaemonSetList { // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // Items is a list of daemon sets. repeated DaemonSet items = 2; @@ -108,7 +108,7 @@ message DaemonSetSpec { // If empty, defaulted to labels on Pod template. // More info: http://kubernetes.io/docs/user-guide/labels#label-selectors // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.LabelSelector selector = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.LabelSelector selector = 1; // Template is the object that describes the pod that will be created. // The DaemonSet will create exactly one copy of this pod on every node @@ -164,10 +164,10 @@ message DeploymentCondition { optional string status = 2; // The last time this condition was updated. - optional k8s.io.kubernetes.pkg.api.unversioned.Time lastUpdateTime = 6; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time lastUpdateTime = 6; // Last time the condition transitioned from one status to another. - optional k8s.io.kubernetes.pkg.api.unversioned.Time lastTransitionTime = 7; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time lastTransitionTime = 7; // The reason for the condition's last transition. optional string reason = 4; @@ -180,7 +180,7 @@ message DeploymentCondition { message DeploymentList { // Standard list metadata. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // Items is the list of Deployments. repeated Deployment items = 2; @@ -209,7 +209,7 @@ message DeploymentSpec { // Label selector for pods. Existing ReplicaSets whose pods are // selected by this will be the ones affected by this deployment. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.LabelSelector selector = 2; + optional k8s.io.kubernetes.pkg.apis.meta.v1.LabelSelector selector = 2; // Template describes the pods that will be created. optional k8s.io.kubernetes.pkg.api.v1.PodTemplateSpec template = 3; @@ -348,7 +348,7 @@ message HorizontalPodAutoscaler { message HorizontalPodAutoscalerList { // Standard list metadata. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // list of horizontal pod autoscaler objects. repeated HorizontalPodAutoscaler items = 2; @@ -382,7 +382,7 @@ message HorizontalPodAutoscalerStatus { // last time the HorizontalPodAutoscaler scaled the number of pods; // used by the autoscaler to control how often the number of pods is changed. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time lastScaleTime = 2; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time lastScaleTime = 2; // current number of replicas of pods managed by this autoscaler. optional int32 currentReplicas = 3; @@ -450,7 +450,7 @@ message IngressList { // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // Items is the list of Ingress. repeated Ingress items = 2; @@ -570,11 +570,11 @@ message JobCondition { // Last time the condition was checked. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time lastProbeTime = 3; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time lastProbeTime = 3; // Last time the condition transit from one status to another. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time lastTransitionTime = 4; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time lastTransitionTime = 4; // (brief) reason for the condition's last transition. // +optional @@ -591,7 +591,7 @@ message JobList { // Standard list metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // Items is the list of Job. repeated Job items = 2; @@ -625,7 +625,7 @@ message JobSpec { // Normally, the system sets this field for you. // More info: http://kubernetes.io/docs/user-guide/labels#label-selectors // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.LabelSelector selector = 4; + optional k8s.io.kubernetes.pkg.apis.meta.v1.LabelSelector selector = 4; // AutoSelector controls generation of pod labels and pod selectors. // It was not present in the original extensions/v1beta1 Job definition, but exists @@ -652,13 +652,13 @@ message JobStatus { // It is not guaranteed to be set in happens-before order across separate operations. // It is represented in RFC3339 form and is in UTC. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time startTime = 2; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time startTime = 2; // CompletionTime represents time when the job was completed. It is not guaranteed to // be set in happens-before order across separate operations. // It is represented in RFC3339 form and is in UTC. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time completionTime = 3; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time completionTime = 3; // Active is the number of actively running pods. // +optional @@ -712,7 +712,7 @@ message NetworkPolicyList { // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // Items is a list of schema objects. repeated NetworkPolicy items = 2; @@ -724,7 +724,7 @@ message NetworkPolicyPeer { // If not provided, this selector selects no pods. // If present but empty, this selector selects all pods in this namespace. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.LabelSelector podSelector = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.LabelSelector podSelector = 1; // Selects Namespaces using cluster scoped-labels. This // matches all pods in all namespaces selected by this label selector. @@ -732,7 +732,7 @@ message NetworkPolicyPeer { // If omitted, this selector selects no namespaces. // If present but empty, this selector selects all namespaces. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.LabelSelector namespaceSelector = 2; + optional k8s.io.kubernetes.pkg.apis.meta.v1.LabelSelector namespaceSelector = 2; } message NetworkPolicyPort { @@ -756,7 +756,7 @@ message NetworkPolicySpec { // same set of pods. In this case, the ingress rules for each are combined additively. // This field is NOT optional and follows standard label selector semantics. // An empty podSelector matches all pods in this namespace. - optional k8s.io.kubernetes.pkg.api.unversioned.LabelSelector podSelector = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.LabelSelector podSelector = 1; // List of ingress rules to be applied to the selected pods. // Traffic is allowed to a pod if namespace.networkPolicy.ingress.isolation is undefined and cluster policy allows it, @@ -788,7 +788,7 @@ message PodSecurityPolicyList { // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // Items is a list of schema objects. repeated PodSecurityPolicy items = 2; @@ -891,7 +891,7 @@ message ReplicaSetCondition { // The last time the condition transitioned from one status to another. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time lastTransitionTime = 3; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time lastTransitionTime = 3; // The reason for the condition's last transition. // +optional @@ -907,7 +907,7 @@ message ReplicaSetList { // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // List of ReplicaSets. // More info: http://kubernetes.io/docs/user-guide/replication-controller @@ -934,7 +934,7 @@ message ReplicaSetSpec { // Label keys and values that must match in order to be controlled by this replica set. // More info: http://kubernetes.io/docs/user-guide/labels#label-selectors // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.LabelSelector selector = 2; + optional k8s.io.kubernetes.pkg.apis.meta.v1.LabelSelector selector = 2; // Template is the object that describes the pod that will be created if // insufficient replicas are detected. @@ -1135,7 +1135,7 @@ message ThirdPartyResourceDataList { // Standard list metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // Items is the list of ThirdpartyResourceData. repeated ThirdPartyResourceData items = 2; @@ -1145,7 +1145,7 @@ message ThirdPartyResourceDataList { message ThirdPartyResourceList { // Standard list metadata. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // Items is the list of ThirdPartyResources. repeated ThirdPartyResource items = 2; diff --git a/pkg/apis/extensions/v1beta1/register.go b/pkg/apis/extensions/v1beta1/register.go index a89a6f51298..1f0886fbaf8 100644 --- a/pkg/apis/extensions/v1beta1/register.go +++ b/pkg/apis/extensions/v1beta1/register.go @@ -17,8 +17,8 @@ limitations under the License. package v1beta1 import ( - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" versionedwatch "k8s.io/kubernetes/pkg/watch/versioned" diff --git a/pkg/apis/extensions/v1beta1/types.generated.go b/pkg/apis/extensions/v1beta1/types.generated.go index b4266118246..9a2a95e0f95 100644 --- a/pkg/apis/extensions/v1beta1/types.generated.go +++ b/pkg/apis/extensions/v1beta1/types.generated.go @@ -26,8 +26,8 @@ import ( "fmt" codec1978 "github.com/ugorji/go/codec" pkg4_resource "k8s.io/kubernetes/pkg/api/resource" - pkg1_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" pkg2_v1 "k8s.io/kubernetes/pkg/api/v1" + pkg1_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" pkg3_types "k8s.io/kubernetes/pkg/types" pkg5_intstr "k8s.io/kubernetes/pkg/util/intstr" "reflect" @@ -66,8 +66,8 @@ func init() { } if false { // reference the types, but skip this branch at build/run time var v0 pkg4_resource.Quantity - var v1 pkg1_unversioned.TypeMeta - var v2 pkg2_v1.ObjectMeta + var v1 pkg2_v1.ObjectMeta + var v2 pkg1_v1.TypeMeta var v3 pkg3_types.UID var v4 pkg5_intstr.IntOrString var v5 time.Time @@ -2978,7 +2978,7 @@ func (x *HorizontalPodAutoscalerStatus) codecDecodeSelfFromMap(l int, d *codec19 } } else { if x.LastScaleTime == nil { - x.LastScaleTime = new(pkg1_unversioned.Time) + x.LastScaleTime = new(pkg1_v1.Time) } yym240 := z.DecBinary() _ = yym240 @@ -3077,7 +3077,7 @@ func (x *HorizontalPodAutoscalerStatus) codecDecodeSelfFromArray(l int, d *codec } } else { if x.LastScaleTime == nil { - x.LastScaleTime = new(pkg1_unversioned.Time) + x.LastScaleTime = new(pkg1_v1.Time) } yym249 := z.DecBinary() _ = yym249 @@ -3722,7 +3722,7 @@ func (x *HorizontalPodAutoscalerList) codecDecodeSelfFromMap(l int, d *codec1978 } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv306 := &x.ListMeta yym307 := z.DecBinary() @@ -3803,7 +3803,7 @@ func (x *HorizontalPodAutoscalerList) codecDecodeSelfFromArray(l int, d *codec19 } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv313 := &x.ListMeta yym314 := z.DecBinary() @@ -4441,7 +4441,7 @@ func (x *ThirdPartyResourceList) codecDecodeSelfFromMap(l int, d *codec1978.Deco } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv371 := &x.ListMeta yym372 := z.DecBinary() @@ -4522,7 +4522,7 @@ func (x *ThirdPartyResourceList) codecDecodeSelfFromArray(l int, d *codec1978.De } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv378 := &x.ListMeta yym379 := z.DecBinary() @@ -5773,7 +5773,7 @@ func (x *DeploymentSpec) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.Selector == nil { - x.Selector = new(pkg1_unversioned.LabelSelector) + x.Selector = new(pkg1_v1.LabelSelector) } yym491 := z.DecBinary() _ = yym491 @@ -5909,7 +5909,7 @@ func (x *DeploymentSpec) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } else { if x.Selector == nil { - x.Selector = new(pkg1_unversioned.LabelSelector) + x.Selector = new(pkg1_v1.LabelSelector) } yym505 := z.DecBinary() _ = yym505 @@ -7860,7 +7860,7 @@ func (x *DeploymentCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder } case "lastUpdateTime": if r.TryDecodeAsNil() { - x.LastUpdateTime = pkg1_unversioned.Time{} + x.LastUpdateTime = pkg1_v1.Time{} } else { yyv660 := &x.LastUpdateTime yym661 := z.DecBinary() @@ -7877,7 +7877,7 @@ func (x *DeploymentCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder } case "lastTransitionTime": if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg1_unversioned.Time{} + x.LastTransitionTime = pkg1_v1.Time{} } else { yyv662 := &x.LastTransitionTime yym663 := z.DecBinary() @@ -7962,7 +7962,7 @@ func (x *DeploymentCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decod } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastUpdateTime = pkg1_unversioned.Time{} + x.LastUpdateTime = pkg1_v1.Time{} } else { yyv669 := &x.LastUpdateTime yym670 := z.DecBinary() @@ -7989,7 +7989,7 @@ func (x *DeploymentCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decod } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg1_unversioned.Time{} + x.LastTransitionTime = pkg1_v1.Time{} } else { yyv671 := &x.LastTransitionTime yym672 := z.DecBinary() @@ -8266,7 +8266,7 @@ func (x *DeploymentList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv696 := &x.ListMeta yym697 := z.DecBinary() @@ -8347,7 +8347,7 @@ func (x *DeploymentList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv703 := &x.ListMeta yym704 := z.DecBinary() @@ -8541,7 +8541,7 @@ func (x *DaemonSetSpec) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.Selector == nil { - x.Selector = new(pkg1_unversioned.LabelSelector) + x.Selector = new(pkg1_v1.LabelSelector) } yym719 := z.DecBinary() _ = yym719 @@ -8589,7 +8589,7 @@ func (x *DaemonSetSpec) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } else { if x.Selector == nil { - x.Selector = new(pkg1_unversioned.LabelSelector) + x.Selector = new(pkg1_v1.LabelSelector) } yym723 := z.DecBinary() _ = yym723 @@ -9474,7 +9474,7 @@ func (x *DaemonSetList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv803 := &x.ListMeta yym804 := z.DecBinary() @@ -9555,7 +9555,7 @@ func (x *DaemonSetList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv810 := &x.ListMeta yym811 := z.DecBinary() @@ -9818,7 +9818,7 @@ func (x *ThirdPartyResourceDataList) codecDecodeSelfFromMap(l int, d *codec1978. } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv835 := &x.ListMeta yym836 := z.DecBinary() @@ -9899,7 +9899,7 @@ func (x *ThirdPartyResourceDataList) codecDecodeSelfFromArray(l int, d *codec197 } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv842 := &x.ListMeta yym843 := z.DecBinary() @@ -10505,7 +10505,7 @@ func (x *JobList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv898 := &x.ListMeta yym899 := z.DecBinary() @@ -10586,7 +10586,7 @@ func (x *JobList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv905 := &x.ListMeta yym906 := z.DecBinary() @@ -10972,7 +10972,7 @@ func (x *JobSpec) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.Selector == nil { - x.Selector = new(pkg1_unversioned.LabelSelector) + x.Selector = new(pkg1_v1.LabelSelector) } yym947 := z.DecBinary() _ = yym947 @@ -11114,7 +11114,7 @@ func (x *JobSpec) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } else { if x.Selector == nil { - x.Selector = new(pkg1_unversioned.LabelSelector) + x.Selector = new(pkg1_v1.LabelSelector) } yym959 := z.DecBinary() _ = yym959 @@ -11493,7 +11493,7 @@ func (x *JobStatus) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.StartTime == nil { - x.StartTime = new(pkg1_unversioned.Time) + x.StartTime = new(pkg1_v1.Time) } yym989 := z.DecBinary() _ = yym989 @@ -11514,7 +11514,7 @@ func (x *JobStatus) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.CompletionTime == nil { - x.CompletionTime = new(pkg1_unversioned.Time) + x.CompletionTime = new(pkg1_v1.Time) } yym991 := z.DecBinary() _ = yym991 @@ -11599,7 +11599,7 @@ func (x *JobStatus) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } else { if x.StartTime == nil { - x.StartTime = new(pkg1_unversioned.Time) + x.StartTime = new(pkg1_v1.Time) } yym999 := z.DecBinary() _ = yym999 @@ -11630,7 +11630,7 @@ func (x *JobStatus) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } else { if x.CompletionTime == nil { - x.CompletionTime = new(pkg1_unversioned.Time) + x.CompletionTime = new(pkg1_v1.Time) } yym1001 := z.DecBinary() _ = yym1001 @@ -11997,7 +11997,7 @@ func (x *JobCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "lastProbeTime": if r.TryDecodeAsNil() { - x.LastProbeTime = pkg1_unversioned.Time{} + x.LastProbeTime = pkg1_v1.Time{} } else { yyv1034 := &x.LastProbeTime yym1035 := z.DecBinary() @@ -12014,7 +12014,7 @@ func (x *JobCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "lastTransitionTime": if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg1_unversioned.Time{} + x.LastTransitionTime = pkg1_v1.Time{} } else { yyv1036 := &x.LastTransitionTime yym1037 := z.DecBinary() @@ -12099,7 +12099,7 @@ func (x *JobCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastProbeTime = pkg1_unversioned.Time{} + x.LastProbeTime = pkg1_v1.Time{} } else { yyv1043 := &x.LastProbeTime yym1044 := z.DecBinary() @@ -12126,7 +12126,7 @@ func (x *JobCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg1_unversioned.Time{} + x.LastTransitionTime = pkg1_v1.Time{} } else { yyv1045 := &x.LastTransitionTime yym1046 := z.DecBinary() @@ -12746,7 +12746,7 @@ func (x *IngressList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv1101 := &x.ListMeta yym1102 := z.DecBinary() @@ -12827,7 +12827,7 @@ func (x *IngressList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv1108 := &x.ListMeta yym1109 := z.DecBinary() @@ -15183,7 +15183,7 @@ func (x *ReplicaSetList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv1288 := &x.ListMeta yym1289 := z.DecBinary() @@ -15264,7 +15264,7 @@ func (x *ReplicaSetList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv1295 := &x.ListMeta yym1296 := z.DecBinary() @@ -15549,7 +15549,7 @@ func (x *ReplicaSetSpec) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.Selector == nil { - x.Selector = new(pkg1_unversioned.LabelSelector) + x.Selector = new(pkg1_v1.LabelSelector) } yym1322 := z.DecBinary() _ = yym1322 @@ -15639,7 +15639,7 @@ func (x *ReplicaSetSpec) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } else { if x.Selector == nil { - x.Selector = new(pkg1_unversioned.LabelSelector) + x.Selector = new(pkg1_v1.LabelSelector) } yym1329 := z.DecBinary() _ = yym1329 @@ -16355,7 +16355,7 @@ func (x *ReplicaSetCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder } case "lastTransitionTime": if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg1_unversioned.Time{} + x.LastTransitionTime = pkg1_v1.Time{} } else { yyv1393 := &x.LastTransitionTime yym1394 := z.DecBinary() @@ -16440,7 +16440,7 @@ func (x *ReplicaSetCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decod } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg1_unversioned.Time{} + x.LastTransitionTime = pkg1_v1.Time{} } else { yyv1400 := &x.LastTransitionTime yym1401 := z.DecBinary() @@ -19277,7 +19277,7 @@ func (x *PodSecurityPolicyList) codecDecodeSelfFromMap(l int, d *codec1978.Decod } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv1639 := &x.ListMeta yym1640 := z.DecBinary() @@ -19358,7 +19358,7 @@ func (x *PodSecurityPolicyList) codecDecodeSelfFromArray(l int, d *codec1978.Dec } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv1646 := &x.ListMeta yym1647 := z.DecBinary() @@ -19858,7 +19858,7 @@ func (x *NetworkPolicySpec) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) switch yys1688 { case "podSelector": if r.TryDecodeAsNil() { - x.PodSelector = pkg1_unversioned.LabelSelector{} + x.PodSelector = pkg1_v1.LabelSelector{} } else { yyv1689 := &x.PodSelector yym1690 := z.DecBinary() @@ -19907,7 +19907,7 @@ func (x *NetworkPolicySpec) codecDecodeSelfFromArray(l int, d *codec1978.Decoder } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.PodSelector = pkg1_unversioned.LabelSelector{} + x.PodSelector = pkg1_v1.LabelSelector{} } else { yyv1694 := &x.PodSelector yym1695 := z.DecBinary() @@ -20662,7 +20662,7 @@ func (x *NetworkPolicyPeer) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) } } else { if x.PodSelector == nil { - x.PodSelector = new(pkg1_unversioned.LabelSelector) + x.PodSelector = new(pkg1_v1.LabelSelector) } yym1750 := z.DecBinary() _ = yym1750 @@ -20679,7 +20679,7 @@ func (x *NetworkPolicyPeer) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) } } else { if x.NamespaceSelector == nil { - x.NamespaceSelector = new(pkg1_unversioned.LabelSelector) + x.NamespaceSelector = new(pkg1_v1.LabelSelector) } yym1752 := z.DecBinary() _ = yym1752 @@ -20720,7 +20720,7 @@ func (x *NetworkPolicyPeer) codecDecodeSelfFromArray(l int, d *codec1978.Decoder } } else { if x.PodSelector == nil { - x.PodSelector = new(pkg1_unversioned.LabelSelector) + x.PodSelector = new(pkg1_v1.LabelSelector) } yym1755 := z.DecBinary() _ = yym1755 @@ -20747,7 +20747,7 @@ func (x *NetworkPolicyPeer) codecDecodeSelfFromArray(l int, d *codec1978.Decoder } } else { if x.NamespaceSelector == nil { - x.NamespaceSelector = new(pkg1_unversioned.LabelSelector) + x.NamespaceSelector = new(pkg1_v1.LabelSelector) } yym1757 := z.DecBinary() _ = yym1757 @@ -20987,7 +20987,7 @@ func (x *NetworkPolicyList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv1779 := &x.ListMeta yym1780 := z.DecBinary() @@ -21068,7 +21068,7 @@ func (x *NetworkPolicyList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv1786 := &x.ListMeta yym1787 := z.DecBinary() diff --git a/pkg/apis/extensions/v1beta1/types.go b/pkg/apis/extensions/v1beta1/types.go index cf375647dbd..37dabfba3fd 100644 --- a/pkg/apis/extensions/v1beta1/types.go +++ b/pkg/apis/extensions/v1beta1/types.go @@ -18,8 +18,8 @@ package v1beta1 import ( "k8s.io/kubernetes/pkg/api/resource" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/util/intstr" ) diff --git a/pkg/apis/extensions/validation/validation.go b/pkg/apis/extensions/validation/validation.go index d0a5e0c2a50..68226830550 100644 --- a/pkg/apis/extensions/validation/validation.go +++ b/pkg/apis/extensions/validation/validation.go @@ -25,10 +25,10 @@ import ( "strings" "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" - unversionedvalidation "k8s.io/kubernetes/pkg/apis/meta/v1/validation" apivalidation "k8s.io/kubernetes/pkg/api/validation" "k8s.io/kubernetes/pkg/apis/extensions" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" + unversionedvalidation "k8s.io/kubernetes/pkg/apis/meta/v1/validation" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/security/apparmor" "k8s.io/kubernetes/pkg/security/podsecuritypolicy/seccomp" diff --git a/pkg/apis/extensions/validation/validation_test.go b/pkg/apis/extensions/validation/validation_test.go index 58d31742b4e..f54be5aa58a 100644 --- a/pkg/apis/extensions/validation/validation_test.go +++ b/pkg/apis/extensions/validation/validation_test.go @@ -22,8 +22,8 @@ import ( "testing" "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/extensions" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/security/apparmor" "k8s.io/kubernetes/pkg/security/podsecuritypolicy/seccomp" psputil "k8s.io/kubernetes/pkg/security/podsecuritypolicy/util" diff --git a/pkg/apis/imagepolicy/types.generated.go b/pkg/apis/imagepolicy/types.generated.go index ad407d8322a..2140e8838dd 100644 --- a/pkg/apis/imagepolicy/types.generated.go +++ b/pkg/apis/imagepolicy/types.generated.go @@ -26,7 +26,7 @@ import ( "fmt" codec1978 "github.com/ugorji/go/codec" pkg2_api "k8s.io/kubernetes/pkg/api" - pkg1_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" + pkg1_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" pkg3_types "k8s.io/kubernetes/pkg/types" "reflect" "runtime" @@ -64,7 +64,7 @@ func init() { } if false { // reference the types, but skip this branch at build/run time var v0 pkg2_api.ObjectMeta - var v1 pkg1_unversioned.TypeMeta + var v1 pkg1_v1.TypeMeta var v2 pkg3_types.UID var v3 time.Time _, _, _, _ = v0, v1, v2, v3 @@ -784,7 +784,7 @@ func (x *ImageReview) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "creationTimestamp": if r.TryDecodeAsNil() { - x.CreationTimestamp = pkg1_unversioned.Time{} + x.CreationTimestamp = pkg1_v1.Time{} } else { yyv76 := &x.CreationTimestamp yym77 := z.DecBinary() @@ -801,7 +801,7 @@ func (x *ImageReview) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "deletionTimestamp": if x.ObjectMeta.DeletionTimestamp == nil { - x.ObjectMeta.DeletionTimestamp = new(pkg1_unversioned.Time) + x.ObjectMeta.DeletionTimestamp = new(pkg1_v1.Time) } if r.TryDecodeAsNil() { if x.DeletionTimestamp != nil { @@ -809,7 +809,7 @@ func (x *ImageReview) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.DeletionTimestamp == nil { - x.DeletionTimestamp = new(pkg1_unversioned.Time) + x.DeletionTimestamp = new(pkg1_v1.Time) } yym79 := z.DecBinary() _ = yym79 @@ -1080,7 +1080,7 @@ func (x *ImageReview) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.CreationTimestamp = pkg1_unversioned.Time{} + x.CreationTimestamp = pkg1_v1.Time{} } else { yyv103 := &x.CreationTimestamp yym104 := z.DecBinary() @@ -1096,7 +1096,7 @@ func (x *ImageReview) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } if x.ObjectMeta.DeletionTimestamp == nil { - x.ObjectMeta.DeletionTimestamp = new(pkg1_unversioned.Time) + x.ObjectMeta.DeletionTimestamp = new(pkg1_v1.Time) } yyj93++ if yyhl93 { @@ -1115,7 +1115,7 @@ func (x *ImageReview) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } else { if x.DeletionTimestamp == nil { - x.DeletionTimestamp = new(pkg1_unversioned.Time) + x.DeletionTimestamp = new(pkg1_v1.Time) } yym106 := z.DecBinary() _ = yym106 diff --git a/pkg/apis/imagepolicy/v1alpha1/generated.pb.go b/pkg/apis/imagepolicy/v1alpha1/generated.pb.go index 42dcd1ab8cf..88d02e60ef3 100644 --- a/pkg/apis/imagepolicy/v1alpha1/generated.pb.go +++ b/pkg/apis/imagepolicy/v1alpha1/generated.pb.go @@ -1019,42 +1019,42 @@ var ( ) var fileDescriptorGenerated = []byte{ - // 585 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xa4, 0x92, 0x3f, 0x6f, 0x13, 0x3f, - 0x18, 0xc7, 0x73, 0x49, 0xff, 0xc5, 0xf9, 0xfd, 0x68, 0x6b, 0x18, 0xa2, 0x0c, 0xd7, 0x2a, 0x48, - 0xa8, 0x20, 0x6a, 0x2b, 0x15, 0x48, 0x15, 0x03, 0xa5, 0x87, 0x18, 0x3a, 0x00, 0xc2, 0x2c, 0x88, - 0xcd, 0xb9, 0x3c, 0xbd, 0xba, 0xb9, 0xb3, 0x4f, 0x67, 0xdf, 0x55, 0x1d, 0x90, 0x18, 0x19, 0x18, - 0x78, 0x37, 0xbc, 0x85, 0x8e, 0x1d, 0x99, 0x2a, 0x1a, 0xde, 0x08, 0x8a, 0xef, 0xd2, 0x3b, 0x92, - 0x06, 0x09, 0x65, 0xf3, 0xe3, 0xc7, 0xdf, 0xcf, 0xf7, 0x6b, 0x3f, 0x46, 0x07, 0xc3, 0x7d, 0x4d, - 0x84, 0xa2, 0xc3, 0xb4, 0x0f, 0x89, 0x04, 0x03, 0x9a, 0xc6, 0xc3, 0x80, 0xf2, 0x58, 0x68, 0x2a, - 0x22, 0x1e, 0x40, 0xac, 0x42, 0xe1, 0x9f, 0xd3, 0xac, 0xc7, 0xc3, 0xf8, 0x84, 0xf7, 0x68, 0x00, - 0x12, 0x12, 0x6e, 0x60, 0x40, 0xe2, 0x44, 0x19, 0x85, 0x69, 0x0e, 0x20, 0x25, 0x80, 0xc4, 0xc3, - 0x80, 0x8c, 0x01, 0xa4, 0x02, 0x20, 0x13, 0x40, 0x67, 0x37, 0x10, 0xe6, 0x24, 0xed, 0x13, 0x5f, - 0x45, 0x34, 0x50, 0x81, 0xa2, 0x96, 0xd3, 0x4f, 0x8f, 0x6d, 0x65, 0x0b, 0xbb, 0xca, 0xf9, 0x9d, - 0xbd, 0xb9, 0x01, 0x69, 0x02, 0x5a, 0xa5, 0x89, 0x0f, 0xd3, 0x99, 0x3a, 0x4f, 0xe7, 0x6b, 0x52, - 0x99, 0x41, 0xa2, 0x85, 0x92, 0x30, 0x98, 0x91, 0x3d, 0x9e, 0x2f, 0xcb, 0x66, 0x2e, 0xde, 0xd9, - 0xbd, 0xfd, 0x74, 0x92, 0x4a, 0x23, 0xa2, 0xd9, 0x4c, 0x4f, 0xfe, 0x7e, 0x5c, 0xfb, 0x27, 0x10, - 0xf1, 0x19, 0x55, 0xef, 0x76, 0x55, 0x6a, 0x44, 0x48, 0x85, 0x34, 0xda, 0x24, 0xd3, 0x92, 0xee, - 0xf7, 0x3a, 0x6a, 0x1d, 0x8d, 0x1f, 0x9e, 0x41, 0x26, 0xe0, 0x0c, 0x7f, 0x40, 0x6b, 0x11, 0x18, - 0x3e, 0xe0, 0x86, 0xb7, 0x9d, 0x6d, 0x67, 0xa7, 0xb5, 0xb7, 0x43, 0xe6, 0xce, 0x8c, 0x64, 0x3d, - 0xf2, 0xb6, 0x7f, 0x0a, 0xbe, 0x79, 0x0d, 0x86, 0x7b, 0xf8, 0xe2, 0x6a, 0xab, 0x36, 0xba, 0xda, - 0x42, 0xe5, 0x1e, 0xbb, 0xa1, 0xe1, 0x3e, 0x5a, 0xd2, 0x31, 0xf8, 0xed, 0xba, 0xa5, 0xbe, 0x20, - 0xff, 0xf8, 0x13, 0x48, 0x25, 0xe5, 0xfb, 0x18, 0x7c, 0xef, 0xbf, 0xc2, 0x6d, 0x69, 0x5c, 0x31, - 0xcb, 0xc6, 0xa7, 0x68, 0x45, 0x1b, 0x6e, 0x52, 0xdd, 0x6e, 0x58, 0x17, 0x6f, 0x21, 0x17, 0x4b, - 0xf2, 0xee, 0x14, 0x3e, 0x2b, 0x79, 0xcd, 0x0a, 0x87, 0xee, 0x01, 0x6a, 0x57, 0x0e, 0xbf, 0x54, - 0xd2, 0x70, 0x21, 0x21, 0x19, 0xa7, 0xc1, 0xf7, 0xd1, 0xb2, 0xa5, 0xdb, 0x27, 0x6c, 0x7a, 0xff, - 0x17, 0x88, 0xe5, 0x5c, 0x90, 0xf7, 0xba, 0x5f, 0x1b, 0x68, 0x7d, 0xea, 0x52, 0xf8, 0x13, 0x42, - 0xfe, 0x84, 0xa4, 0xdb, 0xce, 0x76, 0x63, 0xa7, 0xb5, 0x77, 0xb4, 0xc8, 0x25, 0xfe, 0xc8, 0x55, - 0x4e, 0xe8, 0x66, 0x5b, 0xb3, 0x8a, 0x21, 0xfe, 0xe2, 0xa0, 0x16, 0x97, 0x52, 0x19, 0x6e, 0x84, - 0x92, 0xba, 0x5d, 0xb7, 0x01, 0xde, 0x2d, 0x3a, 0x2b, 0x72, 0x58, 0x32, 0x5f, 0x49, 0x93, 0x9c, - 0x7b, 0x77, 0x8b, 0x20, 0xad, 0x4a, 0x87, 0x55, 0xad, 0x31, 0x45, 0x4d, 0xc9, 0x23, 0xd0, 0x31, - 0xf7, 0xc1, 0x4e, 0xb3, 0xe9, 0x6d, 0x16, 0xa2, 0xe6, 0x9b, 0x49, 0x83, 0x95, 0x67, 0x3a, 0xcf, - 0xd1, 0xc6, 0xb4, 0x0d, 0xde, 0x40, 0x8d, 0x21, 0x9c, 0xe7, 0x53, 0x60, 0xe3, 0x25, 0xbe, 0x87, - 0x96, 0x33, 0x1e, 0xa6, 0x60, 0xbf, 0x61, 0x93, 0xe5, 0xc5, 0xb3, 0xfa, 0xbe, 0xd3, 0x3d, 0x46, - 0x9b, 0x33, 0xc3, 0xc7, 0x0f, 0xd1, 0x2a, 0x0f, 0x43, 0x75, 0x06, 0x03, 0x0b, 0x59, 0xf3, 0xd6, - 0x8b, 0x0c, 0xab, 0x87, 0xf9, 0x36, 0x9b, 0xf4, 0xf1, 0x03, 0xb4, 0x92, 0x00, 0xd7, 0x4a, 0xe6, - 0xe8, 0xf2, 0xdf, 0x30, 0xbb, 0xcb, 0x8a, 0xae, 0xf7, 0xe8, 0xe2, 0xda, 0xad, 0x5d, 0x5e, 0xbb, - 0xb5, 0x1f, 0xd7, 0x6e, 0xed, 0xf3, 0xc8, 0x75, 0x2e, 0x46, 0xae, 0x73, 0x39, 0x72, 0x9d, 0x9f, - 0x23, 0xd7, 0xf9, 0xf6, 0xcb, 0xad, 0x7d, 0x5c, 0x9b, 0xbc, 0xe3, 0xef, 0x00, 0x00, 0x00, 0xff, - 0xff, 0x16, 0xa4, 0x8e, 0xac, 0x70, 0x05, 0x00, 0x00, + // 579 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xa4, 0x92, 0x4f, 0x6f, 0xd3, 0x3e, + 0x18, 0xc7, 0x9b, 0x76, 0xff, 0xea, 0xfe, 0x7e, 0x6c, 0x33, 0x1c, 0xa2, 0x1e, 0xb2, 0xa9, 0x48, + 0x68, 0x20, 0x66, 0xab, 0x13, 0x87, 0x89, 0x03, 0x63, 0x41, 0x1c, 0x76, 0x00, 0x84, 0xb9, 0x20, + 0x6e, 0x6e, 0xf6, 0x2c, 0xcb, 0x9a, 0xd8, 0x51, 0xec, 0x74, 0xda, 0x01, 0x89, 0x23, 0x07, 0x0e, + 0xbc, 0x1b, 0xde, 0x42, 0x8f, 0x3b, 0x72, 0x9a, 0x68, 0x79, 0x23, 0x28, 0x4e, 0xba, 0x84, 0xfe, + 0x99, 0x84, 0x7a, 0xf3, 0xe3, 0xc7, 0xdf, 0xcf, 0xf7, 0x6b, 0x3f, 0x46, 0x47, 0xfd, 0x43, 0x45, + 0x02, 0x49, 0xfb, 0x69, 0x0f, 0x12, 0x01, 0x1a, 0x14, 0x8d, 0xfb, 0x3e, 0xe5, 0x71, 0xa0, 0x68, + 0x10, 0x71, 0x1f, 0x62, 0x19, 0x06, 0xde, 0x15, 0x1d, 0x74, 0x79, 0x18, 0x9f, 0xf3, 0x2e, 0xf5, + 0x41, 0x40, 0xc2, 0x35, 0x9c, 0x92, 0x38, 0x91, 0x5a, 0x62, 0x9a, 0x03, 0x48, 0x09, 0x20, 0x71, + 0xdf, 0x27, 0x19, 0x80, 0x54, 0x00, 0x64, 0x02, 0x68, 0xef, 0xfb, 0x81, 0x3e, 0x4f, 0x7b, 0xc4, + 0x93, 0x11, 0xf5, 0xa5, 0x2f, 0xa9, 0xe1, 0xf4, 0xd2, 0x33, 0x53, 0x99, 0xc2, 0xac, 0x72, 0x7e, + 0xfb, 0x60, 0x61, 0x40, 0x9a, 0x80, 0x92, 0x69, 0xe2, 0xc1, 0x74, 0xa6, 0xf6, 0xd3, 0xc5, 0x9a, + 0xc1, 0xcc, 0x0d, 0xee, 0x70, 0x50, 0x34, 0x02, 0xcd, 0xe7, 0x69, 0xf6, 0xe7, 0x6b, 0x92, 0x54, + 0xe8, 0x20, 0x9a, 0x0d, 0xf4, 0xec, 0xee, 0xe3, 0xca, 0x3b, 0x87, 0x88, 0xcf, 0xa8, 0xba, 0xf3, + 0x55, 0xa9, 0x0e, 0x42, 0x1a, 0x08, 0xad, 0x74, 0x32, 0x2d, 0xe9, 0xfc, 0xa8, 0xa3, 0xd6, 0x49, + 0xf6, 0xea, 0x0c, 0x06, 0x01, 0x5c, 0xe2, 0x8f, 0x68, 0x23, 0xbb, 0xc2, 0x29, 0xd7, 0xdc, 0xb6, + 0x76, 0xad, 0xbd, 0xd6, 0xc1, 0x1e, 0x59, 0x38, 0x30, 0x32, 0xe8, 0x92, 0x77, 0xbd, 0x0b, 0xf0, + 0xf4, 0x1b, 0xd0, 0xdc, 0xc5, 0xc3, 0x9b, 0x9d, 0xda, 0xf8, 0x66, 0x07, 0x95, 0x7b, 0xec, 0x96, + 0x86, 0x7b, 0x68, 0x45, 0xc5, 0xe0, 0xd9, 0x75, 0x43, 0x7d, 0x49, 0xfe, 0xf1, 0x1b, 0x90, 0x4a, + 0xca, 0x0f, 0x31, 0x78, 0xee, 0x7f, 0x85, 0xdb, 0x4a, 0x56, 0x31, 0xc3, 0xc6, 0x17, 0x68, 0x4d, + 0x69, 0xae, 0x53, 0x65, 0x37, 0x8c, 0x8b, 0xbb, 0x94, 0x8b, 0x21, 0xb9, 0xf7, 0x0a, 0x9f, 0xb5, + 0xbc, 0x66, 0x85, 0x43, 0xe7, 0x08, 0xd9, 0x95, 0xc3, 0xaf, 0xa4, 0xd0, 0x3c, 0x10, 0x90, 0x64, + 0x69, 0xf0, 0x43, 0xb4, 0x6a, 0xe8, 0xe6, 0x09, 0x9b, 0xee, 0xff, 0x05, 0x62, 0x35, 0x17, 0xe4, + 0xbd, 0xce, 0xb7, 0x06, 0xda, 0x9c, 0xba, 0x14, 0xfe, 0x8c, 0x90, 0x37, 0x21, 0x29, 0xdb, 0xda, + 0x6d, 0xec, 0xb5, 0x0e, 0x4e, 0x96, 0xb9, 0xc4, 0x5f, 0xb9, 0xca, 0x09, 0xdd, 0x6e, 0x2b, 0x56, + 0x31, 0xc4, 0x5f, 0x2d, 0xd4, 0xe2, 0x42, 0x48, 0xcd, 0x75, 0x20, 0x85, 0xb2, 0xeb, 0x26, 0xc0, + 0xfb, 0x65, 0x67, 0x45, 0x8e, 0x4b, 0xe6, 0x6b, 0xa1, 0x93, 0x2b, 0xf7, 0x7e, 0x11, 0xa4, 0x55, + 0xe9, 0xb0, 0xaa, 0x35, 0xa6, 0xa8, 0x29, 0x78, 0x04, 0x2a, 0xe6, 0x1e, 0x98, 0x69, 0x36, 0xdd, + 0xed, 0x42, 0xd4, 0x7c, 0x3b, 0x69, 0xb0, 0xf2, 0x4c, 0xfb, 0x05, 0xda, 0x9a, 0xb6, 0xc1, 0x5b, + 0xa8, 0xd1, 0x87, 0xab, 0x7c, 0x0a, 0x2c, 0x5b, 0xe2, 0x07, 0x68, 0x75, 0xc0, 0xc3, 0x14, 0xcc, + 0x37, 0x6c, 0xb2, 0xbc, 0x78, 0x5e, 0x3f, 0xb4, 0x3a, 0x67, 0x68, 0x7b, 0x66, 0xf8, 0xf8, 0x31, + 0x5a, 0xe7, 0x61, 0x28, 0x2f, 0xe1, 0xd4, 0x40, 0x36, 0xdc, 0xcd, 0x22, 0xc3, 0xfa, 0x71, 0xbe, + 0xcd, 0x26, 0x7d, 0xfc, 0x08, 0xad, 0x25, 0xc0, 0x95, 0x14, 0x39, 0xba, 0xfc, 0x37, 0xcc, 0xec, + 0xb2, 0xa2, 0xeb, 0x3e, 0x19, 0x8e, 0x9c, 0xda, 0xf5, 0xc8, 0xa9, 0xfd, 0x1c, 0x39, 0xb5, 0x2f, + 0x63, 0xc7, 0x1a, 0x8e, 0x1d, 0xeb, 0x7a, 0xec, 0x58, 0xbf, 0xc6, 0x8e, 0xf5, 0xfd, 0xb7, 0x53, + 0xfb, 0xb4, 0x31, 0x79, 0xc7, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x06, 0xba, 0x95, 0xb5, 0x6d, + 0x05, 0x00, 0x00, } diff --git a/pkg/apis/imagepolicy/v1alpha1/generated.proto b/pkg/apis/imagepolicy/v1alpha1/generated.proto index 06419a135a0..963c5ab2874 100644 --- a/pkg/apis/imagepolicy/v1alpha1/generated.proto +++ b/pkg/apis/imagepolicy/v1alpha1/generated.proto @@ -22,8 +22,8 @@ syntax = 'proto2'; package k8s.io.kubernetes.pkg.apis.imagepolicy.v1alpha1; import "k8s.io/kubernetes/pkg/api/resource/generated.proto"; -import "k8s.io/kubernetes/pkg/api/unversioned/generated.proto"; import "k8s.io/kubernetes/pkg/api/v1/generated.proto"; +import "k8s.io/kubernetes/pkg/apis/meta/v1/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/schema/generated.proto"; import "k8s.io/kubernetes/pkg/util/intstr/generated.proto"; diff --git a/pkg/apis/imagepolicy/v1alpha1/register.go b/pkg/apis/imagepolicy/v1alpha1/register.go index 8dad71f414d..817402ccb6d 100644 --- a/pkg/apis/imagepolicy/v1alpha1/register.go +++ b/pkg/apis/imagepolicy/v1alpha1/register.go @@ -17,8 +17,8 @@ limitations under the License. package v1alpha1 import ( - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" ) diff --git a/pkg/apis/imagepolicy/v1alpha1/types.generated.go b/pkg/apis/imagepolicy/v1alpha1/types.generated.go index 403f805dca3..0b6269c5468 100644 --- a/pkg/apis/imagepolicy/v1alpha1/types.generated.go +++ b/pkg/apis/imagepolicy/v1alpha1/types.generated.go @@ -25,8 +25,8 @@ import ( "errors" "fmt" codec1978 "github.com/ugorji/go/codec" - pkg1_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" pkg2_v1 "k8s.io/kubernetes/pkg/api/v1" + pkg1_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" pkg3_types "k8s.io/kubernetes/pkg/types" "reflect" "runtime" @@ -63,8 +63,8 @@ func init() { panic(err) } if false { // reference the types, but skip this branch at build/run time - var v0 pkg1_unversioned.TypeMeta - var v1 pkg2_v1.ObjectMeta + var v0 pkg2_v1.ObjectMeta + var v1 pkg1_v1.TypeMeta var v2 pkg3_types.UID var v3 time.Time _, _, _, _ = v0, v1, v2, v3 diff --git a/pkg/apis/imagepolicy/v1alpha1/types.go b/pkg/apis/imagepolicy/v1alpha1/types.go index 228491b1ee7..c238df5e527 100644 --- a/pkg/apis/imagepolicy/v1alpha1/types.go +++ b/pkg/apis/imagepolicy/v1alpha1/types.go @@ -17,8 +17,8 @@ limitations under the License. package v1alpha1 import ( - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" ) // +genclient=true diff --git a/pkg/apis/meta/v1/generated.pb.go b/pkg/apis/meta/v1/generated.pb.go index 6d1f25700bb..dc19ce16108 100644 --- a/pkg/apis/meta/v1/generated.pb.go +++ b/pkg/apis/meta/v1/generated.pb.go @@ -15,14 +15,14 @@ limitations under the License. */ // Code generated by protoc-gen-gogo. -// source: k8s.io/kubernetes/pkg/api/unversioned/generated.proto +// source: k8s.io/kubernetes/pkg/apis/meta/v1/generated.proto // DO NOT EDIT! /* - Package unversioned is a generated protocol buffer package. + Package v1 is a generated protocol buffer package. It is generated from these files: - k8s.io/kubernetes/pkg/api/unversioned/generated.proto + k8s.io/kubernetes/pkg/apis/meta/v1/generated.proto It has these top-level messages: APIGroup @@ -176,30 +176,30 @@ func (*TypeMeta) ProtoMessage() {} func (*TypeMeta) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{23} } func init() { - proto.RegisterType((*APIGroup)(nil), "k8s.io.kubernetes.pkg.api.unversioned.APIGroup") - proto.RegisterType((*APIGroupList)(nil), "k8s.io.kubernetes.pkg.api.unversioned.APIGroupList") - proto.RegisterType((*APIResource)(nil), "k8s.io.kubernetes.pkg.api.unversioned.APIResource") - proto.RegisterType((*APIResourceList)(nil), "k8s.io.kubernetes.pkg.api.unversioned.APIResourceList") - proto.RegisterType((*APIVersions)(nil), "k8s.io.kubernetes.pkg.api.unversioned.APIVersions") - proto.RegisterType((*Duration)(nil), "k8s.io.kubernetes.pkg.api.unversioned.Duration") - proto.RegisterType((*ExportOptions)(nil), "k8s.io.kubernetes.pkg.api.unversioned.ExportOptions") - proto.RegisterType((*GroupKind)(nil), "k8s.io.kubernetes.pkg.api.unversioned.GroupKind") - proto.RegisterType((*GroupResource)(nil), "k8s.io.kubernetes.pkg.api.unversioned.GroupResource") - proto.RegisterType((*GroupVersion)(nil), "k8s.io.kubernetes.pkg.api.unversioned.GroupVersion") - proto.RegisterType((*GroupVersionForDiscovery)(nil), "k8s.io.kubernetes.pkg.api.unversioned.GroupVersionForDiscovery") - proto.RegisterType((*GroupVersionKind)(nil), "k8s.io.kubernetes.pkg.api.unversioned.GroupVersionKind") - proto.RegisterType((*GroupVersionResource)(nil), "k8s.io.kubernetes.pkg.api.unversioned.GroupVersionResource") - proto.RegisterType((*LabelSelector)(nil), "k8s.io.kubernetes.pkg.api.unversioned.LabelSelector") - proto.RegisterType((*LabelSelectorRequirement)(nil), "k8s.io.kubernetes.pkg.api.unversioned.LabelSelectorRequirement") - proto.RegisterType((*ListMeta)(nil), "k8s.io.kubernetes.pkg.api.unversioned.ListMeta") - proto.RegisterType((*RootPaths)(nil), "k8s.io.kubernetes.pkg.api.unversioned.RootPaths") - proto.RegisterType((*ServerAddressByClientCIDR)(nil), "k8s.io.kubernetes.pkg.api.unversioned.ServerAddressByClientCIDR") - proto.RegisterType((*Status)(nil), "k8s.io.kubernetes.pkg.api.unversioned.Status") - proto.RegisterType((*StatusCause)(nil), "k8s.io.kubernetes.pkg.api.unversioned.StatusCause") - proto.RegisterType((*StatusDetails)(nil), "k8s.io.kubernetes.pkg.api.unversioned.StatusDetails") - proto.RegisterType((*Time)(nil), "k8s.io.kubernetes.pkg.api.unversioned.Time") - proto.RegisterType((*Timestamp)(nil), "k8s.io.kubernetes.pkg.api.unversioned.Timestamp") - proto.RegisterType((*TypeMeta)(nil), "k8s.io.kubernetes.pkg.api.unversioned.TypeMeta") + proto.RegisterType((*APIGroup)(nil), "k8s.io.kubernetes.pkg.apis.meta.v1.APIGroup") + proto.RegisterType((*APIGroupList)(nil), "k8s.io.kubernetes.pkg.apis.meta.v1.APIGroupList") + proto.RegisterType((*APIResource)(nil), "k8s.io.kubernetes.pkg.apis.meta.v1.APIResource") + proto.RegisterType((*APIResourceList)(nil), "k8s.io.kubernetes.pkg.apis.meta.v1.APIResourceList") + proto.RegisterType((*APIVersions)(nil), "k8s.io.kubernetes.pkg.apis.meta.v1.APIVersions") + proto.RegisterType((*Duration)(nil), "k8s.io.kubernetes.pkg.apis.meta.v1.Duration") + proto.RegisterType((*ExportOptions)(nil), "k8s.io.kubernetes.pkg.apis.meta.v1.ExportOptions") + proto.RegisterType((*GroupKind)(nil), "k8s.io.kubernetes.pkg.apis.meta.v1.GroupKind") + proto.RegisterType((*GroupResource)(nil), "k8s.io.kubernetes.pkg.apis.meta.v1.GroupResource") + proto.RegisterType((*GroupVersion)(nil), "k8s.io.kubernetes.pkg.apis.meta.v1.GroupVersion") + proto.RegisterType((*GroupVersionForDiscovery)(nil), "k8s.io.kubernetes.pkg.apis.meta.v1.GroupVersionForDiscovery") + proto.RegisterType((*GroupVersionKind)(nil), "k8s.io.kubernetes.pkg.apis.meta.v1.GroupVersionKind") + proto.RegisterType((*GroupVersionResource)(nil), "k8s.io.kubernetes.pkg.apis.meta.v1.GroupVersionResource") + proto.RegisterType((*LabelSelector)(nil), "k8s.io.kubernetes.pkg.apis.meta.v1.LabelSelector") + proto.RegisterType((*LabelSelectorRequirement)(nil), "k8s.io.kubernetes.pkg.apis.meta.v1.LabelSelectorRequirement") + proto.RegisterType((*ListMeta)(nil), "k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta") + proto.RegisterType((*RootPaths)(nil), "k8s.io.kubernetes.pkg.apis.meta.v1.RootPaths") + proto.RegisterType((*ServerAddressByClientCIDR)(nil), "k8s.io.kubernetes.pkg.apis.meta.v1.ServerAddressByClientCIDR") + proto.RegisterType((*Status)(nil), "k8s.io.kubernetes.pkg.apis.meta.v1.Status") + proto.RegisterType((*StatusCause)(nil), "k8s.io.kubernetes.pkg.apis.meta.v1.StatusCause") + proto.RegisterType((*StatusDetails)(nil), "k8s.io.kubernetes.pkg.apis.meta.v1.StatusDetails") + proto.RegisterType((*Time)(nil), "k8s.io.kubernetes.pkg.apis.meta.v1.Time") + proto.RegisterType((*Timestamp)(nil), "k8s.io.kubernetes.pkg.apis.meta.v1.Timestamp") + proto.RegisterType((*TypeMeta)(nil), "k8s.io.kubernetes.pkg.apis.meta.v1.TypeMeta") } func (m *APIGroup) Marshal() (data []byte, err error) { size := m.Size() @@ -4446,93 +4446,93 @@ var ( ) var fileDescriptorGenerated = []byte{ - // 1400 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xcc, 0x57, 0x4f, 0x6b, 0x1b, 0x47, - 0x14, 0xd7, 0x4a, 0x96, 0xb2, 0x7a, 0xb2, 0x6a, 0x67, 0xeb, 0xd0, 0x8d, 0xa1, 0x92, 0xba, 0xa1, - 0xc5, 0x81, 0x44, 0x22, 0x26, 0x2d, 0x21, 0xa5, 0x7f, 0x2c, 0xdb, 0x09, 0x26, 0x71, 0x62, 0xc6, - 0x21, 0x85, 0x24, 0x85, 0xae, 0xb5, 0x63, 0x79, 0x91, 0xb4, 0xbb, 0x9d, 0x99, 0x35, 0x11, 0x2d, - 0x34, 0x97, 0x40, 0x0f, 0xa5, 0xe4, 0xd8, 0x4b, 0x4b, 0x02, 0xf9, 0x06, 0xfd, 0x12, 0xa1, 0xa7, - 0x5c, 0x0a, 0x3d, 0x14, 0xd3, 0xb8, 0x97, 0x5e, 0x7b, 0xf5, 0xa9, 0xcc, 0xec, 0xcc, 0x6a, 0x57, - 0x8e, 0xe2, 0x75, 0x9b, 0x43, 0x4f, 0xda, 0xf7, 0xff, 0xcd, 0x7b, 0xbf, 0x79, 0x6f, 0x04, 0xef, - 0xf7, 0x2e, 0xd1, 0xa6, 0xeb, 0xb7, 0x7a, 0xe1, 0x16, 0x26, 0x1e, 0x66, 0x98, 0xb6, 0x82, 0x5e, - 0xb7, 0x65, 0x07, 0x6e, 0x2b, 0xf4, 0x76, 0x31, 0xa1, 0xae, 0xef, 0x61, 0xa7, 0xd5, 0xc5, 0x1e, - 0x26, 0x36, 0xc3, 0x4e, 0x33, 0x20, 0x3e, 0xf3, 0x8d, 0x77, 0x23, 0xb3, 0xe6, 0xc8, 0xac, 0x19, - 0xf4, 0xba, 0x4d, 0x3b, 0x70, 0x9b, 0x09, 0xb3, 0xf9, 0xf3, 0x5d, 0x97, 0xed, 0x84, 0x5b, 0xcd, - 0x8e, 0x3f, 0x68, 0x75, 0xfd, 0xae, 0xdf, 0x12, 0xd6, 0x5b, 0xe1, 0xb6, 0xa0, 0x04, 0x21, 0xbe, - 0x22, 0xaf, 0xf3, 0xe7, 0x5f, 0x9e, 0x0c, 0x09, 0x3d, 0xe6, 0x0e, 0xf0, 0x78, 0x12, 0xf3, 0x17, - 0x5f, 0xad, 0x4e, 0x3b, 0x3b, 0x78, 0x60, 0x1f, 0xb2, 0xba, 0xf0, 0x72, 0xab, 0x90, 0xb9, 0xfd, - 0x96, 0xeb, 0x31, 0xca, 0xc8, 0xb8, 0x89, 0xf5, 0x4b, 0x01, 0xf4, 0xa5, 0x8d, 0xb5, 0xab, 0xc4, - 0x0f, 0x03, 0xa3, 0x01, 0x53, 0x9e, 0x3d, 0xc0, 0xa6, 0xd6, 0xd0, 0x16, 0xca, 0xed, 0xe9, 0x67, - 0x7b, 0xf5, 0xdc, 0xfe, 0x5e, 0x7d, 0xea, 0x86, 0x3d, 0xc0, 0x48, 0x48, 0x8c, 0x01, 0xe8, 0xb2, - 0x04, 0xd4, 0xcc, 0x37, 0x0a, 0x0b, 0x95, 0xc5, 0x4f, 0x9a, 0x99, 0xea, 0xd5, 0x14, 0x11, 0x6e, - 0x47, 0xe4, 0x15, 0x9f, 0xac, 0xb8, 0xb4, 0xe3, 0xef, 0x62, 0x32, 0x6c, 0xcf, 0xca, 0x30, 0xba, - 0x14, 0x52, 0x14, 0x87, 0x30, 0x1e, 0x6a, 0x30, 0x1b, 0x10, 0xbc, 0x8d, 0x09, 0xc1, 0x8e, 0x94, - 0x9b, 0x85, 0x86, 0xf6, 0x3a, 0xe2, 0x9a, 0x32, 0xee, 0xec, 0xc6, 0x58, 0x00, 0x74, 0x28, 0xa4, - 0xf1, 0x54, 0x83, 0x79, 0x8a, 0xc9, 0x2e, 0x26, 0x4b, 0x8e, 0x43, 0x30, 0xa5, 0xed, 0xe1, 0x72, - 0xdf, 0xc5, 0x1e, 0x5b, 0x5e, 0x5b, 0x41, 0xd4, 0x9c, 0x12, 0x95, 0xf8, 0x34, 0x63, 0x46, 0x9b, - 0x93, 0x1c, 0xb5, 0x2d, 0x99, 0xd2, 0xfc, 0x44, 0x15, 0x8a, 0x5e, 0x91, 0x87, 0xd5, 0x85, 0x69, - 0xd5, 0xcb, 0xeb, 0x2e, 0x65, 0xc6, 0x67, 0x50, 0xea, 0x72, 0x82, 0x9a, 0x9a, 0xc8, 0xb0, 0x95, - 0x31, 0x43, 0xe5, 0xa4, 0xfd, 0x86, 0x4c, 0xa8, 0x24, 0x48, 0x8a, 0xa4, 0x3b, 0xeb, 0xa1, 0x06, - 0x95, 0xa5, 0x8d, 0x35, 0x84, 0xa9, 0x1f, 0x92, 0x0e, 0xce, 0x00, 0x9c, 0x45, 0x00, 0xfe, 0x4b, - 0x03, 0xbb, 0x83, 0x1d, 0x33, 0xdf, 0xd0, 0x16, 0xf4, 0xb6, 0x21, 0xf5, 0xe0, 0x46, 0x2c, 0x41, - 0x09, 0x2d, 0xee, 0xb5, 0xe7, 0x7a, 0x8e, 0x68, 0x78, 0xc2, 0xeb, 0x35, 0xd7, 0x73, 0x90, 0x90, - 0x58, 0x3f, 0x6b, 0x30, 0x93, 0xc8, 0x43, 0x1c, 0xfa, 0x12, 0x4c, 0x77, 0x13, 0x3d, 0x97, 0x39, - 0xcd, 0x49, 0xeb, 0xe9, 0x24, 0x1e, 0x50, 0x4a, 0xd3, 0xd8, 0x86, 0x32, 0x91, 0x9e, 0x14, 0xba, - 0x17, 0xb3, 0x57, 0x4c, 0x25, 0x31, 0x0a, 0x95, 0x60, 0x52, 0x34, 0x72, 0x6d, 0xfd, 0x15, 0x55, - 0x4f, 0xe1, 0xdd, 0x58, 0x48, 0x5c, 0x2a, 0xde, 0xa8, 0x72, 0x7b, 0x7a, 0xc2, 0x7d, 0x38, 0x02, - 0x87, 0xf9, 0xff, 0x07, 0x0e, 0x2f, 0xeb, 0x3f, 0x3c, 0xae, 0xe7, 0x1e, 0xfc, 0xde, 0xc8, 0x59, - 0x6b, 0xa0, 0xaf, 0x84, 0xc4, 0x66, 0xbc, 0xbc, 0x1f, 0x81, 0xee, 0xc8, 0x6f, 0xd1, 0x94, 0x42, - 0xfb, 0x1d, 0x75, 0xf5, 0x95, 0xce, 0xc1, 0x5e, 0xbd, 0xca, 0x07, 0x5c, 0x53, 0x31, 0x50, 0x6c, - 0x62, 0xdd, 0x83, 0xea, 0xea, 0xfd, 0xc0, 0x27, 0xec, 0x66, 0xc0, 0x44, 0x31, 0xde, 0x83, 0x12, - 0x16, 0x0c, 0xe1, 0x4d, 0x1f, 0x81, 0x35, 0x52, 0x43, 0x52, 0x6a, 0x9c, 0x81, 0x22, 0xbe, 0x6f, - 0x77, 0x98, 0x44, 0x5d, 0x55, 0xaa, 0x15, 0x57, 0x39, 0x13, 0x45, 0x32, 0xeb, 0x1e, 0x94, 0x05, - 0x32, 0x38, 0xb8, 0xb8, 0x85, 0x00, 0x86, 0xc4, 0x4e, 0x6c, 0x21, 0x34, 0x50, 0x24, 0x8b, 0xd1, - 0x99, 0x9f, 0x84, 0xce, 0x44, 0x19, 0xfa, 0x50, 0x8d, 0x6c, 0xd5, 0x85, 0xc9, 0x14, 0xe1, 0x1c, - 0xe8, 0x0a, 0x34, 0x32, 0x4a, 0x3c, 0x2b, 0x95, 0x23, 0x14, 0x6b, 0x24, 0xa2, 0xed, 0x40, 0x0a, - 0xe5, 0xd9, 0x82, 0x9d, 0x85, 0x13, 0x12, 0x1a, 0x32, 0xd6, 0x8c, 0x54, 0x3b, 0xa1, 0x2e, 0x8b, - 0x92, 0x27, 0x22, 0x7d, 0x03, 0xe6, 0xa4, 0xf9, 0xfa, 0x1f, 0xee, 0x61, 0xf6, 0x54, 0xac, 0xef, - 0x35, 0x98, 0x4d, 0x7a, 0xca, 0xde, 0xbe, 0xec, 0x41, 0x8e, 0x9e, 0x43, 0x89, 0x8a, 0xfc, 0xa4, - 0xc1, 0x5c, 0xea, 0x68, 0xc7, 0xea, 0xf8, 0x31, 0x92, 0x4a, 0x82, 0xa3, 0x70, 0x0c, 0x70, 0xfc, - 0x9a, 0x87, 0xea, 0x75, 0x7b, 0x0b, 0xf7, 0x37, 0x71, 0x1f, 0x77, 0x98, 0x4f, 0x8c, 0xaf, 0xa1, - 0x32, 0xb0, 0x59, 0x67, 0x47, 0x70, 0xd5, 0xaa, 0x58, 0xcd, 0x38, 0x44, 0x52, 0xae, 0x9a, 0xeb, - 0x23, 0x3f, 0xab, 0x1e, 0x23, 0xc3, 0xf6, 0x9b, 0x32, 0xa7, 0x4a, 0x42, 0x82, 0x92, 0xe1, 0xc4, - 0x8a, 0x17, 0xf4, 0xea, 0xfd, 0x80, 0x4f, 0x92, 0x7f, 0xf1, 0xb4, 0x48, 0xe5, 0x80, 0xf0, 0x97, - 0xa1, 0x4b, 0xf0, 0x00, 0x7b, 0x6c, 0xb4, 0xe2, 0xd7, 0xc7, 0x02, 0xa0, 0x43, 0x21, 0xe7, 0x3f, - 0x86, 0xd9, 0xf1, 0xec, 0x8d, 0x59, 0x28, 0xf4, 0xf0, 0x30, 0xea, 0x18, 0xe2, 0x9f, 0xc6, 0x1c, - 0x14, 0x77, 0xed, 0x7e, 0x28, 0xef, 0x23, 0x8a, 0x88, 0xcb, 0xf9, 0x4b, 0x9a, 0xf5, 0x54, 0x03, - 0x73, 0x52, 0x22, 0xc6, 0xdb, 0x09, 0x47, 0xed, 0x8a, 0xcc, 0xaa, 0x70, 0x0d, 0x0f, 0x23, 0xaf, - 0xab, 0xa0, 0xfb, 0x01, 0x7f, 0x96, 0xf9, 0x44, 0xf6, 0xfd, 0xac, 0xea, 0xe5, 0x4d, 0xc9, 0x3f, - 0xd8, 0xab, 0x9f, 0x4a, 0xb9, 0x57, 0x02, 0x14, 0x9b, 0x1a, 0x16, 0x94, 0x44, 0x3e, 0xd4, 0x2c, - 0x88, 0x2d, 0x02, 0x7c, 0x18, 0xde, 0x16, 0x1c, 0x24, 0x25, 0xd6, 0x57, 0xa0, 0xf3, 0x2d, 0xb9, - 0x8e, 0x99, 0xcd, 0x21, 0x44, 0x71, 0x7f, 0xfb, 0xba, 0xeb, 0xf5, 0x64, 0x6a, 0x31, 0x84, 0x36, - 0x25, 0x1f, 0xc5, 0x1a, 0xc6, 0x12, 0xcc, 0x28, 0x38, 0xdd, 0x4e, 0x61, 0xf4, 0x2d, 0x69, 0x34, - 0x83, 0xd2, 0x62, 0x34, 0xae, 0x6f, 0x9d, 0x83, 0x32, 0xf2, 0x7d, 0xb6, 0x61, 0xb3, 0x1d, 0x6a, - 0xd4, 0xa1, 0x18, 0xf0, 0x0f, 0xb9, 0xf2, 0xca, 0xfc, 0x32, 0x08, 0x09, 0x8a, 0xf8, 0xd6, 0x77, - 0x1a, 0x9c, 0x9e, 0xb8, 0x80, 0xf8, 0x83, 0xa2, 0x13, 0x53, 0x32, 0xfd, 0xf8, 0x41, 0x31, 0xd2, - 0x43, 0x09, 0x2d, 0xe3, 0x43, 0xa8, 0xa6, 0xb6, 0x96, 0x3c, 0xc0, 0x29, 0x69, 0x56, 0x4d, 0x45, - 0x43, 0x69, 0x5d, 0xeb, 0xef, 0x3c, 0x94, 0x36, 0x99, 0xcd, 0x42, 0x6a, 0x7c, 0x0e, 0xfa, 0x00, - 0x33, 0xdb, 0xb1, 0x99, 0x2d, 0x22, 0x67, 0x7f, 0x59, 0xa9, 0xda, 0x8f, 0x2a, 0xad, 0x38, 0x28, - 0x76, 0xc9, 0x17, 0x1b, 0x15, 0x81, 0x64, 0x7e, 0xf1, 0x62, 0x8b, 0xc2, 0x23, 0x29, 0xe5, 0xd3, - 0x62, 0x80, 0x29, 0xb5, 0xbb, 0x6a, 0x02, 0xc4, 0xd3, 0x62, 0x3d, 0x62, 0x23, 0x25, 0x37, 0x3e, - 0x80, 0x12, 0xc1, 0x36, 0xf5, 0x3d, 0x73, 0x4a, 0x68, 0xd6, 0x94, 0x4b, 0x24, 0xb8, 0x07, 0x7b, - 0xf5, 0x69, 0xe9, 0x5c, 0xd0, 0x48, 0x6a, 0x1b, 0x77, 0xe1, 0x84, 0x83, 0x99, 0xed, 0xf6, 0xa9, - 0x59, 0x14, 0x07, 0xbd, 0x98, 0xf5, 0x71, 0x21, 0xbc, 0xad, 0x44, 0xb6, 0xed, 0x0a, 0x4f, 0x4a, - 0x12, 0x48, 0x79, 0xe4, 0x73, 0xb5, 0xe3, 0x3b, 0xd8, 0x2c, 0x35, 0xb4, 0x85, 0xe2, 0x68, 0xae, - 0x2e, 0xfb, 0x0e, 0x46, 0x42, 0x62, 0x3d, 0xd2, 0xa0, 0x12, 0x79, 0x5a, 0xb6, 0x43, 0x8a, 0x8d, - 0x0b, 0xf1, 0x31, 0xa2, 0x86, 0x9f, 0x56, 0x36, 0xb7, 0x86, 0x01, 0x3e, 0xd8, 0xab, 0x97, 0x85, - 0x1a, 0x27, 0xe2, 0x13, 0x24, 0x8a, 0x94, 0x3f, 0xa2, 0x48, 0x67, 0xa0, 0xb8, 0xed, 0xe2, 0xbe, - 0x1a, 0xf4, 0xf1, 0x88, 0xbe, 0xc2, 0x99, 0x28, 0x92, 0x59, 0x3f, 0xe6, 0xa1, 0x9a, 0x3a, 0x5c, - 0x86, 0xc7, 0x6f, 0x3c, 0xfb, 0xf3, 0x19, 0xde, 0x13, 0x13, 0xb7, 0x8c, 0x71, 0x07, 0x4a, 0x1d, - 0x7e, 0x3e, 0xf5, 0x87, 0x63, 0xf1, 0x58, 0xbd, 0x10, 0xa5, 0x19, 0x61, 0x49, 0x90, 0x14, 0x49, - 0x8f, 0xc6, 0x55, 0x38, 0x49, 0x30, 0x23, 0xc3, 0xa5, 0x6d, 0x86, 0xc9, 0x26, 0xee, 0xf8, 0x9e, - 0x13, 0xb5, 0xbc, 0x18, 0x17, 0xf9, 0x24, 0x1a, 0x57, 0x40, 0x87, 0x6d, 0xac, 0x3e, 0x4c, 0xdd, - 0x72, 0x07, 0x98, 0xd7, 0x9d, 0x4a, 0x37, 0xd1, 0x63, 0x2f, 0xae, 0xbb, 0x32, 0x56, 0x72, 0x5e, - 0x1e, 0xcf, 0xf6, 0xfc, 0x08, 0xee, 0xc5, 0x51, 0x79, 0x6e, 0x70, 0x26, 0x8a, 0x64, 0x97, 0xe7, - 0xf8, 0x06, 0xfb, 0xf6, 0x49, 0x3d, 0xf7, 0xe8, 0x49, 0x3d, 0xf7, 0xf8, 0x89, 0xdc, 0x66, 0x77, - 0xa1, 0xcc, 0xa3, 0x51, 0x66, 0x0f, 0x82, 0xd7, 0x1d, 0xd2, 0xfa, 0x02, 0x74, 0x0e, 0x25, 0x31, - 0x2b, 0x55, 0x77, 0xb4, 0x89, 0xdd, 0x59, 0x04, 0xb0, 0x03, 0x37, 0x3d, 0x1a, 0xe3, 0x81, 0x34, - 0x7a, 0xee, 0xa3, 0x84, 0x56, 0xfb, 0xfc, 0xb3, 0x17, 0xb5, 0xdc, 0xf3, 0x17, 0xb5, 0xdc, 0x6f, - 0x2f, 0x6a, 0xb9, 0x07, 0xfb, 0x35, 0xed, 0xd9, 0x7e, 0x4d, 0x7b, 0xbe, 0x5f, 0xd3, 0xfe, 0xd8, - 0xaf, 0x69, 0x8f, 0xfe, 0xac, 0xe5, 0xee, 0x54, 0x12, 0x8d, 0xfc, 0x27, 0x00, 0x00, 0xff, 0xff, - 0xac, 0x17, 0x87, 0x87, 0xd2, 0x10, 0x00, 0x00, + // 1406 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xcc, 0x57, 0x4f, 0x6f, 0xdb, 0xc6, + 0x12, 0x17, 0x25, 0x4b, 0x91, 0x46, 0xd6, 0xb3, 0xc3, 0xe7, 0xe0, 0x31, 0x06, 0x9e, 0xa4, 0xc7, + 0x3c, 0x14, 0x0e, 0x90, 0x48, 0xb0, 0x51, 0x14, 0x41, 0xda, 0x14, 0x30, 0x6d, 0x27, 0x30, 0x12, + 0x27, 0xc6, 0x3a, 0x48, 0x8b, 0x34, 0x87, 0xd2, 0xe4, 0x5a, 0x66, 0x25, 0x91, 0xec, 0xee, 0x4a, + 0x88, 0xd0, 0x43, 0x83, 0x02, 0x05, 0x7a, 0x28, 0x8a, 0x1c, 0x8b, 0x1e, 0x8a, 0x18, 0xe8, 0x07, + 0xe8, 0x57, 0xe8, 0x2d, 0xb7, 0xe6, 0xd8, 0x43, 0x61, 0x34, 0x2e, 0x7a, 0xea, 0x37, 0xf0, 0xa9, + 0xd8, 0xe5, 0x2e, 0x45, 0xca, 0x51, 0x4c, 0x23, 0x3d, 0xf4, 0x64, 0xed, 0xfc, 0xf9, 0xcd, 0x70, + 0xe6, 0xb7, 0x33, 0x6b, 0x58, 0xe9, 0x5e, 0xa3, 0x2d, 0x2f, 0x68, 0x77, 0x07, 0xbb, 0x98, 0xf8, + 0x98, 0x61, 0xda, 0x0e, 0xbb, 0x9d, 0xb6, 0x1d, 0x7a, 0xb4, 0xdd, 0xc7, 0xcc, 0x6e, 0x0f, 0x97, + 0xdb, 0x1d, 0xec, 0x63, 0x62, 0x33, 0xec, 0xb6, 0x42, 0x12, 0xb0, 0x40, 0x37, 0x23, 0x9f, 0xd6, + 0xd8, 0xa7, 0x15, 0x76, 0x3b, 0x2d, 0xee, 0xd3, 0xe2, 0x3e, 0xad, 0xe1, 0xf2, 0xe2, 0xd5, 0x8e, + 0xc7, 0xf6, 0x07, 0xbb, 0x2d, 0x27, 0xe8, 0xb7, 0x3b, 0x41, 0x27, 0x68, 0x0b, 0xd7, 0xdd, 0xc1, + 0x9e, 0x38, 0x89, 0x83, 0xf8, 0x15, 0x41, 0x2e, 0x5e, 0x7d, 0x75, 0x1a, 0x64, 0xe0, 0x33, 0xaf, + 0x8f, 0x27, 0x33, 0x58, 0x7c, 0xfb, 0xf5, 0xe6, 0xd4, 0xd9, 0xc7, 0x7d, 0xfb, 0x84, 0xd7, 0xf2, + 0xab, 0xbd, 0x06, 0xcc, 0xeb, 0xb5, 0x3d, 0x9f, 0x51, 0x46, 0x26, 0x5d, 0xcc, 0x9f, 0x0a, 0x50, + 0x5e, 0xdd, 0xde, 0xbc, 0x45, 0x82, 0x41, 0xa8, 0x37, 0x61, 0xc6, 0xb7, 0xfb, 0xd8, 0xd0, 0x9a, + 0xda, 0x52, 0xc5, 0x9a, 0x7d, 0x7e, 0xd8, 0xc8, 0x1d, 0x1d, 0x36, 0x66, 0xee, 0xda, 0x7d, 0x8c, + 0x84, 0x46, 0xff, 0x04, 0xca, 0x43, 0x4c, 0xa8, 0x17, 0xf8, 0xd4, 0xc8, 0x37, 0x0b, 0x4b, 0xd5, + 0x95, 0xf7, 0x5a, 0xa7, 0x17, 0xab, 0x25, 0xe0, 0x1f, 0x44, 0x8e, 0x37, 0x03, 0xb2, 0xee, 0x51, + 0x27, 0x18, 0x62, 0x32, 0xb2, 0xe6, 0x65, 0x8c, 0xb2, 0x54, 0x52, 0x14, 0xe3, 0xeb, 0x5f, 0x68, + 0x30, 0x1f, 0x12, 0xbc, 0x87, 0x09, 0xc1, 0xae, 0xd4, 0x1b, 0x85, 0xa6, 0xf6, 0xc6, 0x41, 0x0d, + 0x19, 0x74, 0x7e, 0x7b, 0x02, 0x1d, 0x9d, 0x88, 0xa7, 0x1f, 0x68, 0xb0, 0x48, 0x31, 0x19, 0x62, + 0xb2, 0xea, 0xba, 0x04, 0x53, 0x6a, 0x8d, 0xd6, 0x7a, 0x1e, 0xf6, 0xd9, 0xda, 0xe6, 0x3a, 0xa2, + 0xc6, 0x8c, 0xa8, 0xc1, 0x8d, 0x2c, 0xe9, 0xec, 0x4c, 0x43, 0xb1, 0x4c, 0x99, 0xcf, 0xe2, 0x54, + 0x13, 0x8a, 0x5e, 0x93, 0x84, 0xe9, 0xc2, 0xac, 0x6a, 0xe1, 0x1d, 0x8f, 0x32, 0xfd, 0x3e, 0x94, + 0x3a, 0xfc, 0x40, 0x0d, 0x4d, 0xa4, 0x77, 0x25, 0x4b, 0x7a, 0x0a, 0xc1, 0xfa, 0x97, 0xcc, 0xa6, + 0x24, 0x8e, 0x14, 0x49, 0x2c, 0xf3, 0x4b, 0x0d, 0xaa, 0xab, 0xdb, 0x9b, 0x08, 0xd3, 0x60, 0x40, + 0x1c, 0x9c, 0x81, 0x2c, 0x2b, 0x00, 0xfc, 0x2f, 0x0d, 0x6d, 0x07, 0xbb, 0x46, 0xbe, 0xa9, 0x2d, + 0x95, 0x2d, 0x5d, 0xda, 0xc1, 0xdd, 0x58, 0x83, 0x12, 0x56, 0x1c, 0xb5, 0xeb, 0xf9, 0xae, 0xe8, + 0x73, 0x02, 0xf5, 0xb6, 0xe7, 0xbb, 0x48, 0x68, 0xcc, 0x1f, 0x35, 0x98, 0x4b, 0xe4, 0x21, 0xbe, + 0xf8, 0x1a, 0xcc, 0x76, 0x12, 0xdd, 0x96, 0x39, 0x2d, 0x48, 0xef, 0xd9, 0x24, 0x13, 0x50, 0xca, + 0x52, 0x77, 0xa0, 0x42, 0x24, 0x92, 0x62, 0x74, 0x3b, 0x63, 0xb9, 0x54, 0x06, 0xe3, 0x38, 0x09, + 0x21, 0x45, 0x63, 0x5c, 0xf3, 0x8f, 0xa8, 0x74, 0x8a, 0xe3, 0xfa, 0x52, 0xe2, 0x16, 0xf1, 0x16, + 0x55, 0xac, 0xd9, 0x29, 0x77, 0xe0, 0x14, 0xfa, 0xe5, 0xff, 0x01, 0xf4, 0xbb, 0x5e, 0xfe, 0xf6, + 0x59, 0x23, 0xf7, 0xe4, 0xd7, 0x66, 0xce, 0xdc, 0x84, 0xf2, 0xfa, 0x80, 0xd8, 0x8c, 0x17, 0xf6, + 0x06, 0x94, 0x5d, 0xf9, 0x5b, 0xb4, 0xa3, 0x60, 0xfd, 0x4f, 0xdd, 0x75, 0x65, 0x73, 0x7c, 0xd8, + 0xa8, 0xf1, 0x71, 0xd6, 0x52, 0x02, 0x14, 0xbb, 0x98, 0x8f, 0xa0, 0xb6, 0xf1, 0x38, 0x0c, 0x08, + 0xbb, 0x17, 0x32, 0x51, 0x89, 0xb7, 0xa0, 0x84, 0x85, 0x40, 0xa0, 0x95, 0xc7, 0x34, 0x8d, 0xcc, + 0x90, 0xd4, 0xea, 0x97, 0xa0, 0x88, 0x1f, 0xdb, 0x0e, 0x93, 0x7c, 0xab, 0x49, 0xb3, 0xe2, 0x06, + 0x17, 0xa2, 0x48, 0x67, 0x3e, 0x82, 0x8a, 0xe0, 0x04, 0xa7, 0x15, 0xf7, 0x10, 0x94, 0x90, 0xac, + 0x89, 0x3d, 0x84, 0x05, 0x8a, 0x74, 0x31, 0x2f, 0xf3, 0xd3, 0x78, 0x99, 0x28, 0x43, 0x0f, 0x6a, + 0x91, 0xaf, 0xba, 0x2a, 0x99, 0x22, 0x5c, 0x81, 0xb2, 0x62, 0x8c, 0x8c, 0x12, 0x0f, 0x47, 0x05, + 0x84, 0x62, 0x8b, 0x44, 0xb4, 0x7d, 0x48, 0xf1, 0x3b, 0x5b, 0xb0, 0xcb, 0x70, 0x4e, 0x72, 0x4c, + 0xc6, 0x9a, 0x93, 0x66, 0xe7, 0xd4, 0x35, 0x51, 0xfa, 0x44, 0xa4, 0xcf, 0xc1, 0x98, 0x36, 0x53, + 0xdf, 0xe0, 0x06, 0x66, 0x4f, 0xc5, 0xfc, 0x46, 0x83, 0xf9, 0x24, 0x52, 0xf6, 0xf6, 0x65, 0x0f, + 0x72, 0xfa, 0x04, 0x4a, 0x54, 0xe4, 0x7b, 0x0d, 0x16, 0x52, 0x9f, 0x76, 0xa6, 0x8e, 0x9f, 0x21, + 0xa9, 0x24, 0x39, 0x0a, 0x67, 0x20, 0xc7, 0xcf, 0x79, 0xa8, 0xdd, 0xb1, 0x77, 0x71, 0x6f, 0x07, + 0xf7, 0xb0, 0xc3, 0x02, 0xa2, 0x8f, 0xa0, 0xda, 0xb7, 0x99, 0xb3, 0x2f, 0xa4, 0x6a, 0x43, 0x58, + 0x59, 0x26, 0x48, 0x0a, 0xa7, 0xb5, 0x35, 0x06, 0xd9, 0xf0, 0x19, 0x19, 0x59, 0xff, 0x96, 0x09, + 0x55, 0x13, 0x1a, 0x94, 0x8c, 0x25, 0x16, 0xba, 0x38, 0x6f, 0x3c, 0x0e, 0xf9, 0x18, 0x39, 0xeb, + 0x2b, 0x22, 0x95, 0x00, 0xc2, 0x9f, 0x0e, 0x3c, 0x82, 0xfb, 0xd8, 0x67, 0xe3, 0x85, 0xbe, 0x35, + 0x81, 0x8e, 0x4e, 0xc4, 0x5b, 0x7c, 0x1f, 0xe6, 0x27, 0x53, 0xd7, 0xe7, 0xa1, 0xd0, 0xc5, 0xa3, + 0xa8, 0x57, 0x88, 0xff, 0xd4, 0x17, 0xa0, 0x38, 0xb4, 0x7b, 0x03, 0x79, 0x13, 0x51, 0x74, 0xb8, + 0x9e, 0xbf, 0xa6, 0x99, 0x3f, 0x68, 0x60, 0x4c, 0x4b, 0x44, 0xff, 0x6f, 0x02, 0xc8, 0xaa, 0xca, + 0xac, 0x0a, 0xb7, 0xf1, 0x28, 0x42, 0xdd, 0x80, 0x72, 0x10, 0xf2, 0xe7, 0x57, 0x40, 0x64, 0xc7, + 0x2f, 0xab, 0x2e, 0xde, 0x93, 0xf2, 0xe3, 0xc3, 0xc6, 0x85, 0x14, 0xbc, 0x52, 0xa0, 0xd8, 0x55, + 0x37, 0xa1, 0x24, 0xf2, 0xa1, 0x46, 0x41, 0x2c, 0x0f, 0xe0, 0x63, 0xf0, 0x81, 0x90, 0x20, 0xa9, + 0x31, 0x3f, 0x83, 0x32, 0xdf, 0x8c, 0x5b, 0x98, 0xd9, 0x9c, 0x3c, 0x14, 0xf7, 0xf6, 0xee, 0x78, + 0x7e, 0x57, 0xa6, 0x16, 0x93, 0x67, 0x47, 0xca, 0x51, 0x6c, 0xa1, 0xaf, 0xc2, 0x9c, 0x22, 0xd2, + 0x83, 0x14, 0x3b, 0xff, 0x23, 0x9d, 0xe6, 0x50, 0x5a, 0x8d, 0x26, 0xed, 0xcd, 0x2b, 0x50, 0x41, + 0x41, 0xc0, 0xb6, 0x6d, 0xb6, 0x4f, 0xf5, 0x06, 0x14, 0x43, 0xfe, 0x43, 0x6e, 0xba, 0x0a, 0xbf, + 0x06, 0x42, 0x83, 0x22, 0xb9, 0xf9, 0xb5, 0x06, 0x17, 0xa7, 0xae, 0x1e, 0xfe, 0x88, 0x70, 0xe2, + 0x93, 0x4c, 0x3f, 0x7e, 0x44, 0x8c, 0xed, 0x50, 0xc2, 0x4a, 0x7f, 0x17, 0x6a, 0xa9, 0x7d, 0x25, + 0x3f, 0xe0, 0x82, 0x74, 0xab, 0xa5, 0xa2, 0xa1, 0xb4, 0xad, 0xf9, 0x67, 0x1e, 0x4a, 0x3b, 0xcc, + 0x66, 0x03, 0xaa, 0x3f, 0x84, 0x32, 0xe7, 0x9e, 0x6b, 0x33, 0x5b, 0x44, 0xce, 0xf8, 0x94, 0x52, + 0x85, 0x1f, 0x97, 0x59, 0x49, 0x50, 0x8c, 0xc7, 0xf7, 0x19, 0x15, 0x51, 0x64, 0x72, 0xf1, 0x3e, + 0x8b, 0x62, 0x23, 0xa9, 0xe5, 0x43, 0xa2, 0x8f, 0x29, 0xb5, 0x3b, 0xea, 0xe2, 0xc7, 0x43, 0x62, + 0x2b, 0x12, 0x23, 0xa5, 0xd7, 0xdf, 0x81, 0x12, 0xc1, 0x36, 0x0d, 0x7c, 0x63, 0x46, 0x58, 0xd6, + 0x15, 0x24, 0x12, 0xd2, 0xe3, 0xc3, 0xc6, 0xac, 0x04, 0x17, 0x67, 0x24, 0xad, 0xf5, 0x0f, 0xe1, + 0x9c, 0x8b, 0x99, 0xed, 0xf5, 0xa8, 0x51, 0x14, 0x5f, 0xb9, 0x9c, 0xe9, 0x41, 0x21, 0xa0, 0xd6, + 0x23, 0x47, 0xab, 0xca, 0x33, 0x92, 0x07, 0xa4, 0xe0, 0xf8, 0x2c, 0x75, 0x02, 0x17, 0x1b, 0xa5, + 0xa6, 0xb6, 0x54, 0x1c, 0xcf, 0xd2, 0xb5, 0xc0, 0xc5, 0x48, 0x68, 0xcc, 0xa7, 0x1a, 0x54, 0x23, + 0xa4, 0x35, 0x7b, 0x40, 0xb1, 0xbe, 0x1c, 0x7f, 0x43, 0xd4, 0xea, 0x8b, 0xca, 0xe7, 0xfe, 0x28, + 0xc4, 0xc7, 0x87, 0x8d, 0x8a, 0x30, 0xe3, 0x87, 0x38, 0xfd, 0x44, 0x85, 0xf2, 0xa7, 0x54, 0xe8, + 0x12, 0x14, 0xf7, 0x3c, 0xdc, 0x53, 0xc3, 0x3d, 0x1e, 0xcb, 0x37, 0xb9, 0x10, 0x45, 0x3a, 0xf3, + 0xbb, 0x3c, 0xd4, 0x52, 0x1f, 0x97, 0xe1, 0xa9, 0x1b, 0xcf, 0xfb, 0x7c, 0x86, 0x37, 0xc4, 0xd4, + 0xcd, 0xa2, 0x7f, 0x00, 0x25, 0x87, 0x7f, 0x9f, 0xfa, 0xc7, 0xa2, 0x9d, 0xbd, 0x11, 0xa2, 0x2e, + 0x63, 0x16, 0x89, 0x23, 0x45, 0x12, 0x4e, 0xbf, 0x05, 0xe7, 0x09, 0x66, 0x64, 0xb4, 0xba, 0xc7, + 0x30, 0xd9, 0xc1, 0x4e, 0xe0, 0xbb, 0x51, 0xb3, 0x8b, 0x71, 0x85, 0xcf, 0xa3, 0x49, 0x03, 0x74, + 0xd2, 0xc7, 0xec, 0xc1, 0xcc, 0x7d, 0xaf, 0x8f, 0x79, 0xd1, 0xa9, 0x84, 0x89, 0x5e, 0x77, 0x71, + 0xd1, 0x95, 0xb3, 0xd2, 0xf3, 0xda, 0xf8, 0xb6, 0x1f, 0x44, 0x44, 0x2f, 0x8e, 0x6b, 0x73, 0x97, + 0x0b, 0x51, 0xa4, 0xbb, 0xbe, 0xc0, 0x57, 0xd6, 0x57, 0x07, 0x8d, 0xdc, 0xd3, 0x83, 0x46, 0xee, + 0xd9, 0x81, 0x5c, 0x5f, 0x1f, 0x41, 0x85, 0x47, 0xa3, 0xcc, 0xee, 0x87, 0x7f, 0x77, 0x48, 0xf3, + 0x63, 0x28, 0x73, 0x1e, 0x89, 0x11, 0xa9, 0x5a, 0xa3, 0x4d, 0x6d, 0xcd, 0x0a, 0x80, 0x1d, 0x7a, + 0xe9, 0x89, 0x18, 0xcf, 0xa1, 0xf1, 0xe3, 0x1e, 0x25, 0xac, 0xac, 0xff, 0x3f, 0x7f, 0x59, 0xcf, + 0xbd, 0x78, 0x59, 0xcf, 0xfd, 0xf2, 0xb2, 0x9e, 0x7b, 0x72, 0x54, 0xd7, 0x9e, 0x1f, 0xd5, 0xb5, + 0x17, 0x47, 0x75, 0xed, 0xb7, 0xa3, 0xba, 0xf6, 0xf4, 0xf7, 0x7a, 0xee, 0x61, 0x7e, 0xb8, 0xfc, + 0x57, 0x00, 0x00, 0x00, 0xff, 0xff, 0x82, 0xf3, 0x8f, 0xb8, 0xa2, 0x10, 0x00, 0x00, } diff --git a/pkg/apis/meta/v1/generated.proto b/pkg/apis/meta/v1/generated.proto index c2a6b7c1cbd..191c6ef5d4a 100644 --- a/pkg/apis/meta/v1/generated.proto +++ b/pkg/apis/meta/v1/generated.proto @@ -19,14 +19,14 @@ limitations under the License. syntax = 'proto2'; -package k8s.io.kubernetes.pkg.api.unversioned; +package k8s.io.kubernetes.pkg.apis.meta.v1; import "k8s.io/kubernetes/pkg/runtime/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/schema/generated.proto"; import "k8s.io/kubernetes/pkg/util/intstr/generated.proto"; // Package-wide variables from generator "generated". -option go_package = "unversioned"; +option go_package = "v1"; // APIGroup contains the name, the supported versions, and the preferred version // of a group. diff --git a/pkg/apis/policy/types.generated.go b/pkg/apis/policy/types.generated.go index cdd6c4eee7d..7df59553e30 100644 --- a/pkg/apis/policy/types.generated.go +++ b/pkg/apis/policy/types.generated.go @@ -26,7 +26,7 @@ import ( "fmt" codec1978 "github.com/ugorji/go/codec" pkg3_api "k8s.io/kubernetes/pkg/api" - pkg2_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" + pkg2_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" pkg4_types "k8s.io/kubernetes/pkg/types" pkg1_intstr "k8s.io/kubernetes/pkg/util/intstr" "reflect" @@ -65,7 +65,7 @@ func init() { } if false { // reference the types, but skip this branch at build/run time var v0 pkg3_api.ObjectMeta - var v1 pkg2_unversioned.LabelSelector + var v1 pkg2_v1.LabelSelector var v2 pkg4_types.UID var v3 pkg1_intstr.IntOrString var v4 time.Time @@ -256,7 +256,7 @@ func (x *PodDisruptionBudgetSpec) codecDecodeSelfFromMap(l int, d *codec1978.Dec } } else { if x.Selector == nil { - x.Selector = new(pkg2_unversioned.LabelSelector) + x.Selector = new(pkg2_v1.LabelSelector) } yym17 := z.DecBinary() _ = yym17 @@ -322,7 +322,7 @@ func (x *PodDisruptionBudgetSpec) codecDecodeSelfFromArray(l int, d *codec1978.D } } else { if x.Selector == nil { - x.Selector = new(pkg2_unversioned.LabelSelector) + x.Selector = new(pkg2_v1.LabelSelector) } yym22 := z.DecBinary() _ = yym22 @@ -413,7 +413,7 @@ func (x *PodDisruptionBudgetStatus) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym29 if false { } else { - h.encMapstringunversioned_Time((map[string]pkg2_unversioned.Time)(x.DisruptedPods), e) + h.encMapstringv1_Time((map[string]pkg2_v1.Time)(x.DisruptedPods), e) } } } else { @@ -427,7 +427,7 @@ func (x *PodDisruptionBudgetStatus) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym30 if false { } else { - h.encMapstringunversioned_Time((map[string]pkg2_unversioned.Time)(x.DisruptedPods), e) + h.encMapstringv1_Time((map[string]pkg2_v1.Time)(x.DisruptedPods), e) } } } @@ -583,7 +583,7 @@ func (x *PodDisruptionBudgetStatus) codecDecodeSelfFromMap(l int, d *codec1978.D _ = yym48 if false { } else { - h.decMapstringunversioned_Time((*map[string]pkg2_unversioned.Time)(yyv47), d) + h.decMapstringv1_Time((*map[string]pkg2_v1.Time)(yyv47), d) } } case "disruptionsAllowed": @@ -659,7 +659,7 @@ func (x *PodDisruptionBudgetStatus) codecDecodeSelfFromArray(l int, d *codec1978 _ = yym56 if false { } else { - h.decMapstringunversioned_Time((*map[string]pkg2_unversioned.Time)(yyv55), d) + h.decMapstringv1_Time((*map[string]pkg2_v1.Time)(yyv55), d) } } yyj53++ @@ -1299,7 +1299,7 @@ func (x *PodDisruptionBudgetList) codecDecodeSelfFromMap(l int, d *codec1978.Dec } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv113 := &x.ListMeta yym114 := z.DecBinary() @@ -1380,7 +1380,7 @@ func (x *PodDisruptionBudgetList) codecDecodeSelfFromArray(l int, d *codec1978.D } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv120 := &x.ListMeta yym121 := z.DecBinary() @@ -1744,7 +1744,7 @@ func (x *Eviction) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } -func (x codecSelfer1234) encMapstringunversioned_Time(v map[string]pkg2_unversioned.Time, e *codec1978.Encoder) { +func (x codecSelfer1234) encMapstringv1_Time(v map[string]pkg2_v1.Time, e *codec1978.Encoder) { var h codecSelfer1234 z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r @@ -1774,7 +1774,7 @@ func (x codecSelfer1234) encMapstringunversioned_Time(v map[string]pkg2_unversio z.EncSendContainerState(codecSelfer_containerMapEnd1234) } -func (x codecSelfer1234) decMapstringunversioned_Time(v *map[string]pkg2_unversioned.Time, d *codec1978.Decoder) { +func (x codecSelfer1234) decMapstringv1_Time(v *map[string]pkg2_v1.Time, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r @@ -1784,11 +1784,11 @@ func (x codecSelfer1234) decMapstringunversioned_Time(v *map[string]pkg2_unversi yybh152 := z.DecBasicHandle() if yyv152 == nil { yyrl152, _ := z.DecInferLen(yyl152, yybh152.MaxInitLen, 40) - yyv152 = make(map[string]pkg2_unversioned.Time, yyrl152) + yyv152 = make(map[string]pkg2_v1.Time, yyrl152) *v = yyv152 } var yymk152 string - var yymv152 pkg2_unversioned.Time + var yymv152 pkg2_v1.Time var yymg152 bool if yybh152.MapValueReset { yymg152 = true @@ -1805,11 +1805,11 @@ func (x codecSelfer1234) decMapstringunversioned_Time(v *map[string]pkg2_unversi if yymg152 { yymv152 = yyv152[yymk152] } else { - yymv152 = pkg2_unversioned.Time{} + yymv152 = pkg2_v1.Time{} } z.DecSendContainerState(codecSelfer_containerMapValue1234) if r.TryDecodeAsNil() { - yymv152 = pkg2_unversioned.Time{} + yymv152 = pkg2_v1.Time{} } else { yyv154 := &yymv152 yym155 := z.DecBinary() @@ -1841,11 +1841,11 @@ func (x codecSelfer1234) decMapstringunversioned_Time(v *map[string]pkg2_unversi if yymg152 { yymv152 = yyv152[yymk152] } else { - yymv152 = pkg2_unversioned.Time{} + yymv152 = pkg2_v1.Time{} } z.DecSendContainerState(codecSelfer_containerMapValue1234) if r.TryDecodeAsNil() { - yymv152 = pkg2_unversioned.Time{} + yymv152 = pkg2_v1.Time{} } else { yyv157 := &yymv152 yym158 := z.DecBinary() diff --git a/pkg/apis/policy/types.go b/pkg/apis/policy/types.go index 02f3f75535c..535e744f97d 100644 --- a/pkg/apis/policy/types.go +++ b/pkg/apis/policy/types.go @@ -92,7 +92,7 @@ type PodDisruptionBudgetList struct { metav1.TypeMeta `json:",inline"` // +optional metav1.ListMeta `json:"metadata,omitempty"` - Items []PodDisruptionBudget `json:"items"` + Items []PodDisruptionBudget `json:"items"` } // +genclient=true diff --git a/pkg/apis/policy/v1alpha1/register.go b/pkg/apis/policy/v1alpha1/register.go index b898c9f3281..25d1462bdb4 100644 --- a/pkg/apis/policy/v1alpha1/register.go +++ b/pkg/apis/policy/v1alpha1/register.go @@ -17,8 +17,8 @@ limitations under the License. package v1alpha1 import ( - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" versionedwatch "k8s.io/kubernetes/pkg/watch/versioned" diff --git a/pkg/apis/policy/v1alpha1/types.go b/pkg/apis/policy/v1alpha1/types.go index 5c05d5610bb..d9cafe227d8 100644 --- a/pkg/apis/policy/v1alpha1/types.go +++ b/pkg/apis/policy/v1alpha1/types.go @@ -17,8 +17,8 @@ limitations under the License. package v1alpha1 import ( - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/util/intstr" ) @@ -74,7 +74,7 @@ type PodDisruptionBudgetList struct { metav1.TypeMeta `json:",inline"` // +optional metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` - Items []PodDisruptionBudget `json:"items" protobuf:"bytes,2,rep,name=items"` + Items []PodDisruptionBudget `json:"items" protobuf:"bytes,2,rep,name=items"` } // Eviction evicts a pod from its node subject to certain policies and safety constraints. diff --git a/pkg/apis/policy/v1beta1/generated.pb.go b/pkg/apis/policy/v1beta1/generated.pb.go index 1c33839feaf..5d1a716ce1e 100644 --- a/pkg/apis/policy/v1beta1/generated.pb.go +++ b/pkg/apis/policy/v1beta1/generated.pb.go @@ -37,8 +37,8 @@ import proto "github.com/gogo/protobuf/proto" import fmt "fmt" import math "math" -import k8s_io_kubernetes_pkg_api_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" import k8s_io_kubernetes_pkg_api_v1 "k8s.io/kubernetes/pkg/api/v1" +import k8s_io_kubernetes_pkg_apis_meta_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" import strings "strings" import reflect "reflect" @@ -429,7 +429,7 @@ func (this *PodDisruptionBudgetList) String() string { return "nil" } s := strings.Join([]string{`&PodDisruptionBudgetList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "PodDisruptionBudget", "PodDisruptionBudget", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -441,7 +441,7 @@ func (this *PodDisruptionBudgetSpec) String() string { } s := strings.Join([]string{`&PodDisruptionBudgetSpec{`, `MinAvailable:` + strings.Replace(strings.Replace(this.MinAvailable.String(), "IntOrString", "k8s_io_kubernetes_pkg_util_intstr.IntOrString", 1), `&`, ``, 1) + `,`, - `Selector:` + strings.Replace(fmt.Sprintf("%v", this.Selector), "LabelSelector", "k8s_io_kubernetes_pkg_api_unversioned.LabelSelector", 1) + `,`, + `Selector:` + strings.Replace(fmt.Sprintf("%v", this.Selector), "LabelSelector", "k8s_io_kubernetes_pkg_apis_meta_v1.LabelSelector", 1) + `,`, `}`, }, "") return s @@ -455,7 +455,7 @@ func (this *PodDisruptionBudgetStatus) String() string { keysForDisruptedPods = append(keysForDisruptedPods, k) } github_com_gogo_protobuf_sortkeys.Strings(keysForDisruptedPods) - mapStringForDisruptedPods := "map[string]k8s_io_kubernetes_pkg_api_unversioned.Time{" + mapStringForDisruptedPods := "map[string]k8s_io_kubernetes_pkg_apis_meta_v1.Time{" for _, k := range keysForDisruptedPods { mapStringForDisruptedPods += fmt.Sprintf("%v: %v,", k, this.DisruptedPods[k]) } @@ -929,7 +929,7 @@ func (m *PodDisruptionBudgetSpec) Unmarshal(data []byte) error { return io.ErrUnexpectedEOF } if m.Selector == nil { - m.Selector = &k8s_io_kubernetes_pkg_api_unversioned.LabelSelector{} + m.Selector = &k8s_io_kubernetes_pkg_apis_meta_v1.LabelSelector{} } if err := m.Selector.Unmarshal(data[iNdEx:postIndex]); err != nil { return err @@ -1110,13 +1110,13 @@ func (m *PodDisruptionBudgetStatus) Unmarshal(data []byte) error { if postmsgIndex > l { return io.ErrUnexpectedEOF } - mapvalue := &k8s_io_kubernetes_pkg_api_unversioned.Time{} + mapvalue := &k8s_io_kubernetes_pkg_apis_meta_v1.Time{} if err := mapvalue.Unmarshal(data[iNdEx:postmsgIndex]); err != nil { return err } iNdEx = postmsgIndex if m.DisruptedPods == nil { - m.DisruptedPods = make(map[string]k8s_io_kubernetes_pkg_api_unversioned.Time) + m.DisruptedPods = make(map[string]k8s_io_kubernetes_pkg_apis_meta_v1.Time) } m.DisruptedPods[mapkey] = *mapvalue iNdEx = postIndex @@ -1323,53 +1323,53 @@ var ( ) var fileDescriptorGenerated = []byte{ - // 764 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xb4, 0x94, 0x4d, 0x6f, 0xf3, 0x44, - 0x10, 0xc7, 0xe3, 0x26, 0x29, 0x61, 0x9b, 0x54, 0x65, 0xa1, 0x10, 0x22, 0xe1, 0xa2, 0x9c, 0x5a, - 0x41, 0xd7, 0x4a, 0x55, 0xa4, 0xc2, 0xa1, 0x52, 0x4d, 0x2a, 0x28, 0xa2, 0x4a, 0xe5, 0x22, 0x81, - 0x90, 0x40, 0xf2, 0xcb, 0xe0, 0x2c, 0xb1, 0xbd, 0xd6, 0xee, 0xda, 0x90, 0x1b, 0x1f, 0x81, 0x03, - 0xdf, 0x88, 0x4b, 0xc5, 0xa9, 0x47, 0x2e, 0x54, 0x34, 0xfd, 0x0e, 0x9c, 0x91, 0xed, 0x4d, 0x1a, - 0xe7, 0xa5, 0xaa, 0xd4, 0xe7, 0xb9, 0x79, 0x77, 0xe7, 0xf7, 0xff, 0xcf, 0xcc, 0xce, 0x1a, 0x7d, - 0x3a, 0x3a, 0x11, 0x84, 0x32, 0x63, 0x94, 0x38, 0xc0, 0x23, 0x90, 0x20, 0x8c, 0x78, 0xe4, 0x1b, - 0x76, 0x4c, 0x85, 0x11, 0xb3, 0x80, 0xba, 0x63, 0x23, 0xed, 0x39, 0x20, 0xed, 0x9e, 0xe1, 0x43, - 0x04, 0xdc, 0x96, 0xe0, 0x91, 0x98, 0x33, 0xc9, 0xf0, 0x41, 0x81, 0x92, 0x47, 0x94, 0xc4, 0x23, - 0x9f, 0x64, 0x28, 0x29, 0x50, 0xa2, 0xd0, 0xce, 0xa1, 0x4f, 0xe5, 0x30, 0x71, 0x88, 0xcb, 0x42, - 0xc3, 0x67, 0x3e, 0x33, 0x72, 0x05, 0x27, 0xf9, 0x29, 0x5f, 0xe5, 0x8b, 0xfc, 0xab, 0x50, 0xee, - 0x1c, 0xad, 0x4d, 0xca, 0xe0, 0x20, 0x58, 0xc2, 0x5d, 0x58, 0xcc, 0xa6, 0xf3, 0xc9, 0x7a, 0x26, - 0x89, 0x52, 0xe0, 0x82, 0xb2, 0x08, 0xbc, 0x25, 0xec, 0xe3, 0xf5, 0x58, 0xba, 0x54, 0x72, 0xe7, - 0x70, 0x75, 0x34, 0x4f, 0x22, 0x49, 0xc3, 0xe5, 0x9c, 0x8e, 0x9f, 0x0e, 0x17, 0xee, 0x10, 0x42, - 0x7b, 0x89, 0xea, 0xad, 0xa6, 0x12, 0x49, 0x03, 0x83, 0x46, 0x52, 0x48, 0xbe, 0x88, 0x74, 0xff, - 0xd2, 0x50, 0xe3, 0x3c, 0xa5, 0xae, 0xa4, 0x2c, 0xc2, 0xdf, 0xa1, 0x46, 0x08, 0xd2, 0xf6, 0x6c, - 0x69, 0xb7, 0xb5, 0x0f, 0xb5, 0xfd, 0xad, 0xa3, 0x7d, 0xb2, 0xf6, 0xaa, 0x48, 0xda, 0x23, 0x03, - 0xe7, 0x67, 0x70, 0xe5, 0x25, 0x48, 0xdb, 0xc4, 0x37, 0x77, 0x7b, 0x95, 0xc9, 0xdd, 0x1e, 0x7a, - 0xdc, 0xb3, 0x66, 0x6a, 0xd8, 0x43, 0x2d, 0x0f, 0x02, 0x90, 0x30, 0x88, 0x33, 0x27, 0xd1, 0xde, - 0xc8, 0xe5, 0x3f, 0x7a, 0x5a, 0xbe, 0x3f, 0x8f, 0x98, 0x6f, 0x4d, 0xee, 0xf6, 0x5a, 0xa5, 0x2d, - 0xab, 0x2c, 0xda, 0xfd, 0x73, 0x03, 0xbd, 0x7d, 0xc5, 0xbc, 0x3e, 0x15, 0x3c, 0xc9, 0xb7, 0xcc, - 0xc4, 0xf3, 0x41, 0xbe, 0xd6, 0xba, 0x6a, 0x22, 0x06, 0x57, 0x95, 0x63, 0x92, 0x67, 0x0f, 0x36, - 0x59, 0x91, 0xe7, 0x75, 0x0c, 0xae, 0xd9, 0x54, 0x7e, 0xb5, 0x6c, 0x65, 0xe5, 0xea, 0x38, 0x40, - 0x9b, 0x42, 0xda, 0x32, 0x11, 0xed, 0x6a, 0xee, 0xd3, 0x7f, 0xa1, 0x4f, 0xae, 0x65, 0x6e, 0x2b, - 0xa7, 0xcd, 0x62, 0x6d, 0x29, 0x8f, 0xee, 0x3f, 0x1a, 0x7a, 0x6f, 0x05, 0xf5, 0x35, 0x15, 0x12, - 0xff, 0xb0, 0xd4, 0x49, 0xe3, 0x89, 0x4e, 0xce, 0x3d, 0x1f, 0x92, 0xe1, 0x79, 0x43, 0x77, 0x94, - 0x6d, 0x63, 0xba, 0x33, 0xd7, 0x4e, 0x17, 0xd5, 0xa9, 0x84, 0x30, 0x1b, 0x8f, 0xea, 0xfe, 0xd6, - 0xd1, 0xe9, 0xcb, 0xea, 0x34, 0x5b, 0xca, 0xaa, 0x7e, 0x91, 0x89, 0x5a, 0x85, 0x76, 0xf7, 0x61, - 0x75, 0x7d, 0x59, 0xbf, 0xf1, 0x10, 0x35, 0x43, 0x1a, 0x9d, 0xa5, 0x36, 0x0d, 0x6c, 0x27, 0x00, - 0x55, 0x23, 0x59, 0x93, 0x47, 0xf6, 0xb0, 0x48, 0xf1, 0xb0, 0xc8, 0x45, 0x24, 0x07, 0xfc, 0x5a, - 0x72, 0x1a, 0xf9, 0xe6, 0x3b, 0xca, 0xb7, 0x79, 0x39, 0xa7, 0x65, 0x95, 0x94, 0xf1, 0x8f, 0xa8, - 0x21, 0x20, 0x00, 0x57, 0x32, 0xae, 0xa6, 0xe7, 0xf8, 0xb9, 0x9d, 0xb4, 0x1d, 0x08, 0xae, 0x15, - 0x6b, 0x36, 0xb3, 0x56, 0x4e, 0x57, 0xd6, 0x4c, 0xb3, 0xfb, 0x5f, 0x0d, 0xbd, 0xbf, 0xf6, 0xee, - 0xf1, 0x57, 0x08, 0x33, 0x47, 0x00, 0x4f, 0xc1, 0xfb, 0xa2, 0xf8, 0x23, 0x50, 0x16, 0xe5, 0xd5, - 0x56, 0xcd, 0x8e, 0xca, 0x1e, 0x0f, 0x96, 0x22, 0xac, 0x15, 0x14, 0xfe, 0x43, 0x43, 0x2d, 0xaf, - 0xb0, 0x01, 0xef, 0x8a, 0x79, 0xd3, 0xdb, 0xfb, 0xf6, 0x55, 0x4c, 0x29, 0xe9, 0xcf, 0x2b, 0x9f, - 0x47, 0x92, 0x8f, 0xcd, 0x5d, 0x95, 0x60, 0xab, 0x74, 0x66, 0x95, 0x93, 0xc0, 0x97, 0x08, 0x7b, - 0x33, 0x49, 0x71, 0x16, 0x04, 0xec, 0x17, 0xf0, 0xf2, 0x07, 0x54, 0x37, 0x3f, 0x50, 0x0a, 0xbb, - 0x25, 0xdf, 0x69, 0x90, 0xb5, 0x02, 0xc4, 0xa7, 0x68, 0xdb, 0x4d, 0x38, 0x87, 0x48, 0x7e, 0x09, - 0x76, 0x20, 0x87, 0xe3, 0x76, 0x2d, 0x97, 0x7a, 0x57, 0x49, 0x6d, 0x7f, 0x5e, 0x3a, 0xb5, 0x16, - 0xa2, 0x33, 0xde, 0x03, 0x41, 0x39, 0x78, 0x53, 0xbe, 0x5e, 0xe6, 0xfb, 0xa5, 0x53, 0x6b, 0x21, - 0x1a, 0x9f, 0xa0, 0x26, 0xfc, 0x1a, 0x83, 0x3b, 0xed, 0xf1, 0x66, 0x4e, 0xcf, 0x26, 0xed, 0x7c, - 0xee, 0xcc, 0x2a, 0x45, 0x76, 0x42, 0x84, 0x97, 0x9b, 0x88, 0x77, 0x50, 0x75, 0x04, 0xe3, 0xfc, - 0xca, 0xdf, 0xb4, 0xb2, 0x4f, 0x7c, 0x86, 0xea, 0xa9, 0x1d, 0x24, 0xf0, 0x8c, 0x7f, 0xf3, 0xfc, - 0x38, 0x7e, 0x43, 0x43, 0xb0, 0x0a, 0xf2, 0xb3, 0x8d, 0x13, 0xcd, 0x3c, 0xb8, 0xb9, 0xd7, 0x2b, - 0xb7, 0xf7, 0x7a, 0xe5, 0xef, 0x7b, 0xbd, 0xf2, 0xdb, 0x44, 0xd7, 0x6e, 0x26, 0xba, 0x76, 0x3b, - 0xd1, 0xb5, 0x7f, 0x27, 0xba, 0xf6, 0xfb, 0x83, 0x5e, 0xf9, 0xfe, 0x0d, 0x75, 0xeb, 0xff, 0x07, - 0x00, 0x00, 0xff, 0xff, 0x5e, 0x98, 0x33, 0x48, 0x43, 0x08, 0x00, 0x00, + // 762 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xb4, 0x94, 0xcf, 0x6e, 0xdb, 0x46, + 0x10, 0xc6, 0x45, 0x4b, 0x72, 0xd5, 0xb5, 0x64, 0xb8, 0xdb, 0xba, 0x55, 0x05, 0x94, 0x2e, 0x74, + 0x92, 0x51, 0x7b, 0x09, 0x19, 0x3d, 0xb8, 0x3d, 0x18, 0x30, 0x2b, 0xa3, 0x75, 0x51, 0x43, 0x06, + 0x5d, 0xa0, 0x85, 0x7b, 0xe2, 0x9f, 0x29, 0xb5, 0x16, 0x45, 0x12, 0xbb, 0x4b, 0x25, 0xba, 0xe5, + 0x11, 0x72, 0xc8, 0x1b, 0xe5, 0x62, 0xe4, 0xe4, 0x63, 0x90, 0x83, 0x61, 0x2b, 0x8f, 0x90, 0x17, + 0x08, 0x48, 0xae, 0x64, 0x51, 0xa2, 0x04, 0x03, 0x4e, 0x6e, 0xdc, 0xdd, 0xf9, 0x7d, 0xdf, 0xcc, + 0xec, 0x2c, 0xd1, 0x2f, 0xfd, 0x43, 0x4e, 0x68, 0xa0, 0xf5, 0x23, 0x0b, 0x98, 0x0f, 0x02, 0xb8, + 0x16, 0xf6, 0x5d, 0xcd, 0x0c, 0x29, 0xd7, 0xc2, 0xc0, 0xa3, 0xf6, 0x48, 0x1b, 0xb6, 0x2d, 0x10, + 0x66, 0x5b, 0x73, 0xc1, 0x07, 0x66, 0x0a, 0x70, 0x48, 0xc8, 0x02, 0x11, 0xe0, 0xdd, 0x14, 0x25, + 0x0f, 0x28, 0x09, 0xfb, 0x2e, 0x89, 0x51, 0x92, 0xa2, 0x44, 0xa2, 0x8d, 0x7d, 0x97, 0x8a, 0x5e, + 0x64, 0x11, 0x3b, 0x18, 0x68, 0x6e, 0xe0, 0x06, 0x5a, 0xa2, 0x60, 0x45, 0xff, 0x27, 0xab, 0x64, + 0x91, 0x7c, 0xa5, 0xca, 0x8d, 0x83, 0xa5, 0x49, 0x69, 0x0c, 0x78, 0x10, 0x31, 0x1b, 0xe6, 0xb3, + 0x69, 0xec, 0x2d, 0x67, 0x86, 0x0b, 0xb9, 0xaf, 0x70, 0xe0, 0xda, 0x00, 0x84, 0x99, 0xc7, 0xec, + 0xe7, 0x33, 0x2c, 0xf2, 0x05, 0x1d, 0x2c, 0x26, 0xf4, 0xf3, 0xea, 0x70, 0x6e, 0xf7, 0x60, 0x60, + 0x2e, 0x50, 0xed, 0x7c, 0x2a, 0x12, 0xd4, 0xd3, 0xa8, 0x2f, 0xb8, 0x60, 0xf3, 0x48, 0xf3, 0x8d, + 0x82, 0x2a, 0x27, 0x43, 0x6a, 0x0b, 0x1a, 0xf8, 0xf8, 0x5f, 0x54, 0x89, 0xf3, 0x77, 0x4c, 0x61, + 0xd6, 0x95, 0x1f, 0x95, 0xd6, 0xc6, 0x41, 0x8b, 0x2c, 0xbd, 0x27, 0x32, 0x6c, 0x93, 0xae, 0x75, + 0x05, 0xb6, 0x38, 0x03, 0x61, 0xea, 0xf8, 0xfa, 0x76, 0xa7, 0x30, 0xbe, 0xdd, 0x41, 0x0f, 0x7b, + 0xc6, 0x54, 0x0d, 0x3b, 0xa8, 0xe6, 0x80, 0x07, 0x02, 0xba, 0x61, 0xec, 0xc4, 0xeb, 0x6b, 0x89, + 0xfc, 0x4f, 0xab, 0xe5, 0x3b, 0xb3, 0x88, 0xfe, 0xd5, 0xf8, 0x76, 0xa7, 0x96, 0xd9, 0x32, 0xb2, + 0xa2, 0xcd, 0xd7, 0x6b, 0xe8, 0xeb, 0xf3, 0xc0, 0xe9, 0x50, 0xce, 0xa2, 0x64, 0x4b, 0x8f, 0x1c, + 0x17, 0xc4, 0x67, 0xad, 0xab, 0xc4, 0x43, 0xb0, 0x65, 0x39, 0x3a, 0x79, 0xf4, 0x54, 0x93, 0x9c, + 0x3c, 0x2f, 0x42, 0xb0, 0xf5, 0xaa, 0xf4, 0x2b, 0xc5, 0x2b, 0x23, 0x51, 0xc7, 0x1e, 0x5a, 0xe7, + 0xc2, 0x14, 0x11, 0xaf, 0x17, 0x13, 0x9f, 0xce, 0x13, 0x7d, 0x12, 0x2d, 0x7d, 0x53, 0x3a, 0xad, + 0xa7, 0x6b, 0x43, 0x7a, 0x34, 0xdf, 0x29, 0xe8, 0xbb, 0x1c, 0xea, 0x2f, 0xca, 0x05, 0xbe, 0x5c, + 0xe8, 0xe4, 0xde, 0xaa, 0x5c, 0xe2, 0xd8, 0xb8, 0x9f, 0x31, 0x9b, 0x74, 0x73, 0x4b, 0x7a, 0x56, + 0x26, 0x3b, 0x33, 0xbd, 0xb4, 0x51, 0x99, 0x0a, 0x18, 0xc4, 0xb3, 0x51, 0x6c, 0x6d, 0x1c, 0x1c, + 0x3d, 0xad, 0x48, 0xbd, 0x26, 0xad, 0xca, 0xa7, 0xb1, 0xa8, 0x91, 0x6a, 0x37, 0xef, 0xf2, 0x8b, + 0x8b, 0x9b, 0x8d, 0x7b, 0xa8, 0x3a, 0xa0, 0xfe, 0xf1, 0xd0, 0xa4, 0x9e, 0x69, 0x79, 0x20, 0x0b, + 0x24, 0x4b, 0xf2, 0x88, 0x5f, 0x15, 0x49, 0x5f, 0x15, 0x39, 0xf5, 0x45, 0x97, 0x5d, 0x08, 0x46, + 0x7d, 0x57, 0xff, 0x46, 0xfa, 0x56, 0xcf, 0x66, 0xb4, 0x8c, 0x8c, 0x32, 0xfe, 0x0f, 0x55, 0x38, + 0x78, 0x60, 0x8b, 0x80, 0xc9, 0xd1, 0x69, 0x3f, 0xaa, 0x8d, 0xa6, 0x05, 0xde, 0x85, 0x04, 0xf5, + 0x6a, 0xdc, 0xc7, 0xc9, 0xca, 0x98, 0x0a, 0x36, 0x3f, 0x94, 0xd0, 0xf7, 0x4b, 0x6f, 0x1d, 0xff, + 0x89, 0x70, 0x60, 0x71, 0x60, 0x43, 0x70, 0x7e, 0x4f, 0xff, 0x05, 0x34, 0xf0, 0x93, 0x52, 0x8b, + 0x7a, 0x43, 0xa6, 0x8e, 0xbb, 0x0b, 0x11, 0x46, 0x0e, 0x85, 0x5f, 0x29, 0xa8, 0xe6, 0xa4, 0x36, + 0xe0, 0x9c, 0x07, 0xce, 0xe4, 0xea, 0xfe, 0xf9, 0x14, 0xf3, 0x49, 0x3a, 0xb3, 0xca, 0x27, 0xbe, + 0x60, 0x23, 0x7d, 0x5b, 0x26, 0x58, 0xcb, 0x9c, 0x19, 0xd9, 0x24, 0xf0, 0x19, 0xc2, 0xce, 0x54, + 0x92, 0x1f, 0x7b, 0x5e, 0xf0, 0x0c, 0x9c, 0xe4, 0xe9, 0x94, 0xf5, 0x1f, 0xa4, 0xc2, 0x76, 0xc6, + 0x77, 0x12, 0x64, 0xe4, 0x80, 0xf8, 0x08, 0x6d, 0xda, 0x11, 0x63, 0xe0, 0x8b, 0x3f, 0xc0, 0xf4, + 0x44, 0x6f, 0x54, 0x2f, 0x25, 0x52, 0xdf, 0x4a, 0xa9, 0xcd, 0xdf, 0x32, 0xa7, 0xc6, 0x5c, 0x74, + 0xcc, 0x3b, 0xc0, 0x29, 0x03, 0x67, 0xc2, 0x97, 0xb3, 0x7c, 0x27, 0x73, 0x6a, 0xcc, 0x45, 0xe3, + 0x43, 0x54, 0x85, 0xe7, 0x21, 0xd8, 0x93, 0x1e, 0xaf, 0x27, 0xf4, 0x74, 0xcc, 0x4e, 0x66, 0xce, + 0x8c, 0x4c, 0x64, 0xe3, 0x0a, 0xe1, 0xc5, 0x26, 0xe2, 0x2d, 0x54, 0xec, 0xc3, 0x28, 0xb9, 0xf2, + 0x2f, 0x8d, 0xf8, 0x13, 0x1f, 0xa1, 0xf2, 0xd0, 0xf4, 0x22, 0x90, 0xb3, 0xd8, 0x7a, 0xcc, 0x2c, + 0xfe, 0x4d, 0x07, 0x60, 0xa4, 0xd8, 0xaf, 0x6b, 0x87, 0x8a, 0xbe, 0x7b, 0x7d, 0xaf, 0x16, 0x6e, + 0xee, 0xd5, 0xc2, 0xdb, 0x7b, 0xb5, 0xf0, 0x62, 0xac, 0x2a, 0xd7, 0x63, 0x55, 0xb9, 0x19, 0xab, + 0xca, 0xdd, 0x58, 0x55, 0x5e, 0xbe, 0x57, 0x0b, 0x97, 0x5f, 0xc8, 0x2b, 0xff, 0x18, 0x00, 0x00, + 0xff, 0xff, 0xfa, 0x95, 0xd6, 0xdd, 0x37, 0x08, 0x00, 0x00, } diff --git a/pkg/apis/policy/v1beta1/generated.proto b/pkg/apis/policy/v1beta1/generated.proto index 560850ea4cc..c274ee4f776 100644 --- a/pkg/apis/policy/v1beta1/generated.proto +++ b/pkg/apis/policy/v1beta1/generated.proto @@ -22,8 +22,8 @@ syntax = 'proto2'; package k8s.io.kubernetes.pkg.apis.policy.v1beta1; import "k8s.io/kubernetes/pkg/api/resource/generated.proto"; -import "k8s.io/kubernetes/pkg/api/unversioned/generated.proto"; import "k8s.io/kubernetes/pkg/api/v1/generated.proto"; +import "k8s.io/kubernetes/pkg/apis/meta/v1/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/schema/generated.proto"; import "k8s.io/kubernetes/pkg/util/intstr/generated.proto"; @@ -55,7 +55,7 @@ message PodDisruptionBudget { // PodDisruptionBudgetList is a collection of PodDisruptionBudgets. message PodDisruptionBudgetList { - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; repeated PodDisruptionBudget items = 2; } @@ -70,7 +70,7 @@ message PodDisruptionBudgetSpec { // Label query over pods whose evictions are managed by the disruption // budget. - optional k8s.io.kubernetes.pkg.api.unversioned.LabelSelector selector = 2; + optional k8s.io.kubernetes.pkg.apis.meta.v1.LabelSelector selector = 2; } // PodDisruptionBudgetStatus represents information about the status of a @@ -92,7 +92,7 @@ message PodDisruptionBudgetStatus { // the list automatically by PodDisruptionBudget controller after some time. // If everything goes smooth this map should be empty for the most of the time. // Large number of entries in the map may indicate problems with pod deletions. - map disruptedPods = 2; + map disruptedPods = 2; // Number of pod disruptions that are currently allowed. optional int32 disruptionsAllowed = 3; diff --git a/pkg/apis/policy/v1beta1/register.go b/pkg/apis/policy/v1beta1/register.go index af7cbfd4ffd..f36029170aa 100644 --- a/pkg/apis/policy/v1beta1/register.go +++ b/pkg/apis/policy/v1beta1/register.go @@ -17,8 +17,8 @@ limitations under the License. package v1beta1 import ( - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" versionedwatch "k8s.io/kubernetes/pkg/watch/versioned" diff --git a/pkg/apis/policy/v1beta1/types.generated.go b/pkg/apis/policy/v1beta1/types.generated.go index c5355112ffd..8044367f614 100644 --- a/pkg/apis/policy/v1beta1/types.generated.go +++ b/pkg/apis/policy/v1beta1/types.generated.go @@ -25,8 +25,8 @@ import ( "errors" "fmt" codec1978 "github.com/ugorji/go/codec" - pkg2_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" pkg3_v1 "k8s.io/kubernetes/pkg/api/v1" + pkg2_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" pkg4_types "k8s.io/kubernetes/pkg/types" pkg1_intstr "k8s.io/kubernetes/pkg/util/intstr" "reflect" @@ -64,8 +64,8 @@ func init() { panic(err) } if false { // reference the types, but skip this branch at build/run time - var v0 pkg2_unversioned.LabelSelector - var v1 pkg3_v1.ObjectMeta + var v0 pkg3_v1.ObjectMeta + var v1 pkg2_v1.LabelSelector var v2 pkg4_types.UID var v3 pkg1_intstr.IntOrString var v4 time.Time @@ -256,7 +256,7 @@ func (x *PodDisruptionBudgetSpec) codecDecodeSelfFromMap(l int, d *codec1978.Dec } } else { if x.Selector == nil { - x.Selector = new(pkg2_unversioned.LabelSelector) + x.Selector = new(pkg2_v1.LabelSelector) } yym17 := z.DecBinary() _ = yym17 @@ -322,7 +322,7 @@ func (x *PodDisruptionBudgetSpec) codecDecodeSelfFromArray(l int, d *codec1978.D } } else { if x.Selector == nil { - x.Selector = new(pkg2_unversioned.LabelSelector) + x.Selector = new(pkg2_v1.LabelSelector) } yym22 := z.DecBinary() _ = yym22 @@ -413,7 +413,7 @@ func (x *PodDisruptionBudgetStatus) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym29 if false { } else { - h.encMapstringunversioned_Time((map[string]pkg2_unversioned.Time)(x.DisruptedPods), e) + h.encMapstringv1_Time((map[string]pkg2_v1.Time)(x.DisruptedPods), e) } } } else { @@ -427,7 +427,7 @@ func (x *PodDisruptionBudgetStatus) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym30 if false { } else { - h.encMapstringunversioned_Time((map[string]pkg2_unversioned.Time)(x.DisruptedPods), e) + h.encMapstringv1_Time((map[string]pkg2_v1.Time)(x.DisruptedPods), e) } } } @@ -583,7 +583,7 @@ func (x *PodDisruptionBudgetStatus) codecDecodeSelfFromMap(l int, d *codec1978.D _ = yym48 if false { } else { - h.decMapstringunversioned_Time((*map[string]pkg2_unversioned.Time)(yyv47), d) + h.decMapstringv1_Time((*map[string]pkg2_v1.Time)(yyv47), d) } } case "disruptionsAllowed": @@ -659,7 +659,7 @@ func (x *PodDisruptionBudgetStatus) codecDecodeSelfFromArray(l int, d *codec1978 _ = yym56 if false { } else { - h.decMapstringunversioned_Time((*map[string]pkg2_unversioned.Time)(yyv55), d) + h.decMapstringv1_Time((*map[string]pkg2_v1.Time)(yyv55), d) } } yyj53++ @@ -1299,7 +1299,7 @@ func (x *PodDisruptionBudgetList) codecDecodeSelfFromMap(l int, d *codec1978.Dec } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv113 := &x.ListMeta yym114 := z.DecBinary() @@ -1380,7 +1380,7 @@ func (x *PodDisruptionBudgetList) codecDecodeSelfFromArray(l int, d *codec1978.D } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv120 := &x.ListMeta yym121 := z.DecBinary() @@ -1744,7 +1744,7 @@ func (x *Eviction) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } -func (x codecSelfer1234) encMapstringunversioned_Time(v map[string]pkg2_unversioned.Time, e *codec1978.Encoder) { +func (x codecSelfer1234) encMapstringv1_Time(v map[string]pkg2_v1.Time, e *codec1978.Encoder) { var h codecSelfer1234 z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r @@ -1774,7 +1774,7 @@ func (x codecSelfer1234) encMapstringunversioned_Time(v map[string]pkg2_unversio z.EncSendContainerState(codecSelfer_containerMapEnd1234) } -func (x codecSelfer1234) decMapstringunversioned_Time(v *map[string]pkg2_unversioned.Time, d *codec1978.Decoder) { +func (x codecSelfer1234) decMapstringv1_Time(v *map[string]pkg2_v1.Time, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r @@ -1784,11 +1784,11 @@ func (x codecSelfer1234) decMapstringunversioned_Time(v *map[string]pkg2_unversi yybh152 := z.DecBasicHandle() if yyv152 == nil { yyrl152, _ := z.DecInferLen(yyl152, yybh152.MaxInitLen, 40) - yyv152 = make(map[string]pkg2_unversioned.Time, yyrl152) + yyv152 = make(map[string]pkg2_v1.Time, yyrl152) *v = yyv152 } var yymk152 string - var yymv152 pkg2_unversioned.Time + var yymv152 pkg2_v1.Time var yymg152 bool if yybh152.MapValueReset { yymg152 = true @@ -1805,11 +1805,11 @@ func (x codecSelfer1234) decMapstringunversioned_Time(v *map[string]pkg2_unversi if yymg152 { yymv152 = yyv152[yymk152] } else { - yymv152 = pkg2_unversioned.Time{} + yymv152 = pkg2_v1.Time{} } z.DecSendContainerState(codecSelfer_containerMapValue1234) if r.TryDecodeAsNil() { - yymv152 = pkg2_unversioned.Time{} + yymv152 = pkg2_v1.Time{} } else { yyv154 := &yymv152 yym155 := z.DecBinary() @@ -1841,11 +1841,11 @@ func (x codecSelfer1234) decMapstringunversioned_Time(v *map[string]pkg2_unversi if yymg152 { yymv152 = yyv152[yymk152] } else { - yymv152 = pkg2_unversioned.Time{} + yymv152 = pkg2_v1.Time{} } z.DecSendContainerState(codecSelfer_containerMapValue1234) if r.TryDecodeAsNil() { - yymv152 = pkg2_unversioned.Time{} + yymv152 = pkg2_v1.Time{} } else { yyv157 := &yymv152 yym158 := z.DecBinary() diff --git a/pkg/apis/policy/v1beta1/types.go b/pkg/apis/policy/v1beta1/types.go index 5a8eda46b4c..99409203943 100644 --- a/pkg/apis/policy/v1beta1/types.go +++ b/pkg/apis/policy/v1beta1/types.go @@ -17,8 +17,8 @@ limitations under the License. package v1beta1 import ( - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/util/intstr" ) @@ -74,7 +74,7 @@ type PodDisruptionBudgetStatus struct { // PodDisruptionBudget is an object to define the max disruption that can be caused to a collection of pods type PodDisruptionBudget struct { metav1.TypeMeta `json:",inline"` - v1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` + v1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` // Specification of the desired behavior of the PodDisruptionBudget. Spec PodDisruptionBudgetSpec `json:"spec,omitempty" protobuf:"bytes,2,opt,name=spec"` @@ -86,7 +86,7 @@ type PodDisruptionBudget struct { type PodDisruptionBudgetList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` - Items []PodDisruptionBudget `json:"items" protobuf:"bytes,2,rep,name=items"` + Items []PodDisruptionBudget `json:"items" protobuf:"bytes,2,rep,name=items"` } // Eviction evicts a pod from its node subject to certain policies and safety constraints. diff --git a/pkg/apis/policy/validation/validation.go b/pkg/apis/policy/validation/validation.go index cfc073a52e1..aed4af6a923 100644 --- a/pkg/apis/policy/validation/validation.go +++ b/pkg/apis/policy/validation/validation.go @@ -19,9 +19,9 @@ package validation import ( "reflect" - unversionedvalidation "k8s.io/kubernetes/pkg/apis/meta/v1/validation" apivalidation "k8s.io/kubernetes/pkg/api/validation" extensionsvalidation "k8s.io/kubernetes/pkg/apis/extensions/validation" + unversionedvalidation "k8s.io/kubernetes/pkg/apis/meta/v1/validation" "k8s.io/kubernetes/pkg/apis/policy" "k8s.io/kubernetes/pkg/util/validation/field" ) diff --git a/pkg/apis/rbac/v1alpha1/generated.pb.go b/pkg/apis/rbac/v1alpha1/generated.pb.go index ca02dda62ea..af85840b293 100644 --- a/pkg/apis/rbac/v1alpha1/generated.pb.go +++ b/pkg/apis/rbac/v1alpha1/generated.pb.go @@ -939,7 +939,7 @@ func (this *ClusterRoleBindingList) String() string { return "nil" } s := strings.Join([]string{`&ClusterRoleBindingList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "ClusterRoleBinding", "ClusterRoleBinding", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -950,7 +950,7 @@ func (this *ClusterRoleList) String() string { return "nil" } s := strings.Join([]string{`&ClusterRoleList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "ClusterRole", "ClusterRole", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -1009,7 +1009,7 @@ func (this *RoleBindingList) String() string { return "nil" } s := strings.Join([]string{`&RoleBindingList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "RoleBinding", "RoleBinding", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -1020,7 +1020,7 @@ func (this *RoleList) String() string { return "nil" } s := strings.Join([]string{`&RoleList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "Role", "Role", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -2801,61 +2801,60 @@ var ( ) var fileDescriptorGenerated = []byte{ - // 886 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xec, 0x55, 0xcf, 0x6f, 0x1b, 0x45, - 0x14, 0xf6, 0xc4, 0x36, 0xb1, 0x5f, 0x88, 0x42, 0x06, 0x15, 0x2d, 0x96, 0xb0, 0x23, 0x9f, 0x2c, - 0xda, 0xee, 0xca, 0x51, 0x2b, 0x7a, 0x80, 0x43, 0x16, 0x21, 0x14, 0x51, 0x42, 0x34, 0x15, 0x15, - 0x54, 0x20, 0x34, 0x5e, 0x4f, 0x9d, 0xc1, 0xeb, 0xdd, 0xd5, 0xcc, 0xac, 0x01, 0x21, 0xa4, 0x8a, - 0x13, 0x47, 0xfe, 0x8a, 0xde, 0xb8, 0x70, 0x45, 0xe2, 0xc0, 0x29, 0x07, 0x0e, 0x3d, 0x22, 0x0e, - 0x16, 0x31, 0xff, 0x08, 0xda, 0xdd, 0xd9, 0x1f, 0xc9, 0xae, 0x5b, 0x37, 0x88, 0x48, 0x48, 0x3d, - 0xd9, 0xfb, 0xde, 0xf7, 0x7d, 0xf3, 0xbe, 0x79, 0x33, 0x6f, 0xe0, 0xce, 0xf4, 0x8e, 0x34, 0xb9, - 0x6f, 0x4d, 0xc3, 0x11, 0x13, 0x1e, 0x53, 0x4c, 0x5a, 0xc1, 0x74, 0x62, 0xd1, 0x80, 0x4b, 0x4b, - 0x8c, 0xa8, 0x63, 0xcd, 0x87, 0xd4, 0x0d, 0x4e, 0xe8, 0xd0, 0x9a, 0x30, 0x8f, 0x09, 0xaa, 0xd8, - 0xd8, 0x0c, 0x84, 0xaf, 0x7c, 0x3c, 0x48, 0x98, 0x66, 0xce, 0x34, 0x83, 0xe9, 0xc4, 0x8c, 0x98, - 0x66, 0xc4, 0x34, 0x53, 0x66, 0xe7, 0xe6, 0x84, 0xab, 0x93, 0x70, 0x64, 0x3a, 0xfe, 0xcc, 0x9a, - 0xf8, 0x13, 0xdf, 0x8a, 0x05, 0x46, 0xe1, 0xc3, 0xf8, 0x2b, 0xfe, 0x88, 0xff, 0x25, 0xc2, 0x9d, - 0xfd, 0x95, 0x25, 0x59, 0x82, 0x49, 0x3f, 0x14, 0x0e, 0xbb, 0x58, 0x4c, 0xe7, 0xf6, 0x6a, 0x4e, - 0xe8, 0xcd, 0x99, 0x90, 0xdc, 0xf7, 0xd8, 0xb8, 0x44, 0xbb, 0xb1, 0x9a, 0x36, 0x2f, 0x39, 0xee, - 0xdc, 0xac, 0x46, 0x8b, 0xd0, 0x53, 0x7c, 0x56, 0xae, 0xe9, 0xd6, 0xd3, 0xe1, 0xd2, 0x39, 0x61, - 0x33, 0x5a, 0x62, 0x0d, 0xab, 0x59, 0xa1, 0xe2, 0xae, 0xc5, 0x3d, 0x25, 0x95, 0xb8, 0x48, 0xe9, - 0xff, 0x86, 0x60, 0xeb, 0x5d, 0x37, 0x94, 0x8a, 0x09, 0xe2, 0xbb, 0x0c, 0x7f, 0x02, 0xad, 0x19, - 0x53, 0x74, 0x4c, 0x15, 0x35, 0xd0, 0x1e, 0x1a, 0x6c, 0xed, 0x0f, 0xcc, 0x95, 0xcd, 0x32, 0xe7, - 0x43, 0xf3, 0xa3, 0xd1, 0x97, 0xcc, 0x51, 0x1f, 0x32, 0x45, 0x6d, 0x7c, 0xba, 0xe8, 0xd5, 0x96, - 0x8b, 0x1e, 0xe4, 0x31, 0x92, 0xa9, 0xe1, 0x4f, 0xa1, 0x29, 0x42, 0x97, 0x49, 0x63, 0x63, 0xaf, - 0x3e, 0xd8, 0xda, 0xbf, 0x65, 0xae, 0x7b, 0x06, 0xcc, 0x63, 0xdf, 0xe5, 0xce, 0x37, 0x24, 0x74, - 0x99, 0xbd, 0xad, 0x97, 0x68, 0x46, 0x5f, 0x92, 0x24, 0x8a, 0xfd, 0x9f, 0x36, 0x00, 0x17, 0x4c, - 0xd8, 0xdc, 0x1b, 0x73, 0x6f, 0xf2, 0x1f, 0x7a, 0xf9, 0x02, 0x5a, 0x32, 0x8c, 0x13, 0xa9, 0x9d, - 0xe1, 0xfa, 0x76, 0xee, 0x25, 0x4c, 0xfb, 0x15, 0xbd, 0x44, 0x4b, 0x07, 0x24, 0xc9, 0x44, 0xf1, - 0x67, 0xb0, 0x29, 0x7c, 0x97, 0x11, 0xf6, 0xd0, 0xa8, 0xc7, 0x95, 0x3f, 0x87, 0x3e, 0x49, 0x88, - 0xf6, 0x8e, 0xd6, 0xdf, 0xd4, 0x01, 0x92, 0x4a, 0xf6, 0x1f, 0x23, 0x78, 0xbd, 0xbc, 0x5f, 0x76, - 0xc8, 0xdd, 0x31, 0x13, 0xf8, 0x07, 0x04, 0xd8, 0x29, 0x65, 0xf5, 0x0e, 0xbe, 0xbd, 0x7e, 0x1d, - 0x15, 0x2b, 0x74, 0x74, 0x49, 0x15, 0xdd, 0x22, 0x15, 0x6b, 0xf6, 0xff, 0x44, 0xf0, 0x5a, 0x19, - 0x7a, 0x97, 0x4b, 0x85, 0x3f, 0x2f, 0x35, 0xd7, 0x7a, 0x4a, 0x73, 0x0b, 0x17, 0xd9, 0x8c, 0xe8, - 0x71, 0x8f, 0xb3, 0x06, 0xa4, 0x91, 0x42, 0x87, 0x29, 0x34, 0xb9, 0x62, 0xb3, 0xb4, 0xbd, 0xff, - 0xce, 0x76, 0x76, 0x6a, 0x0f, 0x23, 0x49, 0x92, 0x28, 0xf7, 0x7f, 0x47, 0xb0, 0x53, 0x00, 0x5f, - 0x85, 0xab, 0x07, 0xe7, 0x5d, 0xdd, 0xbe, 0x9c, 0xab, 0x6a, 0x3b, 0xdf, 0xd7, 0x01, 0xf2, 0x9b, - 0x8a, 0x7b, 0xd0, 0x9c, 0x33, 0x31, 0x92, 0x06, 0xda, 0xab, 0x0f, 0xda, 0x76, 0x3b, 0xc2, 0xdf, - 0x8f, 0x02, 0x24, 0x89, 0xe3, 0x47, 0x08, 0xae, 0x51, 0xa5, 0x04, 0x1f, 0x85, 0x8a, 0x11, 0x26, - 0x95, 0xe0, 0x8e, 0xe2, 0xbe, 0x17, 0x15, 0x17, 0x19, 0xbf, 0xbe, 0xa2, 0x38, 0x3d, 0x03, 0x4d, - 0x42, 0xbf, 0x7a, 0xef, 0x6b, 0xc5, 0xbc, 0xc8, 0xbf, 0xfd, 0x86, 0x2e, 0xe9, 0xda, 0x41, 0x95, - 0x22, 0xa9, 0x5e, 0x08, 0x5f, 0x87, 0x36, 0x0d, 0xf8, 0xfb, 0xc2, 0x0f, 0x03, 0x69, 0xd4, 0xe3, - 0x3a, 0xb7, 0x97, 0x8b, 0x5e, 0xfb, 0xe0, 0xf8, 0x30, 0x09, 0x92, 0x3c, 0x1f, 0x81, 0xd3, 0x27, - 0x44, 0x1a, 0x8d, 0x1c, 0x4c, 0xd2, 0x20, 0xc9, 0xf3, 0xf8, 0x2d, 0xd8, 0x4e, 0x3f, 0x8e, 0xe8, - 0x8c, 0x49, 0xa3, 0x19, 0x13, 0x76, 0x97, 0x8b, 0xde, 0x36, 0x29, 0x26, 0xc8, 0x79, 0x1c, 0x7e, - 0x07, 0x76, 0x3c, 0xdf, 0x4b, 0x21, 0x1f, 0x93, 0xbb, 0xd2, 0x78, 0x29, 0xa6, 0xbe, 0xba, 0x5c, - 0xf4, 0x76, 0x8e, 0xce, 0xa7, 0xc8, 0x45, 0x6c, 0xff, 0x3b, 0xd8, 0x2d, 0x4c, 0x4b, 0x7d, 0xa1, - 0x4f, 0x00, 0x82, 0x2c, 0xa8, 0x8f, 0xd5, 0xe5, 0xc6, 0x6f, 0x36, 0x15, 0xf3, 0x18, 0x29, 0x68, - 0xf7, 0x7f, 0x41, 0xd0, 0xf8, 0xff, 0x3e, 0x23, 0x8f, 0x37, 0x60, 0xeb, 0xc5, 0xfb, 0xb1, 0xc6, - 0xfb, 0x11, 0x4d, 0xae, 0x2b, 0x9e, 0xc7, 0x97, 0x9f, 0x5c, 0xcf, 0x1e, 0xc4, 0xbf, 0x22, 0x68, - 0x5d, 0xd5, 0x04, 0xbe, 0x77, 0xde, 0x87, 0xf9, 0x9c, 0x3e, 0xaa, 0x0d, 0x7c, 0x0b, 0x69, 0x8f, - 0xf0, 0x0d, 0x68, 0xa5, 0x23, 0x2b, 0x2e, 0xbf, 0x9d, 0x57, 0x93, 0x4e, 0x35, 0x92, 0x21, 0xf0, - 0x1e, 0x34, 0xa6, 0xdc, 0x1b, 0xc7, 0x13, 0xb7, 0x6d, 0xbf, 0xac, 0x91, 0x8d, 0x0f, 0xb8, 0x37, - 0x26, 0x71, 0x26, 0x42, 0x78, 0x74, 0xc6, 0xe2, 0x53, 0x54, 0x40, 0x44, 0xc3, 0x8a, 0xc4, 0x99, - 0xfe, 0xcf, 0x08, 0x36, 0xf5, 0x09, 0xcc, 0xf4, 0xd0, 0x4a, 0xbd, 0x7d, 0x00, 0x1a, 0xf0, 0xfb, - 0xc9, 0xa6, 0xe9, 0x75, 0xb3, 0xbb, 0x72, 0x70, 0x7c, 0xa8, 0x33, 0xa4, 0x80, 0x7a, 0x76, 0x0d, - 0xd8, 0x82, 0x76, 0xf4, 0x2b, 0x03, 0xea, 0x30, 0xa3, 0x11, 0xc3, 0x76, 0x35, 0xac, 0x7d, 0x94, - 0x26, 0x48, 0x8e, 0xb1, 0xdf, 0x3c, 0x3d, 0xeb, 0xd6, 0x9e, 0x9c, 0x75, 0x6b, 0x7f, 0x9c, 0x75, - 0x6b, 0x8f, 0x96, 0x5d, 0x74, 0xba, 0xec, 0xa2, 0x27, 0xcb, 0x2e, 0xfa, 0x6b, 0xd9, 0x45, 0x3f, - 0xfe, 0xdd, 0xad, 0x3d, 0x68, 0xa5, 0x1b, 0xff, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x90, 0xdd, - 0x28, 0xaf, 0xe7, 0x0c, 0x00, 0x00, + // 879 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xec, 0x55, 0x41, 0x6f, 0x23, 0x35, + 0x14, 0x8e, 0x9b, 0x84, 0x26, 0xaf, 0x54, 0xa5, 0x46, 0x8b, 0x86, 0x4a, 0x24, 0x55, 0x4e, 0x11, + 0xdb, 0x9d, 0x51, 0xaa, 0x45, 0xec, 0x01, 0x0e, 0x1d, 0x84, 0x50, 0xc5, 0x52, 0x2a, 0xaf, 0x58, + 0x41, 0x85, 0x84, 0x9c, 0x89, 0x37, 0x35, 0x99, 0xcc, 0x8c, 0x6c, 0x4f, 0x01, 0x21, 0xa4, 0x15, + 0x27, 0x8e, 0xfc, 0x8a, 0xbd, 0x71, 0xe1, 0xba, 0x37, 0x4e, 0xe5, 0xb6, 0x37, 0x38, 0x45, 0x34, + 0xfc, 0x11, 0x64, 0xc7, 0x33, 0x93, 0x36, 0x93, 0x6e, 0xb7, 0x68, 0x2b, 0x21, 0x71, 0x4a, 0xfc, + 0xde, 0xf7, 0x3d, 0x7f, 0xcf, 0xcf, 0xf3, 0x19, 0xee, 0x8d, 0xee, 0x49, 0x97, 0xc7, 0xde, 0x28, + 0xed, 0x33, 0x11, 0x31, 0xc5, 0xa4, 0x97, 0x8c, 0x86, 0x1e, 0x4d, 0xb8, 0xf4, 0x44, 0x9f, 0x06, + 0xde, 0x49, 0x8f, 0x86, 0xc9, 0x31, 0xed, 0x79, 0x43, 0x16, 0x31, 0x41, 0x15, 0x1b, 0xb8, 0x89, + 0x88, 0x55, 0x8c, 0xbb, 0x33, 0xa6, 0x5b, 0x30, 0xdd, 0x64, 0x34, 0x74, 0x35, 0xd3, 0xd5, 0x4c, + 0x37, 0x63, 0x6e, 0xdd, 0x19, 0x72, 0x75, 0x9c, 0xf6, 0xdd, 0x20, 0x1e, 0x7b, 0xc3, 0x78, 0x18, + 0x7b, 0xa6, 0x40, 0x3f, 0x7d, 0x64, 0x56, 0x66, 0x61, 0xfe, 0xcd, 0x0a, 0x6f, 0xed, 0x2e, 0x95, + 0xe4, 0x09, 0x26, 0xe3, 0x54, 0x04, 0xec, 0xa2, 0x98, 0xad, 0x9d, 0xe5, 0x9c, 0x93, 0x05, 0xe9, + 0x97, 0xec, 0x20, 0xbd, 0x31, 0x53, 0xb4, 0x8c, 0x73, 0xa7, 0x9c, 0x23, 0xd2, 0x48, 0xf1, 0xf1, + 0xa2, 0xa0, 0xbb, 0x97, 0xc3, 0x65, 0x70, 0xcc, 0xc6, 0x74, 0x81, 0xd5, 0x2b, 0x67, 0xa5, 0x8a, + 0x87, 0x1e, 0x8f, 0x94, 0x54, 0xe2, 0x22, 0xa5, 0xf3, 0x1b, 0x82, 0xb5, 0x0f, 0xc2, 0x54, 0x2a, + 0x26, 0x48, 0x1c, 0x32, 0xfc, 0x39, 0x34, 0x74, 0x0b, 0x03, 0xaa, 0xa8, 0x83, 0xb6, 0x51, 0x77, + 0x6d, 0xb7, 0xeb, 0x2e, 0x9d, 0x94, 0x7b, 0xd2, 0x73, 0x3f, 0xed, 0x7f, 0xcd, 0x02, 0xf5, 0x09, + 0x53, 0xd4, 0xc7, 0xa7, 0x93, 0x76, 0x65, 0x3a, 0x69, 0x43, 0x11, 0x23, 0x79, 0x35, 0xfc, 0x05, + 0xd4, 0x45, 0x1a, 0x32, 0xe9, 0xac, 0x6c, 0x57, 0xbb, 0x6b, 0xbb, 0x77, 0xdd, 0xab, 0x5e, 0x00, + 0xf7, 0x30, 0x0e, 0x79, 0xf0, 0x1d, 0x49, 0x43, 0xe6, 0xaf, 0xdb, 0x2d, 0xea, 0x7a, 0x25, 0xc9, + 0xac, 0x62, 0xe7, 0x97, 0x15, 0xc0, 0x73, 0x4d, 0xf8, 0x3c, 0x1a, 0xf0, 0x68, 0xf8, 0x12, 0x7b, + 0xf9, 0x0a, 0x1a, 0x32, 0x35, 0x89, 0xac, 0x9d, 0xde, 0xd5, 0xdb, 0x79, 0x30, 0x63, 0xfa, 0xaf, + 0xd9, 0x2d, 0x1a, 0x36, 0x20, 0x49, 0x5e, 0x14, 0x7f, 0x09, 0xab, 0x22, 0x0e, 0x19, 0x61, 0x8f, + 0x9c, 0xaa, 0x51, 0xfe, 0x02, 0xf5, 0xc9, 0x8c, 0xe8, 0x6f, 0xd8, 0xfa, 0xab, 0x36, 0x40, 0xb2, + 0x92, 0x9d, 0x27, 0x08, 0xde, 0x5c, 0x3c, 0x2f, 0x3f, 0xe5, 0xe1, 0x80, 0x09, 0xfc, 0x13, 0x02, + 0x1c, 0x2c, 0x64, 0xed, 0x09, 0xbe, 0x77, 0x75, 0x1d, 0x25, 0x3b, 0x6c, 0x59, 0x49, 0x25, 0xd3, + 0x22, 0x25, 0x7b, 0x76, 0xfe, 0x40, 0xf0, 0xc6, 0x22, 0xf4, 0x3e, 0x97, 0x0a, 0x1f, 0x2d, 0x0c, + 0x77, 0xe7, 0x32, 0x69, 0x1a, 0xab, 0x47, 0xac, 0xb9, 0x66, 0xc0, 0xf9, 0xe9, 0x67, 0x91, 0xb9, + 0xf1, 0x52, 0xa8, 0x73, 0xc5, 0xc6, 0xd9, 0x6c, 0xff, 0x5d, 0xcf, 0xf9, 0x95, 0xdd, 0xd7, 0x25, + 0xc9, 0xac, 0x72, 0xe7, 0x77, 0x04, 0x1b, 0x73, 0xe0, 0x97, 0xde, 0xd2, 0xd1, 0xf9, 0x96, 0xde, + 0xb9, 0x5e, 0x4b, 0xe5, 0xbd, 0xfc, 0x58, 0x05, 0x28, 0xbe, 0x51, 0xdc, 0x86, 0xfa, 0x09, 0x13, + 0x7d, 0xe9, 0xa0, 0xed, 0x6a, 0xb7, 0xe9, 0x37, 0x35, 0xfe, 0xa1, 0x0e, 0x90, 0x59, 0x1c, 0x3f, + 0x46, 0x70, 0x8b, 0x2a, 0x25, 0x78, 0x3f, 0x55, 0x8c, 0x30, 0xa9, 0x04, 0x0f, 0x14, 0x8f, 0x23, + 0x2d, 0x4e, 0x77, 0x7d, 0x7b, 0x89, 0x38, 0xeb, 0x7e, 0x2e, 0xa1, 0xdf, 0x7c, 0xf8, 0xad, 0x62, + 0x91, 0xe4, 0x71, 0xe4, 0xbf, 0x65, 0x25, 0xdd, 0xda, 0x2b, 0xab, 0x48, 0xca, 0x37, 0xc2, 0xb7, + 0xa1, 0x49, 0x13, 0xfe, 0x91, 0x88, 0xd3, 0x44, 0x3a, 0x55, 0xa3, 0x73, 0x7d, 0x3a, 0x69, 0x37, + 0xf7, 0x0e, 0xf7, 0x67, 0x41, 0x52, 0xe4, 0x35, 0x38, 0x7b, 0x39, 0xa4, 0x53, 0x2b, 0xc0, 0x24, + 0x0b, 0x92, 0x22, 0x8f, 0xdf, 0x85, 0xf5, 0x6c, 0x71, 0x40, 0xc7, 0x4c, 0x3a, 0x75, 0x43, 0xd8, + 0x9c, 0x4e, 0xda, 0xeb, 0x64, 0x3e, 0x41, 0xce, 0xe3, 0xf0, 0xfb, 0xb0, 0x11, 0xc5, 0x51, 0x06, + 0xf9, 0x8c, 0xdc, 0x97, 0xce, 0x2b, 0x86, 0xfa, 0xfa, 0x74, 0xd2, 0xde, 0x38, 0x38, 0x9f, 0x22, + 0x17, 0xb1, 0x9d, 0x1f, 0x60, 0x73, 0xce, 0x27, 0xed, 0xa7, 0x7c, 0x0c, 0x90, 0xe4, 0x41, 0x7b, + 0xa7, 0xae, 0x67, 0xbc, 0xb9, 0x1f, 0x16, 0x31, 0x32, 0x57, 0xbb, 0xf3, 0x14, 0x41, 0xed, 0xbf, + 0xfb, 0x80, 0x3c, 0x59, 0x81, 0xb5, 0xff, 0x5f, 0x8e, 0x2b, 0xbc, 0x1c, 0xda, 0xb6, 0x6e, 0xd2, + 0x89, 0xaf, 0x6f, 0x5b, 0xcf, 0xb7, 0xe0, 0xa7, 0x08, 0x1a, 0x37, 0xe2, 0xbd, 0x0f, 0xce, 0x37, + 0xe1, 0xbe, 0x60, 0x13, 0xe5, 0xea, 0xbf, 0x87, 0x6c, 0x3a, 0x78, 0x07, 0x1a, 0x99, 0x59, 0x19, + 0xed, 0xcd, 0x42, 0x4d, 0xe6, 0x67, 0x24, 0x47, 0xe0, 0x6d, 0xa8, 0x8d, 0x78, 0x34, 0x30, 0x5e, + 0xdb, 0xf4, 0x5f, 0xb5, 0xc8, 0xda, 0xc7, 0x3c, 0x1a, 0x10, 0x93, 0xd1, 0x88, 0x88, 0x8e, 0x99, + 0xb9, 0x3f, 0x73, 0x08, 0x6d, 0x53, 0xc4, 0x64, 0x3a, 0xbf, 0x22, 0x58, 0xb5, 0x77, 0x2f, 0xaf, + 0x87, 0x96, 0xd6, 0xdb, 0x05, 0xa0, 0x09, 0x7f, 0xc8, 0x84, 0x36, 0x6c, 0xbb, 0x6f, 0xfe, 0x95, + 0xec, 0x1d, 0xee, 0xdb, 0x0c, 0x99, 0x43, 0x3d, 0x5f, 0x03, 0xf6, 0xa0, 0xa9, 0x7f, 0x65, 0x42, + 0x03, 0xe6, 0xd4, 0x0c, 0x6c, 0xd3, 0xc2, 0x9a, 0x07, 0x59, 0x82, 0x14, 0x18, 0xff, 0xed, 0xd3, + 0xb3, 0x56, 0xe5, 0xd9, 0x59, 0xab, 0xf2, 0xe7, 0x59, 0xab, 0xf2, 0x78, 0xda, 0x42, 0xa7, 0xd3, + 0x16, 0x7a, 0x36, 0x6d, 0xa1, 0xbf, 0xa6, 0x2d, 0xf4, 0xf3, 0xdf, 0xad, 0xca, 0x51, 0x23, 0x3b, + 0xf8, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x24, 0x96, 0xf9, 0x34, 0xd8, 0x0c, 0x00, 0x00, } diff --git a/pkg/apis/rbac/v1alpha1/generated.proto b/pkg/apis/rbac/v1alpha1/generated.proto index c265441f965..63ec41b9c1b 100644 --- a/pkg/apis/rbac/v1alpha1/generated.proto +++ b/pkg/apis/rbac/v1alpha1/generated.proto @@ -22,8 +22,8 @@ syntax = 'proto2'; package k8s.io.kubernetes.pkg.apis.rbac.v1alpha1; import "k8s.io/kubernetes/pkg/api/resource/generated.proto"; -import "k8s.io/kubernetes/pkg/api/unversioned/generated.proto"; import "k8s.io/kubernetes/pkg/api/v1/generated.proto"; +import "k8s.io/kubernetes/pkg/apis/meta/v1/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/schema/generated.proto"; import "k8s.io/kubernetes/pkg/util/intstr/generated.proto"; @@ -68,7 +68,7 @@ message ClusterRoleBindingBuilder { message ClusterRoleBindingList { // Standard object's metadata. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // Items is a list of ClusterRoleBindings repeated ClusterRoleBinding items = 2; @@ -78,7 +78,7 @@ message ClusterRoleBindingList { message ClusterRoleList { // Standard object's metadata. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // Items is a list of ClusterRoles repeated ClusterRole items = 2; @@ -154,7 +154,7 @@ message RoleBinding { message RoleBindingList { // Standard object's metadata. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // Items is a list of RoleBindings repeated RoleBinding items = 2; @@ -164,7 +164,7 @@ message RoleBindingList { message RoleList { // Standard object's metadata. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // Items is a list of Roles repeated Role items = 2; diff --git a/pkg/apis/rbac/v1alpha1/register.go b/pkg/apis/rbac/v1alpha1/register.go index 261662554a6..f2cd91d8c5d 100644 --- a/pkg/apis/rbac/v1alpha1/register.go +++ b/pkg/apis/rbac/v1alpha1/register.go @@ -17,8 +17,8 @@ limitations under the License. package v1alpha1 import ( - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" "k8s.io/kubernetes/pkg/watch/versioned" diff --git a/pkg/apis/rbac/v1alpha1/types.generated.go b/pkg/apis/rbac/v1alpha1/types.generated.go index 30a5c8f7d23..188610876b4 100644 --- a/pkg/apis/rbac/v1alpha1/types.generated.go +++ b/pkg/apis/rbac/v1alpha1/types.generated.go @@ -25,8 +25,8 @@ import ( "errors" "fmt" codec1978 "github.com/ugorji/go/codec" - pkg2_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" pkg3_v1 "k8s.io/kubernetes/pkg/api/v1" + pkg2_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" pkg1_runtime "k8s.io/kubernetes/pkg/runtime" pkg4_types "k8s.io/kubernetes/pkg/types" "reflect" @@ -64,8 +64,8 @@ func init() { panic(err) } if false { // reference the types, but skip this branch at build/run time - var v0 pkg2_unversioned.TypeMeta - var v1 pkg3_v1.ObjectMeta + var v0 pkg3_v1.ObjectMeta + var v1 pkg2_v1.TypeMeta var v2 pkg1_runtime.RawExtension var v3 pkg4_types.UID var v4 time.Time @@ -2033,7 +2033,7 @@ func (x *RoleBindingList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv180 := &x.ListMeta yym181 := z.DecBinary() @@ -2114,7 +2114,7 @@ func (x *RoleBindingList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv187 := &x.ListMeta yym188 := z.DecBinary() @@ -2377,7 +2377,7 @@ func (x *RoleList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv212 := &x.ListMeta yym213 := z.DecBinary() @@ -2458,7 +2458,7 @@ func (x *RoleList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv219 := &x.ListMeta yym220 := z.DecBinary() @@ -3396,7 +3396,7 @@ func (x *ClusterRoleBindingList) codecDecodeSelfFromMap(l int, d *codec1978.Deco } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv305 := &x.ListMeta yym306 := z.DecBinary() @@ -3477,7 +3477,7 @@ func (x *ClusterRoleBindingList) codecDecodeSelfFromArray(l int, d *codec1978.De } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv312 := &x.ListMeta yym313 := z.DecBinary() @@ -3740,7 +3740,7 @@ func (x *ClusterRoleList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv337 := &x.ListMeta yym338 := z.DecBinary() @@ -3821,7 +3821,7 @@ func (x *ClusterRoleList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv344 := &x.ListMeta yym345 := z.DecBinary() diff --git a/pkg/apis/rbac/v1alpha1/types.go b/pkg/apis/rbac/v1alpha1/types.go index 85bdd61f256..756d8800c8c 100644 --- a/pkg/apis/rbac/v1alpha1/types.go +++ b/pkg/apis/rbac/v1alpha1/types.go @@ -17,8 +17,8 @@ limitations under the License. package v1alpha1 import ( - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" ) diff --git a/pkg/apis/storage/types.generated.go b/pkg/apis/storage/types.generated.go index 65dc2dd1a47..5df21c3baf7 100644 --- a/pkg/apis/storage/types.generated.go +++ b/pkg/apis/storage/types.generated.go @@ -26,7 +26,7 @@ import ( "fmt" codec1978 "github.com/ugorji/go/codec" pkg2_api "k8s.io/kubernetes/pkg/api" - pkg1_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" + pkg1_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" pkg3_types "k8s.io/kubernetes/pkg/types" "reflect" "runtime" @@ -64,7 +64,7 @@ func init() { } if false { // reference the types, but skip this branch at build/run time var v0 pkg2_api.ObjectMeta - var v1 pkg1_unversioned.TypeMeta + var v1 pkg1_v1.TypeMeta var v2 pkg3_types.UID var v3 time.Time _, _, _, _ = v0, v1, v2, v3 @@ -653,7 +653,7 @@ func (x *StorageClassList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv55 := &x.ListMeta yym56 := z.DecBinary() @@ -734,7 +734,7 @@ func (x *StorageClassList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv62 := &x.ListMeta yym63 := z.DecBinary() diff --git a/pkg/apis/storage/v1beta1/generated.pb.go b/pkg/apis/storage/v1beta1/generated.pb.go index 0dd6295c712..603219fbd37 100644 --- a/pkg/apis/storage/v1beta1/generated.pb.go +++ b/pkg/apis/storage/v1beta1/generated.pb.go @@ -245,7 +245,7 @@ func (this *StorageClassList) String() string { return "nil" } s := strings.Join([]string{`&StorageClassList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "StorageClass", "StorageClass", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -696,35 +696,35 @@ var ( ) var fileDescriptorGenerated = []byte{ - // 472 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x9c, 0x92, 0x41, 0x8b, 0xd3, 0x40, - 0x14, 0xc7, 0x3b, 0x2d, 0xc5, 0xdd, 0xa9, 0x62, 0x89, 0x1e, 0x4a, 0x0e, 0xd9, 0xb2, 0xa7, 0x2a, - 0xee, 0x0c, 0x2d, 0x2e, 0x94, 0x05, 0x2f, 0x15, 0x41, 0x41, 0x71, 0x89, 0x17, 0x11, 0xf6, 0x30, - 0x69, 0x9f, 0xd9, 0x31, 0x4d, 0x26, 0xcc, 0xbc, 0x04, 0x16, 0x3c, 0xf8, 0x11, 0xfc, 0x58, 0x3d, - 0xf6, 0xe8, 0x41, 0x16, 0x1b, 0xbf, 0x88, 0x34, 0x89, 0x9b, 0xd0, 0x6c, 0x17, 0xf1, 0x96, 0x37, - 0xf3, 0x7e, 0xff, 0xf7, 0x7f, 0xff, 0x0c, 0x3d, 0x0b, 0xa6, 0x86, 0x49, 0xc5, 0x83, 0xc4, 0x03, - 0x1d, 0x01, 0x82, 0xe1, 0x71, 0xe0, 0x73, 0x11, 0x4b, 0xc3, 0x0d, 0x2a, 0x2d, 0x7c, 0xe0, 0xe9, - 0xd8, 0x03, 0x14, 0x63, 0xee, 0x43, 0x04, 0x5a, 0x20, 0x2c, 0x58, 0xac, 0x15, 0x2a, 0xeb, 0x69, - 0xc1, 0xb2, 0x8a, 0x65, 0x71, 0xe0, 0xb3, 0x2d, 0xcb, 0x4a, 0x96, 0x95, 0xac, 0x7d, 0xe2, 0x4b, - 0xbc, 0x4c, 0x3c, 0x36, 0x57, 0x21, 0xf7, 0x95, 0xaf, 0x78, 0x2e, 0xe1, 0x25, 0x9f, 0xf3, 0x2a, - 0x2f, 0xf2, 0xaf, 0x42, 0xda, 0x9e, 0xec, 0xb5, 0xc5, 0x35, 0x18, 0x95, 0xe8, 0x39, 0xec, 0xda, - 0xb1, 0x4f, 0xf7, 0x33, 0x49, 0x94, 0x82, 0x36, 0x52, 0x45, 0xb0, 0x68, 0x60, 0xcf, 0xf6, 0x63, - 0x69, 0x63, 0x67, 0xfb, 0xe4, 0xf6, 0x6e, 0x9d, 0x44, 0x28, 0xc3, 0xa6, 0xa7, 0xe7, 0x77, 0xb7, - 0x9b, 0xf9, 0x25, 0x84, 0xa2, 0x41, 0x8d, 0x6f, 0xa7, 0x12, 0x94, 0x4b, 0x2e, 0x23, 0x34, 0xa8, - 0x77, 0x91, 0xe3, 0x9f, 0x6d, 0x7a, 0xff, 0x43, 0x91, 0xf9, 0xcb, 0xa5, 0x30, 0xc6, 0xfa, 0x48, - 0x0f, 0x42, 0x40, 0xb1, 0x10, 0x28, 0x06, 0x64, 0x48, 0x46, 0xbd, 0xc9, 0x88, 0xed, 0xfd, 0x5f, - 0x2c, 0x1d, 0xb3, 0xf7, 0xde, 0x17, 0x98, 0xe3, 0x3b, 0x40, 0x31, 0xb3, 0x56, 0xd7, 0x47, 0xad, - 0xec, 0xfa, 0x88, 0x56, 0x67, 0xee, 0x8d, 0x9a, 0x75, 0x4a, 0x7b, 0xb1, 0x56, 0xa9, 0xcc, 0xf3, - 0xd4, 0x83, 0xf6, 0x90, 0x8c, 0x0e, 0x67, 0x8f, 0x4a, 0xa4, 0x77, 0x5e, 0x5d, 0xb9, 0xf5, 0x3e, - 0xeb, 0x2b, 0xa5, 0xb1, 0xd0, 0x22, 0x04, 0x04, 0x6d, 0x06, 0x9d, 0x61, 0x67, 0xd4, 0x9b, 0xbc, - 0x66, 0xff, 0xfe, 0x84, 0x58, 0x7d, 0x3d, 0x76, 0x7e, 0x23, 0xf5, 0x2a, 0x42, 0x7d, 0x55, 0x59, - 0xae, 0x2e, 0xdc, 0xda, 0x3c, 0xfb, 0x05, 0x7d, 0xb8, 0x83, 0x58, 0x7d, 0xda, 0x09, 0xe0, 0x2a, - 0x0f, 0xe7, 0xd0, 0xdd, 0x7e, 0x5a, 0x8f, 0x69, 0x37, 0x15, 0xcb, 0x04, 0x8a, 0x9d, 0xdc, 0xa2, - 0x38, 0x6b, 0x4f, 0xc9, 0xf1, 0x9a, 0xd0, 0x7e, 0x7d, 0xfe, 0x5b, 0x69, 0xd0, 0xba, 0x68, 0x44, - 0xcc, 0xef, 0x88, 0xb8, 0xf6, 0x06, 0xd9, 0x16, 0xcf, 0x93, 0xee, 0x97, 0xb6, 0x0f, 0xfe, 0x9e, - 0xd4, 0x72, 0xbe, 0xa0, 0x5d, 0x89, 0x10, 0x9a, 0x41, 0x3b, 0xcf, 0x6a, 0xfa, 0xbf, 0x59, 0xcd, - 0x1e, 0x94, 0x43, 0xba, 0x6f, 0xb6, 0x72, 0x6e, 0xa1, 0x3a, 0x7b, 0xb2, 0xda, 0x38, 0xad, 0xf5, - 0xc6, 0x69, 0xfd, 0xd8, 0x38, 0xad, 0x6f, 0x99, 0x43, 0x56, 0x99, 0x43, 0xd6, 0x99, 0x43, 0x7e, - 0x65, 0x0e, 0xf9, 0xfe, 0xdb, 0x69, 0x7d, 0xba, 0x57, 0xaa, 0xfd, 0x09, 0x00, 0x00, 0xff, 0xff, - 0x0a, 0x07, 0x46, 0xe4, 0x25, 0x04, 0x00, 0x00, + // 471 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x9c, 0x92, 0x4f, 0x8b, 0xd3, 0x4e, + 0x18, 0xc7, 0x33, 0x2d, 0xe5, 0xb7, 0x3b, 0xfd, 0x89, 0x25, 0x7a, 0x28, 0x3d, 0x64, 0xcb, 0x9e, + 0xaa, 0xec, 0xce, 0xd0, 0xa2, 0x50, 0x16, 0xbc, 0x54, 0x04, 0x05, 0xc5, 0x25, 0x5e, 0x64, 0xc1, + 0xc3, 0xa4, 0xfb, 0x98, 0x1d, 0xd3, 0x64, 0xc2, 0xcc, 0x93, 0xc0, 0x82, 0x07, 0x5f, 0x82, 0x2f, + 0xab, 0x17, 0x61, 0x8f, 0x1e, 0x64, 0xb1, 0xf1, 0x8d, 0x48, 0xfe, 0xb8, 0x09, 0xfd, 0x87, 0x78, + 0x9b, 0x67, 0xe6, 0xf9, 0x7c, 0x9f, 0xef, 0xf3, 0x4d, 0xe8, 0x59, 0x30, 0x35, 0x4c, 0x2a, 0x1e, + 0x24, 0x1e, 0xe8, 0x08, 0x10, 0x0c, 0x8f, 0x03, 0x9f, 0x8b, 0x58, 0x1a, 0x6e, 0x50, 0x69, 0xe1, + 0x03, 0x4f, 0xc7, 0x1e, 0xa0, 0x18, 0x73, 0x1f, 0x22, 0xd0, 0x02, 0xe1, 0x92, 0xc5, 0x5a, 0xa1, + 0xb2, 0x1f, 0x97, 0x2c, 0xab, 0x59, 0x16, 0x07, 0x3e, 0xcb, 0x59, 0x56, 0xb1, 0xac, 0x62, 0x07, + 0xa7, 0xbe, 0xc4, 0xab, 0xc4, 0x63, 0x73, 0x15, 0x72, 0x5f, 0xf9, 0x8a, 0x17, 0x12, 0x5e, 0xf2, + 0xb1, 0xa8, 0x8a, 0xa2, 0x38, 0x95, 0xd2, 0x83, 0xc9, 0x4e, 0x5b, 0x5c, 0x83, 0x51, 0x89, 0x9e, + 0xc3, 0xba, 0x9d, 0xc1, 0xc9, 0x6e, 0x26, 0xdd, 0x30, 0xbf, 0x67, 0x82, 0xe1, 0x21, 0xa0, 0xd8, + 0xc6, 0x9c, 0x6e, 0x67, 0x74, 0x12, 0xa1, 0x0c, 0x37, 0x0d, 0x3d, 0xd9, 0xdf, 0x6e, 0xe6, 0x57, + 0x10, 0x8a, 0x0d, 0x6a, 0xbc, 0x9d, 0x4a, 0x50, 0x2e, 0xb8, 0x8c, 0xd0, 0xa0, 0x5e, 0x47, 0x8e, + 0x7f, 0xb4, 0xe8, 0xff, 0xef, 0xca, 0xc0, 0x9f, 0x2f, 0x84, 0x31, 0xf6, 0x7b, 0x7a, 0x90, 0xef, + 0x70, 0x29, 0x50, 0xf4, 0xc9, 0x90, 0x8c, 0xba, 0x93, 0x11, 0xdb, 0xf9, 0xb1, 0x58, 0x3a, 0x66, + 0x6f, 0xbd, 0x4f, 0x30, 0xc7, 0x37, 0x80, 0x62, 0x66, 0x2f, 0x6f, 0x8f, 0xac, 0xec, 0xf6, 0x88, + 0xd6, 0x77, 0xee, 0x9d, 0x9a, 0xfd, 0x94, 0x76, 0x63, 0xad, 0x52, 0x69, 0xa4, 0x8a, 0x40, 0xf7, + 0x5b, 0x43, 0x32, 0x3a, 0x9c, 0x3d, 0xa8, 0x90, 0xee, 0x79, 0xfd, 0xe4, 0x36, 0xfb, 0xec, 0xcf, + 0x94, 0xc6, 0x42, 0x8b, 0x10, 0x10, 0xb4, 0xe9, 0xb7, 0x87, 0xed, 0x51, 0x77, 0xf2, 0x92, 0xfd, + 0xfd, 0xff, 0xc3, 0x9a, 0xeb, 0xb1, 0xf3, 0x3b, 0xa9, 0x17, 0x11, 0xea, 0xeb, 0xda, 0x72, 0xfd, + 0xe0, 0x36, 0xe6, 0x0d, 0x9e, 0xd1, 0xfb, 0x6b, 0x88, 0xdd, 0xa3, 0xed, 0x00, 0xae, 0x8b, 0x70, + 0x0e, 0xdd, 0xfc, 0x68, 0x3f, 0xa4, 0x9d, 0x54, 0x2c, 0x12, 0x28, 0x77, 0x72, 0xcb, 0xe2, 0xac, + 0x35, 0x25, 0xc7, 0xdf, 0x08, 0xed, 0x35, 0xe7, 0xbf, 0x96, 0x06, 0xed, 0x8b, 0x8d, 0x88, 0x4f, + 0xf6, 0xed, 0x93, 0xf7, 0xe6, 0x41, 0xe7, 0x6c, 0x11, 0x73, 0xaf, 0xf2, 0x7c, 0xf0, 0xe7, 0xa6, + 0x11, 0xf2, 0x07, 0xda, 0x91, 0x08, 0xa1, 0xe9, 0xb7, 0x8a, 0xa0, 0xa6, 0xff, 0x1a, 0xd4, 0xec, + 0x5e, 0x35, 0xa4, 0xf3, 0x2a, 0x97, 0x73, 0x4b, 0xd5, 0xd9, 0xa3, 0xe5, 0xca, 0xb1, 0x6e, 0x56, + 0x8e, 0xf5, 0x7d, 0xe5, 0x58, 0x5f, 0x32, 0x87, 0x2c, 0x33, 0x87, 0xdc, 0x64, 0x0e, 0xf9, 0x99, + 0x39, 0xe4, 0xeb, 0x2f, 0xc7, 0xba, 0xf8, 0xaf, 0x52, 0xfb, 0x1d, 0x00, 0x00, 0xff, 0xff, 0xc5, + 0xf0, 0x27, 0x65, 0x1f, 0x04, 0x00, 0x00, } diff --git a/pkg/apis/storage/v1beta1/generated.proto b/pkg/apis/storage/v1beta1/generated.proto index efc3b806d3f..497ea99954e 100644 --- a/pkg/apis/storage/v1beta1/generated.proto +++ b/pkg/apis/storage/v1beta1/generated.proto @@ -22,8 +22,8 @@ syntax = 'proto2'; package k8s.io.kubernetes.pkg.apis.storage.v1beta1; import "k8s.io/kubernetes/pkg/api/resource/generated.proto"; -import "k8s.io/kubernetes/pkg/api/unversioned/generated.proto"; import "k8s.io/kubernetes/pkg/api/v1/generated.proto"; +import "k8s.io/kubernetes/pkg/apis/meta/v1/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/schema/generated.proto"; import "k8s.io/kubernetes/pkg/util/intstr/generated.proto"; @@ -56,7 +56,7 @@ message StorageClassList { // Standard list metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // Items is the list of StorageClasses repeated StorageClass items = 2; diff --git a/pkg/apis/storage/v1beta1/register.go b/pkg/apis/storage/v1beta1/register.go index 87a347e7a69..59717557c5d 100644 --- a/pkg/apis/storage/v1beta1/register.go +++ b/pkg/apis/storage/v1beta1/register.go @@ -17,8 +17,8 @@ limitations under the License. package v1beta1 import ( - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" versionedwatch "k8s.io/kubernetes/pkg/watch/versioned" diff --git a/pkg/apis/storage/v1beta1/types.generated.go b/pkg/apis/storage/v1beta1/types.generated.go index 993cee3f3f6..9b235bca2af 100644 --- a/pkg/apis/storage/v1beta1/types.generated.go +++ b/pkg/apis/storage/v1beta1/types.generated.go @@ -25,8 +25,8 @@ import ( "errors" "fmt" codec1978 "github.com/ugorji/go/codec" - pkg1_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" pkg2_v1 "k8s.io/kubernetes/pkg/api/v1" + pkg1_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" pkg3_types "k8s.io/kubernetes/pkg/types" "reflect" "runtime" @@ -63,8 +63,8 @@ func init() { panic(err) } if false { // reference the types, but skip this branch at build/run time - var v0 pkg1_unversioned.TypeMeta - var v1 pkg2_v1.ObjectMeta + var v0 pkg2_v1.ObjectMeta + var v1 pkg1_v1.TypeMeta var v2 pkg3_types.UID var v3 time.Time _, _, _, _ = v0, v1, v2, v3 @@ -653,7 +653,7 @@ func (x *StorageClassList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv55 := &x.ListMeta yym56 := z.DecBinary() @@ -734,7 +734,7 @@ func (x *StorageClassList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv62 := &x.ListMeta yym63 := z.DecBinary() diff --git a/pkg/apis/storage/v1beta1/types.go b/pkg/apis/storage/v1beta1/types.go index c97ba423afc..92d619ffdd6 100644 --- a/pkg/apis/storage/v1beta1/types.go +++ b/pkg/apis/storage/v1beta1/types.go @@ -17,8 +17,8 @@ limitations under the License. package v1beta1 import ( - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" ) // +genclient=true diff --git a/pkg/apiserver/api_installer.go b/pkg/apiserver/api_installer.go index 17652022d58..9db4e80eb62 100644 --- a/pkg/apiserver/api_installer.go +++ b/pkg/apiserver/api_installer.go @@ -31,8 +31,8 @@ import ( "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/meta" "k8s.io/kubernetes/pkg/api/rest" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/extensions" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apiserver/metrics" "k8s.io/kubernetes/pkg/conversion" "k8s.io/kubernetes/pkg/runtime" diff --git a/pkg/apiserver/apiserver_test.go b/pkg/apiserver/apiserver_test.go index bfcfec8bd9e..3c73db845da 100644 --- a/pkg/apiserver/apiserver_test.go +++ b/pkg/apiserver/apiserver_test.go @@ -38,8 +38,8 @@ import ( apierrs "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/meta" "k8s.io/kubernetes/pkg/api/rest" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apiserver/filters" "k8s.io/kubernetes/pkg/apiserver/request" apiservertesting "k8s.io/kubernetes/pkg/apiserver/testing" @@ -122,13 +122,13 @@ func newMapper() *meta.DefaultRESTMapper { func addGrouplessTypes() { type ListOptions struct { - Object runtime.Object + Object runtime.Object metav1.TypeMeta `json:",inline"` - LabelSelector string `json:"labelSelector,omitempty"` - FieldSelector string `json:"fieldSelector,omitempty"` - Watch bool `json:"watch,omitempty"` - ResourceVersion string `json:"resourceVersion,omitempty"` - TimeoutSeconds *int64 `json:"timeoutSeconds,omitempty"` + LabelSelector string `json:"labelSelector,omitempty"` + FieldSelector string `json:"fieldSelector,omitempty"` + Watch bool `json:"watch,omitempty"` + ResourceVersion string `json:"resourceVersion,omitempty"` + TimeoutSeconds *int64 `json:"timeoutSeconds,omitempty"` } api.Scheme.AddKnownTypes(grouplessGroupVersion, &apiservertesting.Simple{}, &apiservertesting.SimpleList{}, &ListOptions{}, &metav1.ExportOptions{}, @@ -140,13 +140,13 @@ func addGrouplessTypes() { func addTestTypes() { type ListOptions struct { - Object runtime.Object + Object runtime.Object metav1.TypeMeta `json:",inline"` - LabelSelector string `json:"labelSelector,omitempty"` - FieldSelector string `json:"fieldSelector,omitempty"` - Watch bool `json:"watch,omitempty"` - ResourceVersion string `json:"resourceVersion,omitempty"` - TimeoutSeconds *int64 `json:"timeoutSeconds,omitempty"` + LabelSelector string `json:"labelSelector,omitempty"` + FieldSelector string `json:"fieldSelector,omitempty"` + Watch bool `json:"watch,omitempty"` + ResourceVersion string `json:"resourceVersion,omitempty"` + TimeoutSeconds *int64 `json:"timeoutSeconds,omitempty"` } api.Scheme.AddKnownTypes(testGroupVersion, &apiservertesting.Simple{}, &apiservertesting.SimpleList{}, &ListOptions{}, &metav1.ExportOptions{}, @@ -168,13 +168,13 @@ func addTestTypes() { func addNewTestTypes() { type ListOptions struct { - Object runtime.Object + Object runtime.Object metav1.TypeMeta `json:",inline"` - LabelSelector string `json:"labelSelector,omitempty"` - FieldSelector string `json:"fieldSelector,omitempty"` - Watch bool `json:"watch,omitempty"` - ResourceVersion string `json:"resourceVersion,omitempty"` - TimeoutSeconds *int64 `json:"timeoutSeconds,omitempty"` + LabelSelector string `json:"labelSelector,omitempty"` + FieldSelector string `json:"fieldSelector,omitempty"` + Watch bool `json:"watch,omitempty"` + ResourceVersion string `json:"resourceVersion,omitempty"` + TimeoutSeconds *int64 `json:"timeoutSeconds,omitempty"` } api.Scheme.AddKnownTypes(newGroupVersion, &apiservertesting.Simple{}, &apiservertesting.SimpleList{}, &ListOptions{}, &metav1.ExportOptions{}, @@ -3250,9 +3250,9 @@ func TestUpdateChecksAPIVersion(t *testing.T) { // same group as its parent resource. type SimpleXGSubresource struct { metav1.TypeMeta `json:",inline"` - api.ObjectMeta `json:"metadata"` - SubresourceInfo string `json:"subresourceInfo,omitempty"` - Labels map[string]string `json:"labels,omitempty"` + api.ObjectMeta `json:"metadata"` + SubresourceInfo string `json:"subresourceInfo,omitempty"` + Labels map[string]string `json:"labels,omitempty"` } func (obj *SimpleXGSubresource) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta } diff --git a/pkg/apiserver/resthandler_test.go b/pkg/apiserver/resthandler_test.go index 0ffb5af49b5..17ffdf61191 100644 --- a/pkg/apiserver/resthandler_test.go +++ b/pkg/apiserver/resthandler_test.go @@ -30,8 +30,8 @@ import ( apierrors "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/api/testapi" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" "k8s.io/kubernetes/pkg/types" diff --git a/pkg/apiserver/testing/types.generated.go b/pkg/apiserver/testing/types.generated.go index a468170ac71..d0df5318756 100644 --- a/pkg/apiserver/testing/types.generated.go +++ b/pkg/apiserver/testing/types.generated.go @@ -26,7 +26,7 @@ import ( "fmt" codec1978 "github.com/ugorji/go/codec" pkg2_api "k8s.io/kubernetes/pkg/api" - pkg1_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" + pkg1_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" pkg3_types "k8s.io/kubernetes/pkg/types" "reflect" "runtime" @@ -64,7 +64,7 @@ func init() { } if false { // reference the types, but skip this branch at build/run time var v0 pkg2_api.ObjectMeta - var v1 pkg1_unversioned.TypeMeta + var v1 pkg1_v1.TypeMeta var v2 pkg3_types.UID var v3 time.Time _, _, _, _ = v0, v1, v2, v3 @@ -1361,7 +1361,7 @@ func (x *SimpleList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv119 := &x.ListMeta yym120 := z.DecBinary() @@ -1442,7 +1442,7 @@ func (x *SimpleList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv126 := &x.ListMeta yym127 := z.DecBinary() diff --git a/pkg/apiserver/testing/types.go b/pkg/apiserver/testing/types.go index ca34d3084fa..ef6efa3a4e0 100644 --- a/pkg/apiserver/testing/types.go +++ b/pkg/apiserver/testing/types.go @@ -24,7 +24,7 @@ import ( type Simple struct { metav1.TypeMeta `json:",inline"` - api.ObjectMeta `json:"metadata"` + api.ObjectMeta `json:"metadata"` // +optional Other string `json:"other,omitempty"` // +optional @@ -35,7 +35,7 @@ func (obj *Simple) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta } type SimpleRoot struct { metav1.TypeMeta `json:",inline"` - api.ObjectMeta `json:"metadata"` + api.ObjectMeta `json:"metadata"` // +optional Other string `json:"other,omitempty"` // +optional @@ -46,9 +46,9 @@ func (obj *SimpleRoot) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta type SimpleGetOptions struct { metav1.TypeMeta `json:",inline"` - Param1 string `json:"param1"` - Param2 string `json:"param2"` - Path string `json:"atAPath"` + Param1 string `json:"param1"` + Param2 string `json:"param2"` + Path string `json:"atAPath"` } func (SimpleGetOptions) SwaggerDoc() map[string]string { diff --git a/pkg/client/cache/listers.go b/pkg/client/cache/listers.go index 92079a0dc1b..cefa5b34dd5 100644 --- a/pkg/client/cache/listers.go +++ b/pkg/client/cache/listers.go @@ -22,11 +22,11 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/meta" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" apps "k8s.io/kubernetes/pkg/apis/apps/v1beta1" certificates "k8s.io/kubernetes/pkg/apis/certificates/v1alpha1" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" policy "k8s.io/kubernetes/pkg/apis/policy/v1beta1" storageinternal "k8s.io/kubernetes/pkg/apis/storage" storage "k8s.io/kubernetes/pkg/apis/storage/v1beta1" diff --git a/pkg/client/cache/listers_extensions.go b/pkg/client/cache/listers_extensions.go index f0b81d86c0d..3b50ae9954a 100644 --- a/pkg/client/cache/listers_extensions.go +++ b/pkg/client/cache/listers_extensions.go @@ -20,10 +20,10 @@ import ( "fmt" "k8s.io/kubernetes/pkg/api/errors" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" extensionsinternal "k8s.io/kubernetes/pkg/apis/extensions" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/labels" ) diff --git a/pkg/client/cache/listers_test.go b/pkg/client/cache/listers_test.go index 3498e9942d8..b002d05a992 100644 --- a/pkg/client/cache/listers_test.go +++ b/pkg/client/cache/listers_test.go @@ -20,9 +20,9 @@ import ( "testing" apierrors "k8s.io/kubernetes/pkg/api/errors" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/util/sets" ) diff --git a/pkg/client/cache/listwatch_test.go b/pkg/client/cache/listwatch_test.go index 87636162181..144ea27024b 100644 --- a/pkg/client/cache/listwatch_test.go +++ b/pkg/client/cache/listwatch_test.go @@ -23,9 +23,9 @@ import ( "time" "k8s.io/kubernetes/pkg/api/testapi" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/fields" diff --git a/pkg/client/cache/reflector_test.go b/pkg/client/cache/reflector_test.go index 85230a7b948..33a3298d4aa 100644 --- a/pkg/client/cache/reflector_test.go +++ b/pkg/client/cache/reflector_test.go @@ -24,8 +24,8 @@ import ( "testing" "time" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/util/wait" "k8s.io/kubernetes/pkg/watch" diff --git a/pkg/client/leaderelection/leaderelection.go b/pkg/client/leaderelection/leaderelection.go index 81bdf0119ae..daeb4859af2 100644 --- a/pkg/client/leaderelection/leaderelection.go +++ b/pkg/client/leaderelection/leaderelection.go @@ -54,8 +54,8 @@ import ( "time" "k8s.io/kubernetes/pkg/api/errors" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/componentconfig" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" rl "k8s.io/kubernetes/pkg/client/leaderelection/resourcelock" "k8s.io/kubernetes/pkg/util/runtime" "k8s.io/kubernetes/pkg/util/wait" diff --git a/pkg/client/leaderelection/leaderelection_test.go b/pkg/client/leaderelection/leaderelection_test.go index 1a5908d8aa9..865e474dc54 100644 --- a/pkg/client/leaderelection/leaderelection_test.go +++ b/pkg/client/leaderelection/leaderelection_test.go @@ -27,8 +27,8 @@ import ( "time" "k8s.io/kubernetes/pkg/api/errors" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" fakeclientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/fake" rl "k8s.io/kubernetes/pkg/client/leaderelection/resourcelock" "k8s.io/kubernetes/pkg/client/record" diff --git a/pkg/client/leaderelection/resourcelock/interface.go b/pkg/client/leaderelection/resourcelock/interface.go index eccfb339e7f..7ace562362f 100644 --- a/pkg/client/leaderelection/resourcelock/interface.go +++ b/pkg/client/leaderelection/resourcelock/interface.go @@ -30,11 +30,11 @@ const ( // with a random string (e.g. UUID) with only slight modification of this code. // TODO(mikedanese): this should potentially be versioned type LeaderElectionRecord struct { - HolderIdentity string `json:"holderIdentity"` - LeaseDurationSeconds int `json:"leaseDurationSeconds"` + HolderIdentity string `json:"holderIdentity"` + LeaseDurationSeconds int `json:"leaseDurationSeconds"` AcquireTime metav1.Time `json:"acquireTime"` RenewTime metav1.Time `json:"renewTime"` - LeaderTransitions int `json:"leaderTransitions"` + LeaderTransitions int `json:"leaderTransitions"` } // ResourceLockConfig common data that exists across different diff --git a/pkg/client/listers/batch/internalversion/job_expansion.go b/pkg/client/listers/batch/internalversion/job_expansion.go index 646aa66cd5b..9c665bc4c31 100644 --- a/pkg/client/listers/batch/internalversion/job_expansion.go +++ b/pkg/client/listers/batch/internalversion/job_expansion.go @@ -20,8 +20,8 @@ import ( "fmt" "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/batch" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/labels" ) diff --git a/pkg/client/listers/batch/internalversion/job_test.go b/pkg/client/listers/batch/internalversion/job_test.go index abefa6f9c02..982364f13f4 100644 --- a/pkg/client/listers/batch/internalversion/job_test.go +++ b/pkg/client/listers/batch/internalversion/job_test.go @@ -20,8 +20,8 @@ import ( "testing" "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/batch" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/util/sets" diff --git a/pkg/client/listers/batch/v1/job_expansion.go b/pkg/client/listers/batch/v1/job_expansion.go index 51d2a457794..d77048714e8 100644 --- a/pkg/client/listers/batch/v1/job_expansion.go +++ b/pkg/client/listers/batch/v1/job_expansion.go @@ -19,9 +19,9 @@ package v1 import ( "fmt" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" batch "k8s.io/kubernetes/pkg/apis/batch/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/labels" ) diff --git a/pkg/client/record/event.go b/pkg/client/record/event.go index 337c3324133..3a4e156f867 100644 --- a/pkg/client/record/event.go +++ b/pkg/client/record/event.go @@ -22,8 +22,8 @@ import ( "time" "k8s.io/kubernetes/pkg/api/errors" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/util/clock" diff --git a/pkg/client/record/event_test.go b/pkg/client/record/event_test.go index d646dc2ba4a..32a7c74ae04 100644 --- a/pkg/client/record/event_test.go +++ b/pkg/client/record/event_test.go @@ -27,8 +27,8 @@ import ( "k8s.io/kubernetes/pkg/api/errors" _ "k8s.io/kubernetes/pkg/api/install" // To register api.Pod used in tests below - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/restclient" k8sruntime "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/util/clock" diff --git a/pkg/client/record/events_cache.go b/pkg/client/record/events_cache.go index 07ee61b5658..349366e27d4 100644 --- a/pkg/client/record/events_cache.go +++ b/pkg/client/record/events_cache.go @@ -25,8 +25,8 @@ import ( "github.com/golang/groupcache/lru" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/util/clock" "k8s.io/kubernetes/pkg/util/sets" "k8s.io/kubernetes/pkg/util/strategicpatch" diff --git a/pkg/client/record/events_cache_test.go b/pkg/client/record/events_cache_test.go index a285a8b0523..112f53b177f 100644 --- a/pkg/client/record/events_cache_test.go +++ b/pkg/client/record/events_cache_test.go @@ -22,8 +22,8 @@ import ( "testing" "time" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/util/clock" "k8s.io/kubernetes/pkg/util/diff" ) diff --git a/pkg/client/restclient/client_test.go b/pkg/client/restclient/client_test.go index 3db16117188..3101a111909 100644 --- a/pkg/client/restclient/client_test.go +++ b/pkg/client/restclient/client_test.go @@ -30,8 +30,8 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/testapi" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" "k8s.io/kubernetes/pkg/util/diff" diff --git a/pkg/client/restclient/request.go b/pkg/client/restclient/request.go index 4e76dac83ae..7c6fcc091dc 100644 --- a/pkg/client/restclient/request.go +++ b/pkg/client/restclient/request.go @@ -33,9 +33,9 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api/errors" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" pathvalidation "k8s.io/kubernetes/pkg/api/validation/path" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/metrics" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" diff --git a/pkg/client/restclient/request_test.go b/pkg/client/restclient/request_test.go index 9d82538ba91..4493537a88c 100755 --- a/pkg/client/restclient/request_test.go +++ b/pkg/client/restclient/request_test.go @@ -34,9 +34,9 @@ import ( "k8s.io/kubernetes/pkg/api" apierrors "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/testapi" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" diff --git a/pkg/client/testing/core/fixture.go b/pkg/client/testing/core/fixture.go index 5f674bbff05..cdc00b5388f 100644 --- a/pkg/client/testing/core/fixture.go +++ b/pkg/client/testing/core/fixture.go @@ -22,8 +22,8 @@ import ( "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/meta" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" diff --git a/pkg/client/typed/discovery/discovery_client.go b/pkg/client/typed/discovery/discovery_client.go index ec971efb48e..dfc9031d524 100644 --- a/pkg/client/typed/discovery/discovery_client.go +++ b/pkg/client/typed/discovery/discovery_client.go @@ -27,8 +27,8 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" diff --git a/pkg/client/typed/discovery/discovery_client_test.go b/pkg/client/typed/discovery/discovery_client_test.go index c1f2557fe01..a707399c195 100644 --- a/pkg/client/typed/discovery/discovery_client_test.go +++ b/pkg/client/typed/discovery/discovery_client_test.go @@ -25,8 +25,8 @@ import ( "github.com/emicklei/go-restful/swagger" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/runtime/schema" "k8s.io/kubernetes/pkg/version" diff --git a/pkg/client/typed/discovery/fake/discovery.go b/pkg/client/typed/discovery/fake/discovery.go index 058db8ceb16..5ccea68c9b6 100644 --- a/pkg/client/typed/discovery/fake/discovery.go +++ b/pkg/client/typed/discovery/fake/discovery.go @@ -18,8 +18,8 @@ package fake import ( "github.com/emicklei/go-restful/swagger" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/client/testing/core" "k8s.io/kubernetes/pkg/runtime/schema" diff --git a/pkg/client/typed/discovery/helper_blackbox_test.go b/pkg/client/typed/discovery/helper_blackbox_test.go index 9541ca37a10..035214a5157 100644 --- a/pkg/client/typed/discovery/helper_blackbox_test.go +++ b/pkg/client/typed/discovery/helper_blackbox_test.go @@ -28,8 +28,8 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" - uapi "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" + uapi "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/client/restclient/fake" "k8s.io/kubernetes/pkg/client/typed/discovery" diff --git a/pkg/client/typed/discovery/restmapper_test.go b/pkg/client/typed/discovery/restmapper_test.go index a712de09763..82f33870aaa 100644 --- a/pkg/client/typed/discovery/restmapper_test.go +++ b/pkg/client/typed/discovery/restmapper_test.go @@ -21,8 +21,8 @@ import ( "testing" "k8s.io/kubernetes/pkg/api/errors" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/client/restclient/fake" "k8s.io/kubernetes/pkg/runtime/schema" diff --git a/pkg/client/typed/dynamic/client.go b/pkg/client/typed/dynamic/client.go index 863645bd510..d965bcbb36f 100644 --- a/pkg/client/typed/dynamic/client.go +++ b/pkg/client/typed/dynamic/client.go @@ -27,8 +27,8 @@ import ( "strings" "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/conversion/queryparams" "k8s.io/kubernetes/pkg/runtime" diff --git a/pkg/client/typed/dynamic/client_test.go b/pkg/client/typed/dynamic/client_test.go index bb4f0856655..09902b92626 100644 --- a/pkg/client/typed/dynamic/client_test.go +++ b/pkg/client/typed/dynamic/client_test.go @@ -26,8 +26,8 @@ import ( "testing" "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" diff --git a/pkg/client/unversioned/helper_test.go b/pkg/client/unversioned/helper_test.go index 2a3cef14ba6..ef32bc37702 100644 --- a/pkg/client/unversioned/helper_test.go +++ b/pkg/client/unversioned/helper_test.go @@ -25,8 +25,8 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" diff --git a/pkg/client/unversioned/testclient/simple/simple_testclient.go b/pkg/client/unversioned/testclient/simple/simple_testclient.go index e02629ca767..b3d4547bfb4 100644 --- a/pkg/client/unversioned/testclient/simple/simple_testclient.go +++ b/pkg/client/unversioned/testclient/simple/simple_testclient.go @@ -26,8 +26,8 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/fields" diff --git a/pkg/cloudprovider/providers/aws/aws.go b/pkg/cloudprovider/providers/aws/aws.go index 92cfa5f6d46..f5cc7063385 100644 --- a/pkg/cloudprovider/providers/aws/aws.go +++ b/pkg/cloudprovider/providers/aws/aws.go @@ -41,9 +41,9 @@ import ( "github.com/aws/aws-sdk-go/service/elb" "github.com/golang/glog" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/api/v1/service" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/cloudprovider" awscredentials "k8s.io/kubernetes/pkg/credentialprovider/aws" "k8s.io/kubernetes/pkg/types" diff --git a/pkg/cloudprovider/providers/aws/aws_test.go b/pkg/cloudprovider/providers/aws/aws_test.go index 350d2253a36..1ef2890d3d0 100644 --- a/pkg/cloudprovider/providers/aws/aws_test.go +++ b/pkg/cloudprovider/providers/aws/aws_test.go @@ -28,8 +28,8 @@ import ( "github.com/aws/aws-sdk-go/service/autoscaling" "github.com/golang/glog" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/util/sets" "github.com/stretchr/testify/assert" diff --git a/pkg/cloudprovider/providers/gce/gce.go b/pkg/cloudprovider/providers/gce/gce.go index 2c2ed11ab59..2d87eac7652 100644 --- a/pkg/cloudprovider/providers/gce/gce.go +++ b/pkg/cloudprovider/providers/gce/gce.go @@ -30,9 +30,9 @@ import ( "gopkg.in/gcfg.v1" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" apiservice "k8s.io/kubernetes/pkg/api/v1/service" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/cloudprovider" "k8s.io/kubernetes/pkg/types" utilerrors "k8s.io/kubernetes/pkg/util/errors" diff --git a/pkg/controller/controller_utils.go b/pkg/controller/controller_utils.go index 3933d45d58e..21ce04df305 100644 --- a/pkg/controller/controller_utils.go +++ b/pkg/controller/controller_utils.go @@ -25,10 +25,10 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/meta" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/api/validation" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/cache" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" "k8s.io/kubernetes/pkg/client/record" diff --git a/pkg/controller/controller_utils_test.go b/pkg/controller/controller_utils_test.go index ff60f2dd950..a71c2566f46 100644 --- a/pkg/controller/controller_utils_test.go +++ b/pkg/controller/controller_utils_test.go @@ -29,9 +29,9 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/cache" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" "k8s.io/kubernetes/pkg/client/record" diff --git a/pkg/controller/cronjob/controller.go b/pkg/controller/cronjob/controller.go index f6389eed8fe..4c72b552733 100644 --- a/pkg/controller/cronjob/controller.go +++ b/pkg/controller/cronjob/controller.go @@ -35,9 +35,9 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api/errors" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" batch "k8s.io/kubernetes/pkg/apis/batch/v2alpha1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" v1core "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/core/v1" "k8s.io/kubernetes/pkg/client/record" diff --git a/pkg/controller/cronjob/controller_test.go b/pkg/controller/cronjob/controller_test.go index 8b33a997178..5716d9020bc 100644 --- a/pkg/controller/cronjob/controller_test.go +++ b/pkg/controller/cronjob/controller_test.go @@ -20,9 +20,9 @@ import ( "testing" "time" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" batch "k8s.io/kubernetes/pkg/apis/batch/v2alpha1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/record" "k8s.io/kubernetes/pkg/types" ) diff --git a/pkg/controller/cronjob/utils_test.go b/pkg/controller/cronjob/utils_test.go index 76ed9e4c52a..46ce0496778 100644 --- a/pkg/controller/cronjob/utils_test.go +++ b/pkg/controller/cronjob/utils_test.go @@ -22,9 +22,9 @@ import ( "testing" "time" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" batch "k8s.io/kubernetes/pkg/apis/batch/v2alpha1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/types" //"k8s.io/kubernetes/pkg/controller" // "k8s.io/kubernetes/pkg/util/rand" diff --git a/pkg/controller/daemon/daemoncontroller.go b/pkg/controller/daemon/daemoncontroller.go index 71a79ee9e77..3cd2e2ade69 100644 --- a/pkg/controller/daemon/daemoncontroller.go +++ b/pkg/controller/daemon/daemoncontroller.go @@ -23,9 +23,9 @@ import ( "sync" "time" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/cache" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" v1core "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/core/v1" diff --git a/pkg/controller/daemon/daemoncontroller_test.go b/pkg/controller/daemon/daemoncontroller_test.go index 9dbf8ed0e72..d96ad441073 100644 --- a/pkg/controller/daemon/daemoncontroller_test.go +++ b/pkg/controller/daemon/daemoncontroller_test.go @@ -22,10 +22,10 @@ import ( "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/api/testapi" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/cache" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" "k8s.io/kubernetes/pkg/client/restclient" diff --git a/pkg/controller/deployment/deployment_controller.go b/pkg/controller/deployment/deployment_controller.go index 362b9a2d12f..e90429a1d53 100644 --- a/pkg/controller/deployment/deployment_controller.go +++ b/pkg/controller/deployment/deployment_controller.go @@ -28,9 +28,9 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/cache" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" v1core "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/core/v1" diff --git a/pkg/controller/deployment/deployment_controller_test.go b/pkg/controller/deployment/deployment_controller_test.go index 8ddc8f331a1..a4cf6a01118 100644 --- a/pkg/controller/deployment/deployment_controller_test.go +++ b/pkg/controller/deployment/deployment_controller_test.go @@ -20,10 +20,10 @@ import ( "fmt" "testing" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/fake" "k8s.io/kubernetes/pkg/client/record" "k8s.io/kubernetes/pkg/client/testing/core" diff --git a/pkg/controller/deployment/sync.go b/pkg/controller/deployment/sync.go index 05362472186..87d839c87ee 100644 --- a/pkg/controller/deployment/sync.go +++ b/pkg/controller/deployment/sync.go @@ -25,9 +25,9 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/controller" deploymentutil "k8s.io/kubernetes/pkg/controller/deployment/util" "k8s.io/kubernetes/pkg/labels" diff --git a/pkg/controller/deployment/sync_test.go b/pkg/controller/deployment/sync_test.go index b4e0263feec..96ed173822b 100644 --- a/pkg/controller/deployment/sync_test.go +++ b/pkg/controller/deployment/sync_test.go @@ -20,8 +20,8 @@ import ( "testing" "time" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/fake" "k8s.io/kubernetes/pkg/client/record" testclient "k8s.io/kubernetes/pkg/client/testing/core" diff --git a/pkg/controller/deployment/util/deployment_util.go b/pkg/controller/deployment/util/deployment_util.go index 84fa25d3a6c..873ecdf0008 100644 --- a/pkg/controller/deployment/util/deployment_util.go +++ b/pkg/controller/deployment/util/deployment_util.go @@ -28,10 +28,10 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/annotations" "k8s.io/kubernetes/pkg/api/meta" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" internalextensions "k8s.io/kubernetes/pkg/apis/extensions" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/labels" diff --git a/pkg/controller/deployment/util/deployment_util_test.go b/pkg/controller/deployment/util/deployment_util_test.go index d51aeda86c9..a9016262ca7 100644 --- a/pkg/controller/deployment/util/deployment_util_test.go +++ b/pkg/controller/deployment/util/deployment_util_test.go @@ -25,9 +25,9 @@ import ( "github.com/stretchr/testify/assert" "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/fake" "k8s.io/kubernetes/pkg/client/testing/core" "k8s.io/kubernetes/pkg/runtime" diff --git a/pkg/controller/disruption/disruption.go b/pkg/controller/disruption/disruption.go index 48ab2e1917c..017b5f8ca4a 100644 --- a/pkg/controller/disruption/disruption.go +++ b/pkg/controller/disruption/disruption.go @@ -22,9 +22,9 @@ import ( "time" "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" policy "k8s.io/kubernetes/pkg/apis/policy/v1beta1" "k8s.io/kubernetes/pkg/client/cache" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" diff --git a/pkg/controller/disruption/disruption_test.go b/pkg/controller/disruption/disruption_test.go index 0024e9657f9..09f61e87d6b 100644 --- a/pkg/controller/disruption/disruption_test.go +++ b/pkg/controller/disruption/disruption_test.go @@ -24,10 +24,10 @@ import ( "time" "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" policy "k8s.io/kubernetes/pkg/apis/policy/v1beta1" "k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/client/record" diff --git a/pkg/controller/endpoint/endpoints_controller_test.go b/pkg/controller/endpoint/endpoints_controller_test.go index 7555196d30d..b6f6d5b305e 100644 --- a/pkg/controller/endpoint/endpoints_controller_test.go +++ b/pkg/controller/endpoint/endpoints_controller_test.go @@ -23,11 +23,11 @@ import ( "testing" "k8s.io/kubernetes/pkg/api/testapi" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" endptspkg "k8s.io/kubernetes/pkg/api/v1/endpoints" "k8s.io/kubernetes/pkg/apimachinery/registered" _ "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/cache" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" "k8s.io/kubernetes/pkg/client/restclient" diff --git a/pkg/controller/garbagecollector/garbagecollector.go b/pkg/controller/garbagecollector/garbagecollector.go index 6a60c768106..115237cfc37 100644 --- a/pkg/controller/garbagecollector/garbagecollector.go +++ b/pkg/controller/garbagecollector/garbagecollector.go @@ -27,8 +27,8 @@ import ( "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/meta" "k8s.io/kubernetes/pkg/api/meta/metatypes" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/client/typed/dynamic" "k8s.io/kubernetes/pkg/controller/garbagecollector/metaonly" diff --git a/pkg/controller/garbagecollector/garbagecollector_test.go b/pkg/controller/garbagecollector/garbagecollector_test.go index 4f7a7186437..0dba2b1daa5 100644 --- a/pkg/controller/garbagecollector/garbagecollector_test.go +++ b/pkg/controller/garbagecollector/garbagecollector_test.go @@ -28,9 +28,9 @@ import ( _ "k8s.io/kubernetes/pkg/api/install" "k8s.io/kubernetes/pkg/api/meta/metatypes" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/client/typed/dynamic" "k8s.io/kubernetes/pkg/controller/garbagecollector/metaonly" diff --git a/pkg/controller/garbagecollector/metaonly/metaonly_test.go b/pkg/controller/garbagecollector/metaonly/metaonly_test.go index 89818e0b534..d41b3d20d51 100644 --- a/pkg/controller/garbagecollector/metaonly/metaonly_test.go +++ b/pkg/controller/garbagecollector/metaonly/metaonly_test.go @@ -23,8 +23,8 @@ import ( _ "k8s.io/kubernetes/pkg/api/install" "k8s.io/kubernetes/pkg/api/meta" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" "k8s.io/kubernetes/pkg/runtime/serializer" diff --git a/pkg/controller/garbagecollector/metaonly/types.generated.go b/pkg/controller/garbagecollector/metaonly/types.generated.go index e7d5d9ec398..fd0c22e5a2f 100644 --- a/pkg/controller/garbagecollector/metaonly/types.generated.go +++ b/pkg/controller/garbagecollector/metaonly/types.generated.go @@ -25,8 +25,8 @@ import ( "errors" "fmt" codec1978 "github.com/ugorji/go/codec" - pkg1_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" pkg2_v1 "k8s.io/kubernetes/pkg/api/v1" + pkg1_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" pkg3_types "k8s.io/kubernetes/pkg/types" "reflect" "runtime" @@ -63,8 +63,8 @@ func init() { panic(err) } if false { // reference the types, but skip this branch at build/run time - var v0 pkg1_unversioned.TypeMeta - var v1 pkg2_v1.ObjectMeta + var v0 pkg2_v1.ObjectMeta + var v1 pkg1_v1.TypeMeta var v2 pkg3_types.UID var v3 time.Time _, _, _, _ = v0, v1, v2, v3 @@ -544,7 +544,7 @@ func (x *MetadataOnlyObjectList) codecDecodeSelfFromMap(l int, d *codec1978.Deco } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv43 := &x.ListMeta yym44 := z.DecBinary() @@ -625,7 +625,7 @@ func (x *MetadataOnlyObjectList) codecDecodeSelfFromArray(l int, d *codec1978.De } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv50 := &x.ListMeta yym51 := z.DecBinary() diff --git a/pkg/controller/garbagecollector/metaonly/types.go b/pkg/controller/garbagecollector/metaonly/types.go index 020ea6723d1..c83cf630b58 100644 --- a/pkg/controller/garbagecollector/metaonly/types.go +++ b/pkg/controller/garbagecollector/metaonly/types.go @@ -17,8 +17,8 @@ limitations under the License. package metaonly import ( - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" ) // MetadataOnlyObject allows decoding only the apiVersion, kind, and metadata fields of diff --git a/pkg/controller/job/jobcontroller.go b/pkg/controller/job/jobcontroller.go index b4efca0c10f..90201bc20b2 100644 --- a/pkg/controller/job/jobcontroller.go +++ b/pkg/controller/job/jobcontroller.go @@ -24,9 +24,9 @@ import ( "time" "k8s.io/kubernetes/pkg/api/errors" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" batch "k8s.io/kubernetes/pkg/apis/batch/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/cache" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" v1core "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/core/v1" diff --git a/pkg/controller/job/jobcontroller_test.go b/pkg/controller/job/jobcontroller_test.go index aba09f0d865..a09a76770b3 100644 --- a/pkg/controller/job/jobcontroller_test.go +++ b/pkg/controller/job/jobcontroller_test.go @@ -22,10 +22,10 @@ import ( "time" "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" batch "k8s.io/kubernetes/pkg/apis/batch/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/cache" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/fake" diff --git a/pkg/controller/namespace/namespace_controller_test.go b/pkg/controller/namespace/namespace_controller_test.go index 47745a91510..3d06f8f5cb1 100644 --- a/pkg/controller/namespace/namespace_controller_test.go +++ b/pkg/controller/namespace/namespace_controller_test.go @@ -27,9 +27,9 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/fake" "k8s.io/kubernetes/pkg/client/restclient" diff --git a/pkg/controller/namespace/namespace_controller_utils.go b/pkg/controller/namespace/namespace_controller_utils.go index 2f121f8d34a..c7a2560a4e8 100644 --- a/pkg/controller/namespace/namespace_controller_utils.go +++ b/pkg/controller/namespace/namespace_controller_utils.go @@ -23,8 +23,8 @@ import ( "time" "k8s.io/kubernetes/pkg/api/errors" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" "k8s.io/kubernetes/pkg/client/typed/dynamic" "k8s.io/kubernetes/pkg/runtime" diff --git a/pkg/controller/node/nodecontroller.go b/pkg/controller/node/nodecontroller.go index 8ac1a7b2832..bb9501335b0 100644 --- a/pkg/controller/node/nodecontroller.go +++ b/pkg/controller/node/nodecontroller.go @@ -25,8 +25,8 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/cache" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" v1core "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/core/v1" diff --git a/pkg/controller/node/nodecontroller_test.go b/pkg/controller/node/nodecontroller_test.go index 40ceb240580..59ad62e06ea 100644 --- a/pkg/controller/node/nodecontroller_test.go +++ b/pkg/controller/node/nodecontroller_test.go @@ -24,9 +24,9 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/cache" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/fake" diff --git a/pkg/controller/node/test_utils.go b/pkg/controller/node/test_utils.go index 1d92d275e2c..11daa1ea48f 100644 --- a/pkg/controller/node/test_utils.go +++ b/pkg/controller/node/test_utils.go @@ -25,8 +25,8 @@ import ( "k8s.io/kubernetes/pkg/api" apierrors "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/resource" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/fake" v1core "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/core/v1" "k8s.io/kubernetes/pkg/runtime" diff --git a/pkg/controller/petset/fakes.go b/pkg/controller/petset/fakes.go index 721b7ebf16f..03b2cec1af9 100644 --- a/pkg/controller/petset/fakes.go +++ b/pkg/controller/petset/fakes.go @@ -23,10 +23,10 @@ import ( inf "gopkg.in/inf.v0" "k8s.io/kubernetes/pkg/api/resource" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" apipod "k8s.io/kubernetes/pkg/api/v1/pod" apps "k8s.io/kubernetes/pkg/apis/apps/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/record" "k8s.io/kubernetes/pkg/types" "k8s.io/kubernetes/pkg/util/sets" diff --git a/pkg/controller/petset/pet_set.go b/pkg/controller/petset/pet_set.go index bbbfdedf343..0ba45f847c7 100644 --- a/pkg/controller/petset/pet_set.go +++ b/pkg/controller/petset/pet_set.go @@ -22,9 +22,9 @@ import ( "sort" "time" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" apps "k8s.io/kubernetes/pkg/apis/apps/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/cache" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" v1core "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/core/v1" diff --git a/pkg/controller/podautoscaler/BUILD b/pkg/controller/podautoscaler/BUILD index c9522cb3b91..692056d285c 100644 --- a/pkg/controller/podautoscaler/BUILD +++ b/pkg/controller/podautoscaler/BUILD @@ -49,6 +49,7 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/api/resource:go_default_library", + "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apimachinery/registered:go_default_library", "//pkg/apis/autoscaling/v1:go_default_library", diff --git a/pkg/controller/podautoscaler/horizontal.go b/pkg/controller/podautoscaler/horizontal.go index 1bf20cb5f7b..890f2c474b2 100644 --- a/pkg/controller/podautoscaler/horizontal.go +++ b/pkg/controller/podautoscaler/horizontal.go @@ -24,10 +24,10 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api/resource" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" autoscaling "k8s.io/kubernetes/pkg/apis/autoscaling/v1" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/cache" unversionedautoscaling "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/autoscaling/v1" v1core "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/core/v1" diff --git a/pkg/controller/podautoscaler/horizontal_test.go b/pkg/controller/podautoscaler/horizontal_test.go index 879756e2e55..fe695ecd71c 100644 --- a/pkg/controller/podautoscaler/horizontal_test.go +++ b/pkg/controller/podautoscaler/horizontal_test.go @@ -28,11 +28,12 @@ import ( "time" "k8s.io/kubernetes/pkg/api/resource" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" + "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/api/v1" _ "k8s.io/kubernetes/pkg/apimachinery/registered" autoscaling "k8s.io/kubernetes/pkg/apis/autoscaling/v1" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/fake" v1core "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/core/v1" "k8s.io/kubernetes/pkg/client/record" @@ -308,7 +309,7 @@ func (tc *testCase) prepareTestClient(t *testing.T) *fake.Clientset { Name: fmt.Sprintf("%s-%d", podNamePrefix, i), Namespace: namespace, }, - Timestamp: metav1.Time{Time: time.Now()}, + Timestamp: unversioned.Time{Time: time.Now()}, Containers: []metricsapi.ContainerMetrics{ { Name: "container", diff --git a/pkg/controller/podautoscaler/metrics/BUILD b/pkg/controller/podautoscaler/metrics/BUILD index 52d30749973..6d663f224ed 100644 --- a/pkg/controller/podautoscaler/metrics/BUILD +++ b/pkg/controller/podautoscaler/metrics/BUILD @@ -35,9 +35,9 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/api/resource:go_default_library", + "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apimachinery/registered:go_default_library", - "//pkg/apis/meta/v1:go_default_library", "//pkg/client/clientset_generated/release_1_5/fake:go_default_library", "//pkg/client/restclient:go_default_library", "//pkg/client/testing/core:go_default_library", diff --git a/pkg/controller/podautoscaler/metrics/metrics_client_test.go b/pkg/controller/podautoscaler/metrics/metrics_client_test.go index 5e89f90ce06..1a892bab81c 100644 --- a/pkg/controller/podautoscaler/metrics/metrics_client_test.go +++ b/pkg/controller/podautoscaler/metrics/metrics_client_test.go @@ -24,7 +24,7 @@ import ( "time" "k8s.io/kubernetes/pkg/api/resource" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" + "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/api/v1" _ "k8s.io/kubernetes/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/fake" @@ -110,7 +110,7 @@ func (tc *testCase) prepareTestClient(t *testing.T) *fake.Clientset { Name: fmt.Sprintf("%s-%d", podNamePrefix, i), Namespace: namespace, }, - Timestamp: metav1.Time{Time: fixedTimestamp.Add(time.Duration(tc.targetTimestamp) * time.Minute)}, + Timestamp: unversioned.Time{Time: fixedTimestamp.Add(time.Duration(tc.targetTimestamp) * time.Minute)}, Containers: []metricsapi.ContainerMetrics{}, } for j, cpu := range containers { diff --git a/pkg/controller/podautoscaler/replica_calculator_test.go b/pkg/controller/podautoscaler/replica_calculator_test.go index 394e2921aed..8f9d779f22b 100644 --- a/pkg/controller/podautoscaler/replica_calculator_test.go +++ b/pkg/controller/podautoscaler/replica_calculator_test.go @@ -26,9 +26,10 @@ import ( "time" "k8s.io/kubernetes/pkg/api/resource" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" + "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/api/v1" _ "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/fake" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/client/testing/core" @@ -138,7 +139,7 @@ func (tc *replicaCalcTestCase) prepareTestClient(t *testing.T) *fake.Clientset { Name: fmt.Sprintf("%s-%d", podNamePrefix, i), Namespace: testNamespace, }, - Timestamp: metav1.Time{Time: tc.timestamp}, + Timestamp: unversioned.Time{Time: tc.timestamp}, Containers: []metricsapi.ContainerMetrics{ { Name: "container1", diff --git a/pkg/controller/podgc/gc_controller_test.go b/pkg/controller/podgc/gc_controller_test.go index 2194cf8d585..0521a1885f9 100644 --- a/pkg/controller/podgc/gc_controller_test.go +++ b/pkg/controller/podgc/gc_controller_test.go @@ -21,8 +21,8 @@ import ( "testing" "time" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/fake" "k8s.io/kubernetes/pkg/labels" diff --git a/pkg/controller/replicaset/replica_set.go b/pkg/controller/replicaset/replica_set.go index 50319dbae29..0bbb9491f36 100644 --- a/pkg/controller/replicaset/replica_set.go +++ b/pkg/controller/replicaset/replica_set.go @@ -27,10 +27,10 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api/errors" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/cache" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" v1core "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/core/v1" diff --git a/pkg/controller/replicaset/replica_set_test.go b/pkg/controller/replicaset/replica_set_test.go index 4c8bf54e4b4..7f85a57c173 100644 --- a/pkg/controller/replicaset/replica_set_test.go +++ b/pkg/controller/replicaset/replica_set_test.go @@ -30,10 +30,10 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/cache" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/fake" diff --git a/pkg/controller/replicaset/replica_set_utils.go b/pkg/controller/replicaset/replica_set_utils.go index 6067deeb8c6..7001595eb48 100644 --- a/pkg/controller/replicaset/replica_set_utils.go +++ b/pkg/controller/replicaset/replica_set_utils.go @@ -25,9 +25,9 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" unversionedextensions "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1" "k8s.io/kubernetes/pkg/labels" ) diff --git a/pkg/controller/replication/replication_controller_test.go b/pkg/controller/replication/replication_controller_test.go index 9e8ed414adb..dbcc369094c 100644 --- a/pkg/controller/replication/replication_controller_test.go +++ b/pkg/controller/replication/replication_controller_test.go @@ -29,9 +29,9 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/cache" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/fake" diff --git a/pkg/controller/replication/replication_controller_utils.go b/pkg/controller/replication/replication_controller_utils.go index 2364199f8ee..dc07177fded 100644 --- a/pkg/controller/replication/replication_controller_utils.go +++ b/pkg/controller/replication/replication_controller_utils.go @@ -23,8 +23,8 @@ import ( "reflect" "github.com/golang/glog" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" v1core "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/core/v1" "k8s.io/kubernetes/pkg/labels" ) diff --git a/pkg/controller/route/routecontroller.go b/pkg/controller/route/routecontroller.go index 755b9953e2d..521e6f86df0 100644 --- a/pkg/controller/route/routecontroller.go +++ b/pkg/controller/route/routecontroller.go @@ -24,8 +24,8 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api/errors" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/cache" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" "k8s.io/kubernetes/pkg/cloudprovider" diff --git a/pkg/controller/volume/persistentvolume/framework_test.go b/pkg/controller/volume/persistentvolume/framework_test.go index 17d8d9d47e2..b00944dcb8c 100644 --- a/pkg/controller/volume/persistentvolume/framework_test.go +++ b/pkg/controller/volume/persistentvolume/framework_test.go @@ -31,8 +31,8 @@ import ( "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/api/testapi" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" storage "k8s.io/kubernetes/pkg/apis/storage/v1beta1" storageutil "k8s.io/kubernetes/pkg/apis/storage/v1beta1/util" "k8s.io/kubernetes/pkg/client/cache" diff --git a/pkg/controller/volume/persistentvolume/index.go b/pkg/controller/volume/persistentvolume/index.go index 219e36ebe3a..b95572a61aa 100644 --- a/pkg/controller/volume/persistentvolume/index.go +++ b/pkg/controller/volume/persistentvolume/index.go @@ -20,8 +20,8 @@ import ( "fmt" "sort" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" storageutil "k8s.io/kubernetes/pkg/apis/storage/v1beta1/util" "k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/labels" diff --git a/pkg/controller/volume/persistentvolume/index_test.go b/pkg/controller/volume/persistentvolume/index_test.go index 3f72901048e..54a09503294 100644 --- a/pkg/controller/volume/persistentvolume/index_test.go +++ b/pkg/controller/volume/persistentvolume/index_test.go @@ -22,8 +22,8 @@ import ( "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/api/testapi" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" storageutil "k8s.io/kubernetes/pkg/apis/storage/v1beta1/util" ) diff --git a/pkg/controller/volume/persistentvolume/provision_test.go b/pkg/controller/volume/persistentvolume/provision_test.go index b59da31bb2e..f2b16e83f9c 100644 --- a/pkg/controller/volume/persistentvolume/provision_test.go +++ b/pkg/controller/volume/persistentvolume/provision_test.go @@ -20,8 +20,8 @@ import ( "errors" "testing" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" storage "k8s.io/kubernetes/pkg/apis/storage/v1beta1" storageutil "k8s.io/kubernetes/pkg/apis/storage/v1beta1/util" ) diff --git a/pkg/controller/volume/persistentvolume/pv_controller.go b/pkg/controller/volume/persistentvolume/pv_controller.go index 8ff07d43062..056b7a57317 100644 --- a/pkg/controller/volume/persistentvolume/pv_controller.go +++ b/pkg/controller/volume/persistentvolume/pv_controller.go @@ -22,8 +22,8 @@ import ( "strings" "time" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" storage "k8s.io/kubernetes/pkg/apis/storage/v1beta1" storageutil "k8s.io/kubernetes/pkg/apis/storage/v1beta1/util" "k8s.io/kubernetes/pkg/client/cache" diff --git a/pkg/conversion/queryparams/convert_test.go b/pkg/conversion/queryparams/convert_test.go index fc2b6506031..506bbbefb9e 100644 --- a/pkg/conversion/queryparams/convert_test.go +++ b/pkg/conversion/queryparams/convert_test.go @@ -66,10 +66,10 @@ func (obj *baz) GetObjectKind() schema.ObjectKind { return schema.EmptyObjectKin // childStructs tests some of the types we serialize to query params for log API calls // notably, the nested time struct type childStructs struct { - Container string `json:"container,omitempty"` - Follow bool `json:"follow,omitempty"` - Previous bool `json:"previous,omitempty"` - SinceSeconds *int64 `json:"sinceSeconds,omitempty"` + Container string `json:"container,omitempty"` + Follow bool `json:"follow,omitempty"` + Previous bool `json:"previous,omitempty"` + SinceSeconds *int64 `json:"sinceSeconds,omitempty"` SinceTime *metav1.Time `json:"sinceTime,omitempty"` EmptyTime *metav1.Time `json:"emptyTime"` } diff --git a/pkg/dns/dns.go b/pkg/dns/dns.go index 4add22f5227..88d74fc96bf 100644 --- a/pkg/dns/dns.go +++ b/pkg/dns/dns.go @@ -27,9 +27,9 @@ import ( etcd "github.com/coreos/etcd/client" "github.com/miekg/dns" skymsg "github.com/skynetservices/skydns/msg" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/api/v1/endpoints" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" kcache "k8s.io/kubernetes/pkg/client/cache" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" "k8s.io/kubernetes/pkg/dns/config" diff --git a/pkg/dns/dns_test.go b/pkg/dns/dns_test.go index 0ce3ff61dbd..1f8ae057892 100644 --- a/pkg/dns/dns_test.go +++ b/pkg/dns/dns_test.go @@ -32,9 +32,9 @@ import ( skyserver "github.com/skynetservices/skydns/server" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" endpointsapi "k8s.io/kubernetes/pkg/api/v1/endpoints" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/cache" fake "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/fake" "k8s.io/kubernetes/pkg/dns/config" diff --git a/pkg/genericapiserver/config.go b/pkg/genericapiserver/config.go index 864c8925ac1..4f86fd2247c 100644 --- a/pkg/genericapiserver/config.go +++ b/pkg/genericapiserver/config.go @@ -37,8 +37,8 @@ import ( "k8s.io/kubernetes/pkg/admission" "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" apiserverauthenticator "k8s.io/kubernetes/pkg/apiserver/authenticator" apiserverfilters "k8s.io/kubernetes/pkg/apiserver/filters" apiserveropenapi "k8s.io/kubernetes/pkg/apiserver/openapi" diff --git a/pkg/genericapiserver/genericapiserver.go b/pkg/genericapiserver/genericapiserver.go index 84674e376f8..af95c8f65c5 100644 --- a/pkg/genericapiserver/genericapiserver.go +++ b/pkg/genericapiserver/genericapiserver.go @@ -32,9 +32,9 @@ import ( "k8s.io/kubernetes/pkg/admission" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apimachinery" "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apiserver" "k8s.io/kubernetes/pkg/client/restclient" genericmux "k8s.io/kubernetes/pkg/genericapiserver/mux" diff --git a/pkg/genericapiserver/genericapiserver_test.go b/pkg/genericapiserver/genericapiserver_test.go index 924d52cbb67..e7d983b7f72 100644 --- a/pkg/genericapiserver/genericapiserver_test.go +++ b/pkg/genericapiserver/genericapiserver_test.go @@ -30,9 +30,9 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/api/testapi" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/apis/extensions" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/auth/authorizer" "k8s.io/kubernetes/pkg/auth/user" openapigen "k8s.io/kubernetes/pkg/generated/openapi" diff --git a/pkg/kubectl/cmd/BUILD b/pkg/kubectl/cmd/BUILD index 1bcc87ec783..454b4db5d8e 100644 --- a/pkg/kubectl/cmd/BUILD +++ b/pkg/kubectl/cmd/BUILD @@ -176,6 +176,7 @@ go_test( "//pkg/api/resource:go_default_library", "//pkg/api/testapi:go_default_library", "//pkg/api/testing:go_default_library", + "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apimachinery/registered:go_default_library", "//pkg/apis/batch:go_default_library", diff --git a/pkg/kubectl/cmd/certificates.go b/pkg/kubectl/cmd/certificates.go index f87080863c8..12e9af67aa2 100644 --- a/pkg/kubectl/cmd/certificates.go +++ b/pkg/kubectl/cmd/certificates.go @@ -20,8 +20,8 @@ import ( "fmt" "io" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/certificates" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/resource" diff --git a/pkg/kubectl/cmd/cmd_test.go b/pkg/kubectl/cmd/cmd_test.go index 7e63fe0b32a..2d25e0e45b5 100644 --- a/pkg/kubectl/cmd/cmd_test.go +++ b/pkg/kubectl/cmd/cmd_test.go @@ -30,8 +30,8 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/client/restclient/fake" "k8s.io/kubernetes/pkg/kubectl" diff --git a/pkg/kubectl/cmd/delete_test.go b/pkg/kubectl/cmd/delete_test.go index d6174c70a91..4c80e84c424 100644 --- a/pkg/kubectl/cmd/delete_test.go +++ b/pkg/kubectl/cmd/delete_test.go @@ -26,8 +26,8 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/meta" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/client/restclient/fake" "k8s.io/kubernetes/pkg/client/typed/dynamic" diff --git a/pkg/kubectl/cmd/drain_test.go b/pkg/kubectl/cmd/drain_test.go index c8a023ebd69..71b971dd058 100644 --- a/pkg/kubectl/cmd/drain_test.go +++ b/pkg/kubectl/cmd/drain_test.go @@ -36,9 +36,9 @@ import ( "k8s.io/kubernetes/pkg/api" apierrors "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/testapi" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/batch" "k8s.io/kubernetes/pkg/apis/extensions" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/policy" "k8s.io/kubernetes/pkg/client/restclient/fake" "k8s.io/kubernetes/pkg/conversion" diff --git a/pkg/kubectl/cmd/get_test.go b/pkg/kubectl/cmd/get_test.go index 6a9fd75ae2c..e8a278fdb8a 100644 --- a/pkg/kubectl/cmd/get_test.go +++ b/pkg/kubectl/cmd/get_test.go @@ -30,8 +30,8 @@ import ( "k8s.io/kubernetes/pkg/api/meta" "k8s.io/kubernetes/pkg/api/testapi" apitesting "k8s.io/kubernetes/pkg/api/testing" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/client/restclient/fake" cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" diff --git a/pkg/kubectl/cmd/logs.go b/pkg/kubectl/cmd/logs.go index 64660ef3c4b..fc030727336 100644 --- a/pkg/kubectl/cmd/logs.go +++ b/pkg/kubectl/cmd/logs.go @@ -26,8 +26,8 @@ import ( "github.com/spf13/cobra" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/meta" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/validation" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" diff --git a/pkg/kubectl/cmd/run.go b/pkg/kubectl/cmd/run.go index d66d36e473a..61ca97436f3 100644 --- a/pkg/kubectl/cmd/run.go +++ b/pkg/kubectl/cmd/run.go @@ -29,9 +29,9 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/meta" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" batchv1 "k8s.io/kubernetes/pkg/apis/batch/v1" "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" conditions "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/kubectl" diff --git a/pkg/kubectl/cmd/testing/fake.go b/pkg/kubectl/cmd/testing/fake.go index c82c42b9f0e..a08a37a1fe1 100644 --- a/pkg/kubectl/cmd/testing/fake.go +++ b/pkg/kubectl/cmd/testing/fake.go @@ -28,9 +28,9 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/meta" "k8s.io/kubernetes/pkg/api/testapi" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/validation" "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/client/restclient/fake" diff --git a/pkg/kubectl/cmd/top_test.go b/pkg/kubectl/cmd/top_test.go index 117c59804cf..a1e9a130eb4 100644 --- a/pkg/kubectl/cmd/top_test.go +++ b/pkg/kubectl/cmd/top_test.go @@ -28,8 +28,9 @@ import ( metricsapi "k8s.io/heapster/metrics/apis/metrics/v1alpha1" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" + "k8s.io/kubernetes/pkg/api/unversioned" v1 "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" ) @@ -61,13 +62,13 @@ func marshallBody(metrics interface{}) (io.ReadCloser, error) { func testNodeMetricsData() (*metricsapi.NodeMetricsList, *api.NodeList) { metrics := &metricsapi.NodeMetricsList{ - ListMeta: metav1.ListMeta{ + ListMeta: unversioned.ListMeta{ ResourceVersion: "1", }, Items: []metricsapi.NodeMetrics{ { ObjectMeta: v1.ObjectMeta{Name: "node1", ResourceVersion: "10"}, - Window: metav1.Duration{Duration: time.Minute}, + Window: unversioned.Duration{Duration: time.Minute}, Usage: v1.ResourceList{ v1.ResourceCPU: *resource.NewMilliQuantity(1, resource.DecimalSI), v1.ResourceMemory: *resource.NewQuantity(2*(1024*1024), resource.DecimalSI), @@ -76,7 +77,7 @@ func testNodeMetricsData() (*metricsapi.NodeMetricsList, *api.NodeList) { }, { ObjectMeta: v1.ObjectMeta{Name: "node2", ResourceVersion: "11"}, - Window: metav1.Duration{Duration: time.Minute}, + Window: unversioned.Duration{Duration: time.Minute}, Usage: v1.ResourceList{ v1.ResourceCPU: *resource.NewMilliQuantity(5, resource.DecimalSI), v1.ResourceMemory: *resource.NewQuantity(6*(1024*1024), resource.DecimalSI), @@ -117,13 +118,13 @@ func testNodeMetricsData() (*metricsapi.NodeMetricsList, *api.NodeList) { func testPodMetricsData() *metricsapi.PodMetricsList { return &metricsapi.PodMetricsList{ - ListMeta: metav1.ListMeta{ + ListMeta: unversioned.ListMeta{ ResourceVersion: "2", }, Items: []metricsapi.PodMetrics{ { ObjectMeta: v1.ObjectMeta{Name: "pod1", Namespace: "test", ResourceVersion: "10"}, - Window: metav1.Duration{Duration: time.Minute}, + Window: unversioned.Duration{Duration: time.Minute}, Containers: []metricsapi.ContainerMetrics{ { Name: "container1-1", @@ -145,7 +146,7 @@ func testPodMetricsData() *metricsapi.PodMetricsList { }, { ObjectMeta: v1.ObjectMeta{Name: "pod2", Namespace: "test", ResourceVersion: "11"}, - Window: metav1.Duration{Duration: time.Minute}, + Window: unversioned.Duration{Duration: time.Minute}, Containers: []metricsapi.ContainerMetrics{ { Name: "container2-1", @@ -175,7 +176,7 @@ func testPodMetricsData() *metricsapi.PodMetricsList { }, { ObjectMeta: v1.ObjectMeta{Name: "pod3", Namespace: "test", ResourceVersion: "12"}, - Window: metav1.Duration{Duration: time.Minute}, + Window: unversioned.Duration{Duration: time.Minute}, Containers: []metricsapi.ContainerMetrics{ { Name: "container3-1", diff --git a/pkg/kubectl/cmd/util/factory.go b/pkg/kubectl/cmd/util/factory.go index cdb927c4d1c..5bad47bef51 100644 --- a/pkg/kubectl/cmd/util/factory.go +++ b/pkg/kubectl/cmd/util/factory.go @@ -41,13 +41,13 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/meta" "k8s.io/kubernetes/pkg/api/service" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/api/validation" "k8s.io/kubernetes/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/apis/apps" "k8s.io/kubernetes/pkg/apis/batch" "k8s.io/kubernetes/pkg/apis/extensions" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" "k8s.io/kubernetes/pkg/client/restclient" diff --git a/pkg/kubectl/cmd/util/factory_test.go b/pkg/kubectl/cmd/util/factory_test.go index a7ddfc7deb3..22f1fe5961b 100644 --- a/pkg/kubectl/cmd/util/factory_test.go +++ b/pkg/kubectl/cmd/util/factory_test.go @@ -34,11 +34,11 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/meta" "k8s.io/kubernetes/pkg/api/testapi" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/api/validation" "k8s.io/kubernetes/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/apis/extensions" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/fake" manualfake "k8s.io/kubernetes/pkg/client/restclient/fake" testcore "k8s.io/kubernetes/pkg/client/testing/core" diff --git a/pkg/kubectl/cmd/util/helpers.go b/pkg/kubectl/cmd/util/helpers.go index c057f678f80..7491586b32b 100644 --- a/pkg/kubectl/cmd/util/helpers.go +++ b/pkg/kubectl/cmd/util/helpers.go @@ -31,9 +31,9 @@ import ( "k8s.io/kubernetes/pkg/api" kerrors "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/meta" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/apis/extensions" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/unversioned/clientcmd" "k8s.io/kubernetes/pkg/kubectl" "k8s.io/kubernetes/pkg/kubectl/resource" diff --git a/pkg/kubectl/cmd/util/helpers_test.go b/pkg/kubectl/cmd/util/helpers_test.go index 8ca600b1179..256bbb6497f 100644 --- a/pkg/kubectl/cmd/util/helpers_test.go +++ b/pkg/kubectl/cmd/util/helpers_test.go @@ -31,10 +31,10 @@ import ( "k8s.io/kubernetes/pkg/api/meta" "k8s.io/kubernetes/pkg/api/testapi" apitesting "k8s.io/kubernetes/pkg/api/testing" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/apis/extensions" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" uexec "k8s.io/kubernetes/pkg/util/exec" diff --git a/pkg/kubectl/custom_column_printer_test.go b/pkg/kubectl/custom_column_printer_test.go index 372906831a7..8373ecc566a 100644 --- a/pkg/kubectl/custom_column_printer_test.go +++ b/pkg/kubectl/custom_column_printer_test.go @@ -23,8 +23,8 @@ import ( "testing" "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" ) diff --git a/pkg/kubectl/deployment.go b/pkg/kubectl/deployment.go index f5f709cd042..c167702fb3e 100644 --- a/pkg/kubectl/deployment.go +++ b/pkg/kubectl/deployment.go @@ -21,8 +21,8 @@ import ( "strings" "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/extensions" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" ) diff --git a/pkg/kubectl/deployment_test.go b/pkg/kubectl/deployment_test.go index 9a3875a0489..1d905be9262 100644 --- a/pkg/kubectl/deployment_test.go +++ b/pkg/kubectl/deployment_test.go @@ -21,8 +21,8 @@ import ( "testing" "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/extensions" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" ) func TestDeploymentGenerate(t *testing.T) { diff --git a/pkg/kubectl/describe.go b/pkg/kubectl/describe.go index 99e1fde3f24..da369ebc07f 100644 --- a/pkg/kubectl/describe.go +++ b/pkg/kubectl/describe.go @@ -34,13 +34,13 @@ import ( "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/events" "k8s.io/kubernetes/pkg/api/resource" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/apps" "k8s.io/kubernetes/pkg/apis/autoscaling" "k8s.io/kubernetes/pkg/apis/batch" "k8s.io/kubernetes/pkg/apis/certificates" "k8s.io/kubernetes/pkg/apis/extensions" versionedextension "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/policy" "k8s.io/kubernetes/pkg/apis/storage" storageutil "k8s.io/kubernetes/pkg/apis/storage/util" diff --git a/pkg/kubectl/describe_test.go b/pkg/kubectl/describe_test.go index 70dc1fb01b2..616a5f5aff4 100644 --- a/pkg/kubectl/describe_test.go +++ b/pkg/kubectl/describe_test.go @@ -29,10 +29,10 @@ import ( fedfake "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/fake" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/policy" "k8s.io/kubernetes/pkg/apis/storage" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" diff --git a/pkg/kubectl/resource/builder_test.go b/pkg/kubectl/resource/builder_test.go index db84f5ff44c..15b928d2117 100644 --- a/pkg/kubectl/resource/builder_test.go +++ b/pkg/kubectl/resource/builder_test.go @@ -35,9 +35,9 @@ import ( "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/api/testapi" apitesting "k8s.io/kubernetes/pkg/api/testing" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/restclient/fake" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/serializer/streaming" diff --git a/pkg/kubectl/resource/helper_test.go b/pkg/kubectl/resource/helper_test.go index 117744edcb1..c3613153b9d 100644 --- a/pkg/kubectl/resource/helper_test.go +++ b/pkg/kubectl/resource/helper_test.go @@ -29,8 +29,8 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" apitesting "k8s.io/kubernetes/pkg/api/testing" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/restclient/fake" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/runtime" diff --git a/pkg/kubectl/resource/result.go b/pkg/kubectl/resource/result.go index 2bc343b159d..f703af06c60 100644 --- a/pkg/kubectl/resource/result.go +++ b/pkg/kubectl/resource/result.go @@ -22,9 +22,9 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/meta" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/apis/extensions" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" utilerrors "k8s.io/kubernetes/pkg/util/errors" diff --git a/pkg/kubectl/resource_printer.go b/pkg/kubectl/resource_printer.go index 63fafaade1e..92fb978bcde 100644 --- a/pkg/kubectl/resource_printer.go +++ b/pkg/kubectl/resource_printer.go @@ -34,12 +34,12 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/events" "k8s.io/kubernetes/pkg/api/meta" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/apps" "k8s.io/kubernetes/pkg/apis/autoscaling" "k8s.io/kubernetes/pkg/apis/batch" "k8s.io/kubernetes/pkg/apis/certificates" "k8s.io/kubernetes/pkg/apis/extensions" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/policy" "k8s.io/kubernetes/pkg/apis/rbac" "k8s.io/kubernetes/pkg/apis/storage" diff --git a/pkg/kubectl/resource_printer_test.go b/pkg/kubectl/resource_printer_test.go index 2f2426813a6..f2634b59abd 100644 --- a/pkg/kubectl/resource_printer_test.go +++ b/pkg/kubectl/resource_printer_test.go @@ -28,11 +28,11 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/apis/batch" "k8s.io/kubernetes/pkg/apis/extensions" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/policy" kubectltesting "k8s.io/kubernetes/pkg/kubectl/testing" "k8s.io/kubernetes/pkg/runtime" diff --git a/pkg/kubectl/rolling_updater.go b/pkg/kubectl/rolling_updater.go index 5b44b6afe57..e1e2af81e69 100644 --- a/pkg/kubectl/rolling_updater.go +++ b/pkg/kubectl/rolling_updater.go @@ -26,8 +26,8 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" "k8s.io/kubernetes/pkg/client/retry" client "k8s.io/kubernetes/pkg/client/unversioned" diff --git a/pkg/kubectl/rolling_updater_test.go b/pkg/kubectl/rolling_updater_test.go index abb4332306c..3eac8b3f582 100644 --- a/pkg/kubectl/rolling_updater_test.go +++ b/pkg/kubectl/rolling_updater_test.go @@ -30,8 +30,8 @@ import ( "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/testapi" apitesting "k8s.io/kubernetes/pkg/api/testing" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/fake" "k8s.io/kubernetes/pkg/client/restclient" diff --git a/pkg/kubectl/run.go b/pkg/kubectl/run.go index 717f00a1854..cc06c1efb54 100644 --- a/pkg/kubectl/run.go +++ b/pkg/kubectl/run.go @@ -23,12 +23,12 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apis/batch" batchv1 "k8s.io/kubernetes/pkg/apis/batch/v1" batchv2alpha1 "k8s.io/kubernetes/pkg/apis/batch/v2alpha1" "k8s.io/kubernetes/pkg/apis/extensions" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/util/validation" ) diff --git a/pkg/kubectl/run_test.go b/pkg/kubectl/run_test.go index b104ea54934..5822a83f2d5 100644 --- a/pkg/kubectl/run_test.go +++ b/pkg/kubectl/run_test.go @@ -22,9 +22,9 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/batch" "k8s.io/kubernetes/pkg/apis/extensions" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" ) func TestGenerate(t *testing.T) { diff --git a/pkg/kubectl/sorting_printer.go b/pkg/kubectl/sorting_printer.go index 606edb88d85..3c1e2e37d51 100644 --- a/pkg/kubectl/sorting_printer.go +++ b/pkg/kubectl/sorting_printer.go @@ -23,8 +23,8 @@ import ( "sort" "k8s.io/kubernetes/pkg/api/meta" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/util/integer" "k8s.io/kubernetes/pkg/util/jsonpath" diff --git a/pkg/kubectl/sorting_printer_test.go b/pkg/kubectl/sorting_printer_test.go index 07dd209c344..9c17f42e3f8 100644 --- a/pkg/kubectl/sorting_printer_test.go +++ b/pkg/kubectl/sorting_printer_test.go @@ -21,8 +21,8 @@ import ( "testing" internal "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" api "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" ) diff --git a/pkg/kubectl/stop.go b/pkg/kubectl/stop.go index 0e70ef07534..a90e12df92e 100644 --- a/pkg/kubectl/stop.go +++ b/pkg/kubectl/stop.go @@ -24,10 +24,10 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/meta" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/apps" "k8s.io/kubernetes/pkg/apis/batch" "k8s.io/kubernetes/pkg/apis/extensions" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" appsclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion" batchclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion" diff --git a/pkg/kubectl/stop_test.go b/pkg/kubectl/stop_test.go index dbef9d1a1bb..7d16fdbb90b 100644 --- a/pkg/kubectl/stop_test.go +++ b/pkg/kubectl/stop_test.go @@ -25,9 +25,9 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/batch" "k8s.io/kubernetes/pkg/apis/extensions" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/fake" coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" testcore "k8s.io/kubernetes/pkg/client/testing/core" diff --git a/pkg/kubectl/testing/types.generated.go b/pkg/kubectl/testing/types.generated.go index d4c0db20f74..d9944eabf12 100644 --- a/pkg/kubectl/testing/types.generated.go +++ b/pkg/kubectl/testing/types.generated.go @@ -26,7 +26,7 @@ import ( "fmt" codec1978 "github.com/ugorji/go/codec" pkg2_api "k8s.io/kubernetes/pkg/api" - pkg1_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" + pkg1_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" pkg3_types "k8s.io/kubernetes/pkg/types" "reflect" "runtime" @@ -64,7 +64,7 @@ func init() { } if false { // reference the types, but skip this branch at build/run time var v0 pkg2_api.ObjectMeta - var v1 pkg1_unversioned.TypeMeta + var v1 pkg1_v1.TypeMeta var v2 pkg3_types.UID var v3 time.Time _, _, _, _ = v0, v1, v2, v3 diff --git a/pkg/kubelet/active_deadline_test.go b/pkg/kubelet/active_deadline_test.go index 2b676df058a..a859422313a 100644 --- a/pkg/kubelet/active_deadline_test.go +++ b/pkg/kubelet/active_deadline_test.go @@ -20,8 +20,8 @@ import ( "testing" "time" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/record" "k8s.io/kubernetes/pkg/types" "k8s.io/kubernetes/pkg/util/clock" diff --git a/pkg/kubelet/config/common_test.go b/pkg/kubelet/config/common_test.go index c714ffd208a..dc815b9e461 100644 --- a/pkg/kubelet/config/common_test.go +++ b/pkg/kubelet/config/common_test.go @@ -22,9 +22,9 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/securitycontext" ) diff --git a/pkg/kubelet/config/config_test.go b/pkg/kubelet/config/config_test.go index 098cc156bca..99d8066f046 100644 --- a/pkg/kubelet/config/config_test.go +++ b/pkg/kubelet/config/config_test.go @@ -25,8 +25,8 @@ import ( "time" "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/record" "k8s.io/kubernetes/pkg/conversion" kubetypes "k8s.io/kubernetes/pkg/kubelet/types" diff --git a/pkg/kubelet/config/file_linux_test.go b/pkg/kubelet/config/file_linux_test.go index 044be0ccfeb..c0af7e5de94 100644 --- a/pkg/kubelet/config/file_linux_test.go +++ b/pkg/kubelet/config/file_linux_test.go @@ -31,9 +31,9 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/api/validation" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" kubetypes "k8s.io/kubernetes/pkg/kubelet/types" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/securitycontext" diff --git a/pkg/kubelet/config/http_test.go b/pkg/kubelet/config/http_test.go index 3a42169edd0..ebc79dc8620 100644 --- a/pkg/kubelet/config/http_test.go +++ b/pkg/kubelet/config/http_test.go @@ -25,10 +25,10 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/api/validation" "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" kubetypes "k8s.io/kubernetes/pkg/kubelet/types" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/types" diff --git a/pkg/kubelet/container/helpers.go b/pkg/kubelet/container/helpers.go index 33a5f2c8b8a..66fdc284fca 100644 --- a/pkg/kubelet/container/helpers.go +++ b/pkg/kubelet/container/helpers.go @@ -25,8 +25,8 @@ import ( "github.com/golang/glog" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/record" runtimeapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime" "k8s.io/kubernetes/pkg/kubelet/util/format" diff --git a/pkg/kubelet/container/ref_test.go b/pkg/kubelet/container/ref_test.go index 14ef351c5f9..2e8e1627aec 100644 --- a/pkg/kubelet/container/ref_test.go +++ b/pkg/kubelet/container/ref_test.go @@ -19,9 +19,9 @@ package container import ( "testing" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" ) func TestFieldPath(t *testing.T) { diff --git a/pkg/kubelet/dockertools/docker_manager.go b/pkg/kubelet/dockertools/docker_manager.go index 30ea7a108d7..804f9156e4e 100644 --- a/pkg/kubelet/dockertools/docker_manager.go +++ b/pkg/kubelet/dockertools/docker_manager.go @@ -44,8 +44,8 @@ import ( cadvisorapi "github.com/google/cadvisor/info/v1" "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/record" "k8s.io/kubernetes/pkg/kubelet/cm" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" diff --git a/pkg/kubelet/eviction/helpers_test.go b/pkg/kubelet/eviction/helpers_test.go index fb710711d29..f99b4822ff7 100644 --- a/pkg/kubelet/eviction/helpers_test.go +++ b/pkg/kubelet/eviction/helpers_test.go @@ -24,8 +24,8 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" statsapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/stats" "k8s.io/kubernetes/pkg/quota" "k8s.io/kubernetes/pkg/types" diff --git a/pkg/kubelet/eviction/types.go b/pkg/kubelet/eviction/types.go index 8a68663fc6c..f601dc5f2de 100644 --- a/pkg/kubelet/eviction/types.go +++ b/pkg/kubelet/eviction/types.go @@ -20,8 +20,8 @@ import ( "time" "k8s.io/kubernetes/pkg/api/resource" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" statsapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/stats" ) diff --git a/pkg/kubelet/kubelet_node_status.go b/pkg/kubelet/kubelet_node_status.go index b5f202c5d6e..4c938fb4a83 100644 --- a/pkg/kubelet/kubelet_node_status.go +++ b/pkg/kubelet/kubelet_node_status.go @@ -28,8 +28,8 @@ import ( "github.com/golang/glog" apierrors "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/resource" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/cloudprovider" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/kubelet/cadvisor" diff --git a/pkg/kubelet/kubelet_node_status_test.go b/pkg/kubelet/kubelet_node_status_test.go index b741674a81c..4a870380a22 100644 --- a/pkg/kubelet/kubelet_node_status_test.go +++ b/pkg/kubelet/kubelet_node_status_test.go @@ -30,8 +30,8 @@ import ( "k8s.io/kubernetes/pkg/api" apierrors "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/resource" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/fake" "k8s.io/kubernetes/pkg/client/testing/core" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" diff --git a/pkg/kubelet/kubelet_pods.go b/pkg/kubelet/kubelet_pods.go index 28d597cf49b..2aa495bed9a 100644 --- a/pkg/kubelet/kubelet_pods.go +++ b/pkg/kubelet/kubelet_pods.go @@ -33,10 +33,10 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" utilpod "k8s.io/kubernetes/pkg/api/v1/pod" "k8s.io/kubernetes/pkg/api/v1/validation" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/fieldpath" "k8s.io/kubernetes/pkg/kubelet/cm" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" diff --git a/pkg/kubelet/kubelet_test.go b/pkg/kubelet/kubelet_test.go index 86b5bb40467..085a03d2118 100644 --- a/pkg/kubelet/kubelet_test.go +++ b/pkg/kubelet/kubelet_test.go @@ -29,9 +29,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "k8s.io/kubernetes/pkg/api/resource" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apis/componentconfig" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/capabilities" "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/fake" "k8s.io/kubernetes/pkg/client/record" diff --git a/pkg/kubelet/kuberuntime/kuberuntime_container.go b/pkg/kubelet/kuberuntime/kuberuntime_container.go index 9118bff417d..73070c113d0 100644 --- a/pkg/kubelet/kuberuntime/kuberuntime_container.go +++ b/pkg/kubelet/kuberuntime/kuberuntime_container.go @@ -29,8 +29,8 @@ import ( "time" "github.com/golang/glog" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" runtimeapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/kubelet/events" diff --git a/pkg/kubelet/kuberuntime/kuberuntime_logs_test.go b/pkg/kubelet/kuberuntime/kuberuntime_logs_test.go index 3683bb6b90a..e228929ba22 100644 --- a/pkg/kubelet/kuberuntime/kuberuntime_logs_test.go +++ b/pkg/kubelet/kuberuntime/kuberuntime_logs_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" ) func TestLogOptions(t *testing.T) { diff --git a/pkg/kubelet/network/exec/exec.go b/pkg/kubelet/network/exec/exec.go index 0335872bdd7..2695830f4f5 100644 --- a/pkg/kubelet/network/exec/exec.go +++ b/pkg/kubelet/network/exec/exec.go @@ -65,8 +65,8 @@ import ( "strings" "github.com/golang/glog" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/componentconfig" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/kubelet/network" utilexec "k8s.io/kubernetes/pkg/util/exec" diff --git a/pkg/kubelet/network/plugins.go b/pkg/kubelet/network/plugins.go index 4220f083fdf..e1aec26502f 100644 --- a/pkg/kubelet/network/plugins.go +++ b/pkg/kubelet/network/plugins.go @@ -24,9 +24,9 @@ import ( clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" "github.com/golang/glog" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apis/componentconfig" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" utilerrors "k8s.io/kubernetes/pkg/util/errors" utilexec "k8s.io/kubernetes/pkg/util/exec" diff --git a/pkg/kubelet/oom_watcher.go b/pkg/kubelet/oom_watcher.go index 692ecbfd779..268ae4b0427 100644 --- a/pkg/kubelet/oom_watcher.go +++ b/pkg/kubelet/oom_watcher.go @@ -20,8 +20,8 @@ import ( "github.com/golang/glog" "github.com/google/cadvisor/events" cadvisorapi "github.com/google/cadvisor/info/v1" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/record" "k8s.io/kubernetes/pkg/kubelet/cadvisor" "k8s.io/kubernetes/pkg/util/runtime" diff --git a/pkg/kubelet/prober/common_test.go b/pkg/kubelet/prober/common_test.go index 88e50633606..c2f7aad1dc4 100644 --- a/pkg/kubelet/prober/common_test.go +++ b/pkg/kubelet/prober/common_test.go @@ -20,8 +20,8 @@ import ( "reflect" "sync" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/fake" "k8s.io/kubernetes/pkg/client/record" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" diff --git a/pkg/kubelet/prober/worker_test.go b/pkg/kubelet/prober/worker_test.go index d786edaedb6..a2ba16b45af 100644 --- a/pkg/kubelet/prober/worker_test.go +++ b/pkg/kubelet/prober/worker_test.go @@ -21,8 +21,8 @@ import ( "testing" "time" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/fake" "k8s.io/kubernetes/pkg/client/record" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" diff --git a/pkg/kubelet/rkt/log.go b/pkg/kubelet/rkt/log.go index 3ceee625f33..ec67decb977 100644 --- a/pkg/kubelet/rkt/log.go +++ b/pkg/kubelet/rkt/log.go @@ -26,8 +26,8 @@ import ( "golang.org/x/net/context" rktapi "github.com/coreos/rkt/api/v1alpha" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/kubelet/util/format" ) diff --git a/pkg/kubelet/server/server.go b/pkg/kubelet/server/server.go index e8062da1db3..6335d73c583 100644 --- a/pkg/kubelet/server/server.go +++ b/pkg/kubelet/server/server.go @@ -37,9 +37,9 @@ import ( "k8s.io/kubernetes/pkg/api" apierrs "k8s.io/kubernetes/pkg/api/errors" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/api/v1/validation" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/auth/authenticator" "k8s.io/kubernetes/pkg/auth/authorizer" "k8s.io/kubernetes/pkg/healthz" diff --git a/pkg/kubelet/server/stats/summary.go b/pkg/kubelet/server/stats/summary.go index 43c10c5fbae..3c313a2aff1 100644 --- a/pkg/kubelet/server/stats/summary.go +++ b/pkg/kubelet/server/stats/summary.go @@ -21,8 +21,8 @@ import ( "strings" "time" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/stats" "k8s.io/kubernetes/pkg/kubelet/cm" "k8s.io/kubernetes/pkg/kubelet/container" diff --git a/pkg/kubelet/server/stats/summary_test.go b/pkg/kubelet/server/stats/summary_test.go index fa94b7d1e89..c0ae4a3ed52 100644 --- a/pkg/kubelet/server/stats/summary_test.go +++ b/pkg/kubelet/server/stats/summary_test.go @@ -25,8 +25,8 @@ import ( fuzz "github.com/google/gofuzz" "github.com/stretchr/testify/assert" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" k8sv1 "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" kubestats "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/stats" "k8s.io/kubernetes/pkg/kubelet/cm" "k8s.io/kubernetes/pkg/kubelet/container" diff --git a/pkg/kubelet/status/status_manager.go b/pkg/kubelet/status/status_manager.go index f7ccd51af48..c8cd617cf2c 100644 --- a/pkg/kubelet/status/status_manager.go +++ b/pkg/kubelet/status/status_manager.go @@ -26,9 +26,9 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" podutil "k8s.io/kubernetes/pkg/api/v1/pod" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" kubepod "k8s.io/kubernetes/pkg/kubelet/pod" kubetypes "k8s.io/kubernetes/pkg/kubelet/types" diff --git a/pkg/kubelet/status/status_manager_test.go b/pkg/kubelet/status/status_manager_test.go index ccc3ad449ef..ed710fcaa6c 100644 --- a/pkg/kubelet/status/status_manager_test.go +++ b/pkg/kubelet/status/status_manager_test.go @@ -32,8 +32,8 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" kubepod "k8s.io/kubernetes/pkg/kubelet/pod" podtest "k8s.io/kubernetes/pkg/kubelet/pod/testing" diff --git a/pkg/kubelet/util/csr/csr.go b/pkg/kubelet/util/csr/csr.go index 284a7ef4aee..3fc7fc1dccb 100644 --- a/pkg/kubelet/util/csr/csr.go +++ b/pkg/kubelet/util/csr/csr.go @@ -20,9 +20,9 @@ import ( "crypto/x509/pkix" "fmt" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" certificates "k8s.io/kubernetes/pkg/apis/certificates/v1alpha1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" unversionedcertificates "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/certificates/v1alpha1" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/types" diff --git a/pkg/master/master_test.go b/pkg/master/master_test.go index 29e532343ee..87b324c1f2b 100644 --- a/pkg/master/master_test.go +++ b/pkg/master/master_test.go @@ -28,7 +28,6 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" apiv1 "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/apis/apps" @@ -41,6 +40,7 @@ import ( "k8s.io/kubernetes/pkg/apis/certificates" "k8s.io/kubernetes/pkg/apis/extensions" extensionsapiv1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/rbac" "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/fake" "k8s.io/kubernetes/pkg/client/restclient" diff --git a/pkg/master/thirdparty/thirdparty.go b/pkg/master/thirdparty/thirdparty.go index 402841bffd9..ba773cff7d7 100644 --- a/pkg/master/thirdparty/thirdparty.go +++ b/pkg/master/thirdparty/thirdparty.go @@ -26,9 +26,9 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/meta" "k8s.io/kubernetes/pkg/api/rest" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/apis/extensions" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apiserver" "k8s.io/kubernetes/pkg/genericapiserver" extensionsrest "k8s.io/kubernetes/pkg/registry/extensions/rest" diff --git a/pkg/registry/apps/petset/etcd/etcd_test.go b/pkg/registry/apps/petset/etcd/etcd_test.go index 7af467a9632..ea5499234e5 100644 --- a/pkg/registry/apps/petset/etcd/etcd_test.go +++ b/pkg/registry/apps/petset/etcd/etcd_test.go @@ -21,8 +21,8 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/apps" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/registry/generic" diff --git a/pkg/registry/apps/petset/strategy_test.go b/pkg/registry/apps/petset/strategy_test.go index 67c3a59ac6a..6ad401b189e 100644 --- a/pkg/registry/apps/petset/strategy_test.go +++ b/pkg/registry/apps/petset/strategy_test.go @@ -20,8 +20,8 @@ import ( "testing" "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/apps" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" ) func TestStatefulSetStrategy(t *testing.T) { diff --git a/pkg/registry/batch/cronjob/strategy_test.go b/pkg/registry/batch/cronjob/strategy_test.go index d72147ffdbe..9f72a630d3e 100644 --- a/pkg/registry/batch/cronjob/strategy_test.go +++ b/pkg/registry/batch/cronjob/strategy_test.go @@ -21,8 +21,8 @@ import ( "k8s.io/kubernetes/pkg/api" apitesting "k8s.io/kubernetes/pkg/api/testing" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/batch" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" ) func newBool(a bool) *bool { diff --git a/pkg/registry/batch/job/etcd/etcd_test.go b/pkg/registry/batch/job/etcd/etcd_test.go index 25f0ca1a21d..0835551a4c9 100644 --- a/pkg/registry/batch/job/etcd/etcd_test.go +++ b/pkg/registry/batch/job/etcd/etcd_test.go @@ -20,9 +20,9 @@ import ( "testing" "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/batch" "k8s.io/kubernetes/pkg/apis/extensions" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/registry/generic" diff --git a/pkg/registry/batch/job/strategy.go b/pkg/registry/batch/job/strategy.go index cbfebfa3f67..e3231de6bf7 100644 --- a/pkg/registry/batch/job/strategy.go +++ b/pkg/registry/batch/job/strategy.go @@ -21,9 +21,9 @@ import ( "strconv" "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/batch" "k8s.io/kubernetes/pkg/apis/batch/validation" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/registry/generic" diff --git a/pkg/registry/batch/job/strategy_test.go b/pkg/registry/batch/job/strategy_test.go index b8e6a8ca555..40d3d5baeb2 100644 --- a/pkg/registry/batch/job/strategy_test.go +++ b/pkg/registry/batch/job/strategy_test.go @@ -23,8 +23,8 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" apitesting "k8s.io/kubernetes/pkg/api/testing" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/batch" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/types" ) diff --git a/pkg/registry/core/namespace/strategy_test.go b/pkg/registry/core/namespace/strategy_test.go index aa0cb735db9..a3389aac03d 100644 --- a/pkg/registry/core/namespace/strategy_test.go +++ b/pkg/registry/core/namespace/strategy_test.go @@ -21,8 +21,8 @@ import ( "k8s.io/kubernetes/pkg/api" apitesting "k8s.io/kubernetes/pkg/api/testing" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" ) func TestNamespaceStrategy(t *testing.T) { diff --git a/pkg/registry/core/pod/etcd/etcd.go b/pkg/registry/core/pod/etcd/etcd.go index 0c94ab426d5..06e616210d4 100644 --- a/pkg/registry/core/pod/etcd/etcd.go +++ b/pkg/registry/core/pod/etcd/etcd.go @@ -25,8 +25,8 @@ import ( "k8s.io/kubernetes/pkg/api/errors" storeerr "k8s.io/kubernetes/pkg/api/errors/storage" "k8s.io/kubernetes/pkg/api/rest" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/validation" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" policyclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion" "k8s.io/kubernetes/pkg/kubelet/client" "k8s.io/kubernetes/pkg/registry/cachesize" diff --git a/pkg/registry/core/service/rest.go b/pkg/registry/core/service/rest.go index 68e69ed9c0f..5b3fb1d1abe 100644 --- a/pkg/registry/core/service/rest.go +++ b/pkg/registry/core/service/rest.go @@ -29,8 +29,8 @@ import ( "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/rest" apiservice "k8s.io/kubernetes/pkg/api/service" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/validation" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/registry/core/endpoint" "k8s.io/kubernetes/pkg/registry/core/service/ipallocator" "k8s.io/kubernetes/pkg/registry/core/service/portallocator" diff --git a/pkg/registry/extensions/controller/etcd/etcd_test.go b/pkg/registry/extensions/controller/etcd/etcd_test.go index 82877e11815..856bbfcf86c 100644 --- a/pkg/registry/extensions/controller/etcd/etcd_test.go +++ b/pkg/registry/extensions/controller/etcd/etcd_test.go @@ -21,8 +21,8 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/extensions" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/registry/registrytest" "k8s.io/kubernetes/pkg/storage" diff --git a/pkg/registry/extensions/daemonset/etcd/etcd_test.go b/pkg/registry/extensions/daemonset/etcd/etcd_test.go index aa93f081454..254aefa46a2 100644 --- a/pkg/registry/extensions/daemonset/etcd/etcd_test.go +++ b/pkg/registry/extensions/daemonset/etcd/etcd_test.go @@ -20,8 +20,8 @@ import ( "testing" "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/extensions" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/registry/generic" diff --git a/pkg/registry/extensions/deployment/etcd/etcd.go b/pkg/registry/extensions/deployment/etcd/etcd.go index 464ee4f089a..ec07eca7c91 100644 --- a/pkg/registry/extensions/deployment/etcd/etcd.go +++ b/pkg/registry/extensions/deployment/etcd/etcd.go @@ -24,9 +24,9 @@ import ( "k8s.io/kubernetes/pkg/api/errors" storeerr "k8s.io/kubernetes/pkg/api/errors/storage" "k8s.io/kubernetes/pkg/api/rest" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/extensions" extvalidation "k8s.io/kubernetes/pkg/apis/extensions/validation" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/registry/cachesize" "k8s.io/kubernetes/pkg/registry/extensions/deployment" "k8s.io/kubernetes/pkg/registry/generic" diff --git a/pkg/registry/extensions/deployment/etcd/etcd_test.go b/pkg/registry/extensions/deployment/etcd/etcd_test.go index b98754301c8..774438839c8 100644 --- a/pkg/registry/extensions/deployment/etcd/etcd_test.go +++ b/pkg/registry/extensions/deployment/etcd/etcd_test.go @@ -24,8 +24,8 @@ import ( "k8s.io/kubernetes/pkg/api/errors" storeerr "k8s.io/kubernetes/pkg/api/errors/storage" "k8s.io/kubernetes/pkg/api/rest" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/extensions" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/registry/generic" diff --git a/pkg/registry/extensions/deployment/strategy.go b/pkg/registry/extensions/deployment/strategy.go index 7dd958edbb6..10c09a6b694 100644 --- a/pkg/registry/extensions/deployment/strategy.go +++ b/pkg/registry/extensions/deployment/strategy.go @@ -22,9 +22,9 @@ import ( "time" "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/apis/extensions/validation" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/controller/deployment/util" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" diff --git a/pkg/registry/extensions/networkpolicy/etcd/etcd_test.go b/pkg/registry/extensions/networkpolicy/etcd/etcd_test.go index b5dc11c5cfc..b7097e6db8c 100644 --- a/pkg/registry/extensions/networkpolicy/etcd/etcd_test.go +++ b/pkg/registry/extensions/networkpolicy/etcd/etcd_test.go @@ -20,8 +20,8 @@ import ( "testing" "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/extensions" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/registry/generic" diff --git a/pkg/registry/extensions/networkpolicy/strategy_test.go b/pkg/registry/extensions/networkpolicy/strategy_test.go index b130fda0bc5..f957cfa53db 100644 --- a/pkg/registry/extensions/networkpolicy/strategy_test.go +++ b/pkg/registry/extensions/networkpolicy/strategy_test.go @@ -20,8 +20,8 @@ import ( "testing" "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/extensions" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" ) func TestNetworkPolicyStrategy(t *testing.T) { diff --git a/pkg/registry/extensions/replicaset/etcd/etcd_test.go b/pkg/registry/extensions/replicaset/etcd/etcd_test.go index aa8e249ef4e..a39a38c1de9 100644 --- a/pkg/registry/extensions/replicaset/etcd/etcd_test.go +++ b/pkg/registry/extensions/replicaset/etcd/etcd_test.go @@ -22,8 +22,8 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/rest" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/extensions" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/registry/generic" diff --git a/pkg/registry/extensions/replicaset/strategy_test.go b/pkg/registry/extensions/replicaset/strategy_test.go index 19187622557..3a5a1c7224c 100644 --- a/pkg/registry/extensions/replicaset/strategy_test.go +++ b/pkg/registry/extensions/replicaset/strategy_test.go @@ -20,8 +20,8 @@ import ( "testing" "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/extensions" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" ) func TestReplicaSetStrategy(t *testing.T) { diff --git a/pkg/registry/extensions/thirdpartyresourcedata/codec.go b/pkg/registry/extensions/thirdpartyresourcedata/codec.go index f1fc5307bdf..e2791f6e1b6 100644 --- a/pkg/registry/extensions/thirdpartyresourcedata/codec.go +++ b/pkg/registry/extensions/thirdpartyresourcedata/codec.go @@ -26,12 +26,12 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/meta" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" apiutil "k8s.io/kubernetes/pkg/api/util" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" "k8s.io/kubernetes/pkg/util/yaml" diff --git a/pkg/registry/extensions/thirdpartyresourcedata/codec_test.go b/pkg/registry/extensions/thirdpartyresourcedata/codec_test.go index 9fca372a00e..e2e7477ac5a 100644 --- a/pkg/registry/extensions/thirdpartyresourcedata/codec_test.go +++ b/pkg/registry/extensions/thirdpartyresourcedata/codec_test.go @@ -25,10 +25,10 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/apis/extensions" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" "k8s.io/kubernetes/pkg/watch/versioned" @@ -36,7 +36,7 @@ import ( type Foo struct { metav1.TypeMeta `json:",inline"` - api.ObjectMeta `json:"metadata,omitempty" description:"standard object metadata"` + api.ObjectMeta `json:"metadata,omitempty" description:"standard object metadata"` SomeField string `json:"someField"` OtherField int `json:"otherField"` @@ -270,10 +270,10 @@ func TestThirdPartyResourceDataListEncoding(t *testing.T) { } targetOutput := struct { - Kind string `json:"kind,omitempty"` - Items []json.RawMessage `json:"items"` - Metadata metav1.ListMeta `json:"metadata,omitempty"` - APIVersion string `json:"apiVersion,omitempty"` + Kind string `json:"kind,omitempty"` + Items []json.RawMessage `json:"items"` + Metadata metav1.ListMeta `json:"metadata,omitempty"` + APIVersion string `json:"apiVersion,omitempty"` }{} err = json.Unmarshal(buf.Bytes(), &targetOutput) diff --git a/pkg/registry/generic/registry/store.go b/pkg/registry/generic/registry/store.go index 98dd7522c4b..d61d2835c4a 100644 --- a/pkg/registry/generic/registry/store.go +++ b/pkg/registry/generic/registry/store.go @@ -28,8 +28,8 @@ import ( storeerr "k8s.io/kubernetes/pkg/api/errors/storage" "k8s.io/kubernetes/pkg/api/meta" "k8s.io/kubernetes/pkg/api/rest" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/validation/path" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/runtime" diff --git a/pkg/runtime/generated.proto b/pkg/runtime/generated.proto index 136ab0b5e3c..bd0e893ba14 100644 --- a/pkg/runtime/generated.proto +++ b/pkg/runtime/generated.proto @@ -85,7 +85,7 @@ message RawExtension { // runtime.TypeMeta `json:",inline"` // ... // other fields // } -// func (obj *MyAwesomeAPIObject) SetGroupVersionKind(gvk *unversioned.GroupVersionKind) { unversioned.UpdateTypeMeta(obj,gvk) }; GroupVersionKind() *GroupVersionKind +// func (obj *MyAwesomeAPIObject) SetGroupVersionKind(gvk *metav1.GroupVersionKind) { metav1.UpdateTypeMeta(obj,gvk) }; GroupVersionKind() *GroupVersionKind // // TypeMeta is provided here for convenience. You may use it directly from this package or define // your own with the same fields. diff --git a/pkg/runtime/unstructured_test.go b/pkg/runtime/unstructured_test.go index 261ff2c3bdc..40c5423c15f 100644 --- a/pkg/runtime/unstructured_test.go +++ b/pkg/runtime/unstructured_test.go @@ -26,9 +26,9 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/meta/metatypes" "k8s.io/kubernetes/pkg/api/testapi" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/validation" "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/types" ) diff --git a/pkg/runtime/unversioned_test.go b/pkg/runtime/unversioned_test.go index b39d530bdd5..fd837b09949 100644 --- a/pkg/runtime/unversioned_test.go +++ b/pkg/runtime/unversioned_test.go @@ -25,8 +25,8 @@ import ( // pkg/conversion/test/... instead of importing pkg/api here. "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/extensions" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" ) diff --git a/pkg/storage/cacher.go b/pkg/storage/cacher.go index 54fce231aee..d495d90c4e6 100644 --- a/pkg/storage/cacher.go +++ b/pkg/storage/cacher.go @@ -27,8 +27,8 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/meta" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/conversion" "k8s.io/kubernetes/pkg/fields" diff --git a/pkg/storage/testing/types.generated.go b/pkg/storage/testing/types.generated.go index 9a81c068782..e37fe8e1d89 100644 --- a/pkg/storage/testing/types.generated.go +++ b/pkg/storage/testing/types.generated.go @@ -26,7 +26,7 @@ import ( "fmt" codec1978 "github.com/ugorji/go/codec" pkg2_api "k8s.io/kubernetes/pkg/api" - pkg1_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" + pkg1_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" pkg3_types "k8s.io/kubernetes/pkg/types" "reflect" "runtime" @@ -64,7 +64,7 @@ func init() { } if false { // reference the types, but skip this branch at build/run time var v0 pkg2_api.ObjectMeta - var v1 pkg1_unversioned.TypeMeta + var v1 pkg1_v1.TypeMeta var v2 pkg3_types.UID var v3 time.Time _, _, _, _ = v0, v1, v2, v3 diff --git a/pkg/storage/testing/types.go b/pkg/storage/testing/types.go index b938928383b..e1276795c65 100644 --- a/pkg/storage/testing/types.go +++ b/pkg/storage/testing/types.go @@ -24,8 +24,8 @@ import ( type TestResource struct { metav1.TypeMeta `json:",inline"` - api.ObjectMeta `json:"metadata"` - Value int `json:"value"` + api.ObjectMeta `json:"metadata"` + Value int `json:"value"` } func (obj *TestResource) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta } diff --git a/pkg/storage/watch_cache_test.go b/pkg/storage/watch_cache_test.go index 0dbe006647d..581f8749a96 100644 --- a/pkg/storage/watch_cache_test.go +++ b/pkg/storage/watch_cache_test.go @@ -23,8 +23,8 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" diff --git a/pkg/util/node/node.go b/pkg/util/node/node.go index 313a21a9d35..7a5eb57775a 100644 --- a/pkg/util/node/node.go +++ b/pkg/util/node/node.go @@ -26,8 +26,8 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" "k8s.io/kubernetes/pkg/types" ) diff --git a/pkg/util/node/node_test.go b/pkg/util/node/node_test.go index 66ef5f65d7b..0db3cc2bb85 100644 --- a/pkg/util/node/node_test.go +++ b/pkg/util/node/node_test.go @@ -19,8 +19,8 @@ package node import ( "testing" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" ) func TestGetPreferredAddress(t *testing.T) { diff --git a/pkg/util/replicaset/replicaset.go b/pkg/util/replicaset/replicaset.go index cc039162ce6..7a9ff81accc 100644 --- a/pkg/util/replicaset/replicaset.go +++ b/pkg/util/replicaset/replicaset.go @@ -22,9 +22,9 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api/errors" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" unversionedextensions "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1" "k8s.io/kubernetes/pkg/labels" errorsutil "k8s.io/kubernetes/pkg/util/errors" diff --git a/pkg/volume/flocker/flocker_volume_test.go b/pkg/volume/flocker/flocker_volume_test.go index 0fb933470d5..2e7d9a69628 100644 --- a/pkg/volume/flocker/flocker_volume_test.go +++ b/pkg/volume/flocker/flocker_volume_test.go @@ -20,8 +20,8 @@ import ( "fmt" "testing" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" utiltesting "k8s.io/kubernetes/pkg/util/testing" "k8s.io/kubernetes/pkg/volume" volumetest "k8s.io/kubernetes/pkg/volume/testing" diff --git a/plugin/pkg/auth/authenticator/token/webhook/webhook_test.go b/plugin/pkg/auth/authenticator/token/webhook/webhook_test.go index 9d7f2cf7dea..541bdb78f1c 100644 --- a/plugin/pkg/auth/authenticator/token/webhook/webhook_test.go +++ b/plugin/pkg/auth/authenticator/token/webhook/webhook_test.go @@ -30,8 +30,8 @@ import ( "testing" "time" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/authentication/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/auth/user" "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api/v1" ) diff --git a/plugin/pkg/auth/authorizer/webhook/webhook_test.go b/plugin/pkg/auth/authorizer/webhook/webhook_test.go index 703bace5005..6ad1e650be4 100644 --- a/plugin/pkg/auth/authorizer/webhook/webhook_test.go +++ b/plugin/pkg/auth/authorizer/webhook/webhook_test.go @@ -32,8 +32,8 @@ import ( "text/template" "time" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/authorization/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/auth/authorizer" "k8s.io/kubernetes/pkg/auth/user" "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api/v1" diff --git a/plugin/pkg/scheduler/algorithm/listers.go b/plugin/pkg/scheduler/algorithm/listers.go index 041cbf3d28a..854b5708c40 100644 --- a/plugin/pkg/scheduler/algorithm/listers.go +++ b/plugin/pkg/scheduler/algorithm/listers.go @@ -19,9 +19,9 @@ package algorithm import ( "fmt" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/labels" ) diff --git a/plugin/pkg/scheduler/algorithm/predicates/predicates.go b/plugin/pkg/scheduler/algorithm/predicates/predicates.go index f880f823a87..f87bc0c893d 100644 --- a/plugin/pkg/scheduler/algorithm/predicates/predicates.go +++ b/plugin/pkg/scheduler/algorithm/predicates/predicates.go @@ -24,8 +24,8 @@ import ( "time" "github.com/golang/glog" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/kubelet/qos" "k8s.io/kubernetes/pkg/labels" diff --git a/plugin/pkg/scheduler/algorithm/priorities/interpod_affinity_test.go b/plugin/pkg/scheduler/algorithm/priorities/interpod_affinity_test.go index de34802e579..cf812a426f1 100644 --- a/plugin/pkg/scheduler/algorithm/priorities/interpod_affinity_test.go +++ b/plugin/pkg/scheduler/algorithm/priorities/interpod_affinity_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" priorityutil "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/priorities/util" schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api" diff --git a/plugin/pkg/scheduler/algorithm/priorities/selector_spreading.go b/plugin/pkg/scheduler/algorithm/priorities/selector_spreading.go index a50015ea79c..e9dd548bc56 100644 --- a/plugin/pkg/scheduler/algorithm/priorities/selector_spreading.go +++ b/plugin/pkg/scheduler/algorithm/priorities/selector_spreading.go @@ -20,8 +20,8 @@ import ( "sync" "github.com/golang/glog" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/labels" utilnode "k8s.io/kubernetes/pkg/util/node" "k8s.io/kubernetes/pkg/util/workqueue" diff --git a/plugin/pkg/scheduler/algorithm/priorities/selector_spreading_test.go b/plugin/pkg/scheduler/algorithm/priorities/selector_spreading_test.go index 93726ece7f6..37f9783a1fc 100644 --- a/plugin/pkg/scheduler/algorithm/priorities/selector_spreading_test.go +++ b/plugin/pkg/scheduler/algorithm/priorities/selector_spreading_test.go @@ -21,9 +21,9 @@ import ( "sort" "testing" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api" "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" diff --git a/plugin/pkg/scheduler/algorithm/priorities/util/topologies.go b/plugin/pkg/scheduler/algorithm/priorities/util/topologies.go index 9824222f52a..171daf3e20d 100644 --- a/plugin/pkg/scheduler/algorithm/priorities/util/topologies.go +++ b/plugin/pkg/scheduler/algorithm/priorities/util/topologies.go @@ -17,8 +17,8 @@ limitations under the License. package util import ( - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/util/sets" ) diff --git a/plugin/pkg/scheduler/api/types.go b/plugin/pkg/scheduler/api/types.go index 055c19f1870..f5d795ddb35 100644 --- a/plugin/pkg/scheduler/api/types.go +++ b/plugin/pkg/scheduler/api/types.go @@ -19,8 +19,8 @@ package api import ( "time" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/restclient" ) diff --git a/plugin/pkg/scheduler/api/v1/types.go b/plugin/pkg/scheduler/api/v1/types.go index ee0aa8a67ec..6474fe1f431 100644 --- a/plugin/pkg/scheduler/api/v1/types.go +++ b/plugin/pkg/scheduler/api/v1/types.go @@ -19,8 +19,8 @@ package v1 import ( "time" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" apiv1 "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/restclient" ) diff --git a/test/e2e/BUILD b/test/e2e/BUILD index 64a09569b7b..6b35a0ba74d 100644 --- a/test/e2e/BUILD +++ b/test/e2e/BUILD @@ -211,6 +211,7 @@ go_library( "//vendor:k8s.io/client-go/kubernetes", "//vendor:k8s.io/client-go/pkg/api/v1", "//vendor:k8s.io/client-go/pkg/apis/extensions/v1beta1", + "//vendor:k8s.io/client-go/pkg/apis/meta/v1", "//vendor:k8s.io/client-go/pkg/apis/policy/v1beta1", "//vendor:k8s.io/client-go/pkg/util/intstr", ], diff --git a/test/e2e/common/empty_dir.go b/test/e2e/common/empty_dir.go index 12b22ecb8e9..76b4480ff76 100644 --- a/test/e2e/common/empty_dir.go +++ b/test/e2e/common/empty_dir.go @@ -20,9 +20,9 @@ import ( "fmt" "path" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/util/uuid" "k8s.io/kubernetes/test/e2e/framework" diff --git a/test/e2e/common/host_path.go b/test/e2e/common/host_path.go index 08f57e90500..59942f6bd0f 100644 --- a/test/e2e/common/host_path.go +++ b/test/e2e/common/host_path.go @@ -21,9 +21,9 @@ import ( "os" "path" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/test/e2e/framework" . "github.com/onsi/ginkgo" diff --git a/test/e2e/common/volumes.go b/test/e2e/common/volumes.go index 9ffbbd3df6f..94156b696e6 100644 --- a/test/e2e/common/volumes.go +++ b/test/e2e/common/volumes.go @@ -48,8 +48,8 @@ import ( "time" apierrs "k8s.io/kubernetes/pkg/api/errors" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" "k8s.io/kubernetes/test/e2e/framework" diff --git a/test/e2e/daemon_set.go b/test/e2e/daemon_set.go index ca14d6eca02..b5cda9b3573 100644 --- a/test/e2e/daemon_set.go +++ b/test/e2e/daemon_set.go @@ -24,11 +24,11 @@ import ( "k8s.io/kubernetes/pkg/api" apierrs "k8s.io/kubernetes/pkg/api/errors" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" extensionsinternal "k8s.io/kubernetes/pkg/apis/extensions" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" "k8s.io/kubernetes/pkg/kubectl" "k8s.io/kubernetes/pkg/labels" diff --git a/test/e2e/density.go b/test/e2e/density.go index 34c3c30ff32..a69b0822912 100644 --- a/test/e2e/density.go +++ b/test/e2e/density.go @@ -27,8 +27,8 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" diff --git a/test/e2e/deployment.go b/test/e2e/deployment.go index 2b09f4f884a..4c3efe7d70f 100644 --- a/test/e2e/deployment.go +++ b/test/e2e/deployment.go @@ -27,10 +27,10 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/annotations" "k8s.io/kubernetes/pkg/api/errors" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" extensionsinternal "k8s.io/kubernetes/pkg/apis/extensions" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" extensionsclient "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1" diff --git a/test/e2e/disruption.go b/test/e2e/disruption.go index 15c6c55ad38..f5b2cc4b8cd 100644 --- a/test/e2e/disruption.go +++ b/test/e2e/disruption.go @@ -23,9 +23,9 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" "k8s.io/client-go/kubernetes" - metav1 "k8s.io/client-go/pkg/apis/meta/v1" "k8s.io/client-go/pkg/api/v1" extensions "k8s.io/client-go/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" policy "k8s.io/client-go/pkg/apis/policy/v1beta1" "k8s.io/client-go/pkg/util/intstr" "k8s.io/kubernetes/pkg/util/wait" diff --git a/test/e2e/dns.go b/test/e2e/dns.go index 43aef508389..50cf871707f 100644 --- a/test/e2e/dns.go +++ b/test/e2e/dns.go @@ -24,10 +24,10 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/api/v1/pod" "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/util/uuid" diff --git a/test/e2e/dns_configmap.go b/test/e2e/dns_configmap.go index 31ec4e10012..57b094d7335 100644 --- a/test/e2e/dns_configmap.go +++ b/test/e2e/dns_configmap.go @@ -21,8 +21,8 @@ import ( "strings" "time" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" fed "k8s.io/kubernetes/pkg/dns/federation" "k8s.io/kubernetes/pkg/fields" diff --git a/test/e2e/federation-deployment.go b/test/e2e/federation-deployment.go index 3c7d1a84567..de4b8379b00 100644 --- a/test/e2e/federation-deployment.go +++ b/test/e2e/federation-deployment.go @@ -24,9 +24,9 @@ import ( fedclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_5" fedutil "k8s.io/kubernetes/federation/pkg/federation-controller/util" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/util/wait" "k8s.io/kubernetes/test/e2e/framework" diff --git a/test/e2e/federation-replicaset.go b/test/e2e/federation-replicaset.go index 5bdca8d0876..7e6b547c3e5 100644 --- a/test/e2e/federation-replicaset.go +++ b/test/e2e/federation-replicaset.go @@ -24,9 +24,9 @@ import ( fedclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_5" fedutil "k8s.io/kubernetes/federation/pkg/federation-controller/util" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/util/wait" "k8s.io/kubernetes/test/e2e/framework" diff --git a/test/e2e/framework/networking_utils.go b/test/e2e/framework/networking_utils.go index b8a2bcd2b1c..80e8d2f2fab 100644 --- a/test/e2e/framework/networking_utils.go +++ b/test/e2e/framework/networking_utils.go @@ -24,9 +24,9 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" coreclientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/core/v1" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/util/intstr" diff --git a/test/e2e/framework/util.go b/test/e2e/framework/util.go index a2ff5b2801c..d6faaf569cf 100644 --- a/test/e2e/framework/util.go +++ b/test/e2e/framework/util.go @@ -44,13 +44,13 @@ import ( "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_5" "k8s.io/kubernetes/pkg/api" apierrs "k8s.io/kubernetes/pkg/api/errors" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" apps "k8s.io/kubernetes/pkg/apis/apps/v1beta1" batch "k8s.io/kubernetes/pkg/apis/batch/v1" extensionsinternal "k8s.io/kubernetes/pkg/apis/extensions" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" "k8s.io/kubernetes/pkg/client/conditions" diff --git a/test/e2e/garbage_collector.go b/test/e2e/garbage_collector.go index 14a33d5a05b..7eab78fe671 100644 --- a/test/e2e/garbage_collector.go +++ b/test/e2e/garbage_collector.go @@ -20,8 +20,8 @@ import ( "fmt" "time" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" "k8s.io/kubernetes/pkg/metrics" "k8s.io/kubernetes/pkg/util/wait" diff --git a/test/e2e/gke_local_ssd.go b/test/e2e/gke_local_ssd.go index 79ae9f9c73a..586763f2489 100644 --- a/test/e2e/gke_local_ssd.go +++ b/test/e2e/gke_local_ssd.go @@ -20,9 +20,9 @@ import ( "fmt" "os/exec" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/util/uuid" "k8s.io/kubernetes/test/e2e/framework" diff --git a/test/e2e/kubectl.go b/test/e2e/kubectl.go index 422f14a0422..5333641c69e 100644 --- a/test/e2e/kubectl.go +++ b/test/e2e/kubectl.go @@ -44,8 +44,8 @@ import ( "k8s.io/kubernetes/pkg/api/annotations" apierrs "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/resource" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/kubectl/cmd/util" diff --git a/test/e2e/mesos.go b/test/e2e/mesos.go index dd0381aea80..1e30a4f25a8 100644 --- a/test/e2e/mesos.go +++ b/test/e2e/mesos.go @@ -19,8 +19,8 @@ package e2e import ( "fmt" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/util/wait" diff --git a/test/e2e/pd.go b/test/e2e/pd.go index 5e661298d1d..8c93ce7830d 100644 --- a/test/e2e/pd.go +++ b/test/e2e/pd.go @@ -31,9 +31,9 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" "k8s.io/kubernetes/pkg/api/resource" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" v1core "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/core/v1" awscloud "k8s.io/kubernetes/pkg/cloudprovider/providers/aws" gcecloud "k8s.io/kubernetes/pkg/cloudprovider/providers/gce" diff --git a/test/e2e/persistent_volumes.go b/test/e2e/persistent_volumes.go index 07cf961873a..18caf9ac386 100644 --- a/test/e2e/persistent_volumes.go +++ b/test/e2e/persistent_volumes.go @@ -24,9 +24,9 @@ import ( . "github.com/onsi/gomega" apierrs "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/resource" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" "k8s.io/kubernetes/pkg/types" "k8s.io/kubernetes/pkg/volume/util/volumehelper" diff --git a/test/e2e/petset.go b/test/e2e/petset.go index 6ada2f1a992..8b979306b32 100644 --- a/test/e2e/petset.go +++ b/test/e2e/petset.go @@ -31,9 +31,9 @@ import ( "k8s.io/kubernetes/pkg/api" apierrs "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/resource" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" apps "k8s.io/kubernetes/pkg/apis/apps/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" "k8s.io/kubernetes/pkg/controller/petset" "k8s.io/kubernetes/pkg/labels" diff --git a/test/e2e/replica_set.go b/test/e2e/replica_set.go index 683b2c3ec82..34fb536cb51 100644 --- a/test/e2e/replica_set.go +++ b/test/e2e/replica_set.go @@ -21,9 +21,9 @@ import ( "time" "k8s.io/kubernetes/pkg/api/resource" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/controller/replicaset" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/util/uuid" diff --git a/test/e2e/resize_nodes.go b/test/e2e/resize_nodes.go index 5119a9c36bc..7f084774fd6 100644 --- a/test/e2e/resize_nodes.go +++ b/test/e2e/resize_nodes.go @@ -24,9 +24,9 @@ import ( "time" "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" "k8s.io/kubernetes/pkg/util/intstr" "k8s.io/kubernetes/test/e2e/framework" diff --git a/test/e2e/third-party.go b/test/e2e/third-party.go index 1a852ba167f..fc6837c4bdd 100644 --- a/test/e2e/third-party.go +++ b/test/e2e/third-party.go @@ -23,10 +23,10 @@ import ( "time" "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/util/wait" "k8s.io/kubernetes/test/e2e/framework" @@ -46,7 +46,7 @@ var data = `{ type Foo struct { metav1.TypeMeta `json:",inline"` - v1.ObjectMeta `json:"metadata,omitempty" description:"standard object metadata"` + v1.ObjectMeta `json:"metadata,omitempty" description:"standard object metadata"` SomeField string `json:"someField"` OtherField int `json:"otherField"` diff --git a/test/e2e/ubernetes_lite.go b/test/e2e/ubernetes_lite.go index 3b4589228c7..fd14b563bfd 100644 --- a/test/e2e/ubernetes_lite.go +++ b/test/e2e/ubernetes_lite.go @@ -22,8 +22,8 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/util/intstr" diff --git a/test/e2e/volume_provisioning.go b/test/e2e/volume_provisioning.go index 7a21da2004f..05c51b944ff 100644 --- a/test/e2e/volume_provisioning.go +++ b/test/e2e/volume_provisioning.go @@ -20,8 +20,8 @@ import ( "time" "k8s.io/kubernetes/pkg/api/resource" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" storage "k8s.io/kubernetes/pkg/apis/storage/v1beta1" storageutil "k8s.io/kubernetes/pkg/apis/storage/v1beta1/util" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" diff --git a/test/e2e/volumes.go b/test/e2e/volumes.go index c138fe8f272..ea877128191 100644 --- a/test/e2e/volumes.go +++ b/test/e2e/volumes.go @@ -47,8 +47,8 @@ import ( "time" apierrs "k8s.io/kubernetes/pkg/api/errors" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" "k8s.io/kubernetes/test/e2e/framework" diff --git a/test/e2e_node/density_test.go b/test/e2e_node/density_test.go index 8f49e316880..5bcccd37442 100644 --- a/test/e2e_node/density_test.go +++ b/test/e2e_node/density_test.go @@ -25,8 +25,8 @@ import ( "sync" "time" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/stats" kubemetrics "k8s.io/kubernetes/pkg/kubelet/metrics" diff --git a/test/e2e_node/kubelet_test.go b/test/e2e_node/kubelet_test.go index 68594a0be24..cdb6bfdbecf 100644 --- a/test/e2e_node/kubelet_test.go +++ b/test/e2e_node/kubelet_test.go @@ -21,8 +21,8 @@ import ( "fmt" "time" - apiunversioned "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + apiunversioned "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/util/uuid" "k8s.io/kubernetes/test/e2e/framework" diff --git a/test/e2e_node/simple_mount.go b/test/e2e_node/simple_mount.go index 1e7f512a270..57be1241969 100644 --- a/test/e2e_node/simple_mount.go +++ b/test/e2e_node/simple_mount.go @@ -17,8 +17,8 @@ limitations under the License. package e2e_node import ( - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/test/e2e/framework" . "github.com/onsi/ginkgo" diff --git a/test/e2e_node/summary_test.go b/test/e2e_node/summary_test.go index 3a9480761ba..d6071fbde60 100644 --- a/test/e2e_node/summary_test.go +++ b/test/e2e_node/summary_test.go @@ -21,8 +21,8 @@ import ( "time" "k8s.io/kubernetes/pkg/api/resource" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/stats" "k8s.io/kubernetes/test/e2e/framework" diff --git a/test/integration/client/client_test.go b/test/integration/client/client_test.go index 9619b17d8d9..6de1092efd2 100644 --- a/test/integration/client/client_test.go +++ b/test/integration/client/client_test.go @@ -29,9 +29,9 @@ import ( "k8s.io/kubernetes/pkg/api" apierrors "k8s.io/kubernetes/pkg/api/errors" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/labels" diff --git a/test/integration/client/dynamic_client_test.go b/test/integration/client/dynamic_client_test.go index 61f5ede9f0f..12708769661 100644 --- a/test/integration/client/dynamic_client_test.go +++ b/test/integration/client/dynamic_client_test.go @@ -23,9 +23,9 @@ import ( "testing" "k8s.io/kubernetes/pkg/api/testapi" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/client/typed/dynamic" diff --git a/test/integration/federation/server_test.go b/test/integration/federation/server_test.go index b153730178f..0543a6a2803 100644 --- a/test/integration/federation/server_test.go +++ b/test/integration/federation/server_test.go @@ -31,9 +31,9 @@ import ( fed_v1b1 "k8s.io/kubernetes/federation/apis/federation/v1beta1" "k8s.io/kubernetes/federation/cmd/federation-apiserver/app" "k8s.io/kubernetes/federation/cmd/federation-apiserver/app/options" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" ext_v1b1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime/schema" ) diff --git a/test/integration/garbagecollector/garbage_collector_test.go b/test/integration/garbagecollector/garbage_collector_test.go index 564a879251e..ef6348278e9 100644 --- a/test/integration/garbagecollector/garbage_collector_test.go +++ b/test/integration/garbagecollector/garbage_collector_test.go @@ -30,9 +30,9 @@ import ( "github.com/golang/glog" dto "github.com/prometheus/client_model/go" "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/client/typed/dynamic" diff --git a/test/integration/persistentvolumes/persistent_volumes_test.go b/test/integration/persistentvolumes/persistent_volumes_test.go index 41ee3c9b0c9..54fcf852977 100644 --- a/test/integration/persistentvolumes/persistent_volumes_test.go +++ b/test/integration/persistentvolumes/persistent_volumes_test.go @@ -28,9 +28,9 @@ import ( "time" "k8s.io/kubernetes/pkg/api/resource" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" storage "k8s.io/kubernetes/pkg/apis/storage/v1beta1" storageutil "k8s.io/kubernetes/pkg/apis/storage/v1beta1/util" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" diff --git a/test/integration/replicaset/replicaset_test.go b/test/integration/replicaset/replicaset_test.go index 37b21e17693..9633156d587 100644 --- a/test/integration/replicaset/replicaset_test.go +++ b/test/integration/replicaset/replicaset_test.go @@ -26,9 +26,9 @@ import ( "time" "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/cache" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" "k8s.io/kubernetes/pkg/client/restclient" diff --git a/test/integration/replicationcontroller/replicationcontroller_test.go b/test/integration/replicationcontroller/replicationcontroller_test.go index 9679b38d083..0cbfc0b3a1a 100644 --- a/test/integration/replicationcontroller/replicationcontroller_test.go +++ b/test/integration/replicationcontroller/replicationcontroller_test.go @@ -26,8 +26,8 @@ import ( "time" "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/cache" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" "k8s.io/kubernetes/pkg/client/restclient" diff --git a/test/integration/scheduler/extender_test.go b/test/integration/scheduler/extender_test.go index 3c49466fbcc..ab8c27000a6 100644 --- a/test/integration/scheduler/extender_test.go +++ b/test/integration/scheduler/extender_test.go @@ -30,9 +30,9 @@ import ( "time" "k8s.io/kubernetes/pkg/api/resource" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" v1core "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/core/v1" "k8s.io/kubernetes/pkg/client/record" diff --git a/test/integration/scheduler/scheduler_test.go b/test/integration/scheduler/scheduler_test.go index fcb552ad9a3..daf5a572f42 100644 --- a/test/integration/scheduler/scheduler_test.go +++ b/test/integration/scheduler/scheduler_test.go @@ -27,9 +27,9 @@ import ( "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/resource" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/cache" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" v1core "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/core/v1" diff --git a/test/integration/storageclasses/storage_classes_test.go b/test/integration/storageclasses/storage_classes_test.go index d132e4e3fea..b12ba870f2f 100644 --- a/test/integration/storageclasses/storage_classes_test.go +++ b/test/integration/storageclasses/storage_classes_test.go @@ -24,9 +24,9 @@ import ( "testing" "k8s.io/kubernetes/pkg/api/resource" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" storage "k8s.io/kubernetes/pkg/apis/storage/v1beta1" storageutil "k8s.io/kubernetes/pkg/apis/storage/v1beta1/util" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" diff --git a/test/integration/thirdparty/thirdparty_test.go b/test/integration/thirdparty/thirdparty_test.go index 392f05b893e..69d9c091863 100644 --- a/test/integration/thirdparty/thirdparty_test.go +++ b/test/integration/thirdparty/thirdparty_test.go @@ -28,9 +28,9 @@ import ( "k8s.io/kubernetes/pkg/api" apierrors "k8s.io/kubernetes/pkg/api/errors" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/runtime/schema" @@ -65,7 +65,7 @@ var versionsToTest = []string{"v1"} type Foo struct { metav1.TypeMeta `json:",inline"` - v1.ObjectMeta `json:"metadata,omitempty" description:"standard object metadata"` + v1.ObjectMeta `json:"metadata,omitempty" description:"standard object metadata"` SomeField string `json:"someField"` OtherField int `json:"otherField"` diff --git a/test/soak/serve_hostnames/serve_hostnames.go b/test/soak/serve_hostnames/serve_hostnames.go index 22c39da042f..f4ccf2d2bde 100644 --- a/test/soak/serve_hostnames/serve_hostnames.go +++ b/test/soak/serve_hostnames/serve_hostnames.go @@ -32,8 +32,8 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/client/unversioned/clientcmd" diff --git a/test/utils/runners.go b/test/utils/runners.go index 9fef997b5c3..68d0a8eb04f 100644 --- a/test/utils/runners.go +++ b/test/utils/runners.go @@ -26,9 +26,9 @@ import ( "k8s.io/kubernetes/pkg/api" apierrs "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/resource" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" "k8s.io/kubernetes/pkg/fields" diff --git a/vendor/BUILD b/vendor/BUILD index 723e6509941..aac6d8115c0 100644 --- a/vendor/BUILD +++ b/vendor/BUILD @@ -8575,8 +8575,8 @@ go_library( "//vendor:k8s.io/client-go/pkg/api", "//vendor:k8s.io/client-go/pkg/api/errors", "//vendor:k8s.io/client-go/pkg/api/meta", - "//vendor:k8s.io/client-go/pkg/api/unversioned", "//vendor:k8s.io/client-go/pkg/api/v1", + "//vendor:k8s.io/client-go/pkg/apis/meta/v1", "//vendor:k8s.io/client-go/pkg/runtime", "//vendor:k8s.io/client-go/pkg/runtime/schema", "//vendor:k8s.io/client-go/pkg/runtime/serializer", @@ -8593,8 +8593,8 @@ go_library( tags = ["automanaged"], deps = [ "//vendor:github.com/emicklei/go-restful/swagger", - "//vendor:k8s.io/client-go/pkg/api/unversioned", "//vendor:k8s.io/client-go/pkg/api/v1", + "//vendor:k8s.io/client-go/pkg/apis/meta/v1", "//vendor:k8s.io/client-go/pkg/runtime/schema", "//vendor:k8s.io/client-go/pkg/version", "//vendor:k8s.io/client-go/rest", @@ -8613,8 +8613,8 @@ go_library( deps = [ "//vendor:k8s.io/client-go/pkg/api", "//vendor:k8s.io/client-go/pkg/api/meta", - "//vendor:k8s.io/client-go/pkg/api/unversioned", "//vendor:k8s.io/client-go/pkg/api/v1", + "//vendor:k8s.io/client-go/pkg/apis/meta/v1", "//vendor:k8s.io/client-go/pkg/conversion/queryparams", "//vendor:k8s.io/client-go/pkg/runtime", "//vendor:k8s.io/client-go/pkg/runtime/schema", @@ -9218,6 +9218,7 @@ go_library( "k8s.io/client-go/pkg/api/resource_helpers.go", "k8s.io/client-go/pkg/api/types.generated.go", "k8s.io/client-go/pkg/api/types.go", + "k8s.io/client-go/pkg/api/zz_generated.deepcopy.go", ], tags = ["automanaged"], deps = [ @@ -9228,7 +9229,7 @@ go_library( "//vendor:k8s.io/client-go/pkg/api/meta", "//vendor:k8s.io/client-go/pkg/api/meta/metatypes", "//vendor:k8s.io/client-go/pkg/api/resource", - "//vendor:k8s.io/client-go/pkg/api/unversioned", + "//vendor:k8s.io/client-go/pkg/apis/meta/v1", "//vendor:k8s.io/client-go/pkg/auth/user", "//vendor:k8s.io/client-go/pkg/conversion", "//vendor:k8s.io/client-go/pkg/fields", @@ -9255,7 +9256,7 @@ go_library( ], tags = ["automanaged"], deps = [ - "//vendor:k8s.io/client-go/pkg/api/unversioned", + "//vendor:k8s.io/client-go/pkg/apis/meta/v1", "//vendor:k8s.io/client-go/pkg/runtime", "//vendor:k8s.io/client-go/pkg/runtime/schema", "//vendor:k8s.io/client-go/pkg/util/validation/field", @@ -9297,7 +9298,7 @@ go_library( deps = [ "//vendor:github.com/golang/glog", "//vendor:k8s.io/client-go/pkg/api/meta/metatypes", - "//vendor:k8s.io/client-go/pkg/api/unversioned", + "//vendor:k8s.io/client-go/pkg/apis/meta/v1", "//vendor:k8s.io/client-go/pkg/conversion", "//vendor:k8s.io/client-go/pkg/runtime", "//vendor:k8s.io/client-go/pkg/runtime/schema", @@ -9376,35 +9377,6 @@ go_library( ], ) -go_library( - name = "k8s.io/client-go/pkg/api/unversioned", - srcs = [ - "k8s.io/client-go/pkg/api/unversioned/doc.go", - "k8s.io/client-go/pkg/api/unversioned/duration.go", - "k8s.io/client-go/pkg/api/unversioned/generated.pb.go", - "k8s.io/client-go/pkg/api/unversioned/group_version.go", - "k8s.io/client-go/pkg/api/unversioned/helpers.go", - "k8s.io/client-go/pkg/api/unversioned/meta.go", - "k8s.io/client-go/pkg/api/unversioned/register.go", - "k8s.io/client-go/pkg/api/unversioned/time.go", - "k8s.io/client-go/pkg/api/unversioned/time_proto.go", - "k8s.io/client-go/pkg/api/unversioned/types.go", - "k8s.io/client-go/pkg/api/unversioned/types_swagger_doc_generated.go", - "k8s.io/client-go/pkg/api/unversioned/well_known_labels.go", - ], - tags = ["automanaged"], - deps = [ - "//vendor:github.com/go-openapi/spec", - "//vendor:github.com/gogo/protobuf/proto", - "//vendor:github.com/gogo/protobuf/sortkeys", - "//vendor:github.com/google/gofuzz", - "//vendor:k8s.io/client-go/pkg/genericapiserver/openapi/common", - "//vendor:k8s.io/client-go/pkg/labels", - "//vendor:k8s.io/client-go/pkg/runtime/schema", - "//vendor:k8s.io/client-go/pkg/selection", - ], -) - go_library( name = "k8s.io/client-go/pkg/api/v1", srcs = [ @@ -9422,6 +9394,7 @@ go_library( "k8s.io/client-go/pkg/api/v1/types.go", "k8s.io/client-go/pkg/api/v1/types_swagger_doc_generated.go", "k8s.io/client-go/pkg/api/v1/zz_generated.conversion.go", + "k8s.io/client-go/pkg/api/v1/zz_generated.deepcopy.go", "k8s.io/client-go/pkg/api/v1/zz_generated.defaults.go", ], tags = ["automanaged"], @@ -9433,8 +9406,8 @@ go_library( "//vendor:k8s.io/client-go/pkg/api/meta", "//vendor:k8s.io/client-go/pkg/api/meta/metatypes", "//vendor:k8s.io/client-go/pkg/api/resource", - "//vendor:k8s.io/client-go/pkg/api/unversioned", "//vendor:k8s.io/client-go/pkg/apis/extensions", + "//vendor:k8s.io/client-go/pkg/apis/meta/v1", "//vendor:k8s.io/client-go/pkg/conversion", "//vendor:k8s.io/client-go/pkg/fields", "//vendor:k8s.io/client-go/pkg/labels", @@ -9511,13 +9484,15 @@ go_library( "k8s.io/client-go/pkg/apis/apps/register.go", "k8s.io/client-go/pkg/apis/apps/types.generated.go", "k8s.io/client-go/pkg/apis/apps/types.go", + "k8s.io/client-go/pkg/apis/apps/zz_generated.deepcopy.go", ], tags = ["automanaged"], deps = [ "//vendor:github.com/ugorji/go/codec", "//vendor:k8s.io/client-go/pkg/api", "//vendor:k8s.io/client-go/pkg/api/resource", - "//vendor:k8s.io/client-go/pkg/api/unversioned", + "//vendor:k8s.io/client-go/pkg/apis/meta/v1", + "//vendor:k8s.io/client-go/pkg/conversion", "//vendor:k8s.io/client-go/pkg/runtime", "//vendor:k8s.io/client-go/pkg/runtime/schema", "//vendor:k8s.io/client-go/pkg/types", @@ -9543,12 +9518,14 @@ go_library( "k8s.io/client-go/pkg/apis/authentication/register.go", "k8s.io/client-go/pkg/apis/authentication/types.generated.go", "k8s.io/client-go/pkg/apis/authentication/types.go", + "k8s.io/client-go/pkg/apis/authentication/zz_generated.deepcopy.go", ], tags = ["automanaged"], deps = [ "//vendor:github.com/ugorji/go/codec", "//vendor:k8s.io/client-go/pkg/api", - "//vendor:k8s.io/client-go/pkg/api/unversioned", + "//vendor:k8s.io/client-go/pkg/apis/meta/v1", + "//vendor:k8s.io/client-go/pkg/conversion", "//vendor:k8s.io/client-go/pkg/runtime", "//vendor:k8s.io/client-go/pkg/runtime/schema", "//vendor:k8s.io/client-go/pkg/types", @@ -9579,15 +9556,16 @@ go_library( "k8s.io/client-go/pkg/apis/authentication/v1beta1/types.go", "k8s.io/client-go/pkg/apis/authentication/v1beta1/types_swagger_doc_generated.go", "k8s.io/client-go/pkg/apis/authentication/v1beta1/zz_generated.conversion.go", + "k8s.io/client-go/pkg/apis/authentication/v1beta1/zz_generated.deepcopy.go", ], tags = ["automanaged"], deps = [ "//vendor:github.com/gogo/protobuf/proto", "//vendor:github.com/gogo/protobuf/sortkeys", "//vendor:github.com/ugorji/go/codec", - "//vendor:k8s.io/client-go/pkg/api/unversioned", "//vendor:k8s.io/client-go/pkg/api/v1", "//vendor:k8s.io/client-go/pkg/apis/authentication", + "//vendor:k8s.io/client-go/pkg/apis/meta/v1", "//vendor:k8s.io/client-go/pkg/conversion", "//vendor:k8s.io/client-go/pkg/runtime", "//vendor:k8s.io/client-go/pkg/runtime/schema", @@ -9602,12 +9580,14 @@ go_library( "k8s.io/client-go/pkg/apis/authorization/register.go", "k8s.io/client-go/pkg/apis/authorization/types.generated.go", "k8s.io/client-go/pkg/apis/authorization/types.go", + "k8s.io/client-go/pkg/apis/authorization/zz_generated.deepcopy.go", ], tags = ["automanaged"], deps = [ "//vendor:github.com/ugorji/go/codec", "//vendor:k8s.io/client-go/pkg/api", - "//vendor:k8s.io/client-go/pkg/api/unversioned", + "//vendor:k8s.io/client-go/pkg/apis/meta/v1", + "//vendor:k8s.io/client-go/pkg/conversion", "//vendor:k8s.io/client-go/pkg/runtime", "//vendor:k8s.io/client-go/pkg/runtime/schema", "//vendor:k8s.io/client-go/pkg/types", @@ -9638,15 +9618,16 @@ go_library( "k8s.io/client-go/pkg/apis/authorization/v1beta1/types.go", "k8s.io/client-go/pkg/apis/authorization/v1beta1/types_swagger_doc_generated.go", "k8s.io/client-go/pkg/apis/authorization/v1beta1/zz_generated.conversion.go", + "k8s.io/client-go/pkg/apis/authorization/v1beta1/zz_generated.deepcopy.go", ], tags = ["automanaged"], deps = [ "//vendor:github.com/gogo/protobuf/proto", "//vendor:github.com/gogo/protobuf/sortkeys", "//vendor:github.com/ugorji/go/codec", - "//vendor:k8s.io/client-go/pkg/api/unversioned", "//vendor:k8s.io/client-go/pkg/api/v1", "//vendor:k8s.io/client-go/pkg/apis/authorization", + "//vendor:k8s.io/client-go/pkg/apis/meta/v1", "//vendor:k8s.io/client-go/pkg/conversion", "//vendor:k8s.io/client-go/pkg/runtime", "//vendor:k8s.io/client-go/pkg/runtime/schema", @@ -9662,12 +9643,14 @@ go_library( "k8s.io/client-go/pkg/apis/autoscaling/register.go", "k8s.io/client-go/pkg/apis/autoscaling/types.generated.go", "k8s.io/client-go/pkg/apis/autoscaling/types.go", + "k8s.io/client-go/pkg/apis/autoscaling/zz_generated.deepcopy.go", ], tags = ["automanaged"], deps = [ "//vendor:github.com/ugorji/go/codec", "//vendor:k8s.io/client-go/pkg/api", - "//vendor:k8s.io/client-go/pkg/api/unversioned", + "//vendor:k8s.io/client-go/pkg/apis/meta/v1", + "//vendor:k8s.io/client-go/pkg/conversion", "//vendor:k8s.io/client-go/pkg/runtime", "//vendor:k8s.io/client-go/pkg/runtime/schema", "//vendor:k8s.io/client-go/pkg/types", @@ -9696,15 +9679,16 @@ go_library( "k8s.io/client-go/pkg/apis/autoscaling/v1/types.go", "k8s.io/client-go/pkg/apis/autoscaling/v1/types_swagger_doc_generated.go", "k8s.io/client-go/pkg/apis/autoscaling/v1/zz_generated.conversion.go", + "k8s.io/client-go/pkg/apis/autoscaling/v1/zz_generated.deepcopy.go", "k8s.io/client-go/pkg/apis/autoscaling/v1/zz_generated.defaults.go", ], tags = ["automanaged"], deps = [ "//vendor:github.com/gogo/protobuf/proto", "//vendor:github.com/ugorji/go/codec", - "//vendor:k8s.io/client-go/pkg/api/unversioned", "//vendor:k8s.io/client-go/pkg/api/v1", "//vendor:k8s.io/client-go/pkg/apis/autoscaling", + "//vendor:k8s.io/client-go/pkg/apis/meta/v1", "//vendor:k8s.io/client-go/pkg/conversion", "//vendor:k8s.io/client-go/pkg/runtime", "//vendor:k8s.io/client-go/pkg/runtime/schema", @@ -9720,13 +9704,15 @@ go_library( "k8s.io/client-go/pkg/apis/batch/register.go", "k8s.io/client-go/pkg/apis/batch/types.generated.go", "k8s.io/client-go/pkg/apis/batch/types.go", + "k8s.io/client-go/pkg/apis/batch/zz_generated.deepcopy.go", ], tags = ["automanaged"], deps = [ "//vendor:github.com/ugorji/go/codec", "//vendor:k8s.io/client-go/pkg/api", "//vendor:k8s.io/client-go/pkg/api/resource", - "//vendor:k8s.io/client-go/pkg/api/unversioned", + "//vendor:k8s.io/client-go/pkg/apis/meta/v1", + "//vendor:k8s.io/client-go/pkg/conversion", "//vendor:k8s.io/client-go/pkg/runtime", "//vendor:k8s.io/client-go/pkg/runtime/schema", "//vendor:k8s.io/client-go/pkg/types", @@ -9758,6 +9744,7 @@ go_library( "k8s.io/client-go/pkg/apis/batch/v1/types.go", "k8s.io/client-go/pkg/apis/batch/v1/types_swagger_doc_generated.go", "k8s.io/client-go/pkg/apis/batch/v1/zz_generated.conversion.go", + "k8s.io/client-go/pkg/apis/batch/v1/zz_generated.deepcopy.go", "k8s.io/client-go/pkg/apis/batch/v1/zz_generated.defaults.go", ], tags = ["automanaged"], @@ -9766,9 +9753,9 @@ go_library( "//vendor:github.com/ugorji/go/codec", "//vendor:k8s.io/client-go/pkg/api", "//vendor:k8s.io/client-go/pkg/api/resource", - "//vendor:k8s.io/client-go/pkg/api/unversioned", "//vendor:k8s.io/client-go/pkg/api/v1", "//vendor:k8s.io/client-go/pkg/apis/batch", + "//vendor:k8s.io/client-go/pkg/apis/meta/v1", "//vendor:k8s.io/client-go/pkg/conversion", "//vendor:k8s.io/client-go/pkg/runtime", "//vendor:k8s.io/client-go/pkg/runtime/schema", @@ -9790,6 +9777,7 @@ go_library( "k8s.io/client-go/pkg/apis/batch/v2alpha1/types.go", "k8s.io/client-go/pkg/apis/batch/v2alpha1/types_swagger_doc_generated.go", "k8s.io/client-go/pkg/apis/batch/v2alpha1/zz_generated.conversion.go", + "k8s.io/client-go/pkg/apis/batch/v2alpha1/zz_generated.deepcopy.go", "k8s.io/client-go/pkg/apis/batch/v2alpha1/zz_generated.defaults.go", ], tags = ["automanaged"], @@ -9798,9 +9786,9 @@ go_library( "//vendor:github.com/ugorji/go/codec", "//vendor:k8s.io/client-go/pkg/api", "//vendor:k8s.io/client-go/pkg/api/resource", - "//vendor:k8s.io/client-go/pkg/api/unversioned", "//vendor:k8s.io/client-go/pkg/api/v1", "//vendor:k8s.io/client-go/pkg/apis/batch", + "//vendor:k8s.io/client-go/pkg/apis/meta/v1", "//vendor:k8s.io/client-go/pkg/conversion", "//vendor:k8s.io/client-go/pkg/runtime", "//vendor:k8s.io/client-go/pkg/runtime/schema", @@ -9817,12 +9805,14 @@ go_library( "k8s.io/client-go/pkg/apis/certificates/register.go", "k8s.io/client-go/pkg/apis/certificates/types.generated.go", "k8s.io/client-go/pkg/apis/certificates/types.go", + "k8s.io/client-go/pkg/apis/certificates/zz_generated.deepcopy.go", ], tags = ["automanaged"], deps = [ "//vendor:github.com/ugorji/go/codec", "//vendor:k8s.io/client-go/pkg/api", - "//vendor:k8s.io/client-go/pkg/api/unversioned", + "//vendor:k8s.io/client-go/pkg/apis/meta/v1", + "//vendor:k8s.io/client-go/pkg/conversion", "//vendor:k8s.io/client-go/pkg/runtime", "//vendor:k8s.io/client-go/pkg/runtime/schema", "//vendor:k8s.io/client-go/pkg/types", @@ -9852,15 +9842,16 @@ go_library( "k8s.io/client-go/pkg/apis/certificates/v1alpha1/types.go", "k8s.io/client-go/pkg/apis/certificates/v1alpha1/types_swagger_doc_generated.go", "k8s.io/client-go/pkg/apis/certificates/v1alpha1/zz_generated.conversion.go", + "k8s.io/client-go/pkg/apis/certificates/v1alpha1/zz_generated.deepcopy.go", ], tags = ["automanaged"], deps = [ "//vendor:github.com/gogo/protobuf/proto", "//vendor:github.com/ugorji/go/codec", "//vendor:k8s.io/client-go/pkg/api", - "//vendor:k8s.io/client-go/pkg/api/unversioned", "//vendor:k8s.io/client-go/pkg/api/v1", "//vendor:k8s.io/client-go/pkg/apis/certificates", + "//vendor:k8s.io/client-go/pkg/apis/meta/v1", "//vendor:k8s.io/client-go/pkg/conversion", "//vendor:k8s.io/client-go/pkg/runtime", "//vendor:k8s.io/client-go/pkg/runtime/schema", @@ -9877,11 +9868,13 @@ go_library( "k8s.io/client-go/pkg/apis/componentconfig/register.go", "k8s.io/client-go/pkg/apis/componentconfig/types.generated.go", "k8s.io/client-go/pkg/apis/componentconfig/types.go", + "k8s.io/client-go/pkg/apis/componentconfig/zz_generated.deepcopy.go", ], tags = ["automanaged"], deps = [ "//vendor:github.com/ugorji/go/codec", - "//vendor:k8s.io/client-go/pkg/api/unversioned", + "//vendor:k8s.io/client-go/pkg/apis/meta/v1", + "//vendor:k8s.io/client-go/pkg/conversion", "//vendor:k8s.io/client-go/pkg/runtime", "//vendor:k8s.io/client-go/pkg/runtime/schema", "//vendor:k8s.io/client-go/pkg/util/config", @@ -9908,13 +9901,14 @@ go_library( "k8s.io/client-go/pkg/apis/componentconfig/v1alpha1/register.go", "k8s.io/client-go/pkg/apis/componentconfig/v1alpha1/types.go", "k8s.io/client-go/pkg/apis/componentconfig/v1alpha1/zz_generated.conversion.go", + "k8s.io/client-go/pkg/apis/componentconfig/v1alpha1/zz_generated.deepcopy.go", "k8s.io/client-go/pkg/apis/componentconfig/v1alpha1/zz_generated.defaults.go", ], tags = ["automanaged"], deps = [ "//vendor:k8s.io/client-go/pkg/api", - "//vendor:k8s.io/client-go/pkg/api/unversioned", "//vendor:k8s.io/client-go/pkg/apis/componentconfig", + "//vendor:k8s.io/client-go/pkg/apis/meta/v1", "//vendor:k8s.io/client-go/pkg/conversion", "//vendor:k8s.io/client-go/pkg/kubelet/qos", "//vendor:k8s.io/client-go/pkg/kubelet/types", @@ -9933,15 +9927,17 @@ go_library( "k8s.io/client-go/pkg/apis/extensions/register.go", "k8s.io/client-go/pkg/apis/extensions/types.generated.go", "k8s.io/client-go/pkg/apis/extensions/types.go", + "k8s.io/client-go/pkg/apis/extensions/zz_generated.deepcopy.go", ], tags = ["automanaged"], deps = [ "//vendor:github.com/ugorji/go/codec", "//vendor:k8s.io/client-go/pkg/api", "//vendor:k8s.io/client-go/pkg/api/resource", - "//vendor:k8s.io/client-go/pkg/api/unversioned", "//vendor:k8s.io/client-go/pkg/apis/autoscaling", "//vendor:k8s.io/client-go/pkg/apis/batch", + "//vendor:k8s.io/client-go/pkg/apis/meta/v1", + "//vendor:k8s.io/client-go/pkg/conversion", "//vendor:k8s.io/client-go/pkg/runtime", "//vendor:k8s.io/client-go/pkg/runtime/schema", "//vendor:k8s.io/client-go/pkg/types", @@ -9973,6 +9969,7 @@ go_library( "k8s.io/client-go/pkg/apis/extensions/v1beta1/types.go", "k8s.io/client-go/pkg/apis/extensions/v1beta1/types_swagger_doc_generated.go", "k8s.io/client-go/pkg/apis/extensions/v1beta1/zz_generated.conversion.go", + "k8s.io/client-go/pkg/apis/extensions/v1beta1/zz_generated.deepcopy.go", "k8s.io/client-go/pkg/apis/extensions/v1beta1/zz_generated.defaults.go", ], tags = ["automanaged"], @@ -9982,11 +9979,11 @@ go_library( "//vendor:github.com/ugorji/go/codec", "//vendor:k8s.io/client-go/pkg/api", "//vendor:k8s.io/client-go/pkg/api/resource", - "//vendor:k8s.io/client-go/pkg/api/unversioned", "//vendor:k8s.io/client-go/pkg/api/v1", "//vendor:k8s.io/client-go/pkg/apis/autoscaling", "//vendor:k8s.io/client-go/pkg/apis/batch", "//vendor:k8s.io/client-go/pkg/apis/extensions", + "//vendor:k8s.io/client-go/pkg/apis/meta/v1", "//vendor:k8s.io/client-go/pkg/conversion", "//vendor:k8s.io/client-go/pkg/runtime", "//vendor:k8s.io/client-go/pkg/runtime/schema", @@ -10003,12 +10000,14 @@ go_library( "k8s.io/client-go/pkg/apis/imagepolicy/register.go", "k8s.io/client-go/pkg/apis/imagepolicy/types.generated.go", "k8s.io/client-go/pkg/apis/imagepolicy/types.go", + "k8s.io/client-go/pkg/apis/imagepolicy/zz_generated.deepcopy.go", ], tags = ["automanaged"], deps = [ "//vendor:github.com/ugorji/go/codec", "//vendor:k8s.io/client-go/pkg/api", - "//vendor:k8s.io/client-go/pkg/api/unversioned", + "//vendor:k8s.io/client-go/pkg/apis/meta/v1", + "//vendor:k8s.io/client-go/pkg/conversion", "//vendor:k8s.io/client-go/pkg/runtime", "//vendor:k8s.io/client-go/pkg/runtime/schema", "//vendor:k8s.io/client-go/pkg/types", @@ -10037,15 +10036,16 @@ go_library( "k8s.io/client-go/pkg/apis/imagepolicy/v1alpha1/types.go", "k8s.io/client-go/pkg/apis/imagepolicy/v1alpha1/types_swagger_doc_generated.go", "k8s.io/client-go/pkg/apis/imagepolicy/v1alpha1/zz_generated.conversion.go", + "k8s.io/client-go/pkg/apis/imagepolicy/v1alpha1/zz_generated.deepcopy.go", ], tags = ["automanaged"], deps = [ "//vendor:github.com/gogo/protobuf/proto", "//vendor:github.com/gogo/protobuf/sortkeys", "//vendor:github.com/ugorji/go/codec", - "//vendor:k8s.io/client-go/pkg/api/unversioned", "//vendor:k8s.io/client-go/pkg/api/v1", "//vendor:k8s.io/client-go/pkg/apis/imagepolicy", + "//vendor:k8s.io/client-go/pkg/apis/meta/v1", "//vendor:k8s.io/client-go/pkg/conversion", "//vendor:k8s.io/client-go/pkg/runtime", "//vendor:k8s.io/client-go/pkg/runtime/schema", @@ -10064,7 +10064,7 @@ go_library( tags = ["automanaged"], deps = [ "//vendor:k8s.io/client-go/pkg/api", - "//vendor:k8s.io/client-go/pkg/api/unversioned", + "//vendor:k8s.io/client-go/pkg/apis/meta/v1", "//vendor:k8s.io/client-go/pkg/runtime", "//vendor:k8s.io/client-go/pkg/runtime/schema", ], @@ -10095,8 +10095,8 @@ go_library( ], tags = ["automanaged"], deps = [ - "//vendor:k8s.io/client-go/pkg/api/unversioned", "//vendor:k8s.io/client-go/pkg/api/v1", + "//vendor:k8s.io/client-go/pkg/apis/meta/v1", "//vendor:k8s.io/client-go/pkg/runtime", "//vendor:k8s.io/client-go/pkg/runtime/schema", ], @@ -10109,12 +10109,14 @@ go_library( "k8s.io/client-go/pkg/apis/policy/register.go", "k8s.io/client-go/pkg/apis/policy/types.generated.go", "k8s.io/client-go/pkg/apis/policy/types.go", + "k8s.io/client-go/pkg/apis/policy/zz_generated.deepcopy.go", ], tags = ["automanaged"], deps = [ "//vendor:github.com/ugorji/go/codec", "//vendor:k8s.io/client-go/pkg/api", - "//vendor:k8s.io/client-go/pkg/api/unversioned", + "//vendor:k8s.io/client-go/pkg/apis/meta/v1", + "//vendor:k8s.io/client-go/pkg/conversion", "//vendor:k8s.io/client-go/pkg/runtime", "//vendor:k8s.io/client-go/pkg/runtime/schema", "//vendor:k8s.io/client-go/pkg/types", @@ -10142,8 +10144,8 @@ go_library( ], tags = ["automanaged"], deps = [ - "//vendor:k8s.io/client-go/pkg/api/unversioned", "//vendor:k8s.io/client-go/pkg/api/v1", + "//vendor:k8s.io/client-go/pkg/apis/meta/v1", "//vendor:k8s.io/client-go/pkg/runtime", "//vendor:k8s.io/client-go/pkg/runtime/schema", "//vendor:k8s.io/client-go/pkg/util/intstr", @@ -10158,11 +10160,13 @@ go_library( "k8s.io/client-go/pkg/apis/rbac/helpers.go", "k8s.io/client-go/pkg/apis/rbac/register.go", "k8s.io/client-go/pkg/apis/rbac/types.go", + "k8s.io/client-go/pkg/apis/rbac/zz_generated.deepcopy.go", ], tags = ["automanaged"], deps = [ "//vendor:k8s.io/client-go/pkg/api", - "//vendor:k8s.io/client-go/pkg/api/unversioned", + "//vendor:k8s.io/client-go/pkg/apis/meta/v1", + "//vendor:k8s.io/client-go/pkg/conversion", "//vendor:k8s.io/client-go/pkg/runtime", "//vendor:k8s.io/client-go/pkg/runtime/schema", "//vendor:k8s.io/client-go/pkg/watch/versioned", @@ -10193,14 +10197,15 @@ go_library( "k8s.io/client-go/pkg/apis/rbac/v1alpha1/types.go", "k8s.io/client-go/pkg/apis/rbac/v1alpha1/types_swagger_doc_generated.go", "k8s.io/client-go/pkg/apis/rbac/v1alpha1/zz_generated.conversion.go", + "k8s.io/client-go/pkg/apis/rbac/v1alpha1/zz_generated.deepcopy.go", "k8s.io/client-go/pkg/apis/rbac/v1alpha1/zz_generated.defaults.go", ], tags = ["automanaged"], deps = [ "//vendor:github.com/gogo/protobuf/proto", "//vendor:github.com/ugorji/go/codec", - "//vendor:k8s.io/client-go/pkg/api/unversioned", "//vendor:k8s.io/client-go/pkg/api/v1", + "//vendor:k8s.io/client-go/pkg/apis/meta/v1", "//vendor:k8s.io/client-go/pkg/apis/rbac", "//vendor:k8s.io/client-go/pkg/conversion", "//vendor:k8s.io/client-go/pkg/runtime", @@ -10217,12 +10222,14 @@ go_library( "k8s.io/client-go/pkg/apis/storage/register.go", "k8s.io/client-go/pkg/apis/storage/types.generated.go", "k8s.io/client-go/pkg/apis/storage/types.go", + "k8s.io/client-go/pkg/apis/storage/zz_generated.deepcopy.go", ], tags = ["automanaged"], deps = [ "//vendor:github.com/ugorji/go/codec", "//vendor:k8s.io/client-go/pkg/api", - "//vendor:k8s.io/client-go/pkg/api/unversioned", + "//vendor:k8s.io/client-go/pkg/apis/meta/v1", + "//vendor:k8s.io/client-go/pkg/conversion", "//vendor:k8s.io/client-go/pkg/runtime", "//vendor:k8s.io/client-go/pkg/runtime/schema", "//vendor:k8s.io/client-go/pkg/types", @@ -10251,14 +10258,15 @@ go_library( "k8s.io/client-go/pkg/apis/storage/v1beta1/types.go", "k8s.io/client-go/pkg/apis/storage/v1beta1/types_swagger_doc_generated.go", "k8s.io/client-go/pkg/apis/storage/v1beta1/zz_generated.conversion.go", + "k8s.io/client-go/pkg/apis/storage/v1beta1/zz_generated.deepcopy.go", ], tags = ["automanaged"], deps = [ "//vendor:github.com/gogo/protobuf/proto", "//vendor:github.com/gogo/protobuf/sortkeys", "//vendor:github.com/ugorji/go/codec", - "//vendor:k8s.io/client-go/pkg/api/unversioned", "//vendor:k8s.io/client-go/pkg/api/v1", + "//vendor:k8s.io/client-go/pkg/apis/meta/v1", "//vendor:k8s.io/client-go/pkg/apis/storage", "//vendor:k8s.io/client-go/pkg/conversion", "//vendor:k8s.io/client-go/pkg/runtime", @@ -10306,12 +10314,14 @@ go_library( "k8s.io/client-go/pkg/federation/apis/federation/register.go", "k8s.io/client-go/pkg/federation/apis/federation/types.generated.go", "k8s.io/client-go/pkg/federation/apis/federation/types.go", + "k8s.io/client-go/pkg/federation/apis/federation/zz_generated.deepcopy.go", ], tags = ["automanaged"], deps = [ "//vendor:github.com/ugorji/go/codec", "//vendor:k8s.io/client-go/pkg/api", - "//vendor:k8s.io/client-go/pkg/api/unversioned", + "//vendor:k8s.io/client-go/pkg/apis/meta/v1", + "//vendor:k8s.io/client-go/pkg/conversion", "//vendor:k8s.io/client-go/pkg/runtime", "//vendor:k8s.io/client-go/pkg/runtime/schema", "//vendor:k8s.io/client-go/pkg/types", @@ -10348,14 +10358,15 @@ go_library( "k8s.io/client-go/pkg/federation/apis/federation/v1beta1/types.go", "k8s.io/client-go/pkg/federation/apis/federation/v1beta1/types_swagger_doc_generated.go", "k8s.io/client-go/pkg/federation/apis/federation/v1beta1/zz_generated.conversion.go", + "k8s.io/client-go/pkg/federation/apis/federation/v1beta1/zz_generated.deepcopy.go", ], tags = ["automanaged"], deps = [ "//vendor:github.com/gogo/protobuf/proto", "//vendor:github.com/ugorji/go/codec", "//vendor:k8s.io/client-go/pkg/api", - "//vendor:k8s.io/client-go/pkg/api/unversioned", "//vendor:k8s.io/client-go/pkg/api/v1", + "//vendor:k8s.io/client-go/pkg/apis/meta/v1", "//vendor:k8s.io/client-go/pkg/conversion", "//vendor:k8s.io/client-go/pkg/federation/apis/federation", "//vendor:k8s.io/client-go/pkg/runtime", @@ -10482,13 +10493,14 @@ go_library( "k8s.io/client-go/pkg/runtime/types.go", "k8s.io/client-go/pkg/runtime/types_proto.go", "k8s.io/client-go/pkg/runtime/unstructured.go", + "k8s.io/client-go/pkg/runtime/zz_generated.deepcopy.go", ], tags = ["automanaged"], deps = [ "//vendor:github.com/gogo/protobuf/proto", "//vendor:github.com/golang/glog", "//vendor:k8s.io/client-go/pkg/api/meta/metatypes", - "//vendor:k8s.io/client-go/pkg/api/unversioned", + "//vendor:k8s.io/client-go/pkg/apis/meta/v1", "//vendor:k8s.io/client-go/pkg/conversion", "//vendor:k8s.io/client-go/pkg/conversion/queryparams", "//vendor:k8s.io/client-go/pkg/runtime/schema", @@ -10739,7 +10751,7 @@ go_library( "//vendor:github.com/golang/glog", "//vendor:k8s.io/client-go/pkg/api", "//vendor:k8s.io/client-go/pkg/api/errors", - "//vendor:k8s.io/client-go/pkg/api/unversioned", + "//vendor:k8s.io/client-go/pkg/apis/meta/v1", "//vendor:k8s.io/client-go/pkg/third_party/forked/golang/netutil", "//vendor:k8s.io/client-go/pkg/util/httpstream", "//vendor:k8s.io/client-go/pkg/util/runtime", @@ -10762,6 +10774,7 @@ go_library( deps = [ "//vendor:github.com/go-openapi/spec", "//vendor:github.com/gogo/protobuf/proto", + "//vendor:github.com/golang/glog", "//vendor:github.com/google/gofuzz", "//vendor:k8s.io/client-go/pkg/genericapiserver/openapi/common", ], @@ -10780,7 +10793,7 @@ go_library( "k8s.io/client-go/pkg/util/labels/labels.go", ], tags = ["automanaged"], - deps = ["//vendor:k8s.io/client-go/pkg/api/unversioned"], + deps = ["//vendor:k8s.io/client-go/pkg/apis/meta/v1"], ) go_library( @@ -10840,7 +10853,6 @@ go_library( deps = [ "//vendor:github.com/davecgh/go-spew/spew", "//vendor:github.com/ghodss/yaml", - "//vendor:k8s.io/client-go/discovery", "//vendor:k8s.io/client-go/pkg/third_party/forked/golang/json", "//vendor:k8s.io/client-go/pkg/util/json", ], @@ -11024,9 +11036,9 @@ go_library( "//vendor:github.com/golang/glog", "//vendor:k8s.io/client-go/pkg/api", "//vendor:k8s.io/client-go/pkg/api/errors", - "//vendor:k8s.io/client-go/pkg/api/unversioned", "//vendor:k8s.io/client-go/pkg/api/v1", "//vendor:k8s.io/client-go/pkg/api/validation/path", + "//vendor:k8s.io/client-go/pkg/apis/meta/v1", "//vendor:k8s.io/client-go/pkg/fields", "//vendor:k8s.io/client-go/pkg/labels", "//vendor:k8s.io/client-go/pkg/runtime", @@ -11072,9 +11084,9 @@ go_library( "//vendor:k8s.io/client-go/pkg/api", "//vendor:k8s.io/client-go/pkg/api/errors", "//vendor:k8s.io/client-go/pkg/api/meta", - "//vendor:k8s.io/client-go/pkg/api/unversioned", "//vendor:k8s.io/client-go/pkg/api/v1", "//vendor:k8s.io/client-go/pkg/apimachinery/registered", + "//vendor:k8s.io/client-go/pkg/apis/meta/v1", "//vendor:k8s.io/client-go/pkg/fields", "//vendor:k8s.io/client-go/pkg/labels", "//vendor:k8s.io/client-go/pkg/runtime", @@ -11121,12 +11133,12 @@ go_library( "//vendor:k8s.io/client-go/pkg/api", "//vendor:k8s.io/client-go/pkg/api/errors", "//vendor:k8s.io/client-go/pkg/api/meta", - "//vendor:k8s.io/client-go/pkg/api/unversioned", "//vendor:k8s.io/client-go/pkg/api/v1", "//vendor:k8s.io/client-go/pkg/apis/apps/v1beta1", "//vendor:k8s.io/client-go/pkg/apis/certificates/v1alpha1", "//vendor:k8s.io/client-go/pkg/apis/extensions", "//vendor:k8s.io/client-go/pkg/apis/extensions/v1beta1", + "//vendor:k8s.io/client-go/pkg/apis/meta/v1", "//vendor:k8s.io/client-go/pkg/apis/policy/v1beta1", "//vendor:k8s.io/client-go/pkg/apis/rbac", "//vendor:k8s.io/client-go/pkg/apis/storage", @@ -11268,8 +11280,8 @@ go_library( "//vendor:github.com/golang/glog", "//vendor:github.com/golang/groupcache/lru", "//vendor:k8s.io/client-go/pkg/api/errors", - "//vendor:k8s.io/client-go/pkg/api/unversioned", "//vendor:k8s.io/client-go/pkg/api/v1", + "//vendor:k8s.io/client-go/pkg/apis/meta/v1", "//vendor:k8s.io/client-go/pkg/runtime", "//vendor:k8s.io/client-go/pkg/util/clock", "//vendor:k8s.io/client-go/pkg/util/runtime", @@ -11655,6 +11667,7 @@ go_library( "k8s.io/client-go/pkg/apis/apps/v1beta1/types.go", "k8s.io/client-go/pkg/apis/apps/v1beta1/types_swagger_doc_generated.go", "k8s.io/client-go/pkg/apis/apps/v1beta1/zz_generated.conversion.go", + "k8s.io/client-go/pkg/apis/apps/v1beta1/zz_generated.deepcopy.go", "k8s.io/client-go/pkg/apis/apps/v1beta1/zz_generated.defaults.go", ], tags = ["automanaged"], @@ -11663,9 +11676,9 @@ go_library( "//vendor:github.com/ugorji/go/codec", "//vendor:k8s.io/client-go/pkg/api", "//vendor:k8s.io/client-go/pkg/api/resource", - "//vendor:k8s.io/client-go/pkg/api/unversioned", "//vendor:k8s.io/client-go/pkg/api/v1", "//vendor:k8s.io/client-go/pkg/apis/apps", + "//vendor:k8s.io/client-go/pkg/apis/meta/v1", "//vendor:k8s.io/client-go/pkg/conversion", "//vendor:k8s.io/client-go/pkg/runtime", "//vendor:k8s.io/client-go/pkg/runtime/schema", @@ -11685,6 +11698,7 @@ go_library( "k8s.io/client-go/pkg/apis/policy/v1beta1/types.go", "k8s.io/client-go/pkg/apis/policy/v1beta1/types_swagger_doc_generated.go", "k8s.io/client-go/pkg/apis/policy/v1beta1/zz_generated.conversion.go", + "k8s.io/client-go/pkg/apis/policy/v1beta1/zz_generated.deepcopy.go", ], tags = ["automanaged"], deps = [ @@ -11692,8 +11706,8 @@ go_library( "//vendor:github.com/gogo/protobuf/sortkeys", "//vendor:github.com/ugorji/go/codec", "//vendor:k8s.io/client-go/pkg/api", - "//vendor:k8s.io/client-go/pkg/api/unversioned", "//vendor:k8s.io/client-go/pkg/api/v1", + "//vendor:k8s.io/client-go/pkg/apis/meta/v1", "//vendor:k8s.io/client-go/pkg/apis/policy", "//vendor:k8s.io/client-go/pkg/conversion", "//vendor:k8s.io/client-go/pkg/runtime", @@ -11741,3 +11755,34 @@ go_library( tags = ["automanaged"], deps = ["//vendor:github.com/gogo/protobuf/proto"], ) + +go_library( + name = "k8s.io/client-go/pkg/apis/meta/v1", + srcs = [ + "k8s.io/client-go/pkg/apis/meta/v1/doc.go", + "k8s.io/client-go/pkg/apis/meta/v1/duration.go", + "k8s.io/client-go/pkg/apis/meta/v1/generated.pb.go", + "k8s.io/client-go/pkg/apis/meta/v1/group_version.go", + "k8s.io/client-go/pkg/apis/meta/v1/helpers.go", + "k8s.io/client-go/pkg/apis/meta/v1/meta.go", + "k8s.io/client-go/pkg/apis/meta/v1/register.go", + "k8s.io/client-go/pkg/apis/meta/v1/time.go", + "k8s.io/client-go/pkg/apis/meta/v1/time_proto.go", + "k8s.io/client-go/pkg/apis/meta/v1/types.go", + "k8s.io/client-go/pkg/apis/meta/v1/types_swagger_doc_generated.go", + "k8s.io/client-go/pkg/apis/meta/v1/well_known_labels.go", + "k8s.io/client-go/pkg/apis/meta/v1/zz_generated.deepcopy.go", + ], + tags = ["automanaged"], + deps = [ + "//vendor:github.com/go-openapi/spec", + "//vendor:github.com/gogo/protobuf/proto", + "//vendor:github.com/gogo/protobuf/sortkeys", + "//vendor:github.com/google/gofuzz", + "//vendor:k8s.io/client-go/pkg/conversion", + "//vendor:k8s.io/client-go/pkg/genericapiserver/openapi/common", + "//vendor:k8s.io/client-go/pkg/labels", + "//vendor:k8s.io/client-go/pkg/runtime/schema", + "//vendor:k8s.io/client-go/pkg/selection", + ], +)