From 43e232b00fff83b868dee4ee985dba781c084aec Mon Sep 17 00:00:00 2001
From: Sen Lu <senlu@google.com>
Date: Mon, 4 Mar 2019 15:09:59 -0800
Subject: [PATCH] remove the metadata bandaid hack

---
 .../generated-security-jobs.yaml                 |  4 ----
 config/jobs/kubernetes/sig-testing/verify.yaml   | 16 ----------------
 images/bootstrap/runner.sh                       |  7 -------
 3 files changed, 27 deletions(-)

diff --git a/config/jobs/kubernetes-security/generated-security-jobs.yaml b/config/jobs/kubernetes-security/generated-security-jobs.yaml
index 88683e9649e0..c075c900b47c 100644
--- a/config/jobs/kubernetes-security/generated-security-jobs.yaml
+++ b/config/jobs/kubernetes-security/generated-security-jobs.yaml
@@ -3550,8 +3550,6 @@ presubmits:
           value: master
         - name: REPO_DIR
           value: /workspace/k8s.io/kubernetes
-        - name: METADATA_BANDAID
-          value: "true"
         image: gcr.io/k8s-testimages/kubekins-e2e:v20190301-76bc03340-master
         imagePullPolicy: Always
         name: ""
@@ -3600,8 +3598,6 @@ presubmits:
           value: master
         - name: REPO_DIR
           value: /workspace/k8s.io/kubernetes
-        - name: METADATA_BANDAID
-          value: "true"
         image: gcr.io/k8s-testimages/kubekins-e2e:v20190301-76bc03340-1.14
         imagePullPolicy: Always
         name: ""
diff --git a/config/jobs/kubernetes/sig-testing/verify.yaml b/config/jobs/kubernetes/sig-testing/verify.yaml
index bdc23f9afd60..e3dadc71f2c0 100644
--- a/config/jobs/kubernetes/sig-testing/verify.yaml
+++ b/config/jobs/kubernetes/sig-testing/verify.yaml
@@ -33,10 +33,6 @@ presubmits:
           value: master
         - name: REPO_DIR
           value: /workspace/k8s.io/kubernetes
-        # TODO(bentheelder): remove bandaid once we have this metadata exposed
-        # properly, first-class
-        - name: METADATA_BANDAID
-          value: "true"
         # docker-in-docker needs privileged mode
         securityContext:
           privileged: true
@@ -71,10 +67,6 @@ presubmits:
               value: master
             - name: REPO_DIR
               value: /workspace/k8s.io/kubernetes
-            # TODO(bentheelder): remove bandaid once we have this metadata exposed
-            # properly, first-class
-            - name: METADATA_BANDAID
-              value: "true"
           # docker-in-docker needs privileged mode
           securityContext:
             privileged: true
@@ -142,10 +134,6 @@ periodics:
         value: master
       - name: REPO_DIR
         value: /workspace/k8s.io/kubernetes
-      # TODO(bentheelder): remove bandaid once we have this metadata exposed
-      # properly, first-class
-      - name: METADATA_BANDAID
-        value: "true"
       # docker-in-docker needs privileged mode
       securityContext:
         privileged: true
@@ -182,10 +170,6 @@ periodics:
             value: release-1.14
           - name: REPO_DIR
             value: /workspace/k8s.io/kubernetes
-          # TODO(bentheelder): remove bandaid once we have this metadata exposed
-          # properly, first-class
-          - name: METADATA_BANDAID
-            value: "true"
         # docker-in-docker needs privileged mode
         securityContext:
           privileged: true
diff --git a/images/bootstrap/runner.sh b/images/bootstrap/runner.sh
index e11ca6213a30..126852bdf117 100755
--- a/images/bootstrap/runner.sh
+++ b/images/bootstrap/runner.sh
@@ -95,13 +95,6 @@ fi
 SOURCE_DATE_EPOCH=$(git log -1 --pretty=%ct || true)
 export SOURCE_DATE_EPOCH
 
-# TODO(bentheelder): this is a band-aid! Delete this when we've exposed this data
-# in the pod-utils first-class.
-if [[ "${METADATA_BANDAID:-false}" == "true" ]]; then
-    mkdir -p "${ARTIFACTS}"
-    echo "{\"revision\": \"$(git rev-parse HEAD)\"}" >> "${ARTIFACTS}/metadata.json"
-fi
-
 # actually start bootstrap and the job
 set -o xtrace
 "$@"