Merge pull request #3018 from jakefhyde/update-kdm

Update kdm
rancher · Aug 17, 2022 · ed1ab31 · ed1ab31
2 parents 18c4cfb + f8c470e
commit ed1ab31
Show file tree

Hide file tree

Showing 3 changed files with 57 additions and 5 deletions.
diff --git a/codegen/codegen.go b/codegen/codegen.go
@@ -10,7 +10,7 @@ import (
 )
 
 const (
-	defaultURL = "https://releases.rancher.com/kontainer-driver-metadata/dev-v2.6/data.json"
+	defaultURL = "https://releases.rancher.com/kontainer-driver-metadata/release-v2.6/data.json"
 	dataFile   = "data/data.json"
 )
 

diff --git a/data/bindata.go b/data/bindata.go
diff --git a/data/data.json b/data/data.json
@@ -9223,6 +9223,49 @@
    "aciOpflexServerContainer": "noiro/opflex-server:5.1.1.0.1ae238a"
   },
   "v1.20.15-rancher2-1": {
+   "etcd": "rancher/mirrored-coreos-etcd:v3.4.15-rancher1",
+   "alpine": "rancher/rke-tools:v0.1.80",
+   "nginxProxy": "rancher/rke-tools:v0.1.80",
+   "certDownloader": "rancher/rke-tools:v0.1.80",
+   "kubernetesServicesSidecar": "rancher/rke-tools:v0.1.80",
+   "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",
+   "kubednsAutoscaler": "rancher/mirrored-cluster-proportional-autoscaler:1.8.1",
+   "coredns": "rancher/mirrored-coredns-coredns:1.8.0",
+   "corednsAutoscaler": "rancher/mirrored-cluster-proportional-autoscaler:1.8.1",
+   "nodelocal": "rancher/mirrored-k8s-dns-node-cache:1.15.13",
+   "kubernetes": "rancher/hyperkube:v1.20.15-rancher2",
+   "flannel": "rancher/mirrored-coreos-flannel:v0.15.1",
+   "flannelCni": "rancher/flannel-cni:v0.3.0-rancher6",
+   "calicoNode": "rancher/mirrored-calico-node:v3.17.2",
+   "calicoCni": "rancher/mirrored-calico-cni:v3.17.2",
+   "calicoControllers": "rancher/mirrored-calico-kube-controllers:v3.17.2",
+   "calicoCtl": "rancher/mirrored-calico-ctl:v3.17.2",
+   "calicoFlexVol": "rancher/mirrored-calico-pod2daemon-flexvol:v3.17.2",
+   "canalNode": "rancher/mirrored-calico-node:v3.17.2",
+   "canalCni": "rancher/mirrored-calico-cni:v3.17.2",
+   "canalControllers": "rancher/mirrored-calico-kube-controllers:v3.17.2",
+   "canalFlannel": "rancher/mirrored-coreos-flannel:v0.15.1",
+   "canalFlexVol": "rancher/mirrored-calico-pod2daemon-flexvol:v3.17.2",
+   "weaveNode": "weaveworks/weave-kube:2.8.1",
+   "weaveCni": "weaveworks/weave-npc:2.8.1",
+   "podInfraContainer": "rancher/mirrored-pause:3.6",
+   "ingress": "rancher/nginx-ingress-controller:nginx-1.2.1-rancher1",
+   "ingressBackend": "rancher/mirrored-nginx-ingress-controller-defaultbackend:1.5-rancher1",
+   "ingressWebhook": "rancher/mirrored-ingress-nginx-kube-webhook-certgen:v1.1.1",
+   "metricsServer": "rancher/mirrored-metrics-server:v0.5.0",
+   "windowsPodInfraContainer": "rancher/mirrored-pause:3.6",
+   "aciCniDeployContainer": "noiro/cnideploy:5.1.1.0.1ae238a",
+   "aciHostContainer": "noiro/aci-containers-host:5.1.1.0.1ae238a",
+   "aciOpflexContainer": "noiro/opflex:5.1.1.0.1ae238a",
+   "aciMcastContainer": "noiro/opflex:5.1.1.0.1ae238a",
+   "aciOvsContainer": "noiro/openvswitch:5.1.1.0.1ae238a",
+   "aciControllerContainer": "noiro/aci-containers-controller:5.1.1.0.1ae238a",
+   "aciGbpServerContainer": "noiro/gbp-server:5.1.1.0.1ae238a",
+   "aciOpflexServerContainer": "noiro/opflex-server:5.1.1.0.1ae238a"
+  },
+  "v1.20.15-rancher2-2": {
    "etcd": "rancher/mirrored-coreos-etcd:v3.4.15-rancher1",
    "alpine": "rancher/rke-tools:v0.1.87",
    "nginxProxy": "rancher/rke-tools:v0.1.87",
@@ -10783,8 +10826,8 @@
  },
  "K8sVersionedTemplates": {
   "aci": {
-   "\u003e=1.17.0-alpha \u003c1.20.15-rancher2-1": "aci-v5.0.0",
-   "\u003e=1.20.15-rancher2-1 \u003c1.21.0-rancher0": "aci-v5.2.3",
+   "\u003e=1.17.0-alpha \u003c1.20.15-rancher2-2": "aci-v5.0.0",
+   "\u003e=1.20.15-rancher2-2 \u003c1.21.0-rancher0": "aci-v5.2.3",
    "\u003e=1.21.0-rancher0 \u003c1.21.14-rancher1-1": "aci-v5.0.0",
    "\u003e=1.21.14-rancher1-1 \u003c1.22.0-rancher0": "aci-v5.2.3",
    "\u003e=1.22.0-rancher0 \u003c1.22.11-rancher1-1": "aci-v5.0.0",
@@ -11376,6 +11419,10 @@
    "minRKEVersion": "1.2.14-rc0",
    "minRancherVersion": "2.5.11-rc0"
   },
+  "v1.20.15-rancher2-2": {
+   "minRKEVersion": "1.2.14-rc0",
+   "minRancherVersion": "2.5.11-rc0"
+  },
   "v1.20.9-rancher1-1": {
    "minRKEVersion": "1.2.0-rc0",
    "minRancherVersion": "2.5.6-rc0"
@@ -11388,6 +11435,10 @@
    "minRKEVersion": "1.3.3-rc0",
    "minRancherVersion": "2.6.3-patch0"
   },
+  "v1.22.11-rancher1-1": {
+   "minRKEVersion": "1.3.3-rc0",
+   "minRancherVersion": "2.6.3-patch0"
+  },
   "v1.22.4-rancher1-1": {
    "minRKEVersion": "1.3.3-rc0",
    "minRancherVersion": "2.6.3-patch0"
@@ -11473,6 +11524,7 @@
   "2.6.3": "v1.21.x",
   "2.6.3-patch1": "v1.21.x",
   "2.6.3-patch2": "v1.21.x",
+  "2.6.3-patch3": "v1.21.x",
   "2.6.4": "v1.22.x",
   "2.6.5": "v1.23.x",
   "2.6.6": "v1.23.x",