Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package rke2 for openSUSE:Factory checked in at 2026-06-02 16:05:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rke2 (Old) and /work/SRC/openSUSE:Factory/.rke2.new.1937 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rke2" Tue Jun 2 16:05:26 2026 rev:52 rq:1356553 version:1.36.1+rke2r2 Changes: -------- --- /work/SRC/openSUSE:Factory/rke2/rke2.changes 2026-05-21 18:28:20.861046720 +0200 +++ /work/SRC/openSUSE:Factory/.rke2.new.1937/rke2.changes 2026-06-02 16:08:25.865124941 +0200 @@ -1,0 +2,7 @@ +Tue Jun 2 04:52:59 UTC 2026 - Johannes Kastl <[email protected]> + +- Update to version 1.36.1+rke2r2: + * Details see + https://github.com/rancher/rke2/releases/tag/v1.36.1+rke2r2 + +------------------------------------------------------------------- Old: ---- rke2-1.36.1+rke2r1.obscpio New: ---- rke2-1.36.1+rke2r2.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rke2.spec ++++++ --- /var/tmp/diff_new_pack.qtHcwN/_old 2026-06-02 16:08:28.041215196 +0200 +++ /var/tmp/diff_new_pack.qtHcwN/_new 2026-06-02 16:08:28.045215362 +0200 @@ -34,7 +34,7 @@ %define hardened_etcd_version build20260512 Name: rke2 -Version: 1.36.1+rke2r1 +Version: 1.36.1+rke2r2 Release: 0 Summary: Rancher Kubernetes Engine License: Apache-2.0 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.qtHcwN/_old 2026-06-02 16:08:28.097217519 +0200 +++ /var/tmp/diff_new_pack.qtHcwN/_new 2026-06-02 16:08:28.097217519 +0200 @@ -2,7 +2,7 @@ <service name="obs_scm" mode="manual"> <param name="url">https://github.com/rancher/rke2</param> <param name="scm">git</param> - <param name="revision">v1.36.1+rke2r1</param> + <param name="revision">v1.36.1+rke2r2</param> <param name="versionformat">@PARENT_TAG@</param> <param name="package-meta">yes</param> <param name="changesgenerate">disable</param> ++++++ rke2-1.36.1+rke2r1.obscpio -> rke2-1.36.1+rke2r2.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rke2-1.36.1+rke2r1/.git/HEAD new/rke2-1.36.1+rke2r2/.git/HEAD --- old/rke2-1.36.1+rke2r1/.git/HEAD 2026-05-14 20:16:53.000000000 +0200 +++ new/rke2-1.36.1+rke2r2/.git/HEAD 2026-05-28 02:01:51.000000000 +0200 @@ -1 +1 @@ -b4a8e78038f35eb282a8d6e3c29797a1181fa961 +05cf623e2245271b63d1d7ef2caced897636175c diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rke2-1.36.1+rke2r1/.git/ORIG_HEAD new/rke2-1.36.1+rke2r2/.git/ORIG_HEAD --- old/rke2-1.36.1+rke2r1/.git/ORIG_HEAD 2026-05-14 20:16:53.000000000 +0200 +++ new/rke2-1.36.1+rke2r2/.git/ORIG_HEAD 2026-05-28 02:01:51.000000000 +0200 @@ -1 +1 @@ -b4a8e78038f35eb282a8d6e3c29797a1181fa961 +05cf623e2245271b63d1d7ef2caced897636175c diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rke2-1.36.1+rke2r1/.git/hooks/applypatch-msg.sample new/rke2-1.36.1+rke2r2/.git/hooks/applypatch-msg.sample --- old/rke2-1.36.1+rke2r1/.git/hooks/applypatch-msg.sample 2026-05-14 20:16:53.000000000 +0200 +++ new/rke2-1.36.1+rke2r2/.git/hooks/applypatch-msg.sample 2026-05-28 02:01:51.000000000 +0200 @@ -1,4 +1,4 @@ -#!/nix/store/3hgg7pr65imdrifqqh3flg3arvkc2r22-bash-5.3p3/bin/bash +#!/nix/store/gik3rh1vz2jlgnifb9dh6vc6sxwwz9jj-bash-5.3p9/bin/bash # # An example hook script to check the commit log message taken by # applypatch from an e-mail message. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rke2-1.36.1+rke2r1/.git/hooks/commit-msg.sample new/rke2-1.36.1+rke2r2/.git/hooks/commit-msg.sample --- old/rke2-1.36.1+rke2r1/.git/hooks/commit-msg.sample 2026-05-14 20:16:53.000000000 +0200 +++ new/rke2-1.36.1+rke2r2/.git/hooks/commit-msg.sample 2026-05-28 02:01:51.000000000 +0200 @@ -1,4 +1,4 @@ -#!/nix/store/3hgg7pr65imdrifqqh3flg3arvkc2r22-bash-5.3p3/bin/bash +#!/nix/store/gik3rh1vz2jlgnifb9dh6vc6sxwwz9jj-bash-5.3p9/bin/bash # # An example hook script to check the commit log message. # Called by "git commit" with one argument, the name of the file @@ -15,10 +15,60 @@ # SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') # grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1" -# This example catches duplicate Signed-off-by lines. +# This example catches duplicate Signed-off-by lines and messages that +# would confuse 'git am'. + +ret=0 test "" = "$(grep '^Signed-off-by: ' "$1" | sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || { echo >&2 Duplicate Signed-off-by lines. - exit 1 + ret=1 } + +comment_re="$( + { + git config --get-regexp "^core\.comment(char|string)\$" || + echo '#' + } | sed -n -e ' + ${ + s/^[^ ]* // + s|[][*./\]|\\&|g + s/^auto$/[#;@!$%^&|:]/ + p + }' +)" +scissors_line="^${comment_re} -\{8,\} >8 -\{8,\}\$" +comment_line="^${comment_re}.*" +blank_line='^[ ]*$' +# Disallow lines starting with "diff -" or "Index: " in the body of the +# message. Stop looking if we see a scissors line. +line="$(sed -n -e " + # Skip comments and blank lines at the start of the file. + /${scissors_line}/q + /${comment_line}/d + /${blank_line}/d + # The first paragraph will become the subject header so + # does not need to be checked. + : subject + n + /${scissors_line}/q + /${blank_line}/!b subject + # Check the body of the message for problematic + # prefixes. + : body + n + /${scissors_line}/q + /${comment_line}/b body + /^diff -/{p;q;} + /^Index: /{p;q;} + b body + " "$1")" +if test -n "$line" +then + echo >&2 "Message contains a diff that will confuse 'git am'." + echo >&2 "To fix this indent the diff." + ret=1 +fi + +exit $ret diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rke2-1.36.1+rke2r1/.git/hooks/fsmonitor-watchman.sample new/rke2-1.36.1+rke2r2/.git/hooks/fsmonitor-watchman.sample --- old/rke2-1.36.1+rke2r1/.git/hooks/fsmonitor-watchman.sample 2026-05-14 20:16:53.000000000 +0200 +++ new/rke2-1.36.1+rke2r2/.git/hooks/fsmonitor-watchman.sample 2026-05-28 02:01:51.000000000 +0200 @@ -1,4 +1,4 @@ -#!/nix/store/55c9z5n6flgs7mcsw9rsy0ldnxkbxwnn-perl-5.40.0/bin/perl +#!/nix/store/6plwsm6pkq79yjv4xvy8csk2pd4hzr67-perl-5.42.0/bin/perl use strict; use warnings; @@ -29,8 +29,6 @@ my $git_work_tree = get_working_dir(); -my $retry = 1; - my $json_pkg; eval { require JSON::XS; @@ -123,8 +121,7 @@ sub is_work_tree_watched { my ($output) = @_; my $error = $output->{error}; - if ($retry > 0 and $error and $error =~ m/unable to resolve root .* directory (.*) is not watched/) { - $retry--; + if ($error and $error =~ m/unable to resolve root .* directory (.*) is not watched/) { my $response = qx/watchman watch "$git_work_tree"/; die "Failed to make watchman watch '$git_work_tree'.\n" . "Falling back to scanning...\n" if $? != 0; @@ -142,15 +139,12 @@ # Watchman query just to get it over with now so we won't pay # the cost in git to look up each individual file. my $o = watchman_clock(); - $error = $output->{error}; + $error = $o->{error}; die "Watchman: $error.\n" . "Falling back to scanning...\n" if $error; output_result($o->{clock}, ("/")); - $last_update_token = $o->{clock}; - - eval { launch_watchman() }; return 0; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rke2-1.36.1+rke2r1/.git/hooks/post-update.sample new/rke2-1.36.1+rke2r2/.git/hooks/post-update.sample --- old/rke2-1.36.1+rke2r1/.git/hooks/post-update.sample 2026-05-14 20:16:53.000000000 +0200 +++ new/rke2-1.36.1+rke2r2/.git/hooks/post-update.sample 2026-05-28 02:01:51.000000000 +0200 @@ -1,4 +1,4 @@ -#!/nix/store/3hgg7pr65imdrifqqh3flg3arvkc2r22-bash-5.3p3/bin/bash +#!/nix/store/gik3rh1vz2jlgnifb9dh6vc6sxwwz9jj-bash-5.3p9/bin/bash # # An example hook script to prepare a packed repository for use over # dumb transports. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rke2-1.36.1+rke2r1/.git/hooks/pre-applypatch.sample new/rke2-1.36.1+rke2r2/.git/hooks/pre-applypatch.sample --- old/rke2-1.36.1+rke2r1/.git/hooks/pre-applypatch.sample 2026-05-14 20:16:53.000000000 +0200 +++ new/rke2-1.36.1+rke2r2/.git/hooks/pre-applypatch.sample 2026-05-28 02:01:51.000000000 +0200 @@ -1,4 +1,4 @@ -#!/nix/store/3hgg7pr65imdrifqqh3flg3arvkc2r22-bash-5.3p3/bin/bash +#!/nix/store/gik3rh1vz2jlgnifb9dh6vc6sxwwz9jj-bash-5.3p9/bin/bash # # An example hook script to verify what is about to be committed # by applypatch from an e-mail message. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rke2-1.36.1+rke2r1/.git/hooks/pre-commit.sample new/rke2-1.36.1+rke2r2/.git/hooks/pre-commit.sample --- old/rke2-1.36.1+rke2r1/.git/hooks/pre-commit.sample 2026-05-14 20:16:53.000000000 +0200 +++ new/rke2-1.36.1+rke2r2/.git/hooks/pre-commit.sample 2026-05-28 02:01:51.000000000 +0200 @@ -1,4 +1,4 @@ -#!/nix/store/3hgg7pr65imdrifqqh3flg3arvkc2r22-bash-5.3p3/bin/bash +#!/nix/store/gik3rh1vz2jlgnifb9dh6vc6sxwwz9jj-bash-5.3p9/bin/bash # # An example hook script to verify what is about to be committed. # Called by "git commit" with no arguments. The hook should diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rke2-1.36.1+rke2r1/.git/hooks/pre-merge-commit.sample new/rke2-1.36.1+rke2r2/.git/hooks/pre-merge-commit.sample --- old/rke2-1.36.1+rke2r1/.git/hooks/pre-merge-commit.sample 2026-05-14 20:16:53.000000000 +0200 +++ new/rke2-1.36.1+rke2r2/.git/hooks/pre-merge-commit.sample 2026-05-28 02:01:51.000000000 +0200 @@ -1,4 +1,4 @@ -#!/nix/store/3hgg7pr65imdrifqqh3flg3arvkc2r22-bash-5.3p3/bin/bash +#!/nix/store/gik3rh1vz2jlgnifb9dh6vc6sxwwz9jj-bash-5.3p9/bin/bash # # An example hook script to verify what is about to be committed. # Called by "git merge" with no arguments. The hook should diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rke2-1.36.1+rke2r1/.git/hooks/pre-push.sample new/rke2-1.36.1+rke2r2/.git/hooks/pre-push.sample --- old/rke2-1.36.1+rke2r1/.git/hooks/pre-push.sample 2026-05-14 20:16:53.000000000 +0200 +++ new/rke2-1.36.1+rke2r2/.git/hooks/pre-push.sample 2026-05-28 02:01:51.000000000 +0200 @@ -1,4 +1,4 @@ -#!/nix/store/3hgg7pr65imdrifqqh3flg3arvkc2r22-bash-5.3p3/bin/bash +#!/nix/store/gik3rh1vz2jlgnifb9dh6vc6sxwwz9jj-bash-5.3p9/bin/bash # An example hook script to verify what is about to be pushed. Called by "git # push" after it has checked the remote status, but before anything has been diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rke2-1.36.1+rke2r1/.git/hooks/pre-rebase.sample new/rke2-1.36.1+rke2r2/.git/hooks/pre-rebase.sample --- old/rke2-1.36.1+rke2r1/.git/hooks/pre-rebase.sample 2026-05-14 20:16:53.000000000 +0200 +++ new/rke2-1.36.1+rke2r2/.git/hooks/pre-rebase.sample 2026-05-28 02:01:51.000000000 +0200 @@ -1,4 +1,4 @@ -#!/nix/store/3hgg7pr65imdrifqqh3flg3arvkc2r22-bash-5.3p3/bin/bash +#!/nix/store/gik3rh1vz2jlgnifb9dh6vc6sxwwz9jj-bash-5.3p9/bin/bash # # Copyright (c) 2006, 2008 Junio C Hamano # @@ -65,7 +65,7 @@ fi else not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"` - /nix/store/55c9z5n6flgs7mcsw9rsy0ldnxkbxwnn-perl-5.40.0/bin/perl -e ' + /nix/store/6plwsm6pkq79yjv4xvy8csk2pd4hzr67-perl-5.42.0/bin/perl -e ' my $topic = $ARGV[0]; my $msg = "* $topic has commits already merged to public branch:\n"; my (%not_in_next) = map { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rke2-1.36.1+rke2r1/.git/hooks/pre-receive.sample new/rke2-1.36.1+rke2r2/.git/hooks/pre-receive.sample --- old/rke2-1.36.1+rke2r1/.git/hooks/pre-receive.sample 2026-05-14 20:16:53.000000000 +0200 +++ new/rke2-1.36.1+rke2r2/.git/hooks/pre-receive.sample 2026-05-28 02:01:51.000000000 +0200 @@ -1,4 +1,4 @@ -#!/nix/store/3hgg7pr65imdrifqqh3flg3arvkc2r22-bash-5.3p3/bin/bash +#!/nix/store/gik3rh1vz2jlgnifb9dh6vc6sxwwz9jj-bash-5.3p9/bin/bash # # An example hook script to make use of push options. # The example simply echoes all push options that start with 'echoback=' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rke2-1.36.1+rke2r1/.git/hooks/prepare-commit-msg.sample new/rke2-1.36.1+rke2r2/.git/hooks/prepare-commit-msg.sample --- old/rke2-1.36.1+rke2r1/.git/hooks/prepare-commit-msg.sample 2026-05-14 20:16:53.000000000 +0200 +++ new/rke2-1.36.1+rke2r2/.git/hooks/prepare-commit-msg.sample 2026-05-28 02:01:51.000000000 +0200 @@ -1,4 +1,4 @@ -#!/nix/store/3hgg7pr65imdrifqqh3flg3arvkc2r22-bash-5.3p3/bin/bash +#!/nix/store/gik3rh1vz2jlgnifb9dh6vc6sxwwz9jj-bash-5.3p9/bin/bash # # An example hook script to prepare the commit log message. # Called by "git commit" with the name of the file that has the @@ -24,11 +24,11 @@ COMMIT_SOURCE=$2 SHA1=$3 -/nix/store/55c9z5n6flgs7mcsw9rsy0ldnxkbxwnn-perl-5.40.0/bin/perl -i.bak -ne 'print unless(m/^. Please enter the commit message/..m/^#$/)' "$COMMIT_MSG_FILE" +/nix/store/6plwsm6pkq79yjv4xvy8csk2pd4hzr67-perl-5.42.0/bin/perl -i.bak -ne 'print unless(m/^. Please enter the commit message/..m/^#$/)' "$COMMIT_MSG_FILE" # case "$COMMIT_SOURCE,$SHA1" in # ,|template,) -# /nix/store/55c9z5n6flgs7mcsw9rsy0ldnxkbxwnn-perl-5.40.0/bin/perl -i.bak -pe ' +# /nix/store/6plwsm6pkq79yjv4xvy8csk2pd4hzr67-perl-5.42.0/bin/perl -i.bak -pe ' # print "\n" . `git diff --cached --name-status -r` # if /^#/ && $first++ == 0' "$COMMIT_MSG_FILE" ;; # *) ;; @@ -38,5 +38,5 @@ # git interpret-trailers --in-place --trailer "$SOB" "$COMMIT_MSG_FILE" # if test -z "$COMMIT_SOURCE" # then -# /nix/store/55c9z5n6flgs7mcsw9rsy0ldnxkbxwnn-perl-5.40.0/bin/perl -i.bak -pe 'print "\n" if !$first_line++' "$COMMIT_MSG_FILE" +# /nix/store/6plwsm6pkq79yjv4xvy8csk2pd4hzr67-perl-5.42.0/bin/perl -i.bak -pe 'print "\n" if !$first_line++' "$COMMIT_MSG_FILE" # fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rke2-1.36.1+rke2r1/.git/hooks/push-to-checkout.sample new/rke2-1.36.1+rke2r2/.git/hooks/push-to-checkout.sample --- old/rke2-1.36.1+rke2r1/.git/hooks/push-to-checkout.sample 2026-05-14 20:16:53.000000000 +0200 +++ new/rke2-1.36.1+rke2r2/.git/hooks/push-to-checkout.sample 2026-05-28 02:01:51.000000000 +0200 @@ -1,4 +1,4 @@ -#!/nix/store/3hgg7pr65imdrifqqh3flg3arvkc2r22-bash-5.3p3/bin/bash +#!/nix/store/gik3rh1vz2jlgnifb9dh6vc6sxwwz9jj-bash-5.3p9/bin/bash # An example hook script to update a checked-out tree on a git push. # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rke2-1.36.1+rke2r1/.git/hooks/sendemail-validate.sample new/rke2-1.36.1+rke2r2/.git/hooks/sendemail-validate.sample --- old/rke2-1.36.1+rke2r1/.git/hooks/sendemail-validate.sample 2026-05-14 20:16:53.000000000 +0200 +++ new/rke2-1.36.1+rke2r2/.git/hooks/sendemail-validate.sample 2026-05-28 02:01:51.000000000 +0200 @@ -1,4 +1,4 @@ -#!/nix/store/3hgg7pr65imdrifqqh3flg3arvkc2r22-bash-5.3p3/bin/bash +#!/nix/store/gik3rh1vz2jlgnifb9dh6vc6sxwwz9jj-bash-5.3p9/bin/bash # An example hook script to validate a patch (and/or patch series) before # sending it via email. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rke2-1.36.1+rke2r1/.git/hooks/update.sample new/rke2-1.36.1+rke2r2/.git/hooks/update.sample --- old/rke2-1.36.1+rke2r1/.git/hooks/update.sample 2026-05-14 20:16:53.000000000 +0200 +++ new/rke2-1.36.1+rke2r2/.git/hooks/update.sample 2026-05-28 02:01:51.000000000 +0200 @@ -1,4 +1,4 @@ -#!/nix/store/3hgg7pr65imdrifqqh3flg3arvkc2r22-bash-5.3p3/bin/bash +#!/nix/store/gik3rh1vz2jlgnifb9dh6vc6sxwwz9jj-bash-5.3p9/bin/bash # # An example hook script to block unannotated tags from entering. # Called by "git receive-pack" with arguments: refname sha1-old sha1-new Binary files old/rke2-1.36.1+rke2r1/.git/index and new/rke2-1.36.1+rke2r2/.git/index differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rke2-1.36.1+rke2r1/.git/logs/HEAD new/rke2-1.36.1+rke2r2/.git/logs/HEAD --- old/rke2-1.36.1+rke2r1/.git/logs/HEAD 2026-05-14 20:16:53.000000000 +0200 +++ new/rke2-1.36.1+rke2r2/.git/logs/HEAD 2026-05-28 02:01:51.000000000 +0200 @@ -1,2 +1,2 @@ -0000000000000000000000000000000000000000 7d1fcc227f1915f6df51ecb208dd284c0ba93dec kastl <[email protected]> 1779280390 +0200 clone: from https://github.com/rancher/rke2 -7d1fcc227f1915f6df51ecb208dd284c0ba93dec b4a8e78038f35eb282a8d6e3c29797a1181fa961 kastl <[email protected]> 1779280390 +0200 checkout: moving from master to v1.36.1+rke2r1 +0000000000000000000000000000000000000000 252cfa243e3e2f2e4ca38f76c16245cd03076373 kastl <[email protected]> 1780375875 +0200 clone: from https://github.com/rancher/rke2 +252cfa243e3e2f2e4ca38f76c16245cd03076373 05cf623e2245271b63d1d7ef2caced897636175c kastl <[email protected]> 1780375875 +0200 checkout: moving from master to v1.36.1+rke2r2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rke2-1.36.1+rke2r1/.git/logs/refs/heads/master new/rke2-1.36.1+rke2r2/.git/logs/refs/heads/master --- old/rke2-1.36.1+rke2r1/.git/logs/refs/heads/master 2026-05-14 20:16:53.000000000 +0200 +++ new/rke2-1.36.1+rke2r2/.git/logs/refs/heads/master 2026-05-28 02:01:51.000000000 +0200 @@ -1 +1 @@ -0000000000000000000000000000000000000000 7d1fcc227f1915f6df51ecb208dd284c0ba93dec kastl <[email protected]> 1779280390 +0200 clone: from https://github.com/rancher/rke2 +0000000000000000000000000000000000000000 252cfa243e3e2f2e4ca38f76c16245cd03076373 kastl <[email protected]> 1780375875 +0200 clone: from https://github.com/rancher/rke2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rke2-1.36.1+rke2r1/.git/logs/refs/remotes/origin/HEAD new/rke2-1.36.1+rke2r2/.git/logs/refs/remotes/origin/HEAD --- old/rke2-1.36.1+rke2r1/.git/logs/refs/remotes/origin/HEAD 2026-05-14 20:16:53.000000000 +0200 +++ new/rke2-1.36.1+rke2r2/.git/logs/refs/remotes/origin/HEAD 2026-05-28 02:01:51.000000000 +0200 @@ -1 +1 @@ -0000000000000000000000000000000000000000 7d1fcc227f1915f6df51ecb208dd284c0ba93dec kastl <[email protected]> 1779280390 +0200 clone: from https://github.com/rancher/rke2 +0000000000000000000000000000000000000000 252cfa243e3e2f2e4ca38f76c16245cd03076373 kastl <[email protected]> 1780375875 +0200 clone: from https://github.com/rancher/rke2 Binary files old/rke2-1.36.1+rke2r1/.git/objects/pack/pack-21c8aa74ff42518ef07f87171e06159f75a7c2a5.idx and new/rke2-1.36.1+rke2r2/.git/objects/pack/pack-21c8aa74ff42518ef07f87171e06159f75a7c2a5.idx differ Binary files old/rke2-1.36.1+rke2r1/.git/objects/pack/pack-21c8aa74ff42518ef07f87171e06159f75a7c2a5.pack and new/rke2-1.36.1+rke2r2/.git/objects/pack/pack-21c8aa74ff42518ef07f87171e06159f75a7c2a5.pack differ Binary files old/rke2-1.36.1+rke2r1/.git/objects/pack/pack-21c8aa74ff42518ef07f87171e06159f75a7c2a5.rev and new/rke2-1.36.1+rke2r2/.git/objects/pack/pack-21c8aa74ff42518ef07f87171e06159f75a7c2a5.rev differ Binary files old/rke2-1.36.1+rke2r1/.git/objects/pack/pack-ca4acd9823dc20c0c95dce978551d645425e8ec3.idx and new/rke2-1.36.1+rke2r2/.git/objects/pack/pack-ca4acd9823dc20c0c95dce978551d645425e8ec3.idx differ Binary files old/rke2-1.36.1+rke2r1/.git/objects/pack/pack-ca4acd9823dc20c0c95dce978551d645425e8ec3.pack and new/rke2-1.36.1+rke2r2/.git/objects/pack/pack-ca4acd9823dc20c0c95dce978551d645425e8ec3.pack differ Binary files old/rke2-1.36.1+rke2r1/.git/objects/pack/pack-ca4acd9823dc20c0c95dce978551d645425e8ec3.rev and new/rke2-1.36.1+rke2r2/.git/objects/pack/pack-ca4acd9823dc20c0c95dce978551d645425e8ec3.rev differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rke2-1.36.1+rke2r1/.git/packed-refs new/rke2-1.36.1+rke2r2/.git/packed-refs --- old/rke2-1.36.1+rke2r1/.git/packed-refs 2026-05-14 20:16:53.000000000 +0200 +++ new/rke2-1.36.1+rke2r2/.git/packed-refs 2026-05-28 02:01:51.000000000 +0200 @@ -10,6 +10,7 @@ a3ca814f39367ebaea80402d5bcb01a0424cafed refs/remotes/origin/copilot/backport-pr-9590-release-1-32 a725e6e3d04ab220e5d31eea518acb3863c9f85f refs/remotes/origin/copilot/bump-latest-chart-images 2e47c22f45640d37dd0f7ea9c9deb24571654f26 refs/remotes/origin/copilot/check-axios-in-repository +b1647b27da82f221d781bd2f9139f6d3b9a27011 refs/remotes/origin/copilot/check-unused-dependencies b71ab4093cfcfce211850b1664385c7c34ea96c9 refs/remotes/origin/copilot/cherry-pick-pr-9590 6953922bb4f3ef404d4112cbad27b0c80ad1e02a refs/remotes/origin/copilot/cherry-pick-pr-9590-to-release-1-35 228ced060742fd9ba730892452de2e88d8c71a40 refs/remotes/origin/copilot/cherry-pick-pr9590-to-release-1-33 @@ -33,7 +34,7 @@ ae13a5302f0500f8ba2530beb525cb114cf9c9b7 refs/remotes/origin/dependabot/go_modules/github.com/ipld/go-ipld-prime-0.23.0 4981fe19ef2e246c7c61b3c80b1517d8f4264486 refs/remotes/origin/e2e.qase.report 6a6aafa7958fb3e04e5b370e1d9b4a2df6726d8a refs/remotes/origin/gh-pages -7d1fcc227f1915f6df51ecb208dd284c0ba93dec refs/remotes/origin/master +252cfa243e3e2f2e4ca38f76c16245cd03076373 refs/remotes/origin/master 3e0e3ba0ad85566ab8ff3fe9b2637654547dcf86 refs/remotes/origin/november_2025_master ad6f2bd5821f2ccea8dabc4b3a02ed54021bb24b refs/remotes/origin/release-1.18 9c031fcd2e6acb542d0e410fde0b8087a36d0fec refs/remotes/origin/release-1.19 @@ -50,10 +51,12 @@ 66f8993a6f9315ce760211954c1a6c28db36cf73 refs/remotes/origin/release-1.30 727f70ecadd1e07faa12f66ce6f1f26634d11fd1 refs/remotes/origin/release-1.31 6864a130b0e3349e0b0aacacdc184e65cac4a910 refs/remotes/origin/release-1.32 -2cf00d600ee7064fe19efee3e35195ad92c006ef refs/remotes/origin/release-1.33 -4fdfd151975bbc58c8d392620db8eea72fea2abc refs/remotes/origin/release-1.34 -e28e7c1a0404f1e9bf36e8b7222d64aec6b7a004 refs/remotes/origin/release-1.35 -b4a8e78038f35eb282a8d6e3c29797a1181fa961 refs/remotes/origin/release-1.36 +341f3e620b43d178daccfe5199f9cb752b0c3922 refs/remotes/origin/release-1.33 +b227fefe1936a550450ce3b6248c559fa58b5cd3 refs/remotes/origin/release-1.34 +a779b949d9a7987fc51e7c71c146db4160d0e3bf refs/remotes/origin/release-1.35 +05cf623e2245271b63d1d7ef2caced897636175c refs/remotes/origin/release-1.36 +b5ad7a30924446caf20b5a67d0ce663e9ba17083 refs/remotes/origin/updatecli_master_7f92e4a73cf4d04bf8b18a1b9c7787163915c22953548951af0d983b2b00ac47 +125fab0a3740fbf2041e4b1d6726094a257ccf21 refs/remotes/origin/updatecli_master_f651c63425e5b0d4cfc9e76c9aa889a0c676de0b84b41b5eaf85e7b107db9894 7a9a9c969d254518135879e1362c9faa2983efd0 refs/tags/v0.0.1-alpha.1 ce16c4ac8967c5b76dcaa5f73bb2287d0ef61b84 refs/tags/v0.0.1-alpha.2 880410a2b26b9654e582b3233990b5c781e03125 refs/tags/v0.0.1-alpha.3 @@ -1032,8 +1035,12 @@ 3e95cbc6dc0c9ed8811327f216ac65ce789a50a9 refs/tags/v1.33.11-rc2+rke2r1 9e559b0969f73df7242fd618386ffb475ae2d460 refs/tags/v1.33.11-rc3+rke2r1 2cf00d600ee7064fe19efee3e35195ad92c006ef refs/tags/v1.33.12+rke2r1 +341f3e620b43d178daccfe5199f9cb752b0c3922 refs/tags/v1.33.12+rke2r2 b9ca6801ae1dbc5a28f0f6c1aa365e0ee9f4f770 refs/tags/v1.33.12-rc1+rke2r1 +083b1084d3a39455f7ed9878818c3a0c3c40554d refs/tags/v1.33.12-rc1+rke2r2 2cf00d600ee7064fe19efee3e35195ad92c006ef refs/tags/v1.33.12-rc2+rke2r1 +bd7aabe70f36a0c9d3a39d2592833615c117fc60 refs/tags/v1.33.12-rc2+rke2r2 +341f3e620b43d178daccfe5199f9cb752b0c3922 refs/tags/v1.33.12-rc3+rke2r2 62de1b13c6405a51bb4804a1dae6c2a5a17cc090 refs/tags/v1.33.2+rke2r1 e6149680a7edefacb990905301926d7b5a749d53 refs/tags/v1.33.2-rc1+rke2r1 62de1b13c6405a51bb4804a1dae6c2a5a17cc090 refs/tags/v1.33.2-rc2+rke2r1 @@ -1107,8 +1114,12 @@ dd07fa6b26e4aab846526d8d4356d496f50c404b refs/tags/v1.34.7-rc2+rke2r1 6fb975ad761d191a245a4c0215843e8c19423ac9 refs/tags/v1.34.7-rc3+rke2r1 4fdfd151975bbc58c8d392620db8eea72fea2abc refs/tags/v1.34.8+rke2r1 +b227fefe1936a550450ce3b6248c559fa58b5cd3 refs/tags/v1.34.8+rke2r2 bc5d8fdfca2fd24304dffb4af5901e2f17499948 refs/tags/v1.34.8-rc1+rke2r1 +b54250d32f284166c9faf8ee8388b3965e068344 refs/tags/v1.34.8-rc1+rke2r2 4fdfd151975bbc58c8d392620db8eea72fea2abc refs/tags/v1.34.8-rc2+rke2r1 +89f6ba7044d691aa0830009cdf627e663aa64ec1 refs/tags/v1.34.8-rc2+rke2r2 +b227fefe1936a550450ce3b6248c559fa58b5cd3 refs/tags/v1.34.8-rc3+rke2r2 233368982cc7242d3eb01e22112343839e8e8f2d refs/tags/v1.35.0+rke2r1 703ad88111dc5f09b34c57d27527b65215afd0e3 refs/tags/v1.35.0+rke2r2 25ce2b8aa70af95611e0cd762079bbd1ee0006df refs/tags/v1.35.0+rke2r3 @@ -1137,12 +1148,20 @@ e71b69d66a3463014cb61c182a142b78856fdd5a refs/tags/v1.35.4-rc2+rke2r1 5dc4f4390d27d77b17b6506d8b22aed72aa4fbe6 refs/tags/v1.35.4-rc3+rke2r1 e28e7c1a0404f1e9bf36e8b7222d64aec6b7a004 refs/tags/v1.35.5+rke2r1 +a779b949d9a7987fc51e7c71c146db4160d0e3bf refs/tags/v1.35.5+rke2r2 08b4ca3eb3054fb54d57a9d702e1abb108505048 refs/tags/v1.35.5-rc1+rke2r1 +a6596eecfa30675f77d80f7873983799fd4d4113 refs/tags/v1.35.5-rc1+rke2r2 e28e7c1a0404f1e9bf36e8b7222d64aec6b7a004 refs/tags/v1.35.5-rc2+rke2r1 +e91ccb487322fedeae66c9a53433ed74d4b1e7ad refs/tags/v1.35.5-rc2+rke2r2 +a779b949d9a7987fc51e7c71c146db4160d0e3bf refs/tags/v1.35.5-rc3+rke2r2 9ffd006828b8824adf130458fde78909f611e5e0 refs/tags/v1.36.0+rke2r1 f551c5e35a0097af7479127a0d2bf7a90137549f refs/tags/v1.36.0-rc1+rke2r1 4ee930822935723884ad9a15dde203ae1ed2d986 refs/tags/v1.36.0-rc2+rke2r1 6c82cbe21490ba21af73260aefc724395c70ca6d refs/tags/v1.36.0-rc3+rke2r1 b4a8e78038f35eb282a8d6e3c29797a1181fa961 refs/tags/v1.36.1+rke2r1 +05cf623e2245271b63d1d7ef2caced897636175c refs/tags/v1.36.1+rke2r2 ec17a9a763cd69d4f4053ebd3f249d66a5c25083 refs/tags/v1.36.1-rc1+rke2r1 +60d7ba6b87426768803811aa868039d398a6761e refs/tags/v1.36.1-rc1+rke2r2 b4a8e78038f35eb282a8d6e3c29797a1181fa961 refs/tags/v1.36.1-rc2+rke2r1 +1e680efe89a27bedc7f98cd60f5954fc671468f9 refs/tags/v1.36.1-rc2+rke2r2 +05cf623e2245271b63d1d7ef2caced897636175c refs/tags/v1.36.1-rc3+rke2r2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rke2-1.36.1+rke2r1/.git/refs/heads/master new/rke2-1.36.1+rke2r2/.git/refs/heads/master --- old/rke2-1.36.1+rke2r1/.git/refs/heads/master 2026-05-14 20:16:53.000000000 +0200 +++ new/rke2-1.36.1+rke2r2/.git/refs/heads/master 2026-05-28 02:01:51.000000000 +0200 @@ -1 +1 @@ -7d1fcc227f1915f6df51ecb208dd284c0ba93dec +252cfa243e3e2f2e4ca38f76c16245cd03076373 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rke2-1.36.1+rke2r1/Dockerfile new/rke2-1.36.1+rke2r2/Dockerfile --- old/rke2-1.36.1+rke2r1/Dockerfile 2026-05-14 20:16:53.000000000 +0200 +++ new/rke2-1.36.1+rke2r2/Dockerfile 2026-05-28 02:01:51.000000000 +0200 @@ -150,7 +150,7 @@ FROM rancher/hardened-containerd:v2.2.3-k3s1-build20260512 AS containerd FROM rancher/hardened-crictl:v1.36.0-build20260512 AS crictl FROM rancher/hardened-runc:v1.4.2-build20260512 AS runc -FROM rancher/hardened-kubernetes:v1.36.1-rke2r1-build20260512 AS kubernetes +FROM rancher/hardened-kubernetes:v1.36.1-rke2r2-build20260521 AS kubernetes FROM scratch AS runtime-collect COPY --from=runc \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rke2-1.36.1+rke2r1/charts/chart_versions.yaml new/rke2-1.36.1+rke2r2/charts/chart_versions.yaml --- old/rke2-1.36.1+rke2r1/charts/chart_versions.yaml 2026-05-14 20:16:53.000000000 +0200 +++ new/rke2-1.36.1+rke2r2/charts/chart_versions.yaml 2026-05-28 02:01:51.000000000 +0200 @@ -5,17 +5,17 @@ - version: v3.32.0-build2026051100 filename: /charts/rke2-canal.yaml bootstrap: true - - version: v3.32.001 + - version: v3.32.003 filename: /charts/rke2-calico.yaml bootstrap: true - - version: v3.32.001 + - version: v3.32.003 filename: /charts/rke2-calico-crd.yaml bootstrap: true package: rke2-calico-crd - version: 1.45.212 filename: /charts/rke2-coredns.yaml bootstrap: true - - version: 4.14.508 + - version: 4.14.509 filename: /charts/rke2-ingress-nginx.yaml bootstrap: false - version: 39.0.703 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rke2-1.36.1+rke2r1/pkg/rke2/rke2_linux.go new/rke2-1.36.1+rke2r2/pkg/rke2/rke2_linux.go --- old/rke2-1.36.1+rke2r1/pkg/rke2/rke2_linux.go 2026-05-14 20:16:53.000000000 +0200 +++ new/rke2-1.36.1+rke2r2/pkg/rke2/rke2_linux.go 2026-05-28 02:01:51.000000000 +0200 @@ -34,6 +34,8 @@ // resolver's default registry will get updated later when bootstrapping if !clx.IsSet("system-default-registry") && clx.Bool("prime") { cfg.Images.SystemDefaultRegistry = images.PrimeRegistry + // By setting system-default-registry, we ensure that K3s sets the klipper-helm registry correctly + clx.Set("system-default-registry", images.PrimeRegistry) } else { cfg.Images.SystemDefaultRegistry = clx.String("system-default-registry") } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rke2-1.36.1+rke2r1/scripts/build-images new/rke2-1.36.1+rke2r2/scripts/build-images --- old/rke2-1.36.1+rke2r1/scripts/build-images 2026-05-14 20:16:53.000000000 +0200 +++ new/rke2-1.36.1+rke2r2/scripts/build-images 2026-05-28 02:01:51.000000000 +0200 @@ -21,7 +21,7 @@ PULL_CMD_CORE="${PULL_CMD_CORE:-docker image pull --quiet}" INGRESS_NGINX_HARDENED_TAG=v1.14.5-hardened2 -INGRESS_NGINX_PRIME_TAG=v1.14.5-prime6 +INGRESS_NGINX_PRIME_TAG=v1.14.5-prime7 INGRESS_NGINX_IMAGES=" ${REGISTRY}/rancher/kube-webhook-certgen:${INGRESS_NGINX_HARDENED_TAG} ${REGISTRY}/rancher/nginx-ingress-controller:${INGRESS_NGINX_HARDENED_TAG}" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rke2-1.36.1+rke2r1/scripts/version.sh new/rke2-1.36.1+rke2r2/scripts/version.sh --- old/rke2-1.36.1+rke2r1/scripts/version.sh 2026-05-14 20:16:53.000000000 +0200 +++ new/rke2-1.36.1+rke2r2/scripts/version.sh 2026-05-28 02:01:51.000000000 +0200 @@ -35,9 +35,9 @@ # hardcode versions unless set specifically ETCD_VERSION=${ETCD_VERSION:-v3.6.7-k3s1} KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.36.1} -KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.36.1-rke2r1-build20260512} +KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.36.1-rke2r2-build20260521} PAUSE_VERSION=${PAUSE_VERSION:-3.6} -CCM_VERSION=${CCM_VERSION:-v1.36.0-rc2.0.20260427154526-d239025e2a23-build20260429} +CCM_VERSION=${CCM_VERSION:-v1.36.1-0.20260508014929-7bbbf7c9b258-build20260515} KLIPPERHELM_VERSION=${KLIPPERHELM_VERSION:-v0.10.0-build20260513} KLIPPERLB_VERSION=${KLIPPERLB_VERSION:-v0.4.17} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rke2-1.36.1+rke2r1/tests/docker/prime/prime_test.go new/rke2-1.36.1+rke2r2/tests/docker/prime/prime_test.go --- old/rke2-1.36.1+rke2r1/tests/docker/prime/prime_test.go 2026-05-14 20:16:53.000000000 +0200 +++ new/rke2-1.36.1+rke2r2/tests/docker/prime/prime_test.go 2026-05-28 02:01:51.000000000 +0200 @@ -32,7 +32,7 @@ var err error tc, err = docker.NewTestConfig() Expect(err).NotTo(HaveOccurred()) - tc.ServerYaml = "prime: true\n" + tc.ServerYaml = "prime: true\ningress-controller: ingress-nginx" Expect(tc.ProvisionServers(*serverCount)).To(Succeed()) Expect(tc.ProvisionAgents(*agentCount)).To(Succeed()) Expect(docker.RestartCluster(append(tc.Servers, tc.Agents...))).To(Succeed()) @@ -55,10 +55,6 @@ Expect(err).NotTo(HaveOccurred(), "failed to get images from kube-system pods") images := strings.Split(res, " ") for _, image := range images { - // The test binary we use still embeds the DockerHub klipper-lb image - if strings.Contains(image, "klipper-helm") || strings.Contains(image, "rancher/hardened-kubernetes") { - continue - } Expect(image).To(ContainSubstring(*registry)) } }) ++++++ rke2.obsinfo ++++++ --- /var/tmp/diff_new_pack.qtHcwN/_old 2026-06-02 16:08:29.745285873 +0200 +++ /var/tmp/diff_new_pack.qtHcwN/_new 2026-06-02 16:08:29.757286371 +0200 @@ -1,5 +1,5 @@ name: rke2 -version: 1.36.1+rke2r1 -mtime: 1778782613 -commit: b4a8e78038f35eb282a8d6e3c29797a1181fa961 +version: 1.36.1+rke2r2 +mtime: 1779926511 +commit: 05cf623e2245271b63d1d7ef2caced897636175c ++++++ vendor.tar.gz ++++++ /work/SRC/openSUSE:Factory/rke2/vendor.tar.gz /work/SRC/openSUSE:Factory/.rke2.new.1937/vendor.tar.gz differ: char 16, line 1
