Skip to content

Commit 8376456

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

File tree

3 files changed

+41
-2
lines changed

3 files changed

+41
-2
lines changed

Diff for: operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/SSABasedGenericKubernetesResourceMatcher.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ private static void fillResultsAndTraverseFurther(Map<String, Object> result,
159159
Object managedFieldValue) {
160160
var emptyMapValue = new HashMap<String, Object>();
161161
result.put(keyInActual, emptyMapValue);
162-
var actualMapValue = actualMap.get(keyInActual);
162+
var actualMapValue = actualMap.getOrDefault(keyInActual, Map.of());
163163
log.debug("key: {} actual map value: {} managedFieldValue: {}", keyInActual,
164164
actualMapValue, managedFieldValue);
165165

Diff for: operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/ssastatefulsetmatcherissue/StatefulSetDependentResource.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ public StatefulSetDependentResource() {
1717
@Override
1818
protected StatefulSet desired(SSAStatefulSetMatcherIssueCustomResource primary,
1919
Context<SSAStatefulSetMatcherIssueCustomResource> context) {
20-
var template = ReconcilerUtils.loadYaml(StatefulSet.class, getClass(), "statefulset.yaml");
20+
var template =
21+
ReconcilerUtils.loadYaml(StatefulSet.class, getClass(), "statefulset_fixed_full.yaml");
2122
template.setMetadata(new ObjectMetaBuilder()
2223
.withName(primary.getMetadata().getName())
2324
.withNamespace(primary.getMetadata().getNamespace())
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
apiVersion: apps/v1
2+
kind: StatefulSet
3+
metadata:
4+
name: web
5+
spec:
6+
selector:
7+
matchLabels:
8+
app: nginx # has to match .spec.template.metadata.labels
9+
serviceName: "nginx"
10+
replicas: 1
11+
minReadySeconds: 10 # by default is 0
12+
template:
13+
metadata:
14+
labels:
15+
app: nginx # has to match .spec.selector.matchLabels
16+
spec:
17+
terminationGracePeriodSeconds: 10
18+
containers:
19+
- name: nginx
20+
image: registry.k8s.io/nginx-slim:0.8
21+
ports:
22+
- containerPort: 80
23+
name: web
24+
volumeMounts:
25+
- name: www
26+
mountPath: /usr/share/nginx/html
27+
volumeClaimTemplates:
28+
- metadata:
29+
name: www
30+
spec:
31+
accessModes: [ "ReadWriteOnce" ]
32+
storageClassName: "my-storage-class"
33+
volumeMode: Filesystem
34+
resources:
35+
requests:
36+
storage: 1Gi
37+
status:
38+
phase: pending

0 commit comments

Comments
 (0)