adding "hostname" label to our services

uc-cdis · Aug 23, 2024 · 6920af9 · 6920af9
1 parent 4dfcee2
commit 6920af9
Show file tree

Hide file tree

Showing 24 changed files with 82 additions and 53 deletions.
diff --git a/.secrets.baseline b/.secrets.baseline
diff --git a/gen3/lib/g3k_manifest.sh b/gen3/lib/g3k_manifest.sh
@@ -253,8 +253,11 @@ g3k_manifest_filter() {
     kvList+=("$kvLabelKey" "tags.datadoghq.com/version: '$version'")
   done
   environment="$(g3k_config_lookup ".global.environment" "$manifestPath")"
+  hostname="$(g3k_config_lookup ".global.hostname" "$manifestPath")"
   kvEnvKey=$(echo "GEN3_ENV_LABEL" | tr '[:lower:]' '[:upper:]')
+  kvHostKey=$(echo "GEN3_HOSTNAME_LABEL" | tr '[:lower:]' '[:upper:]')
   kvList+=("$kvEnvKey" "tags.datadoghq.com/env: $environment")
+  kvList+=("$kvHostKey" "hostname: $hostname")
   for key in $(g3k_config_lookup '. | keys[]' "$manifestPath"); do
     gen3_log_debug "harvesting key $key"
     for key2 in $(g3k_config_lookup ".[\"${key}\"] "' | to_entries | map(select((.value|type != "array") and (.value|type != "object"))) | map(.key)[]' "$manifestPath" | grep '^[a-zA-Z]'); do

diff --git a/kube/services/ambassador/ambassador-deploy.yaml b/kube/services/ambassador/ambassador-deploy.yaml
@@ -24,6 +24,7 @@ spec:
         netnolimit: "yes"
         userhelper: "yes"
         GEN3_DATE_LABEL
+        GEN3_HOSTNAME_LABEL
     spec:
       affinity:
         podAntiAffinity:

diff --git a/kube/services/arborist/arborist-deploy.yaml b/kube/services/arborist/arborist-deploy.yaml
@@ -24,6 +24,7 @@ spec:
         # for revproxy authz
         public: "yes"
         GEN3_DATE_LABEL
+        GEN3_HOSTNAME_LABEL
     spec:
       affinity:
         podAntiAffinity:

diff --git a/kube/services/argo-wrapper/argo-wrapper-deploy.yaml b/kube/services/argo-wrapper/argo-wrapper-deploy.yaml
@@ -24,6 +24,7 @@ spec:
         GEN3_ENV_LABEL
         GEN3_ARGO-WRAPPER_VERSION
         GEN3_DATE_LABEL
+        GEN3_HOSTNAME_LABEL
     spec:
       affinity:
         podAntiAffinity:

diff --git a/kube/services/audit-service/audit-service-deploy.yaml b/kube/services/audit-service/audit-service-deploy.yaml
@@ -27,6 +27,7 @@ spec:
         # for network policy
         netnolimit: "yes"
         GEN3_DATE_LABEL
+        GEN3_HOSTNAME_LABEL
     spec:
       serviceAccountName: audit-service-sa
       affinity:

diff --git a/kube/services/aws-es-proxy/aws-es-proxy-deploy.yaml b/kube/services/aws-es-proxy/aws-es-proxy-deploy.yaml
@@ -21,6 +21,7 @@ spec:
         app: esproxy
         netvpc: "yes"
         GEN3_DATE_LABEL
+        GEN3_HOSTNAME_LABEL
     spec:
       affinity:
         nodeAffinity:

diff --git a/kube/services/dicom-server/dicom-server-deploy.yaml b/kube/services/dicom-server/dicom-server-deploy.yaml
@@ -16,6 +16,7 @@ spec:
         release: production
         public: "yes"
         GEN3_DATE_LABEL
+        GEN3_HOSTNAME_LABEL
     spec:
       affinity:
         nodeAffinity:

diff --git a/kube/services/dicom-viewer/dicom-viewer-deploy.yaml b/kube/services/dicom-viewer/dicom-viewer-deploy.yaml
@@ -16,6 +16,7 @@ spec:
         release: production
         public: "yes"
         GEN3_DATE_LABEL
+        GEN3_HOSTNAME_LABEL
     spec:
       affinity:
         nodeAffinity:

diff --git a/kube/services/fence/fence-deploy.yaml b/kube/services/fence/fence-deploy.yaml
@@ -28,6 +28,7 @@ spec:
         userhelper: "yes"
         tags.datadoghq.com/service: "fence"
         GEN3_ENV_LABEL
+        GEN3_HOSTNAME_LABEL
         GEN3_FENCE_VERSION
         GEN3_DATE_LABEL
     spec:

diff --git a/kube/services/frontend-framework/frontend-framework-deploy.yaml b/kube/services/frontend-framework/frontend-framework-deploy.yaml
@@ -18,6 +18,7 @@ spec:
         app: frontend-framework
         public: "yes"
         GEN3_DATE_LABEL
+        GEN3_HOSTNAME_LABEL
     spec:
       affinity:
         podAntiAffinity:

diff --git a/kube/services/guppy/guppy-deploy.yaml b/kube/services/guppy/guppy-deploy.yaml
@@ -23,6 +23,7 @@ spec:
         GEN3_GUPPY_VERSION
         GEN3_ENV_LABEL
         GEN3_DATE_LABEL
+        GEN3_HOSTNAME_LABEL
     spec:
       affinity:
         podAntiAffinity:

diff --git a/kube/services/hatchery/hatchery-deploy.yaml b/kube/services/hatchery/hatchery-deploy.yaml
@@ -24,6 +24,7 @@ spec:
         GEN3_HATCHERY_VERSION
         GEN3_ENV_LABEL
         GEN3_DATE_LABEL
+        GEN3_HOSTNAME_LABEL
     spec:
       affinity:
         podAntiAffinity:

diff --git a/kube/services/indexd/indexd-deploy.yaml b/kube/services/indexd/indexd-deploy.yaml
@@ -27,6 +27,7 @@ spec:
         GEN3_ENV_LABEL
         GEN3_INDEXD_VERSION
         GEN3_DATE_LABEL
+        GEN3_HOSTNAME_LABEL
     spec:
       affinity:
         podAntiAffinity:

diff --git a/kube/services/manifestservice/manifestservice-deploy.yaml b/kube/services/manifestservice/manifestservice-deploy.yaml
@@ -24,6 +24,7 @@ spec:
         userhelper: "yes"
         netvpc: "yes"
         GEN3_DATE_LABEL
+        GEN3_HOSTNAME_LABEL
     spec:
       serviceAccountName: manifestservice-sa
       affinity:

diff --git a/kube/services/metadata/metadata-deploy.yaml b/kube/services/metadata/metadata-deploy.yaml
@@ -25,6 +25,7 @@ spec:
         # for network policy
         netnolimit: "yes"
         GEN3_DATE_LABEL
+        GEN3_HOSTNAME_LABEL
     spec:
       affinity:
         podAntiAffinity:

diff --git a/kube/services/peregrine/peregrine-deploy.yaml b/kube/services/peregrine/peregrine-deploy.yaml
@@ -29,6 +29,7 @@ spec:
         GEN3_ENV_LABEL
         GEN3_PEREGRINE_VERSION
         GEN3_DATE_LABEL
+        GEN3_HOSTNAME_LABEL
     spec:
       affinity:
         podAntiAffinity:

diff --git a/kube/services/portal/portal-deploy.yaml b/kube/services/portal/portal-deploy.yaml
@@ -19,6 +19,7 @@ spec:
         app: portal
         public: "yes"
         GEN3_DATE_LABEL
+        GEN3_HOSTNAME_LABEL
     spec:
       affinity:
         podAntiAffinity:

diff --git a/kube/services/requestor/requestor-deploy.yaml b/kube/services/requestor/requestor-deploy.yaml
@@ -25,6 +25,7 @@ spec:
         # for network policy
         netnolimit: "yes"
         GEN3_DATE_LABEL
+        GEN3_HOSTNAME_LABEL
     spec:
       affinity:
         podAntiAffinity:

diff --git a/kube/services/revproxy/revproxy-deploy.yaml b/kube/services/revproxy/revproxy-deploy.yaml
@@ -23,6 +23,7 @@ spec:
         userhelper: "yes"
         internet: "yes"
         GEN3_DATE_LABEL
+        GEN3_HOSTNAME_LABEL
     spec:
       affinity:
         podAntiAffinity:

diff --git a/kube/services/sheepdog/sheepdog-deploy.yaml b/kube/services/sheepdog/sheepdog-deploy.yaml
@@ -27,6 +27,7 @@ spec:
         GEN3_ENV_LABEL
         GEN3_SHEEPDOG_VERSION
         GEN3_DATE_LABEL
+        GEN3_HOSTNAME_LABEL
     spec:
       affinity:
         podAntiAffinity:

diff --git a/kube/services/sower/sower-deploy.yaml b/kube/services/sower/sower-deploy.yaml
@@ -22,6 +22,7 @@ spec:
         public: "yes"
         netnolimit: "yes"
         GEN3_DATE_LABEL
+        GEN3_HOSTNAME_LABEL
     spec:
       affinity:
         podAntiAffinity:

diff --git a/kube/services/ssjdispatcher/ssjdispatcher-deploy.yaml b/kube/services/ssjdispatcher/ssjdispatcher-deploy.yaml
@@ -21,6 +21,7 @@ spec:
         netnolimit: "yes"
         public: "yes"
         GEN3_DATE_LABEL
+        GEN3_HOSTNAME_LABEL
     spec:
       serviceAccountName: ssjdispatcher-service-account
       securityContext:

diff --git a/kube/services/wts/wts-deploy.yaml b/kube/services/wts/wts-deploy.yaml
@@ -29,6 +29,7 @@ spec:
         GEN3_DATE_LABEL
         GEN3_WTS_VERSION
         GEN3_ENV_LABEL
+        GEN3_HOSTNAME_LABEL
     spec:
       affinity:
         podAntiAffinity: