admin/kubesphere
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update dependencies

Browse Source 
Signed-off-by: hongming <talonwan@yunify.com>
This commit is contained in:
hongming
2020-12-22 16:48:26 +08:00
parent 4a11a50544
commit fe6c5de00f
2857 changed files with 252134 additions and 115656 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/controller/globalrolebinding/globalrolebinding_controller.go
View File

@@ -17,6 +17,7 @@ limitations under the License.
package globalrolebinding
import (
"context"
"encoding/json"
"fmt"
corev1 "k8s.io/api/core/v1"
@@ -314,7 +315,7 @@ func (c *Controller) assignClusterAdminRole(globalRoleBinding *iamv1alpha2.Globa
return err
}
_, err = c.k8sClient.RbacV1().ClusterRoleBindings().Create(clusterRoleBinding)
_, err = c.k8sClient.RbacV1().ClusterRoleBindings().Create(context.Background(), clusterRoleBinding, metav1.CreateOptions{})
if err != nil {
if errors.IsAlreadyExists(err) {
return nil
@@ -373,7 +374,7 @@ func (c *Controller) createFederatedGlobalRoleBinding(globalRoleBinding *iamv1al
AbsPath(fmt.Sprintf("/apis/%s/%s/%s", iamv1alpha2.FedGlobalRoleBindingResource.Group,
iamv1alpha2.FedGlobalRoleBindingResource.Version, iamv1alpha2.FedGlobalRoleBindingResource.Name)).
Body(data).
Do().Error()
Do(context.Background()).Error()
if err != nil {
if errors.IsAlreadyExists(err) {
return nil
@@ -398,7 +399,7 @@ func (c *Controller) updateFederatedGlobalRoleBinding(federatedGlobalRoleBinding
iamv1alpha2.FedGlobalRoleBindingResource.Version, iamv1alpha2.FedGlobalRoleBindingResource.Name,
federatedGlobalRoleBinding.Name)).
Body(data).
Do().Error()
Do(context.Background()).Error()
if err != nil {
if errors.IsNotFound(err) {
return nil
@@ -416,7 +417,7 @@ func (c *Controller) ensureNotControlledByKubefed(globalRoleBinding *iamv1alpha2
}
globalRoleBinding = globalRoleBinding.DeepCopy()
globalRoleBinding.Labels[constants.KubefedManagedLabel] = "false"
_, err := c.ksClient.IamV1alpha2().GlobalRoleBindings().Update(globalRoleBinding)
_, err := c.ksClient.IamV1alpha2().GlobalRoleBindings().Update(context.Background(), globalRoleBinding, metav1.UpdateOptions{})
if err != nil {
klog.Error(err)
}