From 39fae17fb191d0c7be6dfaf57cf20bfc093beb55 Mon Sep 17 00:00:00 2001 From: Takashi IIGUNI Date: Thu, 13 Aug 2020 03:02:14 +0000 Subject: [PATCH] ci: cleanup clusterrolebindings `anon-user-access` clusterrolebinding is created when installing rook operator. However each test suite does not delete the clusterrolebinding, and cause errors. This PR skip creating the clusterrolebinding in each suite if it already exists. Signed-off-by: Takashi IIGUNI --- tests/framework/utils/k8s_helper.go | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/tests/framework/utils/k8s_helper.go b/tests/framework/utils/k8s_helper.go index d4d1c59a0..3aa957e8e 100644 --- a/tests/framework/utils/k8s_helper.go +++ b/tests/framework/utils/k8s_helper.go @@ -1564,15 +1564,18 @@ func (k8sh *K8sHelper) appendContainerLogs(file *os.File, pod v1.Pod, containerN // CreateAnonSystemClusterBinding Creates anon-user-access clusterrolebinding for cluster-admin role - used by kubeadm env. func (k8sh *K8sHelper) CreateAnonSystemClusterBinding() { - args := []string{"create", "clusterrolebinding", "anon-user-access", "--clusterrole", "cluster-admin", "--user", "system:anonymous"} - _, err := k8sh.Kubectl(args...) + _, err := k8sh.Clientset.RbacV1beta1().ClusterRoleBindings().Get("anon-user-access", metav1.GetOptions{}) if err != nil { - logger.Warningf("anon-user-access not created") - return + logger.Warningf("anon-user-access clusterrolebinding not found. %v", err) + args := []string{"create", "clusterrolebinding", "anon-user-access", "--clusterrole", "cluster-admin", "--user", "system:anonymous"} + _, err := k8sh.Kubectl(args...) + if err != nil { + logger.Errorf("failed to create anon-user-access. %v", err) + return + } + logger.Info("anon-user-access creation completed, waiting for it to exist in API") } - logger.Infof("anon-user-access creation completed, waiting for it to exist in API") - for i := 0; i < RetryLoop; i++ { var err error if _, err = k8sh.Clientset.RbacV1beta1().ClusterRoleBindings().Get("anon-user-access", metav1.GetOptions{}); err == nil {