Skip to content

Commit

Permalink
Merge pull request #3621 from krunalhinguu/v2.9-june-patches
Browse files Browse the repository at this point in the history 
[release/v1.6] Vendor June patch KDM data
  • Loading branch information
@krunalhinguu
krunalhinguu authored Jun 27, 2024
2 parents 61e8a5c + 80a31f7 commit 8d11342
Show file tree
Hide file tree
Showing 2 changed files with 113 additions and 27 deletions.
4 changes: 2 additions & 2 deletions data/bindata.go
View file

Large diffs are not rendered by default.

136 changes: 111 additions & 25 deletions data/data.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13286,6 +13286,47 @@
"aciOvsContainer": "noiro/openvswitch:6.0.4.1.81c2369",
"aciControllerContainer": "noiro/aci-containers-controller:6.0.4.1.81c2369"
},
"v1.27.15-rancher1-1": {
"etcd": "rancher/mirrored-coreos-etcd:v3.5.10",
"alpine": "rancher/rke-tools:v0.1.96",
"nginxProxy": "rancher/rke-tools:v0.1.96",
"certDownloader": "rancher/rke-tools:v0.1.96",
"kubernetesServicesSidecar": "rancher/rke-tools:v0.1.96",
"kubedns": "rancher/mirrored-k8s-dns-kube-dns:1.22.28",
"dnsmasq": "rancher/mirrored-k8s-dns-dnsmasq-nanny:1.22.28",
"kubednsSidecar": "rancher/mirrored-k8s-dns-sidecar:1.22.28",
"kubednsAutoscaler": "rancher/mirrored-cluster-proportional-autoscaler:v1.8.9",
"coredns": "rancher/mirrored-coredns-coredns:1.10.1",
"corednsAutoscaler": "rancher/mirrored-cluster-proportional-autoscaler:v1.8.9",
"nodelocal": "rancher/mirrored-k8s-dns-node-cache:1.22.28",
"kubernetes": "rancher/hyperkube:v1.27.15-rancher1",
"flannel": "rancher/mirrored-flannel-flannel:v0.21.4",
"flannelCni": "rancher/flannel-cni:v0.3.0-rancher8",
"calicoNode": "rancher/mirrored-calico-node:v3.26.3",
"calicoCni": "rancher/calico-cni:v3.26.3-rancher1",
"calicoControllers": "rancher/mirrored-calico-kube-controllers:v3.26.3",
"calicoCtl": "rancher/mirrored-calico-ctl:v3.26.3",
"calicoFlexVol": "rancher/mirrored-calico-pod2daemon-flexvol:v3.26.3",
"canalNode": "rancher/mirrored-calico-node:v3.26.3",
"canalCni": "rancher/calico-cni:v3.26.3-rancher1",
"canalControllers": "rancher/mirrored-calico-kube-controllers:v3.26.3",
"canalFlannel": "rancher/mirrored-flannel-flannel:v0.21.4",
"canalFlexVol": "rancher/mirrored-calico-pod2daemon-flexvol:v3.26.3",
"weaveNode": "weaveworks/weave-kube:2.8.1",
"weaveCni": "weaveworks/weave-npc:2.8.1",
"podInfraContainer": "rancher/mirrored-pause:3.7",
"ingress": "rancher/nginx-ingress-controller:nginx-1.9.4-rancher1",
"ingressBackend": "rancher/mirrored-nginx-ingress-controller-defaultbackend:1.5-rancher1",
"ingressWebhook": "rancher/mirrored-ingress-nginx-kube-webhook-certgen:v20231011-8b53cabe0",
"metricsServer": "rancher/mirrored-metrics-server:v0.6.3",
"windowsPodInfraContainer": "rancher/mirrored-pause:3.7",
"aciCniDeployContainer": "noiro/cnideploy:6.0.4.1.81c2369",
"aciHostContainer": "noiro/aci-containers-host:6.0.4.1.81c2369",
"aciOpflexContainer": "noiro/opflex:6.0.4.1.81c2369",
"aciMcastContainer": "noiro/opflex:6.0.4.1.81c2369",
"aciOvsContainer": "noiro/openvswitch:6.0.4.1.81c2369",
"aciControllerContainer": "noiro/aci-containers-controller:6.0.4.1.81c2369"
},
"v1.27.6-rancher1-1": {
"etcd": "rancher/mirrored-coreos-etcd:v3.5.7",
"alpine": "rancher/rke-tools:v0.1.96",
Expand Down Expand Up @@ -13452,6 +13493,47 @@
"aciOvsContainer": "noiro/openvswitch:6.0.4.1.81c2369",
"aciControllerContainer": "noiro/aci-containers-controller:6.0.4.1.81c2369"
},
"v1.28.11-rancher1-1": {
"etcd": "rancher/mirrored-coreos-etcd:v3.5.10",
"alpine": "rancher/rke-tools:v0.1.96",
"nginxProxy": "rancher/rke-tools:v0.1.96",
"certDownloader": "rancher/rke-tools:v0.1.96",
"kubernetesServicesSidecar": "rancher/rke-tools:v0.1.96",
"kubedns": "rancher/mirrored-k8s-dns-kube-dns:1.22.28",
"dnsmasq": "rancher/mirrored-k8s-dns-dnsmasq-nanny:1.22.28",
"kubednsSidecar": "rancher/mirrored-k8s-dns-sidecar:1.22.28",
"kubednsAutoscaler": "rancher/mirrored-cluster-proportional-autoscaler:v1.8.9",
"coredns": "rancher/mirrored-coredns-coredns:1.10.1",
"corednsAutoscaler": "rancher/mirrored-cluster-proportional-autoscaler:v1.8.9",
"nodelocal": "rancher/mirrored-k8s-dns-node-cache:1.22.28",
"kubernetes": "rancher/hyperkube:v1.28.11-rancher1",
"flannel": "rancher/mirrored-flannel-flannel:v0.24.2",
"flannelCni": "rancher/flannel-cni:v0.3.0-rancher9",
"calicoNode": "rancher/mirrored-calico-node:v3.27.0",
"calicoCni": "rancher/calico-cni:v3.27.0-rancher1",
"calicoControllers": "rancher/mirrored-calico-kube-controllers:v3.27.0",
"calicoCtl": "rancher/mirrored-calico-ctl:v3.27.0",
"calicoFlexVol": "rancher/mirrored-calico-pod2daemon-flexvol:v3.27.0",
"canalNode": "rancher/mirrored-calico-node:v3.27.0",
"canalCni": "rancher/calico-cni:v3.27.0-rancher1",
"canalControllers": "rancher/mirrored-calico-kube-controllers:v3.27.0",
"canalFlannel": "rancher/mirrored-flannel-flannel:v0.24.2",
"canalFlexVol": "rancher/mirrored-calico-pod2daemon-flexvol:v3.27.0",
"weaveNode": "weaveworks/weave-kube:2.8.1",
"weaveCni": "weaveworks/weave-npc:2.8.1",
"podInfraContainer": "rancher/mirrored-pause:3.7",
"ingress": "rancher/nginx-ingress-controller:nginx-1.9.6-rancher1",
"ingressBackend": "rancher/mirrored-nginx-ingress-controller-defaultbackend:1.5-rancher1",
"ingressWebhook": "rancher/mirrored-ingress-nginx-kube-webhook-certgen:v20231226-1a7112e06",
"metricsServer": "rancher/mirrored-metrics-server:v0.7.0",
"windowsPodInfraContainer": "rancher/mirrored-pause:3.7",
"aciCniDeployContainer": "noiro/cnideploy:6.0.4.1.81c2369",
"aciHostContainer": "noiro/aci-containers-host:6.0.4.1.81c2369",
"aciOpflexContainer": "noiro/opflex:6.0.4.1.81c2369",
"aciMcastContainer": "noiro/opflex:6.0.4.1.81c2369",
"aciOvsContainer": "noiro/openvswitch:6.0.4.1.81c2369",
"aciControllerContainer": "noiro/aci-containers-controller:6.0.4.1.81c2369"
},
"v1.28.7-rancher1-1": {
"etcd": "rancher/mirrored-coreos-etcd:v3.5.10",
"alpine": "rancher/rke-tools:v0.1.96",
Expand Down Expand Up @@ -13575,7 +13657,7 @@
"aciOvsContainer": "noiro/openvswitch:6.0.4.1.81c2369",
"aciControllerContainer": "noiro/aci-containers-controller:6.0.4.1.81c2369"
},
"v1.29.5-rancher1-1": {
"v1.29.6-rancher1-1": {
"etcd": "rancher/mirrored-coreos-etcd:v3.5.12",
"alpine": "rancher/rke-tools:v0.1.97",
"nginxProxy": "rancher/rke-tools:v0.1.97",
Expand All @@ -13588,7 +13670,7 @@
"coredns": "rancher/mirrored-coredns-coredns:1.11.1",
"corednsAutoscaler": "rancher/mirrored-cluster-proportional-autoscaler:v1.8.9",
"nodelocal": "rancher/mirrored-k8s-dns-node-cache:1.22.28",
"kubernetes": "rancher/hyperkube:v1.29.5-rancher1",
"kubernetes": "rancher/hyperkube:v1.29.6-rancher1",
"flannel": "rancher/mirrored-flannel-flannel:v0.25.1",
"flannelCni": "rancher/flannel-cni:v1.4.1-rancher1",
"calicoNode": "rancher/mirrored-calico-node:v3.27.3",
Expand Down Expand Up @@ -13616,7 +13698,7 @@
"aciOvsContainer": "noiro/openvswitch:6.0.4.1.81c2369",
"aciControllerContainer": "noiro/aci-containers-controller:6.0.4.1.81c2369"
},
"v1.30.1-rancher1-1": {
"v1.30.2-rancher1-1": {
"etcd": "rancher/mirrored-coreos-etcd:v3.5.12",
"alpine": "rancher/rke-tools:v0.1.99",
"nginxProxy": "rancher/rke-tools:v0.1.99",
Expand All @@ -13629,7 +13711,7 @@
"coredns": "rancher/mirrored-coredns-coredns:1.11.1",
"corednsAutoscaler": "rancher/mirrored-cluster-proportional-autoscaler:v1.8.9",
"nodelocal": "rancher/mirrored-k8s-dns-node-cache:1.23.0",
"kubernetes": "rancher/hyperkube:v1.30.1-rancher1",
"kubernetes": "rancher/hyperkube:v1.30.2-rancher1",
"flannel": "rancher/mirrored-flannel-flannel:v0.25.1",
"flannelCni": "rancher/flannel-cni:v1.4.1-rancher1",
"calicoNode": "rancher/mirrored-calico-node:v3.28.0",
Expand Down Expand Up @@ -14570,11 +14652,15 @@
},
"v1.25": {
"minRKEVersion": "1.4.0-rc0",
"minRancherVersion": "2.7.2-patch0"
"maxRKEVersion": "1.5.99",
"minRancherVersion": "2.7.2-patch0",
"maxRancherVersion": "2.8.99"
},
"v1.26": {
"minRKEVersion": "1.4.0-rc0",
"minRancherVersion": "2.7.5-patch0"
"maxRKEVersion": "1.5.99",
"minRancherVersion": "2.7.5-patch0",
"maxRancherVersion": "2.8.99"
},
"v1.27": {
"minRKEVersion": "1.5.0-rc0",
Expand Down Expand Up @@ -14666,7 +14752,7 @@
},
"RKEDefaultK8sVersions": {
"0.3": "v1.16.3-rancher1-1",
"default": "v1.30.1-rancher1-1"
"default": "v1.30.2-rancher1-1"
},
"K8sVersionDockerInfo": {
"1.10": [
Expand Down Expand Up @@ -23291,7 +23377,7 @@
"featureVersions": {
"encryption-key-rotation": "2.0.0"
},
"maxChannelServerVersion": "v2.9.99",
"maxChannelServerVersion": "v2.8.99",
"minChannelServerVersion": "v2.7.2-alpha1",
"serverArgs": {
"cluster-cidr": {
Expand Down Expand Up @@ -23459,7 +23545,7 @@
"featureVersions": {
"encryption-key-rotation": "2.0.0"
},
"maxChannelServerVersion": "v2.9.99",
"maxChannelServerVersion": "v2.8.99",
"minChannelServerVersion": "v2.7.2-alpha1",
"serverArgs": {
"cluster-cidr": {
Expand Down Expand Up @@ -23630,7 +23716,7 @@
"featureVersions": {
"encryption-key-rotation": "2.0.0"
},
"maxChannelServerVersion": "v2.9.99",
"maxChannelServerVersion": "v2.8.99",
"minChannelServerVersion": "v2.7.2-alpha1",
"serverArgs": {
"cluster-cidr": {
Expand Down Expand Up @@ -24281,7 +24367,7 @@
"featureVersions": {
"encryption-key-rotation": "2.0.0"
},
"maxChannelServerVersion": "v2.9.99",
"maxChannelServerVersion": "v2.8.99",
"minChannelServerVersion": "v2.7.5-alpha1",
"serverArgs": {
"cluster-cidr": {
Expand Down Expand Up @@ -24449,7 +24535,7 @@
"featureVersions": {
"encryption-key-rotation": "2.0.0"
},
"maxChannelServerVersion": "v2.9.99",
"maxChannelServerVersion": "v2.8.99",
"minChannelServerVersion": "v2.7.5-alpha1",
"serverArgs": {
"cluster-cidr": {
Expand Down Expand Up @@ -24620,7 +24706,7 @@
"featureVersions": {
"encryption-key-rotation": "2.0.0"
},
"maxChannelServerVersion": "v2.9.99",
"maxChannelServerVersion": "v2.8.99",
"minChannelServerVersion": "v2.7.5-alpha1",
"serverArgs": {
"cluster-cidr": {
Expand Down Expand Up @@ -24797,7 +24883,7 @@
"featureVersions": {
"encryption-key-rotation": "2.0.0"
},
"maxChannelServerVersion": "v2.9.99",
"maxChannelServerVersion": "v2.8.99",
"minChannelServerVersion": "v2.7.5-alpha1",
"serverArgs": {
"cluster-cidr": {
Expand Down Expand Up @@ -24977,7 +25063,7 @@
"featureVersions": {
"encryption-key-rotation": "2.0.0"
},
"maxChannelServerVersion": "v2.9.99",
"maxChannelServerVersion": "v2.8.99",
"minChannelServerVersion": "v2.7.5-alpha1",
"serverArgs": {
"cluster-cidr": {
Expand Down Expand Up @@ -25157,7 +25243,7 @@
"featureVersions": {
"encryption-key-rotation": "2.0.0"
},
"maxChannelServerVersion": "v2.9.99",
"maxChannelServerVersion": "v2.8.99",
"minChannelServerVersion": "v2.7.5-alpha1",
"serverArgs": {
"cluster-cidr": {
Expand Down Expand Up @@ -41081,7 +41167,7 @@
"featureVersions": {
"encryption-key-rotation": "2.0.0"
},
"maxChannelServerVersion": "v2.9.99",
"maxChannelServerVersion": "v2.8.99",
"minChannelServerVersion": "v2.7.2-alpha1",
"serverArgs": {
"audit-policy-file": {
Expand Down Expand Up @@ -41346,7 +41432,7 @@
"featureVersions": {
"encryption-key-rotation": "2.0.0"
},
"maxChannelServerVersion": "v2.9.99",
"maxChannelServerVersion": "v2.8.99",
"minChannelServerVersion": "v2.7.2-alpha1",
"serverArgs": {
"audit-policy-file": {
Expand Down Expand Up @@ -41614,7 +41700,7 @@
"featureVersions": {
"encryption-key-rotation": "2.0.0"
},
"maxChannelServerVersion": "v2.9.99",
"maxChannelServerVersion": "v2.8.99",
"minChannelServerVersion": "v2.7.2-alpha1",
"serverArgs": {
"audit-policy-file": {
Expand Down Expand Up @@ -42664,7 +42750,7 @@
"featureVersions": {
"encryption-key-rotation": "2.0.0"
},
"maxChannelServerVersion": "v2.9.99",
"maxChannelServerVersion": "v2.8.99",
"minChannelServerVersion": "v2.7.5-alpha1",
"serverArgs": {
"audit-policy-file": {
Expand Down Expand Up @@ -42929,7 +43015,7 @@
"featureVersions": {
"encryption-key-rotation": "2.0.0"
},
"maxChannelServerVersion": "v2.9.99",
"maxChannelServerVersion": "v2.8.99",
"minChannelServerVersion": "v2.7.5-alpha1",
"serverArgs": {
"audit-policy-file": {
Expand Down Expand Up @@ -43197,7 +43283,7 @@
"featureVersions": {
"encryption-key-rotation": "2.0.0"
},
"maxChannelServerVersion": "v2.9.99",
"maxChannelServerVersion": "v2.8.99",
"minChannelServerVersion": "v2.7.5-alpha1",
"serverArgs": {
"audit-policy-file": {
Expand Down Expand Up @@ -43465,7 +43551,7 @@
"featureVersions": {
"encryption-key-rotation": "2.0.0"
},
"maxChannelServerVersion": "v2.9.99",
"maxChannelServerVersion": "v2.8.99",
"minChannelServerVersion": "v2.7.5-alpha1",
"serverArgs": {
"audit-policy-file": {
Expand Down Expand Up @@ -43733,7 +43819,7 @@
"featureVersions": {
"encryption-key-rotation": "2.0.0"
},
"maxChannelServerVersion": "v2.9.99",
"maxChannelServerVersion": "v2.8.99",
"minChannelServerVersion": "v2.7.5-alpha1",
"serverArgs": {
"audit-policy-file": {
Expand Down Expand Up @@ -44002,7 +44088,7 @@
"featureVersions": {
"encryption-key-rotation": "2.0.0"
},
"maxChannelServerVersion": "v2.9.99",
"maxChannelServerVersion": "v2.8.99",
"minChannelServerVersion": "v2.7.5-alpha1",
"serverArgs": {
"audit-policy-file": {
Expand Down

0 comments on commit 8d11342

Please sign in to comment.