diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json index a2d4ebabc63..6965c6e3213 100644 --- a/api/openapi-spec/swagger.json +++ b/api/openapi-spec/swagger.json @@ -21454,7 +21454,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update the specified ConfigMap", "operationId": "patchCoreV1NamespacedConfigMap", @@ -22056,7 +22057,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update the specified Endpoints", "operationId": "patchCoreV1NamespacedEndpoints", @@ -22658,7 +22660,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update the specified Event", "operationId": "patchCoreV1NamespacedEvent", @@ -23260,7 +23263,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update the specified LimitRange", "operationId": "patchCoreV1NamespacedLimitRange", @@ -23862,7 +23866,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update the specified PersistentVolumeClaim", "operationId": "patchCoreV1NamespacedPersistentVolumeClaim", @@ -24057,7 +24062,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update status of the specified PersistentVolumeClaim", "operationId": "patchCoreV1NamespacedPersistentVolumeClaimStatus", @@ -24659,7 +24665,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update the specified Pod", "operationId": "patchCoreV1NamespacedPod", @@ -26028,7 +26035,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update status of the specified Pod", "operationId": "patchCoreV1NamespacedPodStatus", @@ -26630,7 +26638,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update the specified PodTemplate", "operationId": "patchCoreV1NamespacedPodTemplate", @@ -27232,7 +27241,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update the specified ReplicationController", "operationId": "patchCoreV1NamespacedReplicationController", @@ -27427,7 +27437,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update scale of the specified ReplicationController", "operationId": "patchCoreV1NamespacedReplicationControllerScale", @@ -27622,7 +27633,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update status of the specified ReplicationController", "operationId": "patchCoreV1NamespacedReplicationControllerStatus", @@ -28224,7 +28236,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update the specified ResourceQuota", "operationId": "patchCoreV1NamespacedResourceQuota", @@ -28419,7 +28432,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update status of the specified ResourceQuota", "operationId": "patchCoreV1NamespacedResourceQuotaStatus", @@ -29021,7 +29035,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update the specified Secret", "operationId": "patchCoreV1NamespacedSecret", @@ -29623,7 +29638,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update the specified ServiceAccount", "operationId": "patchCoreV1NamespacedServiceAccount", @@ -30195,7 +30211,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update the specified Service", "operationId": "patchCoreV1NamespacedService", @@ -30914,7 +30931,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update status of the specified Service", "operationId": "patchCoreV1NamespacedServiceStatus", @@ -31195,7 +31213,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update the specified Namespace", "operationId": "patchCoreV1Namespace", @@ -31466,7 +31485,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update status of the specified Namespace", "operationId": "patchCoreV1NamespaceStatus", @@ -32052,7 +32072,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update the specified Node", "operationId": "patchCoreV1Node", @@ -32747,7 +32768,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update status of the specified Node", "operationId": "patchCoreV1NodeStatus", @@ -33437,7 +33459,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update the specified PersistentVolume", "operationId": "patchCoreV1PersistentVolume", @@ -33624,7 +33647,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update status of the specified PersistentVolume", "operationId": "patchCoreV1PersistentVolumeStatus", @@ -39717,7 +39741,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update the specified MutatingWebhookConfiguration", "operationId": "patchAdmissionregistrationV1MutatingWebhookConfiguration", @@ -40303,7 +40328,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update the specified ValidatingWebhookConfiguration", "operationId": "patchAdmissionregistrationV1ValidatingWebhookConfiguration", @@ -41354,7 +41380,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update the specified MutatingWebhookConfiguration", "operationId": "patchAdmissionregistrationV1beta1MutatingWebhookConfiguration", @@ -41940,7 +41967,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update the specified ValidatingWebhookConfiguration", "operationId": "patchAdmissionregistrationV1beta1ValidatingWebhookConfiguration", @@ -43024,7 +43052,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update the specified CustomResourceDefinition", "operationId": "patchApiextensionsV1CustomResourceDefinition", @@ -43211,7 +43240,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update status of the specified CustomResourceDefinition", "operationId": "patchApiextensionsV1CustomResourceDefinitionStatus", @@ -44046,7 +44076,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update the specified CustomResourceDefinition", "operationId": "patchApiextensionsV1beta1CustomResourceDefinition", @@ -44233,7 +44264,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update status of the specified CustomResourceDefinition", "operationId": "patchApiextensionsV1beta1CustomResourceDefinitionStatus", @@ -45101,7 +45133,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update the specified APIService", "operationId": "patchApiregistrationV1APIService", @@ -45288,7 +45321,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update status of the specified APIService", "operationId": "patchApiregistrationV1APIServiceStatus", @@ -46123,7 +46157,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update the specified APIService", "operationId": "patchApiregistrationV1beta1APIService", @@ -46310,7 +46345,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update status of the specified APIService", "operationId": "patchApiregistrationV1beta1APIServiceStatus", @@ -47506,7 +47542,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update the specified ControllerRevision", "operationId": "patchAppsV1NamespacedControllerRevision", @@ -48108,7 +48145,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update the specified DaemonSet", "operationId": "patchAppsV1NamespacedDaemonSet", @@ -48303,7 +48341,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update status of the specified DaemonSet", "operationId": "patchAppsV1NamespacedDaemonSetStatus", @@ -48905,7 +48944,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update the specified Deployment", "operationId": "patchAppsV1NamespacedDeployment", @@ -49100,7 +49140,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update scale of the specified Deployment", "operationId": "patchAppsV1NamespacedDeploymentScale", @@ -49295,7 +49336,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update status of the specified Deployment", "operationId": "patchAppsV1NamespacedDeploymentStatus", @@ -49897,7 +49939,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update the specified ReplicaSet", "operationId": "patchAppsV1NamespacedReplicaSet", @@ -50092,7 +50135,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update scale of the specified ReplicaSet", "operationId": "patchAppsV1NamespacedReplicaSetScale", @@ -50287,7 +50331,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update status of the specified ReplicaSet", "operationId": "patchAppsV1NamespacedReplicaSetStatus", @@ -50889,7 +50934,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update the specified StatefulSet", "operationId": "patchAppsV1NamespacedStatefulSet", @@ -51084,7 +51130,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update scale of the specified StatefulSet", "operationId": "patchAppsV1NamespacedStatefulSetScale", @@ -51279,7 +51326,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update status of the specified StatefulSet", "operationId": "patchAppsV1NamespacedStatefulSetStatus", @@ -54010,7 +54058,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update the specified ControllerRevision", "operationId": "patchAppsV1beta1NamespacedControllerRevision", @@ -54612,7 +54661,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update the specified Deployment", "operationId": "patchAppsV1beta1NamespacedDeployment", @@ -54905,7 +54955,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update scale of the specified Deployment", "operationId": "patchAppsV1beta1NamespacedDeploymentScale", @@ -55100,7 +55151,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update status of the specified Deployment", "operationId": "patchAppsV1beta1NamespacedDeploymentStatus", @@ -55702,7 +55754,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update the specified StatefulSet", "operationId": "patchAppsV1beta1NamespacedStatefulSet", @@ -55897,7 +55950,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update scale of the specified StatefulSet", "operationId": "patchAppsV1beta1NamespacedStatefulSetScale", @@ -56092,7 +56146,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update status of the specified StatefulSet", "operationId": "patchAppsV1beta1NamespacedStatefulSetStatus", @@ -58151,7 +58206,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update the specified ControllerRevision", "operationId": "patchAppsV1beta2NamespacedControllerRevision", @@ -58753,7 +58809,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update the specified DaemonSet", "operationId": "patchAppsV1beta2NamespacedDaemonSet", @@ -58948,7 +59005,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update status of the specified DaemonSet", "operationId": "patchAppsV1beta2NamespacedDaemonSetStatus", @@ -59550,7 +59608,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update the specified Deployment", "operationId": "patchAppsV1beta2NamespacedDeployment", @@ -59745,7 +59804,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update scale of the specified Deployment", "operationId": "patchAppsV1beta2NamespacedDeploymentScale", @@ -59940,7 +60000,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update status of the specified Deployment", "operationId": "patchAppsV1beta2NamespacedDeploymentStatus", @@ -60542,7 +60603,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update the specified ReplicaSet", "operationId": "patchAppsV1beta2NamespacedReplicaSet", @@ -60737,7 +60799,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update scale of the specified ReplicaSet", "operationId": "patchAppsV1beta2NamespacedReplicaSetScale", @@ -60932,7 +60995,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update status of the specified ReplicaSet", "operationId": "patchAppsV1beta2NamespacedReplicaSetStatus", @@ -61534,7 +61598,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update the specified StatefulSet", "operationId": "patchAppsV1beta2NamespacedStatefulSet", @@ -61729,7 +61794,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update scale of the specified StatefulSet", "operationId": "patchAppsV1beta2NamespacedStatefulSetScale", @@ -61924,7 +61990,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update status of the specified StatefulSet", "operationId": "patchAppsV1beta2NamespacedStatefulSetStatus", @@ -64464,7 +64531,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update the specified AuditSink", "operationId": "patchAuditregistrationV1alpha1AuditSink", @@ -66486,7 +66554,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update the specified HorizontalPodAutoscaler", "operationId": "patchAutoscalingV1NamespacedHorizontalPodAutoscaler", @@ -66681,7 +66750,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update status of the specified HorizontalPodAutoscaler", "operationId": "patchAutoscalingV1NamespacedHorizontalPodAutoscalerStatus", @@ -67756,7 +67826,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update the specified HorizontalPodAutoscaler", "operationId": "patchAutoscalingV2beta1NamespacedHorizontalPodAutoscaler", @@ -67951,7 +68022,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update status of the specified HorizontalPodAutoscaler", "operationId": "patchAutoscalingV2beta1NamespacedHorizontalPodAutoscalerStatus", @@ -69026,7 +69098,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update the specified HorizontalPodAutoscaler", "operationId": "patchAutoscalingV2beta2NamespacedHorizontalPodAutoscaler", @@ -69221,7 +69294,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update status of the specified HorizontalPodAutoscaler", "operationId": "patchAutoscalingV2beta2NamespacedHorizontalPodAutoscalerStatus", @@ -70329,7 +70403,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update the specified Job", "operationId": "patchBatchV1NamespacedJob", @@ -70524,7 +70599,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update status of the specified Job", "operationId": "patchBatchV1NamespacedJobStatus", @@ -71599,7 +71675,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update the specified CronJob", "operationId": "patchBatchV1beta1NamespacedCronJob", @@ -71794,7 +71871,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update status of the specified CronJob", "operationId": "patchBatchV1beta1NamespacedCronJobStatus", @@ -72869,7 +72947,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update the specified CronJob", "operationId": "patchBatchV2alpha1NamespacedCronJob", @@ -73064,7 +73143,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update status of the specified CronJob", "operationId": "patchBatchV2alpha1NamespacedCronJobStatus", @@ -74052,7 +74132,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update the specified CertificateSigningRequest", "operationId": "patchCertificatesV1beta1CertificateSigningRequest", @@ -74323,7 +74404,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update status of the specified CertificateSigningRequest", "operationId": "patchCertificatesV1beta1CertificateSigningRequestStatus", @@ -75311,7 +75393,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update the specified Lease", "operationId": "patchCoordinationV1NamespacedLease", @@ -76386,7 +76469,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update the specified Lease", "operationId": "patchCoordinationV1beta1NamespacedLease", @@ -77494,7 +77578,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update the specified EndpointSlice", "operationId": "patchDiscoveryV1alpha1NamespacedEndpointSlice", @@ -78602,7 +78687,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update the specified Event", "operationId": "patchEventsV1beta1NamespacedEvent", @@ -79918,7 +80004,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update the specified DaemonSet", "operationId": "patchExtensionsV1beta1NamespacedDaemonSet", @@ -80113,7 +80200,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update status of the specified DaemonSet", "operationId": "patchExtensionsV1beta1NamespacedDaemonSetStatus", @@ -80715,7 +80803,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update the specified Deployment", "operationId": "patchExtensionsV1beta1NamespacedDeployment", @@ -81008,7 +81097,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update scale of the specified Deployment", "operationId": "patchExtensionsV1beta1NamespacedDeploymentScale", @@ -81203,7 +81293,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update status of the specified Deployment", "operationId": "patchExtensionsV1beta1NamespacedDeploymentStatus", @@ -81805,7 +81896,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update the specified Ingress", "operationId": "patchExtensionsV1beta1NamespacedIngress", @@ -82000,7 +82092,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update status of the specified Ingress", "operationId": "patchExtensionsV1beta1NamespacedIngressStatus", @@ -82602,7 +82695,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update the specified NetworkPolicy", "operationId": "patchExtensionsV1beta1NamespacedNetworkPolicy", @@ -83204,7 +83298,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update the specified ReplicaSet", "operationId": "patchExtensionsV1beta1NamespacedReplicaSet", @@ -83399,7 +83494,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update scale of the specified ReplicaSet", "operationId": "patchExtensionsV1beta1NamespacedReplicaSetScale", @@ -83594,7 +83690,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update status of the specified ReplicaSet", "operationId": "patchExtensionsV1beta1NamespacedReplicaSetStatus", @@ -83789,7 +83886,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update scale of the specified ReplicationControllerDummy", "operationId": "patchExtensionsV1beta1NamespacedReplicationControllerDummyScale", @@ -84479,7 +84577,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update the specified PodSecurityPolicy", "operationId": "patchExtensionsV1beta1PodSecurityPolicy", @@ -87147,7 +87246,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update the specified NetworkPolicy", "operationId": "patchNetworkingV1NamespacedNetworkPolicy", @@ -88326,7 +88426,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update the specified Ingress", "operationId": "patchNetworkingV1beta1NamespacedIngress", @@ -88521,7 +88622,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update status of the specified Ingress", "operationId": "patchNetworkingV1beta1NamespacedIngressStatus", @@ -89509,7 +89611,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update the specified RuntimeClass", "operationId": "patchNodeV1alpha1RuntimeClass", @@ -90344,7 +90447,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update the specified RuntimeClass", "operationId": "patchNodeV1beta1RuntimeClass", @@ -91228,7 +91332,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update the specified PodDisruptionBudget", "operationId": "patchPolicyV1beta1NamespacedPodDisruptionBudget", @@ -91423,7 +91528,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update status of the specified PodDisruptionBudget", "operationId": "patchPolicyV1beta1NamespacedPodDisruptionBudgetStatus", @@ -92113,7 +92219,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update the specified PodSecurityPolicy", "operationId": "patchPolicyV1beta1PodSecurityPolicy", @@ -93301,7 +93408,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update the specified ClusterRoleBinding", "operationId": "patchRbacAuthorizationV1ClusterRoleBinding", @@ -93871,7 +93979,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update the specified ClusterRole", "operationId": "patchRbacAuthorizationV1ClusterRole", @@ -94457,7 +94566,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update the specified RoleBinding", "operationId": "patchRbacAuthorizationV1NamespacedRoleBinding", @@ -95043,7 +95153,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update the specified Role", "operationId": "patchRbacAuthorizationV1NamespacedRole", @@ -96958,7 +97069,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update the specified ClusterRoleBinding", "operationId": "patchRbacAuthorizationV1alpha1ClusterRoleBinding", @@ -97528,7 +97640,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update the specified ClusterRole", "operationId": "patchRbacAuthorizationV1alpha1ClusterRole", @@ -98114,7 +98227,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update the specified RoleBinding", "operationId": "patchRbacAuthorizationV1alpha1NamespacedRoleBinding", @@ -98700,7 +98814,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update the specified Role", "operationId": "patchRbacAuthorizationV1alpha1NamespacedRole", @@ -100615,7 +100730,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update the specified ClusterRoleBinding", "operationId": "patchRbacAuthorizationV1beta1ClusterRoleBinding", @@ -101185,7 +101301,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update the specified ClusterRole", "operationId": "patchRbacAuthorizationV1beta1ClusterRole", @@ -101771,7 +101888,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update the specified RoleBinding", "operationId": "patchRbacAuthorizationV1beta1NamespacedRoleBinding", @@ -102357,7 +102475,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update the specified Role", "operationId": "patchRbacAuthorizationV1beta1NamespacedRole", @@ -104321,7 +104440,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update the specified PriorityClass", "operationId": "patchSchedulingV1PriorityClass", @@ -105156,7 +105276,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update the specified PriorityClass", "operationId": "patchSchedulingV1alpha1PriorityClass", @@ -105991,7 +106112,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update the specified PriorityClass", "operationId": "patchSchedulingV1beta1PriorityClass", @@ -106875,7 +106997,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update the specified PodPreset", "operationId": "patchSettingsV1alpha1NamespacedPodPreset", @@ -107967,7 +108090,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update the specified StorageClass", "operationId": "patchStorageV1StorageClass", @@ -108553,7 +108677,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update the specified VolumeAttachment", "operationId": "patchStorageV1VolumeAttachment", @@ -108740,7 +108865,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update status of the specified VolumeAttachment", "operationId": "patchStorageV1VolumeAttachmentStatus", @@ -109791,7 +109917,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update the specified VolumeAttachment", "operationId": "patchStorageV1alpha1VolumeAttachment", @@ -110626,7 +110753,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update the specified CSIDriver", "operationId": "patchStorageV1beta1CSIDriver", @@ -111212,7 +111340,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update the specified CSINode", "operationId": "patchStorageV1beta1CSINode", @@ -111798,7 +111927,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update the specified StorageClass", "operationId": "patchStorageV1beta1StorageClass", @@ -112384,7 +112514,8 @@ "consumes": [ "application/json-patch+json", "application/merge-patch+json", - "application/strategic-merge-patch+json" + "application/strategic-merge-patch+json", + "application/apply-patch+yaml" ], "description": "partially update the specified VolumeAttachment", "operationId": "patchStorageV1beta1VolumeAttachment", diff --git a/pkg/features/kube_features.go b/pkg/features/kube_features.go index 6866483e39d..1ac49ea446c 100644 --- a/pkg/features/kube_features.go +++ b/pkg/features/kube_features.go @@ -579,7 +579,7 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS genericfeatures.APIResponseCompression: {Default: true, PreRelease: featuregate.Beta}, genericfeatures.APIListChunking: {Default: true, PreRelease: featuregate.Beta}, genericfeatures.DryRun: {Default: true, PreRelease: featuregate.Beta}, - genericfeatures.ServerSideApply: {Default: false, PreRelease: featuregate.Alpha}, + genericfeatures.ServerSideApply: {Default: true, PreRelease: featuregate.Beta}, genericfeatures.RequestManagement: {Default: false, PreRelease: featuregate.Alpha}, // inherited features from apiextensions-apiserver, relisted here to get a conflict if it is changed diff --git a/staging/src/k8s.io/apiserver/pkg/features/kube_features.go b/staging/src/k8s.io/apiserver/pkg/features/kube_features.go index 081fa8bca21..bc23ed1a0e1 100644 --- a/staging/src/k8s.io/apiserver/pkg/features/kube_features.go +++ b/staging/src/k8s.io/apiserver/pkg/features/kube_features.go @@ -95,6 +95,7 @@ const ( // owner: @apelisse, @lavalamp // alpha: v1.14 + // beta: v1.16 // // Server-side apply. Merging happens on the server. ServerSideApply featuregate.Feature = "ServerSideApply" @@ -156,7 +157,7 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS APIListChunking: {Default: true, PreRelease: featuregate.Beta}, DryRun: {Default: true, PreRelease: featuregate.Beta}, RemainingItemCount: {Default: true, PreRelease: featuregate.Beta}, - ServerSideApply: {Default: false, PreRelease: featuregate.Alpha}, + ServerSideApply: {Default: true, PreRelease: featuregate.Beta}, StorageVersionHash: {Default: true, PreRelease: featuregate.Beta}, WinOverlay: {Default: false, PreRelease: featuregate.Alpha}, WinDSR: {Default: false, PreRelease: featuregate.Alpha}, diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/apply/apply.go b/staging/src/k8s.io/kubectl/pkg/cmd/apply/apply.go index 9f7a994b3c1..915f055ea43 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/apply/apply.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/apply/apply.go @@ -204,11 +204,11 @@ func (o *ApplyOptions) Complete(f cmdutil.Factory, cmd *cobra.Command) error { o.DryRun = cmdutil.GetDryRunFlag(cmd) if o.ForceConflicts && !o.ServerSideApply { - return fmt.Errorf("--experimental-force-conflicts only works with --experimental-server-side") + return fmt.Errorf("--force-conflicts only works with --server-side") } if o.DryRun && o.ServerSideApply { - return fmt.Errorf("--dry-run doesn't work with --experimental-server-side (did you mean --server-dry-run instead?)") + return fmt.Errorf("--dry-run doesn't work with --server-side (did you mean --server-dry-run instead?)") } if o.DryRun && o.ServerDryRun { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/diff/diff.go b/staging/src/k8s.io/kubectl/pkg/cmd/diff/diff.go index e64df1ddb62..f8f114a078b 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/diff/diff.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/diff/diff.go @@ -402,7 +402,7 @@ func (o *DiffOptions) Complete(f cmdutil.Factory, cmd *cobra.Command) error { o.ServerSideApply = cmdutil.GetServerSideApplyFlag(cmd) o.ForceConflicts = cmdutil.GetForceConflictsFlag(cmd) if o.ForceConflicts && !o.ServerSideApply { - return fmt.Errorf("--experimental-force-conflicts only works with --experimental-server-side") + return fmt.Errorf("--force-conflicts only works with --server-side") } if !o.ServerSideApply { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/util/helpers.go b/staging/src/k8s.io/kubectl/pkg/cmd/util/helpers.go index 9d27003e43f..0659eabf30d 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/util/helpers.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/util/helpers.go @@ -26,7 +26,7 @@ import ( "strings" "time" - "github.com/evanphx/json-patch" + jsonpatch "github.com/evanphx/json-patch" "github.com/spf13/cobra" "github.com/spf13/pflag" kerrors "k8s.io/apimachinery/pkg/api/errors" @@ -409,9 +409,9 @@ func AddDryRunFlag(cmd *cobra.Command) { } func AddServerSideApplyFlags(cmd *cobra.Command) { - cmd.Flags().Bool("experimental-server-side", false, "If true, apply runs in the server instead of the client. This is an alpha feature and flag.") - cmd.Flags().Bool("experimental-force-conflicts", false, "If true, server-side apply will force the changes against conflicts. This is an alpha feature and flag.") - cmd.Flags().String("experimental-field-manager", "kubectl", "Name of the manager used to track field ownership. This is an alpha feature and flag.") + cmd.Flags().Bool("server-side", false, "If true, apply runs in the server instead of the client.") + cmd.Flags().Bool("force-conflicts", false, "If true, server-side apply will force the changes against conflicts.") + cmd.Flags().String("field-manager", "kubectl", "Name of the manager used to track field ownership.") } func AddIncludeUninitializedFlag(cmd *cobra.Command) { @@ -488,15 +488,15 @@ func DumpReaderToFile(reader io.Reader, filename string) error { } func GetServerSideApplyFlag(cmd *cobra.Command) bool { - return GetFlagBool(cmd, "experimental-server-side") + return GetFlagBool(cmd, "server-side") } func GetForceConflictsFlag(cmd *cobra.Command) bool { - return GetFlagBool(cmd, "experimental-force-conflicts") + return GetFlagBool(cmd, "force-conflicts") } func GetFieldManagerFlag(cmd *cobra.Command) string { - return GetFlagString(cmd, "experimental-field-manager") + return GetFlagString(cmd, "field-manager") } func GetDryRunFlag(cmd *cobra.Command) bool { diff --git a/test/cmd/apply.sh b/test/cmd/apply.sh index 8b6acec44a1..99c3a9f048e 100755 --- a/test/cmd/apply.sh +++ b/test/cmd/apply.sh @@ -249,12 +249,12 @@ run_kubectl_apply_tests() { set -o errexit create_and_use_new_namespace - kube::log::status "Testing kubectl apply --experimental-server-side" + kube::log::status "Testing kubectl apply --server-side" ## kubectl apply should create the resource that doesn't exist yet # Pre-Condition: no POD exists kube::test::get_object_assert pods "{{range.items}}{{${id_field:?}}}:{{end}}" '' # Command: apply a pod "test-pod" (doesn't exist) should create this pod - kubectl apply --experimental-server-side -f hack/testdata/pod.yaml "${kube_flags[@]:?}" + kubectl apply --server-side -f hack/testdata/pod.yaml "${kube_flags[@]:?}" # Post-Condition: pod "test-pod" is created kube::test::get_object_assert 'pods test-pod' "{{${labels_field:?}.name}}" 'test-pod-label' # Clean up @@ -265,13 +265,13 @@ run_kubectl_apply_tests() { kube::test::get_object_assert pods "{{range.items}}{{${id_field:?}}}:{{end}}" '' # apply dry-run - kubectl apply --experimental-server-side --server-dry-run -f hack/testdata/pod.yaml "${kube_flags[@]:?}" + kubectl apply --server-side --server-dry-run -f hack/testdata/pod.yaml "${kube_flags[@]:?}" # No pod exists kube::test::get_object_assert pods "{{range.items}}{{${id_field:?}}}:{{end}}" '' # apply non dry-run creates the pod - kubectl apply --experimental-server-side -f hack/testdata/pod.yaml "${kube_flags[@]:?}" + kubectl apply --server-side -f hack/testdata/pod.yaml "${kube_flags[@]:?}" # apply changes - kubectl apply --experimental-server-side --server-dry-run -f hack/testdata/pod-apply.yaml "${kube_flags[@]:?}" + kubectl apply --server-side --server-dry-run -f hack/testdata/pod-apply.yaml "${kube_flags[@]:?}" # Post-Condition: label still has initial value kube::test::get_object_assert 'pods test-pod' "{{${labels_field:?}.name}}" 'test-pod-label' @@ -302,7 +302,7 @@ run_kubectl_apply_tests() { __EOF__ # Dry-run create the CR - kubectl "${kube_flags[@]:?}" apply --experimental-server-side --server-dry-run -f hack/testdata/CRD/resource.yaml "${kube_flags[@]:?}" + kubectl "${kube_flags[@]:?}" apply --server-side --server-dry-run -f hack/testdata/CRD/resource.yaml "${kube_flags[@]:?}" # Make sure that the CR doesn't exist ! kubectl "${kube_flags[@]:?}" get resource/myobj