Skip to content

Commit 3a00db1

Browse files
committed
manager name fix
1 parent 602e69e commit 3a00db1

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/KubernetesDependentResource.java

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ public R create(R target, P primary, Context<P> context) {
139139
.useLegacyCreateUpdateAndMatchingOnDependentResources()) {
140140
return prepare(target, primary, "Creating").create();
141141
} else {
142-
return prepare(target, primary, "Creating").patch(SSA_PATCH_CONTEXT);
142+
return prepare(target, primary, "Creating").patch(getSSAPatchContext(context));
143143
}
144144
}
145145

@@ -149,7 +149,7 @@ public R update(R actual, R target, P primary, Context<P> context) {
149149
var updatedActual = processor.replaceSpecOnActual(actual, target, context);
150150
return prepare(updatedActual, primary, "Updating").replace();
151151
} else {
152-
return prepare(actual, primary, "Updating").patch(SSA_PATCH_CONTEXT);
152+
return prepare(actual, primary, "Updating").patch(getSSAPatchContext(context));
153153
}
154154
}
155155

@@ -290,4 +290,12 @@ public boolean isDeletable() {
290290
return super.isDeletable() && !garbageCollected;
291291
}
292292

293+
private PatchContext getSSAPatchContext(Context<P> context) {
294+
return new PatchContext.Builder()
295+
.withPatchType(PatchType.SERVER_SIDE_APPLY)
296+
.withForce(true)
297+
.withFieldManager(context.getControllerConfiguration().dependentFieldManager())
298+
.build();
299+
}
300+
293301
}

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/SSABasedGenericKubernetesResourceMatcher.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import com.fasterxml.jackson.core.type.TypeReference;
1515
import com.fasterxml.jackson.databind.ObjectMapper;
1616

17+
// todo add migration integration test
1718
public class SSABasedGenericKubernetesResourceMatcher<R extends HasMetadata> {
1819

1920
@SuppressWarnings("rawtypes")

0 commit comments

Comments
 (0)