Merge pull request #48168 from sheriff-rh/osdocs-2933.3

Java-based Operator code update

Author: stevsmit

modules/osdk-java-controller-memcached-deployment.adoc

@@ -11,18 +11,11 @@ The `createMemcachedDeployment` method uses the link:https://fabric8.io/[fabric8
 [source,java]
 ----
     private Deployment createMemcachedDeployment(Memcached m) {
-        return new DeploymentBuilder()
+        Deployment deployment = new DeploymentBuilder()
             .withMetadata(
                 new ObjectMetaBuilder()
                     .withName(m.getMetadata().getName())
                     .withNamespace(m.getMetadata().getNamespace())
-                    .withOwnerReferences(
-                        new OwnerReferenceBuilder()
-                            .withApiVersion("v1")
-                            .withKind("Memcached")
-                            .withName(m.getMetadata().getName())
-                            .withUid(m.getMetadata().getUid())
-                            .build())
                     .build())
             .withSpec(
                 new DeploymentSpecBuilder()
@@ -50,5 +43,7 @@ The `createMemcachedDeployment` method uses the link:https://fabric8.io/[fabric8
                             .build())
                     .build())
             .build();
+      deployment.addOwnerReference(m);
+      return deployment;
     }
 ----

modules/osdk-java-implement-controller.adoc

@@ -113,46 +113,41 @@ public class MemcachedReconciler implements Reconciler<Memcached> {
   }
 
   private Deployment createMemcachedDeployment(Memcached m) {
-    return new DeploymentBuilder()
-        .withMetadata(
-            new ObjectMetaBuilder()
-                .withName(m.getMetadata().getName())
-                .withNamespace(m.getMetadata().getNamespace())
-                .withOwnerReferences(
-                    new OwnerReferenceBuilder()
-                        .withApiVersion("v1")
-                        .withKind("Memcached")
-                        .withName(m.getMetadata().getName())
-                        .withUid(m.getMetadata().getUid())
-                        .build())
-                .build())
-        .withSpec(
-            new DeploymentSpecBuilder()
-                .withReplicas(m.getSpec().getSize())
-                .withSelector(
-                    new LabelSelectorBuilder().withMatchLabels(labelsForMemcached(m)).build())
-                .withTemplate(
-                    new PodTemplateSpecBuilder()
-                        .withMetadata(
-                            new ObjectMetaBuilder().withLabels(labelsForMemcached(m)).build())
-                        .withSpec(
-                            new PodSpecBuilder()
-                                .withContainers(
-                                    new ContainerBuilder()
-                                        .withImage("memcached:1.4.36-alpine")
-                                        .withName("memcached")
-                                        .withCommand("memcached", "-m=64", "-o", "modern", "-v")
-                                        .withPorts(
-                                            new ContainerPortBuilder()
-                                                .withContainerPort(11211)
-                                                .withName("memcached")
-                                                .build())
-                                        .build())
-                                .build())
-                        .build())
-                .build())
-        .build();
-}
+      Deployment deployment = new DeploymentBuilder()
+          .withMetadata(
+              new ObjectMetaBuilder()
+                  .withName(m.getMetadata().getName())
+                  .withNamespace(m.getMetadata().getNamespace())
+                  .build())
+          .withSpec(
+              new DeploymentSpecBuilder()
+                  .withReplicas(m.getSpec().getSize())
+                  .withSelector(
+                      new LabelSelectorBuilder().withMatchLabels(labelsForMemcached(m)).build())
+                  .withTemplate(
+                      new PodTemplateSpecBuilder()
+                          .withMetadata(
+                              new ObjectMetaBuilder().withLabels(labelsForMemcached(m)).build())
+                          .withSpec(
+                              new PodSpecBuilder()
+                                  .withContainers(
+                                      new ContainerBuilder()
+                                          .withImage("memcached:1.4.36-alpine")
+                                          .withName("memcached")
+                                          .withCommand("memcached", "-m=64", "-o", "modern", "-v")
+                                          .withPorts(
+                                              new ContainerPortBuilder()
+                                                  .withContainerPort(11211)
+                                                  .withName("memcached")
+                                                  .build())
+                                          .build())
+                                  .build())
+                          .build())
+                  .build())
+          .build();
+    deployment.addOwnerReference(m);
+    return deployment;
+  }
 }
 ----
 ====