Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package rke2-1.25 for openSUSE:Factory checked in at 2023-12-05 17:03:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rke2-1.25 (Old) and /work/SRC/openSUSE:Factory/.rke2-1.25.new.25432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rke2-1.25" Tue Dec 5 17:03:25 2023 rev:4 rq:1130892 version:1.25.16+rke2r1 Changes: -------- --- /work/SRC/openSUSE:Factory/rke2-1.25/rke2-1.25.changes 2023-11-09 21:35:47.313750598 +0100 +++ /work/SRC/openSUSE:Factory/.rke2-1.25.new.25432/rke2-1.25.changes 2023-12-05 17:03:36.862028154 +0100 @@ -1,0 +2,9 @@ +Tue Dec 5 06:29:54 UTC 2023 - Johannes Kastl <[email protected]> + +- Update to version 1.25.16+rke2r1: + * This release updates Kubernetes to v1.25.16, and fixes a number + of issues. + * Details see + https://github.com/rancher/rke2/releases/tag/v1.25.16+rke2r1 + +------------------------------------------------------------------- Old: ---- rke2-1.25.15+rke2r2.obscpio New: ---- rke2-1.25.16+rke2r1.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rke2-1.25.spec ++++++ --- /var/tmp/diff_new_pack.8o58me/_old 2023-12-05 17:03:38.750097749 +0100 +++ /var/tmp/diff_new_pack.8o58me/_new 2023-12-05 17:03:38.750097749 +0100 @@ -20,7 +20,7 @@ %define binary_name rke2 Name: rke2-1.25 -Version: 1.25.15+rke2r2 +Version: 1.25.16+rke2r1 Release: 0 Summary: Rancher Kubernetes Engine License: Apache-2.0 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.8o58me/_old 2023-12-05 17:03:38.778098781 +0100 +++ /var/tmp/diff_new_pack.8o58me/_new 2023-12-05 17:03:38.782098929 +0100 @@ -3,7 +3,7 @@ <param name="url">https://github.com/rancher/rke2</param> <param name="scm">git</param> <param name="exclude">.git</param> - <param name="revision">v1.25.15+rke2r2</param> + <param name="revision">v1.25.16+rke2r1</param> <param name="versionformat">@PARENT_TAG@</param> <param name="changesgenerate">disable</param> <param name="versionrewrite-pattern">v(.*)</param> @@ -17,7 +17,7 @@ <param name="compression">gz</param> </service> <service name="go_modules" mode="manual"> - <param name="archive">rke2-1.25.15+rke2r2.obscpio</param> + <param name="archive">rke2-1.25.16+rke2r1.obscpio</param> </service> </services> ++++++ rke2-1.25.15+rke2r2.obscpio -> rke2-1.25.16+rke2r1.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rke2-1.25.15+rke2r2/.drone.yml new/rke2-1.25.16+rke2r1/.drone.yml --- old/rke2-1.25.15+rke2r2/.drone.yml 2023-11-03 21:25:27.000000000 +0100 +++ new/rke2-1.25.16+rke2r1/.drone.yml 2023-11-22 18:15:06.000000000 +0100 @@ -96,7 +96,7 @@ path: /var/run/docker.sock - name: publish-image-runtime - image: rancher/hardened-build-base:v1.20.10b1 + image: rancher/hardened-build-base:v1.20.11b1 commands: - docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD - DRONE_TAG=${DRONE_TAG} make publish-image-runtime @@ -191,7 +191,7 @@ - drone-publish.rancher.io - name: publish-image-runtime - image: rancher/hardened-build-base:v1.20.10b1 + image: rancher/hardened-build-base:v1.20.11b1 commands: - docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD - DRONE_TAG=${DRONE_TAG} make publish-image-runtime diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rke2-1.25.15+rke2r2/Dockerfile new/rke2-1.25.16+rke2r1/Dockerfile --- old/rke2-1.25.15+rke2r2/Dockerfile 2023-11-03 21:25:27.000000000 +0100 +++ new/rke2-1.25.16+rke2r1/Dockerfile 2023-11-22 18:15:06.000000000 +0100 @@ -1,7 +1,7 @@ ARG KUBERNETES_VERSION=dev # Build environment -FROM rancher/hardened-build-base:v1.20.10b1 AS build +FROM rancher/hardened-build-base:v1.20.11b1 AS build ARG DAPPER_HOST_ARCH ENV ARCH $DAPPER_HOST_ARCH RUN set -x \ @@ -18,7 +18,8 @@ py3-pip \ pigz \ tar \ - yq + yq \ + helm RUN if [ "${ARCH}" != "s390x" ]; then \ apk --no-cache add mingw-w64-gcc; \ @@ -117,28 +118,14 @@ ARG CACHEBUST="cachebust" COPY charts/ /charts/ RUN echo ${CACHEBUST}>/dev/null -RUN CHART_VERSION="1.14.200" CHART_FILE=/charts/rke2-cilium.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh -RUN CHART_VERSION="v3.26.1-build2023080200" CHART_FILE=/charts/rke2-canal.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh -RUN CHART_VERSION="v3.26.101" CHART_FILE=/charts/rke2-calico.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh -RUN CHART_VERSION="v3.26.101" CHART_FILE=/charts/rke2-calico-crd.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh -RUN CHART_VERSION="1.24.006" CHART_FILE=/charts/rke2-coredns.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh -RUN CHART_VERSION="4.8.200" CHART_FILE=/charts/rke2-ingress-nginx.yaml CHART_BOOTSTRAP=false /charts/build-chart.sh -RUN CHART_VERSION="2.11.100-build2023051510" CHART_FILE=/charts/rke2-metrics-server.yaml CHART_BOOTSTRAP=false /charts/build-chart.sh -RUN CHART_VERSION="v4.0.2-build2023081100" CHART_FILE=/charts/rke2-multus.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh -RUN CHART_VERSION="1.5.100" CHART_FILE=/charts/rancher-vsphere-cpi.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh -RUN CHART_VERSION="3.0.1-rancher101" CHART_FILE=/charts/rancher-vsphere-csi.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh -RUN CHART_VERSION="0.2.200" CHART_FILE=/charts/harvester-cloud-provider.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh -RUN CHART_VERSION="0.1.1600" CHART_FILE=/charts/harvester-csi-driver.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh -RUN CHART_VERSION="1.7.202" CHART_FILE=/charts/rke2-snapshot-controller.yaml CHART_BOOTSTRAP=false /charts/build-chart.sh -RUN CHART_VERSION="1.7.202" CHART_FILE=/charts/rke2-snapshot-controller-crd.yaml CHART_BOOTSTRAP=false /charts/build-chart.sh -RUN CHART_VERSION="1.7.302" CHART_FILE=/charts/rke2-snapshot-validation-webhook.yaml CHART_BOOTSTRAP=false /charts/build-chart.sh -RUN rm -vf /charts/*.sh /charts/*.md +RUN /charts/build-charts.sh +RUN rm -vf /charts/*.sh /charts/*.md /charts/chart_versions.yaml # rke2-runtime image # This image includes any host level programs that we might need. All binaries # must be placed in bin/ of the file image and subdirectories of bin/ will be flattened during installation. # This means bin/foo/bar will become bin/bar when rke2 installs this to the host -FROM rancher/hardened-kubernetes:v1.25.15-rke2r2-build20231102 AS kubernetes +FROM rancher/hardened-kubernetes:v1.25.16-rke2r1-build20231116 AS kubernetes FROM rancher/hardened-containerd:v1.7.7-k3s1-build20231010 AS containerd FROM rancher/hardened-crictl:v1.26.1-build20230406 AS crictl FROM rancher/hardened-runc:v1.1.8-build20230802 AS runc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rke2-1.25.15+rke2r2/Makefile new/rke2-1.25.16+rke2r1/Makefile --- old/rke2-1.25.15+rke2r2/Makefile 2023-11-03 21:25:27.000000000 +0100 +++ new/rke2-1.25.16+rke2r1/Makefile 2023-11-22 18:15:06.000000000 +0100 @@ -17,7 +17,7 @@ .PHONY: dapper-ci dapper-ci: .ci ## Used by Drone CI, does the same as "ci" but in a Drone way -.ci: validate build package +.ci: validate validate-charts build package .PHONY: build build: ## Build using host go tools @@ -71,6 +71,11 @@ validate-release: ./scripts/validate-release +.PHONY: validate-charts +validate-charts: + ./scripts/validate-charts + + .PHONY: run run: build-debug ./scripts/run diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rke2-1.25.15+rke2r2/charts/build-charts.sh new/rke2-1.25.16+rke2r1/charts/build-charts.sh --- old/rke2-1.25.15+rke2r2/charts/build-charts.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/rke2-1.25.16+rke2r1/charts/build-charts.sh 2023-11-22 18:15:06.000000000 +0100 @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +set -eux -o pipefail + +while read version filename bootstrap; do + CHART_VERSION=$version CHART_FILE=$filename CHART_BOOTSTRAP=$bootstrap /charts/build-chart.sh +done <<< $(yq e '.charts[] | [.version, .filename, .bootstrap] | join(" ")' /charts/chart_versions.yaml) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rke2-1.25.15+rke2r2/charts/chart_versions.yaml new/rke2-1.25.16+rke2r1/charts/chart_versions.yaml --- old/rke2-1.25.15+rke2r2/charts/chart_versions.yaml 1970-01-01 01:00:00.000000000 +0100 +++ new/rke2-1.25.16+rke2r1/charts/chart_versions.yaml 2023-11-22 18:15:06.000000000 +0100 @@ -0,0 +1,46 @@ +charts: + - version: 1.14.400 + filename: /charts/rke2-cilium.yaml + bootstrap: true + - version: v3.26.3-build2023110900 + filename: /charts/rke2-canal.yaml + bootstrap: true + - version: v3.26.300 + filename: /charts/rke2-calico.yaml + bootstrap: true + - version: v3.26.300 + filename: /charts/rke2-calico-crd.yaml + bootstrap: true + - version: 1.24.006 + filename: /charts/rke2-coredns.yaml + bootstrap: true + - version: 4.8.200 + filename: /charts/rke2-ingress-nginx.yaml + bootstrap: false + - version: 2.11.100-build2023051510 + filename: /charts/rke2-metrics-server.yaml + bootstrap: false + - version: v4.0.2-build2023081100 + filename: /charts/rke2-multus.yaml + bootstrap: true + - version: 1.5.100 + filename: /charts/rancher-vsphere-cpi.yaml + bootstrap: true + - version: 3.0.1-rancher101 + filename: /charts/rancher-vsphere-csi.yaml + bootstrap: true + - version: 0.2.200 + filename: /charts/harvester-cloud-provider.yaml + bootstrap: true + - version: 0.1.1600 + filename: /charts/harvester-csi-driver.yaml + bootstrap: true + - version: 1.7.202 + filename: /charts/rke2-snapshot-controller.yaml + bootstrap: false + - version: 1.7.202 + filename: /charts/rke2-snapshot-controller-crd.yaml + bootstrap: false + - version: 1.7.302 + filename: /charts/rke2-snapshot-validation-webhook.yaml + bootstrap: false diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rke2-1.25.15+rke2r2/go.mod new/rke2-1.25.16+rke2r1/go.mod --- old/rke2-1.25.15+rke2r2/go.mod 2023-11-03 21:25:27.000000000 +0100 +++ new/rke2-1.25.16+rke2r1/go.mod 2023-11-22 18:15:06.000000000 +0100 @@ -23,7 +23,7 @@ github.com/opencontainers/runc => github.com/opencontainers/runc v1.1.8 github.com/opencontainers/runtime-spec => github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417 github.com/opencontainers/selinux => github.com/opencontainers/selinux v1.10.1 - github.com/rancher/wrangler => github.com/rancher/wrangler v1.1.1-0.20230425173236-39a4707f0689 + github.com/rancher/wrangler => github.com/rancher/wrangler v1.1.1-0.20230807182002-35cb42e6a915 go.etcd.io/etcd/api/v3 => github.com/k3s-io/etcd/api/v3 v3.5.4-k3s1 go.etcd.io/etcd/client/pkg/v3 => github.com/k3s-io/etcd/client/pkg/v3 v3.5.4-k3s1 go.etcd.io/etcd/client/v3 => github.com/k3s-io/etcd/client/v3 v3.5.4-k3s1 @@ -98,7 +98,7 @@ github.com/gruntwork-io/terratest v0.40.19 github.com/iamacarpet/go-win64api v0.0.0-20210311141720-fe38760bed28 github.com/k3s-io/helm-controller v0.15.4 - github.com/k3s-io/k3s v1.25.16-0.20231102204128-ad5b4434529a // release-1.25 + github.com/k3s-io/k3s v1.25.16-0.20231122010439-c8165989e934 // release-1.25 github.com/libp2p/go-netroute v0.2.0 github.com/natefinch/lumberjack v2.0.0+incompatible github.com/onsi/ginkgo/v2 v2.11.0 @@ -111,10 +111,10 @@ github.com/spf13/cobra v1.6.1 github.com/tigera/operator v1.28.1 github.com/urfave/cli v1.22.12 - golang.org/x/crypto v0.14.0 + golang.org/x/crypto v0.15.0 golang.org/x/sync v0.3.0 - golang.org/x/sys v0.13.0 - golang.org/x/term v0.13.0 // indirect + golang.org/x/sys v0.14.0 + golang.org/x/term v0.14.0 // indirect golang.org/x/tools v0.10.0 // indirect google.golang.org/grpc v1.57.0 k8s.io/api v0.27.5 @@ -271,9 +271,9 @@ github.com/josharian/intern v1.0.0 // indirect github.com/josharian/native v1.1.0 // indirect github.com/json-iterator/go v1.1.12 // indirect - github.com/k3s-io/kine v0.10.3 // indirect + github.com/k3s-io/kine v0.11.0 // indirect github.com/karrick/godirwalk v1.16.1 // indirect - github.com/klauspost/compress v1.16.6 // indirect + github.com/klauspost/compress v1.17.2 // indirect github.com/klauspost/cpuid/v2 v2.1.0 // indirect github.com/lib/pq v1.10.2 // indirect github.com/libopenstorage/openstorage v1.0.0 // indirect @@ -311,10 +311,10 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect github.com/nats-io/jsm.go v0.0.31-0.20220317133147-fe318f464eee // indirect - github.com/nats-io/jwt/v2 v2.4.1 // indirect - github.com/nats-io/nats-server/v2 v2.9.18 // indirect - github.com/nats-io/nats.go v1.27.1 // indirect - github.com/nats-io/nkeys v0.4.4 // indirect + github.com/nats-io/jwt/v2 v2.5.3 // indirect + github.com/nats-io/nats-server/v2 v2.10.5 // indirect + github.com/nats-io/nats.go v1.31.0 // indirect + github.com/nats-io/nkeys v0.4.6 // indirect github.com/nats-io/nuid v1.0.1 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect github.com/opencontainers/image-spec v1.1.0-rc3 // indirect @@ -330,8 +330,8 @@ github.com/prometheus/client_model v0.4.0 // indirect github.com/prometheus/common v0.42.0 // indirect github.com/prometheus/procfs v0.10.1 // indirect - github.com/rancher/dynamiclistener v0.3.6-rc2 // indirect - github.com/rancher/lasso v0.0.0-20221227210133-6ea88ca2fbcc // indirect + github.com/rancher/dynamiclistener v0.3.6 // indirect + github.com/rancher/lasso v0.0.0-20230830164424-d684fdeb6f29 // indirect github.com/rancher/remotedialer v0.3.0 // indirect github.com/robfig/cron/v3 v3.0.1 // indirect github.com/rootless-containers/rootlesskit v1.0.1 // indirect @@ -348,6 +348,7 @@ github.com/stretchr/testify v1.8.4 // indirect github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect github.com/tchap/go-patricia v2.3.0+incompatible // indirect + github.com/tidwall/btree v1.6.0 // indirect github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75 // indirect github.com/tmccombs/hcl2json v0.3.3 // indirect github.com/ulikunitz/xz v0.5.8 // indirect @@ -387,8 +388,8 @@ golang.org/x/mod v0.11.0 // indirect golang.org/x/net v0.17.0 // indirect golang.org/x/oauth2 v0.10.0 // indirect - golang.org/x/text v0.13.0 // indirect - golang.org/x/time v0.3.0 // indirect + golang.org/x/text v0.14.0 // indirect + golang.org/x/time v0.4.0 // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect golang.zx2c4.com/wireguard v0.0.0-20230325221338-052af4a8072b // indirect golang.zx2c4.com/wireguard/wgctrl v0.0.0-20230429144221-925a1e7659e6 // indirect diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rke2-1.25.15+rke2r2/go.sum new/rke2-1.25.16+rke2r1/go.sum --- old/rke2-1.25.15+rke2r2/go.sum 2023-11-03 21:25:27.000000000 +0100 +++ new/rke2-1.25.16+rke2r1/go.sum 2023-11-22 18:15:06.000000000 +0100 @@ -924,10 +924,10 @@ github.com/k3s-io/etcd/server/v3 v3.5.4-k3s1/go.mod h1:S5/YTU15KxymM5l3T6b09sNOHPXqGYIZStpuuGbb65c= github.com/k3s-io/helm-controller v0.15.4 h1:l4DWmUWpphbtwmuXGtpr5Rql/2NaCLSv4ZD8HlND9uY= github.com/k3s-io/helm-controller v0.15.4/go.mod h1:BgCPBQblj/Ect4Q7/Umf86WvyDjdG/34D+n8wfXtoeM= -github.com/k3s-io/k3s v1.25.16-0.20231102204128-ad5b4434529a h1:Yyern585oKCpG6MmumPkPLIGlAPeUXQoFFq0Ix0eokc= -github.com/k3s-io/k3s v1.25.16-0.20231102204128-ad5b4434529a/go.mod h1:Z26OCOX3JiqNAJ5Uuirnx6GDgdL3Svpj/zl2Z3wP1Ng= -github.com/k3s-io/kine v0.10.3 h1:OamjhtcQnK7zpzbiUDvXXKaAwdkXIuzr+nuyFWSC1ZA= -github.com/k3s-io/kine v0.10.3/go.mod h1:hiOK3Gj89Py+AB11YK0fxEwkdWxBvNfaMt8PRWXqh6M= +github.com/k3s-io/k3s v1.25.16-0.20231122010439-c8165989e934 h1:nk3arzewkBxasv2YiiW2jellwbJe+jy9FiiyhIpYclE= +github.com/k3s-io/k3s v1.25.16-0.20231122010439-c8165989e934/go.mod h1:s3Xrk8zFE2FXDCqCUW68+7zvGxVQhQfoh6ZwvyH+1bE= +github.com/k3s-io/kine v0.11.0 h1:7tS0H9yBDxXiy1BgEEkBWLswwG/q4sARPTHdxOMz1qw= +github.com/k3s-io/kine v0.11.0/go.mod h1:tjSsWrCetgaGMTfnJW6vzqdT/qOPhF/+nUEaE+eixBA= github.com/k3s-io/klog v1.0.0-k3s2 h1:yyvD2bQbxG7m85/pvNctLX2bUDmva5kOBvuZ77tTGBA= github.com/k3s-io/klog v1.0.0-k3s2/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= github.com/k3s-io/klog/v2 v2.60.1-k3s1 h1:C1hsMF1Eo6heGVQzts6cZ+rDZAReSiOBUxsYMuUkkZI= @@ -996,8 +996,8 @@ github.com/klauspost/compress v1.14.4/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= github.com/klauspost/compress v1.15.12/go.mod h1:QPwzmACJjUTFsnSHH934V6woptycfrDDJnH7hvFVbGM= github.com/klauspost/compress v1.16.0/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= -github.com/klauspost/compress v1.16.6 h1:91SKEy4K37vkp255cJ8QesJhjyRO0hn9i9G0GoUwLsk= -github.com/klauspost/compress v1.16.6/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= +github.com/klauspost/compress v1.17.2 h1:RlWWUY/Dr4fL8qk9YG7DTZ7PDgME2V4csBXA8L/ixi4= +github.com/klauspost/compress v1.17.2/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= github.com/klauspost/cpuid/v2 v2.0.1/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.0.4/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.1.0 h1:eyi1Ad2aNJMW95zcSbmGg7Cg6cq3ADwLpMAP96d8rF0= @@ -1178,21 +1178,21 @@ github.com/nats-io/jwt v0.3.0/go.mod h1:fRYCDE99xlTsqUzISS1Bi75UBJ6ljOJQOAAu5VglpSg= github.com/nats-io/jwt v0.3.2/go.mod h1:/euKqTS1ZD+zzjYrY7pseZrTtWQSjujC7xjPc8wL6eU= github.com/nats-io/jwt/v2 v2.2.1-0.20220113022732-58e87895b296/go.mod h1:0tqz9Hlu6bCBFLWAASKhE5vUA4c24L9KPUUgvwumE/k= -github.com/nats-io/jwt/v2 v2.4.1 h1:Y35W1dgbbz2SQUYDPCaclXcuqleVmpbRa7646Jf2EX4= -github.com/nats-io/jwt/v2 v2.4.1/go.mod h1:24BeQtRwxRV8ruvC4CojXlx/WQ/VjuwlYiH+vu/+ibI= +github.com/nats-io/jwt/v2 v2.5.3 h1:/9SWvzc6hTfamcgXJ3uYRpgj+QuY2aLNqRiqrKcrpEo= +github.com/nats-io/jwt/v2 v2.5.3/go.mod h1:iysuPemFcc7p4IoYots3IuELSI4EDe9Y0bQMe+I3Bf4= github.com/nats-io/nats-server/v2 v2.1.2/go.mod h1:Afk+wRZqkMQs/p45uXdrVLuab3gwv3Z8C4HTBu8GD/k= github.com/nats-io/nats-server/v2 v2.7.5-0.20220309212130-5c0d1999ff72/go.mod h1:1vZ2Nijh8tcyNe8BDVyTviCd9NYzRbubQYiEHsvOQWc= -github.com/nats-io/nats-server/v2 v2.9.18 h1:00muGH0qu/7NAw1b/2eFcpIvdHcTghj6PFjUVhy8zEo= -github.com/nats-io/nats-server/v2 v2.9.18/go.mod h1:aTb/xtLCGKhfTFLxP591CMWfkdgBmcUUSkiSOe5A3gw= +github.com/nats-io/nats-server/v2 v2.10.5 h1:hhWt6m9ja/mNnm6ixc85jCthDaiUFPaeJI79K/MD980= +github.com/nats-io/nats-server/v2 v2.10.5/go.mod h1:xUMTU4kS//SDkJCSvFwN9SyJ9nUuLhSkzB/Qz0dvjjg= github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzEE/Zbp4w= github.com/nats-io/nats.go v1.13.1-0.20220308171302-2f2f6968e98d/go.mod h1:BPko4oXsySz4aSWeFgOHLZs3G4Jq4ZAyE6/zMCxRT6w= -github.com/nats-io/nats.go v1.27.1 h1:OuYnal9aKVSnOzLQIzf7554OXMCG7KbaTkCSBHRcSoo= -github.com/nats-io/nats.go v1.27.1/go.mod h1:XpbWUlOElGwTYbMR7imivs7jJj9GtK7ypv321Wp6pjc= +github.com/nats-io/nats.go v1.31.0 h1:/WFBHEc/dOKBF6qf1TZhrdEfTmOZ5JzdJ+Y3m6Y/p7E= +github.com/nats-io/nats.go v1.31.0/go.mod h1:di3Bm5MLsoB4Bx61CBTsxuarI36WbhAwOm8QrW39+i8= github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= github.com/nats-io/nkeys v0.3.0/go.mod h1:gvUNGjVcM2IPr5rCsRsC6Wb3Hr2CQAm08dsxtV6A5y4= -github.com/nats-io/nkeys v0.4.4 h1:xvBJ8d69TznjcQl9t6//Q5xXuVhyYiSos6RPtvQNTwA= -github.com/nats-io/nkeys v0.4.4/go.mod h1:XUkxdLPTufzlihbamfzQ7mw/VGx6ObUs+0bN5sNvt64= +github.com/nats-io/nkeys v0.4.6 h1:IzVe95ru2CT6ta874rt9saQRkWfe2nFj1NtvYSLqMzY= +github.com/nats-io/nkeys v0.4.6/go.mod h1:4DxZNzenSVd1cYQoAa8948QY3QDjrHfcfVADymtkpts= github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw= github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= github.com/networkplumbing/go-nft v0.2.0/go.mod h1:HnnM+tYvlGAsMU7yoYwXEVLLiDW9gdMmb5HoGcwpuQs= @@ -1369,10 +1369,10 @@ github.com/pseudomuto/protoc-gen-doc v1.4.1/go.mod h1:exDTOVwqpp30eV/EDPFLZy3Pwr2sn6hBC1WIYH/UbIg= github.com/pseudomuto/protokit v0.2.0/go.mod h1:2PdH30hxVHsup8KpBTOXTBeMVhJZVio3Q8ViKSAXT0Q= github.com/r3labs/diff/v2 v2.8.0/go.mod h1:I8noH9Fc2fjSaMxqF3G2lhDdC0b+JXCfyx85tWFM9kc= -github.com/rancher/dynamiclistener v0.3.6-rc2 h1:Y1nai+Xv+4qqlB3c+hmrY2uBo1EcCDU9kmN5hbnmZhA= -github.com/rancher/dynamiclistener v0.3.6-rc2/go.mod h1:wOh62hdJIgyqTdD/VAHO77UPKAbUsJJ5gYRjzgBL3Wo= -github.com/rancher/lasso v0.0.0-20221227210133-6ea88ca2fbcc h1:29VHrInLV4qSevvcvhBj5UhQWkPShxrxv4AahYg2Scw= -github.com/rancher/lasso v0.0.0-20221227210133-6ea88ca2fbcc/go.mod h1:dEfC9eFQigj95lv/JQ8K5e7+qQCacWs1aIA6nLxKzT8= +github.com/rancher/dynamiclistener v0.3.6 h1:iAFWeiFNra6tYlt4k+jINrK3hOxZ8mjW2S/9nA6sxKs= +github.com/rancher/dynamiclistener v0.3.6/go.mod h1:VqBaJNi+bZmre0+gi+2Jb6jbn7ovHzRueW+M7QhVKsk= +github.com/rancher/lasso v0.0.0-20230830164424-d684fdeb6f29 h1:+kige/h8/LnzWgPjB5NUIHz/pWiW/lFpqcTUkN5uulY= +github.com/rancher/lasso v0.0.0-20230830164424-d684fdeb6f29/go.mod h1:kgk9kJVMj9FIrrXU0iyM6u/9Je4bEjPImqswkTVaKsQ= github.com/rancher/remotedialer v0.2.6-0.20201012155453-8b1b7bb7d05f/go.mod h1:dbzn9NF1JWbGEHL6Q/1KG4KFROILiY/j6wmfF1Np3fk= github.com/rancher/remotedialer v0.3.0 h1:y1EO8JCsgZo0RcqTUp6U8FXcBAv27R+TLnWRcpvX1sM= github.com/rancher/remotedialer v0.3.0/go.mod h1:BwwztuvViX2JrLLUwDlsYt5DiyUwHLlzynRwkZLAY0Q= @@ -1380,8 +1380,8 @@ github.com/rancher/wharfie v0.6.2/go.mod h1:7ii0+eehBwUEFaJMiRHWCbvN11bsfVHT1oc+P/6IBSg= github.com/rancher/wins v0.1.1 h1:WyqxkAyCstwuv+04tdJiGODXv0De/lOyRHV6MJVfrUo= github.com/rancher/wins v0.1.1/go.mod h1:SdPsn8b5PoVj1ozvjRc8VNyjNvOGSoQy4HkN5Q6yTqo= -github.com/rancher/wrangler v1.1.1-0.20230425173236-39a4707f0689 h1:otb4OjgXH2b8a4C9g76jCDuTF3opjaYffZ55SiVe7KU= -github.com/rancher/wrangler v1.1.1-0.20230425173236-39a4707f0689/go.mod h1:D6Tu6oVX8aGtCHsMCtYaysgVK3ad920MTSeAu7rzb5U= +github.com/rancher/wrangler v1.1.1-0.20230807182002-35cb42e6a915 h1:CNwXnngrb5PgPe4nr7G5jS298YkhS6udMnNvyBOboFQ= +github.com/rancher/wrangler v1.1.1-0.20230807182002-35cb42e6a915/go.mod h1:0oPjv01nvzeavcmeuT0xMlGKs9IJaNk5NCPPQq1n8Ro= github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= @@ -1510,6 +1510,8 @@ github.com/tchap/go-patricia v2.2.6+incompatible/go.mod h1:bmLyhP68RS6kStMGxByiQ23RP/odRBOTVjwp2cDyi6I= github.com/tchap/go-patricia v2.3.0+incompatible h1:GkY4dP3cEfEASBPPkWd+AmjYxhmDkqO9/zg7R0lSQRs= github.com/tchap/go-patricia v2.3.0+incompatible/go.mod h1:bmLyhP68RS6kStMGxByiQ23RP/odRBOTVjwp2cDyi6I= +github.com/tidwall/btree v1.6.0 h1:LDZfKfQIBHGHWSwckhXI0RPSXzlo+KYdjK7FWSqOzzg= +github.com/tidwall/btree v1.6.0/go.mod h1:twD9XRA5jj9VUQGELzDO4HPQTNJsoWWfYEL+EUQ2cKY= github.com/tigera/api v0.0.0-20220325204048-b3e0b35ba256/go.mod h1:6qWfgULooruKiC8eoGgyRjOh0K+h/q8bc7AvdUysAUo= github.com/tigera/operator v1.28.1 h1:jFaO/3if3Lz1Plxc+QipJTUXIYen6TDC77c6y6afG2k= github.com/tigera/operator v1.28.1/go.mod h1:XU62bZPxkA4iTDwz1qBGrodE9s8XaFMRfR1fTVgc9j0= @@ -1718,8 +1720,9 @@ golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw= golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0= -golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc= golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= +golang.org/x/crypto v0.15.0 h1:frVn1TEaCEaZcn3Tmd7Y2b5KKPaZ+I32Q2OA3kYp5TA= +golang.org/x/crypto v0.15.0/go.mod h1:4ChreQoLWfG3xLDer1WdlH5NdlQ3+mwnQq1YTKY+72g= golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -1820,8 +1823,9 @@ golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= -golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek= golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= +golang.org/x/term v0.14.0 h1:LGK9IlZ8T9jvdy6cTdfKUCltatMFOehAQo9SRC46UQ8= +golang.org/x/term v0.14.0/go.mod h1:TySc+nGkYR6qt8km8wUhuFRTVSMIX3XPR58y2lC8vww= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -1839,8 +1843,9 @@ golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/text v0.10.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= -golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= +golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -1851,8 +1856,8 @@ golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20220210224613-90d013bbcef8/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4= -golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.4.0 h1:Z81tqI5ddIoXDPvVQ7/7CC9TnLM7ubaFG2qXYd5BbYY= +golang.org/x/time v0.4.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rke2-1.25.15+rke2r2/pkg/cli/cmds/agent.go new/rke2-1.25.16+rke2r1/pkg/cli/cmds/agent.go --- old/rke2-1.25.15+rke2r2/pkg/cli/cmds/agent.go 2023-11-03 21:25:27.000000000 +0100 +++ new/rke2-1.25.16+rke2r1/pkg/cli/cmds/agent.go 2023-11-22 18:15:06.000000000 +0100 @@ -33,6 +33,7 @@ "container-runtime-endpoint": copyFlag, "image-service-endpoint": dropFlag, "pause-image": dropFlag, + "disable-apiserver-lb": dropFlag, "private-registry": copyFlag, "node-ip": copyFlag, "node-external-ip": copyFlag, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rke2-1.25.15+rke2r2/scripts/build-images new/rke2-1.25.16+rke2r1/scripts/build-images --- old/rke2-1.25.15+rke2r2/scripts/build-images 2023-11-03 21:25:27.000000000 +0100 +++ new/rke2-1.25.16+rke2r1/scripts/build-images 2023-11-22 18:15:06.000000000 +0100 @@ -29,36 +29,36 @@ EOF xargs -n1 -t docker image pull --quiet << EOF > build/images-canal.txt - ${REGISTRY}/rancher/hardened-calico:v3.26.1-build20230802 - ${REGISTRY}/rancher/hardened-flannel:v0.22.1-build20230802 + ${REGISTRY}/rancher/hardened-calico:v3.26.3-build20231109 + ${REGISTRY}/rancher/hardened-flannel:v0.23.0-build20231109 EOF if [ "${GOARCH}" != "s390x" ]; then xargs -n1 -t docker image pull --quiet << EOF > build/images-cilium.txt ${REGISTRY}/rancher/mirrored-cilium-certgen:v0.1.9 - ${REGISTRY}/rancher/mirrored-cilium-cilium:v1.14.2 - ${REGISTRY}/rancher/mirrored-cilium-cilium-envoy:v1.25.9-e198a2824d309024cb91fb6a984445e73033291d + ${REGISTRY}/rancher/mirrored-cilium-cilium:v1.14.4 + ${REGISTRY}/rancher/mirrored-cilium-cilium-envoy:v1.26.6-ff0d5d3f77d610040e93c7c7a430d61a0c0b90c1 ${REGISTRY}/rancher/mirrored-cilium-cilium-etcd-operator:v2.0.7 - ${REGISTRY}/rancher/mirrored-cilium-clustermesh-apiserver:v1.14.2 - ${REGISTRY}/rancher/mirrored-cilium-hubble-relay:v1.14.2 - ${REGISTRY}/rancher/mirrored-cilium-hubble-ui:v0.12.0 - ${REGISTRY}/rancher/mirrored-cilium-hubble-ui-backend:v0.12.0 - ${REGISTRY}/rancher/mirrored-cilium-kvstoremesh:v1.14.2 - ${REGISTRY}/rancher/mirrored-cilium-operator-aws:v1.14.2 - ${REGISTRY}/rancher/mirrored-cilium-operator-azure:v1.14.2 - ${REGISTRY}/rancher/mirrored-cilium-operator-generic:v1.14.2 - ${REGISTRY}/rancher/hardened-cni-plugins:v1.2.0-build20230523 + ${REGISTRY}/rancher/mirrored-cilium-clustermesh-apiserver:v1.14.4 + ${REGISTRY}/rancher/mirrored-cilium-hubble-relay:v1.14.4 + ${REGISTRY}/rancher/mirrored-cilium-hubble-ui:v0.12.1 + ${REGISTRY}/rancher/mirrored-cilium-hubble-ui-backend:v0.12.1 + ${REGISTRY}/rancher/mirrored-cilium-kvstoremesh:v1.14.4 + ${REGISTRY}/rancher/mirrored-cilium-operator-aws:v1.14.4 + ${REGISTRY}/rancher/mirrored-cilium-operator-azure:v1.14.4 + ${REGISTRY}/rancher/mirrored-cilium-operator-generic:v1.14.4 + ${REGISTRY}/rancher/hardened-cni-plugins:v1.2.0-build20231009 EOF xargs -n1 -t docker image pull --quiet << EOF > build/images-calico.txt - ${REGISTRY}/rancher/mirrored-calico-operator:v1.30.4 - ${REGISTRY}/rancher/mirrored-calico-ctl:v3.26.1 - ${REGISTRY}/rancher/mirrored-calico-kube-controllers:v3.26.1 - ${REGISTRY}/rancher/mirrored-calico-typha:v3.26.1 - ${REGISTRY}/rancher/mirrored-calico-node:v3.26.1 - ${REGISTRY}/rancher/mirrored-calico-pod2daemon-flexvol:v3.26.1 - ${REGISTRY}/rancher/mirrored-calico-cni:v3.26.1 - ${REGISTRY}/rancher/mirrored-calico-apiserver:v3.26.1 + ${REGISTRY}/rancher/mirrored-calico-operator:v1.30.7 + ${REGISTRY}/rancher/mirrored-calico-ctl:v3.26.3 + ${REGISTRY}/rancher/mirrored-calico-kube-controllers:v3.26.3 + ${REGISTRY}/rancher/mirrored-calico-typha:v3.26.3 + ${REGISTRY}/rancher/mirrored-calico-node:v3.26.3 + ${REGISTRY}/rancher/mirrored-calico-pod2daemon-flexvol:v3.26.3 + ${REGISTRY}/rancher/mirrored-calico-cni:v3.26.3 + ${REGISTRY}/rancher/mirrored-calico-apiserver:v3.26.3 EOF xargs -n1 -t docker image pull --quiet << EOF > build/images-vsphere.txt @@ -89,10 +89,10 @@ ${REGISTRY}/rancher/harvester-cloud-provider:v0.2.0 ${REGISTRY}/rancher/mirrored-kube-vip-kube-vip-iptables:v0.6.0 ${REGISTRY}/rancher/harvester-csi-driver:v0.1.5 - ${REGISTRY}/rancher/longhornio-csi-node-driver-registrar:v2.3.0 - ${REGISTRY}/rancher/longhornio-csi-resizer:v1.2.0 - ${REGISTRY}/rancher/longhornio-csi-provisioner:v2.1.2 - ${REGISTRY}/rancher/longhornio-csi-attacher:v3.2.1 + ${REGISTRY}/rancher/mirrored-longhornio-csi-node-driver-registrar:v2.3.0 + ${REGISTRY}/rancher/mirrored-longhornio-csi-resizer:v1.2.0 + ${REGISTRY}/rancher/mirrored-longhornio-csi-provisioner:v2.1.2 + ${REGISTRY}/rancher/mirrored-longhornio-csi-attacher:v3.2.1 EOF fi # Continue to provide a legacy airgap archive set with the default CNI images diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rke2-1.25.15+rke2r2/scripts/validate new/rke2-1.25.16+rke2r1/scripts/validate --- old/rke2-1.25.15+rke2r2/scripts/validate 2023-11-03 21:25:27.000000000 +0100 +++ new/rke2-1.25.16+rke2r1/scripts/validate 2023-11-22 18:15:06.000000000 +0100 @@ -18,7 +18,7 @@ fi CALICO_WINDOWS_VERSION=$(grep 'CALICO_VERSION=' Dockerfile.windows | cut -d '=' -f 2- | grep -oE "v([0-9]+)\.([0-9]+)") - CALICO_LINUX_VERSION=$(grep "rke2-calico.yaml" Dockerfile | grep 'CHART_VERSION=' | cut -d '=' -f 2- | grep -oE "v([0-9]+)\.([0-9]+)") + CALICO_LINUX_VERSION=$(yq '.charts[] | select(.filename == "/charts/rke2-canal.yaml").version' charts/chart_versions.yaml | cut -d ',' -f 1- | grep -oE "v([0-9]+)\.([0-9]+)") if [ ! "$CALICO_WINDOWS_VERSION" = "$CALICO_LINUX_VERSION" ]; then fatal "Calico windows binary version [$CALICO_WINDOWS_VERSION] does not match Calico chart version [$CALICO_LINUX_VERSION]" fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rke2-1.25.15+rke2r2/scripts/validate-charts new/rke2-1.25.16+rke2r1/scripts/validate-charts --- old/rke2-1.25.15+rke2r2/scripts/validate-charts 1970-01-01 01:00:00.000000000 +0100 +++ new/rke2-1.25.16+rke2r1/scripts/validate-charts 2023-11-22 18:15:06.000000000 +0100 @@ -0,0 +1,190 @@ +#!/usr/bin/env bash +set -e +source ./scripts/version.sh +set +x + +info() { + echo '[INFO] ' "$@" +} + +warn() { + echo '[WARN] ' "$@" >&2 +} + +error() { + echo '[ERROR] ' "$@" >&2 +} + +fatal() { + echo '[ERROR] ' "$@" >&2 + exit 1 +} + +cleanup() { + exit_code=$? + trap - EXIT INT + rm -rf /tmp/tmp.*.tar.gz + exit ${exit_code} +} +trap cleanup EXIT INT + + +download_chart() { + chart_version=$1 + chart_name=$2 + bootstrap=$3 + + chart_package=${chart_name%%-crd} + + chart_url=${CHART_REPO:="https://rke2-charts.rancher.io"}/assets/${chart_package}/${chart_name}-${chart_version:="v0.0.0"}.tgz + + chart_tmp=$(mktemp --suffix .tar.gz) + + curl -fsSL "${chart_url}" -o "${chart_tmp}" + + echo $chart_tmp +} + +check_system_registry() { + chart_version=$1 + chart_name=$2 + chart_tmp=$3 + + yaml_tmp=$(mktemp --suffix .yaml) + values="global.systemDefaultRegistry=my-registry,global.cattle.systemDefaultRegistry=my-registry,vCenter.clusterId=test-id" + helm template test-chart --kube-version ${KUBERNETES_VERSION} --set $values $chart_tmp > $yaml_tmp; + + awk '$1 ~ /^image:/ { + if( $2 !~ /my-registry/ && $2 !~ busybox) { + print $2 + } + } + ' $yaml_tmp +} + +is_supported() { +kube_version="$1" +lower_bound="$2" +upper_bound="$3" + +kube_version="${kube_version#[vV]}" +kube_version_major="${kube_version%%\.*}" +kube_version_minor="${kube_version#*.}" +kube_version_minor="${kube_version_minor%.*}" +kube_version_patch="${kube_version##*.}" +kube_version_dash="${kube_version_patch##*-}" +kube_version_patch="${kube_version_patch%-*}" + +lower_bound="${lower_bound#[vV]}" +lower_bound_major="${lower_bound%%\.*}" +lower_bound_minor="${lower_bound#*.}" +lower_bound_minor="${lower_bound_minor%.*}" +lower_bound_patch="${lower_bound##*.}" +lower_bound_dash="${lower_bound_patch##*-}" +lower_bound_patch="${lower_bound_patch%-*}" + + +upper_bound="${upper_bound#[vV]}" +upper_bound_major="${upper_bound%%\.*}" +upper_bound_minor="${upper_bound#*.}" +upper_bound_minor="${upper_bound_minor%.*}" +upper_bound_patch="${upper_bound##*.}" +upper_bound_dash="${upper_bound_patch##*-}" +upper_bound_patch="${upper_bound_patch%-*}" + +if [ "$lower_bound_major" -le "$kube_version_major" ] && \ + [ "$kube_version_major" -le "$upper_bound_major" ] && \ + [ "$lower_bound_minor" -le "$kube_version_minor" ] && \ + [ "$kube_version_minor" -le "$upper_bound_minor" ] && \ + [ "$lower_bound_patch" -le "$kube_version_patch" ] && \ + [ "$kube_version_patch" -le "$upper_bound_patch" ]; then + echo 0 +else + echo 1 +fi +} + +check_airgap() { + chart_version=$1 + chart_name=$2 + chart_tmp=$3 + + yaml_tmp=$(mktemp --suffix .yaml) + values="vCenter.clusterId=test-id" + helm template test-chart --kube-version ${KUBERNETES_VERSION} --set $values $chart_tmp > $yaml_tmp; + + chart_folder=$(mktemp -d) + tar xfz $chart_tmp -C $chart_folder + + version_annotation=`awk '$1 ~ /catalog.cattle.io\/kube-version:/ { + print $3 " " $5 + } + ' $chart_folder/$chart_name/Chart.yaml ` + if ! [ -z ${version_annotation} ]; then + version_annotation=${version_annotation:0:-1} + read lower_bound upper_bound <<< $version_annotation + + supported=$(is_supported ${KUBERNETES_VERSION} $lower_bound $upper_bound) + if [ $supported = 1 ] ; then + warn "Chart $chart_name:$chart_version does not support k8s ${KUBERNETES_VERSION}. Skipping airgap check" + return + fi + fi + awk '$1 ~ /^image:/ { + gsub(/"/, "", $2) + gsub(/^docker.io/, "", $2) + print $2 + } + ' $yaml_tmp | \ + while read image + do + [ "$image" = "busybox" ] && continue + if ! grep -q $image scripts/build-images; then + echo $image + fi + done +} + +declare -A NO_SYSTEM_REGISTRY +declare -A NOT_FOUND + +while read version filename bootstrap; do + chart_name=$(basename "${filename%%.yaml}") + chart_tmp=$(download_chart $version $chart_name $bootstrap) + + info "Validating chart $chart_name, version $version..." + + no_system_registry=$(check_system_registry $version $chart_name $chart_tmp) + if ! [ -z "$no_system_registry" ]; then + NO_SYSTEM_REGISTRY[$chart_name]=$no_system_registry + fi + + not_found=$(check_airgap $version $chart_name $chart_tmp) + if ! [ -z "$not_found" ]; then + NOT_FOUND[$chart_name]=$not_found + fi +done <<< $(yq e '.charts[] | [.version, .filename, .bootstrap] | join(" ")' charts/chart_versions.yaml) + +failed=0 + +if [ ${#NO_SYSTEM_REGISTRY[@]} -ge 1 ]; then + failed=1 + for chart in "${!NO_SYSTEM_REGISTRY[@]}" + do + error "Images not using global.systemDefaultRegistry in chart '$chart': ${NO_SYSTEM_REGISTRY[$chart]}" + done + error "Please use global.systemDefaultRegistry for above images" +fi + +if [ ${#NOT_FOUND[@]} -ge 1 ]; then + failed=1 + for chart in "${!NOT_FOUND[@]}" + do + error "Missing images for chart '$chart': ${NOT_FOUND[$chart]}" + done + error "Please include above images in build-images" +fi + +[ $failed = 1 ] && fatal "Please fix the issues above" + +exit 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rke2-1.25.15+rke2r2/scripts/version.sh new/rke2-1.25.16+rke2r1/scripts/version.sh --- old/rke2-1.25.15+rke2r2/scripts/version.sh 2023-11-03 21:25:27.000000000 +0100 +++ new/rke2-1.25.16+rke2r1/scripts/version.sh 2023-11-22 18:15:06.000000000 +0100 @@ -31,8 +31,8 @@ PLATFORM=${GOOS}-${GOARCH} RELEASE=${PROG}.${PLATFORM} # hardcode versions unless set specifically -KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.25.15} -KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.25.15-rke2r2-build20231102} +KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.25.16} +KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.25.16-rke2r1-build20231116} ETCD_VERSION=${ETCD_VERSION:-v3.5.9-k3s1} PAUSE_VERSION=${PAUSE_VERSION:-3.6} CCM_VERSION=${CCM_VERSION:-v1.26.3-build20230406} ++++++ rke2.obsinfo ++++++ --- /var/tmp/diff_new_pack.8o58me/_old 2023-12-05 17:03:38.986106449 +0100 +++ /var/tmp/diff_new_pack.8o58me/_new 2023-12-05 17:03:38.990106596 +0100 @@ -1,5 +1,5 @@ name: rke2 -version: 1.25.15+rke2r2 -mtime: 1699043127 -commit: 390ad79ce05d2c1192ee5871d780c325629420c4 +version: 1.25.16+rke2r1 +mtime: 1700673306 +commit: 760de1e9851f5af9782a9437b2e9cc49c1f743f9 ++++++ vendor.tar.gz ++++++ /work/SRC/openSUSE:Factory/rke2-1.25/vendor.tar.gz /work/SRC/openSUSE:Factory/.rke2-1.25.new.25432/vendor.tar.gz differ: char 5, line 1
