diff --git a/apis/management.cattle.io/v3/global_types.go b/apis/management.cattle.io/v3/global_types.go index ec564c91..6413139b 100644 --- a/apis/management.cattle.io/v3/global_types.go +++ b/apis/management.cattle.io/v3/global_types.go @@ -21,33 +21,3 @@ type Feature struct { Value *bool `json:"value" norman:"required"` Default bool `json:"default" norman:"nocreate,noupdate"` } - -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"` - 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"` - Version int `json:"version,omitempty" norman:"nocreate,noupdate"` - ExpiresAt string `json:"expiresAt,omitempty" norman:"nocreate,noupdate"` - Issuer string `json:"issuer,omitempty" norman:"nocreate,noupdate"` - IssuedAt string `json:"issuedAt,omitempty" norman:"nocreate,noupdate"` - Algorithm string `json:"algorithm,omitempty" norman:"nocreate,noupdate"` - SerialNumber string `json:"serialNumber,omitempty" norman:"nocreate,noupdate"` - KeySize int `json:"keySize,omitempty" norman:"nocreate,noupdate"` - SubjectAlternativeNames []string `json:"subjectAlternativeNames,omitempty" norman:"nocreate,noupdate"` -} diff --git a/apis/management.cattle.io/v3/schema/schema.go b/apis/management.cattle.io/v3/schema/schema.go index a82a470e..a6c98a59 100644 --- a/apis/management.cattle.io/v3/schema/schema.go +++ b/apis/management.cattle.io/v3/schema/schema.go @@ -660,12 +660,6 @@ func logTypes(schema *types.Schemas) *types.Schemas { func globalTypes(schema *types.Schemas) *types.Schemas { return schema. - AddMapperForType(&Version, v3.ListenConfig{}, - m.DisplayName{}, - m.Drop{Field: "caKey"}, - m.Drop{Field: "caCert"}, - ). - MustImport(&Version, v3.ListenConfig{}). MustImportAndCustomize(&Version, v3.Setting{}, func(schema *types.Schema) { schema.MustCustomizeField("name", func(f types.Field) types.Field { f.Required = true