Remove deprecated variable from GRPC definitions (#1994)

* Update training operator image in CI * Remove deprecated GRPC var * Remove deprecated GRPC var * Remove deprecated GRPC var * Support for k8s v1.25 in CI * Revert "Support for k8s v1.25 in CI" This reverts commit 16e6fe4.
kubeflow · Nov 3, 2022 · 4a2db41 · 4a2db41
1 parent fadd9d8
commit 4a2db41
Show file tree

Hide file tree

Showing 7 changed files with 163 additions and 218 deletions.
diff --git a/pkg/apis/manager/v1beta1/api.pb.go b/pkg/apis/manager/v1beta1/api.pb.go
diff --git a/pkg/apis/manager/v1beta1/api.proto b/pkg/apis/manager/v1beta1/api.proto
@@ -293,9 +293,6 @@ message DeleteObservationLogReply {
 message GetSuggestionsRequest {
     Experiment experiment = 1;
     repeated Trial trials = 2; // All completed trials owned by the experiment.
-    // Use current_request_number instead. This API will be removed in Katib 0.14.
-    // The number of Suggestions requested at one time.
-    int32 request_number = 3 [deprecated=true];
     // The number of Suggestions requested at one time.
     // When you set 3 to current_request_number, you get three Suggestions at one time.
     int32 current_request_number = 4; 

diff --git a/pkg/apis/manager/v1beta1/gen-doc/api.md b/pkg/apis/manager/v1beta1/gen-doc/api.md
@@ -375,7 +375,6 @@ Discrete and Categorical type use List.
 | ----- | ---- | ----- | ----------- |
 | experiment | [Experiment](#api-v1-beta1-Experiment) |  |  |
 | trials | [Trial](#api-v1-beta1-Trial) | repeated | All completed trials owned by the experiment. |
-| request_number | [int32](#int32) |  | **Deprecated.** Use current_request_number instead. This API will be removed in Katib 0.14. The number of Suggestions requested at one time. |
 | current_request_number | [int32](#int32) |  | The number of Suggestions requested at one time. When you set 3 to current_request_number, you get three Suggestions at one time. |
 | total_request_number | [int32](#int32) |  | The number of Suggestions requested till now. |
 

diff --git a/pkg/apis/manager/v1beta1/gen-doc/index.html b/pkg/apis/manager/v1beta1/gen-doc/index.html
@@ -1029,14 +1029,6 @@ <h3 id="api.v1.beta1.GetSuggestionsRequest">GetSuggestionsRequest</h3>
                   <td><p>All completed trials owned by the experiment. </p></td>
                 </tr>
 
-                <tr>
-                  <td>request_number</td>
-                  <td><a href="#int32">int32</a></td>
-                  <td></td>
-                  <td><p><strong>Deprecated.</strong> Use current_request_number instead. This API will be removed in Katib 0.14.
-The number of Suggestions requested at one time. </p></td>
-                </tr>
-
                 <tr>
                   <td>current_request_number</td>
                   <td><a href="#int32">int32</a></td>
@@ -1056,27 +1048,6 @@ <h3 id="api.v1.beta1.GetSuggestionsRequest">GetSuggestionsRequest</h3>
           </table>
 
 
-
-
-            <h4>Fields with deprecated option</h4>
-            <table>
-              <thead>
-                <tr>
-                  <td>Name</td>
-                  <td>Option</td>
-                </tr>
-              </thead>
-              <tbody>
-
-                <tr>
-                  <td>request_number</td>
-                  <td><p>true</p></td>
-                </tr>
-
-              </tbody>
-            </table>
-
-
 
 
 

diff --git a/pkg/apis/manager/v1beta1/python/api_pb2.py b/pkg/apis/manager/v1beta1/python/api_pb2.py
diff --git a/pkg/controller.v1beta1/suggestion/suggestionclient/suggestionclient.go b/pkg/controller.v1beta1/suggestion/suggestionclient/suggestionclient.go
@@ -109,10 +109,8 @@ func (g *General) SyncAssignments(
 		instance.Status.AlgorithmSettings)
 
 	requestSuggestion := &suggestionapi.GetSuggestionsRequest{
-		Experiment: g.ConvertExperiment(filledE),
-		Trials:     g.ConvertTrials(ts),
-		// TODO (andreyvelich): Remove this once RequestNumber is deprecated.
-		RequestNumber:        int32(currentRequestNum),
+		Experiment:           g.ConvertExperiment(filledE),
+		Trials:               g.ConvertTrials(ts),
 		CurrentRequestNumber: int32(currentRequestNum),
 		TotalRequestNumber:   int32(instance.Spec.Requests),
 	}

diff --git a/pkg/controller.v1beta1/suggestion/suggestionclient/suggestionclient_test.go b/pkg/controller.v1beta1/suggestion/suggestionclient/suggestionclient_test.go
@@ -994,7 +994,6 @@ func newFakeRequest() *suggestionapi.GetSuggestionsRequest {
 				},
 			},
 		},
-		RequestNumber:        2,
 		CurrentRequestNumber: 2,
 		TotalRequestNumber:   6,
 	}