Merge pull request #31 from like-inspur/master

add annotation namespace
tumblr · May 27, 2020 · 35975e6 · 35975e6
2 parents 61e633e + be417c3
commit 35975e6
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/entrypoint.sh b/entrypoint.sh
@@ -7,6 +7,7 @@ TLS_CERT_FILE="${TLS_CERT_FILE:-/var/lib/secrets/cert.crt}"
 TLS_KEY_FILE="${TLS_KEY_FILE:-/var/lib/secrets/cert.key}"
 CONFIGMAP_LABELS="${CONFIGMAP_LABELS:-app=k8s-sidecar-injector}"
 CONFIGMAP_NAMESPACE="${CONFIGMAP_NAMESPACE:-}"
+ANNOTATION_NAMESPACE="${ANNOTATION_NAMESPACE:-injector.tumblr.com}"
 LOG_LEVEL="${LOG_LEVEL:-2}"
 echo "k8s-sidecar-injector starting at $(date) with TLS_PORT=${TLS_PORT} CONFIG_DIR=${CONFIG_DIR} TLS_CERT_FILE=${TLS_CERT_FILE} TLS_KEY_FILE=${TLS_KEY_FILE}"
 set -x
@@ -19,4 +20,5 @@ exec k8s-sidecar-injector \
   --tls-key-file="${TLS_KEY_FILE}" \
   --configmap-labels="${CONFIGMAP_LABELS}" \
   --configmap-namespace="${CONFIGMAP_NAMESPACE}" \
+  --annotation-namespace="${ANNOTATION_NAMESPACE}" \
   "$@"