Update types

vendor.conf

@@ -28,4 +28,4 @@ github.com/matttproud/golang_protobuf_extensions c12348ce28de40eed0136aa2b644d0e
 github.com/mattn/go-colorable            efa589957cd060542a26d2dd7832fd6a6c6c3ade
 github.com/mattn/go-isatty               6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c
 github.com/rancher/norman                0557aa4ff31a3a0f007dcb1b684894f23cda390c
-github.com/rancher/types                 1d346f8e7dcaf5f60f41cc3b52c8a55bb08866f5
+github.com/rancher/types                 5b7ed44f928712b6c0c7a1f3f19a93f32e2ee206

vendor/github.com/rancher/types/apis/management.cattle.io/v3/backup_types.go

@@ -40,14 +40,19 @@ type EtcdBackup struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
+	// backup spec
+	Spec EtcdBackupSpec `json:"spec"`
+	// backup status
+	Status EtcdBackupStatus `yaml:"status" json:"status,omitempty"`
+}
+
+type EtcdBackupSpec struct {
 	// cluster ID
 	ClusterID string `json:"clusterId,omitempty" norman:"required,type=reference[cluster]"`
 	// actual file name on the target
 	Filename string `yaml:"filename" json:"filename,omitempty"`
 	// backupConfig
 	BackupConfig BackupConfig `yaml:",omitempty" json:"backupConfig,omitempty"`
-	// backup status
-	Status EtcdBackupStatus `yaml:"status" json:"status,omitempty"`
 }
 
 type EtcdBackupStatus struct {

vendor/github.com/rancher/types/apis/management.cattle.io/v3/catalog_types.go

@@ -3,7 +3,6 @@ package v3
 import (
 	"github.com/rancher/norman/condition"
 	"github.com/rancher/norman/types"
-
 	"k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
@@ -37,8 +36,9 @@ type CatalogStatus struct {
 }
 
 var (
-	CatalogConditionRefreshed condition.Cond = "Refreshed"
-	CatalogConditionUpgraded  condition.Cond = "Upgraded"
+	CatalogConditionRefreshed  condition.Cond = "Refreshed"
+	CatalogConditionUpgraded   condition.Cond = "Upgraded"
+	CatalogConditionDiskCached condition.Cond = "DiskCached"
 )
 
 type CatalogCondition struct {
@@ -101,7 +101,9 @@ type TemplateSpec struct {
 	FolderName     string `json:"folderName,omitempty"`
 	Icon           string `json:"icon,omitempty"`
 	IconFilename   string `json:"iconFilename,omitempty"`
-	Readme         string `json:"readme,omitempty"`
+
+	// Deprecated: Do not use
+	Readme string `json:"readme,omitempty" norman:"nocreate,noupdate"`
 
 	Categories []string              `json:"categories,omitempty"`
 	Versions   []TemplateVersionSpec `json:"versions,omitempty"`
@@ -138,15 +140,24 @@ type TemplateVersionSpec struct {
 	ExternalID          string            `json:"externalId,omitempty"`
 	Version             string            `json:"version,omitempty"`
 	RancherVersion      string            `json:"rancherVersion,omitempty"`
+	RequiredNamespace   string            `json:"requiredNamespace,omitempty"`
 	KubeVersion         string            `json:"kubeVersion,omitempty"`
-	Readme              string            `json:"readme,omitempty"`
-	AppReadme           string            `json:"appReadme,omitempty"`
 	UpgradeVersionLinks map[string]string `json:"upgradeVersionLinks,omitempty"`
 	Digest              string            `json:"digest,omitempty"`
 
-	Files             map[string]string `json:"files,omitempty"`
-	Questions         []Question        `json:"questions,omitempty"`
-	RequiredNamespace string            `json:"requiredNamespace,omitempty"`
+	// Deprecated: Do not use
+	Files map[string]string `json:"files,omitempty" norman:"nocreate,noupdate"`
+	// Deprecated: Do not use
+	Questions []Question `json:"questions,omitempty" norman:"nocreate,noupdate"`
+	// Deprecated: Do not use
+	Readme string `json:"readme,omitempty" norman:"nocreate,noupdate"`
+	// Deprecated: Do not use
+	AppReadme string `json:"appReadme,omitempty" norman:"nocreate,noupdate"`
+
+	// for local cache rebuilt
+	VersionName string   `json:"versionName,omitempty"`
+	VersionDir  string   `json:"versionDir,omitempty"`
+	VersionURLs []string `json:"versionUrls,omitempty"`
 }
 
 type TemplateVersionStatus struct {
@@ -195,6 +206,9 @@ type SubQuestion struct {
 	ShowIf       string   `json:"showIf,omitempty" yaml:"show_if,omitempty"`
 }
 
+// TemplateContent is deprecated
+//
+// Deprecated: Do not use
 type TemplateContent struct {
 	metav1.TypeMeta `json:",inline"`
 	// Standard object’s metadata. More info:

vendor/github.com/rancher/types/apis/management.cattle.io/v3/cluster_types.go

@@ -236,6 +236,10 @@ type MonitoringInput struct {
 	Answers map[string]string `json:"answers,omitempty"`
 }
 
+type MonitoringOutput struct {
+	Answers map[string]string `json:"answers,omitempty"`
+}
+
 type RestoreFromEtcdBackupInput struct {
 	EtcdBackupName string `json:"etcdBackupName,omitempty" norman:"type=reference[etcdBackup]"`
 }

vendor/github.com/rancher/types/apis/management.cattle.io/v3/globaldns_types.go

@@ -19,6 +19,7 @@ type GlobalDNS struct {
 
 type GlobalDNSSpec struct {
 	FQDN                string   `json:"fqdn,omitempty" norman:"required"`
+	TTL                 int64    `json:"ttl,omitempty"`
 	ProjectNames        []string `json:"projectNames" norman:"type=array[reference[project]],noupdate"`
 	MultiClusterAppName string   `json:"multiClusterAppName,omitempty" norman:"type=reference[multiClusterApp]"`
 	ProviderName        string   `json:"providerName,omitempty" norman:"type=reference[globalDnsProvider],required"`
@@ -31,6 +32,8 @@ type GlobalDNSStatus struct {
 }
 
 type GlobalDNSProvider struct {
+	types.Namespaced
+
 	metav1.TypeMeta `json:",inline"`
 	// Standard object’s metadata. More info:
 	// https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md#metadata
@@ -43,6 +46,7 @@ type GlobalDNSProvider struct {
 type GlobalDNSProviderSpec struct {
 	Route53ProviderConfig    *Route53ProviderConfig    `json:"route53ProviderConfig,omitempty"`
 	CloudflareProviderConfig *CloudflareProviderConfig `json:"cloudflareProviderConfig,omitempty"`
+	AlidnsProviderConfig     *AlidnsProviderConfig     `json:"alidnsProviderConfig,omitempty"`
 	Members                  []Member                  `json:"members,omitempty"`
 }
 
@@ -61,3 +65,13 @@ type CloudflareProviderConfig struct {
 type UpdateGlobalDNSTargetsInput struct {
 	ProjectNames []string `json:"projectNames" norman:"type=array[reference[project]]"`
 }
+
+type AlidnsProviderConfig struct {
+	RootDomain string `json:"rootDomain" norman:"required"`
+	AccessKey  string `json:"accessKey" norman:"notnullable,required,minLength=1"`
+	SecretKey  string `json:"secretKey" norman:"notnullable,required,minLength=1,type=password"`
+}
+
+type GlobalDNSSystemImages struct {
+	ExternalDNS string `yaml:"ExternalDns" json:"ExternalDns,omitempty"`
+}

vendor/github.com/rancher/types/apis/management.cattle.io/v3/k8s_defaults.go

@@ -84,11 +84,12 @@ var (
 		},
 	}
 
-	// ToolsSystemImages default images for alert, pipeline, logging
+	// ToolsSystemImages default images for alert, pipeline, logging, globaldns
 	ToolsSystemImages = struct {
-		AlertSystemImages    AlertSystemImages
-		PipelineSystemImages projectv3.PipelineSystemImages
-		LoggingSystemImages  LoggingSystemImages
+		AlertSystemImages     AlertSystemImages
+		PipelineSystemImages  projectv3.PipelineSystemImages
+		LoggingSystemImages   LoggingSystemImages
+		GlobalDNSSystemImages GlobalDNSSystemImages
 	}{
 		AlertSystemImages: AlertSystemImages{
 			AlertManager:       m("prom/alertmanager:v0.15.2"),
@@ -109,6 +110,9 @@ var (
 			FluentdHelper:                 m("rancher/fluentd-helper:v0.1.2"),
 			LogAggregatorFlexVolumeDriver: m("rancher/log-aggregator:v0.1.4"),
 		},
+		GlobalDNSSystemImages: GlobalDNSSystemImages{
+			ExternalDNS: m("registry.opensource.zalan.do/teapot/external-dns:v0.5.10"),
+		},
 	}
 
 	AllK8sVersions = map[string]RKESystemImages{
@@ -734,10 +738,10 @@ var (
 		"v1.12.4-rancher1-1": {
 			Etcd:                      m("quay.io/coreos/etcd:v3.2.24"),
 			Kubernetes:                m("rancher/hyperkube:v1.12.4-rancher1"),
-			Alpine:                    m("rancher/rke-tools:v0.1.23"),
-			NginxProxy:                m("rancher/rke-tools:v0.1.23"),
-			CertDownloader:            m("rancher/rke-tools:v0.1.23"),
-			KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.23"),
+			Alpine:                    m("rancher/rke-tools:v0.1.24"),
+			NginxProxy:                m("rancher/rke-tools:v0.1.24"),
+			CertDownloader:            m("rancher/rke-tools:v0.1.24"),
+			KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.24"),
 			KubeDNS:                   m("gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.13"),
 			DNSmasq:                   m("gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.13"),
 			KubeDNSSidecar:            m("gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.13"),
@@ -762,10 +766,10 @@ var (
 		"v1.12.5-rancher1-1": {
 			Etcd:                      m("quay.io/coreos/etcd:v3.2.24"),
 			Kubernetes:                m("rancher/hyperkube:v1.12.5-rancher1"),
-			Alpine:                    m("rancher/rke-tools:v0.1.23"),
-			NginxProxy:                m("rancher/rke-tools:v0.1.23"),
-			CertDownloader:            m("rancher/rke-tools:v0.1.23"),
-			KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.23"),
+			Alpine:                    m("rancher/rke-tools:v0.1.24"),
+			NginxProxy:                m("rancher/rke-tools:v0.1.24"),
+			CertDownloader:            m("rancher/rke-tools:v0.1.24"),
+			KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.24"),
 			KubeDNS:                   m("gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.13"),
 			DNSmasq:                   m("gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.13"),
 			KubeDNSSidecar:            m("gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.13"),
@@ -790,10 +794,10 @@ var (
 		"v1.13.1-rancher1-1": {
 			Etcd:                      m("quay.io/coreos/etcd:v3.2.24"),
 			Kubernetes:                m("rancher/hyperkube:v1.13.1-rancher1"),
-			Alpine:                    m("rancher/rke-tools:v0.1.23"),
-			NginxProxy:                m("rancher/rke-tools:v0.1.23"),
-			CertDownloader:            m("rancher/rke-tools:v0.1.23"),
-			KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.23"),
+			Alpine:                    m("rancher/rke-tools:v0.1.24"),
+			NginxProxy:                m("rancher/rke-tools:v0.1.24"),
+			CertDownloader:            m("rancher/rke-tools:v0.1.24"),
+			KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.24"),
 			KubeDNS:                   m("gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.15.0"),
 			DNSmasq:                   m("gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.15.0"),
 			KubeDNSSidecar:            m("gcr.io/google_containers/k8s-dns-sidecar-amd64:1.15.0"),
@@ -815,6 +819,60 @@ var (
 			CoreDNS:                   m("coredns/coredns:1.2.6"),
 			CoreDNSAutoscaler:         m("gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.0.0"),
 		},
+		// Add a new version with old rke-tools to allow upgrade from 2.1.x clusters
+		"v1.12.5-rancher1-1-1": {
+			Etcd:                      m("quay.io/coreos/etcd:v3.2.24"),
+			Kubernetes:                m("rancher/hyperkube:v1.12.5-rancher1"),
+			Alpine:                    m("rancher/rke-tools:v0.1.16"),
+			NginxProxy:                m("rancher/rke-tools:v0.1.16"),
+			CertDownloader:            m("rancher/rke-tools:v0.1.16"),
+			KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.16"),
+			KubeDNS:                   m("gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.13"),
+			DNSmasq:                   m("gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.13"),
+			KubeDNSSidecar:            m("gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.13"),
+			KubeDNSAutoscaler:         m("gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.0.0"),
+			Flannel:                   m("quay.io/coreos/flannel:v0.10.0"),
+			FlannelCNI:                m("quay.io/coreos/flannel-cni:v0.3.0"),
+			CalicoNode:                m("quay.io/calico/node:v3.1.3"),
+			CalicoCNI:                 m("quay.io/calico/cni:v3.1.3"),
+			CalicoCtl:                 m("quay.io/calico/ctl:v2.0.0"),
+			CanalNode:                 m("quay.io/calico/node:v3.1.3"),
+			CanalCNI:                  m("quay.io/calico/cni:v3.1.3"),
+			CanalFlannel:              m("quay.io/coreos/flannel:v0.10.0"),
+			WeaveNode:                 m("weaveworks/weave-kube:2.5.0"),
+			WeaveCNI:                  m("weaveworks/weave-npc:2.5.0"),
+			PodInfraContainer:         m("gcr.io/google_containers/pause-amd64:3.1"),
+			Ingress:                   m("rancher/nginx-ingress-controller:0.21.0-rancher1"),
+			IngressBackend:            m("k8s.gcr.io/defaultbackend:1.4"),
+			MetricsServer:             m("gcr.io/google_containers/metrics-server-amd64:v0.3.1"),
+		},
+		// Add a new version with old rke-tools to allow upgrade from 2.1.x clusters
+		"v1.13.1-rancher1-1-1": {
+			Etcd:                      m("quay.io/coreos/etcd:v3.2.24"),
+			Kubernetes:                m("rancher/hyperkube:v1.13.1-rancher1"),
+			Alpine:                    m("rancher/rke-tools:v0.1.16"),
+			NginxProxy:                m("rancher/rke-tools:v0.1.16"),
+			CertDownloader:            m("rancher/rke-tools:v0.1.16"),
+			KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.16"),
+			KubeDNS:                   m("gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.15.0"),
+			DNSmasq:                   m("gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.15.0"),
+			KubeDNSSidecar:            m("gcr.io/google_containers/k8s-dns-sidecar-amd64:1.15.0"),
+			KubeDNSAutoscaler:         m("gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.0.0"),
+			Flannel:                   m("quay.io/coreos/flannel:v0.10.0"),
+			FlannelCNI:                m("quay.io/coreos/flannel-cni:v0.3.0"),
+			CalicoNode:                m("quay.io/calico/node:v3.4.0"),
+			CalicoCNI:                 m("quay.io/calico/cni:v3.4.0"),
+			CalicoCtl:                 m("quay.io/calico/ctl:v2.0.0"),
+			CanalNode:                 m("quay.io/calico/node:v3.4.0"),
+			CanalCNI:                  m("quay.io/calico/cni:v3.4.0"),
+			CanalFlannel:              m("quay.io/coreos/flannel:v0.10.0"),
+			WeaveNode:                 m("weaveworks/weave-kube:2.5.0"),
+			WeaveCNI:                  m("weaveworks/weave-npc:2.5.0"),
+			PodInfraContainer:         m("gcr.io/google_containers/pause-amd64:3.1"),
+			Ingress:                   m("rancher/nginx-ingress-controller:0.21.0-rancher1"),
+			IngressBackend:            m("k8s.gcr.io/defaultbackend:1.4"),
+			MetricsServer:             m("gcr.io/google_containers/metrics-server-amd64:v0.3.1"),
+		},
 	}
 )
 

vendor/github.com/rancher/types/apis/management.cattle.io/v3/logging_types.go

@@ -56,7 +56,7 @@ type ClusterLoggingSpec struct {
 	LoggingTargets
 	LoggingCommonField
 	ClusterName            string `json:"clusterName" norman:"type=reference[cluster]"`
-	ExcludeSystemComponent bool   `json:"excludeSystemComponent,omitempty"`
+	IncludeSystemComponent *bool  `json:"includeSystemComponent,omitempty" norman:"default=true"`
 }
 
 type ProjectLoggingSpec struct {

vendor/github.com/rancher/types/apis/management.cattle.io/v3/multi_cluster_app.go

@@ -43,6 +43,7 @@ type MultiClusterAppStatus struct {
 type Target struct {
 	ProjectName string `json:"projectName,omitempty" norman:"type=reference[project],required"`
 	AppName     string `json:"appName,omitempty" norman:"type=reference[v3/projects/schemas/app]"`
+	State       string `json:"state,omitempty"`
 	Healthstate string `json:"healthState,omitempty"`
 }
 
@@ -84,5 +85,5 @@ type MultiClusterAppRollbackInput struct {
 
 type UpdateMultiClusterAppTargetsInput struct {
 	Projects []string `json:"projects" norman:"type=array[reference[project]],required"`
-	Answers  []Answer `json:"answers" norman:"type=array[reference[answer]]"`
+	Answers  []Answer `json:"answers"`
 }

vendor/github.com/rancher/types/apis/management.cattle.io/v3/rke_types.go

@@ -217,7 +217,7 @@ type KubeAPIService struct {
 	// Enabled/Disable PodSecurityPolicy
 	PodSecurityPolicy bool `yaml:"pod_security_policy" json:"podSecurityPolicy,omitempty"`
 	// Enable/Disable AlwaysPullImages admissions plugin
-	AlwaysPullImages bool `yaml:"always_pull_images" json:"always_pull_images,omitempty"`
+	AlwaysPullImages bool `yaml:"always_pull_images" json:"alwaysPullImages,omitempty"`
 }
 
 type KubeControllerService struct {

vendor/github.com/rancher/types/apis/management.cattle.io/v3/schema_types.go

@@ -18,18 +18,19 @@ type DynamicSchema struct {
 }
 
 type DynamicSchemaSpec struct {
-	SchemaName        string            `json:"schemaName,omitempty"`
-	Embed             bool              `json:"embed,omitempty"`
-	EmbedType         string            `json:"embedType,omitempty"`
-	PluralName        string            `json:"pluralName,omitempty"`
-	ResourceMethods   []string          `json:"resourceMethods,omitempty"`
-	ResourceFields    map[string]Field  `json:"resourceFields,omitempty"`
-	ResourceActions   map[string]Action `json:"resourceActions,omitempty"`
-	CollectionMethods []string          `json:"collectionMethods,omitempty"`
-	CollectionFields  map[string]Field  `json:"collectionFields,omitempty"`
-	CollectionActions map[string]Action `json:"collectionActions,omitempty"`
-	CollectionFilters map[string]Filter `json:"collectionFilters,omitempty"`
-	IncludeableLinks  []string          `json:"includeableLinks,omitempty"`
+	SchemaName           string            `json:"schemaName,omitempty"`
+	Embed                bool              `json:"embed,omitempty"`
+	EmbedType            string            `json:"embedType,omitempty"`
+	PluralName           string            `json:"pluralName,omitempty"`
+	ResourceMethods      []string          `json:"resourceMethods,omitempty"`
+	ResourceFields       map[string]Field  `json:"resourceFields,omitempty"`
+	ResourceActions      map[string]Action `json:"resourceActions,omitempty"`
+	CollectionMethods    []string          `json:"collectionMethods,omitempty"`
+	CollectionFields     map[string]Field  `json:"collectionFields,omitempty"`
+	CollectionActions    map[string]Action `json:"collectionActions,omitempty"`
+	CollectionFilters    map[string]Filter `json:"collectionFilters,omitempty"`
+	IncludeableLinks     []string          `json:"includeableLinks,omitempty"`
+	DynamicSchemaVersion string            `json:"dynamicSchemaVersion,omitempty"`
 }
 
 type DynamicSchemaStatus struct {

vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_deepcopy.go

@@ -180,6 +180,22 @@ func (in *AlertSystemImages) DeepCopy() *AlertSystemImages {
 	return out
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *AlidnsProviderConfig) DeepCopyInto(out *AlidnsProviderConfig) {
+	*out = *in
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AlidnsProviderConfig.
+func (in *AlidnsProviderConfig) DeepCopy() *AlidnsProviderConfig {
+	if in == nil {
+		return nil
+	}
+	out := new(AlidnsProviderConfig)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *Answer) DeepCopyInto(out *Answer) {
 	*out = *in
@@ -1438,6 +1454,11 @@ func (in *ClusterLoggingSpec) DeepCopyInto(out *ClusterLoggingSpec) {
 	*out = *in
 	in.LoggingTargets.DeepCopyInto(&out.LoggingTargets)
 	in.LoggingCommonField.DeepCopyInto(&out.LoggingCommonField)
+	if in.IncludeSystemComponent != nil {
+		in, out := &in.IncludeSystemComponent, &out.IncludeSystemComponent
+		*out = new(bool)
+		**out = **in
+	}
 	return
 }
 
@@ -2397,7 +2418,7 @@ func (in *EtcdBackup) DeepCopyInto(out *EtcdBackup) {
 	out.Namespaced = in.Namespaced
 	out.TypeMeta = in.TypeMeta
 	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
-	in.BackupConfig.DeepCopyInto(&out.BackupConfig)
+	in.Spec.DeepCopyInto(&out.Spec)
 	in.Status.DeepCopyInto(&out.Status)
 	return
 }
@@ -2469,6 +2490,23 @@ func (in *EtcdBackupList) DeepCopyObject() runtime.Object {
 	return nil
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *EtcdBackupSpec) DeepCopyInto(out *EtcdBackupSpec) {
+	*out = *in
+	in.BackupConfig.DeepCopyInto(&out.BackupConfig)
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new EtcdBackupSpec.
+func (in *EtcdBackupSpec) DeepCopy() *EtcdBackupSpec {
+	if in == nil {
+		return nil
+	}
+	out := new(EtcdBackupSpec)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *EtcdBackupStatus) DeepCopyInto(out *EtcdBackupStatus) {
 	*out = *in
@@ -2841,6 +2879,7 @@ func (in *GlobalDNSList) DeepCopyObject() runtime.Object {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *GlobalDNSProvider) DeepCopyInto(out *GlobalDNSProvider) {
 	*out = *in
+	out.Namespaced = in.Namespaced
 	out.TypeMeta = in.TypeMeta
 	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
 	in.Spec.DeepCopyInto(&out.Spec)
@@ -2911,6 +2950,11 @@ func (in *GlobalDNSProviderSpec) DeepCopyInto(out *GlobalDNSProviderSpec) {
 		*out = new(CloudflareProviderConfig)
 		**out = **in
 	}
+	if in.AlidnsProviderConfig != nil {
+		in, out := &in.AlidnsProviderConfig, &out.AlidnsProviderConfig
+		*out = new(AlidnsProviderConfig)
+		**out = **in
+	}
 	if in.Members != nil {
 		in, out := &in.Members, &out.Members
 		*out = make([]Member, len(*in))
@@ -2991,6 +3035,22 @@ func (in *GlobalDNSStatus) DeepCopy() *GlobalDNSStatus {
 	return out
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *GlobalDNSSystemImages) DeepCopyInto(out *GlobalDNSSystemImages) {
+	*out = *in
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new GlobalDNSSystemImages.
+func (in *GlobalDNSSystemImages) DeepCopy() *GlobalDNSSystemImages {
+	if in == nil {
+		return nil
+	}
+	out := new(GlobalDNSSystemImages)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *GlobalOpenstackOpts) DeepCopyInto(out *GlobalOpenstackOpts) {
 	*out = *in
@@ -4254,6 +4314,29 @@ func (in *MonitoringInput) DeepCopy() *MonitoringInput {
 	return out
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *MonitoringOutput) DeepCopyInto(out *MonitoringOutput) {
+	*out = *in
+	if in.Answers != nil {
+		in, out := &in.Answers, &out.Answers
+		*out = make(map[string]string, len(*in))
+		for key, val := range *in {
+			(*out)[key] = val
+		}
+	}
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new MonitoringOutput.
+func (in *MonitoringOutput) DeepCopy() *MonitoringOutput {
+	if in == nil {
+		return nil
+	}
+	out := new(MonitoringOutput)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *MonitoringStatus) DeepCopyInto(out *MonitoringStatus) {
 	*out = *in
@@ -8038,6 +8121,11 @@ func (in *TemplateVersionSpec) DeepCopyInto(out *TemplateVersionSpec) {
 			(*in)[i].DeepCopyInto(&(*out)[i])
 		}
 	}
+	if in.VersionURLs != nil {
+		in, out := &in.VersionURLs, &out.VersionURLs
+		*out = make([]string, len(*in))
+		copy(*out, *in)
+	}
 	return
 }
 

vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_global_dns_provider_controller.go

@@ -24,8 +24,9 @@ var (
 	GlobalDNSProviderResource = metav1.APIResource{
 		Name:         "globaldnsproviders",
 		SingularName: "globaldnsprovider",
-		Namespaced:   false,
-		Kind:         GlobalDNSProviderGroupVersionKind.Kind,
+		Namespaced:   true,
+
+		Kind: GlobalDNSProviderGroupVersionKind.Kind,
 	}
 )
 

vendor/github.com/rancher/types/apis/project.cattle.io/v3/app_types.go

@@ -26,6 +26,7 @@ type AppSpec struct {
 	AppRevisionName     string            `json:"appRevisionName,omitempty" norman:"type=reference[/v3/project/schemas/apprevision]"`
 	Prune               bool              `json:"prune,omitempty"`
 	MultiClusterAppName string            `json:"multiClusterAppName,omitempty" norman:"type=reference[/v3/schemas/multiclusterapp]"`
+	ValuesYaml          string            `json:"valuesYaml,omitempty"`
 }
 
 var (
@@ -73,12 +74,16 @@ type AppRevisionStatus struct {
 	ExternalID  string            `json:"externalId"`
 	Answers     map[string]string `json:"answers"`
 	Digest      string            `json:"digest"`
+	ValuesYaml  string            `json:"valuesYaml,omitempty"`
+	Files       map[string]string `json:"files,omitempty"`
 }
 
 type AppUpgradeConfig struct {
 	ExternalID   string            `json:"externalId,omitempty"`
 	Answers      map[string]string `json:"answers,omitempty"`
 	ForceUpgrade bool              `json:"forceUpgrade,omitempty"`
+	Files        map[string]string `json:"files,omitempty"`
+	ValuesYaml   string            `json:"valuesYaml,omitempty"`
 }
 
 type RollbackRevision struct {

vendor/github.com/rancher/types/apis/project.cattle.io/v3/zz_generated_deepcopy.go

@@ -170,6 +170,13 @@ func (in *AppRevisionStatus) DeepCopyInto(out *AppRevisionStatus) {
 			(*out)[key] = val
 		}
 	}
+	if in.Files != nil {
+		in, out := &in.Files, &out.Files
+		*out = make(map[string]string, len(*in))
+		for key, val := range *in {
+			(*out)[key] = val
+		}
+	}
 	return
 }
 
@@ -251,6 +258,13 @@ func (in *AppUpgradeConfig) DeepCopyInto(out *AppUpgradeConfig) {
 			(*out)[key] = val
 		}
 	}
+	if in.Files != nil {
+		in, out := &in.Files, &out.Files
+		*out = make(map[string]string, len(*in))
+		for key, val := range *in {
+			(*out)[key] = val
+		}
+	}
 	return
 }
 

vendor/github.com/rancher/types/image/mirror.go

@@ -20,6 +20,7 @@ func Mirror(image string) string {
 	image = strings.Replace(image, "alpine/git", "rancher/alpine-git", 1)
 	image = strings.Replace(image, "prom/", "rancher/prom-", 1)
 	image = strings.Replace(image, "quay.io/pires", "rancher", 1)
+	image = strings.Replace(image, "registry.opensource.zalan.do/teapot/external-dns", "rancher/kubernetes-external-dns", 1)
 
 	Mirrors[image] = orig
 	return image