Skip to content

Commit

Permalink
do not block owner deletion
Browse files Browse the repository at this point in the history
  • Loading branch information
adambkaplan committed Feb 20, 2020
1 parent fca37b3 commit 1c3dff5
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions pkg/serviceaccounts/controllers/create_dockercfg_secrets.go
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,9 @@ func (e *DockercfgController) createDockerPullSecret(serviceAccount *v1.ServiceA
return nil, false, err
}
dockercfgSecret.Data[v1.DockerConfigKey] = dockercfgContent
blockDeletion := false
ownerRef := metav1.NewControllerRef(tokenSecret, v1.SchemeGroupVersion.WithKind("Secret"))
ownerRef.BlockOwnerDeletion = &blockDeletion
dockercfgSecret.SetOwnerReferences([]metav1.OwnerReference{*ownerRef})

// Save the secret
Expand Down Expand Up @@ -565,7 +567,9 @@ func (e *DockercfgController) syncDockercfgOwner(pullSecret *v1.Secret) error {
return nil
}
pullSecret = pullSecret.DeepCopy()
blockDeletion := false
ownerRef := metav1.NewControllerRef(tokenSecretObj, v1.SchemeGroupVersion.WithKind("Secret"))
ownerRef.BlockOwnerDeletion = &blockDeletion
pullSecret.SetOwnerReferences([]metav1.OwnerReference{*ownerRef})
klog.V(4).Infof("Adding token %s/%s as the owner of pull secret %s/%s", pullSecret.Namespace, tokenName, pullSecret.Namespace, pullSecret.Name)
_, err = e.client.CoreV1().Secrets(pullSecret.Namespace).Update(pullSecret)
Expand Down

0 comments on commit 1c3dff5

Please sign in to comment.