Merge pull request #65 from cloudfoundry/image-refs

Refactor config values to follow standard format

Author: Caitlyn Yu

config/00-values.yml renamed to config/values/_defaults.yml

@@ -9,11 +9,4 @@ fluentd:
     path: '/metrics'
     port: '24231'
 
-images:
-  log_cache: ""
-  syslog_server: ""
-  log_cache_gateway: ""
-  fluent: ""
-  cf_auth_proxy: ""
-
 debug: false

config/values/images.yml

@@ -0,0 +1,11 @@
+
+#@ load("@ytt:overlay", "overlay")
+#@data/values
+---
+#@overlay/match missing_ok=True
+images:
+  log_cache: ""
+  syslog_server: ""
+  log_cache_gateway: ""
+  fluent: ""
+  cf_auth_proxy: ""

scripts/build-images.sh

@@ -16,7 +16,7 @@ function buildAndReplaceImage {
     docker push $REPOSITORY/$image:latest
 
     imageRef="$(docker image inspect $REPOSITORY/$image:latest --format '{{index .RepoDigests 0}}')"
-    sed -i'' -e "s| $yttValuesRef:.*| $yttValuesRef: \"$imageRef\"|" config/00-values.yml
+    sed -i'' -e "s| $yttValuesRef:.*| $yttValuesRef: \"$imageRef\"|" config/values/images.yml
 }
 buildAndReplaceImage log-cache vendor/log-cache/src cmd/log-cache/Dockerfile log_cache > /tmp/logcache.txt  &
 buildAndReplaceImage log-cache-gateway vendor/log-cache/src cmd/gateway/Dockerfile log_cache_gateway > /tmp/log-cache-gateway.txt &

scripts/bump-cf-for-k8s.sh

@@ -8,6 +8,7 @@ BASE_DIR="${SCRIPT_DIR}/.."
 
 pushd "${CF_FOR_K8s_DIR}"
   vendir sync -d config/logging/_ytt_lib/cf-k8s-logging="${BASE_DIR}/config"
-  cp -r "${BASE_DIR}"/tests/assets/* config/logging/_ytt_lib/cf-k8s-logging/
+  cp -r "${BASE_DIR}"/tests/assets/aggregate-drain.yml config/logging/_ytt_lib/cf-k8s-logging/values/
+  cp -r "${BASE_DIR}"/tests/assets/ncat-deploy.yml config/logging/_ytt_lib/cf-k8s-logging/
 popd