Do not expose development values to kc package bundle (#1111)

Structure the config values to have a clear separation of values
Update dev-deploy.sh to use these config values

Signed-off-by: Praveen Rewar <[email protected]>

Author: praveenrewar

.github/workflows/kind-action.yml

@@ -38,7 +38,7 @@ jobs:
 
           source ./hack/version-util.sh
 
-          ytt -f config/ -v kapp_controller_version="$(get_kappctrl_ver)+develop" | kbld -f- > kbld.out 2> kbldmeta.out
+          ytt -f config -f config-dev -v dev.version="$(get_kappctrl_ver)+develop" | kbld -f- > kbld.out 2> kbldmeta.out
           cat kbldmeta.out | tail -n 1 | sed 's/.*final: kapp-controller -> \(.*\)$/\1/p'  | tail -n 1 | xargs kind load docker-image --name kinder
           kapp deploy -a kc -f kbld.out -c -y
 

config-dev/build.yaml

@@ -0,0 +1,33 @@
+#@ load("@ytt:data", "data")
+
+---
+apiVersion: kbld.k14s.io/v1alpha1
+kind: Config
+sources:
+- image: kapp-controller
+  path: .
+  docker:
+    buildx:
+      #@ if data.values.dev.rapid_deploy:
+      pull: false
+      noCache: false
+      file: Dockerfile.dev
+      buildkit: true
+      #@ elif data.values.dev.push_images:
+      #! Always rebuild image
+      pull: true
+      noCache: true
+      #@ end
+      #! pass kapp_controller_version into Dockerfile.
+      rawOptions:
+      - #@ "--build-arg=KCTRL_VER="+data.values.dev.version
+      #@ if/end data.values.dev.platform != "":
+      - #@ "--platform="+data.values.dev.platform
+
+#@ if/end data.values.dev.push_images:
+---
+apiVersion: kbld.k14s.io/v1alpha1
+kind: Config
+destinations:
+- image: kapp-controller
+  newImage: #@ data.values.dev.image_repo

config-dev/values-schema.yml

@@ -0,0 +1,16 @@
+#@data/values-schema
+---
+#@overlay/match missing_ok=True
+#@overlay/match-child-defaults
+#@schema/desc "Configuration explicitly for developing kapp-controller"
+dev:
+  #@schema/desc "Whether to push images to the OCI registry or not"
+  push_images: false
+  #@schema/desc "Whether to use the faster deployment type whilst developing (must have deployed to a cluster once fully first)"
+  rapid_deploy: false
+  #@schema/desc "Location of kapp-controller image"
+  image_repo: docker.io/k14s/kapp-controller-test
+  #@schema/desc "Development version"
+  version: develop
+  #@schema/desc "Comma separated list of supported architectures"
+  platform: ""

config/build.yml renamed to config-release/build.yml

@@ -1,5 +1,6 @@
 #@ load("@ytt:data", "data")
 
+---
 apiVersion: kbld.k14s.io/v1alpha1
 kind: Config
 sources:
@@ -8,17 +9,15 @@ sources:
   docker:
     buildx:
       pull: true
-      noCache: #@ not data.values.image_cache
+      noCache: true
       #! pass kapp_controller_version into Dockerfile.
       rawOptions:
-      - #@ "--build-arg=KCTRL_VER="+data.values.kapp_controller_version
-      #@ if/end data.values.platform != "":
-      - #@ "--platform="+data.values.platform
-
-#@ if/end data.values.push_images:
+      - #@ "--build-arg=KCTRL_VER="+data.values.dev.version
+      #@ if/end data.values.dev.platform != "":
+      - #@ "--platform="+data.values.dev.platform
 ---
 apiVersion: kbld.k14s.io/v1alpha1
 kind: Config
 destinations:
 - image: kapp-controller
-  newImage: #@ data.values.image_repo
+  newImage: #@ data.values.dev.image_repo

config-release/values-schema.yml

@@ -0,0 +1,12 @@
+#@data/values-schema
+---
+#@overlay/match missing_ok=True
+#@overlay/match-child-defaults
+#@schema/desc "Configuration explicitly for developing kapp-controller"
+dev:
+  #@schema/desc "Location of kapp-controller image"
+  image_repo: ghcr.io/carvel-dev/kapp-controller
+  #@schema/desc "Development version"
+  version: develop
+  #@schema/desc "Comma separated list of supported architectures"
+  platform: "linux/amd64,linux/arm64"

config-release/values.yaml

@@ -6,7 +6,7 @@ metadata:
   name: kapp-controller
   namespace: #@ data.values.namespace
   annotations:
-    kapp-controller.carvel.dev/version: #@ data.values.kapp_controller_version
+    kapp-controller.carvel.dev/version: v0.0.0
 spec:
   selector:
     matchLabels:

config/deployment.yml

@@ -0,0 +1,19 @@
+#@data/values-schema
+---
+#@schema/desc "The namespace in which to deploy kapp-controller"
+namespace: kapp-controller
+#@schema/desc "Whether to create namespace specified for kapp-controller"
+create_namespace: true
+#@schema/desc "The global packaging namespace for kapp-controller"
+packaging_global_namespace: kapp-controller-packaging-global
+#@schema/desc "Whether to create the global packaging namespace for kapp-controller"
+create_packaging_namespace: true
+#! clusters version 1.19 and below should disable APIPriorityAndFairness by setting the below to false
+#@schema/desc "Whether to enable api priority and fairness"
+enable_api_priority_and_fairness: true
+#@schema/desc "Whether to enable pprofiling for kapp-controller"
+dangerous_enable_pprof: false
+#@schema/desc "Comma separated list of cipher suites - empty for language defaults"
+tls_cipher_suites: ""
+#@schema/desc "API port"
+api_port: 10350

config/values-schema.yml

@@ -39,8 +39,8 @@ things up.
 
 #### Non-minikube environment
 
-1. Change the [push_images property](https://github.com/carvel-dev/kapp-controller/blob/develop/config/values.yml#L10) to true
-2. Change the [image_repo property](https://github.com/carvel-dev/kapp-controller/blob/develop/config/values.yml#L12) to the location to push the kapp-controller image
+1. Change the [push_images property](https://github.com/carvel-dev/kapp-controller/blob/develop/config-dev/values-schema.yml#L8) to true
+2. Change the [image_repo property](https://github.com/carvel-dev/kapp-controller/blob/develop/config-dev/values-schema.yml#L12) to the location to push the kapp-controller image
 3. Run `./hack/deploy.sh`
 
 *Note:* As above, while iterating you may prefer to run
@@ -170,15 +170,15 @@ to the date of the original release. For example:
 #### Release development process 
 
 If you are making changes to the release process and want to test the process, it is recommended 
-to work on a fork of kapp-controller instead of against the repository in the vmware-tanzu organization.
+to work on a fork of kapp-controller instead of against the repository in the carvel-dev organization.
 
 To do this, you can start by forking this repository. 
 
 Next, head to the `Actions` tab of the fork you are using and enable GitHub Actions to run 
 against this fork (i.e. By default, Actions do not run against forked repositories). 
 
-Change the [`config-release/values.yml`](../config-release/values.yml) to point to your forked repository by changing 
-`image_repo: ghcr.io/vmware-tanzu/carvel-kapp-controller` to `image_repo: ghcr.io/<YOUR GitHub USERNAME>/carvel-kapp-controller`.
+Change the [`config-release/values-schema.yml`](../config-release/values-schema.yml) to point to your forked repository by changing 
+`image_repo: ghcr.io/carvel-dev/kapp-controller` to `image_repo: ghcr.io/<YOUR GitHub USERNAME>/kapp-controller`.
 
 After these steps have been carried out, you can trigger the release process by pushing a tag 
 to your forked repository.