Skip to content

Commit b6fe9f0

Browse files
committed
Revert "handle "already exists" when certrotation creates secret"
This reverts commit 9acaa19. Signed-off-by: Alex Kalenyuk <[email protected]>
1 parent 05640ec commit b6fe9f0

File tree

1 file changed

+4
-17
lines changed

1 file changed

+4
-17
lines changed

pkg/operator/controller/certrotation.go

+4-17
Original file line numberDiff line numberDiff line change
@@ -197,28 +197,15 @@ func (cm *certManager) ensureCertConfig(secret *corev1.Secret, certConfig cdicer
197197
return secret, nil
198198
}
199199

200-
func (cm *certManager) createOrGetSecret(namespace, name string) (*corev1.Secret, error) {
200+
func (cm *certManager) createSecret(namespace, name string) (*corev1.Secret, error) {
201201
secret := &corev1.Secret{
202202
ObjectMeta: metav1.ObjectMeta{
203203
Name: name,
204204
},
205205
Type: corev1.SecretTypeTLS,
206206
}
207207

208-
secret, err := cm.k8sClient.CoreV1().Secrets(namespace).Create(context.TODO(), secret, metav1.CreateOptions{})
209-
if err != nil {
210-
if !errors.IsAlreadyExists(err) {
211-
return nil, err
212-
}
213-
214-
// skip the cache
215-
secret, err = cm.k8sClient.CoreV1().Secrets(namespace).Get(context.TODO(), name, metav1.GetOptions{})
216-
if err != nil {
217-
return nil, err
218-
}
219-
}
220-
221-
return secret, nil
208+
return cm.k8sClient.CoreV1().Secrets(namespace).Create(context.TODO(), secret, metav1.CreateOptions{})
222209
}
223210

224211
func (cm *certManager) ensureSigner(cd cdicerts.CertificateDefinition) (*crypto.CA, error) {
@@ -233,7 +220,7 @@ func (cm *certManager) ensureSigner(cd cdicerts.CertificateDefinition) (*crypto.
233220
return nil, err
234221
}
235222

236-
secret, err = cm.createOrGetSecret(cd.SignerSecret.Namespace, cd.SignerSecret.Name)
223+
secret, err = cm.createSecret(cd.SignerSecret.Namespace, cd.SignerSecret.Name)
237224
if err != nil {
238225
return nil, err
239226
}
@@ -296,7 +283,7 @@ func (cm *certManager) ensureTarget(cd cdicerts.CertificateDefinition, ca *crypt
296283
return err
297284
}
298285

299-
secret, err = cm.createOrGetSecret(cd.TargetSecret.Namespace, cd.TargetSecret.Name)
286+
secret, err = cm.createSecret(cd.TargetSecret.Namespace, cd.TargetSecret.Name)
300287
if err != nil {
301288
return err
302289
}

0 commit comments

Comments
 (0)