11package io .javaoperatorsdk .operator .processing .event ;
22
3- import java .io .ByteArrayInputStream ;
4- import java .io .IOException ;
5- import java .nio .charset .StandardCharsets ;
6-
73import org .slf4j .Logger ;
84import org .slf4j .LoggerFactory ;
95
1410import io .fabric8 .kubernetes .client .dsl .MixedOperation ;
1511import io .fabric8 .kubernetes .client .dsl .Resource ;
1612import io .fabric8 .kubernetes .client .dsl .internal .HasMetadataOperationsImpl ;
17- import io .fabric8 .kubernetes .client .utils .Serialization ;
1813import io .javaoperatorsdk .operator .OperatorException ;
1914import io .javaoperatorsdk .operator .api .ObservedGenerationAware ;
2015import io .javaoperatorsdk .operator .api .config .ConfigurationServiceProvider ;
@@ -372,9 +367,9 @@ public R replaceResourceWithLock(R resource) {
372367 resource .getMetadata ().getResourceVersion ());
373368 return resourceOperation
374369 .inNamespace (resource .getMetadata ().getNamespace ())
375- .withName ( getName ( resource ) )
370+ .resource ( resource )
376371 .lockResourceVersion (resource .getMetadata ().getResourceVersion ())
377- .replace (resource );
372+ .replace ();
378373 }
379374
380375 @ SuppressWarnings ({"rawtypes" , "unchecked" })
@@ -393,15 +388,11 @@ public R patchStatus(R resource, R originalResource) {
393388 // don't do optimistic locking on patch
394389 originalResource .getMetadata ().setResourceVersion (null );
395390 resource .getMetadata ().setResourceVersion (null );
396- try (var bis = new ByteArrayInputStream (
397- Serialization .asJson (originalResource ).getBytes (StandardCharsets .UTF_8 ))) {
391+ try {
398392 return resourceOperation
399393 .inNamespace (resource .getMetadata ().getNamespace ())
400- // will be simplified in fabric8 v6
401- .load (bis )
394+ .resource (originalResource )
402395 .editStatus (r -> resource );
403- } catch (IOException e ) {
404- throw new IllegalStateException (e );
405396 } finally {
406397 // restore initial resource version
407398 originalResource .getMetadata ().setResourceVersion (resourceVersion );
0 commit comments