From 72be47c1c874ecc5f3d777f05e15a93f0873d63e Mon Sep 17 00:00:00 2001 From: Rafael Breno <32229014+rafaelbreno@users.noreply.github.com> Date: Thu, 16 Jan 2025 18:36:44 -0300 Subject: [PATCH 1/3] Update channels.yaml --- channels.yaml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/channels.yaml b/channels.yaml index 52df479d7..0236d6016 100644 --- a/channels.yaml +++ b/channels.yaml @@ -716,6 +716,12 @@ releases: node-external-dns: type: array featureVersions: *featureVersions-v1 + - version: v1.29.13-rc2+k3s1 + minChannelServerVersion: v2.9.0-alpha1 + maxChannelServerVersion: v2.10.99 + serverArgs: *serverArgs-v9 + agentArgs: *agentArgs-v7 + featureVersions: *featureVersions-v1 - version: v1.30.1+k3s1 minChannelServerVersion: v2.9.0-alpha1 maxChannelServerVersion: v2.9.99 @@ -764,6 +770,12 @@ releases: serverArgs: *serverArgs-v9 agentArgs: *agentArgs-v7 featureVersions: *featureVersions-v1 + - version: v1.30.9-rc1+k3s1 + minChannelServerVersion: v2.9.0-alpha1 + maxChannelServerVersion: v2.10.99 + serverArgs: *serverArgs-v9 + agentArgs: *agentArgs-v7 + featureVersions: *featureVersions-v1 - version: v1.31.1+k3s1 minChannelServerVersion: v2.9.0-alpha1 maxChannelServerVersion: v2.10.99 @@ -788,3 +800,9 @@ releases: serverArgs: *serverArgs-v9 agentArgs: *agentArgs-v7 featureVersions: *featureVersions-v1 + - version: v1.31.5-rc1+k3s1 + minChannelServerVersion: v2.9.0-alpha1 + maxChannelServerVersion: v2.10.99 + serverArgs: *serverArgs-v9 + agentArgs: *agentArgs-v7 + featureVersions: *featureVersions-v1 From b464e026ab6ccdd40573af887dff2853ef46d279 Mon Sep 17 00:00:00 2001 From: Rafael Breno <32229014+rafaelbreno@users.noreply.github.com> Date: Thu, 16 Jan 2025 20:44:31 -0300 Subject: [PATCH 2/3] go generate --- data/data.json | 630 ++++++++++++++++++++++++++++++++++++++++++++++++- regsync.yaml | 7 + 2 files changed, 628 insertions(+), 9 deletions(-) diff --git a/data/data.json b/data/data.json index bd59d9058..114631eef 100644 --- a/data/data.json +++ b/data/data.json @@ -31868,6 +31868,399 @@ }, { "agentArgs": { + "bind-address": { + "type": "string" + }, + "debug": { + "type": "bool" + }, + "default-runtime": { + "type": "string" + }, + "disable-apiserver-lb": { + "type": "boolean" + }, + "disable-default-registry-endpoint": { + "type": "boolean" + }, + "docker": { + "default": false, + "type": "boolean" + }, + "enable-pprof": { + "type": "boolean" + }, + "flannel-conf": { + "type": "string" + }, + "flannel-iface": { + "type": "string" + }, + "kube-proxy-arg": { + "type": "array" + }, + "kubelet-arg": { + "type": "array" + }, + "node-external-dns": { + "type": "array" + }, + "node-internal-dns": { + "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.10.99", + "minChannelServerVersion": "v2.9.0-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" + }, + "supervisor-metrics": { + "type": "boolean" + }, + "tls-san": { + "type": "array" + }, + "tls-san-security": { + "type": "boolean" + }, + "write-kubeconfig-group": { + "type": "string" + } + }, + "version": "v1.29.13-rc2+k3s1" + }, + { + "agentArgs": { + "debug": { + "type": "bool" + }, + "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.9.99", + "minChannelServerVersion": "v2.9.0-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.30.1+k3s1" + }, + { + "agentArgs": { + "bind-address": { + "type": "string" + }, "debug": { "type": "bool" }, @@ -31884,6 +32277,9 @@ "default": false, "type": "boolean" }, + "enable-pprof": { + "type": "boolean" + }, "flannel-conf": { "type": "string" }, @@ -32043,14 +32439,20 @@ "service-node-port-range": { "type": "string" }, + "supervisor-metrics": { + "type": "boolean" + }, "tls-san": { "type": "array" }, "tls-san-security": { "type": "boolean" + }, + "write-kubeconfig-group": { + "type": "string" } }, - "version": "v1.30.1+k3s1" + "version": "v1.30.2+k3s2" }, { "agentArgs": { @@ -32248,7 +32650,7 @@ "type": "string" } }, - "version": "v1.30.2+k3s2" + "version": "v1.30.3+k3s1" }, { "agentArgs": { @@ -32446,7 +32848,7 @@ "type": "string" } }, - "version": "v1.30.3+k3s1" + "version": "v1.30.4+k3s1" }, { "agentArgs": { @@ -32514,7 +32916,7 @@ "featureVersions": { "encryption-key-rotation": "2.0.0" }, - "maxChannelServerVersion": "v2.9.99", + "maxChannelServerVersion": "v2.10.99", "minChannelServerVersion": "v2.9.0-alpha1", "serverArgs": { "cluster-cidr": { @@ -32644,7 +33046,7 @@ "type": "string" } }, - "version": "v1.30.4+k3s1" + "version": "v1.30.5+k3s1" }, { "agentArgs": { @@ -32842,7 +33244,7 @@ "type": "string" } }, - "version": "v1.30.5+k3s1" + "version": "v1.30.6+k3s1" }, { "agentArgs": { @@ -33040,7 +33442,7 @@ "type": "string" } }, - "version": "v1.30.6+k3s1" + "version": "v1.30.7+k3s1" }, { "agentArgs": { @@ -33078,6 +33480,12 @@ "kubelet-arg": { "type": "array" }, + "node-external-dns": { + "type": "array" + }, + "node-internal-dns": { + "type": "array" + }, "pause-image": { "type": "string" }, @@ -33238,7 +33646,7 @@ "type": "string" } }, - "version": "v1.30.7+k3s1" + "version": "v1.30.8+k3s1" }, { "agentArgs": { @@ -33442,7 +33850,7 @@ "type": "string" } }, - "version": "v1.30.8+k3s1" + "version": "v1.30.9-rc1+k3s1" }, { "agentArgs": { @@ -34241,6 +34649,210 @@ } }, "version": "v1.31.4+k3s1" + }, + { + "agentArgs": { + "bind-address": { + "type": "string" + }, + "debug": { + "type": "bool" + }, + "default-runtime": { + "type": "string" + }, + "disable-apiserver-lb": { + "type": "boolean" + }, + "disable-default-registry-endpoint": { + "type": "boolean" + }, + "docker": { + "default": false, + "type": "boolean" + }, + "enable-pprof": { + "type": "boolean" + }, + "flannel-conf": { + "type": "string" + }, + "flannel-iface": { + "type": "string" + }, + "kube-proxy-arg": { + "type": "array" + }, + "kubelet-arg": { + "type": "array" + }, + "node-external-dns": { + "type": "array" + }, + "node-internal-dns": { + "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.10.99", + "minChannelServerVersion": "v2.9.0-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" + }, + "supervisor-metrics": { + "type": "boolean" + }, + "tls-san": { + "type": "array" + }, + "tls-san-security": { + "type": "boolean" + }, + "write-kubeconfig-group": { + "type": "string" + } + }, + "version": "v1.31.5-rc1+k3s1" } ] }, diff --git a/regsync.yaml b/regsync.yaml index 424ca926f..e21440f88 100644 --- a/regsync.yaml +++ b/regsync.yaml @@ -528,6 +528,7 @@ sync: - v1.29.10-k3s1 - v1.29.11-k3s1 - v1.29.12-k3s1 + - v1.29.13-rc2-k3s1 - v1.29.3-k3s1 - v1.29.4-k3s1 - v1.29.5-k3s1 @@ -543,10 +544,12 @@ sync: - v1.30.6-k3s1 - v1.30.7-k3s1 - v1.30.8-k3s1 + - v1.30.9-rc1-k3s1 - v1.31.1-k3s1 - v1.31.2-k3s1 - v1.31.3-k3s1 - v1.31.4-k3s1 + - v1.31.5-rc1-k3s1 - source: docker.io/rancher/klipper-helm target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/klipper-helm' type: repository @@ -1177,6 +1180,7 @@ sync: - 2.10.5 - 2.10.7 - 2.11.10 + - 2.11.18 - 2.11.8 - 2.6.2 - 2.9.1 @@ -1680,6 +1684,7 @@ sync: - v1.29.10-k3s1 - v1.29.11-k3s1 - v1.29.12-k3s1 + - v1.29.13-rc2-k3s1 - v1.29.3-k3s1 - v1.29.4-k3s1 - v1.29.5-k3s1 @@ -1695,10 +1700,12 @@ sync: - v1.30.6-k3s1 - v1.30.7-k3s1 - v1.30.8-k3s1 + - v1.30.9-rc1-k3s1 - v1.31.1-k3s1 - v1.31.2-k3s1 - v1.31.3-k3s1 - v1.31.4-k3s1 + - v1.31.5-rc1-k3s1 - source: docker.io/rancher/system-agent-installer-rke2 target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/system-agent-installer-rke2' type: repository From e750cd58a0e4b7ab7ffd1619fe908a465264ebd3 Mon Sep 17 00:00:00 2001 From: Rafael Breno <32229014+rafaelbreno@users.noreply.github.com> Date: Mon, 20 Jan 2025 14:13:04 -0300 Subject: [PATCH 3/3] Update Golang image and golangci-lint --- Dockerfile.dapper | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile.dapper b/Dockerfile.dapper index ba38279a8..30b73c0e0 100644 --- a/Dockerfile.dapper +++ b/Dockerfile.dapper @@ -2,7 +2,7 @@ ARG RANCHER_VERSION=v2.10-head FROM rancher/rancher:$RANCHER_VERSION as rancher -FROM registry.suse.com/bci/golang:1.22 +FROM registry.suse.com/bci/golang:1.23 RUN mkdir -p /var/lib/rancher COPY --from=rancher /var/lib/rancher /var/lib/rancher @@ -66,7 +66,7 @@ RUN ln -s /usr/bin/cni /usr/bin/bridge && \ ARG DAPPER_HOST_ARCH ENV ARCH $DAPPER_HOST_ARCH -ENV GOLANGCI_LINT v1.59.0 +ENV GOLANGCI_LINT v1.60.3 RUN zypper -n install git docker vim less file curl wget jq awk && rpm -e --nodeps --noscripts containerd RUN go install golang.org/x/tools/cmd/goimports@latest