fix: Fix incomplete air-gapped support

Author: ThomasVitale

.github/workflows/release.yml

@@ -18,6 +18,6 @@ jobs:
       registry-server: ghcr.io
       registry-username: ${{ github.actor }}
       image: ${{ github.repository }}
-      version: 1.15.0
+      version: 1.15.0+kadras.1
     secrets:
       pull-request-token: ${{ secrets.GH_ORG_PAT }}

Makefile

@@ -28,7 +28,7 @@ schema:
 
 # Use kbld to resolve the OCI images referenced within the manifests
 kbld:
-	rm -f package/.imgpkg/images.yml && mkdir -p package/.imgpkg && kbld --file package/config --imgpkg-lock-output package/.imgpkg/images.yml 1>> /dev/null
+	rm -f package/.imgpkg/images.yml && mkdir -p package/.imgpkg && ytt --file package/config | kbld -f- --imgpkg-lock-output package/.imgpkg/images.yml 1>> /dev/null
 
 # Check the ytt-annotated Kubernetes configuration and its validation
 test-config:

package/config/kbld-config.yml

@@ -5,9 +5,15 @@ kind: Config
 # Search rules specify custom strategies for kbld to identify references for container images.
 # See more about the search rules: https://carvel.dev/kbld/docs/latest/config/#search-rules.
 searchRules:
-  
-  # Resolves the image references from the specified OCI repository,
-  # even when included in non-standard locations such as values in
-  # environment variables.
-  - valueMatcher:
-      imageRepo: quay.io/jetstack/cert-manager-acmesolver
+
+  #! Some of the OCI images used by this package are defined as arguments to containers.
+  #! We change the configuration to pass the image reference via configuration file
+  #! so that can be discovered and its digest resolved by kbld. It's a pre-requisite for supporting
+  #! package relocation to another registry and air-gapped scenarios.
+  - keyMatcher:
+      name: config.yaml
+    updateStrategy:
+      yaml:
+        searchRules:
+          - keyMatcher:
+              path: [ acmeHTTP01Config, solverImage ]

package/config/overlays/config-controller.yml

@@ -18,10 +18,6 @@ logging:
   verbosity: #@ data.values.controller.loglevel
   format: text
 
-#! Some of the OCI images used by this package are defined as arguments to containers.
-#! We change the configuration to pass the image reference via configuration file
-#! so that can be discovered and its digest resolved by kbld. It's a pre-requisite for supporting
-#! package relocation to another registry and air-gapped scenarios.
 acmeHTTP01Config:
   solverImage: quay.io/jetstack/cert-manager-acmesolver:v1.15.0
 #@ end

package/package-resources.yml

@@ -12,11 +12,7 @@ spec:
   template:
     spec:
       deploy:
-      - kapp:
-          rawOptions:
-          - --wait-timeout=5m
-          - --kube-api-qps=25
-          - --kube-api-burst=50
+      - kapp: {}
       fetch:
       - git: {}
       template: