Merge pull request #76 from cloudfoundry/image-refs

Refactored config values to standard layout

Author: Caitlyn Yu

.github/workflows/tests.yml

@@ -10,7 +10,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v1
       with:
-        go-version: 1.13
+        go-version: 1.16
     - name: Check out code
       uses: actions/checkout@v1
     - name: Run tests

ci/scaling.yml

@@ -19,7 +19,7 @@ resources:
     private_key: ((github_private_key.private_key))
     branch: develop
     ignore_paths:
-      - config/values.yaml # Do not want resource to trigger on image digest updates
+      - config/values/images.yml # Do not want resource to trigger on image digest updates
 
 - name: cf-k8s-networking-ci
   type: git

config/routecontroller/routecontroller.yaml

@@ -31,7 +31,7 @@ spec:
     spec:
       containers:
       - name: routecontroller
-        image: #@ data.values.routecontroller.image
+        image: #@ data.values.images.routecontroller
         args: ["--enable-leader-election=true"]
         resources:
           limits:

config/values.yaml config/values/_defaults.yml

@@ -5,8 +5,5 @@
 systemNamespace: cf-system
 workloadsNamespace: cf-workloads
 
-routecontroller:
-  image: cloudfoundry/routecontroller@sha256:547a0939ab61bcac7a24f371f7eba0ba5ee287a88d2d45478fcc88be1f524e73
-
 service:
   externalPort: 80

config/values/images.yml

@@ -0,0 +1,6 @@
+#@ load("@ytt:overlay", "overlay")
+#@data/values
+---
+#@overlay/match missing_ok=True
+images:
+  routecontroller: cloudfoundry/routecontroller@sha256:547a0939ab61bcac7a24f371f7eba0ba5ee287a88d2d45478fcc88be1f524e73

routecontroller/stress/stress_test.go

@@ -79,7 +79,7 @@ func stressRouteController(numberOfRoutes int, results Results) Results {
 
 	yttSession, err := ytt.Run(
 		"-f", filepath.Join("..", "..", "config", "routecontroller"),
-		"-f", filepath.Join("..", "..", "config", "values.yaml"),
+		"-f", filepath.Join("..", "..", "config", "values", "_defaults.yml"),
 		"-v", "systemNamespace=default",
 	)
 	Expect(err).NotTo(HaveOccurred())