Skip to content

Commit 5f3dfe2

Browse files
authored
[ws-man-bridge-api] Always set govern to true (#16631)
* [ws-man-bridge-api] Always set govern to true * fix * Fix
1 parent 8f8f72d commit 5f3dfe2

File tree

6 files changed

+119
-173
lines changed

6 files changed

+119
-173
lines changed

components/ws-manager-bridge-api/cluster-service.proto

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ message TlsConfig {
4848
message RegistrationHints {
4949
Preferability perfereability = 1;
5050
bool cordoned = 2;
51-
bool govern = 3;
51+
reserved 3; // bool govern = 3;
5252
}
5353

5454
message AdmissionConstraint {

components/ws-manager-bridge-api/go/cluster-service.pb.go

Lines changed: 115 additions & 125 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

components/ws-manager-bridge-api/typescript/src/cluster-service_pb.d.ts

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

components/ws-manager-bridge-api/typescript/src/cluster-service_pb.js

Lines changed: 1 addition & 31 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

components/ws-manager-bridge/src/cluster-service-server.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -117,13 +117,10 @@ export class ClusterService implements IClusterServiceServer {
117117

118118
// store the ws-manager into the database
119119
let perfereability = Preferability.NONE;
120-
let govern = false;
120+
let govern = true;
121121
let state: WorkspaceClusterState = "available";
122122
if (req.hints) {
123123
perfereability = req.hints.perfereability;
124-
if (req.hints.govern) {
125-
govern = req.hints.govern;
126-
}
127124
state = mapCordoned(req.hints.cordoned);
128125
}
129126
let score = mapPreferabilityToScore(perfereability);

dev/gpctl/cmd/clusters-register.go

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -125,14 +125,6 @@ var clustersRegisterCmd = &cobra.Command{
125125
request.Hints.Cordoned = cordoned
126126
}
127127

128-
govern, err := cmd.Flags().GetBool("hint-govern")
129-
if err != nil {
130-
log.Fatal(err)
131-
}
132-
if cmd.Flags().Changed("hint-govern") {
133-
request.Hints.Govern = govern
134-
}
135-
136128
preferability, err := cmd.Flags().GetString("hint-preferability")
137129
if err != nil {
138130
log.Fatal(err)
@@ -166,7 +158,7 @@ func init() {
166158
clustersRegisterCmd.Flags().String("url", "", "cluster url")
167159
clustersRegisterCmd.Flags().String("tls-path", "", "folder containing the ws cluster's ca.crt, tls.crt and tls.key")
168160
clustersRegisterCmd.Flags().Bool("hint-cordoned", false, "sets hint cordoned")
169-
clustersRegisterCmd.Flags().Bool("hint-govern", false, "sets hint govern")
161+
clustersRegisterCmd.Flags().Bool("hint-govern", true, "DEPRECATED: sets hint govern")
170162
clustersRegisterCmd.Flags().String("hint-preferability", "none", "sets hint preferability, one of: 'none', 'prefer', 'dontschedule'")
171163

172164
clustersRegisterCmd.Flags().String("from-file", "", "reads request from JSON file, '-' for stdin")

0 commit comments

Comments
 (0)