diff --git a/.secrets.baseline b/.secrets.baseline index 0cc95d0da2..d8f28a079a 100644 --- a/.secrets.baseline +++ b/.secrets.baseline @@ -90,6 +90,10 @@ { "path": "detect_secrets.filters.allowlist.is_line_allowlisted" }, + { + "path": "detect_secrets.filters.common.is_baseline_file", + "filename": ".secrets.baseline" + }, { "path": "detect_secrets.filters.common.is_ignored_due_to_verification_policies", "min_level": 2 @@ -693,49 +697,49 @@ "filename": "kube/services/arborist/arborist-deploy.yaml", "hashed_secret": "dbd5f43594a152b52261c8e21520a3989823fe55", "is_verified": false, - "line_number": 64 + "line_number": 65 }, { "type": "Secret Keyword", "filename": "kube/services/arborist/arborist-deploy.yaml", "hashed_secret": "1c062eaac9e6fa0766377d3cfc3e4a88982fecdb", "is_verified": false, - "line_number": 67 + "line_number": 68 }, { "type": "Secret Keyword", "filename": "kube/services/arborist/arborist-deploy.yaml", "hashed_secret": "694cfd0a009a42055e975de9111b2f3c6e8a3634", "is_verified": false, - "line_number": 70 + "line_number": 71 }, { "type": "Secret Keyword", "filename": "kube/services/arborist/arborist-deploy.yaml", "hashed_secret": "4b09a441cef18c75560f6c3caeafc96f2163c3fd", "is_verified": false, - "line_number": 77 + "line_number": 78 }, { "type": "Secret Keyword", "filename": "kube/services/arborist/arborist-deploy.yaml", "hashed_secret": "7e7478a28dcc3695a083b66b47243b050c813e2d", "is_verified": false, - "line_number": 80 + "line_number": 81 }, { "type": "Secret Keyword", "filename": "kube/services/arborist/arborist-deploy.yaml", "hashed_secret": "2f57bb00fcb93481c2be444e3e9f322b6cb5fadb", "is_verified": false, - "line_number": 83 + "line_number": 84 }, { "type": "Secret Keyword", "filename": "kube/services/arborist/arborist-deploy.yaml", "hashed_secret": "ea73fcfdaa415890d5fde24d3b2245671be32f73", "is_verified": false, - "line_number": 86 + "line_number": 87 } ], "kube/services/argo/workflows/fence-usersync-wf.yaml": [ @@ -806,7 +810,7 @@ "filename": "kube/services/audit-service/audit-service-deploy.yaml", "hashed_secret": "42cde1c58c36d8bb5804a076e55ac6ec07ef99fc", "is_verified": false, - "line_number": 64 + "line_number": 65 } ], "kube/services/aws-es-proxy/aws-es-proxy-deploy.yaml": [ @@ -815,7 +819,7 @@ "filename": "kube/services/aws-es-proxy/aws-es-proxy-deploy.yaml", "hashed_secret": "7f834ccb442433fc12ec9532f75c3a4b6a748d4c", "is_verified": false, - "line_number": 46 + "line_number": 47 } ], "kube/services/cedar-wrapper/cedar-wrapper-deploy.yaml": [ @@ -913,7 +917,7 @@ "filename": "kube/services/dicom-server/dicom-server-deploy.yaml", "hashed_secret": "706168ac2565a93cceffe2202ac45d3d31c075fb", "is_verified": false, - "line_number": 40 + "line_number": 41 } ], "kube/services/fence/fence-canary-deploy.yaml": [ @@ -987,63 +991,63 @@ "filename": "kube/services/fence/fence-deploy.yaml", "hashed_secret": "dbd5f43594a152b52261c8e21520a3989823fe55", "is_verified": false, - "line_number": 71 + "line_number": 72 }, { "type": "Secret Keyword", "filename": "kube/services/fence/fence-deploy.yaml", "hashed_secret": "1c062eaac9e6fa0766377d3cfc3e4a88982fecdb", "is_verified": false, - "line_number": 74 + "line_number": 75 }, { "type": "Secret Keyword", "filename": "kube/services/fence/fence-deploy.yaml", "hashed_secret": "694cfd0a009a42055e975de9111b2f3c6e8a3634", "is_verified": false, - "line_number": 77 + "line_number": 78 }, { "type": "Secret Keyword", "filename": "kube/services/fence/fence-deploy.yaml", "hashed_secret": "4b09a441cef18c75560f6c3caeafc96f2163c3fd", "is_verified": false, - "line_number": 87 + "line_number": 88 }, { "type": "Secret Keyword", "filename": "kube/services/fence/fence-deploy.yaml", "hashed_secret": "7e7478a28dcc3695a083b66b47243b050c813e2d", "is_verified": false, - "line_number": 90 + "line_number": 91 }, { "type": "Secret Keyword", "filename": "kube/services/fence/fence-deploy.yaml", "hashed_secret": "2f57bb00fcb93481c2be444e3e9f322b6cb5fadb", "is_verified": false, - "line_number": 93 + "line_number": 94 }, { "type": "Secret Keyword", "filename": "kube/services/fence/fence-deploy.yaml", "hashed_secret": "98f5a68541a6d981bf5825f23dffe6a0b150e457", "is_verified": false, - "line_number": 96 + "line_number": 97 }, { "type": "Secret Keyword", "filename": "kube/services/fence/fence-deploy.yaml", "hashed_secret": "0849046cdafcdb17f5a4bf5c528430d5e04ad295", "is_verified": false, - "line_number": 99 + "line_number": 100 }, { "type": "Secret Keyword", "filename": "kube/services/fence/fence-deploy.yaml", "hashed_secret": "9ce05cf6168d15dfe02aac9ca9e0712c19c9436d", "is_verified": false, - "line_number": 102 + "line_number": 103 } ], "kube/services/fenceshib/fenceshib-canary-deploy.yaml": [ @@ -1189,28 +1193,28 @@ "filename": "kube/services/frontend-framework/frontend-framework-deploy.yaml", "hashed_secret": "9ce05cf6168d15dfe02aac9ca9e0712c19c9436d", "is_verified": false, - "line_number": 54 + "line_number": 55 }, { "type": "Secret Keyword", "filename": "kube/services/frontend-framework/frontend-framework-deploy.yaml", "hashed_secret": "6607b403f74e62246fc6a3c938feffc5a34a7e49", "is_verified": false, - "line_number": 57 + "line_number": 58 }, { "type": "Secret Keyword", "filename": "kube/services/frontend-framework/frontend-framework-deploy.yaml", "hashed_secret": "4b0bb3e58651fe56ee23e59aa6a3cb96dc61ddd2", "is_verified": false, - "line_number": 60 + "line_number": 61 }, { "type": "Secret Keyword", "filename": "kube/services/frontend-framework/frontend-framework-deploy.yaml", "hashed_secret": "e3c7565314f404e3883929f003c65a02a80366e9", "is_verified": false, - "line_number": 66 + "line_number": 67 } ], "kube/services/frontend-framework/frontend-framework-root-deploy.yaml": [ @@ -1346,14 +1350,14 @@ "filename": "kube/services/guppy/guppy-deploy.yaml", "hashed_secret": "0db22b31c9add2d3c76743c0ac6fbc99bb8b4761", "is_verified": false, - "line_number": 65 + "line_number": 66 }, { "type": "Secret Keyword", "filename": "kube/services/guppy/guppy-deploy.yaml", "hashed_secret": "9ce05cf6168d15dfe02aac9ca9e0712c19c9436d", "is_verified": false, - "line_number": 68 + "line_number": 69 } ], "kube/services/indexd/indexd-canary-deploy.yaml": [ @@ -1392,28 +1396,28 @@ "filename": "kube/services/indexd/indexd-deploy.yaml", "hashed_secret": "0b701c1fabb6ba47a7d47d455e3696d207014bd3", "is_verified": false, - "line_number": 63 + "line_number": 64 }, { "type": "Secret Keyword", "filename": "kube/services/indexd/indexd-deploy.yaml", "hashed_secret": "aee98a99696237d70b6854ee4c2d9e42bc696039", "is_verified": false, - "line_number": 66 + "line_number": 67 }, { "type": "Secret Keyword", "filename": "kube/services/indexd/indexd-deploy.yaml", "hashed_secret": "bdecca54d39013d43d3b7f05f2927eaa7df375dc", "is_verified": false, - "line_number": 72 + "line_number": 73 }, { "type": "Secret Keyword", "filename": "kube/services/indexd/indexd-deploy.yaml", "hashed_secret": "9ce05cf6168d15dfe02aac9ca9e0712c19c9436d", "is_verified": false, - "line_number": 75 + "line_number": 76 } ], "kube/services/jenkins-ci-worker/jenkins-ci-worker-deploy.yaml": [ @@ -2818,21 +2822,21 @@ "filename": "kube/services/manifestservice/manifestservice-deploy.yaml", "hashed_secret": "3da2c49c267b6c58401bbf05e379b38d20434f78", "is_verified": false, - "line_number": 61 + "line_number": 62 }, { "type": "Secret Keyword", "filename": "kube/services/manifestservice/manifestservice-deploy.yaml", "hashed_secret": "469e0c2b1a67aa94955bae023ddc727be31581a7", "is_verified": false, - "line_number": 64 + "line_number": 65 }, { "type": "Secret Keyword", "filename": "kube/services/manifestservice/manifestservice-deploy.yaml", "hashed_secret": "9ce05cf6168d15dfe02aac9ca9e0712c19c9436d", "is_verified": false, - "line_number": 67 + "line_number": 68 } ], "kube/services/metadata/metadata-deploy.yaml": [ @@ -2841,14 +2845,14 @@ "filename": "kube/services/metadata/metadata-deploy.yaml", "hashed_secret": "e14f65c8ca7f3b27a0f0f5463569954841e162c9", "is_verified": false, - "line_number": 61 + "line_number": 62 }, { "type": "Secret Keyword", "filename": "kube/services/metadata/metadata-deploy.yaml", "hashed_secret": "c27babf45eb0ed87329e69c7d47dba611e859c5d", "is_verified": false, - "line_number": 66 + "line_number": 67 } ], "kube/services/monitoring/grafana-values.yaml": [ @@ -2930,28 +2934,28 @@ "filename": "kube/services/peregrine/peregrine-deploy.yaml", "hashed_secret": "6131c35d7eebdbc17a314bef8aac75b87323cff3", "is_verified": false, - "line_number": 67 + "line_number": 68 }, { "type": "Secret Keyword", "filename": "kube/services/peregrine/peregrine-deploy.yaml", "hashed_secret": "ca253d1c9dece2da0d6fb24ded7bdb849a475966", "is_verified": false, - "line_number": 70 + "line_number": 71 }, { "type": "Secret Keyword", "filename": "kube/services/peregrine/peregrine-deploy.yaml", "hashed_secret": "990a3202b5c94aa5e5997e7dc1a218e457f8b8ec", "is_verified": false, - "line_number": 76 + "line_number": 77 }, { "type": "Secret Keyword", "filename": "kube/services/peregrine/peregrine-deploy.yaml", "hashed_secret": "9ce05cf6168d15dfe02aac9ca9e0712c19c9436d", "is_verified": false, - "line_number": 79 + "line_number": 80 } ], "kube/services/pidgin/pidgin-deploy.yaml": [ @@ -2976,28 +2980,28 @@ "filename": "kube/services/portal/portal-deploy.yaml", "hashed_secret": "9ce05cf6168d15dfe02aac9ca9e0712c19c9436d", "is_verified": false, - "line_number": 55 + "line_number": 56 }, { "type": "Secret Keyword", "filename": "kube/services/portal/portal-deploy.yaml", "hashed_secret": "5c5a8e158ad2d8544f73cd5422072d414f497faa", "is_verified": false, - "line_number": 58 + "line_number": 59 }, { "type": "Secret Keyword", "filename": "kube/services/portal/portal-deploy.yaml", "hashed_secret": "619551216e129bbc5322678abf9c9210c0327cfb", "is_verified": false, - "line_number": 61 + "line_number": 62 }, { "type": "Secret Keyword", "filename": "kube/services/portal/portal-deploy.yaml", "hashed_secret": "e3c7565314f404e3883929f003c65a02a80366e9", "is_verified": false, - "line_number": 67 + "line_number": 68 } ], "kube/services/portal/portal-root-deploy.yaml": [ @@ -3119,7 +3123,7 @@ "filename": "kube/services/requestor/requestor-deploy.yaml", "hashed_secret": "15debe4170aa5b89858d939f4c0644307ae7789b", "is_verified": false, - "line_number": 61 + "line_number": 62 } ], "kube/services/revproxy/gen3.nginx.conf/indexd-service.conf": [ @@ -3171,21 +3175,21 @@ "filename": "kube/services/revproxy/revproxy-deploy.yaml", "hashed_secret": "c7a87a61893a647e29289845cb51e61afb06800b", "is_verified": false, - "line_number": 74 + "line_number": 75 }, { "type": "Secret Keyword", "filename": "kube/services/revproxy/revproxy-deploy.yaml", "hashed_secret": "b3a4e2dea4c1fae8c58a07a84065b73b3a2d831c", "is_verified": false, - "line_number": 77 + "line_number": 78 }, { "type": "Secret Keyword", "filename": "kube/services/revproxy/revproxy-deploy.yaml", "hashed_secret": "9ce05cf6168d15dfe02aac9ca9e0712c19c9436d", "is_verified": false, - "line_number": 80 + "line_number": 81 } ], "kube/services/sftp/sftp-deploy.yaml": [ @@ -3233,28 +3237,28 @@ "filename": "kube/services/sheepdog/sheepdog-deploy.yaml", "hashed_secret": "ec9c944c51e87322de8d22e3ca9e2be1ad8fee0d", "is_verified": false, - "line_number": 63 + "line_number": 64 }, { "type": "Secret Keyword", "filename": "kube/services/sheepdog/sheepdog-deploy.yaml", "hashed_secret": "79496491225eda4a7be9fcddee2825c85b1535cc", "is_verified": false, - "line_number": 66 + "line_number": 67 }, { "type": "Secret Keyword", "filename": "kube/services/sheepdog/sheepdog-deploy.yaml", "hashed_secret": "e43756046ad1763d6946575fed0e05130a154bd2", "is_verified": false, - "line_number": 72 + "line_number": 73 }, { "type": "Secret Keyword", "filename": "kube/services/sheepdog/sheepdog-deploy.yaml", "hashed_secret": "9ce05cf6168d15dfe02aac9ca9e0712c19c9436d", "is_verified": false, - "line_number": 75 + "line_number": 76 } ], "kube/services/shiny/shiny-deploy.yaml": [ @@ -3272,7 +3276,7 @@ "filename": "kube/services/ssjdispatcher/ssjdispatcher-deploy.yaml", "hashed_secret": "7f932449df74fc78573fea502df8a484aef3f69d", "is_verified": false, - "line_number": 61 + "line_number": 62 } ], "kube/services/superset/superset-deploy.yaml": [ @@ -3363,7 +3367,7 @@ "filename": "kube/services/wts/wts-deploy.yaml", "hashed_secret": "5de687ae886f19c3cb68d4980e3f2e77cca3db9e", "is_verified": false, - "line_number": 65 + "line_number": 66 } ], "packer/buildAll.sh": [ @@ -3685,5 +3689,5 @@ } ] }, - "generated_at": "2024-07-19T04:34:31Z" + "generated_at": "2024-08-23T16:35:21Z" } diff --git a/gen3/lib/g3k_manifest.sh b/gen3/lib/g3k_manifest.sh index ae42e84ba5..d69ef5b99a 100644 --- 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 index 8788cef13c..28e6a41fda 100644 --- 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 index 5deef6ac7b..360c5c04ac 100644 --- 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 index 89ec29ecce..3b9d1b6a2d 100644 --- 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 index 935cab408b..b7081a7f51 100644 --- 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 index 34f18d9730..c7f72b4d81 100644 --- 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 index 43bd90e5da..58040e6d45 100644 --- 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 index 9df6fbc930..7cd9b6bbe0 100644 --- 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 index 9524315d98..35048424b0 100644 --- 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 index f0da277dce..7acc9f745c 100644 --- 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 index c3e8d121c4..1dc6c7da00 100644 --- 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 index f7de81d79b..80e64a5821 100644 --- 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 index 2390790587..af60e9b4a3 100644 --- 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 index 0966f24803..3551cfa66c 100644 --- 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 index 72986e7958..68a83078e6 100644 --- 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 index 20bba64adf..6467fe3251 100644 --- 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 index 742f1b71cb..fb1aa2d6f1 100644 --- 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 index fb5ce173f7..2ed8866384 100644 --- 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 index 7ea798b778..80fd582e0b 100644 --- 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 index a260c87411..2f476d0f0a 100644 --- 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 index b66739d068..2c4e5f610c 100644 --- 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 index 554c60cb5e..990f583cb0 100644 --- 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 index e54a9cfc4f..06f43fe01c 100644 --- 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: