Skip to content

Commit

Permalink
Merge pull request #949 from kinarashah/devsl5
Browse files Browse the repository at this point in the history
  • Loading branch information
@kinarashah
kinarashah authored Aug 12, 2022
2 parents 7422e43 + 5858bdd commit ce269b2
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 40 deletions.
40 changes: 20 additions & 20 deletions data/data.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9224,10 +9224,10 @@
},
"v1.20.15-rancher2-1": {
"etcd": "rancher/mirrored-coreos-etcd:v3.4.15-rancher1",
"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",
"alpine": "rancher/rke-tools:v0.1.87",
"nginxProxy": "rancher/rke-tools:v0.1.87",
"certDownloader": "rancher/rke-tools:v0.1.87",
"kubernetesServicesSidecar": "rancher/rke-tools:v0.1.87",
"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",
Expand Down Expand Up @@ -9606,10 +9606,10 @@
},
"v1.21.14-rancher1-1": {
"etcd": "rancher/mirrored-coreos-etcd:v3.4.16-rancher1",
"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",
"alpine": "rancher/rke-tools:v0.1.87",
"nginxProxy": "rancher/rke-tools:v0.1.87",
"certDownloader": "rancher/rke-tools:v0.1.87",
"kubernetesServicesSidecar": "rancher/rke-tools:v0.1.87",
"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",
Expand Down Expand Up @@ -10079,10 +10079,10 @@
},
"v1.22.11-rancher1-1": {
"etcd": "rancher/mirrored-coreos-etcd:v3.5.3",
"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",
"alpine": "rancher/rke-tools:v0.1.87",
"nginxProxy": "rancher/rke-tools:v0.1.87",
"certDownloader": "rancher/rke-tools:v0.1.87",
"kubernetesServicesSidecar": "rancher/rke-tools:v0.1.87",
"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",
Expand Down Expand Up @@ -10595,10 +10595,10 @@
},
"v1.23.8-rancher1-1": {
"etcd": "rancher/mirrored-coreos-etcd:v3.5.3",
"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",
"alpine": "rancher/rke-tools:v0.1.87",
"nginxProxy": "rancher/rke-tools:v0.1.87",
"certDownloader": "rancher/rke-tools:v0.1.87",
"kubernetesServicesSidecar": "rancher/rke-tools:v0.1.87",
"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",
Expand Down Expand Up @@ -10638,10 +10638,10 @@
},
"v1.24.2-rancher1-1": {
"etcd": "rancher/mirrored-coreos-etcd:v3.5.4",
"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",
"alpine": "rancher/rke-tools:v0.1.87",
"nginxProxy": "rancher/rke-tools:v0.1.87",
"certDownloader": "rancher/rke-tools:v0.1.87",
"kubernetesServicesSidecar": "rancher/rke-tools:v0.1.87",
"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",
Expand Down
40 changes: 20 additions & 20 deletions rke/k8s_rke_system_images.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6618,10 +6618,10 @@ func loadK8sRKESystemImages() map[string]v3.RKESystemImages {
"v1.20.15-rancher2-1": {
Etcd: "rancher/mirrored-coreos-etcd:v3.4.15-rancher1",
Kubernetes: "rancher/hyperkube:v1.20.15-rancher2",
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",
Alpine: "rancher/rke-tools:v0.1.87",
NginxProxy: "rancher/rke-tools:v0.1.87",
CertDownloader: "rancher/rke-tools:v0.1.87",
KubernetesServicesSidecar: "rancher/rke-tools:v0.1.87",
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",
Expand Down Expand Up @@ -7190,10 +7190,10 @@ func loadK8sRKESystemImages() map[string]v3.RKESystemImages {
"v1.21.14-rancher1-1": {
Etcd: "rancher/mirrored-coreos-etcd:v3.4.16-rancher1",
Kubernetes: "rancher/hyperkube:v1.21.14-rancher1",
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",
Alpine: "rancher/rke-tools:v0.1.87",
NginxProxy: "rancher/rke-tools:v0.1.87",
CertDownloader: "rancher/rke-tools:v0.1.87",
KubernetesServicesSidecar: "rancher/rke-tools:v0.1.87",
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",
Expand Down Expand Up @@ -7586,10 +7586,10 @@ func loadK8sRKESystemImages() map[string]v3.RKESystemImages {
"v1.22.11-rancher1-1": {
Etcd: "rancher/mirrored-coreos-etcd:v3.5.3",
Kubernetes: "rancher/hyperkube:v1.22.11-rancher1",
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",
Alpine: "rancher/rke-tools:v0.1.87",
NginxProxy: "rancher/rke-tools:v0.1.87",
CertDownloader: "rancher/rke-tools:v0.1.87",
KubernetesServicesSidecar: "rancher/rke-tools:v0.1.87",
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",
Expand Down Expand Up @@ -7806,10 +7806,10 @@ func loadK8sRKESystemImages() map[string]v3.RKESystemImages {
"v1.23.8-rancher1-1": {
Etcd: "rancher/mirrored-coreos-etcd:v3.5.3",
Kubernetes: "rancher/hyperkube:v1.23.8-rancher1",
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",
Alpine: "rancher/rke-tools:v0.1.87",
NginxProxy: "rancher/rke-tools:v0.1.87",
CertDownloader: "rancher/rke-tools:v0.1.87",
KubernetesServicesSidecar: "rancher/rke-tools:v0.1.87",
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",
Expand Down Expand Up @@ -7849,10 +7849,10 @@ func loadK8sRKESystemImages() map[string]v3.RKESystemImages {
"v1.24.2-rancher1-1": {
Etcd: "rancher/mirrored-coreos-etcd:v3.5.4",
Kubernetes: "rancher/hyperkube:v1.24.2-rancher1",
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",
Alpine: "rancher/rke-tools:v0.1.87",
NginxProxy: "rancher/rke-tools:v0.1.87",
CertDownloader: "rancher/rke-tools:v0.1.87",
KubernetesServicesSidecar: "rancher/rke-tools:v0.1.87",
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",
Expand Down

0 comments on commit ce269b2

Please sign in to comment.