1
0
mirror of https://github.com/rancher/rke.git synced 2025-05-10 17:35:03 +00:00

Merge pull request from kinarashah/ttt

vendor update kdm
This commit is contained in:
Kinara Shah 2021-06-09 11:16:48 -07:00 committed by GitHub
commit eccc55a1ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 14 deletions

File diff suppressed because one or more lines are too long

View File

@ -2476,6 +2476,7 @@
"api-audiences": "unknown",
"bind-address": "0.0.0.0",
"enable-admission-plugins": "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota,NodeRestriction,Priority,TaintNodesByCondition,PersistentVolumeClaimResize",
"feature-gates": "IPv6DualStack=false",
"insecure-port": "0",
"kubelet-preferred-address-types": "InternalIP,ExternalIP,Hostname",
"profiling": "false",
@ -7433,10 +7434,10 @@
},
"v1.19.11-rancher1-1": {
"etcd": "rancher/mirrored-coreos-etcd:v3.4.15-rancher1",
"alpine": "rancher/rke-tools:v0.1.75",
"nginxProxy": "rancher/rke-tools:v0.1.75",
"certDownloader": "rancher/rke-tools:v0.1.75",
"kubernetesServicesSidecar": "rancher/rke-tools:v0.1.75",
"alpine": "rancher/rke-tools:v0.1.76",
"nginxProxy": "rancher/rke-tools:v0.1.76",
"certDownloader": "rancher/rke-tools:v0.1.76",
"kubernetesServicesSidecar": "rancher/rke-tools:v0.1.76",
"kubedns": "rancher/mirrored-k8s-dns-kube-dns:1.15.10",
"dnsmasq": "rancher/mirrored-k8s-dns-dnsmasq-nanny:1.15.10",
"kubednsSidecar": "rancher/mirrored-k8s-dns-sidecar:1.15.10",
@ -7905,10 +7906,10 @@
},
"v1.20.7-rancher1-1": {
"etcd": "rancher/mirrored-coreos-etcd:v3.4.15-rancher1",
"alpine": "rancher/rke-tools:v0.1.75",
"nginxProxy": "rancher/rke-tools:v0.1.75",
"certDownloader": "rancher/rke-tools:v0.1.75",
"kubernetesServicesSidecar": "rancher/rke-tools:v0.1.75",
"alpine": "rancher/rke-tools:v0.1.76",
"nginxProxy": "rancher/rke-tools:v0.1.76",
"certDownloader": "rancher/rke-tools:v0.1.76",
"kubernetesServicesSidecar": "rancher/rke-tools:v0.1.76",
"kubedns": "rancher/mirrored-k8s-dns-kube-dns:1.15.10",
"dnsmasq": "rancher/mirrored-k8s-dns-dnsmasq-nanny:1.15.10",
"kubednsSidecar": "rancher/mirrored-k8s-dns-sidecar:1.15.10",
@ -7947,10 +7948,10 @@
},
"v1.21.1-rancher2-1": {
"etcd": "rancher/mirrored-coreos-etcd:v3.4.16-rancher1",
"alpine": "rancher/rke-tools:v0.1.75",
"nginxProxy": "rancher/rke-tools:v0.1.75",
"certDownloader": "rancher/rke-tools:v0.1.75",
"kubernetesServicesSidecar": "rancher/rke-tools:v0.1.75",
"alpine": "rancher/rke-tools:v0.1.76",
"nginxProxy": "rancher/rke-tools:v0.1.76",
"certDownloader": "rancher/rke-tools:v0.1.76",
"kubernetesServicesSidecar": "rancher/rke-tools:v0.1.76",
"kubedns": "rancher/mirrored-k8s-dns-kube-dns:1.17.4",
"dnsmasq": "rancher/mirrored-k8s-dns-dnsmasq-nanny:1.17.4",
"kubednsSidecar": "rancher/mirrored-k8s-dns-sidecar:1.17.4",

View File

@ -1616,6 +1616,11 @@ func (in *RancherKubernetesEngineConfig) DeepCopyInto(out *RancherKubernetesEngi
*out = new(bool)
**out = **in
}
if in.EnableCRIDockerd != nil {
in, out := &in.EnableCRIDockerd, &out.EnableCRIDockerd
*out = new(bool)
**out = **in
}
if in.PrivateRegistries != nil {
in, out := &in.PrivateRegistries, &out.PrivateRegistries
*out = make([]PrivateRegistry, len(*in))