rancher/types
1
0
Fork 0
mirror of https://github.com/rancher/types.git synced 2025-09-19 00:46:53 +00:00
Code Issues Releases Wiki Activity

Add new fields for secret references

Browse Source
This commit is contained in:
Colleen Murphy
2022-02-17 15:27:53 -08:00
parent 2f606d0074
commit ead316d07a
5 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apis/management.cattle.io/v3/alerting_types.go
View File

@@ -404,6 +404,9 @@ type WechatConfig struct {
}
type NotifierStatus struct {
SMTPCredentialSecret string `json:"smtpCredentialSecret,omitempty" norman:"nocreate,noupdate"`
WechatCredentialSecret string `json:"wechatCredentialSecret,omitempty" norman:"nocreate,noupdate"`
DingtalkCredentialSecret string `json:"dingtalkCredentialSecret,omitempty" norman:"nocreate,noupdate"`
}
// HTTPClientConfig configures an HTTP client.

10
apis/management.cattle.io/v3/catalog_types.go
View File

@@ -36,13 +36,15 @@ type CatalogStatus struct {
// helmVersionCommits records hash of each helm template version
HelmVersionCommits map[string]VersionCommits `json:"helmVersionCommits,omitempty"`
Conditions []CatalogCondition `json:"conditions,omitempty"`
CredentialSecret string `json:"credentialSecret,omitempty" norman:"nocreate,noupdate"`
}
var (
CatalogConditionRefreshed condition.Cond = "Refreshed"
CatalogConditionUpgraded condition.Cond = "Upgraded"
CatalogConditionDiskCached condition.Cond = "DiskCached"
CatalogConditionProcessed condition.Cond = "Processed"
CatalogConditionRefreshed condition.Cond = "Refreshed"
CatalogConditionUpgraded condition.Cond = "Upgraded"
CatalogConditionDiskCached condition.Cond = "DiskCached"
CatalogConditionProcessed condition.Cond = "Processed"
CatalogConditionSecretsMigrated condition.Cond = "SecretsMigrated"
)
type CatalogCondition struct {

4
apis/management.cattle.io/v3/cluster_types.go
View File

@@ -66,6 +66,7 @@ const (
ClusterConditionPrometheusOperatorDeployed condition.Cond = "PrometheusOperatorDeployed"
ClusterConditionMonitoringEnabled condition.Cond = "MonitoringEnabled"
ClusterConditionAlertingEnabled condition.Cond = "AlertingEnabled"
ClusterConditionSecretsMigrated condition.Cond = "SecretsMigrated"
ClusterDriverImported = "imported"
ClusterDriverLocal = "local"
@@ -159,6 +160,9 @@ type ClusterStatus struct {
CertificatesExpiration map[string]CertExpiration `json:"certificatesExpiration,omitempty"`
ScheduledClusterScanStatus *ScheduledClusterScanStatus `json:"scheduledClusterScanStatus,omitempty"`
CurrentCisRunName string `json:"currentCisRunName,omitempty"`
PrivateRegistrySecret string `json:"privateRegistrySecret,omitempty" norman:"nocreate,noupdate"`
S3CredentialSecret string `json:"s3CredentialSecret,omitempty" norman:"nocreate,noupdate"`
WeavePasswordSecret string `json:"weavePasswordSecret,omitempty" norman:"nocreate,noupdate"`
}
type ClusterComponentStatus struct {

1
apis/management.cattle.io/v3/schema/schema.go
View File

@@ -692,6 +692,7 @@ func globalTypes(schema *types.Schemas) *types.Schemas {
func alertTypes(schema *types.Schemas) *types.Schemas {
return schema.
AddMapperForType(&Version, v3.Notifier{},
&m.Embed{Field: "status"},
m.DisplayName{}).
MustImport(&Version, v3.ClusterAlert{}).
MustImport(&Version, v3.ProjectAlert{}).

7
apis/project.cattle.io/v3/pipeline_types.go
View File

@@ -65,9 +65,10 @@ type SourceCodeProviderConfig struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`
ProjectName string `json:"projectName" norman:"required,type=reference[project]"`
Type string `json:"type" norman:"noupdate,options=github|gitlab|bitbucketcloud|bitbucketserver"`
Enabled bool `json:"enabled,omitempty"`
ProjectName string `json:"projectName" norman:"required,type=reference[project]"`
Type string `json:"type" norman:"noupdate,options=github|gitlab|bitbucketcloud|bitbucketserver"`
Enabled bool `json:"enabled,omitempty"`
CredentialSecret string `json:"credentialSecret,omitempty" norman:"nocreate,noupdate"`
}
func (s *SourceCodeProviderConfig) ObjClusterName() string {