Skip to content

Commit 3682da3

Browse files
committed
refactor: improve testability of context construction
1 parent 8160370 commit 3682da3

2 files changed

Lines changed: 8 additions & 1 deletion

File tree

stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/backup/BackupRole.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import io.fabric8.kubernetes.api.model.rbac.SubjectBuilder;
1919
import io.stackgres.common.StackGresUtil;
2020
import io.stackgres.common.crd.CommonDefinition;
21+
import io.stackgres.common.crd.sgbackup.BackupStatus;
2122
import io.stackgres.common.crd.sgbackup.StackGresBackup;
2223
import io.stackgres.common.labels.LabelFactoryForBackup;
2324
import io.stackgres.operator.conciliation.OperatorVersionBinder;
@@ -50,7 +51,8 @@ public static String roleName(String backupName) {
5051

5152
@Override
5253
public Stream<HasMetadata> generateResource(StackGresBackupContext context) {
53-
if (isNotBackupCopy(context)) {
54+
if (isNotBackupCopy(context)
55+
|| BackupStatus.isFinished(context.getSource())) {
5456
return Stream.of();
5557
}
5658
return Stream.of(

stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/dbops/DbOpsRole.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import io.fabric8.kubernetes.api.model.rbac.RoleBuilder;
2222
import io.fabric8.kubernetes.api.model.rbac.RoleRefBuilder;
2323
import io.fabric8.kubernetes.api.model.rbac.SubjectBuilder;
24+
import io.stackgres.common.DbOpsUtil;
2425
import io.stackgres.common.crd.CommonDefinition;
2526
import io.stackgres.common.crd.sgcluster.StackGresCluster;
2627
import io.stackgres.common.crd.sgdbops.StackGresDbOps;
@@ -54,6 +55,10 @@ public static String roleName(String dbOpsName) {
5455

5556
@Override
5657
public Stream<HasMetadata> generateResource(StackGresDbOpsContext context) {
58+
if (DbOpsUtil.isAlreadyCompleted(context.getSource())) {
59+
return Stream.of();
60+
}
61+
5762
return Stream.<HasMetadata>of(
5863
createServiceAccount(context),
5964
createRole(context),

0 commit comments

Comments
 (0)