Skip to content

Commit 6886843

Browse files
committed
fixes
Signed-off-by: Attila Mészáros <[email protected]>
1 parent 1736095 commit 6886843

File tree

4 files changed

+10
-4
lines changed

4 files changed

+10
-4
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ spec:
6363
parent:
6464
apiVersion: glueoperator.sample/v1 # watches all the custom resource of type WebPage
6565
kind: WebPage
66-
status: # update the status of the custom resource at the end of reconciliation
67-
observedGeneration: "{parent.metadata.generation}"
66+
statusTemplate: | # update the status of the custom resource at the end of reconciliation
67+
observedGeneration: {parent.metadata.generation}
6868
childResources:
6969
- name: htmlconfigmap
7070
resource:

src/test/java/io/javaoperatorsdk/operator/glue/sample/webpage/WebPageSampleTest.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,12 @@ void webPageCRUD() {
5353
await().untilAsserted(() -> {
5454
var ingress = get(Ingress.class, webPage.getMetadata().getName());
5555
var configMap = get(ConfigMap.class, webPage.getMetadata().getName());
56+
var wp = get(WebPage.class, webPage.getMetadata().getName());
5657

5758
assertThat(configMap.getData().get("index.html")).contains("Hello World 2!");
5859
assertThat(ingress).isNotNull();
60+
assertThat(wp.getStatus()).isNotNull();
61+
assertThat(wp.getStatus().getObservedGeneration()).isNotNull();
5962
});
6063

6164
delete(webPage);

src/test/resources/sample/webpage/webpage.crd.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ spec:
2424
type: object
2525
status:
2626
type: object
27+
properties:
28+
observedGeneration:
29+
type: integer
2730
type: object
2831
served: true
2932
storage: true

src/test/resources/sample/webpage/webpage.operator.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ spec:
66
parent:
77
apiVersion: glueoperator.sample/v1
88
kind: WebPage
9-
status:
10-
observedGeneration: "{parent.metadata.generation}"
9+
statusTemplate: |
10+
observedGeneration: {parent.metadata.generation}
1111
childResources:
1212
- name: htmlconfigmap
1313
resource:

0 commit comments

Comments
 (0)