From 5ab6924482427be7322191a821ca345f08232fb8 Mon Sep 17 00:00:00 2001 From: Darren Shepherd Date: Mon, 5 Feb 2018 22:04:18 -0700 Subject: [PATCH] Add FailedSpec and GeneratedCerts --- apis/management.cattle.io/v3/cluster_types.go | 1 + apis/management.cattle.io/v3/global_types.go | 25 ++++++++++--------- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/apis/management.cattle.io/v3/cluster_types.go b/apis/management.cattle.io/v3/cluster_types.go index 147deff9..7c93e9e0 100644 --- a/apis/management.cattle.io/v3/cluster_types.go +++ b/apis/management.cattle.io/v3/cluster_types.go @@ -79,6 +79,7 @@ type ClusterStatus struct { Capacity v1.ResourceList `json:"capacity,omitempty"` Allocatable v1.ResourceList `json:"allocatable,omitempty"` AppliedSpec ClusterSpec `json:"appliedSpec,omitempty"` + FailedSpec *ClusterSpec `json:"failedSpec,omitempty"` Requested v1.ResourceList `json:"requested,omitempty"` Limits v1.ResourceList `json:"limits,omitempty"` ClusterName string `json:"clusterName,omitempty"` diff --git a/apis/management.cattle.io/v3/global_types.go b/apis/management.cattle.io/v3/global_types.go index 7a89b140..b4984e00 100644 --- a/apis/management.cattle.io/v3/global_types.go +++ b/apis/management.cattle.io/v3/global_types.go @@ -17,18 +17,19 @@ type ListenConfig struct { metav1.TypeMeta `json:",inline"` metav1.ObjectMeta `json:"metadata,omitempty"` - DisplayName string `json:"displayName,omitempty"` - Description string `json:"description,omitempty"` - Mode string `json:"mode,omitempty" norman:"type=enum,options=https|http|acme"` - CACerts string `json:"caCerts,omitempty"` - CACert string `json:"caCert,omitempty"` - CAKey string `json:"caKey,omitempty"` - Cert string `json:"cert,omitempty"` - Key string `json:"key,omitempty" norman:"writeOnly"` - Domains []string `json:"domains,omitempty"` - TOS []string `json:"tos,omitempty" norman:"default=auto"` - KnownIPs []string `json:"knownIps" norman:"nocreate,noupdate"` - Enabled bool `json:"enabled,omitempty" norman:"default=true"` + DisplayName string `json:"displayName,omitempty"` + Description string `json:"description,omitempty"` + Mode string `json:"mode,omitempty" norman:"type=enum,options=https|http|acme"` + CACerts string `json:"caCerts,omitempty"` + CACert string `json:"caCert,omitempty"` + CAKey string `json:"caKey,omitempty"` + Cert string `json:"cert,omitempty"` + Key string `json:"key,omitempty" norman:"writeOnly"` + Domains []string `json:"domains,omitempty"` + TOS []string `json:"tos,omitempty" norman:"default=auto"` + KnownIPs []string `json:"knownIps" norman:"nocreate,noupdate"` + GeneratedCerts map[string]string `json:"generatedCerts" norman:"nocreate,noupdate"` + Enabled bool `json:"enabled,omitempty" norman:"default=true"` CertFingerprint string `json:"certFingerprint,omitempty" norman:"nocreate,noupdate"` CN string `json:"cn,omitempty" norman:"nocreate,noupdate"`