Merge pull request #913 from jhadvig/OCPBUGS-33715_2

OCPBUGS-33715: Cache organization ID when the ID changes

Author: openshift-merge-bot[bot]

pkg/console/operator/sync_v400.go

@@ -478,10 +478,11 @@ func (co *consoleOperator) GetTelemetryConfiguration(ctx context.Context, operat
 	if err != nil {
 		return nil, err
 	}
-
-	organizationID := telemetry.GetOrganizationID(telemetryConfig, co.trackables.organizationID, clusterID, accessToken)
-	// cache ORGANIZATION_ID
-	co.trackables.organizationID = organizationID
+	organizationID, refreshCache := telemetry.GetOrganizationID(telemetryConfig, co.trackables.organizationID, clusterID, accessToken)
+	// cache fetched ORGANIZATION_ID
+	if refreshCache {
+		co.trackables.organizationID = organizationID
+	}
 	telemetryConfig["ORGANIZATION_ID"] = organizationID
 
 	return telemetryConfig, nil

pkg/console/telemetry/telemetry.go

@@ -84,21 +84,21 @@ func GetAccessToken(secretsLister v1.SecretLister) (string, error) {
 // 1. custom ORGANIZATION_ID is awailable as telemetry annotation on console-operator config or in telemetry-config configmap
 // 2. cached ORGANIZATION_ID is available on the operator controller instance
 // else fetch the ORGANIZATION_ID from OCM
-func GetOrganizationID(telemetryConfig map[string]string, cachedOrganizationID, clusterID, accessToken string) string {
-	if customOrganizationID, isCustomOrgIDSet := telemetryConfig["ORGANIZATION_ID"]; isCustomOrgIDSet {
-		return customOrganizationID
+func GetOrganizationID(telemetryConfig map[string]string, cachedOrganizationID, clusterID, accessToken string) (string, bool) {
+	customOrganizationID, isCustomOrgIDSet := telemetryConfig["ORGANIZATION_ID"]
+	if isCustomOrgIDSet {
+		return customOrganizationID, false
 	}
 
 	if cachedOrganizationID != "" {
-		return cachedOrganizationID
+		return cachedOrganizationID, false
 	}
 
 	fetchedOrganizationID, err := FetchOrganizationID(clusterID, accessToken)
-	klog.V(4).Infoln("Fetching ORGANIZATION_ID from OCM")
 	if err != nil {
 		klog.Errorf("telemetry config error: %s", err)
 	}
-	return fetchedOrganizationID
+	return fetchedOrganizationID, true
 }
 
 // Needed to create our own types for OCM Subscriptions since their types and client are useless