-
Notifications
You must be signed in to change notification settings - Fork 75
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
Add version in operator status #139
Open
qiujian16
wants to merge
1
commit into
open-cluster-management-io:main
Choose a base branch
from
qiujian16:add-version
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 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 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 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 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 |
---|---|---|
|
@@ -127,6 +127,9 @@ type ClusterManagerStatus struct { | |
// +optional | ||
ObservedGeneration int64 `json:"observedGeneration,omitempty"` | ||
|
||
// Version represents the version of the compoenents in cluster manager | ||
Version ClusterManagerVersion `json:"version,omitempty"` | ||
|
||
// Conditions contain the different condition statuses for this ClusterManager. | ||
// Valid condition types are: | ||
// Applied: Components in hub are applied. | ||
|
@@ -145,6 +148,21 @@ type ClusterManagerStatus struct { | |
RelatedResources []RelatedResourceMeta `json:"relatedResources,omitempty"` | ||
} | ||
|
||
// ClusterManagerVersion represents the version of the compoenents in cluster manager | ||
type ClusterManagerVersion struct { | ||
// ClusterManager is the version of cluster manager operator | ||
ClusterManager string `json:"clusterManager,omitempty"` | ||
|
||
// Registration is the version of the registration controller and webhoook | ||
Registration string `json:"registration,omitempty"` | ||
|
||
// Work is the version of the work webhook | ||
Work string `json:"work,omitempty"` | ||
|
||
// Placement is the version of the placement controller | ||
Placement string `json:"placement,omitempty"` | ||
} | ||
|
||
// RelatedResourceMeta represents the resource that is managed by an operator | ||
type RelatedResourceMeta struct { | ||
// group is the group of the resource that you're tracking | ||
|
@@ -297,12 +315,27 @@ type NodePlacement struct { | |
Tolerations []v1.Toleration `json:"tolerations,omitempty"` | ||
} | ||
|
||
// KlusterletVersion represents the version of the compoenents in klusterlet | ||
type KlusterletVersion struct { | ||
// Klusterlet is the version of klusterlet operator | ||
Klusterlet string `json:"klusterlet,omitempty"` | ||
|
||
// Registration is the version of the registration agent | ||
Registration string `json:"registration,omitempty"` | ||
|
||
// Work is the version of the work agent | ||
Work string `json:"work,omitempty"` | ||
} | ||
|
||
// KlusterletStatus represents the current status of Klusterlet agent. | ||
type KlusterletStatus struct { | ||
// ObservedGeneration is the last generation change you've dealt with | ||
// +optional | ||
ObservedGeneration int64 `json:"observedGeneration,omitempty"` | ||
|
||
// Version represents the version of the compoenents in klusterlet | ||
Version KlusterletVersion `json:"version,omitempty"` | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. ditto |
||
|
||
// Conditions contain the different condition statuses for this Klusterlet. | ||
// Valid condition types are: | ||
// Applied: Components have been applied in the managed cluster. | ||
|
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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.
either make this a pointer or remove
omitempty
?