Skip to content

Commit 22d4cf8

Browse files
authored
Remove managedFields from gathered resources (openshift#460)
* Remove metadata.managedFields from resources * Fix tests broken by ResourceMarshaller * Add tests for ResourceMarshaller * Update sample JSONs with managedFields * Fix invalid pointer to resources in some gatherers * Fix linter errors related to resource marshalling * Add misspell nolint to ResourceMarshaller
1 parent 794a5b5 commit 22d4cf8

File tree

185 files changed

+13071
-17556
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

185 files changed

+13071
-17556
lines changed

docs/insights-archive-sample/config/authentication.json

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,23 @@
11
{
2-
"kind": "Authentication",
3-
"apiVersion": "config.openshift.io/v1",
42
"metadata": {
53
"name": "cluster",
64
"selfLink": "/apis/config.openshift.io/v1/authentications/cluster",
7-
"uid": "ac282512-00f7-41c2-bdff-2a3a17c70f56",
8-
"resourceVersion": "20082",
5+
"uid": "f90ceec3-1d67-4d0f-81c9-c92e8e06162f",
6+
"resourceVersion": "15398",
97
"generation": 1,
10-
"creationTimestamp": "2020-08-12T08:27:44Z",
8+
"creationTimestamp": "2021-07-07T11:03:06Z",
119
"annotations": {
10+
"include.release.openshift.io/self-managed-high-availability": "true",
11+
"include.release.openshift.io/single-node-developer": "true",
1212
"release.openshift.io/create-only": "true"
1313
}
1414
},
1515
"spec": {
1616
"type": "",
1717
"oauthMetadata": {
1818
"name": ""
19-
}
19+
},
20+
"serviceAccountIssuer": ""
2021
},
2122
"status": {
2223
"integratedOAuthMetadata": {

docs/insights-archive-sample/config/clusteroperator/authentication.json

+34-14
Original file line numberDiff line numberDiff line change
@@ -4,47 +4,60 @@
44
"metadata": {
55
"name": "authentication",
66
"selfLink": "/apis/config.openshift.io/v1/clusteroperators/authentication",
7-
"uid": "159e53cc-e023-47f4-bb59-390da02f0c9e",
8-
"resourceVersion": "23758",
7+
"uid": "f9f2d54f-1abd-4533-9819-5386a1e7c7a6",
8+
"resourceVersion": "1782215",
99
"generation": 1,
10-
"creationTimestamp": "2020-08-12T08:29:29Z"
10+
"creationTimestamp": "2021-07-07T11:02:54Z",
11+
"annotations": {
12+
"exclude.release.openshift.io/internal-openshift-hosted": "true",
13+
"include.release.openshift.io/self-managed-high-availability": "true",
14+
"include.release.openshift.io/single-node-developer": "true"
15+
}
1116
},
1217
"spec": {},
1318
"status": {
1419
"conditions": [
1520
{
1621
"type": "Degraded",
1722
"status": "False",
18-
"lastTransitionTime": "2020-08-12T08:53:52Z",
19-
"reason": "AsExpected"
23+
"lastTransitionTime": "2021-07-12T21:20:38Z",
24+
"reason": "AsExpected",
25+
"message": "All is well"
2026
},
2127
{
2228
"type": "Progressing",
2329
"status": "False",
24-
"lastTransitionTime": "2020-08-12T08:59:23Z",
25-
"reason": "AsExpected"
30+
"lastTransitionTime": "2021-07-12T21:20:42Z",
31+
"reason": "AsExpected",
32+
"message": "All is well"
2633
},
2734
{
2835
"type": "Available",
2936
"status": "True",
30-
"lastTransitionTime": "2020-08-12T08:59:23Z",
31-
"reason": "AsExpected"
37+
"lastTransitionTime": "2021-07-12T21:20:44Z",
38+
"reason": "AsExpected",
39+
"message": "OAuthServerDeploymentAvailable: availableReplicas==2"
3240
},
3341
{
3442
"type": "Upgradeable",
35-
"status": "True",
36-
"lastTransitionTime": "2020-08-12T08:29:29Z",
37-
"reason": "AsExpected"
43+
"status": "False",
44+
"lastTransitionTime": "2021-07-07T11:26:28Z",
45+
"reason": "UnsupportedConfigOverrides_UnsupportedConfigOverridesSet",
46+
"message": "UnsupportedConfigOverridesUpgradeable: setting: [useUnsupportedUnsafeNonHANonProductionUnstableOAuthServer]"
3847
}
3948
],
4049
"versions": [
50+
{
51+
"name": "oauth-apiserver",
52+
"version": "4.7.16"
53+
},
4154
{
4255
"name": "oauth-openshift",
43-
"version": "4.4.16_openshift"
56+
"version": "4.7.16_openshift"
4457
},
4558
{
4659
"name": "operator",
47-
"version": "4.4.16"
60+
"version": "4.7.16"
4861
}
4962
],
5063
"relatedObjects": [
@@ -71,11 +84,13 @@
7184
{
7285
"group": "route.openshift.io",
7386
"resource": "routes",
87+
"namespace": "openshift-authentication",
7488
"name": "oauth-openshift"
7589
},
7690
{
7791
"group": "",
7892
"resource": "services",
93+
"namespace": "openshift-authentication",
7994
"name": "oauth-openshift"
8095
},
8196
{
@@ -102,6 +117,11 @@
102117
"group": "",
103118
"resource": "namespaces",
104119
"name": "openshift-ingress"
120+
},
121+
{
122+
"group": "",
123+
"resource": "namespaces",
124+
"name": "openshift-oauth-apiserver"
105125
}
106126
],
107127
"extension": null
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
{
2+
"kind": "ClusterOperator",
3+
"apiVersion": "config.openshift.io/v1",
4+
"metadata": {
5+
"name": "baremetal",
6+
"selfLink": "/apis/config.openshift.io/v1/clusteroperators/baremetal",
7+
"uid": "acae4cff-a1f3-4d63-b75b-e4532a0a0c3f",
8+
"resourceVersion": "5106",
9+
"generation": 1,
10+
"creationTimestamp": "2021-07-07T11:02:54Z",
11+
"annotations": {
12+
"exclude.release.openshift.io/internal-openshift-hosted": "true",
13+
"include.release.openshift.io/self-managed-high-availability": "true",
14+
"include.release.openshift.io/single-node-developer": "true"
15+
}
16+
},
17+
"spec": {},
18+
"status": {
19+
"conditions": [
20+
{
21+
"type": "Progressing",
22+
"status": "False",
23+
"lastTransitionTime": "2021-07-07T11:26:29Z"
24+
},
25+
{
26+
"type": "Degraded",
27+
"status": "False",
28+
"lastTransitionTime": "2021-07-07T11:26:29Z"
29+
},
30+
{
31+
"type": "Available",
32+
"status": "True",
33+
"lastTransitionTime": "2021-07-07T11:26:29Z",
34+
"reason": "AsExpected",
35+
"message": "Operational"
36+
},
37+
{
38+
"type": "Upgradeable",
39+
"status": "True",
40+
"lastTransitionTime": "2021-07-07T11:26:29Z"
41+
},
42+
{
43+
"type": "Disabled",
44+
"status": "True",
45+
"lastTransitionTime": "2021-07-07T11:26:29Z",
46+
"reason": "UnsupportedPlatform",
47+
"message": "Nothing to do on this Platform"
48+
}
49+
],
50+
"versions": [
51+
{
52+
"name": "operator",
53+
"version": "4.7.16"
54+
}
55+
],
56+
"relatedObjects": [
57+
{
58+
"group": "",
59+
"resource": "namespaces",
60+
"name": "openshift-machine-api"
61+
},
62+
{
63+
"group": "metal3.io",
64+
"resource": "baremetalhosts",
65+
"namespace": "openshift-machine-api",
66+
"name": ""
67+
},
68+
{
69+
"group": "metal3.io",
70+
"resource": "provisioning",
71+
"name": ""
72+
}
73+
],
74+
"extension": null
75+
}
76+
}

0 commit comments

Comments
 (0)