Hello community, here is the log from the commit of package kubernetes for openSUSE:Factory checked in at 2020-04-09 23:14:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kubernetes (Old) and /work/SRC/openSUSE:Factory/.kubernetes.new.3248 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kubernetes" Thu Apr 9 23:14:12 2020 rev:59 rq:791773 version:1.18.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kubernetes/kubernetes.changes 2020-04-05 20:52:18.809111913 +0200 +++ /work/SRC/openSUSE:Factory/.kubernetes.new.3248/kubernetes.changes 2020-04-09 23:14:13.562201881 +0200 @@ -1,0 +2,5 @@ +Mon Apr 6 10:23:14 UTC 2020 - Robert Munteanu <[email protected]> + +- Add fix-spn-prefix-added.patch, fixing upstream issue #89672 + +------------------------------------------------------------------- New: ---- fix-spn-prefix-added.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kubernetes.spec ++++++ --- /var/tmp/diff_new_pack.0pyBwh/_old 2020-04-09 23:14:14.862202633 +0200 +++ /var/tmp/diff_new_pack.0pyBwh/_new 2020-04-09 23:14:14.866202635 +0200 @@ -53,6 +53,8 @@ Patch3: opensuse-version-checks.patch # Patch to change the default flexvolume path in kubeadm to match that used by our kubelet, else kubeadm tries to write to /usr when kubelet is already looking at a path on /var thanks to the fix to bsc#1084766 Patch4: kubeadm-opensuse-flexvolume.patch +# Fix https://github.com/kubernetes/kubernetes/issues/89672 +Patch5: fix-spn-prefix-added.patch BuildRequires: bash-completion BuildRequires: fdupes BuildRequires: git @@ -182,6 +184,7 @@ %patch2 -p0 %patch3 -p1 %patch4 -p0 +%patch5 -p1 %build # This is fixing bug bsc#1065972 ++++++ fix-spn-prefix-added.patch ++++++ >From 77bd7c8a8b29dced5a06c232485ab6de1306c087 Mon Sep 17 00:00:00 2001 From: Weinong Wang <[email protected]> Date: Tue, 31 Mar 2020 15:59:37 -0700 Subject: [PATCH] fix a bug where spn: prefix is unexpectedly added to kubeconfig apiserver-id setting --- .../plugin/pkg/client/auth/azure/azure.go | 5 +- .../pkg/client/auth/azure/azure_test.go | 142 ++++++++++++------ 2 files changed, 103 insertions(+), 44 deletions(-) diff --git a/staging/src/k8s.io/client-go/plugin/pkg/client/auth/azure/azure.go b/staging/src/k8s.io/client-go/plugin/pkg/client/auth/azure/azure.go index 2746536b2a6e5..fded604a3c7db 100644 --- a/staging/src/k8s.io/client-go/plugin/pkg/client/auth/azure/azure.go +++ b/staging/src/k8s.io/client-go/plugin/pkg/client/auth/azure/azure.go @@ -307,8 +307,9 @@ func (ts *azureTokenSource) retrieveTokenFromCfg() (*azureToken, error) { if expiresOn == "" { return nil, fmt.Errorf("no expiresOn in cfg: %s", cfgExpiresOn) } + tokenAudience := resourceID if ts.configMode == configModeDefault { - resourceID = fmt.Sprintf("spn:%s", resourceID) + tokenAudience = fmt.Sprintf("spn:%s", resourceID) } return &azureToken{ @@ -318,7 +319,7 @@ func (ts *azureTokenSource) retrieveTokenFromCfg() (*azureToken, error) { ExpiresIn: json.Number(expiresIn), ExpiresOn: json.Number(expiresOn), NotBefore: json.Number(expiresOn), - Resource: resourceID, + Resource: tokenAudience, Type: tokenType, }, environment: environment,
