Skip to content

Commit

Permalink
Merge pull request #3015 from neolit123/1.30-update-super-admin-test-…
Browse files Browse the repository at this point in the history 
…after-upgrade

kinder: apply yet another fix for super-admin workflow
  • Loading branch information
@k8s-ci-robot
k8s-ci-robot authored Feb 7, 2024
2 parents 49d7749 + 4830cc0 commit 90085a9
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
3 changes: 1 addition & 2 deletions kinder/ci/tools/update-workflows/templates/workflows/super-admin-tasks.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -200,9 +200,8 @@ tasks:
${CMD} test -f /etc/kubernetes/admin.conf || exit 1
${CMD} test -f /etc/kubernetes/super-admin.conf && exit 1
# Check certificate subject for .conf files
# Check certificate subject for admin.conf
${CMD} grep 'client-certificate-data' /etc/kubernetes/admin.conf | awk '{print $2}' | base64 -d | openssl x509 -subject -noout | grep "subject=O = kubeadm:cluster-admins, CN = kubernetes-admin" || exit 1
${CMD} grep 'client-certificate-data' /etc/kubernetes/super-admin.conf | awk '{print $2}' | base64 -d | openssl x509 -subject -noout | grep "subject=O = system:masters, CN = kubernetes-super-admin" || exit 1
# Check certificate subject for apiserver-kubelet-client.crt
${CMD} openssl x509 -subject -noout -in /etc/kubernetes/pki/apiserver-kubelet-client.crt | grep "subject=O = kubeadm:cluster-admins, CN = kube-apiserver-kubelet-client" || exit 1
Expand Down
3 changes: 1 addition & 2 deletions kinder/ci/workflows/super-admin-tasks.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,9 +201,8 @@ tasks:
${CMD} test -f /etc/kubernetes/admin.conf || exit 1
${CMD} test -f /etc/kubernetes/super-admin.conf && exit 1
# Check certificate subject for .conf files
# Check certificate subject for admin.conf
${CMD} grep 'client-certificate-data' /etc/kubernetes/admin.conf | awk '{print $2}' | base64 -d | openssl x509 -subject -noout | grep "subject=O = kubeadm:cluster-admins, CN = kubernetes-admin" || exit 1
${CMD} grep 'client-certificate-data' /etc/kubernetes/super-admin.conf | awk '{print $2}' | base64 -d | openssl x509 -subject -noout | grep "subject=O = system:masters, CN = kubernetes-super-admin" || exit 1
# Check certificate subject for apiserver-kubelet-client.crt
${CMD} openssl x509 -subject -noout -in /etc/kubernetes/pki/apiserver-kubelet-client.crt | grep "subject=O = kubeadm:cluster-admins, CN = kube-apiserver-kubelet-client" || exit 1
Expand Down

0 comments on commit 90085a9

Please sign in to comment.