diff --git a/channels-rke2.yaml b/channels-rke2.yaml index 221e3a5da..f078e0c46 100644 --- a/channels-rke2.yaml +++ b/channels-rke2.yaml @@ -1911,3 +1911,14 @@ releases: repo: rancher-rke2-charts version: 3.12.002 featureVersions: *featureVersions-v1 + - version: v1.27.14+rke2r1 + minChannelServerVersion: v2.7.11-alpha1 + maxChannelServerVersion: v2.8.99 + serverArgs: *serverArgs-v1-27-13-rke2r1 + agentArgs: *agentArgs-v1-25-15-rke2r2 + charts: &charts-v1-27-14-rke2r1 + <<: *charts-v1-27-13-rke2r1 + rke2-cilium: + repo: rancher-rke2-charts + version: 1.15.500 + featureVersions: *featureVersions-v1 diff --git a/channels.yaml b/channels.yaml index 1a6b0316b..4d6aff978 100644 --- a/channels.yaml +++ b/channels.yaml @@ -561,9 +561,15 @@ releases: - version: v1.27.13+k3s1 minChannelServerVersion: v2.7.11-alpha1 maxChannelServerVersion: v2.7.99 - serverArgs: + serverArgs: &serverArgs-v8 <<: *serverArgs-v7 kine-tls: type: boolean agentArgs: *agentArgs-v5 featureVersions: *featureVersions-v1 + - version: v1.27.14+k3s1 + minChannelServerVersion: v2.7.11-alpha1 + maxChannelServerVersion: v2.7.99 + serverArgs: *serverArgs-v8 + agentArgs: *agentArgs-v5 + featureVersions: *featureVersions-v1 diff --git a/data/data.json b/data/data.json index 1b273238e..c999b4c38 100644 --- a/data/data.json +++ b/data/data.json @@ -13062,6 +13062,47 @@ "aciOvsContainer": "noiro/openvswitch:6.0.4.1.81c2369", "aciControllerContainer": "noiro/aci-containers-controller:6.0.4.1.81c2369" }, + "v1.27.14-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.14-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", @@ -14152,7 +14193,7 @@ }, "RKEDefaultK8sVersions": { "0.3": "v1.16.3-rancher1-1", - "default": "v1.27.13-rancher1-1" + "default": "v1.27.14-rancher1-1" }, "K8sVersionDockerInfo": { "1.10": [ @@ -25841,6 +25882,189 @@ } }, "version": "v1.27.13+k3s1" + }, + { + "agentArgs": { + "default-runtime": { + "type": "string" + }, + "disable-apiserver-lb": { + "type": "boolean" + }, + "disable-default-registry-endpoint": { + "type": "boolean" + }, + "docker": { + "default": false, + "type": "boolean" + }, + "flannel-conf": { + "type": "string" + }, + "flannel-iface": { + "type": "string" + }, + "kube-proxy-arg": { + "type": "array" + }, + "kubelet-arg": { + "type": "array" + }, + "pause-image": { + "type": "string" + }, + "protect-kernel-defaults": { + "default": false, + "type": "boolean" + }, + "resolv-conf": { + "type": "string" + }, + "selinux": { + "default": false, + "type": "boolean" + }, + "snapshotter": { + "type": "string" + }, + "system-default-registry": { + "type": "string" + }, + "vpn-auth": { + "type": "string" + }, + "vpn-auth-file": { + "type": "string" + } + }, + "featureVersions": { + "encryption-key-rotation": "2.0.0" + }, + "maxChannelServerVersion": "v2.7.99", + "minChannelServerVersion": "v2.7.11-alpha1", + "serverArgs": { + "cluster-cidr": { + "type": "string" + }, + "cluster-dns": { + "type": "string" + }, + "cluster-domain": { + "type": "string" + }, + "datastore-cafile": { + "type": "string" + }, + "datastore-certfile": { + "type": "string" + }, + "datastore-endpoint": { + "type": "string" + }, + "datastore-keyfile": { + "type": "string" + }, + "default-local-storage-path": { + "type": "string" + }, + "disable": { + "options": [ + "coredns", + "servicelb", + "traefik", + "local-storage", + "metrics-server" + ], + "type": "array" + }, + "disable-apiserver": { + "default": false, + "type": "boolean" + }, + "disable-cloud-controller": { + "default": false, + "type": "boolean" + }, + "disable-controller-manager": { + "default": false, + "type": "boolean" + }, + "disable-etcd": { + "default": false, + "type": "boolean" + }, + "disable-kube-proxy": { + "default": false, + "type": "boolean" + }, + "disable-network-policy": { + "default": false, + "type": "boolean" + }, + "disable-scheduler": { + "default": false, + "type": "boolean" + }, + "egress-selector-mode": { + "type": "string" + }, + "embedded-registry": { + "type": "boolean" + }, + "etcd-arg": { + "type": "array" + }, + "etcd-expose-metrics": { + "default": false, + "type": "boolean" + }, + "flannel-backend": { + "options": [ + "none", + "vxlan", + "ipsec", + "host-gw", + "wireguard", + "wireguard-native" + ], + "type": "enum" + }, + "helm-job-image": { + "type": "string" + }, + "kine-tls": { + "type": "boolean" + }, + "kube-apiserver-arg": { + "type": "array" + }, + "kube-cloud-controller-manager-arg": { + "type": "array" + }, + "kube-controller-manager-arg": { + "type": "array" + }, + "kube-scheduler-arg": { + "type": "array" + }, + "secrets-encryption": { + "default": false, + "type": "boolean" + }, + "service-cidr": { + "type": "string" + }, + "service-node-port-range": { + "type": "string" + }, + "tls-san": { + "type": "array" + }, + "tls-san-security": { + "type": "boolean" + } + }, + "version": "v1.27.14+k3s1" } ] }, @@ -43874,6 +44098,291 @@ } }, "version": "v1.27.13+rke2r1" + }, + { + "agentArgs": { + "audit-policy-file": { + "type": "string" + }, + "cloud-controller-manager-extra-env": { + "type": "array" + }, + "cloud-controller-manager-extra-mount": { + "type": "array" + }, + "cloud-provider-config": { + "type": "string" + }, + "cloud-provider-name": { + "default": null, + "nullable": true, + "options": [ + "aws", + "azure", + "gcp", + "rancher-vsphere", + "harvester", + "external" + ], + "type": "enum" + }, + "control-plane-resource-limits": { + "type": "string" + }, + "control-plane-resource-requests": { + "type": "string" + }, + "etcd-extra-env": { + "type": "array" + }, + "etcd-extra-mount": { + "type": "array" + }, + "kube-apiserver-extra-env": { + "type": "array" + }, + "kube-apiserver-extra-mount": { + "type": "array" + }, + "kube-controller-manager-extra-env": { + "type": "array" + }, + "kube-controller-manager-extra-mount": { + "type": "array" + }, + "kube-proxy-arg": { + "type": "array" + }, + "kube-proxy-extra-env": { + "type": "array" + }, + "kube-proxy-extra-mount": { + "type": "array" + }, + "kube-scheduler-extra-env": { + "type": "array" + }, + "kube-scheduler-extra-mount": { + "type": "array" + }, + "kubelet-arg": { + "type": "array" + }, + "profile": { + "nullable": true, + "options": [ + "cis", + "cis-1.23" + ], + "type": "enum" + }, + "protect-kernel-defaults": { + "default": false, + "type": "boolean" + }, + "resolv-conf": { + "type": "string" + }, + "selinux": { + "type": "bool" + }, + "system-default-registry": { + "type": "string" + } + }, + "charts": { + "harvester-cloud-provider": { + "repo": "rancher-rke2-charts", + "version": "0.2.300" + }, + "harvester-csi-driver": { + "repo": "rancher-rke2-charts", + "version": "0.1.1700" + }, + "rancher-vsphere-cpi": { + "repo": "rancher-rke2-charts", + "version": "1.7.001" + }, + "rancher-vsphere-csi": { + "repo": "rancher-rke2-charts", + "version": "3.1.2-rancher400" + }, + "rke2-calico": { + "repo": "rancher-rke2-charts", + "version": "v3.27.300" + }, + "rke2-calico-crd": { + "repo": "rancher-rke2-charts", + "version": "v3.27.002" + }, + "rke2-canal": { + "repo": "rancher-rke2-charts", + "version": "v3.27.3-build2024042301" + }, + "rke2-cilium": { + "repo": "rancher-rke2-charts", + "version": "1.15.500" + }, + "rke2-coredns": { + "repo": "rancher-rke2-charts", + "version": "1.29.002" + }, + "rke2-flannel": { + "repo": "rancher-rke2-charts", + "version": "v0.25.102" + }, + "rke2-ingress-nginx": { + "repo": "rancher-rke2-charts", + "version": "4.9.100" + }, + "rke2-metrics-server": { + "repo": "rancher-rke2-charts", + "version": "3.12.002" + }, + "rke2-multus": { + "repo": "rancher-rke2-charts", + "version": "v4.0.2-build2024020802" + }, + "rke2-snapshot-controller": { + "repo": "rancher-rke2-charts", + "version": "1.7.202" + }, + "rke2-snapshot-controller-crd": { + "repo": "rancher-rke2-charts", + "version": "1.7.202" + }, + "rke2-snapshot-validation-webhook": { + "repo": "rancher-rke2-charts", + "version": "1.7.302" + } + }, + "featureVersions": { + "encryption-key-rotation": "2.0.0" + }, + "maxChannelServerVersion": "v2.8.99", + "minChannelServerVersion": "v2.7.11-alpha1", + "serverArgs": { + "audit-policy-file": { + "type": "string" + }, + "cluster-cidr": { + "type": "string" + }, + "cluster-dns": { + "type": "string" + }, + "cluster-domain": { + "type": "string" + }, + "cni": { + "default": "calico", + "options": [ + "canal", + "cilium", + "calico", + "flannel", + "multus,canal", + "multus,cilium", + "multus,calico" + ], + "type": "array" + }, + "container-runtime-endpoint": { + "type": "string" + }, + "datastore-cafile": { + "type": "string" + }, + "datastore-certfile": { + "type": "string" + }, + "datastore-endpoint": { + "type": "string" + }, + "datastore-keyfile": { + "type": "string" + }, + "disable": { + "options": [ + "rke2-coredns", + "rke2-ingress-nginx", + "rke2-metrics-server" + ], + "type": "array" + }, + "disable-cloud-controller": { + "type": "bool" + }, + "disable-kube-proxy": { + "default": false, + "type": "boolean" + }, + "disable-scheduler": { + "type": "bool" + }, + "egress-selector-mode": { + "type": "string" + }, + "etcd-arg": { + "type": "array" + }, + "etcd-expose-metrics": { + "default": false, + "type": "boolean" + }, + "etcd-image": { + "type": "string" + }, + "kube-apiserver-arg": { + "type": "array" + }, + "kube-apiserver-image": { + "type": "string" + }, + "kube-cloud-controller-manager-arg": { + "type": "array" + }, + "kube-controller-manager-arg": { + "type": "array" + }, + "kube-controller-manager-image": { + "type": "string" + }, + "kube-proxy-arg": { + "type": "array" + }, + "kube-scheduler-arg": { + "type": "array" + }, + "kube-scheduler-image": { + "type": "string" + }, + "kubelet-path": { + "type": "string" + }, + "pause-image": { + "type": "string" + }, + "runtime-image": { + "type": "string" + }, + "service-cidr": { + "type": "string" + }, + "service-node-port-range": { + "type": "string" + }, + "snapshotter": { + "type": "string" + }, + "tls-san": { + "type": "array" + }, + "tls-san-security": { + "type": "boolean" + } + }, + "version": "v1.27.14+rke2r1" } ] } diff --git a/pkg/rke/k8s_rke_system_images.go b/pkg/rke/k8s_rke_system_images.go index 862597948..fb2c6f876 100644 --- a/pkg/rke/k8s_rke_system_images.go +++ b/pkg/rke/k8s_rke_system_images.go @@ -10268,6 +10268,48 @@ func loadK8sRKESystemImages() map[string]v3.RKESystemImages { WindowsPodInfraContainer: "rancher/mirrored-pause:3.7", Nodelocal: "rancher/mirrored-k8s-dns-node-cache:1.22.28", }, + // Enabled in Rancher v2.7.14 + "v1.27.14-rancher1-1": { + Etcd: "rancher/mirrored-coreos-etcd:v3.5.10", + Kubernetes: "rancher/hyperkube:v1.27.14-rancher1", + 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", + 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", + 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", + AciOpenvSwitchContainer: "noiro/openvswitch:6.0.4.1.81c2369", + AciControllerContainer: "noiro/aci-containers-controller:6.0.4.1.81c2369", + 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", + CoreDNS: "rancher/mirrored-coredns-coredns:1.10.1", + CoreDNSAutoscaler: "rancher/mirrored-cluster-proportional-autoscaler:v1.8.9", + WindowsPodInfraContainer: "rancher/mirrored-pause:3.7", + Nodelocal: "rancher/mirrored-k8s-dns-node-cache:1.22.28", + }, // k8s version from 2.1.x release with old rke-tools to allow upgrade from 2.1.x clusters // without all clusters being restarted "v1.11.9-rancher1-3": { diff --git a/pkg/rke/k8s_version_info.go b/pkg/rke/k8s_version_info.go index 76ea2468e..b1c0f7f82 100644 --- a/pkg/rke/k8s_version_info.go +++ b/pkg/rke/k8s_version_info.go @@ -61,7 +61,7 @@ func loadRKEDefaultK8sVersions() map[string]string { return map[string]string{ "0.3": "v1.16.3-rancher1-1", // rke will use default if its version is absent - "default": "v1.27.13-rancher1-1", + "default": "v1.27.14-rancher1-1", } } diff --git a/regsync.yaml b/regsync.yaml index 6b51ec112..f8ecd53fa 100644 --- a/regsync.yaml +++ b/regsync.yaml @@ -187,6 +187,7 @@ sync: - v1.27.11-rke2r1-build20240214 - v1.27.12-rke2r1-build20240315 - v1.27.13-rke2r1-build20240416 + - v1.27.14-rke2r1-build20240515 - v1.27.5-rke2r1-build20230824 - v1.27.7-rke2r2-build20231102 - v1.27.8-rke2r1-build20231115 @@ -333,6 +334,7 @@ sync: - v1.27.11-rancher1 - v1.27.12-rancher1 - v1.27.13-rancher1 + - v1.27.14-rancher1 - v1.27.6-rancher1 - v1.27.8-rancher2 - source: docker.io/rancher/k3s-upgrade @@ -378,6 +380,7 @@ sync: - v1.27.11-k3s1 - v1.27.12-k3s1 - v1.27.13-k3s1 + - v1.27.14-k3s1 - v1.27.5-k3s1 - v1.27.7-k3s2 - v1.27.8-k3s2 @@ -578,6 +581,7 @@ sync: tags: allow: - v0.1.11 + - v0.1.12 - v0.1.8 - v0.1.9 - source: docker.io/rancher/mirrored-cilium-cilium @@ -597,6 +601,7 @@ sync: - v1.14.4 - v1.15.1 - v1.15.4 + - v1.15.5 - source: docker.io/rancher/mirrored-cilium-cilium-envoy target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/mirrored-cilium-cilium-envoy' type: repository @@ -607,6 +612,7 @@ sync: - v1.26.6-ff0d5d3f77d610040e93c7c7a430d61a0c0b90c1 - v1.27.3-713b673cccf1af661efd75ca20532336517ddcb9 - v1.27.4-21905253931655328edaacf3cd16aeda73bbea2f + - v1.28.3-31ec52ec5f2e4d28a8e19a0bfb872fa48cf7a515 - source: docker.io/rancher/mirrored-cilium-cilium-etcd-operator target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/mirrored-cilium-cilium-etcd-operator' type: repository @@ -627,6 +633,7 @@ sync: - v1.14.4 - v1.15.1 - v1.15.4 + - v1.15.5 - source: docker.io/rancher/mirrored-cilium-hubble-relay target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/mirrored-cilium-hubble-relay' type: repository @@ -641,6 +648,7 @@ sync: - v1.14.4 - v1.15.1 - v1.15.4 + - v1.15.5 - source: docker.io/rancher/mirrored-cilium-hubble-ui target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/mirrored-cilium-hubble-ui' type: repository @@ -688,6 +696,7 @@ sync: - v1.14.4 - v1.15.1 - v1.15.4 + - v1.15.5 - source: docker.io/rancher/mirrored-cilium-operator-azure target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/mirrored-cilium-operator-azure' type: repository @@ -705,6 +714,7 @@ sync: - v1.14.4 - v1.15.1 - v1.15.4 + - v1.15.5 - source: docker.io/rancher/mirrored-cilium-operator-generic target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/mirrored-cilium-operator-generic' type: repository @@ -722,6 +732,7 @@ sync: - v1.14.4 - v1.15.1 - v1.15.4 + - v1.15.5 - source: docker.io/rancher/mirrored-cilium-startup-script target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/mirrored-cilium-startup-script' type: repository @@ -1128,6 +1139,8 @@ sync: - v1.27.12-rke2r1-windows-amd64 - v1.27.13-rke2r1 - v1.27.13-rke2r1-windows-amd64 + - v1.27.14-rke2r1 + - v1.27.14-rke2r1-windows-amd64 - v1.27.5-rke2r1 - v1.27.5-rke2r1-windows-amd64 - v1.27.7-rke2r2 @@ -1177,6 +1190,7 @@ sync: - v1.27.11-rke2r1 - v1.27.12-rke2r1 - v1.27.13-rke2r1 + - v1.27.14-rke2r1 - v1.27.5-rke2r1 - v1.27.7-rke2r2 - v1.27.8-rke2r1 @@ -1223,6 +1237,7 @@ sync: - v1.27.11-k3s1 - v1.27.12-k3s1 - v1.27.13-k3s1 + - v1.27.14-k3s1 - v1.27.5-k3s1 - v1.27.7-k3s2 - v1.27.8-k3s2 @@ -1269,6 +1284,7 @@ sync: - v1.27.11-rke2r1 - v1.27.12-rke2r1 - v1.27.13-rke2r1 + - v1.27.14-rke2r1 - v1.27.5-rke2r1 - v1.27.7-rke2r2 - v1.27.8-rke2r1