Merge pull request #3315 from vardhaman22/k8s-july-patches

[2.7] vendor k8s july patches kdm data

codegen/codegen.go

@@ -10,7 +10,7 @@ import (
 )
 
 const (
-	defaultURL = "https://releases.rancher.com/kontainer-driver-metadata/release-v2.7/data.json"
+	defaultURL = "https://releases.rancher.com/kontainer-driver-metadata/dev-v2.7-2023-07-patches/data.json"
 	dataFile   = "data/data.json"
 )
 

data/data.json

@@ -11577,6 +11577,49 @@
    "aciGbpServerContainer": "noiro/gbp-server:5.2.7.1.81c2369",
    "aciOpflexServerContainer": "noiro/opflex-server:5.2.7.1.81c2369"
   },
+  "v1.24.16-rancher1-1": {
+   "etcd": "rancher/mirrored-coreos-etcd:v3.5.4",
+   "alpine": "rancher/rke-tools:v0.1.88",
+   "nginxProxy": "rancher/rke-tools:v0.1.88",
+   "certDownloader": "rancher/rke-tools:v0.1.88",
+   "kubernetesServicesSidecar": "rancher/rke-tools:v0.1.88",
+   "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",
+   "kubednsAutoscaler": "rancher/mirrored-cluster-proportional-autoscaler:1.8.5",
+   "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",
+   "kubernetes": "rancher/hyperkube:v1.24.16-rancher1",
+   "flannel": "rancher/mirrored-coreos-flannel:v0.15.1",
+   "flannelCni": "rancher/flannel-cni:v0.3.0-rancher6",
+   "calicoNode": "rancher/mirrored-calico-node:v3.22.5",
+   "calicoCni": "rancher/calico-cni:v3.22.5-rancher1",
+   "calicoControllers": "rancher/mirrored-calico-kube-controllers:v3.22.5",
+   "calicoCtl": "rancher/mirrored-calico-ctl:v3.22.5",
+   "calicoFlexVol": "rancher/mirrored-calico-pod2daemon-flexvol:v3.22.5",
+   "canalNode": "rancher/mirrored-calico-node:v3.22.5",
+   "canalCni": "rancher/calico-cni:v3.22.5-rancher1",
+   "canalControllers": "rancher/mirrored-calico-kube-controllers:v3.22.5",
+   "canalFlannel": "rancher/mirrored-flannelcni-flannel:v0.17.0",
+   "canalFlexVol": "rancher/mirrored-calico-pod2daemon-flexvol:v3.22.5",
+   "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.5.1-rancher2",
+   "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.6.2",
+   "windowsPodInfraContainer": "rancher/mirrored-pause:3.7",
+   "aciCniDeployContainer": "noiro/cnideploy:5.2.7.1.81c2369",
+   "aciHostContainer": "noiro/aci-containers-host:5.2.7.1.81c2369",
+   "aciOpflexContainer": "noiro/opflex:5.2.7.1.81c2369",
+   "aciMcastContainer": "noiro/opflex:5.2.7.1.81c2369",
+   "aciOvsContainer": "noiro/openvswitch:5.2.7.1.81c2369",
+   "aciControllerContainer": "noiro/aci-containers-controller:5.2.7.1.81c2369",
+   "aciGbpServerContainer": "noiro/gbp-server:5.2.7.1.81c2369",
+   "aciOpflexServerContainer": "noiro/opflex-server:5.2.7.1.81c2369"
+  },
   "v1.24.2-rancher1-1": {
    "etcd": "rancher/mirrored-coreos-etcd:v3.5.4",
    "alpine": "rancher/rke-tools:v0.1.87",
@@ -11835,6 +11878,49 @@
    "aciGbpServerContainer": "noiro/gbp-server:5.2.7.1.81c2369",
    "aciOpflexServerContainer": "noiro/opflex-server:5.2.7.1.81c2369"
   },
+  "v1.25.12-rancher1-1": {
+   "etcd": "rancher/mirrored-coreos-etcd:v3.5.6",
+   "alpine": "rancher/rke-tools:v0.1.88",
+   "nginxProxy": "rancher/rke-tools:v0.1.88",
+   "certDownloader": "rancher/rke-tools:v0.1.88",
+   "kubernetesServicesSidecar": "rancher/rke-tools:v0.1.88",
+   "kubedns": "rancher/mirrored-k8s-dns-kube-dns:1.22.8",
+   "dnsmasq": "rancher/mirrored-k8s-dns-dnsmasq-nanny:1.22.8",
+   "kubednsSidecar": "rancher/mirrored-k8s-dns-sidecar:1.22.8",
+   "kubednsAutoscaler": "rancher/mirrored-cluster-proportional-autoscaler:1.8.6",
+   "coredns": "rancher/mirrored-coredns-coredns:1.9.4",
+   "corednsAutoscaler": "rancher/mirrored-cluster-proportional-autoscaler:1.8.6",
+   "nodelocal": "rancher/mirrored-k8s-dns-node-cache:1.22.10",
+   "kubernetes": "rancher/hyperkube:v1.25.12-rancher1",
+   "flannel": "rancher/mirrored-flannelcni-flannel:v0.19.2",
+   "flannelCni": "rancher/flannel-cni:v0.3.0-rancher7",
+   "calicoNode": "rancher/mirrored-calico-node:v3.24.1",
+   "calicoCni": "rancher/calico-cni:v3.24.1-rancher1",
+   "calicoControllers": "rancher/mirrored-calico-kube-controllers:v3.24.1",
+   "calicoCtl": "rancher/mirrored-calico-ctl:v3.24.1",
+   "calicoFlexVol": "rancher/mirrored-calico-pod2daemon-flexvol:v3.24.1",
+   "canalNode": "rancher/mirrored-calico-node:v3.24.1",
+   "canalCni": "rancher/calico-cni:v3.24.1-rancher1",
+   "canalControllers": "rancher/mirrored-calico-kube-controllers:v3.24.1",
+   "canalFlannel": "rancher/mirrored-flannelcni-flannel:v0.19.2",
+   "canalFlexVol": "rancher/mirrored-calico-pod2daemon-flexvol:v3.24.1",
+   "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.5.1-rancher2",
+   "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.6.2",
+   "windowsPodInfraContainer": "rancher/mirrored-pause:3.7",
+   "aciCniDeployContainer": "noiro/cnideploy:5.2.7.1.81c2369",
+   "aciHostContainer": "noiro/aci-containers-host:5.2.7.1.81c2369",
+   "aciOpflexContainer": "noiro/opflex:5.2.7.1.81c2369",
+   "aciMcastContainer": "noiro/opflex:5.2.7.1.81c2369",
+   "aciOvsContainer": "noiro/openvswitch:5.2.7.1.81c2369",
+   "aciControllerContainer": "noiro/aci-containers-controller:5.2.7.1.81c2369",
+   "aciGbpServerContainer": "noiro/gbp-server:5.2.7.1.81c2369",
+   "aciOpflexServerContainer": "noiro/opflex-server:5.2.7.1.81c2369"
+  },
   "v1.25.6-rancher2-1": {
    "etcd": "rancher/mirrored-coreos-etcd:v3.5.6",
    "alpine": "rancher/rke-tools:v0.1.87",
@@ -12093,6 +12179,49 @@
    "aciGbpServerContainer": "noiro/gbp-server:5.2.7.1.81c2369",
    "aciOpflexServerContainer": "noiro/opflex-server:5.2.7.1.81c2369"
   },
+  "v1.26.7-rancher1-1": {
+   "etcd": "rancher/mirrored-coreos-etcd:v3.5.6",
+   "alpine": "rancher/rke-tools:v0.1.89",
+   "nginxProxy": "rancher/rke-tools:v0.1.89",
+   "certDownloader": "rancher/rke-tools:v0.1.89",
+   "kubernetesServicesSidecar": "rancher/rke-tools:v0.1.89",
+   "kubedns": "rancher/mirrored-k8s-dns-kube-dns:1.22.20",
+   "dnsmasq": "rancher/mirrored-k8s-dns-dnsmasq-nanny:1.22.20",
+   "kubednsSidecar": "rancher/mirrored-k8s-dns-sidecar:1.22.20",
+   "kubednsAutoscaler": "rancher/mirrored-cluster-proportional-autoscaler:1.8.6",
+   "coredns": "rancher/mirrored-coredns-coredns:1.9.4",
+   "corednsAutoscaler": "rancher/mirrored-cluster-proportional-autoscaler:1.8.6",
+   "nodelocal": "rancher/mirrored-k8s-dns-node-cache:1.22.20",
+   "kubernetes": "rancher/hyperkube:v1.26.7-rancher1",
+   "flannel": "rancher/mirrored-flannel-flannel:v0.21.4",
+   "flannelCni": "rancher/flannel-cni:v0.3.0-rancher8",
+   "calicoNode": "rancher/mirrored-calico-node:v3.25.0",
+   "calicoCni": "rancher/calico-cni:v3.25.0-rancher1",
+   "calicoControllers": "rancher/mirrored-calico-kube-controllers:v3.25.0",
+   "calicoCtl": "rancher/mirrored-calico-ctl:v3.25.0",
+   "calicoFlexVol": "rancher/mirrored-calico-pod2daemon-flexvol:v3.25.0",
+   "canalNode": "rancher/mirrored-calico-node:v3.25.0",
+   "canalCni": "rancher/calico-cni:v3.25.0-rancher1",
+   "canalControllers": "rancher/mirrored-calico-kube-controllers:v3.25.0",
+   "canalFlannel": "rancher/mirrored-flannel-flannel:v0.21.4",
+   "canalFlexVol": "rancher/mirrored-calico-pod2daemon-flexvol:v3.25.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.7.0-rancher1",
+   "ingressBackend": "rancher/mirrored-nginx-ingress-controller-defaultbackend:1.5-rancher1",
+   "ingressWebhook": "rancher/mirrored-ingress-nginx-kube-webhook-certgen:v20230312-helm-chart-4.5.2-28-g66a760794",
+   "metricsServer": "rancher/mirrored-metrics-server:v0.6.3",
+   "windowsPodInfraContainer": "rancher/mirrored-pause:3.7",
+   "aciCniDeployContainer": "noiro/cnideploy:5.2.7.1.81c2369",
+   "aciHostContainer": "noiro/aci-containers-host:5.2.7.1.81c2369",
+   "aciOpflexContainer": "noiro/opflex:5.2.7.1.81c2369",
+   "aciMcastContainer": "noiro/opflex:5.2.7.1.81c2369",
+   "aciOvsContainer": "noiro/openvswitch:5.2.7.1.81c2369",
+   "aciControllerContainer": "noiro/aci-containers-controller:5.2.7.1.81c2369",
+   "aciGbpServerContainer": "noiro/gbp-server:5.2.7.1.81c2369",
+   "aciOpflexServerContainer": "noiro/opflex-server:5.2.7.1.81c2369"
+  },
   "v1.8.11-rancher2-1": {
    "etcd": "rancher/coreos-etcd:v3.0.17",
    "alpine": "rancher/rke-tools:v0.1.8",
@@ -13009,7 +13138,7 @@
  },
  "RKEDefaultK8sVersions": {
   "0.3": "v1.16.3-rancher1-1",
-  "default": "v1.26.6-rancher1-1"
+  "default": "v1.26.7-rancher1-1"
  },
  "K8sVersionDockerInfo": {
   "1.10": [