From b1302863b5eace53795a15156c9ace9cc8fbac6d Mon Sep 17 00:00:00 2001 From: Brooks Newberry Date: Thu, 18 Apr 2024 13:52:12 -0700 Subject: [PATCH 1/2] v1.27.13+rke2r1 Signed-off-by: Brooks Newberry --- channels-rke2.yaml | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/channels-rke2.yaml b/channels-rke2.yaml index 25af1586c..221e3a5da 100644 --- a/channels-rke2.yaml +++ b/channels-rke2.yaml @@ -1870,3 +1870,44 @@ releases: repo: rancher-rke2-charts version: v4.0.2-build2024020802 featureVersions: *featureVersions-v1 + - version: v1.27.13+rke2r1 + minChannelServerVersion: v2.7.11-alpha1 + maxChannelServerVersion: v2.8.99 + serverArgs: &serverArgs-v1-27-13-rke2r1 + <<: *serverArgs-v1-27-11-rke2r1 + datastore-endpoint: + type: string + datastore-cafile: + type: string + datastore-certfile: + type: string + datastore-keyfile: + type: string + agentArgs: *agentArgs-v1-25-15-rke2r2 + charts: &charts-v1-27-13-rke2r1 + <<: *charts-v1-27-12-rke2r1 + rke2-flannel: + repo: rancher-rke2-charts + version: v0.25.102 + rke2-canal: + repo: rancher-rke2-charts + version: v3.27.3-build2024042301 + rke2-ingress-nginx: + repo: rancher-rke2-charts + version: 4.9.100 + rke2-calico: + repo: rancher-rke2-charts + version: v3.27.300 + rke2-cilium: + repo: rancher-rke2-charts + version: 1.15.400 + harvester-cloud-provider: + repo: rancher-rke2-charts + version: 0.2.300 + rancher-vsphere-csi: + repo: rancher-rke2-charts + version: 3.1.2-rancher400 + rke2-metrics-server: + repo: rancher-rke2-charts + version: 3.12.002 + featureVersions: *featureVersions-v1 From 2a55abaa9b1702a5f4f7bcec086c544654725a8f Mon Sep 17 00:00:00 2001 From: Brooks Newberry Date: Thu, 18 Apr 2024 13:52:22 -0700 Subject: [PATCH 2/2] go generate --- data/data.json | 285 +++++++++++++++++++++++++++++++++++++++++++++++++ regsync.yaml | 43 ++++++++ 2 files changed, 328 insertions(+) diff --git a/data/data.json b/data/data.json index 05e023dc8..becce1d4f 100644 --- a/data/data.json +++ b/data/data.json @@ -43406,6 +43406,291 @@ } }, "version": "v1.27.12+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.400" + }, + "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.13+rke2r1" } ] } diff --git a/regsync.yaml b/regsync.yaml index b15ab099b..92166216f 100644 --- a/regsync.yaml +++ b/regsync.yaml @@ -29,6 +29,12 @@ sync: - v0.3.0-rancher6 - v0.3.0-rancher7 - v0.3.0-rancher8 + - source: docker.io/rancher/hardened-addon-resizer + target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/hardened-addon-resizer' + type: repository + tags: + allow: + - 1.8.20-build20240410 - source: docker.io/rancher/hardened-calico target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/hardened-calico' type: repository @@ -44,6 +50,7 @@ sync: - v3.26.3-build20231109 - v3.27.0-build20240206 - v3.27.2-build20240308 + - v3.27.3-build20240423 - source: docker.io/rancher/hardened-cluster-autoscaler target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/hardened-cluster-autoscaler' type: repository @@ -65,6 +72,7 @@ sync: - v1.2.0-build20230523 - v1.2.0-build20231009 - v1.4.0-build20240122 + - v1.4.1-build20240325 - source: docker.io/rancher/hardened-coredns target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/hardened-coredns' type: repository @@ -97,6 +105,7 @@ sync: - v3.5.4-k3s1-build20221011 - v3.5.7-k3s1-build20230406 - v3.5.9-k3s1-build20230802 + - v3.5.9-k3s1-build20240418 - source: docker.io/rancher/hardened-flannel target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/hardened-flannel' type: repository @@ -113,6 +122,7 @@ sync: - v0.23.0-build20231109 - v0.24.2-build20240122 - v0.24.3-build20240307 + - v0.25.1-build20240423 - source: docker.io/rancher/hardened-ib-sriov-cni target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/hardened-ib-sriov-cni' type: repository @@ -133,6 +143,7 @@ sync: - v0.6.3-build20230515 - v0.6.3-build20230607 - v0.6.3-build20231009 + - v0.7.1-build20240401 - source: docker.io/rancher/hardened-kubernetes target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/hardened-kubernetes' type: repository @@ -175,6 +186,7 @@ sync: - v1.27.10-rke2r1-build20240117 - v1.27.11-rke2r1-build20240214 - v1.27.12-rke2r1-build20240315 + - v1.27.13-rke2r1-build20240416 - v1.27.5-rke2r1-build20230824 - v1.27.7-rke2r2-build20231102 - v1.27.8-rke2r1-build20231115 @@ -265,6 +277,7 @@ sync: - v0.1.4 - v0.1.5 - v0.2.0 + - v0.2.1 - source: docker.io/rancher/harvester-csi-driver target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/harvester-csi-driver' type: repository @@ -436,6 +449,7 @@ sync: - v3.26.3 - v3.27.0 - v3.27.2 + - v3.27.3 - source: docker.io/rancher/mirrored-calico-cni target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/mirrored-calico-cni' type: repository @@ -450,12 +464,14 @@ sync: - v3.26.3 - v3.27.0 - v3.27.2 + - v3.27.3 - source: docker.io/rancher/mirrored-calico-csi target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/mirrored-calico-csi' type: repository tags: allow: - v3.27.2 + - v3.27.3 - source: docker.io/rancher/mirrored-calico-ctl target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/mirrored-calico-ctl' type: repository @@ -471,6 +487,7 @@ sync: - v3.26.3 - v3.27.0 - v3.27.2 + - v3.27.3 - source: docker.io/rancher/mirrored-calico-kube-controllers target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/mirrored-calico-kube-controllers' type: repository @@ -486,6 +503,7 @@ sync: - v3.26.3 - v3.27.0 - v3.27.2 + - v3.27.3 - source: docker.io/rancher/mirrored-calico-node target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/mirrored-calico-node' type: repository @@ -501,12 +519,14 @@ sync: - v3.26.3 - v3.27.0 - v3.27.2 + - v3.27.3 - source: docker.io/rancher/mirrored-calico-node-driver-registrar target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/mirrored-calico-node-driver-registrar' type: repository tags: allow: - v3.27.2 + - v3.27.3 - source: docker.io/rancher/mirrored-calico-operator target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/mirrored-calico-operator' type: repository @@ -520,6 +540,7 @@ sync: - v1.30.7 - v1.32.3 - v1.32.5 + - v1.32.7 - source: docker.io/rancher/mirrored-calico-pod2daemon-flexvol target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/mirrored-calico-pod2daemon-flexvol' type: repository @@ -535,6 +556,7 @@ sync: - v3.26.3 - v3.27.0 - v3.27.2 + - v3.27.3 - source: docker.io/rancher/mirrored-calico-typha target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/mirrored-calico-typha' type: repository @@ -548,11 +570,13 @@ sync: - v3.26.3 - v3.27.0 - v3.27.2 + - v3.27.3 - source: docker.io/rancher/mirrored-cilium-certgen target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/mirrored-cilium-certgen' type: repository tags: allow: + - v0.1.11 - v0.1.8 - v0.1.9 - source: docker.io/rancher/mirrored-cilium-cilium @@ -571,6 +595,7 @@ sync: - v1.14.2 - v1.14.4 - v1.15.1 + - v1.15.4 - source: docker.io/rancher/mirrored-cilium-cilium-envoy target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/mirrored-cilium-cilium-envoy' type: repository @@ -580,6 +605,7 @@ sync: - v1.25.9-f039e2bd380b7eef2f2feea5750676bb36133699 - v1.26.6-ff0d5d3f77d610040e93c7c7a430d61a0c0b90c1 - v1.27.3-713b673cccf1af661efd75ca20532336517ddcb9 + - v1.27.4-21905253931655328edaacf3cd16aeda73bbea2f - source: docker.io/rancher/mirrored-cilium-cilium-etcd-operator target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/mirrored-cilium-cilium-etcd-operator' type: repository @@ -599,6 +625,7 @@ sync: - v1.14.2 - v1.14.4 - v1.15.1 + - v1.15.4 - source: docker.io/rancher/mirrored-cilium-hubble-relay target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/mirrored-cilium-hubble-relay' type: repository @@ -612,6 +639,7 @@ sync: - v1.14.2 - v1.14.4 - v1.15.1 + - v1.15.4 - source: docker.io/rancher/mirrored-cilium-hubble-ui target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/mirrored-cilium-hubble-ui' type: repository @@ -658,6 +686,7 @@ sync: - v1.14.2 - v1.14.4 - v1.15.1 + - v1.15.4 - source: docker.io/rancher/mirrored-cilium-operator-azure target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/mirrored-cilium-operator-azure' type: repository @@ -674,6 +703,7 @@ sync: - v1.14.2 - v1.14.4 - v1.15.1 + - v1.15.4 - source: docker.io/rancher/mirrored-cilium-operator-generic target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/mirrored-cilium-operator-generic' type: repository @@ -690,6 +720,7 @@ sync: - v1.14.2 - v1.14.4 - v1.15.1 + - v1.15.4 - source: docker.io/rancher/mirrored-cilium-startup-script target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/mirrored-cilium-startup-script' type: repository @@ -936,6 +967,12 @@ sync: - v1.4.0 - v1.7.0 - v1.8.0 + - source: docker.io/rancher/mirrored-sig-storage-csi-snapshotter + target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/mirrored-sig-storage-csi-snapshotter' + type: repository + tags: + allow: + - v6.2.1 - source: docker.io/rancher/mirrored-sig-storage-livenessprobe target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/mirrored-sig-storage-livenessprobe' type: repository @@ -976,6 +1013,7 @@ sync: - nginx-1.8.1-rancher1 - nginx-1.9.3-hardened1 - nginx-1.9.4-rancher1 + - nginx-1.9.6-hardened1 - source: docker.io/rancher/pause target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/pause' type: repository @@ -1006,6 +1044,7 @@ sync: - v1.26.3-build20230406 - v1.26.3-build20230608 - v1.28.2-build20231016 + - v1.29.3-build20240412 - source: docker.io/rancher/rke2-runtime target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/rke2-runtime' type: repository @@ -1085,6 +1124,8 @@ sync: - v1.27.11-rke2r1-windows-amd64 - v1.27.12-rke2r1 - v1.27.12-rke2r1-windows-amd64 + - v1.27.13-rke2r1 + - v1.27.13-rke2r1-windows-amd64 - v1.27.5-rke2r1 - v1.27.5-rke2r1-windows-amd64 - v1.27.7-rke2r2 @@ -1133,6 +1174,7 @@ sync: - v1.27.10-rke2r1 - v1.27.11-rke2r1 - v1.27.12-rke2r1 + - v1.27.13-rke2r1 - v1.27.5-rke2r1 - v1.27.7-rke2r2 - v1.27.8-rke2r1 @@ -1223,6 +1265,7 @@ sync: - v1.27.10-rke2r1 - v1.27.11-rke2r1 - v1.27.12-rke2r1 + - v1.27.13-rke2r1 - v1.27.5-rke2r1 - v1.27.7-rke2r2 - v1.27.8-rke2r1