Fix bug where reporting applied intents to the cloud could fail when …

…using istio, due to a missing SharedServiceAccount annotation
otterize · Feb 24, 2025 · 99637ea · 99637ea
1 parent aee63b3
commit 99637ea
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 28 deletions.
diff --git a/src/operator/api/v1alpha3/clientintents_types.go b/src/operator/api/v1alpha3/clientintents_types.go
@@ -572,13 +572,13 @@ func clientIntentsStatusToCloudFormat(clientIntents ClientIntents, intent Intent
 
 	status.IstioStatus.ServiceAccountName = toPtrOrNil(serviceAccountName)
 	isSharedValue, ok := clientIntents.Annotations[OtterizeSharedServiceAccountAnnotation]
-	if !ok {
-		return nil, false, errors.Errorf("missing annotation shared service account for client intents %s", clientIntents.Name)
-	}
-
-	isShared, err := strconv.ParseBool(isSharedValue)
-	if err != nil {
-		return nil, false, errors.Errorf("failed to parse shared service account annotation for client intents %s", clientIntents.Name)
+	isShared := false
+	if ok {
+		parsedIsShared, err := strconv.ParseBool(isSharedValue)
+		if err != nil {
+			return nil, false, errors.Errorf("failed to parse shared service account annotation for client intents %s", clientIntents.Name)
+		}
+		isShared = parsedIsShared
 	}
 	status.IstioStatus.IsServiceAccountShared = lo.ToPtr(isShared)
 

diff --git a/src/operator/api/v1beta1/clientintents_types.go b/src/operator/api/v1beta1/clientintents_types.go
@@ -575,13 +575,13 @@ func clientIntentsStatusToCloudFormat(clientIntents ClientIntents, intent Intent
 
 	status.IstioStatus.ServiceAccountName = toPtrOrNil(serviceAccountName)
 	isSharedValue, ok := clientIntents.Annotations[OtterizeSharedServiceAccountAnnotation]
-	if !ok {
-		return nil, false, errors.Errorf("missing annotation shared service account for client intents %s", clientIntents.Name)
-	}
-
-	isShared, err := strconv.ParseBool(isSharedValue)
-	if err != nil {
-		return nil, false, errors.Errorf("failed to parse shared service account annotation for client intents %s", clientIntents.Name)
+	isShared := false
+	if ok {
+		parsedIsShared, err := strconv.ParseBool(isSharedValue)
+		if err != nil {
+			return nil, false, errors.Errorf("failed to parse shared service account annotation for client intents %s", clientIntents.Name)
+		}
+		isShared = parsedIsShared
 	}
 	status.IstioStatus.IsServiceAccountShared = lo.ToPtr(isShared)
 

diff --git a/src/operator/api/v2alpha1/clientintents_types.go b/src/operator/api/v2alpha1/clientintents_types.go
@@ -688,13 +688,13 @@ func clientIntentsStatusToCloudFormat(clientIntents ClientIntents, intent Target
 
 	status.IstioStatus.ServiceAccountName = toPtrOrNil(serviceAccountName)
 	isSharedValue, ok := clientIntents.Annotations[OtterizeSharedServiceAccountAnnotation]
-	if !ok {
-		return nil, false, errors.Errorf("missing annotation shared service account for client intents %s", clientIntents.Name)
-	}
-
-	isShared, err := strconv.ParseBool(isSharedValue)
-	if err != nil {
-		return nil, false, errors.Errorf("failed to parse shared service account annotation for client intents %s", clientIntents.Name)
+	isShared := false
+	if ok {
+		parsedIsShared, err := strconv.ParseBool(isSharedValue)
+		if err != nil {
+			return nil, false, errors.Errorf("failed to parse shared service account annotation for client intents %s", clientIntents.Name)
+		}
+		isShared = parsedIsShared
 	}
 	status.IstioStatus.IsServiceAccountShared = lo.ToPtr(isShared)
 

diff --git a/src/operator/api/v2beta1/clientintents_types.go b/src/operator/api/v2beta1/clientintents_types.go
@@ -688,13 +688,13 @@ func clientIntentsStatusToCloudFormat(clientIntents ClientIntents, intent Target
 
 	status.IstioStatus.ServiceAccountName = toPtrOrNil(serviceAccountName)
 	isSharedValue, ok := clientIntents.Annotations[OtterizeSharedServiceAccountAnnotation]
-	if !ok {
-		return nil, false, errors.Errorf("missing annotation shared service account for client intents %s", clientIntents.Name)
-	}
-
-	isShared, err := strconv.ParseBool(isSharedValue)
-	if err != nil {
-		return nil, false, errors.Errorf("failed to parse shared service account annotation for client intents %s", clientIntents.Name)
+	isShared := false
+	if ok {
+		parsedIsShared, err := strconv.ParseBool(isSharedValue)
+		if err != nil {
+			return nil, false, errors.Errorf("failed to parse shared service account annotation for client intents %s", clientIntents.Name)
+		}
+		isShared = parsedIsShared
 	}
 	status.IstioStatus.IsServiceAccountShared = lo.ToPtr(isShared)