From e9f060dae399ffc98dfbb121d77b3cbefef88417 Mon Sep 17 00:00:00 2001
From: Peter Szalai <szalaipeti.vagyok@gmail.com>
Date: Thu, 2 Mar 2023 15:05:16 +0100
Subject: [PATCH] Add setup job labels to compose files (#7473)

---
 docker/docker-compose-without-neo4j.override.yml          | 2 ++
 docker/docker-compose-without-neo4j.yml                   | 6 ++++++
 docker/docker-compose.override.yml                        | 2 ++
 docker/docker-compose.yml                                 | 6 ++++++
 docker/quickstart/docker-compose-m1.quickstart.yml        | 8 ++++++++
 .../docker-compose-without-neo4j-m1.quickstart.yml        | 8 ++++++++
 .../docker-compose-without-neo4j.quickstart.yml           | 6 ++++++
 docker/quickstart/docker-compose.quickstart.yml           | 8 ++++++++
 8 files changed, 46 insertions(+)

diff --git a/docker/docker-compose-without-neo4j.override.yml b/docker/docker-compose-without-neo4j.override.yml
index 4bad986676..d2c50df793 100644
--- a/docker/docker-compose-without-neo4j.override.yml
+++ b/docker/docker-compose-without-neo4j.override.yml
@@ -14,6 +14,8 @@ services:
       - mysqldata:/var/lib/mysql
 
   mysql-setup:
+    labels:
+      datahub_setup_job: true
     build:
       context: ../
       dockerfile: docker/mysql-setup/Dockerfile
diff --git a/docker/docker-compose-without-neo4j.yml b/docker/docker-compose-without-neo4j.yml
index 0cedaa25b2..2cba67792f 100644
--- a/docker/docker-compose-without-neo4j.yml
+++ b/docker/docker-compose-without-neo4j.yml
@@ -55,6 +55,8 @@ services:
 
   # This "container" is a workaround to pre-create search indices
   elasticsearch-setup:
+    labels:
+      datahub_setup_job: true
     build:
       context: ../
       dockerfile: docker/elasticsearch-setup/Dockerfile
@@ -102,6 +104,8 @@ services:
       - datahub-gms
 
   kafka-setup:
+    labels:
+      datahub_setup_job: true
     build:
       dockerfile: ./docker/kafka-setup/Dockerfile
       context: ../
@@ -114,6 +118,8 @@ services:
       - schema-registry
 
   datahub-upgrade:
+    labels:
+      datahub_setup_job: true
     build:
       context: ../
       dockerfile: docker/datahub-upgrade/Dockerfile
diff --git a/docker/docker-compose.override.yml b/docker/docker-compose.override.yml
index 41467d8e7e..e4389ed040 100644
--- a/docker/docker-compose.override.yml
+++ b/docker/docker-compose.override.yml
@@ -15,6 +15,8 @@ services:
       - mysqldata:/var/lib/mysql
 
   mysql-setup:
+    labels:
+      datahub_setup_job: true
     build:
       context: ../
       dockerfile: docker/mysql-setup/Dockerfile
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 1221ffb4f8..167faac6ce 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -68,6 +68,8 @@ services:
 
   # This "container" is a workaround to pre-create search indices
   elasticsearch-setup:
+    labels:
+      datahub_setup_job: true
     build:
       context: ../
       dockerfile: docker/elasticsearch-setup/Dockerfile
@@ -118,6 +120,8 @@ services:
   # This is not required in most cases, kept here for backwards compatibility with older clients that
   # explicitly wait for this container
   kafka-setup:
+    labels:
+      datahub_setup_job: true
     build:
       dockerfile: ./docker/kafka-setup/Dockerfile
       context: ../
@@ -130,6 +134,8 @@ services:
       - schema-registry
 
   datahub-upgrade:
+    labels:
+      datahub_setup_job: true
     build:
       context: ../
       dockerfile: docker/datahub-upgrade/Dockerfile
diff --git a/docker/quickstart/docker-compose-m1.quickstart.yml b/docker/quickstart/docker-compose-m1.quickstart.yml
index 02ef55f34a..1af05dfae0 100644
--- a/docker/quickstart/docker-compose-m1.quickstart.yml
+++ b/docker/quickstart/docker-compose-m1.quickstart.yml
@@ -127,6 +127,8 @@ services:
     - ENTITY_REGISTRY_CONFIG_PATH=/datahub/datahub-gms/resources/entity-registry.yml
     hostname: datahub-upgrade
     image: ${DATAHUB_UPGRADE_IMAGE:-acryldata/datahub-upgrade}:${DATAHUB_VERSION:-head}
+    labels:
+      datahub_setup_job: true
   elasticsearch:
     container_name: elasticsearch
     environment:
@@ -157,6 +159,8 @@ services:
     - ELASTICSEARCH_PROTOCOL=http
     hostname: elasticsearch-setup
     image: ${DATAHUB_ELASTIC_SETUP_IMAGE:-linkedin/datahub-elasticsearch-setup}:${DATAHUB_VERSION:-head}
+    labels:
+      datahub_setup_job: true
   kafka-setup:
     container_name: kafka-setup
     depends_on:
@@ -168,6 +172,8 @@ services:
     - KAFKA_ZOOKEEPER_CONNECT=zookeeper:2181
     hostname: kafka-setup
     image: ${DATAHUB_KAFKA_SETUP_IMAGE:-linkedin/datahub-kafka-setup}:${DATAHUB_VERSION:-head}
+    labels:
+      datahub_setup_job: true
   mysql:
     command: --character-set-server=utf8mb4 --collation-server=utf8mb4_bin --default-authentication-plugin=mysql_native_password
     container_name: mysql
@@ -195,6 +201,8 @@ services:
     - DATAHUB_DB_NAME=datahub
     hostname: mysql-setup
     image: ${DATAHUB_MYSQL_SETUP_IMAGE:-acryldata/datahub-mysql-setup}:${DATAHUB_VERSION:-head}
+    labels:
+      datahub_setup_job: true
   neo4j:
     container_name: neo4j
     environment:
diff --git a/docker/quickstart/docker-compose-without-neo4j-m1.quickstart.yml b/docker/quickstart/docker-compose-without-neo4j-m1.quickstart.yml
index 91df6d5ec8..503efa77da 100644
--- a/docker/quickstart/docker-compose-without-neo4j-m1.quickstart.yml
+++ b/docker/quickstart/docker-compose-without-neo4j-m1.quickstart.yml
@@ -118,6 +118,8 @@ services:
     - ENTITY_REGISTRY_CONFIG_PATH=/datahub/datahub-gms/resources/entity-registry.yml
     hostname: datahub-upgrade
     image: ${DATAHUB_UPGRADE_IMAGE:-acryldata/datahub-upgrade}:${DATAHUB_VERSION:-head}
+    labels:
+      datahub_setup_job: true
   elasticsearch:
     container_name: elasticsearch
     environment:
@@ -148,6 +150,8 @@ services:
     - ELASTICSEARCH_PROTOCOL=http
     hostname: elasticsearch-setup
     image: ${DATAHUB_ELASTIC_SETUP_IMAGE:-linkedin/datahub-elasticsearch-setup}:${DATAHUB_VERSION:-head}
+    labels:
+      datahub_setup_job: true
   kafka-setup:
     container_name: kafka-setup
     depends_on:
@@ -159,6 +163,8 @@ services:
     - KAFKA_ZOOKEEPER_CONNECT=zookeeper:2181
     hostname: kafka-setup
     image: ${DATAHUB_KAFKA_SETUP_IMAGE:-linkedin/datahub-kafka-setup}:${DATAHUB_VERSION:-head}
+    labels:
+      datahub_setup_job: true
   mysql:
     command: --character-set-server=utf8mb4 --collation-server=utf8mb4_bin --default-authentication-plugin=mysql_native_password
     container_name: mysql
@@ -186,6 +192,8 @@ services:
     - DATAHUB_DB_NAME=datahub
     hostname: mysql-setup
     image: ${DATAHUB_MYSQL_SETUP_IMAGE:-acryldata/datahub-mysql-setup}:${DATAHUB_VERSION:-head}
+    labels:
+      datahub_setup_job: true
   schema-registry:
     container_name: schema-registry
     depends_on:
diff --git a/docker/quickstart/docker-compose-without-neo4j.quickstart.yml b/docker/quickstart/docker-compose-without-neo4j.quickstart.yml
index 211f8cdba4..af803c8498 100644
--- a/docker/quickstart/docker-compose-without-neo4j.quickstart.yml
+++ b/docker/quickstart/docker-compose-without-neo4j.quickstart.yml
@@ -116,6 +116,8 @@ services:
       - ENTITY_REGISTRY_CONFIG_PATH=/datahub/datahub-gms/resources/entity-registry.yml
     hostname: datahub-upgrade
     image: ${DATAHUB_UPGRADE_IMAGE:-acryldata/datahub-upgrade}:${DATAHUB_VERSION:-head}
+    labels:
+      datahub_setup_job: true
   elasticsearch:
     container_name: elasticsearch
     environment:
@@ -145,6 +147,8 @@ services:
       - ELASTICSEARCH_PROTOCOL=http
     hostname: elasticsearch-setup
     image: ${DATAHUB_ELASTIC_SETUP_IMAGE:-linkedin/datahub-elasticsearch-setup}:${DATAHUB_VERSION:-head}
+    labels:
+      datahub_setup_job: true
   kafka-setup:
     container_name: kafka-setup
     depends_on:
@@ -156,6 +160,8 @@ services:
       - KAFKA_ZOOKEEPER_CONNECT=zookeeper:2181
     hostname: kafka-setup
     image: ${DATAHUB_KAFKA_SETUP_IMAGE:-linkedin/datahub-kafka-setup}:${DATAHUB_VERSION:-head}
+    labels:
+      datahub_setup_job: true
   mysql:
     command: --character-set-server=utf8mb4 --collation-server=utf8mb4_bin --default-authentication-plugin=mysql_native_password
     container_name: mysql
diff --git a/docker/quickstart/docker-compose.quickstart.yml b/docker/quickstart/docker-compose.quickstart.yml
index 22ef0785f5..ee9efac705 100644
--- a/docker/quickstart/docker-compose.quickstart.yml
+++ b/docker/quickstart/docker-compose.quickstart.yml
@@ -125,6 +125,8 @@ services:
       - ENTITY_REGISTRY_CONFIG_PATH=/datahub/datahub-gms/resources/entity-registry.yml
     hostname: datahub-upgrade
     image: ${DATAHUB_UPGRADE_IMAGE:-acryldata/datahub-upgrade}:${DATAHUB_VERSION:-head}
+    labels:
+      datahub_setup_job: true
   elasticsearch:
     container_name: elasticsearch
     environment:
@@ -154,6 +156,8 @@ services:
       - ELASTICSEARCH_PROTOCOL=http
     hostname: elasticsearch-setup
     image: ${DATAHUB_ELASTIC_SETUP_IMAGE:-linkedin/datahub-elasticsearch-setup}:${DATAHUB_VERSION:-head}
+    labels:
+      datahub_setup_job: true
   kafka-setup:
     container_name: kafka-setup
     depends_on:
@@ -165,6 +169,8 @@ services:
       - KAFKA_ZOOKEEPER_CONNECT=zookeeper:2181
     hostname: kafka-setup
     image: ${DATAHUB_KAFKA_SETUP_IMAGE:-linkedin/datahub-kafka-setup}:${DATAHUB_VERSION:-head}
+    labels:
+      datahub_setup_job: true
   mysql:
     command: --character-set-server=utf8mb4 --collation-server=utf8mb4_bin --default-authentication-plugin=mysql_native_password
     container_name: mysql
@@ -192,6 +198,8 @@ services:
       - DATAHUB_DB_NAME=datahub
     hostname: mysql-setup
     image: ${DATAHUB_MYSQL_SETUP_IMAGE:-acryldata/datahub-mysql-setup}:${DATAHUB_VERSION:-head}
+    labels:
+      datahub_setup_job: true
   neo4j:
     container_name: neo4j
     environment: