Merge pull request #70094 from mwwolters/prepare-log-file-args

Changed prepare-log-file to take args for setting uid/gid for log files.

Merge pull request #70094 from mwwolters/prepare-log-file-args
4cbeddd7 · k8s-ci-robot · GitHub · 3abb9f0a · c9d34073 · 4cbeddd7
Unverified Commit 4cbeddd7 authored Oct 24, 2018 by k8s-ci-robot Committed by GitHub Oct 24, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

configure-helper.sh cluster/gce/gci/configure-helper.sh +3 -1

No files found.
--- a/cluster/gce/gci/configure-helper.sh
+++ b/cluster/gce/gci/configure-helper.sh
@@ -1273,10 +1273,12 @@ EOF
 # Create the log file and set its properties.
 #
 # $1 is the file to create.
+# $2: the log owner uid to set for the log file.
+# $3: the log owner gid to set for the log file.
 function prepare-log-file {
  touch $1
  chmod 644 $1
-  chown "${LOG_OWNER_USER:-root}":"${LOG_OWNER_GROUP:-root}" $1
+  chown "${2:-${LOG_OWNER_USER:-root}}":"${3:-${LOG_OWNER_GROUP:-root}}" $1
 }

 # Prepares parameters for kube-proxy manifest.