diff --git a/vendor.conf b/vendor.conf index 384033dc..8710af01 100644 --- a/vendor.conf +++ b/vendor.conf @@ -25,4 +25,4 @@ golang.org/x/sys/windows 2f57af4873d00d535c5c9028850aa2152e6a5566 gopkg.in/yaml.v2 670d4cfef0544295bc27a114dbac37980d83185a github.com/rancher/norman 8d5d75c7b82deb9226f1203d16fba3965f2cd775 -github.com/rancher/types 9f5225fa37e5cfe5e0e3321fa66514b4538412e4 +github.com/rancher/types e4d6a30f09245d89624f95f08fc5458fe22aa766 diff --git a/vendor/github.com/rancher/types/client/management/v3/zz_generated_azure_adconfig.go b/vendor/github.com/rancher/types/client/management/v3/zz_generated_azure_adconfig.go new file mode 100644 index 00000000..b7edbafc --- /dev/null +++ b/vendor/github.com/rancher/types/client/management/v3/zz_generated_azure_adconfig.go @@ -0,0 +1,40 @@ +package client + +const ( + AzureADConfigType = "azureADConfig" + AzureADConfigFieldAccessMode = "accessMode" + AzureADConfigFieldAllowedPrincipalIDs = "allowedPrincipalIds" + AzureADConfigFieldAnnotations = "annotations" + AzureADConfigFieldClientID = "clientId" + AzureADConfigFieldClientSecret = "clientSecret" + AzureADConfigFieldCreated = "created" + AzureADConfigFieldCreatorID = "creatorId" + AzureADConfigFieldDomain = "domain" + AzureADConfigFieldEnabled = "enabled" + AzureADConfigFieldLabels = "labels" + AzureADConfigFieldName = "name" + AzureADConfigFieldOwnerReferences = "ownerReferences" + AzureADConfigFieldRemoved = "removed" + AzureADConfigFieldTenantID = "tenantId" + AzureADConfigFieldType = "type" + AzureADConfigFieldUuid = "uuid" +) + +type AzureADConfig struct { + AccessMode string `json:"accessMode,omitempty" yaml:"accessMode,omitempty"` + AllowedPrincipalIDs []string `json:"allowedPrincipalIds,omitempty" yaml:"allowedPrincipalIds,omitempty"` + Annotations map[string]string `json:"annotations,omitempty" yaml:"annotations,omitempty"` + ClientID string `json:"clientId,omitempty" yaml:"clientId,omitempty"` + ClientSecret string `json:"clientSecret,omitempty" yaml:"clientSecret,omitempty"` + Created string `json:"created,omitempty" yaml:"created,omitempty"` + CreatorID string `json:"creatorId,omitempty" yaml:"creatorId,omitempty"` + Domain string `json:"domain,omitempty" yaml:"domain,omitempty"` + Enabled bool `json:"enabled,omitempty" yaml:"enabled,omitempty"` + Labels map[string]string `json:"labels,omitempty" yaml:"labels,omitempty"` + Name string `json:"name,omitempty" yaml:"name,omitempty"` + OwnerReferences []OwnerReference `json:"ownerReferences,omitempty" yaml:"ownerReferences,omitempty"` + Removed string `json:"removed,omitempty" yaml:"removed,omitempty"` + TenantID string `json:"tenantId,omitempty" yaml:"tenantId,omitempty"` + Type string `json:"type,omitempty" yaml:"type,omitempty"` + Uuid string `json:"uuid,omitempty" yaml:"uuid,omitempty"` +} diff --git a/vendor/github.com/rancher/types/client/management/v3/zz_generated_azure_adtest_and_apply_input.go b/vendor/github.com/rancher/types/client/management/v3/zz_generated_azure_adtest_and_apply_input.go new file mode 100644 index 00000000..34e4db22 --- /dev/null +++ b/vendor/github.com/rancher/types/client/management/v3/zz_generated_azure_adtest_and_apply_input.go @@ -0,0 +1,16 @@ +package client + +const ( + AzureADTestAndApplyInputType = "azureADTestAndApplyInput" + AzureADTestAndApplyInputFieldAzureADConfig = "azureAdConfig" + AzureADTestAndApplyInputFieldEnabled = "enabled" + AzureADTestAndApplyInputFieldPassword = "password" + AzureADTestAndApplyInputFieldUsername = "username" +) + +type AzureADTestAndApplyInput struct { + AzureADConfig *AzureADConfig `json:"azureAdConfig,omitempty" yaml:"azureAdConfig,omitempty"` + Enabled bool `json:"enabled,omitempty" yaml:"enabled,omitempty"` + Password string `json:"password,omitempty" yaml:"password,omitempty"` + Username string `json:"username,omitempty" yaml:"username,omitempty"` +} diff --git a/vendor/github.com/rancher/types/client/management/v3/zz_generated_bastion_host.go b/vendor/github.com/rancher/types/client/management/v3/zz_generated_bastion_host.go new file mode 100644 index 00000000..f329c20f --- /dev/null +++ b/vendor/github.com/rancher/types/client/management/v3/zz_generated_bastion_host.go @@ -0,0 +1,20 @@ +package client + +const ( + BastionHostType = "bastionHost" + BastionHostFieldAddress = "address" + BastionHostFieldPort = "port" + BastionHostFieldSSHAgentAuth = "sshAgentAuth" + BastionHostFieldSSHKey = "sshKey" + BastionHostFieldSSHKeyPath = "sshKeyPath" + BastionHostFieldUser = "user" +) + +type BastionHost struct { + Address string `json:"address,omitempty" yaml:"address,omitempty"` + Port string `json:"port,omitempty" yaml:"port,omitempty"` + SSHAgentAuth bool `json:"sshAgentAuth,omitempty" yaml:"sshAgentAuth,omitempty"` + SSHKey string `json:"sshKey,omitempty" yaml:"sshKey,omitempty"` + SSHKeyPath string `json:"sshKeyPath,omitempty" yaml:"sshKeyPath,omitempty"` + User string `json:"user,omitempty" yaml:"user,omitempty"` +} diff --git a/vendor/github.com/rancher/types/client/management/v3/zz_generated_cluster_logging.go b/vendor/github.com/rancher/types/client/management/v3/zz_generated_cluster_logging.go index 1c682c40..57824f7f 100644 --- a/vendor/github.com/rancher/types/client/management/v3/zz_generated_cluster_logging.go +++ b/vendor/github.com/rancher/types/client/management/v3/zz_generated_cluster_logging.go @@ -14,6 +14,7 @@ const ( ClusterLoggingFieldCreatorID = "creatorId" ClusterLoggingFieldElasticsearchConfig = "elasticsearchConfig" ClusterLoggingFieldEmbeddedConfig = "embeddedConfig" + ClusterLoggingFieldFailedSpec = "failedSpec" ClusterLoggingFieldKafkaConfig = "kafkaConfig" ClusterLoggingFieldLabels = "labels" ClusterLoggingFieldName = "name" @@ -40,6 +41,7 @@ type ClusterLogging struct { CreatorID string `json:"creatorId,omitempty" yaml:"creatorId,omitempty"` ElasticsearchConfig *ElasticsearchConfig `json:"elasticsearchConfig,omitempty" yaml:"elasticsearchConfig,omitempty"` EmbeddedConfig *EmbeddedConfig `json:"embeddedConfig,omitempty" yaml:"embeddedConfig,omitempty"` + FailedSpec *ClusterLoggingSpec `json:"failedSpec,omitempty" yaml:"failedSpec,omitempty"` KafkaConfig *KafkaConfig `json:"kafkaConfig,omitempty" yaml:"kafkaConfig,omitempty"` Labels map[string]string `json:"labels,omitempty" yaml:"labels,omitempty"` Name string `json:"name,omitempty" yaml:"name,omitempty"` diff --git a/vendor/github.com/rancher/types/client/management/v3/zz_generated_cluster_logging_status.go b/vendor/github.com/rancher/types/client/management/v3/zz_generated_cluster_logging_status.go index 5ae32f1c..a43b36a3 100644 --- a/vendor/github.com/rancher/types/client/management/v3/zz_generated_cluster_logging_status.go +++ b/vendor/github.com/rancher/types/client/management/v3/zz_generated_cluster_logging_status.go @@ -4,9 +4,11 @@ const ( ClusterLoggingStatusType = "clusterLoggingStatus" ClusterLoggingStatusFieldAppliedSpec = "appliedSpec" ClusterLoggingStatusFieldConditions = "conditions" + ClusterLoggingStatusFieldFailedSpec = "failedSpec" ) type ClusterLoggingStatus struct { AppliedSpec *ClusterLoggingSpec `json:"appliedSpec,omitempty" yaml:"appliedSpec,omitempty"` Conditions []LoggingCondition `json:"conditions,omitempty" yaml:"conditions,omitempty"` + FailedSpec *ClusterLoggingSpec `json:"failedSpec,omitempty" yaml:"failedSpec,omitempty"` } diff --git a/vendor/github.com/rancher/types/client/management/v3/zz_generated_elasticsearch_config.go b/vendor/github.com/rancher/types/client/management/v3/zz_generated_elasticsearch_config.go index 520bd018..f367c0bd 100644 --- a/vendor/github.com/rancher/types/client/management/v3/zz_generated_elasticsearch_config.go +++ b/vendor/github.com/rancher/types/client/management/v3/zz_generated_elasticsearch_config.go @@ -7,6 +7,7 @@ const ( ElasticsearchConfigFieldDateFormat = "dateFormat" ElasticsearchConfigFieldEndpoint = "endpoint" ElasticsearchConfigFieldIndexPrefix = "indexPrefix" + ElasticsearchConfigFieldSSLVerify = "sslVerify" ) type ElasticsearchConfig struct { @@ -15,4 +16,5 @@ type ElasticsearchConfig struct { DateFormat string `json:"dateFormat,omitempty" yaml:"dateFormat,omitempty"` Endpoint string `json:"endpoint,omitempty" yaml:"endpoint,omitempty"` IndexPrefix string `json:"indexPrefix,omitempty" yaml:"indexPrefix,omitempty"` + SSLVerify bool `json:"sslVerify,omitempty" yaml:"sslVerify,omitempty"` } diff --git a/vendor/github.com/rancher/types/client/management/v3/zz_generated_etcd_service.go b/vendor/github.com/rancher/types/client/management/v3/zz_generated_etcd_service.go index f1f4a524..2cc36d8d 100644 --- a/vendor/github.com/rancher/types/client/management/v3/zz_generated_etcd_service.go +++ b/vendor/github.com/rancher/types/client/management/v3/zz_generated_etcd_service.go @@ -4,21 +4,27 @@ const ( ETCDServiceType = "etcdService" ETCDServiceFieldCACert = "caCert" ETCDServiceFieldCert = "cert" + ETCDServiceFieldCreation = "creation" ETCDServiceFieldExternalURLs = "externalUrls" ETCDServiceFieldExtraArgs = "extraArgs" ETCDServiceFieldExtraBinds = "extraBinds" ETCDServiceFieldImage = "image" ETCDServiceFieldKey = "key" ETCDServiceFieldPath = "path" + ETCDServiceFieldRetention = "retention" + ETCDServiceFieldSnapshot = "snapshot" ) type ETCDService struct { CACert string `json:"caCert,omitempty" yaml:"caCert,omitempty"` Cert string `json:"cert,omitempty" yaml:"cert,omitempty"` + Creation string `json:"creation,omitempty" yaml:"creation,omitempty"` ExternalURLs []string `json:"externalUrls,omitempty" yaml:"externalUrls,omitempty"` ExtraArgs map[string]string `json:"extraArgs,omitempty" yaml:"extraArgs,omitempty"` ExtraBinds []string `json:"extraBinds,omitempty" yaml:"extraBinds,omitempty"` Image string `json:"image,omitempty" yaml:"image,omitempty"` Key string `json:"key,omitempty" yaml:"key,omitempty"` Path string `json:"path,omitempty" yaml:"path,omitempty"` + Retention string `json:"retention,omitempty" yaml:"retention,omitempty"` + Snapshot bool `json:"snapshot,omitempty" yaml:"snapshot,omitempty"` } diff --git a/vendor/github.com/rancher/types/client/management/v3/zz_generated_rancher_kubernetes_engine_config.go b/vendor/github.com/rancher/types/client/management/v3/zz_generated_rancher_kubernetes_engine_config.go index f6410953..b640ba8b 100644 --- a/vendor/github.com/rancher/types/client/management/v3/zz_generated_rancher_kubernetes_engine_config.go +++ b/vendor/github.com/rancher/types/client/management/v3/zz_generated_rancher_kubernetes_engine_config.go @@ -2,10 +2,12 @@ package client const ( RancherKubernetesEngineConfigType = "rancherKubernetesEngineConfig" + RancherKubernetesEngineConfigFieldAddonJobTimeout = "addonJobTimeout" RancherKubernetesEngineConfigFieldAddons = "addons" RancherKubernetesEngineConfigFieldAddonsInclude = "addonsInclude" RancherKubernetesEngineConfigFieldAuthentication = "authentication" RancherKubernetesEngineConfigFieldAuthorization = "authorization" + RancherKubernetesEngineConfigFieldBastionHost = "bastionHost" RancherKubernetesEngineConfigFieldCloudProvider = "cloudProvider" RancherKubernetesEngineConfigFieldClusterName = "clusterName" RancherKubernetesEngineConfigFieldIgnoreDockerVersion = "ignoreDockerVersion" @@ -21,10 +23,12 @@ const ( ) type RancherKubernetesEngineConfig struct { + AddonJobTimeout int64 `json:"addonJobTimeout,omitempty" yaml:"addonJobTimeout,omitempty"` Addons string `json:"addons,omitempty" yaml:"addons,omitempty"` AddonsInclude []string `json:"addonsInclude,omitempty" yaml:"addonsInclude,omitempty"` Authentication *AuthnConfig `json:"authentication,omitempty" yaml:"authentication,omitempty"` Authorization *AuthzConfig `json:"authorization,omitempty" yaml:"authorization,omitempty"` + BastionHost *BastionHost `json:"bastionHost,omitempty" yaml:"bastionHost,omitempty"` CloudProvider *CloudProvider `json:"cloudProvider,omitempty" yaml:"cloudProvider,omitempty"` ClusterName string `json:"clusterName,omitempty" yaml:"clusterName,omitempty"` IgnoreDockerVersion bool `json:"ignoreDockerVersion,omitempty" yaml:"ignoreDockerVersion,omitempty"` diff --git a/vendor/github.com/rancher/types/client/management/v3/zz_generated_role_template.go b/vendor/github.com/rancher/types/client/management/v3/zz_generated_role_template.go index e4e34db6..8febf38b 100644 --- a/vendor/github.com/rancher/types/client/management/v3/zz_generated_role_template.go +++ b/vendor/github.com/rancher/types/client/management/v3/zz_generated_role_template.go @@ -12,6 +12,7 @@ const ( RoleTemplateFieldCreated = "created" RoleTemplateFieldCreatorID = "creatorId" RoleTemplateFieldDescription = "description" + RoleTemplateFieldEnabled = "enabled" RoleTemplateFieldExternal = "external" RoleTemplateFieldHidden = "hidden" RoleTemplateFieldLabels = "labels" @@ -31,6 +32,7 @@ type RoleTemplate struct { Created string `json:"created,omitempty" yaml:"created,omitempty"` CreatorID string `json:"creatorId,omitempty" yaml:"creatorId,omitempty"` Description string `json:"description,omitempty" yaml:"description,omitempty"` + Enabled *bool `json:"enabled,omitempty" yaml:"enabled,omitempty"` External bool `json:"external,omitempty" yaml:"external,omitempty"` Hidden bool `json:"hidden,omitempty" yaml:"hidden,omitempty"` Labels map[string]string `json:"labels,omitempty" yaml:"labels,omitempty"` diff --git a/vendor/github.com/rancher/types/client/management/v3/zz_generated_splunk_config.go b/vendor/github.com/rancher/types/client/management/v3/zz_generated_splunk_config.go index 731af295..8714a554 100644 --- a/vendor/github.com/rancher/types/client/management/v3/zz_generated_splunk_config.go +++ b/vendor/github.com/rancher/types/client/management/v3/zz_generated_splunk_config.go @@ -1,14 +1,16 @@ package client const ( - SplunkConfigType = "splunkConfig" - SplunkConfigFieldEndpoint = "endpoint" - SplunkConfigFieldSource = "source" - SplunkConfigFieldToken = "token" + SplunkConfigType = "splunkConfig" + SplunkConfigFieldEndpoint = "endpoint" + SplunkConfigFieldSSLVerify = "sslVerify" + SplunkConfigFieldSource = "source" + SplunkConfigFieldToken = "token" ) type SplunkConfig struct { - Endpoint string `json:"endpoint,omitempty" yaml:"endpoint,omitempty"` - Source string `json:"source,omitempty" yaml:"source,omitempty"` - Token string `json:"token,omitempty" yaml:"token,omitempty"` + Endpoint string `json:"endpoint,omitempty" yaml:"endpoint,omitempty"` + SSLVerify bool `json:"sslVerify,omitempty" yaml:"sslVerify,omitempty"` + Source string `json:"source,omitempty" yaml:"source,omitempty"` + Token string `json:"token,omitempty" yaml:"token,omitempty"` } diff --git a/vendor/github.com/rancher/types/client/project/v3/zz_generated_app.go b/vendor/github.com/rancher/types/client/project/v3/zz_generated_app.go index e598ec16..74b9186a 100644 --- a/vendor/github.com/rancher/types/client/project/v3/zz_generated_app.go +++ b/vendor/github.com/rancher/types/client/project/v3/zz_generated_app.go @@ -9,11 +9,13 @@ const ( AppFieldAnnotations = "annotations" AppFieldAnswers = "answers" AppFieldAppRevisionId = "appRevisionId" + AppFieldAppliedFiles = "appliedFiles" AppFieldConditions = "conditions" AppFieldCreated = "created" AppFieldCreatorID = "creatorId" AppFieldDescription = "description" AppFieldExternalID = "externalId" + AppFieldFiles = "files" AppFieldLabels = "labels" AppFieldLastAppliedTemplates = "lastAppliedTemplate" AppFieldName = "name" @@ -35,11 +37,13 @@ type App struct { Annotations map[string]string `json:"annotations,omitempty" yaml:"annotations,omitempty"` Answers map[string]string `json:"answers,omitempty" yaml:"answers,omitempty"` AppRevisionId string `json:"appRevisionId,omitempty" yaml:"appRevisionId,omitempty"` + AppliedFiles map[string]string `json:"appliedFiles,omitempty" yaml:"appliedFiles,omitempty"` Conditions []AppCondition `json:"conditions,omitempty" yaml:"conditions,omitempty"` Created string `json:"created,omitempty" yaml:"created,omitempty"` CreatorID string `json:"creatorId,omitempty" yaml:"creatorId,omitempty"` Description string `json:"description,omitempty" yaml:"description,omitempty"` ExternalID string `json:"externalId,omitempty" yaml:"externalId,omitempty"` + Files map[string]string `json:"files,omitempty" yaml:"files,omitempty"` Labels map[string]string `json:"labels,omitempty" yaml:"labels,omitempty"` LastAppliedTemplates string `json:"lastAppliedTemplate,omitempty" yaml:"lastAppliedTemplate,omitempty"` Name string `json:"name,omitempty" yaml:"name,omitempty"` diff --git a/vendor/github.com/rancher/types/client/project/v3/zz_generated_app_spec.go b/vendor/github.com/rancher/types/client/project/v3/zz_generated_app_spec.go index 29dafe7f..cc10ca3e 100644 --- a/vendor/github.com/rancher/types/client/project/v3/zz_generated_app_spec.go +++ b/vendor/github.com/rancher/types/client/project/v3/zz_generated_app_spec.go @@ -6,6 +6,7 @@ const ( AppSpecFieldAppRevisionId = "appRevisionId" AppSpecFieldDescription = "description" AppSpecFieldExternalID = "externalId" + AppSpecFieldFiles = "files" AppSpecFieldProjectId = "projectId" AppSpecFieldPrune = "prune" AppSpecFieldTargetNamespace = "targetNamespace" @@ -16,6 +17,7 @@ type AppSpec struct { AppRevisionId string `json:"appRevisionId,omitempty" yaml:"appRevisionId,omitempty"` Description string `json:"description,omitempty" yaml:"description,omitempty"` ExternalID string `json:"externalId,omitempty" yaml:"externalId,omitempty"` + Files map[string]string `json:"files,omitempty" yaml:"files,omitempty"` ProjectId string `json:"projectId,omitempty" yaml:"projectId,omitempty"` Prune bool `json:"prune,omitempty" yaml:"prune,omitempty"` TargetNamespace string `json:"targetNamespace,omitempty" yaml:"targetNamespace,omitempty"` diff --git a/vendor/github.com/rancher/types/client/project/v3/zz_generated_app_status.go b/vendor/github.com/rancher/types/client/project/v3/zz_generated_app_status.go index 66738ab7..12a52e6c 100644 --- a/vendor/github.com/rancher/types/client/project/v3/zz_generated_app_status.go +++ b/vendor/github.com/rancher/types/client/project/v3/zz_generated_app_status.go @@ -2,13 +2,15 @@ package client const ( AppStatusType = "appStatus" + AppStatusFieldAppliedFiles = "appliedFiles" AppStatusFieldConditions = "conditions" AppStatusFieldLastAppliedTemplates = "lastAppliedTemplate" AppStatusFieldNotes = "notes" ) type AppStatus struct { - Conditions []AppCondition `json:"conditions,omitempty" yaml:"conditions,omitempty"` - LastAppliedTemplates string `json:"lastAppliedTemplate,omitempty" yaml:"lastAppliedTemplate,omitempty"` - Notes string `json:"notes,omitempty" yaml:"notes,omitempty"` + AppliedFiles map[string]string `json:"appliedFiles,omitempty" yaml:"appliedFiles,omitempty"` + Conditions []AppCondition `json:"conditions,omitempty" yaml:"conditions,omitempty"` + LastAppliedTemplates string `json:"lastAppliedTemplate,omitempty" yaml:"lastAppliedTemplate,omitempty"` + Notes string `json:"notes,omitempty" yaml:"notes,omitempty"` }