decoupling Jenkins and LDAP
Signed-off-by: hongming <talonwan@yunify.com>
This commit is contained in:
137
config/crds/iam.kubesphere.io_users.yaml
generated
137
config/crds/iam.kubesphere.io_users.yaml
generated
@@ -1,6 +1,6 @@
|
|||||||
|
|
||||||
---
|
---
|
||||||
apiVersion: apiextensions.k8s.io/v1beta1
|
apiVersion: apiextensions.k8s.io/v1
|
||||||
kind: CustomResourceDefinition
|
kind: CustomResourceDefinition
|
||||||
metadata:
|
metadata:
|
||||||
annotations:
|
annotations:
|
||||||
@@ -8,13 +8,6 @@ metadata:
|
|||||||
creationTimestamp: null
|
creationTimestamp: null
|
||||||
name: users.iam.kubesphere.io
|
name: users.iam.kubesphere.io
|
||||||
spec:
|
spec:
|
||||||
additionalPrinterColumns:
|
|
||||||
- JSONPath: .spec.email
|
|
||||||
name: Email
|
|
||||||
type: string
|
|
||||||
- JSONPath: .status.state
|
|
||||||
name: Status
|
|
||||||
type: string
|
|
||||||
group: iam.kubesphere.io
|
group: iam.kubesphere.io
|
||||||
names:
|
names:
|
||||||
categories:
|
categories:
|
||||||
@@ -24,73 +17,73 @@ spec:
|
|||||||
plural: users
|
plural: users
|
||||||
singular: user
|
singular: user
|
||||||
scope: Cluster
|
scope: Cluster
|
||||||
subresources:
|
|
||||||
status: {}
|
|
||||||
validation:
|
|
||||||
openAPIV3Schema:
|
|
||||||
description: User is the Schema for the users API
|
|
||||||
properties:
|
|
||||||
apiVersion:
|
|
||||||
description: 'APIVersion defines the versioned schema of this representation
|
|
||||||
of an object. Servers should convert recognized schemas to the latest
|
|
||||||
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
|
|
||||||
type: string
|
|
||||||
kind:
|
|
||||||
description: 'Kind is a string value representing the REST resource this
|
|
||||||
object represents. Servers may infer this from the endpoint the client
|
|
||||||
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
|
|
||||||
type: string
|
|
||||||
metadata:
|
|
||||||
description: Standard object's metadata.
|
|
||||||
type: object
|
|
||||||
spec:
|
|
||||||
description: UserSpec defines the desired state of User
|
|
||||||
properties:
|
|
||||||
description:
|
|
||||||
description: Description of the user.
|
|
||||||
type: string
|
|
||||||
displayName:
|
|
||||||
type: string
|
|
||||||
email:
|
|
||||||
description: Unique email address(https://www.ietf.org/rfc/rfc5322.txt).
|
|
||||||
type: string
|
|
||||||
groups:
|
|
||||||
items:
|
|
||||||
type: string
|
|
||||||
type: array
|
|
||||||
lang:
|
|
||||||
description: The preferred written or spoken language for the user.
|
|
||||||
type: string
|
|
||||||
password:
|
|
||||||
description: password will be encrypted by mutating admission webhook
|
|
||||||
type: string
|
|
||||||
required:
|
|
||||||
- email
|
|
||||||
type: object
|
|
||||||
status:
|
|
||||||
description: UserStatus defines the observed state of User
|
|
||||||
properties:
|
|
||||||
lastLoginTime:
|
|
||||||
description: Last login attempt timestamp
|
|
||||||
format: date-time
|
|
||||||
type: string
|
|
||||||
lastTransitionTime:
|
|
||||||
format: date-time
|
|
||||||
type: string
|
|
||||||
reason:
|
|
||||||
type: string
|
|
||||||
state:
|
|
||||||
description: The user status
|
|
||||||
type: string
|
|
||||||
type: object
|
|
||||||
required:
|
|
||||||
- spec
|
|
||||||
type: object
|
|
||||||
version: v1alpha2
|
|
||||||
versions:
|
versions:
|
||||||
- name: v1alpha2
|
- additionalPrinterColumns:
|
||||||
|
- jsonPath: .spec.email
|
||||||
|
name: Email
|
||||||
|
type: string
|
||||||
|
- jsonPath: .status.state
|
||||||
|
name: Status
|
||||||
|
type: string
|
||||||
|
name: v1alpha2
|
||||||
|
schema:
|
||||||
|
openAPIV3Schema:
|
||||||
|
description: User is the Schema for the users API
|
||||||
|
properties:
|
||||||
|
apiVersion:
|
||||||
|
description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
|
||||||
|
type: string
|
||||||
|
kind:
|
||||||
|
description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
|
||||||
|
type: string
|
||||||
|
metadata:
|
||||||
|
type: object
|
||||||
|
spec:
|
||||||
|
description: UserSpec defines the desired state of User
|
||||||
|
properties:
|
||||||
|
description:
|
||||||
|
description: Description of the user.
|
||||||
|
type: string
|
||||||
|
displayName:
|
||||||
|
type: string
|
||||||
|
email:
|
||||||
|
description: Unique email address(https://www.ietf.org/rfc/rfc5322.txt).
|
||||||
|
type: string
|
||||||
|
groups:
|
||||||
|
items:
|
||||||
|
type: string
|
||||||
|
type: array
|
||||||
|
lang:
|
||||||
|
description: The preferred written or spoken language for the user.
|
||||||
|
type: string
|
||||||
|
password:
|
||||||
|
description: password will be encrypted by mutating admission webhook
|
||||||
|
type: string
|
||||||
|
required:
|
||||||
|
- email
|
||||||
|
type: object
|
||||||
|
status:
|
||||||
|
description: UserStatus defines the observed state of User
|
||||||
|
properties:
|
||||||
|
lastLoginTime:
|
||||||
|
description: Last login attempt timestamp
|
||||||
|
format: date-time
|
||||||
|
type: string
|
||||||
|
lastTransitionTime:
|
||||||
|
format: date-time
|
||||||
|
type: string
|
||||||
|
reason:
|
||||||
|
type: string
|
||||||
|
state:
|
||||||
|
description: The user status
|
||||||
|
type: string
|
||||||
|
type: object
|
||||||
|
required:
|
||||||
|
- spec
|
||||||
|
type: object
|
||||||
served: true
|
served: true
|
||||||
storage: true
|
storage: true
|
||||||
|
subresources: {}
|
||||||
status:
|
status:
|
||||||
acceptedNames:
|
acceptedNames:
|
||||||
kind: ""
|
kind: ""
|
||||||
|
|||||||
@@ -59,6 +59,7 @@ const (
|
|||||||
WorkspaceRoleAnnotation = "iam.kubesphere.io/workspacerole"
|
WorkspaceRoleAnnotation = "iam.kubesphere.io/workspacerole"
|
||||||
ClusterRoleAnnotation = "iam.kubesphere.io/clusterrole"
|
ClusterRoleAnnotation = "iam.kubesphere.io/clusterrole"
|
||||||
UninitializedAnnotation = "iam.kubesphere.io/uninitialized"
|
UninitializedAnnotation = "iam.kubesphere.io/uninitialized"
|
||||||
|
LastPasswordChangeTimeAnnotation = "iam.kubesphere.io/last-password-change-time"
|
||||||
RoleAnnotation = "iam.kubesphere.io/role"
|
RoleAnnotation = "iam.kubesphere.io/role"
|
||||||
RoleTemplateLabel = "iam.kubesphere.io/role-template"
|
RoleTemplateLabel = "iam.kubesphere.io/role-template"
|
||||||
ScopeLabelFormat = "scope.kubesphere.io/%s"
|
ScopeLabelFormat = "scope.kubesphere.io/%s"
|
||||||
@@ -96,7 +97,6 @@ const (
|
|||||||
// +kubebuilder:printcolumn:name="Email",type="string",JSONPath=".spec.email"
|
// +kubebuilder:printcolumn:name="Email",type="string",JSONPath=".spec.email"
|
||||||
// +kubebuilder:printcolumn:name="Status",type="string",JSONPath=".status.state"
|
// +kubebuilder:printcolumn:name="Status",type="string",JSONPath=".status.state"
|
||||||
// +kubebuilder:resource:categories="iam",scope="Cluster"
|
// +kubebuilder:resource:categories="iam",scope="Cluster"
|
||||||
// +kubebuilder:subresource:status
|
|
||||||
type User struct {
|
type User struct {
|
||||||
metav1.TypeMeta `json:",inline"`
|
metav1.TypeMeta `json:",inline"`
|
||||||
// Standard object's metadata.
|
// Standard object's metadata.
|
||||||
|
|||||||
@@ -161,7 +161,7 @@ func (c *loginRecordController) updateUserLastLoginTime(user *iamv1alpha2.User,
|
|||||||
if user.DeletionTimestamp.IsZero() &&
|
if user.DeletionTimestamp.IsZero() &&
|
||||||
(user.Status.LastLoginTime == nil || user.Status.LastLoginTime.Before(&loginRecord.CreationTimestamp)) {
|
(user.Status.LastLoginTime == nil || user.Status.LastLoginTime.Before(&loginRecord.CreationTimestamp)) {
|
||||||
user.Status.LastLoginTime = &loginRecord.CreationTimestamp
|
user.Status.LastLoginTime = &loginRecord.CreationTimestamp
|
||||||
_, err := c.ksClient.IamV1alpha2().Users().UpdateStatus(context.Background(), user, metav1.UpdateOptions{})
|
_, err := c.ksClient.IamV1alpha2().Users().Update(context.Background(), user, metav1.UpdateOptions{})
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
|
|||||||
@@ -112,7 +112,6 @@ var _ = Describe("LoginRecord", func() {
|
|||||||
newObject := user.DeepCopy()
|
newObject := user.DeepCopy()
|
||||||
newObject.Status.LastLoginTime = &loginRecord.CreationTimestamp
|
newObject.Status.LastLoginTime = &loginRecord.CreationTimestamp
|
||||||
updateAction := clienttesting.NewUpdateAction(iamv1alpha2.SchemeGroupVersion.WithResource(iamv1alpha2.ResourcesPluralUser), "", newObject)
|
updateAction := clienttesting.NewUpdateAction(iamv1alpha2.SchemeGroupVersion.WithResource(iamv1alpha2.ResourcesPluralUser), "", newObject)
|
||||||
updateAction.Subresource = "status"
|
|
||||||
Expect(actions[0]).Should(Equal(updateAction))
|
Expect(actions[0]).Should(Equal(updateAction))
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -23,6 +23,8 @@ import (
|
|||||||
"reflect"
|
"reflect"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
|
utilwait "k8s.io/apimachinery/pkg/util/wait"
|
||||||
|
|
||||||
"kubesphere.io/kubesphere/pkg/controller/utils/controller"
|
"kubesphere.io/kubesphere/pkg/controller/utils/controller"
|
||||||
|
|
||||||
"golang.org/x/crypto/bcrypt"
|
"golang.org/x/crypto/bcrypt"
|
||||||
@@ -65,7 +67,10 @@ const (
|
|||||||
messageResourceSynced = "User synced successfully"
|
messageResourceSynced = "User synced successfully"
|
||||||
controllerName = "user-controller"
|
controllerName = "user-controller"
|
||||||
// user finalizer
|
// user finalizer
|
||||||
finalizer = "finalizers.kubesphere.io/users"
|
finalizer = "finalizers.kubesphere.io/users"
|
||||||
|
interval = time.Second
|
||||||
|
timeout = 15 * time.Second
|
||||||
|
syncFailMessage = "Failed to sync: %s"
|
||||||
)
|
)
|
||||||
|
|
||||||
type userController struct {
|
type userController struct {
|
||||||
@@ -165,44 +170,42 @@ func (c *userController) reconcile(key string) error {
|
|||||||
// then lets add the finalizer and update the object.
|
// then lets add the finalizer and update the object.
|
||||||
if !sliceutil.HasString(user.Finalizers, finalizer) {
|
if !sliceutil.HasString(user.Finalizers, finalizer) {
|
||||||
user.ObjectMeta.Finalizers = append(user.ObjectMeta.Finalizers, finalizer)
|
user.ObjectMeta.Finalizers = append(user.ObjectMeta.Finalizers, finalizer)
|
||||||
|
|
||||||
if user, err = c.ksClient.IamV1alpha2().Users().Update(context.Background(), user, metav1.UpdateOptions{}); err != nil {
|
if user, err = c.ksClient.IamV1alpha2().Users().Update(context.Background(), user, metav1.UpdateOptions{}); err != nil {
|
||||||
|
klog.Error(err)
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// The object is being deleted
|
// The object is being deleted
|
||||||
if sliceutil.HasString(user.ObjectMeta.Finalizers, finalizer) {
|
if sliceutil.HasString(user.ObjectMeta.Finalizers, finalizer) {
|
||||||
|
|
||||||
klog.V(4).Infof("delete user %s", key)
|
|
||||||
// we do not need to delete the user from ldapServer when ldapClient is nil
|
// we do not need to delete the user from ldapServer when ldapClient is nil
|
||||||
if c.ldapClient != nil {
|
if c.ldapClient != nil {
|
||||||
if err = c.ldapClient.Delete(key); err != nil && err != ldapclient.ErrUserNotExists {
|
if err = c.waitForDeleteFromLDAP(key); err != nil {
|
||||||
klog.Error(err)
|
// ignore timeout error
|
||||||
return err
|
c.recorder.Event(user, corev1.EventTypeWarning, controller.FailedSynced, fmt.Sprintf(syncFailMessage, err))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if err = c.deleteRoleBindings(user); err != nil {
|
if err = c.deleteRoleBindings(user); err != nil {
|
||||||
klog.Error(err)
|
c.recorder.Event(user, corev1.EventTypeWarning, controller.FailedSynced, fmt.Sprintf(syncFailMessage, err))
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
if err = c.deleteGroupBindings(user); err != nil {
|
if err = c.deleteGroupBindings(user); err != nil {
|
||||||
klog.Error(err)
|
c.recorder.Event(user, corev1.EventTypeWarning, controller.FailedSynced, fmt.Sprintf(syncFailMessage, err))
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
if c.devopsClient != nil {
|
if c.devopsClient != nil {
|
||||||
// unassign jenkins role, unassign multiple times is allowed
|
// unassign jenkins role, unassign multiple times is allowed
|
||||||
if err = c.unassignDevOpsAdminRole(user); err != nil {
|
if err = c.waitForUnassignDevOpsAdminRole(user); err != nil {
|
||||||
klog.Error(err)
|
// ignore timeout error
|
||||||
return err
|
c.recorder.Event(user, corev1.EventTypeWarning, controller.FailedSynced, fmt.Sprintf(syncFailMessage, err))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if err = c.deleteLoginRecords(user); err != nil {
|
if err = c.deleteLoginRecords(user); err != nil {
|
||||||
klog.Error(err)
|
c.recorder.Event(user, corev1.EventTypeWarning, controller.FailedSynced, fmt.Sprintf(syncFailMessage, err))
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -212,6 +215,7 @@ func (c *userController) reconcile(key string) error {
|
|||||||
})
|
})
|
||||||
|
|
||||||
if user, err = c.ksClient.IamV1alpha2().Users().Update(context.Background(), user, metav1.UpdateOptions{}); err != nil {
|
if user, err = c.ksClient.IamV1alpha2().Users().Update(context.Background(), user, metav1.UpdateOptions{}); err != nil {
|
||||||
|
klog.Error(err)
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -222,9 +226,10 @@ func (c *userController) reconcile(key string) error {
|
|||||||
|
|
||||||
// we do not need to sync ldap info when ldapClient is nil
|
// we do not need to sync ldap info when ldapClient is nil
|
||||||
if c.ldapClient != nil {
|
if c.ldapClient != nil {
|
||||||
if err = c.ldapSync(user); err != nil {
|
// ignore errors if timeout
|
||||||
klog.Error(err)
|
if err = c.waitForSyncToLDAP(user); err != nil {
|
||||||
return err
|
// ignore timeout error
|
||||||
|
c.recorder.Event(user, corev1.EventTypeWarning, controller.FailedSynced, fmt.Sprintf(syncFailMessage, err))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -242,6 +247,7 @@ func (c *userController) reconcile(key string) error {
|
|||||||
// ensure user kubeconfig configmap is created
|
// ensure user kubeconfig configmap is created
|
||||||
if err = c.kubeconfig.CreateKubeConfig(user); err != nil {
|
if err = c.kubeconfig.CreateKubeConfig(user); err != nil {
|
||||||
klog.Error(err)
|
klog.Error(err)
|
||||||
|
c.recorder.Event(user, corev1.EventTypeWarning, controller.FailedSynced, fmt.Sprintf(syncFailMessage, err))
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -249,16 +255,16 @@ func (c *userController) reconcile(key string) error {
|
|||||||
if c.devopsClient != nil {
|
if c.devopsClient != nil {
|
||||||
// assign jenkins role after user create, assign multiple times is allowed
|
// assign jenkins role after user create, assign multiple times is allowed
|
||||||
// used as logged-in users can do anything
|
// used as logged-in users can do anything
|
||||||
if err = c.assignDevOpsAdminRole(user); err != nil {
|
if err = c.waitForAssignDevOpsAdminRole(user); err != nil {
|
||||||
klog.Error(err)
|
// ignore timeout error
|
||||||
return err
|
c.recorder.Event(user, corev1.EventTypeWarning, controller.FailedSynced, fmt.Sprintf(syncFailMessage, err))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// synchronization through kubefed-controller when multi cluster is enabled
|
// synchronization through kubefed-controller when multi cluster is enabled
|
||||||
if c.multiClusterEnabled {
|
if c.multiClusterEnabled {
|
||||||
if err = c.multiClusterSync(user); err != nil {
|
if err = c.multiClusterSync(user); err != nil {
|
||||||
klog.Error(err)
|
c.recorder.Event(user, corev1.EventTypeWarning, controller.FailedSynced, fmt.Sprintf(syncFailMessage, err))
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -280,6 +286,7 @@ func (c *userController) encryptPassword(user *iamv1alpha2.User) (*iamv1alpha2.U
|
|||||||
if user.Annotations == nil {
|
if user.Annotations == nil {
|
||||||
user.Annotations = make(map[string]string)
|
user.Annotations = make(map[string]string)
|
||||||
}
|
}
|
||||||
|
user.Annotations[iamv1alpha2.LastPasswordChangeTimeAnnotation] = time.Now().UTC().Format(time.RFC3339)
|
||||||
// ensure plain text password won't be kept anywhere
|
// ensure plain text password won't be kept anywhere
|
||||||
delete(user.Annotations, corev1.LastAppliedConfigAnnotation)
|
delete(user.Annotations, corev1.LastAppliedConfigAnnotation)
|
||||||
return c.ksClient.IamV1alpha2().Users().Update(context.Background(), user, metav1.UpdateOptions{})
|
return c.ksClient.IamV1alpha2().Users().Update(context.Background(), user, metav1.UpdateOptions{})
|
||||||
@@ -303,7 +310,6 @@ func (c *userController) ensureNotControlledByKubefed(user *iamv1alpha2.User) er
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (c *userController) multiClusterSync(user *iamv1alpha2.User) error {
|
func (c *userController) multiClusterSync(user *iamv1alpha2.User) error {
|
||||||
|
|
||||||
if err := c.ensureNotControlledByKubefed(user); err != nil {
|
if err := c.ensureNotControlledByKubefed(user); err != nil {
|
||||||
klog.Error(err)
|
klog.Error(err)
|
||||||
return err
|
return err
|
||||||
@@ -399,44 +405,71 @@ func (c *userController) updateFederatedUser(fedUser *iamv1alpha2.FederatedUser)
|
|||||||
if errors.IsNotFound(err) {
|
if errors.IsNotFound(err) {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
return err
|
klog.Error(err)
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *userController) assignDevOpsAdminRole(user *iamv1alpha2.User) error {
|
|
||||||
if err := c.devopsClient.AssignGlobalRole(modelsdevops.JenkinsAdminRoleName, user.Name); err != nil {
|
|
||||||
klog.Errorf("%+v", err)
|
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *userController) unassignDevOpsAdminRole(user *iamv1alpha2.User) error {
|
func (c *userController) waitForAssignDevOpsAdminRole(user *iamv1alpha2.User) error {
|
||||||
if err := c.devopsClient.UnAssignGlobalRole(modelsdevops.JenkinsAdminRoleName, user.Name); err != nil {
|
err := utilwait.PollImmediate(interval, timeout, func() (done bool, err error) {
|
||||||
klog.Errorf("%+v", err)
|
if err := c.devopsClient.AssignGlobalRole(modelsdevops.JenkinsAdminRoleName, user.Name); err != nil {
|
||||||
return err
|
klog.Error(err)
|
||||||
}
|
return false, err
|
||||||
return nil
|
}
|
||||||
|
return true, nil
|
||||||
|
})
|
||||||
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *userController) ldapSync(user *iamv1alpha2.User) error {
|
func (c *userController) waitForUnassignDevOpsAdminRole(user *iamv1alpha2.User) error {
|
||||||
|
err := utilwait.PollImmediate(interval, timeout, func() (done bool, err error) {
|
||||||
|
if err := c.devopsClient.UnAssignGlobalRole(modelsdevops.JenkinsAdminRoleName, user.Name); err != nil {
|
||||||
|
return false, err
|
||||||
|
}
|
||||||
|
return true, nil
|
||||||
|
})
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *userController) waitForSyncToLDAP(user *iamv1alpha2.User) error {
|
||||||
if isEncrypted(user.Spec.EncryptedPassword) {
|
if isEncrypted(user.Spec.EncryptedPassword) {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
_, err := c.ldapClient.Get(user.Name)
|
err := utilwait.PollImmediate(interval, timeout, func() (done bool, err error) {
|
||||||
if err != nil {
|
_, err = c.ldapClient.Get(user.Name)
|
||||||
if err == ldapclient.ErrUserNotExists {
|
if err != nil {
|
||||||
klog.V(4).Infof("create user %s", user.Name)
|
if err == ldapclient.ErrUserNotExists {
|
||||||
return c.ldapClient.Create(user)
|
err = c.ldapClient.Create(user)
|
||||||
|
if err != nil {
|
||||||
|
klog.Error(err)
|
||||||
|
return false, err
|
||||||
|
}
|
||||||
|
return true, nil
|
||||||
|
}
|
||||||
|
klog.Error(err)
|
||||||
|
return false, err
|
||||||
}
|
}
|
||||||
klog.Error(err)
|
err = c.ldapClient.Update(user)
|
||||||
return err
|
if err != nil {
|
||||||
} else {
|
klog.Error(err)
|
||||||
klog.V(4).Infof("update user %s", user.Name)
|
return false, err
|
||||||
return c.ldapClient.Update(user)
|
}
|
||||||
}
|
return true, nil
|
||||||
|
})
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *userController) waitForDeleteFromLDAP(username string) error {
|
||||||
|
err := utilwait.PollImmediate(interval, timeout, func() (done bool, err error) {
|
||||||
|
err = c.ldapClient.Delete(username)
|
||||||
|
if err != nil && err != ldapclient.ErrUserNotExists {
|
||||||
|
klog.Error(err)
|
||||||
|
return false, err
|
||||||
|
}
|
||||||
|
return true, nil
|
||||||
|
})
|
||||||
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *userController) deleteGroupBindings(user *iamv1alpha2.User) error {
|
func (c *userController) deleteGroupBindings(user *iamv1alpha2.User) error {
|
||||||
@@ -486,7 +519,6 @@ func (c *userController) deleteRoleBindings(user *iamv1alpha2.User) error {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -504,45 +536,45 @@ func (c *userController) deleteLoginRecords(user *iamv1alpha2.User) error {
|
|||||||
|
|
||||||
// syncUserStatus will reconcile user state based on user login records
|
// syncUserStatus will reconcile user state based on user login records
|
||||||
func (c *userController) syncUserStatus(user *iamv1alpha2.User) (*iamv1alpha2.User, error) {
|
func (c *userController) syncUserStatus(user *iamv1alpha2.User) (*iamv1alpha2.User, error) {
|
||||||
// disabled user, nothing to do
|
|
||||||
if user.Status.State != nil && *user.Status.State == iamv1alpha2.UserDisabled {
|
if user.Spec.EncryptedPassword == "" {
|
||||||
|
if user.Labels[iamv1alpha2.IdentifyProviderLabel] != "" {
|
||||||
|
// mapped user from other identity provider always active until disabled
|
||||||
|
if user.Status.State == nil || *user.Status.State != iamv1alpha2.UserActive {
|
||||||
|
expected := user.DeepCopy()
|
||||||
|
active := iamv1alpha2.UserActive
|
||||||
|
expected.Status = iamv1alpha2.UserStatus{
|
||||||
|
State: &active,
|
||||||
|
LastTransitionTime: &metav1.Time{Time: time.Now()},
|
||||||
|
}
|
||||||
|
return c.ksClient.IamV1alpha2().Users().Update(context.Background(), expected, metav1.UpdateOptions{})
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// becomes disabled after setting a blank password
|
||||||
|
if user.Status.State == nil || *user.Status.State != iamv1alpha2.UserDisabled {
|
||||||
|
expected := user.DeepCopy()
|
||||||
|
disabled := iamv1alpha2.UserDisabled
|
||||||
|
expected.Status = iamv1alpha2.UserStatus{
|
||||||
|
State: &disabled,
|
||||||
|
LastTransitionTime: &metav1.Time{Time: time.Now()},
|
||||||
|
}
|
||||||
|
return c.ksClient.IamV1alpha2().Users().Update(context.Background(), expected, metav1.UpdateOptions{})
|
||||||
|
}
|
||||||
|
}
|
||||||
return user, nil
|
return user, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// mapped user from other identity provider always active until disabled
|
|
||||||
if user.Spec.EncryptedPassword == "" &&
|
|
||||||
user.Labels[iamv1alpha2.IdentifyProviderLabel] != "" &&
|
|
||||||
(user.Status.State == nil || *user.Status.State != iamv1alpha2.UserActive) {
|
|
||||||
expected := user.DeepCopy()
|
|
||||||
active := iamv1alpha2.UserActive
|
|
||||||
expected.Status = iamv1alpha2.UserStatus{
|
|
||||||
State: &active,
|
|
||||||
LastTransitionTime: &metav1.Time{Time: time.Now()},
|
|
||||||
}
|
|
||||||
return c.ksClient.IamV1alpha2().Users().UpdateStatus(context.Background(), expected, metav1.UpdateOptions{})
|
|
||||||
}
|
|
||||||
|
|
||||||
// becomes inactive after setting a blank password
|
|
||||||
if user.Spec.EncryptedPassword == "" &&
|
|
||||||
user.Labels[iamv1alpha2.IdentifyProviderLabel] == "" {
|
|
||||||
expected := user.DeepCopy()
|
|
||||||
expected.Status = iamv1alpha2.UserStatus{
|
|
||||||
State: nil,
|
|
||||||
LastTransitionTime: &metav1.Time{Time: time.Now()},
|
|
||||||
}
|
|
||||||
return c.ksClient.IamV1alpha2().Users().UpdateStatus(context.Background(), expected, metav1.UpdateOptions{})
|
|
||||||
}
|
|
||||||
|
|
||||||
// becomes active after password encrypted
|
// becomes active after password encrypted
|
||||||
if isEncrypted(user.Spec.EncryptedPassword) &&
|
if isEncrypted(user.Spec.EncryptedPassword) {
|
||||||
user.Status.State == nil {
|
if user.Status.State == nil || *user.Status.State == iamv1alpha2.UserDisabled {
|
||||||
expected := user.DeepCopy()
|
expected := user.DeepCopy()
|
||||||
active := iamv1alpha2.UserActive
|
active := iamv1alpha2.UserActive
|
||||||
expected.Status = iamv1alpha2.UserStatus{
|
expected.Status = iamv1alpha2.UserStatus{
|
||||||
State: &active,
|
State: &active,
|
||||||
LastTransitionTime: &metav1.Time{Time: time.Now()},
|
LastTransitionTime: &metav1.Time{Time: time.Now()},
|
||||||
|
}
|
||||||
|
return c.ksClient.IamV1alpha2().Users().Update(context.Background(), expected, metav1.UpdateOptions{})
|
||||||
}
|
}
|
||||||
return c.ksClient.IamV1alpha2().Users().UpdateStatus(context.Background(), expected, metav1.UpdateOptions{})
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// blocked user, check if need to unblock user
|
// blocked user, check if need to unblock user
|
||||||
@@ -556,7 +588,7 @@ func (c *userController) syncUserStatus(user *iamv1alpha2.User) (*iamv1alpha2.Us
|
|||||||
State: &active,
|
State: &active,
|
||||||
LastTransitionTime: &metav1.Time{Time: time.Now()},
|
LastTransitionTime: &metav1.Time{Time: time.Now()},
|
||||||
}
|
}
|
||||||
return c.ksClient.IamV1alpha2().Users().UpdateStatus(context.Background(), expected, metav1.UpdateOptions{})
|
return c.ksClient.IamV1alpha2().Users().Update(context.Background(), expected, metav1.UpdateOptions{})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -588,7 +620,7 @@ func (c *userController) syncUserStatus(user *iamv1alpha2.User) (*iamv1alpha2.Us
|
|||||||
}
|
}
|
||||||
// block user for AuthenticateRateLimiterDuration duration, after that put it back to the queue to unblock
|
// block user for AuthenticateRateLimiterDuration duration, after that put it back to the queue to unblock
|
||||||
c.Workqueue.AddAfter(user.Name, c.authenticationOptions.AuthenticateRateLimiterDuration)
|
c.Workqueue.AddAfter(user.Name, c.authenticationOptions.AuthenticateRateLimiterDuration)
|
||||||
return c.ksClient.IamV1alpha2().Users().UpdateStatus(context.Background(), expect, metav1.UpdateOptions{})
|
return c.ksClient.IamV1alpha2().Users().Update(context.Background(), expect, metav1.UpdateOptions{})
|
||||||
}
|
}
|
||||||
|
|
||||||
return user, nil
|
return user, nil
|
||||||
|
|||||||
@@ -196,6 +196,10 @@ func checkAction(expected, actual core.Action, t *testing.T) {
|
|||||||
user := object.(*iamv1alpha2.User)
|
user := object.(*iamv1alpha2.User)
|
||||||
expUser.Status.LastTransitionTime = nil
|
expUser.Status.LastTransitionTime = nil
|
||||||
user.Status.LastTransitionTime = nil
|
user.Status.LastTransitionTime = nil
|
||||||
|
if user.Status.State != nil {
|
||||||
|
disabled := iamv1alpha2.UserDisabled
|
||||||
|
expUser.Status.State = &disabled
|
||||||
|
}
|
||||||
if !reflect.DeepEqual(expUser, user) {
|
if !reflect.DeepEqual(expUser, user) {
|
||||||
t.Errorf("Action %s %s has wrong object\nDiff:\n %s",
|
t.Errorf("Action %s %s has wrong object\nDiff:\n %s",
|
||||||
a.GetVerb(), a.GetResource().Resource, diff.ObjectGoPrintSideBySide(expObject, object))
|
a.GetVerb(), a.GetResource().Resource, diff.ObjectGoPrintSideBySide(expObject, object))
|
||||||
@@ -239,7 +243,6 @@ func (f *fixture) expectUpdateUserStatusAction(user *iamv1alpha2.User) {
|
|||||||
|
|
||||||
expect = expect.DeepCopy()
|
expect = expect.DeepCopy()
|
||||||
action = core.NewUpdateAction(schema.GroupVersionResource{Resource: "users"}, "", expect)
|
action = core.NewUpdateAction(schema.GroupVersionResource{Resource: "users"}, "", expect)
|
||||||
action.Subresource = "status"
|
|
||||||
f.actions = append(f.actions, action)
|
f.actions = append(f.actions, action)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -171,8 +171,6 @@ func (l *ldapInterfaceImpl) newConn() (ldap.Client, error) {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
defer conn.Close()
|
|
||||||
|
|
||||||
err = conn.Bind(l.managerDN, l.managerPassword)
|
err = conn.Bind(l.managerDN, l.managerPassword)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
|
|||||||
2
vendor/modules.txt
vendored
2
vendor/modules.txt
vendored
@@ -1601,6 +1601,7 @@ sigs.k8s.io/controller-runtime/pkg/cache/internal
|
|||||||
sigs.k8s.io/controller-runtime/pkg/client
|
sigs.k8s.io/controller-runtime/pkg/client
|
||||||
sigs.k8s.io/controller-runtime/pkg/client/apiutil
|
sigs.k8s.io/controller-runtime/pkg/client/apiutil
|
||||||
sigs.k8s.io/controller-runtime/pkg/client/config
|
sigs.k8s.io/controller-runtime/pkg/client/config
|
||||||
|
sigs.k8s.io/controller-runtime/pkg/client/fake
|
||||||
sigs.k8s.io/controller-runtime/pkg/controller
|
sigs.k8s.io/controller-runtime/pkg/controller
|
||||||
sigs.k8s.io/controller-runtime/pkg/controller/controllerutil
|
sigs.k8s.io/controller-runtime/pkg/controller/controllerutil
|
||||||
sigs.k8s.io/controller-runtime/pkg/conversion
|
sigs.k8s.io/controller-runtime/pkg/conversion
|
||||||
@@ -1612,6 +1613,7 @@ sigs.k8s.io/controller-runtime/pkg/healthz
|
|||||||
sigs.k8s.io/controller-runtime/pkg/internal/controller
|
sigs.k8s.io/controller-runtime/pkg/internal/controller
|
||||||
sigs.k8s.io/controller-runtime/pkg/internal/controller/metrics
|
sigs.k8s.io/controller-runtime/pkg/internal/controller/metrics
|
||||||
sigs.k8s.io/controller-runtime/pkg/internal/log
|
sigs.k8s.io/controller-runtime/pkg/internal/log
|
||||||
|
sigs.k8s.io/controller-runtime/pkg/internal/objectutil
|
||||||
sigs.k8s.io/controller-runtime/pkg/internal/recorder
|
sigs.k8s.io/controller-runtime/pkg/internal/recorder
|
||||||
sigs.k8s.io/controller-runtime/pkg/internal/testing/integration
|
sigs.k8s.io/controller-runtime/pkg/internal/testing/integration
|
||||||
sigs.k8s.io/controller-runtime/pkg/internal/testing/integration/addr
|
sigs.k8s.io/controller-runtime/pkg/internal/testing/integration/addr
|
||||||
|
|||||||
409
vendor/sigs.k8s.io/controller-runtime/pkg/client/fake/client.go
generated
vendored
Normal file
409
vendor/sigs.k8s.io/controller-runtime/pkg/client/fake/client.go
generated
vendored
Normal file
@@ -0,0 +1,409 @@
|
|||||||
|
/*
|
||||||
|
Copyright 2018 The Kubernetes Authors.
|
||||||
|
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package fake
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"encoding/json"
|
||||||
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
"strconv"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
apierrors "k8s.io/apimachinery/pkg/api/errors"
|
||||||
|
"k8s.io/apimachinery/pkg/api/meta"
|
||||||
|
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||||
|
"k8s.io/apimachinery/pkg/runtime"
|
||||||
|
"k8s.io/apimachinery/pkg/runtime/schema"
|
||||||
|
utilrand "k8s.io/apimachinery/pkg/util/rand"
|
||||||
|
"k8s.io/apimachinery/pkg/util/validation/field"
|
||||||
|
"k8s.io/client-go/kubernetes/scheme"
|
||||||
|
"k8s.io/client-go/testing"
|
||||||
|
|
||||||
|
"sigs.k8s.io/controller-runtime/pkg/client"
|
||||||
|
"sigs.k8s.io/controller-runtime/pkg/client/apiutil"
|
||||||
|
"sigs.k8s.io/controller-runtime/pkg/internal/objectutil"
|
||||||
|
)
|
||||||
|
|
||||||
|
type versionedTracker struct {
|
||||||
|
testing.ObjectTracker
|
||||||
|
}
|
||||||
|
|
||||||
|
type fakeClient struct {
|
||||||
|
tracker versionedTracker
|
||||||
|
scheme *runtime.Scheme
|
||||||
|
}
|
||||||
|
|
||||||
|
var _ client.Client = &fakeClient{}
|
||||||
|
|
||||||
|
const (
|
||||||
|
maxNameLength = 63
|
||||||
|
randomLength = 5
|
||||||
|
maxGeneratedNameLength = maxNameLength - randomLength
|
||||||
|
)
|
||||||
|
|
||||||
|
// NewFakeClient creates a new fake client for testing.
|
||||||
|
// You can choose to initialize it with a slice of runtime.Object.
|
||||||
|
// Deprecated: use NewFakeClientWithScheme. You should always be
|
||||||
|
// passing an explicit Scheme.
|
||||||
|
func NewFakeClient(initObjs ...runtime.Object) client.Client {
|
||||||
|
return NewFakeClientWithScheme(scheme.Scheme, initObjs...)
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewFakeClientWithScheme creates a new fake client with the given scheme
|
||||||
|
// for testing.
|
||||||
|
// You can choose to initialize it with a slice of runtime.Object.
|
||||||
|
func NewFakeClientWithScheme(clientScheme *runtime.Scheme, initObjs ...runtime.Object) client.Client {
|
||||||
|
tracker := testing.NewObjectTracker(clientScheme, scheme.Codecs.UniversalDecoder())
|
||||||
|
for _, obj := range initObjs {
|
||||||
|
err := tracker.Add(obj)
|
||||||
|
if err != nil {
|
||||||
|
panic(fmt.Errorf("failed to add object %v to fake client: %w", obj, err))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return &fakeClient{
|
||||||
|
tracker: versionedTracker{tracker},
|
||||||
|
scheme: clientScheme,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (t versionedTracker) Create(gvr schema.GroupVersionResource, obj runtime.Object, ns string) error {
|
||||||
|
accessor, err := meta.Accessor(obj)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if accessor.GetName() == "" {
|
||||||
|
return apierrors.NewInvalid(
|
||||||
|
obj.GetObjectKind().GroupVersionKind().GroupKind(),
|
||||||
|
accessor.GetName(),
|
||||||
|
field.ErrorList{field.Required(field.NewPath("metadata.name"), "name is required")})
|
||||||
|
}
|
||||||
|
if accessor.GetResourceVersion() != "" {
|
||||||
|
return apierrors.NewBadRequest("resourceVersion can not be set for Create requests")
|
||||||
|
}
|
||||||
|
accessor.SetResourceVersion("1")
|
||||||
|
if err := t.ObjectTracker.Create(gvr, obj, ns); err != nil {
|
||||||
|
accessor.SetResourceVersion("")
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (t versionedTracker) Update(gvr schema.GroupVersionResource, obj runtime.Object, ns string) error {
|
||||||
|
accessor, err := meta.Accessor(obj)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("failed to get accessor for object: %v", err)
|
||||||
|
}
|
||||||
|
if accessor.GetName() == "" {
|
||||||
|
return apierrors.NewInvalid(
|
||||||
|
obj.GetObjectKind().GroupVersionKind().GroupKind(),
|
||||||
|
accessor.GetName(),
|
||||||
|
field.ErrorList{field.Required(field.NewPath("metadata.name"), "name is required")})
|
||||||
|
}
|
||||||
|
oldObject, err := t.ObjectTracker.Get(gvr, ns, accessor.GetName())
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
oldAccessor, err := meta.Accessor(oldObject)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if accessor.GetResourceVersion() != oldAccessor.GetResourceVersion() {
|
||||||
|
return apierrors.NewConflict(gvr.GroupResource(), accessor.GetName(), errors.New("object was modified"))
|
||||||
|
}
|
||||||
|
if oldAccessor.GetResourceVersion() == "" {
|
||||||
|
oldAccessor.SetResourceVersion("0")
|
||||||
|
}
|
||||||
|
intResourceVersion, err := strconv.ParseUint(oldAccessor.GetResourceVersion(), 10, 64)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("can not convert resourceVersion %q to int: %v", oldAccessor.GetResourceVersion(), err)
|
||||||
|
}
|
||||||
|
intResourceVersion++
|
||||||
|
accessor.SetResourceVersion(strconv.FormatUint(intResourceVersion, 10))
|
||||||
|
return t.ObjectTracker.Update(gvr, obj, ns)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *fakeClient) Get(ctx context.Context, key client.ObjectKey, obj runtime.Object) error {
|
||||||
|
gvr, err := getGVRFromObject(obj, c.scheme)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
o, err := c.tracker.Get(gvr, key.Namespace, key.Name)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
gvk, err := apiutil.GVKForObject(obj, c.scheme)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
ta, err := meta.TypeAccessor(o)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
ta.SetKind(gvk.Kind)
|
||||||
|
ta.SetAPIVersion(gvk.GroupVersion().String())
|
||||||
|
|
||||||
|
j, err := json.Marshal(o)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
decoder := scheme.Codecs.UniversalDecoder()
|
||||||
|
_, _, err = decoder.Decode(j, nil, obj)
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *fakeClient) List(ctx context.Context, obj runtime.Object, opts ...client.ListOption) error {
|
||||||
|
gvk, err := apiutil.GVKForObject(obj, c.scheme)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
OriginalKind := gvk.Kind
|
||||||
|
|
||||||
|
if !strings.HasSuffix(gvk.Kind, "List") {
|
||||||
|
return fmt.Errorf("non-list type %T (kind %q) passed as output", obj, gvk)
|
||||||
|
}
|
||||||
|
// we need the non-list GVK, so chop off the "List" from the end of the kind
|
||||||
|
gvk.Kind = gvk.Kind[:len(gvk.Kind)-4]
|
||||||
|
|
||||||
|
listOpts := client.ListOptions{}
|
||||||
|
listOpts.ApplyOptions(opts)
|
||||||
|
|
||||||
|
gvr, _ := meta.UnsafeGuessKindToResource(gvk)
|
||||||
|
o, err := c.tracker.List(gvr, gvk, listOpts.Namespace)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
ta, err := meta.TypeAccessor(o)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
ta.SetKind(OriginalKind)
|
||||||
|
ta.SetAPIVersion(gvk.GroupVersion().String())
|
||||||
|
|
||||||
|
j, err := json.Marshal(o)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
decoder := scheme.Codecs.UniversalDecoder()
|
||||||
|
_, _, err = decoder.Decode(j, nil, obj)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
if listOpts.LabelSelector != nil {
|
||||||
|
objs, err := meta.ExtractList(obj)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
filteredObjs, err := objectutil.FilterWithLabels(objs, listOpts.LabelSelector)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
err = meta.SetList(obj, filteredObjs)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *fakeClient) Create(ctx context.Context, obj runtime.Object, opts ...client.CreateOption) error {
|
||||||
|
createOptions := &client.CreateOptions{}
|
||||||
|
createOptions.ApplyOptions(opts)
|
||||||
|
|
||||||
|
for _, dryRunOpt := range createOptions.DryRun {
|
||||||
|
if dryRunOpt == metav1.DryRunAll {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
gvr, err := getGVRFromObject(obj, c.scheme)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
accessor, err := meta.Accessor(obj)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
if accessor.GetName() == "" && accessor.GetGenerateName() != "" {
|
||||||
|
base := accessor.GetGenerateName()
|
||||||
|
if len(base) > maxGeneratedNameLength {
|
||||||
|
base = base[:maxGeneratedNameLength]
|
||||||
|
}
|
||||||
|
accessor.SetName(fmt.Sprintf("%s%s", base, utilrand.String(randomLength)))
|
||||||
|
}
|
||||||
|
|
||||||
|
return c.tracker.Create(gvr, obj, accessor.GetNamespace())
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *fakeClient) Delete(ctx context.Context, obj runtime.Object, opts ...client.DeleteOption) error {
|
||||||
|
gvr, err := getGVRFromObject(obj, c.scheme)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
accessor, err := meta.Accessor(obj)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
delOptions := client.DeleteOptions{}
|
||||||
|
delOptions.ApplyOptions(opts)
|
||||||
|
|
||||||
|
//TODO: implement propagation
|
||||||
|
return c.tracker.Delete(gvr, accessor.GetNamespace(), accessor.GetName())
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *fakeClient) DeleteAllOf(ctx context.Context, obj runtime.Object, opts ...client.DeleteAllOfOption) error {
|
||||||
|
gvk, err := apiutil.GVKForObject(obj, c.scheme)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
dcOptions := client.DeleteAllOfOptions{}
|
||||||
|
dcOptions.ApplyOptions(opts)
|
||||||
|
|
||||||
|
gvr, _ := meta.UnsafeGuessKindToResource(gvk)
|
||||||
|
o, err := c.tracker.List(gvr, gvk, dcOptions.Namespace)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
objs, err := meta.ExtractList(o)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
filteredObjs, err := objectutil.FilterWithLabels(objs, dcOptions.LabelSelector)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
for _, o := range filteredObjs {
|
||||||
|
accessor, err := meta.Accessor(o)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
err = c.tracker.Delete(gvr, accessor.GetNamespace(), accessor.GetName())
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *fakeClient) Update(ctx context.Context, obj runtime.Object, opts ...client.UpdateOption) error {
|
||||||
|
updateOptions := &client.UpdateOptions{}
|
||||||
|
updateOptions.ApplyOptions(opts)
|
||||||
|
|
||||||
|
for _, dryRunOpt := range updateOptions.DryRun {
|
||||||
|
if dryRunOpt == metav1.DryRunAll {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
gvr, err := getGVRFromObject(obj, c.scheme)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
accessor, err := meta.Accessor(obj)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return c.tracker.Update(gvr, obj, accessor.GetNamespace())
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *fakeClient) Patch(ctx context.Context, obj runtime.Object, patch client.Patch, opts ...client.PatchOption) error {
|
||||||
|
patchOptions := &client.PatchOptions{}
|
||||||
|
patchOptions.ApplyOptions(opts)
|
||||||
|
|
||||||
|
for _, dryRunOpt := range patchOptions.DryRun {
|
||||||
|
if dryRunOpt == metav1.DryRunAll {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
gvr, err := getGVRFromObject(obj, c.scheme)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
accessor, err := meta.Accessor(obj)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
data, err := patch.Data(obj)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
reaction := testing.ObjectReaction(c.tracker)
|
||||||
|
handled, o, err := reaction(testing.NewPatchAction(gvr, accessor.GetNamespace(), accessor.GetName(), patch.Type(), data))
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if !handled {
|
||||||
|
panic("tracker could not handle patch method")
|
||||||
|
}
|
||||||
|
|
||||||
|
gvk, err := apiutil.GVKForObject(obj, c.scheme)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
ta, err := meta.TypeAccessor(o)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
ta.SetKind(gvk.Kind)
|
||||||
|
ta.SetAPIVersion(gvk.GroupVersion().String())
|
||||||
|
|
||||||
|
j, err := json.Marshal(o)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
decoder := scheme.Codecs.UniversalDecoder()
|
||||||
|
_, _, err = decoder.Decode(j, nil, obj)
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *fakeClient) Status() client.StatusWriter {
|
||||||
|
return &fakeStatusWriter{client: c}
|
||||||
|
}
|
||||||
|
|
||||||
|
func getGVRFromObject(obj runtime.Object, scheme *runtime.Scheme) (schema.GroupVersionResource, error) {
|
||||||
|
gvk, err := apiutil.GVKForObject(obj, scheme)
|
||||||
|
if err != nil {
|
||||||
|
return schema.GroupVersionResource{}, err
|
||||||
|
}
|
||||||
|
gvr, _ := meta.UnsafeGuessKindToResource(gvk)
|
||||||
|
return gvr, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
type fakeStatusWriter struct {
|
||||||
|
client *fakeClient
|
||||||
|
}
|
||||||
|
|
||||||
|
func (sw *fakeStatusWriter) Update(ctx context.Context, obj runtime.Object, opts ...client.UpdateOption) error {
|
||||||
|
// TODO(droot): This results in full update of the obj (spec + status). Need
|
||||||
|
// a way to update status field only.
|
||||||
|
return sw.client.Update(ctx, obj, opts...)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (sw *fakeStatusWriter) Patch(ctx context.Context, obj runtime.Object, patch client.Patch, opts ...client.PatchOption) error {
|
||||||
|
// TODO(droot): This results in full update of the obj (spec + status). Need
|
||||||
|
// a way to update status field only.
|
||||||
|
return sw.client.Patch(ctx, obj, patch, opts...)
|
||||||
|
}
|
||||||
33
vendor/sigs.k8s.io/controller-runtime/pkg/client/fake/doc.go
generated
vendored
Normal file
33
vendor/sigs.k8s.io/controller-runtime/pkg/client/fake/doc.go
generated
vendored
Normal file
@@ -0,0 +1,33 @@
|
|||||||
|
/*
|
||||||
|
Copyright 2018 The Kubernetes Authors.
|
||||||
|
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/*
|
||||||
|
Package fake provides a fake client for testing.
|
||||||
|
|
||||||
|
Deprecated: please use pkg/envtest for testing. This package will be dropped
|
||||||
|
before the v1.0.0 release.
|
||||||
|
|
||||||
|
An fake client is backed by its simple object store indexed by GroupVersionResource.
|
||||||
|
You can create a fake client with optional objects.
|
||||||
|
|
||||||
|
client := NewFakeClient(initObjs...) // initObjs is a slice of runtime.Object
|
||||||
|
|
||||||
|
You can invoke the methods defined in the Client interface.
|
||||||
|
|
||||||
|
When it doubt, it's almost always better not to use this package and instead use
|
||||||
|
envtest.Environment with a real client and API server.
|
||||||
|
*/
|
||||||
|
package fake
|
||||||
42
vendor/sigs.k8s.io/controller-runtime/pkg/internal/objectutil/filter.go
generated
vendored
Normal file
42
vendor/sigs.k8s.io/controller-runtime/pkg/internal/objectutil/filter.go
generated
vendored
Normal file
@@ -0,0 +1,42 @@
|
|||||||
|
/*
|
||||||
|
Copyright 2018 The Kubernetes Authors.
|
||||||
|
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package objectutil
|
||||||
|
|
||||||
|
import (
|
||||||
|
apimeta "k8s.io/apimachinery/pkg/api/meta"
|
||||||
|
"k8s.io/apimachinery/pkg/labels"
|
||||||
|
"k8s.io/apimachinery/pkg/runtime"
|
||||||
|
)
|
||||||
|
|
||||||
|
// FilterWithLabels returns a copy of the items in objs matching labelSel
|
||||||
|
func FilterWithLabels(objs []runtime.Object, labelSel labels.Selector) ([]runtime.Object, error) {
|
||||||
|
outItems := make([]runtime.Object, 0, len(objs))
|
||||||
|
for _, obj := range objs {
|
||||||
|
meta, err := apimeta.Accessor(obj)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if labelSel != nil {
|
||||||
|
lbls := labels.Set(meta.GetLabels())
|
||||||
|
if !labelSel.Matches(lbls) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
}
|
||||||
|
outItems = append(outItems, obj.DeepCopyObject())
|
||||||
|
}
|
||||||
|
return outItems, nil
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user