weiguoqiang/cert-manager
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #6647 from wallrj/fix-e2e-with-k8s-1.29

Browse Source 
Fix E2E test failure caused by hard coded group names which are no longer used in Kubernetes >=1.29
This commit is contained in:
jetstack-bot 2024-01-17 12:42:36 +00:00 committed by GitHub
commit 8f82135125
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
test/e2e/suite/certificaterequests/approval/userinfo.go
View File

@ -34,6 +34,7 @@ import (
cmmeta "github.com/cert-manager/cert-manager/pkg/apis/meta/v1"
clientset "github.com/cert-manager/cert-manager/pkg/client/clientset/versioned"
"github.com/cert-manager/cert-manager/pkg/util"
"github.com/cert-manager/cert-manager/pkg/util/pki"
"github.com/cert-manager/cert-manager/test/unit/gen"
)
@ -45,8 +46,15 @@ var _ = framework.CertManagerDescribe("UserInfo CertificateRequests", func() {
It("should appropriately create set UserInfo of CertificateRequests, and reject changes", func() {
var (
adminUsername = "kubernetes-admin"
adminGroups = []string{"system:masters", "system:authenticated"}
)
// Kubeadm >= 1.29 changed the groups of the admin user from
// system:masters to kubeadm:cluster-admins, so instead of hard coding
// the group names we try and read them from the client certificate.
// https://github.com/kubernetes/kubeadm/issues/2414
cert, err := pki.DecodeX509CertificateBytes(f.KubeClientConfig.CertData)
Expect(err).NotTo(HaveOccurred())
adminGroups := append([]string{"system:authenticated"}, cert.Subject.Organization...)
csr, _, err := gen.CSR(x509.RSA)
Expect(err).NotTo(HaveOccurred())