Skip to content
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
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,19 @@ spec:
version:
description: version is the version of the thing you're tracking
type: string
version:
description: Version represents the version of the compoenents in klusterlet
type: object
properties:
klusterlet:
description: Klusterlet is the version of klusterlet operator
type: string
registration:
description: Registration is the version of the registration agent
type: string
work:
description: Work is the version of the work agent
type: string
served: true
storage: true
subresources:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,22 @@ spec:
version:
description: version is the version of the thing you're tracking
type: string
version:
description: Version represents the version of the compoenents in cluster manager
type: object
properties:
clusterManager:
description: ClusterManager is the version of cluster manager operator
type: string
placement:
description: Placement is the version of the placement controller
type: string
registration:
description: Registration is the version of the registration controller and webhoook
type: string
work:
description: Work is the version of the work webhook
type: string
served: true
storage: true
subresources:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,19 @@ spec:
version:
description: version is the version of the thing you're tracking
type: string
version:
description: Version represents the version of the compoenents in klusterlet
type: object
properties:
klusterlet:
description: Klusterlet is the version of klusterlet operator
type: string
registration:
description: Registration is the version of the registration agent
type: string
work:
description: Work is the version of the work agent
type: string
version: v1
versions:
- name: v1
Expand Down
33 changes: 33 additions & 0 deletions operator/v1/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"`
Copy link
Member

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?


// Conditions contain the different condition statuses for this ClusterManager.
// Valid condition types are:
// Applied: Components in hub are applied.
Expand All @@ -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
Expand Down Expand Up @@ -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"`
Copy link
Member

Choose a reason for hiding this comment

The 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.
Expand Down
34 changes: 34 additions & 0 deletions operator/v1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 25 additions & 0 deletions operator/v1/zz_generated.swagger_doc_generated.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.