Skip to content

Refactor WebPage Sample #976

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Feb 28, 2022
Merged

Refactor WebPage Sample #976

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1191656
fix: refactor samples to dependent resources
csviri Feb 28, 2022
2f037df
docs: comment
csviri Feb 28, 2022
5520451
fix: wip
csviri Feb 28, 2022
282053e
fix: renamings etc
csviri Feb 28, 2022
fd5ae7d
fix: refactor labels
csviri Feb 28, 2022
7732221
fix: from code review
csviri Feb 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions ...operatorsdk/operator/processing/dependent/kubernetes/CrudKubernetesDependentResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
package io.javaoperatorsdk.operator.processing.dependent.kubernetes;

import io.fabric8.kubernetes.api.model.HasMetadata;
import io.javaoperatorsdk.operator.api.reconciler.dependent.Creator;
import io.javaoperatorsdk.operator.api.reconciler.dependent.Deleter;
import io.javaoperatorsdk.operator.api.reconciler.dependent.Updater;

/**
* Adaptor Class for standalone mode for resources that manages Create, Update and Delete
*
* @param <R> Managed resource
* @param <P> Primary Resource
*/
public abstract class CrudKubernetesDependentResource<R extends HasMetadata, P extends HasMetadata>
extends
KubernetesDependentResource<R, P> implements Creator<R, P>, Updater<R, P>, Deleter<P> {
}
4 changes: 3 additions & 1 deletion sample-operators/webpage/k8s/webpage.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
apiVersion: "sample.javaoperatorsdk/v1"
kind: WebPage
metadata:
labels:
low-level: "true"
name: hellows
spec:
html: |
Expand All @@ -9,6 +11,6 @@ spec:
<title>Hello Operator World</title>
</head>
<body>
Hello World!
Hello World!
</body>
</html>
8 changes: 8 additions & 0 deletions sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,12 @@ public class WebPage extends CustomResource<WebPageSpec, WebPageStatus>
protected WebPageStatus initStatus() {
return new WebPageStatus();
}

@Override
public String toString() {
return "WebPage{" +
"spec=" + spec +
", status=" + status +
'}';
}
}
7 changes: 6 additions & 1 deletion ...e-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageOperator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package io.javaoperatorsdk.operator.sample;

import java.io.IOException;
import java.util.Arrays;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand All @@ -26,7 +27,11 @@ public static void main(String[] args) throws IOException {
Config config = new ConfigBuilder().withNamespace(null).build();
KubernetesClient client = new DefaultKubernetesClient(config);
Operator operator = new Operator(client, DefaultConfigurationService.instance());
operator.register(new WebPageReconciler(client));
if (Arrays.stream(args).anyMatch(arg -> arg.equals("--classic"))) {
operator.register(new WebPageReconciler(client));
} else {
operator.register(new WebPageReconcilerDependentResources(client));
}
operator.installShutdownHook();
operator.start();

Expand Down
Loading