address comments.

Signed-off-by: Morven Cao <lcao@redhat.com>

Author: morvencao

charts/maestro-agent/templates/pubsub-init-hook.yaml

@@ -50,15 +50,6 @@ spec:
               subscriber = pubsub_v1.SubscriberClient()
               publisher = pubsub_v1.PublisherClient()
 
-              # Extract topic names from full resource paths
-              # If using full paths like "projects/my-project/topics/sourceevents"
-              # we need to extract just the topic name
-              def extract_topic_name(topic_path):
-                  if topic_path.startswith('projects/'):
-                      # Full resource path: projects/PROJECT_ID/topics/TOPIC_NAME
-                      return topic_path.split('/')[-1]
-                  return topic_path
-
               subscriptions = [
                 (
                   f'sourceevents-{consumer_name}',

test/setup/deploy_server.sh

@@ -218,8 +218,13 @@ helm upgrade --install maestro-server \
   --wait \
   --timeout 5m
 
-kubectl rollout restart deploy/maestro -n ${namespace}
-kubectl rollout status deploy/maestro --timeout=300s -n ${namespace}
+if [ "$msg_broker" = "pubsub" ]; then
+  # restart to ensure maestro server starting subscriptions after pubsub-init post-hook completes
+  kubectl rollout restart deploy/maestro -n ${namespace}
+  kubectl rollout status deploy/maestro --timeout=300s -n ${namespace}
+else
+  kubectl wait deploy/maestro -n ${namespace} --for condition=Available=True --timeout=300s
+fi
 
 # TODO use maestro service health check to ensure the service ready
 sleep 30 # wait 30 seconds for the service ready