rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-08-25 18:08:43 +00:00
Code Issues Releases Wiki Activity

Vendor Update

Browse Source
This commit is contained in:
Erik Wilson 2018-12-28 09:41:59 -07:00 committed by Craig Jellick
parent e04b7d4413
commit 9db25ef841
8 changed files with 148 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vendor.conf
View File

@ -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 522fc4d7b1af7ecea4caec2399a9338d27ab814b
github.com/rancher/types db4a9fe5448517c8006c82199541ebfccf3caaa1

18
vendor/github.com/rancher/types/apis/management.cattle.io/v3/alerting_types.go generated vendored
View File

@ -62,7 +62,7 @@ type ProjectAlertSpec struct {
type Recipient struct {
Recipient string `json:"recipient,omitempty"`
NotifierName string `json:"notifierName,omitempty" norman:"required,type=reference[notifier]"`
NotifierType string `json:"notifierType,omitempty" norman:"required,options=slack|email|pagerduty|webhook"`
NotifierType string `json:"notifierType,omitempty" norman:"required,options=slack|email|pagerduty|webhook|wechat"`
}
type TargetNode struct {
@ -200,12 +200,10 @@ type CommonRuleField struct {
type MetricRule struct {
Expression string `json:"expression,omitempty" norman:"required"`
LegendFormat string `json:"legendFormat,omitempty"`
Step int64 `json:"step,omitempty"`
Description string `json:"description,omitempty"`
Duration string `json:"duration,omitempty"`
Duration string `json:"duration,omitempty" norman:"required"`
Comparison string `json:"comparison,omitempty" norman:"type=enum,options=equal|not-equal|greater-than|less-than|greater-or-equal|less-or-equal,default=equal"`
ThresholdValue float64 `json:"thresholdValue,omitempty" norman:"type=float"`
ThresholdValue float64 `json:"thresholdValue,omitempty" norman:"required,type=float"`
}
type TimingField struct {
@ -267,6 +265,7 @@ type NotifierSpec struct {
SlackConfig *SlackConfig `json:"slackConfig,omitempty"`
PagerdutyConfig *PagerdutyConfig `json:"pagerdutyConfig,omitempty"`
WebhookConfig *WebhookConfig `json:"webhookConfig,omitempty"`
WechatConfig *WechatConfig `json:"wechatConfig,omitempty"`
}
type Notification struct {
@ -275,6 +274,7 @@ type Notification struct {
SlackConfig *SlackConfig `json:"slackConfig,omitempty"`
PagerdutyConfig *PagerdutyConfig `json:"pagerdutyConfig,omitempty"`
WebhookConfig *WebhookConfig `json:"webhookConfig,omitempty"`
WechatConfig *WechatConfig `json:"wechatConfig,omitempty"`
}
type SMTPConfig struct {
@ -300,6 +300,14 @@ type WebhookConfig struct {
URL string `json:"url,omitempty" norman:"required"`
}
type WechatConfig struct {
DefaultRecipient string `json:"defaultRecipient,omitempty" norman:"required"`
Secret string `json:"secret,omitempty" norman:"type=password,required"`
Agent string `json:"agent,omitempty" norman:"required"`
Corp string `json:"corp,omitempty" norman:"required"`
RecipientType string `json:"recipientType,omitempty" norman:"required,options=tag|party|user,default=party"`
}
type NotifierStatus struct {
}

1
vendor/github.com/rancher/types/apis/management.cattle.io/v3/authn_types.go generated vendored
View File

@ -25,6 +25,7 @@ type Token struct {
Expired bool `json:"expired"`
ExpiresAt string `json:"expiresAt"`
Current bool `json:"current"`
ClusterName string `json:"clusterName,omitempty" norman:"noupdate,type=reference[cluster]"`
Enabled *bool `json:"enabled,omitempty" norman:"default=true"`
}

6
vendor/github.com/rancher/types/apis/management.cattle.io/v3/cluster_types.go generated vendored
View File

@ -77,6 +77,7 @@ type ClusterSpec struct {
Description string `json:"description"`
Internal bool `json:"internal" norman:"nocreate,noupdate"`
DesiredAgentImage string `json:"desiredAgentImage"`
DesiredAuthImage string `json:"desiredAuthImage"`
ImportedConfig *ImportedConfig `json:"importedConfig,omitempty" norman:"nocreate,noupdate"`
GoogleKubernetesEngineConfig *MapStringInterface `json:"googleKubernetesEngineConfig,omitempty"`
AzureKubernetesServiceConfig *MapStringInterface `json:"azureKubernetesServiceConfig,omitempty"`
@ -89,6 +90,9 @@ type ClusterSpec struct {
EnableNetworkPolicy *bool `json:"enableNetworkPolicy" norman:"default=false"`
EnableClusterAlerting bool `json:"enableClusterAlerting" norman:"default=false"`
EnableClusterMonitoring bool `json:"enableClusterMonitoring" norman:"default=false"`
EnableClusterAuth bool `json:"enableClusterAuth" norman:"default=false"`
ClusterEndpointFQDN string `json:"clusterEndpointFQDN,omitempty"`
ClusterEndpointFQDNCaCert string `json:"clusterEndpointFQDNCaCert,omitempty"`
}
type ImportedConfig struct {
@ -103,6 +107,7 @@ type ClusterStatus struct {
// https://kubernetes.io/docs/api-reference/v1.8/#componentstatus-v1-core
Driver string `json:"driver"`
AgentImage string `json:"agentImage"`
AuthImage string `json:"authImage"`
ComponentStatuses []ClusterComponentStatus `json:"componentStatuses,omitempty"`
APIEndpoint string `json:"apiEndpoint,omitempty"`
ServiceAccountToken string `json:"serviceAccountToken,omitempty"`
@ -116,6 +121,7 @@ type ClusterStatus struct {
Version *version.Info `json:"version,omitempty"`
AppliedPodSecurityPolicyTemplateName string `json:"appliedPodSecurityPolicyTemplateId"`
AppliedEnableNetworkPolicy bool `json:"appliedEnableNetworkPolicy" norman:"nocreate,noupdate,default=false"`
AppliedEnableClusterAuth bool `json:"appliedEnableAuth"`
Capabilities Capabilities `json:"capabilities,omitempty"`
MonitoringStatus *MonitoringStatus `json:"monitoringStatus,omitempty" norman:"nocreate,noupdate"`
}

58
vendor/github.com/rancher/types/apis/management.cattle.io/v3/k8s_defaults.go generated vendored
View File

@ -9,7 +9,7 @@ import (
)
const (
DefaultK8s = "v1.12.3-rancher1-1"
DefaultK8s = "v1.12.4-rancher1-1"
)
var (
@ -18,9 +18,9 @@ var (
// k8sVersionsCurrent are the latest versions available for installation
k8sVersionsCurrent = []string{
"v1.9.7-rancher2-2",
"v1.10.11-rancher1-1",
"v1.10.12-rancher1-1",
"v1.11.6-rancher1-1",
"v1.12.3-rancher1-1",
"v1.12.4-rancher1-1",
}
// K8sVersionToRKESystemImages is dynamically populated on init() with the latest versions
@ -446,6 +446,32 @@ var (
IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"),
MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.2.1"),
},
"v1.10.12-rancher1-1": {
Etcd: m("quay.io/coreos/etcd:v3.1.12"),
Kubernetes: m("rancher/hyperkube:v1.10.12-rancher1"),
Alpine: m("rancher/rke-tools:v0.1.13"),
NginxProxy: m("rancher/rke-tools:v0.1.13"),
CertDownloader: m("rancher/rke-tools:v0.1.13"),
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.13"),
KubeDNS: m("gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.8"),
DNSmasq: m("gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.8"),
KubeDNSSidecar: m("gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.8"),
KubeDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.0.0"),
Flannel: m("quay.io/coreos/flannel:v0.9.1"),
FlannelCNI: m("quay.io/coreos/flannel-cni:v0.2.0"),
CalicoNode: m("quay.io/calico/node:v3.1.1"),
CalicoCNI: m("quay.io/calico/cni:v3.1.1"),
CalicoCtl: m("quay.io/calico/ctl:v2.0.0"),
CanalNode: m("quay.io/calico/node:v3.1.1"),
CanalCNI: m("quay.io/calico/cni:v3.1.1"),
CanalFlannel: m("quay.io/coreos/flannel:v0.9.1"),
WeaveNode: m("weaveworks/weave-kube:2.1.2"),
WeaveCNI: m("weaveworks/weave-npc:2.1.2"),
PodInfraContainer: m("gcr.io/google_containers/pause-amd64:3.1"),
Ingress: m("rancher/nginx-ingress-controller:0.16.2-rancher1"),
IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"),
MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.2.1"),
},
"v1.11.1-rancher1-1": {
Etcd: m("quay.io/coreos/etcd:v3.2.18"),
Kubernetes: m("rancher/hyperkube:v1.11.1-rancher1"),
@ -680,6 +706,32 @@ var (
IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"),
MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.3.1"),
},
"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.18"),
NginxProxy: m("rancher/rke-tools:v0.1.18"),
CertDownloader: m("rancher/rke-tools:v0.1.18"),
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.18"),
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.1.2"),
WeaveCNI: m("weaveworks/weave-npc:2.1.2"),
PodInfraContainer: m("gcr.io/google_containers/pause-amd64:3.1"),
Ingress: m("rancher/nginx-ingress-controller:0.16.2-rancher1"),
IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"),
MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.3.1"),
},
}
)

16
vendor/github.com/rancher/types/apis/management.cattle.io/v3/k8s_windows_default.go generated vendored
View File

@ -166,6 +166,14 @@ var (
CanalCNIBinaries: m("rancher/canal-cni:v0.0.1-nanoserver-1803"),
KubeletPause: m("rancher/kubelet-pause:v0.0.1-nanoserver-1803"),
},
"v1.10.12-rancher1-1": {
NginxProxy: m("rancher/nginx-proxy:v0.0.1-nanoserver-1803"),
KubernetesBinaries: m("rancher/hyperkube:v1.10.12-nanoserver-1803"),
FlannelCNIBinaries: m("rancher/flannel-cni:v0.0.1-nanoserver-1803"),
CalicoCNIBinaries: m("rancher/calico-cni:v0.0.1-nanoserver-1803"),
CanalCNIBinaries: m("rancher/canal-cni:v0.0.1-nanoserver-1803"),
KubeletPause: m("rancher/kubelet-pause:v0.0.1-nanoserver-1803"),
},
"v1.11.1-rancher1-1": {
NginxProxy: m("rancher/nginx-proxy:v0.0.1-nanoserver-1803"),
KubernetesBinaries: m("rancher/hyperkube:v1.11.1-nanoserver-1803"),
@ -238,6 +246,14 @@ var (
CanalCNIBinaries: m("rancher/canal-cni:v0.0.1-nanoserver-1803"),
KubeletPause: m("rancher/kubelet-pause:v0.0.1-nanoserver-1803"),
},
"v1.12.4-rancher1-1": {
NginxProxy: m("rancher/nginx-proxy:v0.0.1-nanoserver-1803"),
KubernetesBinaries: m("rancher/hyperkube:v1.12.4-nanoserver-1803"),
FlannelCNIBinaries: m("rancher/flannel-cni:v0.0.1-nanoserver-1803"),
CalicoCNIBinaries: m("rancher/calico-cni:v0.0.1-nanoserver-1803"),
CanalCNIBinaries: m("rancher/canal-cni:v0.0.1-nanoserver-1803"),
KubeletPause: m("rancher/kubelet-pause:v0.0.1-nanoserver-1803"),
},
}
)

11
vendor/github.com/rancher/types/apis/management.cattle.io/v3/rke_types.go generated vendored
View File

@ -256,13 +256,20 @@ type NetworkConfig struct {
WeaveNetworkProvider *WeaveNetworkProvider `yaml:",omitempty" json:"weaveNetworkProvider,omitempty"`
}
type AuthWebhookConfig struct {
// ConfigFile is a multiline string that represent a custom webhook config file
ConfigFile string `yaml:"config_file" json:"configFile,omitempty"`
// CacheTimeout controls how long to cache authentication decisions
CacheTimeout string `yaml:"cache_timeout" json:"cacheTimeout,omitempty"`
}
type AuthnConfig struct {
// Authentication strategy that will be used in kubernetes cluster
Strategy string `yaml:"strategy" json:"strategy,omitempty" norman:"default=x509"`
// Authentication options
Options map[string]string `yaml:"options" json:"options,omitempty"`
// List of additional hostnames and IPs to include in the api server PKI cert
SANs []string `yaml:"sans" json:"sans,omitempty"`
// Webhook configuration options
Webhook *AuthWebhookConfig `yaml:"webhook" json:"webhook,omitempty"`
}
type AuthzConfig struct {

54
vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_deepcopy.go generated vendored
View File

@ -258,21 +258,35 @@ func (in *AuthConfigList) DeepCopyObject() runtime.Object {
return nil
}
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *AuthWebhookConfig) DeepCopyInto(out *AuthWebhookConfig) {
*out = *in
return
}
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AuthWebhookConfig.
func (in *AuthWebhookConfig) DeepCopy() *AuthWebhookConfig {
if in == nil {
return nil
}
out := new(AuthWebhookConfig)
in.DeepCopyInto(out)
return out
}
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *AuthnConfig) DeepCopyInto(out *AuthnConfig) {
*out = *in
if in.Options != nil {
in, out := &in.Options, &out.Options
*out = make(map[string]string, len(*in))
for key, val := range *in {
(*out)[key] = val
}
}
if in.SANs != nil {
in, out := &in.SANs, &out.SANs
*out = make([]string, len(*in))
copy(*out, *in)
}
if in.Webhook != nil {
in, out := &in.Webhook, &out.Webhook
*out = new(AuthWebhookConfig)
**out = **in
}
return
}
@ -4552,6 +4566,11 @@ func (in *Notification) DeepCopyInto(out *Notification) {
*out = new(WebhookConfig)
**out = **in
}
if in.WechatConfig != nil {
in, out := &in.WechatConfig, &out.WechatConfig
*out = new(WechatConfig)
**out = **in
}
return
}
@ -4650,6 +4669,11 @@ func (in *NotifierSpec) DeepCopyInto(out *NotifierSpec) {
*out = new(WebhookConfig)
**out = **in
}
if in.WechatConfig != nil {
in, out := &in.WechatConfig, &out.WechatConfig
*out = new(WechatConfig)
**out = **in
}
return
}
@ -7692,6 +7716,22 @@ func (in *WebhookConfig) DeepCopy() *WebhookConfig {
return out
}
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *WechatConfig) DeepCopyInto(out *WechatConfig) {
*out = *in
return
}
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new WechatConfig.
func (in *WechatConfig) DeepCopy() *WechatConfig {
if in == nil {
return nil
}
out := new(WechatConfig)
in.DeepCopyInto(out)
return out
}
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *WindowsSystemImages) DeepCopyInto(out *WindowsSystemImages) {
*out = *in