Support rendering of upstream Kustomize (#134)

Support rendering of upstream Kustomize
appuio · Nov 28, 2024 · e087c04 · e087c04
1 parent a9997b1
commit e087c04
Show file tree

Hide file tree

Showing 90 changed files with 2,657 additions and 2,548 deletions.
diff --git a/class/control-api.yml b/class/control-api.yml
@@ -24,36 +24,40 @@ parameters:
           - control-api/component/main.jsonnet
         input_type: jsonnet
         output_path: control-api/
-      - input_paths:
-          - control-api/component/api-server.jsonnet
-        input_type: jsonnet
-        output_path: control-api/01_api_server/
-      - input_paths:
-          - control-api/component/api-controller.jsonnet
-        input_type: jsonnet
-        output_path: control-api/02_api_controller/
-
       - input_paths:
           - control-api/crds/${control_api:images:control-api:tag}/
         output_path: control-api/
         input_type: copy
         output_type: yaml
+      - input_paths:
+          - ${_base_directory}/component/control-api.jsonnet
+        input_type: jsonnet
+        output_path: ${_base_directory}/manifests/control-api
+        output_type: yaml
+      - input_type: external
+        output_path: .
+        input_paths:
+          - ${_kustomize_wrapper}
+        env_vars:
+          INPUT_DIR: ${_base_directory}/manifests/control-api
+        args:
+          - \${compiled_target_dir}/control-api/20_kustomize
+      - input_paths:
+          - control-api/component/webhook.jsonnet
+        input_type: jsonnet
+        output_path: control-api/30_webhook/
 
       # Rendering the cloud agent rbac and service accounts using kustomize manifests from the agent repo.
       - input_paths:
           - ${_base_directory}/component/cloud-agent-rbac.jsonnet
         input_type: jsonnet
-        output_path: ${_base_directory}/cloud-agent-rbac
+        output_path: ${_base_directory}/manifests/cloud-agent-rbac
         output_type: yaml
       - input_type: external
         output_path: .
         input_paths:
           - ${_kustomize_wrapper}
         env_vars:
-          INPUT_DIR: ${_base_directory}/cloud-agent-rbac
+          INPUT_DIR: ${_base_directory}/manifests/cloud-agent-rbac
         args:
           - \${compiled_target_dir}/control-api/90_cloud_agent_rbac
-      - input_paths:
-          - ${_base_directory}/cloud-agent-rbac
-        input_type: remove
-        output_path: .
diff --git a/class/defaults.yml b/class/defaults.yml
@@ -165,6 +165,11 @@ parameters:
 
     secrets: {}
 
+    manifests_version: ${control_api:images:control-api:tag}
+
+    kustomize_input:
+      namespace: ${control_api:namespace}
+
     images:
       control-api:
         registry: ghcr.io

diff --git a/component/api-controller.jsonnet b/component/api-controller.jsonnet