OCPBUGS-14475: extend configmap gatherer to get gateway-mode-config (o…

…penshift#788)
JoaoFula · Jan 23, 2024 · ee2b05b · ee2b05b
1 parent 2b4e75a
commit ee2b05b
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 7 deletions.
diff --git a/docs/gathered-data.md b/docs/gathered-data.md
@@ -583,6 +583,7 @@ and tries to fetch `cluster-monitoring-config` from `openshift-monitoring` names
 ### Changes
 - `cluster-monitoring-config` data since versions 4.6.22+ and 4.7.0+
 - `cluster-config-v1` since versions 4.9.0+
+- `gateway-mode-config` data from 'openshift-network-operator' namespace since 4.14.0+
 
 ### Anonymization
 If the content of a `ConfigMap` contains a parseable PEM structure (like a certificate), it removes the inside of

diff --git a/...archive-sample/config/configmaps/openshift-network-operator/gateway-mode-config/mode.json b/...archive-sample/config/configmaps/openshift-network-operator/gateway-mode-config/mode.json
@@ -0,0 +1 @@
+"local"
diff --git a/pkg/controller/operator.go b/pkg/controller/operator.go
@@ -84,8 +84,11 @@ func (s *Operator) Run(ctx context.Context, controller *controllercmd.Controller
 		return err
 	}
 
-	desiredVersion := os.Getenv("RELEASE_VERSION")
 	missingVersion := "0.0.1-snapshot"
+	desiredVersion := missingVersion
+	if envVersion, exists := os.LookupEnv("RELEASE_VERSION"); exists {
+		desiredVersion = envVersion
+	}
 
 	// By default, this will exit(0) the process if the featuregates ever change to a different set of values.
 	featureGateAccessor := featuregates.NewFeatureGateAccess(

diff --git a/pkg/gatherers/clusterconfig/config_maps.go b/pkg/gatherers/clusterconfig/config_maps.go
@@ -44,6 +44,7 @@ import (
 // ### Changes
 // - `cluster-monitoring-config` data since versions 4.6.22+ and 4.7.0+
 // - `cluster-config-v1` since versions 4.9.0+
+// - `gateway-mode-config` data from 'openshift-network-operator' namespace since 4.14.0+
 //
 // ### Anonymization
 // If the content of a `ConfigMap` contains a parseable PEM structure (like a certificate), it removes the inside of
@@ -61,10 +62,14 @@ func (g *Gatherer) GatherConfigMaps(ctx context.Context) ([]record.Record, []err
 
 	records, errs := gatherConfigMaps(ctx, coreClient)
 
-	monitoringRec, monitoringErrs := gatherMonitoringCM(ctx, coreClient)
+	monitoringRec, monitoringErrs := gatherConfigMap(ctx, coreClient, "cluster-monitoring-config", "openshift-monitoring")
 	records = append(records, monitoringRec...)
 	errs = append(errs, monitoringErrs...)
 
+	gateayModeConf, networkErrs := gatherConfigMap(ctx, coreClient, "gateway-mode-config", "openshift-network-operator")
+	records = append(records, gateayModeConf...)
+	errs = append(errs, networkErrs...)
+
 	clusterConfigV1Rec, clusterConfigV1Errs := gatherClusterConfigV1(ctx, coreClient)
 	records = append(records, clusterConfigV1Rec...)
 	errs = append(errs, clusterConfigV1Errs...)
@@ -98,21 +103,21 @@ func gatherConfigMaps(ctx context.Context, coreClient corev1client.CoreV1Interfa
 	return records, nil
 }
 
-func gatherMonitoringCM(ctx context.Context, coreClient corev1client.CoreV1Interface) ([]record.Record, []error) {
-	monitoringCM, err := coreClient.ConfigMaps("openshift-monitoring").Get(ctx, "cluster-monitoring-config", metav1.GetOptions{})
+func gatherConfigMap(ctx context.Context, coreClient corev1client.CoreV1Interface, name, namespace string) ([]record.Record, []error) {
+	cm, err := coreClient.ConfigMaps(namespace).Get(ctx, name, metav1.GetOptions{})
 	if err != nil {
 		return nil, []error{err}
 	}
 
 	records := make([]record.Record, 0)
 
-	for dk, dv := range monitoringCM.Data {
+	for dk, dv := range cm.Data {
 		j, err := yaml.YAMLToJSON([]byte(dv))
 		if err != nil {
 			return nil, []error{err}
 		}
 		records = append(records, record.Record{
-			Name: fmt.Sprintf("config/configmaps/%s/%s/%s", monitoringCM.Namespace, monitoringCM.Name, strings.TrimSuffix(dk, ".yaml")),
+			Name: fmt.Sprintf("config/configmaps/%s/%s/%s", cm.Namespace, cm.Name, strings.TrimSuffix(dk, ".yaml")),
 			Item: RawJSON(j),
 		})
 	}

diff --git a/pkg/gatherers/clusterconfig/config_maps_test.go b/pkg/gatherers/clusterconfig/config_maps_test.go
@@ -204,7 +204,7 @@ func Test_ConfigMap_YAML_Data(t *testing.T) {
 			if err != nil {
 				t.Fatalf("cannot create %s config map: %v", tt.testCM.Name, err)
 			}
-			records, errs := gatherMonitoringCM(context.Background(), coreClient.CoreV1())
+			records, errs := gatherConfigMap(context.Background(), coreClient.CoreV1(), tt.testCM.Name, tt.testCM.Namespace)
 			if len(errs) > 0 {
 				if errs[0].Error() != tt.expectedError.Error() {
 					t.Fatalf("unexpected errors: %v", errs[0].Error())