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

Merge pull request #3005 from kinarashah/revert

Browse Source
This commit is contained in:
Kinara Shah 2022-08-09 16:25:20 -07:00 committed by GitHub
commit 42bb0ecb84
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cluster/plan.go
View File

@ -512,8 +512,7 @@ func (c *Cluster) BuildKubeletProcess(host *hosts.Host, serviceOptions v3.Kubern
// cri-dockerd must be enabled if the cluster version is 1.24 and higher
if parsedRangeAtLeast124(parsedVersion) {
CommandArgs["container-runtime-endpoint"] = "unix:///var/run/cri-dockerd.sock"
Binds = []string{fmt.Sprintf("%s:/var/lib/cri-dockerd:z", path.Join(host.PrefixPath, "/var/lib/cri-dockerd")),
fmt.Sprintf("%s:%s", path.Join(host.PrefixPath, KubeletDockerConfigPath), "/.docker/config.json")}
Binds = []string{fmt.Sprintf("%s:/var/lib/cri-dockerd:z", path.Join(host.PrefixPath, "/var/lib/cri-dockerd"))}
}
}

2
data/bindata.go
View File

File diff suppressed because one or more lines are too long

40
data/data.json
View File

@ -9224,10 +9224,10 @@
},
"v1.20.15-rancher2-1": {
"etcd": "rancher/mirrored-coreos-etcd:v3.4.15-rancher1",
"alpine": "rancher/rke-tools:v0.1.85",
"nginxProxy": "rancher/rke-tools:v0.1.85",
"certDownloader": "rancher/rke-tools:v0.1.85",
"kubernetesServicesSidecar": "rancher/rke-tools:v0.1.85",
"alpine": "rancher/rke-tools:v0.1.86",
"nginxProxy": "rancher/rke-tools:v0.1.86",
"certDownloader": "rancher/rke-tools:v0.1.86",
"kubernetesServicesSidecar": "rancher/rke-tools:v0.1.86",
"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",
@ -9606,10 +9606,10 @@
},
"v1.21.14-rancher1-1": {
"etcd": "rancher/mirrored-coreos-etcd:v3.4.16-rancher1",
"alpine": "rancher/rke-tools:v0.1.85",
"nginxProxy": "rancher/rke-tools:v0.1.85",
"certDownloader": "rancher/rke-tools:v0.1.85",
"kubernetesServicesSidecar": "rancher/rke-tools:v0.1.85",
"alpine": "rancher/rke-tools:v0.1.86",
"nginxProxy": "rancher/rke-tools:v0.1.86",
"certDownloader": "rancher/rke-tools:v0.1.86",
"kubernetesServicesSidecar": "rancher/rke-tools:v0.1.86",
"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",
@ -10079,10 +10079,10 @@
},
"v1.22.11-rancher1-1": {
"etcd": "rancher/mirrored-coreos-etcd:v3.5.3",
"alpine": "rancher/rke-tools:v0.1.85",
"nginxProxy": "rancher/rke-tools:v0.1.85",
"certDownloader": "rancher/rke-tools:v0.1.85",
"kubernetesServicesSidecar": "rancher/rke-tools:v0.1.85",
"alpine": "rancher/rke-tools:v0.1.86",
"nginxProxy": "rancher/rke-tools:v0.1.86",
"certDownloader": "rancher/rke-tools:v0.1.86",
"kubernetesServicesSidecar": "rancher/rke-tools:v0.1.86",
"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",
@ -10595,10 +10595,10 @@
},
"v1.23.8-rancher1-1": {
"etcd": "rancher/mirrored-coreos-etcd:v3.5.3",
"alpine": "rancher/rke-tools:v0.1.85",
"nginxProxy": "rancher/rke-tools:v0.1.85",
"certDownloader": "rancher/rke-tools:v0.1.85",
"kubernetesServicesSidecar": "rancher/rke-tools:v0.1.85",
"alpine": "rancher/rke-tools:v0.1.86",
"nginxProxy": "rancher/rke-tools:v0.1.86",
"certDownloader": "rancher/rke-tools:v0.1.86",
"kubernetesServicesSidecar": "rancher/rke-tools:v0.1.86",
"kubedns": "rancher/mirrored-k8s-dns-kube-dns:1.21.1",
"dnsmasq": "rancher/mirrored-k8s-dns-dnsmasq-nanny:1.21.1",
"kubednsSidecar": "rancher/mirrored-k8s-dns-sidecar:1.21.1",
@ -10638,10 +10638,10 @@
},
"v1.24.2-rancher1-1": {
"etcd": "rancher/mirrored-coreos-etcd:v3.5.4",
"alpine": "rancher/rke-tools:v0.1.85",
"nginxProxy": "rancher/rke-tools:v0.1.85",
"certDownloader": "rancher/rke-tools:v0.1.85",
"kubernetesServicesSidecar": "rancher/rke-tools:v0.1.85",
"alpine": "rancher/rke-tools:v0.1.86",
"nginxProxy": "rancher/rke-tools:v0.1.86",
"certDownloader": "rancher/rke-tools:v0.1.86",
"kubernetesServicesSidecar": "rancher/rke-tools:v0.1.86",
"coredns": "rancher/mirrored-coredns-coredns:1.9.3",
"corednsAutoscaler": "rancher/mirrored-cluster-proportional-autoscaler:1.8.5",
"nodelocal": "rancher/mirrored-k8s-dns-node-cache:1.21.1",