Skip to content

Commit f38a5be

Browse files
committed
Merge branch 'main' into next
2 parents 983ce46 + 323372a commit f38a5be

File tree

7 files changed

+13
-21
lines changed

7 files changed

+13
-21
lines changed

docs/documentation/use-samples.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@ examples:
2626

2727
# Implementing a Sample Operator
2828

29-
Add [dependency](https://search.maven.org/search?q=a:operator-framework) to your project with Maven:
29+
Add [dependency](https://search.maven.org/search?q=a:operator-framework%20AND%20g:io.javaoperatorsdk) to your project with Maven:
3030

3131
```xml
3232

3333
<dependency>
3434
<groupId>io.javaoperatorsdk</groupId>
3535
<artifactId>operator-framework</artifactId>
36-
<version>{see https://search.maven.org/search?q=a:operator-framework for latest version}</version>
36+
<version>{see https://search.maven.org/search?q=a:operator-framework%20AND%20g:io.javaoperatorsdk for latest version}</version>
3737
</dependency>
3838
```
3939

@@ -188,14 +188,14 @@ public class QuarkusOperator implements QuarkusApplication {
188188

189189
You can also let Spring Boot wire your application together and automatically register the controllers.
190190

191-
Add [this dependency](https://search.maven.org/search?q=a:operator-framework-spring-boot-starter) to your project:
191+
Add [this dependency](https://search.maven.org/search?q=a:operator-framework-spring-boot-starter%20AND%20g:io.javaoperatorsdk) to your project:
192192

193193
```xml
194194

195195
<dependency>
196196
<groupId>io.javaoperatorsdk</groupId>
197197
<artifactId>operator-framework-spring-boot-starter</artifactId>
198-
<version>{see https://search.maven.org/search?q=a:operator-framework-spring-boot-starter for
198+
<version>{see https://search.maven.org/search?q=a:operator-framework-spring-boot-starter%20AND%20g:io.javaoperatorsdk for
199199
latest version}
200200
</version>
201201
</dependency>
@@ -224,7 +224,7 @@ necessary, but it doesn't need real access to a Kubernetes cluster.
224224
<dependency>
225225
<groupId>io.javaoperatorsdk</groupId>
226226
<artifactId>operator-framework-spring-boot-starter-test</artifactId>
227-
<version>{see https://search.maven.org/search?q=a:operator-framework-spring-boot-starter for
227+
<version>{see https://search.maven.org/search?q=a:operator-framework-spring-boot-starter%20AND%20g:io.javaoperatorsdk for
228228
latest version}
229229
</version>
230230
</dependency>

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/ReconciliationDispatcher.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import io.fabric8.kubernetes.api.model.HasMetadata;
77
import io.fabric8.kubernetes.api.model.KubernetesResourceList;
88
import io.fabric8.kubernetes.client.CustomResource;
9-
import io.fabric8.kubernetes.client.KubernetesClientException;
109
import io.fabric8.kubernetes.client.dsl.MixedOperation;
1110
import io.fabric8.kubernetes.client.dsl.Resource;
1211
import io.javaoperatorsdk.operator.api.ObservedGenerationAware;
@@ -49,13 +48,6 @@ public ReconciliationDispatcher(Controller<R> controller) {
4948
public PostExecutionControl<R> handleExecution(ExecutionScope<R> executionScope) {
5049
try {
5150
return handleDispatch(executionScope);
52-
} catch (KubernetesClientException e) {
53-
log.info(
54-
"Kubernetes exception {} {} during event processing, {} failed",
55-
e.getCode(),
56-
e.getMessage(),
57-
executionScope);
58-
return PostExecutionControl.exceptionDuringExecution(e);
5951
} catch (RuntimeException e) {
6052
log.error("Error during event processing {} failed.", executionScope, e);
6153
return PostExecutionControl.exceptionDuringExecution(e);

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,15 +57,15 @@
5757
<micrometer-core.version>1.8.2</micrometer-core.version>
5858

5959
<fmt-maven-plugin.version>2.11</fmt-maven-plugin.version>
60-
<maven-compiler-plugin.version>3.9.0</maven-compiler-plugin.version>
60+
<maven-compiler-plugin.version>3.10.0</maven-compiler-plugin.version>
6161
<maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
62-
<maven-javadoc-plugin.version>3.3.1</maven-javadoc-plugin.version>
62+
<maven-javadoc-plugin.version>3.3.2</maven-javadoc-plugin.version>
6363
<maven-resources-plugin.version>3.2.0</maven-resources-plugin.version>
6464
<maven-source-plugin.version>3.2.1</maven-source-plugin.version>
6565
<maven-jar-plugin.version>3.2.2</maven-jar-plugin.version>
6666
<maven-clean-plugin.version>3.1.0</maven-clean-plugin.version>
6767
<maven-gpg-plugin.version>3.0.1</maven-gpg-plugin.version>
68-
<nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>
68+
<nexus-staging-maven-plugin.version>1.6.11</nexus-staging-maven-plugin.version>
6969
<maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version>
7070
<maven-install-plugin.version>2.5.2</maven-install-plugin.version>
7171
<git-commit-id-maven-plugin.version>5.0.0</git-commit-id-maven-plugin.version>

sample-operators/mysql-schema/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105
<plugin>
106106
<groupId>org.apache.maven.plugins</groupId>
107107
<artifactId>maven-compiler-plugin</artifactId>
108-
<version>3.9.0</version>
108+
<version>3.10.0</version>
109109
</plugin>
110110
</plugins>
111111
</build>

sample-operators/tomcat-operator/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
<plugin>
9191
<groupId>org.apache.maven.plugins</groupId>
9292
<artifactId>maven-compiler-plugin</artifactId>
93-
<version>3.9.0</version>
93+
<version>3.10.0</version>
9494
</plugin>
9595
</plugins>
9696
</build>

sample-operators/webpage/k8s/operator.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ rules:
9292
- apiGroups:
9393
- "sample.javaoperatorsdk"
9494
resources:
95-
- webservers
96-
- webservers/status
95+
- webpages
96+
- webpages/status
9797
verbs:
9898
- '*'

sample-operators/webpage/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
<plugin>
6565
<groupId>org.apache.maven.plugins</groupId>
6666
<artifactId>maven-compiler-plugin</artifactId>
67-
<version>3.9.0</version>
67+
<version>3.10.0</version>
6868
</plugin>
6969
</plugins>
7070
</build>

0 commit comments

Comments
 (0)