7bb760620f
This PR reworks auth controller to use informer framework. It also fix the problem of tenant and user not created. Change-Id: I017032f2eb4d83440319729d9f1fb13351f4d72b Closes-Bug: 1702841 Signed-off-by: Pengfei Ni <feiskyer@gmail.com>
66 lines
1.8 KiB
Go
66 lines
1.8 KiB
Go
package auth
|
|
|
|
import (
|
|
"reflect"
|
|
"time"
|
|
|
|
crv1 "git.openstack.org/openstack/stackube/pkg/apis/v1"
|
|
"git.openstack.org/openstack/stackube/pkg/util"
|
|
|
|
apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
|
|
apiextensionsclient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
|
|
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
|
"k8s.io/apimachinery/pkg/util/wait"
|
|
apiv1 "k8s.io/client-go/pkg/api/v1"
|
|
"k8s.io/client-go/rest"
|
|
)
|
|
|
|
const (
|
|
tenantCRDName = crv1.TenantResourcePlural + "." + crv1.GroupName
|
|
)
|
|
|
|
func CreateTenantCRD(clientset apiextensionsclient.Interface) (*apiextensionsv1beta1.CustomResourceDefinition, error) {
|
|
crd := &apiextensionsv1beta1.CustomResourceDefinition{
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Name: tenantCRDName,
|
|
},
|
|
Spec: apiextensionsv1beta1.CustomResourceDefinitionSpec{
|
|
Group: crv1.GroupName,
|
|
Version: crv1.SchemeGroupVersion.Version,
|
|
Scope: apiextensionsv1beta1.NamespaceScoped,
|
|
Names: apiextensionsv1beta1.CustomResourceDefinitionNames{
|
|
Plural: crv1.TenantResourcePlural,
|
|
Kind: reflect.TypeOf(crv1.Tenant{}).Name(),
|
|
},
|
|
},
|
|
}
|
|
_, err := clientset.ApiextensionsV1beta1().CustomResourceDefinitions().Create(crd)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
// wait for CRD being established
|
|
if err = util.WaitForCRDReady(clientset, tenantCRDName); err != nil {
|
|
return nil, err
|
|
} else {
|
|
return crd, nil
|
|
}
|
|
}
|
|
|
|
func WaitForTenantInstanceProcessed(kubeClient *rest.RESTClient, name string) error {
|
|
return wait.Poll(100*time.Millisecond, 10*time.Second, func() (bool, error) {
|
|
var tenant crv1.Tenant
|
|
err := kubeClient.Get().
|
|
Resource(crv1.TenantResourcePlural).
|
|
Namespace(apiv1.NamespaceDefault).
|
|
Name(name).
|
|
Do().Into(&tenant)
|
|
|
|
if err == nil && tenant.Status.State == crv1.TenantActive {
|
|
return true, nil
|
|
}
|
|
|
|
return false, err
|
|
})
|
|
}
|