Skip to content

Commit af2b565

Browse files
committed
improce: facelift samples to use ReconcileUtils
Signed-off-by: Attila Mészáros <a_meszaros@apple.com>
1 parent 90cc671 commit af2b565

File tree

1 file changed

+4
-15
lines changed

1 file changed

+4
-15
lines changed

sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageReconciler.java

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -105,12 +105,7 @@ public UpdateControl<WebPage> reconcile(WebPage webPage, Context<WebPage> contex
105105
"Creating or updating ConfigMap {} in {}",
106106
desiredHtmlConfigMap.getMetadata().getName(),
107107
ns);
108-
context
109-
.getClient()
110-
.configMaps()
111-
.inNamespace(ns)
112-
.resource(desiredHtmlConfigMap)
113-
.serverSideApply();
108+
ReconcileUtils.serverSideApply(context, desiredHtmlConfigMap);
114109
}
115110

116111
var existingDeployment = context.getSecondaryResource(Deployment.class).orElse(null);
@@ -119,13 +114,7 @@ public UpdateControl<WebPage> reconcile(WebPage webPage, Context<WebPage> contex
119114
"Creating or updating Deployment {} in {}",
120115
desiredDeployment.getMetadata().getName(),
121116
ns);
122-
context
123-
.getClient()
124-
.apps()
125-
.deployments()
126-
.inNamespace(ns)
127-
.resource(desiredDeployment)
128-
.serverSideApply();
117+
ReconcileUtils.serverSideApply(context, desiredDeployment);
129118
}
130119

131120
var existingService = context.getSecondaryResource(Service.class).orElse(null);
@@ -134,14 +123,14 @@ public UpdateControl<WebPage> reconcile(WebPage webPage, Context<WebPage> contex
134123
"Creating or updating Deployment {} in {}",
135124
desiredDeployment.getMetadata().getName(),
136125
ns);
137-
context.getClient().services().inNamespace(ns).resource(desiredService).serverSideApply();
126+
ReconcileUtils.serverSideApply(context, desiredService);
138127
}
139128

140129
var existingIngress = context.getSecondaryResource(Ingress.class);
141130
if (Boolean.TRUE.equals(webPage.getSpec().getExposed())) {
142131
var desiredIngress = makeDesiredIngress(webPage);
143132
if (existingIngress.isEmpty() || !match(desiredIngress, existingIngress.get())) {
144-
context.getClient().resource(desiredIngress).inNamespace(ns).serverSideApply();
133+
ReconcileUtils.serverSideApply(context, desiredIngress);
145134
}
146135
} else existingIngress.ifPresent(ingress -> context.getClient().resource(ingress).delete());
147136

0 commit comments

Comments
 (0)