Skip to content

Commit fa9f9b8

Browse files
committed
fix: add .io suffix to sample.javaoperatorsdk group
The intent here is to use better groups for example CRDs.
1 parent 39dd757 commit fa9f9b8

File tree

22 files changed

+40
-40
lines changed

22 files changed

+40
-40
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ The Controller implements the business logic and describes all the classes neede
7979

8080
```java
8181
@Controller(customResourceClass = WebServer.class,
82-
crdName = "webservers.sample.javaoperatorsdk")
82+
crdName = "webservers.sample.javaoperatorsdk.io")
8383
public class WebServerController implements ResourceController<WebServer> {
8484

8585
@Override

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/TestCustomResource.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,6 @@ public String getKind() {
4141

4242
@Override
4343
public String getApiVersion() {
44-
return "sample.javaoperatorsdk/v1";
44+
return "sample.javaoperatorsdk.io/v1";
4545
}
4646
}

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/TestCustomResourceController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public class TestCustomResourceController implements ResourceController<TestCust
2525

2626
private static final Logger log = LoggerFactory.getLogger(TestCustomResourceController.class);
2727

28-
public static final String CRD_NAME = "customservices.sample.javaoperatorsdk";
28+
public static final String CRD_NAME = "customservices.sample.javaoperatorsdk.io";
2929
public static final String FINALIZER_NAME = CRD_NAME + ".io/finalizer";
3030

3131
private final KubernetesClient kubernetesClient;

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/subresource/SubResourceTestCustomResource.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,6 @@ public String getKind() {
4141

4242
@Override
4343
public String getApiVersion() {
44-
return "sample.javaoperatorsdk/v1";
44+
return "sample.javaoperatorsdk.io/v1";
4545
}
4646
}

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/subresource/SubResourceTestCustomResourceController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
public class SubResourceTestCustomResourceController implements ResourceController<SubResourceTestCustomResource>,
1919
TestExecutionInfoProvider {
2020

21-
public static final String CRD_NAME = "subresourcesamples.sample.javaoperatorsdk";
21+
public static final String CRD_NAME = "subresourcesamples.sample.javaoperatorsdk.io";
2222
public static final String FINALIZER_NAME = CRD_NAME + ".io/finalizer";
2323
private static final Logger log = LoggerFactory.getLogger(SubResourceTestCustomResourceController.class);
2424
private final AtomicInteger numberOfExecutions = new AtomicInteger(0);

operator-framework/src/test/resources/io/javaoperatorsdk/operator/subresource-test-crd.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
apiVersion: apiextensions.k8s.io/v1beta1
22
kind: CustomResourceDefinition
33
metadata:
4-
name: subresourcesamples.sample.javaoperatorsdk
4+
name: subresourcesamples.sample.javaoperatorsdk.io
55
spec:
6-
group: sample.javaoperatorsdk
6+
group: sample.javaoperatorsdk.io
77
version: v1
88
subresources:
99
status: {}

operator-framework/src/test/resources/io/javaoperatorsdk/operator/test-crd.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
apiVersion: apiextensions.k8s.io/v1beta1
22
kind: CustomResourceDefinition
33
metadata:
4-
name: customservices.sample.javaoperatorsdk
4+
name: customservices.sample.javaoperatorsdk.io
55
spec:
6-
group: sample.javaoperatorsdk
6+
group: sample.javaoperatorsdk.io
77
version: v1
88
scope: Namespaced
99
names:

samples/common/crd/crd.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
apiVersion: apiextensions.k8s.io/v1beta1
22
kind: CustomResourceDefinition
33
metadata:
4-
name: customservices.sample.javaoperatorsdk
4+
name: customservices.sample.javaoperatorsdk.io
55
spec:
6-
group: sample.javaoperatorsdk
6+
group: sample.javaoperatorsdk.io
77
version: v1
88
scope: Namespaced
99
names:

samples/common/crd/test_object.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: "sample.javaoperatorsdk/v1"
1+
apiVersion: "sample.javaoperatorsdk.io/v1"
22
kind: CustomService
33
metadata:
44
name: custom-service1

samples/common/src/main/java/io/javaoperatorsdk/operator/sample/CustomService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@ public void setSpec(ServiceSpec spec) {
1717

1818
@Override
1919
public String getApiVersion() {
20-
return "sample.javaoperatorsdk/v1";
20+
return "sample.javaoperatorsdk.io/v1";
2121
}
2222
}

samples/common/src/main/java/io/javaoperatorsdk/operator/sample/CustomServiceController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* A very simple sample controller that creates a service with a label.
1818
*/
1919
@Controller(customResourceClass = CustomService.class,
20-
crdName = "customservices.sample.javaoperatorsdk")
20+
crdName = "customservices.sample.javaoperatorsdk.io")
2121
public class CustomServiceController implements ResourceController<CustomService> {
2222

2323
public static final String KIND = "CustomService";

samples/mysql-schema/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Access to the MySQL server is configured in the configuration of the operator, s
88

99
This is an example input:
1010
```yaml
11-
apiVersion: "mysql.sample.javaoperatorsdk/v1"
11+
apiVersion: "mysql.sample.javaoperatorsdk.io/v1"
1212
kind: MySQLSchema
1313
metadata:
1414
name: mydb

samples/mysql-schema/k8s/crd.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
apiVersion: apiextensions.k8s.io/v1beta1
22
kind: CustomResourceDefinition
33
metadata:
4-
name: schemas.mysql.sample.javaoperatorsdk
4+
name: schemas.mysql.sample.javaoperatorsdk.io
55
spec:
6-
group: mysql.sample.javaoperatorsdk
6+
group: mysql.sample.javaoperatorsdk.io
77
version: v1
88
subresources:
99
status: {}

samples/mysql-schema/k8s/example.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: "mysql.sample.javaoperatorsdk/v1"
1+
apiVersion: "mysql.sample.javaoperatorsdk.io/v1"
22
kind: MySQLSchema
33
metadata:
44
name: mydb

samples/mysql-schema/k8s/rbac.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ metadata:
44
name: mysql-schema-operator
55
rules:
66
- apiGroups:
7-
- mysql.sample.javaoperatorsdk
7+
- mysql.sample.javaoperatorsdk.io
88
resources:
99
- schemas
1010
verbs:
1111
- "*"
1212
- apiGroups:
13-
- mysql.sample.javaoperatorsdk
13+
- mysql.sample.javaoperatorsdk.io
1414
resources:
1515
- schemas/status
1616
verbs:

samples/mysql-schema/src/main/java/io/javaoperatorsdk/operator/sample/Schema.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@ public void setStatus(SchemaStatus status) {
2727

2828
@Override
2929
public String getApiVersion() {
30-
return "mysql.sample.javaoperatorsdk/v1";
30+
return "mysql.sample.javaoperatorsdk.io/v1";
3131
}
3232
}

samples/mysql-schema/src/main/java/io/javaoperatorsdk/operator/sample/SchemaController.java

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,5 @@
11
package io.javaoperatorsdk.operator.sample;
22

3-
import io.javaoperatorsdk.operator.api.Context;
4-
import io.javaoperatorsdk.operator.api.Controller;
5-
import io.javaoperatorsdk.operator.api.ResourceController;
6-
import io.javaoperatorsdk.operator.api.UpdateControl;
7-
import io.fabric8.kubernetes.api.model.Secret;
8-
import io.fabric8.kubernetes.api.model.SecretBuilder;
9-
import io.fabric8.kubernetes.client.KubernetesClient;
10-
import org.apache.commons.lang3.RandomStringUtils;
11-
import org.slf4j.Logger;
12-
import org.slf4j.LoggerFactory;
13-
143
import java.sql.Connection;
154
import java.sql.DriverManager;
165
import java.sql.PreparedStatement;
@@ -19,11 +8,22 @@
198
import java.sql.Statement;
209
import java.util.Base64;
2110

11+
import io.fabric8.kubernetes.api.model.Secret;
12+
import io.fabric8.kubernetes.api.model.SecretBuilder;
13+
import io.fabric8.kubernetes.client.KubernetesClient;
14+
import io.javaoperatorsdk.operator.api.Context;
15+
import io.javaoperatorsdk.operator.api.Controller;
16+
import io.javaoperatorsdk.operator.api.ResourceController;
17+
import io.javaoperatorsdk.operator.api.UpdateControl;
18+
import org.apache.commons.lang3.RandomStringUtils;
19+
import org.slf4j.Logger;
20+
import org.slf4j.LoggerFactory;
21+
2222
import static java.lang.String.format;
2323

2424
@Controller(
25-
crdName = "schemas.mysql.sample.javaoperatorsdk",
26-
customResourceClass = Schema.class)
25+
crdName = "schemas.mysql.sample.javaoperatorsdk.io",
26+
customResourceClass = Schema.class)
2727
public class SchemaController implements ResourceController<Schema> {
2828
static final String USERNAME_FORMAT = "%s-user";
2929
static final String SECRET_FORMAT = "%s-secret";

samples/webserver/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ the html.
77

88
This is an example input:
99
```yaml
10-
apiVersion: "sample.javaoperatorsdk/v1"
10+
apiVersion: "sample.javaoperatorsdk.io/v1"
1111
kind: WebServer
1212
metadata:
1313
name: mynginx-hello

samples/webserver/crd/crd.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
apiVersion: apiextensions.k8s.io/v1beta1
22
kind: CustomResourceDefinition
33
metadata:
4-
name: webservers.sample.javaoperatorsdk
4+
name: webservers.sample.javaoperatorsdk.io
55
spec:
6-
group: sample.javaoperatorsdk
6+
group: sample.javaoperatorsdk.io
77
version: v1
88
scope: Namespaced
99
names:

samples/webserver/crd/webserver.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: "sample.javaoperatorsdk/v1"
1+
apiVersion: "sample.javaoperatorsdk.io/v1"
22
kind: WebServer
33
metadata:
44
name: hellows

samples/webserver/src/main/java/io/javaoperatorsdk/operator/sample/WebServer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@ public void setStatus(WebServerStatus status) {
2727

2828
@Override
2929
public String getApiVersion() {
30-
return "sample.javaoperatorsdk/v1";
30+
return "sample.javaoperatorsdk.io/v1";
3131
}
3232
}

samples/webserver/src/main/java/io/javaoperatorsdk/operator/sample/WebServerController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import org.slf4j.LoggerFactory;
2727

2828
@Controller(customResourceClass = WebServer.class,
29-
crdName = "webservers.sample.javaoperatorsdk")
29+
crdName = "webservers.sample.javaoperatorsdk.io")
3030
public class WebServerController implements ResourceController<WebServer> {
3131

3232
private final Logger log = LoggerFactory.getLogger(getClass());

0 commit comments

Comments
 (0)