examples: move kapp config to delivery template (#736)

vmware-tanzu · Mar 23, 2022 · 47376b7 · 47376b7
1 parent e900599
commit 47376b7
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 25 deletions.
diff --git a/examples/basic-delivery/app-operator/deploy-app.yaml b/examples/basic-delivery/app-operator/deploy-app.yaml
@@ -37,6 +37,29 @@ spec:
         - http:
             url: $(deployment.url)$
       template:
-        - ytt: {}
+        - ytt:
+            inline:
+              paths:
+                config.yaml: |
+                  apiVersion: kapp.k14s.io/v1alpha1
+                  kind: Config
+                  rebaseRules:
+                    - path:
+                        - metadata
+                        - annotations
+                        - serving.knative.dev/creator
+                      type: copy
+                      sources: [new, existing]
+                      resourceMatchers: &matchers
+                        - apiVersionKindMatcher:
+                            apiVersion: serving.knative.dev/v1
+                            kind: Service
+                    - path:
+                        - metadata
+                        - annotations
+                        - serving.knative.dev/lastModifier
+                      type: copy
+                      sources: [new, existing]
+                      resourceMatchers: *matchers
       deploy:
         - kapp: {}
diff --git a/examples/gitwriter-sc/app-operator/config-service.yaml b/examples/gitwriter-sc/app-operator/config-service.yaml
@@ -26,7 +26,7 @@ spec:
     #@ load("@ytt:base64", "base64")
     
     #@ def manifest():
-    manifest.yaml: #@ yaml.encode(service()) + "---\n" + yaml.encode(config())
+    manifest.yaml: #@ yaml.encode(service())
     #@ end
     
     #@ def service():
@@ -57,29 +57,6 @@ spec:
             - name: registry-credentials
     #@ end
     
-    #@ def config():
-    apiVersion: kapp.k14s.io/v1alpha1
-    kind: Config
-    rebaseRules:
-      - path:
-          - metadata
-          - annotations
-          - serving.knative.dev/creator
-        type: copy
-        sources: [new, existing]
-        resourceMatchers: &matchers
-          - apiVersionKindMatcher:
-              apiVersion: serving.knative.dev/v1
-              kind: Service
-      - path:
-          - metadata
-          - annotations
-          - serving.knative.dev/lastModifier
-        type: copy
-        sources: [new, existing]
-        resourceMatchers: *matchers
-    #@ end
-
     ---
     apiVersion: v1
     kind: ConfigMap