Merge pull request buildpacks-community#1261 from buildpacks-community/improve-ytt

Reformat schema to allow for kbld imgpkg lock generation

Author: tomkennedy513

.github/workflows/ci.yaml

@@ -242,15 +242,15 @@ jobs:
     - name: Build release yaml
       run: |        
         ytt -f config/ \
-          -v controller_image=$(cat controller) \
-          -v webhook_image=$(cat webhook) \
-          -v build_init_image=$(cat build-init) \
-          -v build_init_windows_image=$(cat build-init-windows) \
-          -v build_waiter_image=$(cat build-waiter) \
-          -v rebase_image=$(cat rebase) \
-          -v completion_image=$(cat completion) \
-          -v completion_windows_image=$(cat completion-windows) \
-          -v lifecycle_image=$(cat lifecycle) > prerelease.yaml
+          -v controller.image=$(cat controller) \
+          -v webhook.image=$(cat webhook) \
+          -v build_init.image=$(cat build-init) \
+          -v build_init_windows.image=$(cat build-init-windows) \
+          -v build_waiter.image=$(cat build-waiter) \
+          -v rebase.image=$(cat rebase) \
+          -v completion.image=$(cat completion) \
+          -v completion_windows.image=$(cat completion-windows) \
+          -v lifecycle.image=$(cat lifecycle) > prerelease.yaml
 
         cat prerelease.yaml
 
@@ -494,15 +494,15 @@ jobs:
       run: |
         file="release-${{ env.KPACK_VERSION }}.yaml"
         ytt -f config/ \
-          -v controller_image=$(cat final-image-refs/controller) \
-          -v webhook_image=$(cat final-image-refs/webhook) \
-          -v build_init_image=$(cat final-image-refs/build-init) \
-          -v build_init_windows_image=$(cat final-image-refs/build-init-windows) \
-          -v build_waiter_image=$(cat final-image-refs/build-waiter) \
-          -v rebase_image=$(cat final-image-refs/rebase) \
-          -v completion_image=$(cat final-image-refs/completion) \
-          -v completion_windows_image=$(cat final-image-refs/completion-windows) \
-          -v lifecycle_image=$(cat final-image-refs/lifecycle) \
+          -v controller.image=$(cat final-image-refs/controller) \
+          -v webhook.image=$(cat final-image-refs/webhook) \
+          -v build_init.image=$(cat final-image-refs/build-init) \
+          -v build_init_windows.image=$(cat final-image-refs/build-init-windows) \
+          -v build_waiter.image=$(cat final-image-refs/build-waiter) \
+          -v rebase.image=$(cat final-image-refs/rebase) \
+          -v completion.image=$(cat final-image-refs/completion) \
+          -v completion_windows.image=$(cat final-image-refs/completion-windows) \
+          -v lifecycle.image=$(cat final-image-refs/lifecycle) \
           -v kpack_version=${{ env.KPACK_VERSION }} > $file
         echo "sha=$(shasum -a 256 $file)" >> $GITHUB_OUTPUT
 

config/controller.yaml

@@ -7,55 +7,55 @@ metadata:
   name:  build-init-image
   namespace: kpack
 data:
-  image: #@ data.values.build_init_image
+  image: #@ data.values.build_init.image
 ---
 apiVersion: v1
 kind: ConfigMap
 metadata:
   name:  build-init-windows-image
   namespace: kpack
 data:
-  image: #@ data.values.build_init_windows_image
+  image: #@ data.values.build_init_windows.image
 ---
 apiVersion: v1
 kind: ConfigMap
 metadata:
   name:  build-waiter-image
   namespace: kpack
 data:
-  image: #@ data.values.build_waiter_image
+  image: #@ data.values.build_waiter.image
 ---
 apiVersion: v1
 kind: ConfigMap
 metadata:
   name:  rebase-image
   namespace: kpack
 data:
-  image: #@ data.values.rebase_image
+  image: #@ data.values.rebase.image
 ---
 apiVersion: v1
 kind: ConfigMap
 metadata:
   name:  lifecycle-image
   namespace: kpack
 data:
-  image: #@ data.values.lifecycle_image
+  image: #@ data.values.lifecycle.image
 ---
 apiVersion: v1
 kind: ConfigMap
 metadata:
   name:  completion-image
   namespace: kpack
 data:
-  image: #@ data.values.completion_image
+  image: #@ data.values.completion.image
 ---
 apiVersion: v1
 kind: ConfigMap
 metadata:
   name:  completion-windows-image
   namespace: kpack
 data:
-  image: #@ data.values.completion_windows_image
+  image: #@ data.values.completion_windows.image
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -92,7 +92,7 @@ spec:
           capabilities:
             drop:
               - ALL
-        image: #@ data.values.controller_image
+        image: #@ data.values.controller.image
         env:
         - name: ENABLE_PRIORITY_CLASSES
           value: "false"

config/schema.yaml

@@ -1,13 +1,22 @@
 #@data/values-schema
 #@overlay/match-child-defaults missing_ok=True
 ---
-controller_image: gcr.io/controller
-webhook_image: gcr.io/webhook
-build_init_image: gcr.io/build-init
-build_waiter_image: gcr.io/build-waiter
-build_init_windows_image: gcr.io/cf-build-service-public/kpack/build-init-windows
-rebase_image: gcr.io/rebase
-completion_image: gcr.io/completion
-completion_windows_image: gcr.io/cf-build-service-public/kpack/completion-windows
-lifecycle_image: gcr.io/lifecycle
 kpack_version: dev
+controller:
+  image: controller
+webhook:
+  image: webhook
+build_init:
+  image: build-init
+build_waiter:
+  image: build-waiter
+build_init_windows:
+  image: build-init-windows
+rebase:
+  image: rebase
+completion:
+  image: completion
+completion_windows:
+  image: completion-windows
+lifecycle:
+  image: lifecycle

config/webhook.yaml

@@ -73,7 +73,7 @@ spec:
           capabilities:
             drop:
               - ALL
-        image: #@ data.values.webhook_image
+        image: #@ data.values.webhook.image
         ports:
         - name: https-webhook
           containerPort: 8443