Skip to content
This repository has been archived by the owner on Jun 26, 2023. It is now read-only.

[MTB] changed validation check for tenantnamespaces #949

Merged
merged 1 commit into from
Jul 28, 2020
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 4 additions & 14 deletions benchmarks/kubectl-mtb/internal/kubectl-mtb/run.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ limitations under the License.
package kubectl

import (
"context"
"fmt"
"strings"
"time"
Expand All @@ -27,7 +28,6 @@ import (
"sigs.k8s.io/multi-tenancy/benchmarks/kubectl-mtb/internal/reporter"
"sigs.k8s.io/multi-tenancy/benchmarks/kubectl-mtb/pkg/benchmark"
"sigs.k8s.io/multi-tenancy/benchmarks/kubectl-mtb/test"
"sigs.k8s.io/multi-tenancy/benchmarks/kubectl-mtb/test/utils"
)

var (
Expand Down Expand Up @@ -141,21 +141,11 @@ func validateFlags(cmd *cobra.Command) error {
return err
}

resource := utils.GroupResource{
APIGroup: "",
APIResource: metav1.APIResource{
Name: "namespaces",
},
ResourceName: tenantNamespace,
}
// checks if tenant-admin and tenant namespace are valid
access, _, err := utils.RunAccessCheck(tenantClient, "", resource, "get")
_, err = k8sClient.CoreV1().Namespaces().Get(context.TODO(), tenantNamespace, metav1.GetOptions{})
if err != nil {
return err
}
if !access {
return fmt.Errorf("Make sure you have entered valid tenant-admin and tenant namespace. ")
return fmt.Errorf("tenantnamespace is not a valid namespace")
}

return nil
}

Expand Down