1
0
mirror of https://github.com/rancher/types.git synced 2025-05-10 08:04:20 +00:00

Merge pull request from ibuildthecloud/agent-state

Add agent features to track status
This commit is contained in:
Darren Shepherd 2020-02-03 11:35:17 -07:00 committed by GitHub
commit d6c661218d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 0 deletions

View File

@ -133,6 +133,7 @@ type ClusterStatus struct {
// https://kubernetes.io/docs/api-reference/v1.8/#componentstatus-v1-core
Driver string `json:"driver"`
AgentImage string `json:"agentImage"`
AgentFeatures map[string]bool `json:"agentFeatures,omitempty"`
AuthImage string `json:"authImage"`
ComponentStatuses []ClusterComponentStatus `json:"componentStatuses,omitempty"`
APIEndpoint string `json:"apiEndpoint,omitempty"`

View File

@ -2244,6 +2244,13 @@ func (in *ClusterStatus) DeepCopyInto(out *ClusterStatus) {
*out = make([]ClusterCondition, len(*in))
copy(*out, *in)
}
if in.AgentFeatures != nil {
in, out := &in.AgentFeatures, &out.AgentFeatures
*out = make(map[string]bool, len(*in))
for key, val := range *in {
(*out)[key] = val
}
}
if in.ComponentStatuses != nil {
in, out := &in.ComponentStatuses, &out.ComponentStatuses
*out = make([]ClusterComponentStatus, len(*in))

View File

@ -7,6 +7,7 @@ import (
const (
ClusterType = "cluster"
ClusterFieldAPIEndpoint = "apiEndpoint"
ClusterFieldAgentFeatures = "agentFeatures"
ClusterFieldAgentImage = "agentImage"
ClusterFieldAgentImageOverride = "agentImageOverride"
ClusterFieldAllocatable = "allocatable"
@ -61,6 +62,7 @@ const (
type Cluster struct {
types.Resource
APIEndpoint string `json:"apiEndpoint,omitempty" yaml:"apiEndpoint,omitempty"`
AgentFeatures map[string]bool `json:"agentFeatures,omitempty" yaml:"agentFeatures,omitempty"`
AgentImage string `json:"agentImage,omitempty" yaml:"agentImage,omitempty"`
AgentImageOverride string `json:"agentImageOverride,omitempty" yaml:"agentImageOverride,omitempty"`
Allocatable map[string]string `json:"allocatable,omitempty" yaml:"allocatable,omitempty"`

View File

@ -3,6 +3,7 @@ package client
const (
ClusterStatusType = "clusterStatus"
ClusterStatusFieldAPIEndpoint = "apiEndpoint"
ClusterStatusFieldAgentFeatures = "agentFeatures"
ClusterStatusFieldAgentImage = "agentImage"
ClusterStatusFieldAllocatable = "allocatable"
ClusterStatusFieldAppliedEnableNetworkPolicy = "appliedEnableNetworkPolicy"
@ -26,6 +27,7 @@ const (
type ClusterStatus struct {
APIEndpoint string `json:"apiEndpoint,omitempty" yaml:"apiEndpoint,omitempty"`
AgentFeatures map[string]bool `json:"agentFeatures,omitempty" yaml:"agentFeatures,omitempty"`
AgentImage string `json:"agentImage,omitempty" yaml:"agentImage,omitempty"`
Allocatable map[string]string `json:"allocatable,omitempty" yaml:"allocatable,omitempty"`
AppliedEnableNetworkPolicy bool `json:"appliedEnableNetworkPolicy,omitempty" yaml:"appliedEnableNetworkPolicy,omitempty"`