Skip to content

Commit 9fd7d51

Browse files
committed
forceConflicts in favor of the operator as it's the owner
1 parent d1352da commit 9fd7d51

1 file changed

Lines changed: 6 additions & 1 deletion

File tree

operator/src/main/java/com/datastax/oss/kaap/controllers/utils/CertManagerCertificatesProvisioner.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ private void createAcmeIssuer() {
349349
)
350350
.endSpec()
351351
.build();
352-
client.resource(issuer).inNamespace(namespace).serverSideApply();
352+
client.resource(issuer).inNamespace(namespace).forceConflicts().serverSideApply();
353353
}
354354

355355
private void createAutorecoveryCertificate() {
@@ -379,6 +379,7 @@ private void createAutorecoveryCertificate() {
379379

380380
client.resource(caCertificate)
381381
.inNamespace(namespace)
382+
.forceConflicts()
382383
.serverSideApply();
383384
}
384385

@@ -513,6 +514,7 @@ private void createCertificate(String name,
513514
.build();
514515
client.resource(certificate)
515516
.inNamespace(namespace)
517+
.forceConflicts()
516518
.serverSideApply();
517519
log.debugf("Created certificate %s mapped to secret %s", name, secretName);
518520
}
@@ -533,6 +535,7 @@ private void createRootCACertificate() {
533535

534536
client.resource(ssIssuer)
535537
.inNamespace(namespace)
538+
.forceConflicts()
536539
.serverSideApply();
537540

538541
final Certificate caCertificate = new CertificateBuilder()
@@ -554,6 +557,7 @@ private void createRootCACertificate() {
554557

555558
client.resource(caCertificate)
556559
.inNamespace(namespace)
560+
.forceConflicts()
557561
.serverSideApply();
558562

559563
final Issuer caIssuer = new IssuerBuilder()
@@ -570,6 +574,7 @@ private void createRootCACertificate() {
570574

571575
client.resource(caIssuer)
572576
.inNamespace(namespace)
577+
.forceConflicts()
573578
.serverSideApply();
574579
log.debug("Created self-signed root CA certificate");
575580
}

0 commit comments

Comments
 (0)