diff --git a/docs/gathered-data.md b/docs/gathered-data.md index ca9f686ebe..e7d2968d93 100644 --- a/docs/gathered-data.md +++ b/docs/gathered-data.md @@ -61,6 +61,7 @@ Response see https://docs.openshift.com/container-platform/4.3/rest_api/index.ht fetches the image pruner configuration * Location in archive: config/clusteroperator/imageregistry.operator.openshift.io/imagepruner/cluster.json +* Location in older versions: config/imagepruner.json * Id in config: image_pruners @@ -72,6 +73,7 @@ fetches the cluster Image Registry configuration PersistentVolume definition is gathered * Location in archive: config/clusteroperator/imageregistry.operator.openshift.io/config/cluster.json +* Location in older versions: config/imageregistry.json * Id in config: image_registries * Since versions: * 4.3.40+ @@ -159,7 +161,9 @@ collects all the ClusterOperators definitions and their resources. The Kubernetes api https://github.com/openshift/client-go/blob/master/config/clientset/versioned/typed/config/v1/clusteroperator.go#L62 Response see https://docs.openshift.com/container-platform/4.3/rest_api/index.html#clusteroperatorlist-v1config-openshift-io +* Location of operators related resources: config/clusteroperator/{group}/{kind}/{name} * Location of operators in archive: config/clusteroperator/ +* Location of operators related resources in older versions: config/clusteroperator/{kind}-{name} * See: docs/insights-archive-sample/config/clusteroperator * Id in config: operators * Spec config for CO resources since versions: @@ -209,6 +213,7 @@ The Kubernetes api https://github.com/kubernetes/client-go/blob/master/kubernete Response see https://docs.openshift.com/container-platform/4.3/rest_api/index.html#configmaplist-v1core * Location in archive: config/configmaps/{namespace-name}/{configmap-name}/ +* Location in older versions: config/configmaps/{configmap-name}/ * See: docs/insights-archive-sample/config/configmaps * Id in config: config_maps * Since versions: diff --git a/pkg/gatherers/clusterconfig/config_maps.go b/pkg/gatherers/clusterconfig/config_maps.go index 202d28e2f8..b71275a6dd 100644 --- a/pkg/gatherers/clusterconfig/config_maps.go +++ b/pkg/gatherers/clusterconfig/config_maps.go @@ -27,6 +27,7 @@ import ( // Response see https://docs.openshift.com/container-platform/4.3/rest_api/index.html#configmaplist-v1core // // * Location in archive: config/configmaps/{namespace-name}/{configmap-name}/ +// * Location in older versions: config/configmaps/{configmap-name}/ // * See: docs/insights-archive-sample/config/configmaps // * Id in config: config_maps // * Since versions: diff --git a/pkg/gatherers/clusterconfig/image_pruners.go b/pkg/gatherers/clusterconfig/image_pruners.go index 0810c62ee1..6ce0f98d4f 100644 --- a/pkg/gatherers/clusterconfig/image_pruners.go +++ b/pkg/gatherers/clusterconfig/image_pruners.go @@ -17,6 +17,7 @@ import ( // GatherClusterImagePruner fetches the image pruner configuration // // * Location in archive: config/clusteroperator/imageregistry.operator.openshift.io/imagepruner/cluster.json +// * Location in older versions: config/imagepruner.json // * Id in config: image_pruners func (g *Gatherer) GatherClusterImagePruner(ctx context.Context) ([]record.Record, []error) { registryClient, err := imageregistryv1client.NewForConfig(g.gatherKubeConfig) diff --git a/pkg/gatherers/clusterconfig/image_registries.go b/pkg/gatherers/clusterconfig/image_registries.go index fb9fba87c1..f33ab94619 100644 --- a/pkg/gatherers/clusterconfig/image_registries.go +++ b/pkg/gatherers/clusterconfig/image_registries.go @@ -25,6 +25,7 @@ import ( // PersistentVolume definition is gathered // // * Location in archive: config/clusteroperator/imageregistry.operator.openshift.io/config/cluster.json +// * Location in older versions: config/imageregistry.json // * Id in config: image_registries // * Since versions: // * 4.3.40+ diff --git a/pkg/gatherers/clusterconfig/operators.go b/pkg/gatherers/clusterconfig/operators.go index a741f7fc81..bc89fdd211 100644 --- a/pkg/gatherers/clusterconfig/operators.go +++ b/pkg/gatherers/clusterconfig/operators.go @@ -37,7 +37,9 @@ type clusterOperatorResource struct { // The Kubernetes api https://github.com/openshift/client-go/blob/master/config/clientset/versioned/typed/config/v1/clusteroperator.go#L62 // Response see https://docs.openshift.com/container-platform/4.3/rest_api/index.html#clusteroperatorlist-v1config-openshift-io // +// * Location of operators related resources: config/clusteroperator/{group}/{kind}/{name} // * Location of operators in archive: config/clusteroperator/ +// * Location of operators related resources in older versions: config/clusteroperator/{kind}-{name} // * See: docs/insights-archive-sample/config/clusteroperator // * Id in config: operators // * Spec config for CO resources since versions: