Skip to content

Commit 4f90d8b

Browse files
committed
Add missing sample archive data
1 parent 6433cde commit 4f90d8b

File tree

3 files changed

+109
-2
lines changed

3 files changed

+109
-2
lines changed

docs/gathered-data.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,8 @@ fetches the image pruner configuration
6565
## ClusterImageRegistry
6666

6767
fetches the cluster Image Registry configuration
68-
If the Image Registry configuration uses some PersistentVolumeClaim for the storage then the corresponding
68+
69+
**Conditional data**: If the Image Registry configuration uses any PersistentVolumeClaim for the storage, the corresponding
6970
PersistentVolume definition is gathered
7071

7172
* Location in archive: config/clusteroperator/imageregistry.operator.openshift.io/config/cluster.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,105 @@
1+
{
2+
"metadata": {
3+
"name": "task-pv-volume",
4+
"selfLink": "/api/v1/persistentvolumes/task-pv-volume",
5+
"uid": "e34bbfc2-1541-444a-b4b5-70d52d2bca50",
6+
"resourceVersion": "345113",
7+
"creationTimestamp": "2021-04-23T07:25:31Z",
8+
"labels": {
9+
"type": "local"
10+
},
11+
"annotations": {
12+
"pv.kubernetes.io/bound-by-controller": "yes"
13+
},
14+
"finalizers": [
15+
"kubernetes.io/pv-protection"
16+
],
17+
"managedFields": [
18+
{
19+
"manager": "oc",
20+
"operation": "Update",
21+
"apiVersion": "v1",
22+
"time": "2021-04-23T07:25:31Z",
23+
"fieldsType": "FieldsV1",
24+
"fieldsV1": {
25+
"f:metadata": {
26+
"f:labels": {
27+
".": {},
28+
"f:type": {}
29+
}
30+
},
31+
"f:spec": {
32+
"f:accessModes": {},
33+
"f:capacity": {
34+
".": {},
35+
"f:storage": {}
36+
},
37+
"f:hostPath": {
38+
".": {},
39+
"f:path": {},
40+
"f:type": {}
41+
},
42+
"f:persistentVolumeReclaimPolicy": {},
43+
"f:storageClassName": {},
44+
"f:volumeMode": {}
45+
}
46+
}
47+
},
48+
{
49+
"manager": "kube-controller-manager",
50+
"operation": "Update",
51+
"apiVersion": "v1",
52+
"time": "2021-04-23T07:43:48Z",
53+
"fieldsType": "FieldsV1",
54+
"fieldsV1": {
55+
"f:metadata": {
56+
"f:annotations": {
57+
".": {},
58+
"f:pv.kubernetes.io/bound-by-controller": {}
59+
}
60+
},
61+
"f:spec": {
62+
"f:claimRef": {
63+
".": {},
64+
"f:apiVersion": {},
65+
"f:kind": {},
66+
"f:name": {},
67+
"f:namespace": {},
68+
"f:resourceVersion": {},
69+
"f:uid": {}
70+
}
71+
},
72+
"f:status": {
73+
"f:phase": {}
74+
}
75+
}
76+
}
77+
]
78+
},
79+
"spec": {
80+
"capacity": {
81+
"storage": "50Mi"
82+
},
83+
"hostPath": {
84+
"path": "/tmp/data",
85+
"type": ""
86+
},
87+
"accessModes": [
88+
"ReadWriteOnce"
89+
],
90+
"claimRef": {
91+
"kind": "PersistentVolumeClaim",
92+
"namespace": "openshift-sdn",
93+
"name": "task-pvc-volume",
94+
"uid": "70d530a3-cde6-44a4-b7a9-b0eeb6a9a895",
95+
"apiVersion": "v1",
96+
"resourceVersion": "345110"
97+
},
98+
"persistentVolumeReclaimPolicy": "Retain",
99+
"storageClassName": "manual",
100+
"volumeMode": "Filesystem"
101+
},
102+
"status": {
103+
"phase": "Bound"
104+
}
105+
}

pkg/gather/clusterconfig/image_registries.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ import (
2121
)
2222

2323
// GatherClusterImageRegistry fetches the cluster Image Registry configuration
24-
// If the Image Registry configuration uses some PersistentVolumeClaim for the storage then the corresponding
24+
//
25+
// **Conditional data**: If the Image Registry configuration uses any PersistentVolumeClaim for the storage, the corresponding
2526
// PersistentVolume definition is gathered
2627
//
2728
// * Location in archive: config/clusteroperator/imageregistry.operator.openshift.io/config/cluster.json

0 commit comments

Comments
 (0)