This repository has been archived by the owner on Feb 9, 2024. It is now read-only.
Hook 'system cluster-info' command #1531
Merged
Conversation
This file contains 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
a-palchikov
commented
May 8, 2020
| @@ -38,7 +37,7 @@ func NewKubernetesCollector(ctx context.Context, runner utils.CommandRunner) Col | |||
| Cmd("k8s-nodes", utils.PlanetCommand(kubectl.Command("get", "nodes", "--output", "wide"))...), | |||
| Cmd("k8s-describe-nodes", utils.PlanetCommand(kubectl.Command("describe", "nodes"))...), | |||
| Cmd("k8s-cluster-info-dump.tgz", | |||
| constants.GravityBin, "system", "cluster-info"), | |||
| utils.Exe.Path, "system", "cluster-info"), | |||
There was a problem hiding this comment.
This will ensure that the command works consistently regardless of the operation state - i.e. during upgrade.
r0mant
approved these changes
May 11, 2020
a-palchikov
added a commit
that referenced
this pull request
Jul 15, 2020
a-palchikov
added a commit
that referenced
this pull request
Jul 17, 2020
a-palchikov
added a commit
that referenced
this pull request
Jul 24, 2020
a-palchikov
added a commit
that referenced
this pull request
Jul 24, 2020
* Expand improvements (#1361) * Forward port changes from 6.3.x * Fix tests * Do not pull/unpack planet package as it needs special attention to file/directory context * Forward port changes from #1348 * Format multiple operations in 'gravity plan' if outputting as text as a table. Forward ports #1373 * Revert LVMSystemDir to schema backwards compatible and mark it deprecated in code. Handle completed operation error gracefully in expand. * Remove container name in selinux Makefile to avoid conflicts with multiple jenkins jobs * Rework client/agent logic to remove the agent from the agent group running by the cluster controller after the operation is completed. * Bump e * Port another slew of PRs: * #1361 * #1424 * #1530 * #1531 * #1542 * #1603 * #1648 * https://github.com/gravitational/gravity.e/pull/4298 * Regenerate proto sources * Address review comments * Bump e. Update cli args test to use a common set of redacted flags for redact test cases * Revert another test change * Correct planet path for journalctl
helgi
pushed a commit
to helgi/gravity
that referenced
this pull request
Jun 21, 2021
* Expand improvements (gravitational#1361) * Forward port changes from 6.3.x * Fix tests * Do not pull/unpack planet package as it needs special attention to file/directory context * Forward port changes from gravitational#1348 * Format multiple operations in 'gravity plan' if outputting as text as a table. Forward ports gravitational#1373 * Revert LVMSystemDir to schema backwards compatible and mark it deprecated in code. Handle completed operation error gracefully in expand. * Remove container name in selinux Makefile to avoid conflicts with multiple jenkins jobs * Rework client/agent logic to remove the agent from the agent group running by the cluster controller after the operation is completed. * Bump e * Port another slew of PRs: * gravitational#1361 * gravitational#1424 * gravitational#1530 * gravitational#1531 * gravitational#1542 * gravitational#1603 * gravitational#1648 * https://github.com/gravitational/gravity.e/pull/4298 * Regenerate proto sources * Address review comments * Bump e. Update cli args test to use a common set of redacted flags for redact test cases * Revert another test change * Correct planet path for journalctl
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Description
This PR adds the hook up for the
system cluster-infocommand added in #1361. Without this, the debug reports will contain a figment of kubernetes resources (i.e. will not have container logs).For some reason, the forward port did not have the command hook up code.
Type of change
Linked tickets and other PRs
TODOs
Testing done
Debug logs (focused on kubernetes) captured before the change:
Debug logs after the change: