-
-
Notifications
You must be signed in to change notification settings - Fork 68
feat(gke): implement ClusterManager.UpdateMaster #192
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
avison9
wants to merge
1
commit into
floci-io:main
Choose a base branch
from
avison9:feat/177-gke-update-master
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
117 changes: 117 additions & 0 deletions
117
src/test/java/io/floci/gcp/services/gke/GkeUpdateMasterRestIntegrationTest.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,117 @@ | ||
| package io.floci.gcp.services.gke; | ||
|
|
||
| import io.quarkus.test.junit.QuarkusTest; | ||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| import static io.restassured.RestAssured.given; | ||
| import static org.hamcrest.Matchers.equalTo; | ||
| import static org.hamcrest.Matchers.startsWith; | ||
|
|
||
| /** | ||
| * {@code ClusterManager.UpdateMaster} over REST ({@code POST .../clusters/{id}:updateMaster}). | ||
| * The custom-method colon suffix is what makes this worth a route-level test on top of | ||
| * {@link GkeServiceTest}: the JAX-RS path regex is the piece a service-level test cannot see. | ||
| */ | ||
| @QuarkusTest | ||
| class GkeUpdateMasterRestIntegrationTest { | ||
|
|
||
| private static final String PROJECT = "gke-update-master-it"; | ||
| private static final String LOCATION = "us-central1"; | ||
| private static final String BASE = "/container/v1/projects/" + PROJECT + "/locations/" + LOCATION; | ||
|
|
||
| @Test | ||
| void updateMasterMovesTheControlPlaneAndLeavesNodesAlone() { | ||
| String cluster = "upgrade-me"; | ||
| String clusterPath = BASE + "/clusters/" + cluster; | ||
|
|
||
| given() | ||
| .contentType("application/json") | ||
| .body("{\"cluster\":{\"name\":\"" + cluster + "\"}}") | ||
| .when().post(BASE + "/clusters") | ||
| .then() | ||
| .statusCode(200) | ||
| .body("status", equalTo("DONE")); | ||
|
|
||
| String nodeVersionBefore = given() | ||
| .when().get(clusterPath) | ||
| .then() | ||
| .statusCode(200) | ||
| .extract().path("currentNodeVersion"); | ||
|
|
||
| String operationName = given() | ||
| .urlEncodingEnabled(false) | ||
| .contentType("application/json") | ||
| .body("{\"masterVersion\":\"1.31.5-gke.1\"}") | ||
| .when().post(clusterPath + ":updateMaster") | ||
| .then() | ||
| .statusCode(200) | ||
| .body("operationType", equalTo("UPGRADE_MASTER")) | ||
| .body("status", equalTo("DONE")) | ||
| .body("targetLink", equalTo("projects/" + PROJECT + "/locations/" + LOCATION + "/clusters/" + cluster)) | ||
| .body("name", startsWith("operation-")) | ||
| .extract().path("name"); | ||
|
|
||
| given() | ||
| .when().get(BASE + "/operations/" + operationName) | ||
| .then() | ||
| .statusCode(200) | ||
| .body("operationType", equalTo("UPGRADE_MASTER")) | ||
| .body("status", equalTo("DONE")); | ||
|
|
||
| // Real GKE upgrades the control plane independently of node pools: the node version | ||
| // and the pool's own version are unaffected by a master-only upgrade. | ||
| given() | ||
| .when().get(clusterPath) | ||
| .then() | ||
| .statusCode(200) | ||
| .body("currentMasterVersion", equalTo("1.31.5-gke.1")) | ||
| .body("currentNodeVersion", equalTo(nodeVersionBefore)) | ||
| .body("nodePools[0].version", equalTo(nodeVersionBefore)); | ||
| } | ||
|
|
||
| @Test | ||
| void updateMasterRequiresAMasterVersion() { | ||
| String cluster = "no-version"; | ||
| String clusterPath = BASE + "/clusters/" + cluster; | ||
|
|
||
| given() | ||
| .contentType("application/json") | ||
| .body("{\"cluster\":{\"name\":\"" + cluster + "\"}}") | ||
| .when().post(BASE + "/clusters") | ||
| .then() | ||
| .statusCode(200); | ||
|
|
||
| String masterVersionBefore = given() | ||
| .when().get(clusterPath) | ||
| .then() | ||
| .statusCode(200) | ||
| .extract().path("currentMasterVersion"); | ||
|
|
||
| given() | ||
| .urlEncodingEnabled(false) | ||
| .contentType("application/json") | ||
| .body("{}") | ||
| .when().post(clusterPath + ":updateMaster") | ||
| .then() | ||
| .statusCode(400) | ||
| .body("error.status", equalTo("INVALID_ARGUMENT")); | ||
|
|
||
| given() | ||
| .when().get(clusterPath) | ||
| .then() | ||
| .statusCode(200) | ||
| .body("currentMasterVersion", equalTo(masterVersionBefore)); | ||
| } | ||
|
|
||
| @Test | ||
| void updateMasterOnAMissingClusterIs404() { | ||
| given() | ||
| .urlEncodingEnabled(false) | ||
| .contentType("application/json") | ||
| .body("{\"masterVersion\":\"1.31.5-gke.1\"}") | ||
| .when().post(BASE + "/clusters/does-not-exist:updateMaster") | ||
| .then() | ||
| .statusCode(404) | ||
| .body("error.status", equalTo("NOT_FOUND")); | ||
| } | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
A REST caller can send valid JSON such as
{"masterVersion":123}. Jackson stores that value as a non-string object, so this direct cast throwsClassCastException. The exception is not mapped to the GCP error format, causing an internal server error instead of400 INVALID_ARGUMENT. This violates the repository directive to preserve GCP protocol compatibility and return GCP-compatible JSON errors.Context Used: AGENTS.md (source)