Merge pull request #2 from ron1/fix-typos-in-examples

Correct typos in examples

multi-cluster/helm-external/README.md

@@ -1,4 +1,4 @@
-# Helm External Example
+# Multi-Cluster Helm External Example
 
 This example will deploy the [Kubernetes sample guestbook](https://github.com/kubernetes/examples/tree/master/guestbook/) application as
 packaged as a Helm chart downloaded from a third party source.
@@ -17,10 +17,10 @@ metadata:
   name: helm-external
   namespace: fleet-local
 spec:
-  repo: https://github.com/rancher/fleet-examples/
+  repo: https://github.com/rancher/fleet-examples
   paths:
-  - helm-external
+  - multi-cluster/helm-external
-  targetCustomizations:
+  targets:
   - name: dev
     clusterSelector:
       matchLabels:

multi-cluster/helm-kustomize/README.md

@@ -1,4 +1,4 @@
-# Helm Kustomize Example
+# Multi-Cluster Helm Kustomize Example
 
 This example will deploy the [Kubernetes sample guestbook](https://github.com/kubernetes/examples/tree/master/guestbook/) application as
 packaged as a Helm chart downloaded from a third party source and will modify the helm chart using Kustomize.
@@ -17,10 +17,10 @@ metadata:
   name: helm-kustomize
   namespace: fleet-local
 spec:
-  repo: https://github.com/rancher/fleet-examples/
+  repo: https://github.com/rancher/fleet-examples
   paths:
-  - helm-kustomize
+  - multi-cluster/helm-kustomize
-  targetCustomizations:
+  targets:
   - name: dev
     clusterSelector:
       matchLabels:

multi-cluster/helm/README.md

@@ -1,4 +1,4 @@
-# Helm Example
+# Multi-Cluster Helm Example
 
 This example will deploy the [Kubernetes sample guestbook](https://github.com/kubernetes/examples/tree/master/guestbook/) application as
 packaged as a Helm chart.
@@ -17,10 +17,10 @@ metadata:
   name: helm
   namespace: fleet-local
 spec:
-  repo: https://github.com/rancher/fleet-examples/
+  repo: https://github.com/rancher/fleet-examples
   paths:
-  - helm
+  - multi-cluster/helm
-  targetCustomizations:
+  targets:
   - name: dev
     clusterSelector:
       matchLabels:

multi-cluster/kustomize/README.md

@@ -1,4 +1,4 @@
-# Helm Example
+# Multi-Cluster Kustomize Example
 
 This example will deploy the [Kubernetes sample guestbook](https://github.com/kubernetes/examples/tree/master/guestbook/) application
 using kustomize. The app will be deployed into the `fleet-mc-kustomize-example` namespace.
@@ -16,10 +16,10 @@ metadata:
   name: kustomize
   namespace: fleet-local
 spec:
-  repo: https://github.com/rancher/fleet-examples/
+  repo: https://github.com/rancher/fleet-examples
-  bundleDirs:
+  paths:
-  - kustomize
+  - multi-cluster/kustomize
-  targetCustomization:
+  targets:
   - name: dev
     clusterSelector:
       matchLabels:

multi-cluster/kustomize/kustomization.yaml

@@ -1,2 +0,0 @@
-resources:
-- overlays/dev

multi-cluster/manifests/README.md

@@ -1,4 +1,4 @@
-# Manifests Example
+# Multi-Cluster Manifests Example
 
 This example will deploy the [Kubernetes sample guestbook](https://github.com/kubernetes/examples/tree/master/guestbook/) application.
 The app will be deployed into the `fleet-mc-manifest-example` namespace.
@@ -16,10 +16,10 @@ metadata:
   name: manifests
   namespace: fleet-local
 spec:
-  repo: https://github.com/rancher/fleet-examples/
+  repo: https://github.com/rancher/fleet-examples
-  bundleDirs:
+  paths:
-  - manifests
+  - multi-cluster/manifests
-  targetCustomizations:
+  targets:
   - name: dev
     clusterSelector:
       matchLabels:

simple/README.md

@@ -10,7 +10,7 @@ metadata:
   name: simple
   namespace: fleet-local
 spec:
-  repo: https://github.com/rancher/fleet-examples/
+  repo: https://github.com/rancher/fleet-examples
   paths:
   - simple
 ```

single-cluster/helm-kustomize/README.md

@@ -11,7 +11,7 @@ metadata:
   name: helm-kustomize
   namespace: fleet-local
 spec:
-  repo: https://github.com/rancher/fleet-examples/
+  repo: https://github.com/rancher/fleet-examples
   paths:
-  - helm-kustomize
+  - single-cluster/helm-kustomize
 ```

single-cluster/helm-kustomize/fleet.yaml

@@ -7,4 +7,4 @@ namespace: fleet-helm-kustomize-example
 helm:
   chart: https://github.com/rancher/fleet-examples/releases/download/example/guestbook-0.0.0.tgz
 kustomize:
-  dir: ./overlays/dev
+  dir: overlays/dev

single-cluster/helm-multi-chart/README.md

@@ -0,0 +1,17 @@
+# Helm Multi-Chart Example
+
+This example will deploy the [Kubernetes sample guestbook](https://github.com/kubernetes/examples/tree/master/guestbook/) application 
+packaged as a Helm chart into the `fleet-helm-example` namespace.
+It will also deploy Rancher Monitoring helm charts into the `cattle-monitoring-system` namespace.
+
+```yaml
+kind: GitRepo
+apiVersion: fleet.cattle.io/v1alpha1
+metadata:
+  name: helm
+  namespace: fleet-local
+spec:
+  repo: https://github.com/rancher/fleet-examples
+  paths:
+  - single-cluster/helm-multi-chart
+```

single-cluster/helm-multi-chart/guestbook/README.md

@@ -1,17 +0,0 @@
-# Helm Example
-
-This example will deploy the [Kubernetes sample guestbook](https://github.com/kubernetes/examples/tree/master/guestbook/) application as
-packaged as a Helm chart.
-The app will be deployed into the `fleet-helm-example` namespace.
-
-```yaml
-kind: GitRepo
-apiVersion: fleet.cattle.io/v1alpha1
-metadata:
-  name: helm
-  namespace: fleet-local
-spec:
-  repo: https://github.com/rancher/fleet-examples/
-  paths:
-  - single-cluster/helm
-```

single-cluster/helm/README.md

@@ -11,7 +11,7 @@ metadata:
   name: helm
   namespace: fleet-local
 spec:
-  repo: https://github.com/rancher/fleet-examples/
+  repo: https://github.com/rancher/fleet-examples
   paths:
   - single-cluster/helm
 ```

single-cluster/kustomize/README.md

@@ -10,7 +10,7 @@ metadata:
   name: kustomize
   namespace: fleet-local
 spec:
-  repo: https://github.com/rancher/fleet-examples/
+  repo: https://github.com/rancher/fleet-examples
   paths:
   - single-cluster/kustomize
 ```

single-cluster/manifests/README.md

@@ -10,7 +10,7 @@ metadata:
   name: manifests
   namespace: fleet-local
 spec:
-  repo: https://github.com/rancher/fleet-examples/
+  repo: https://github.com/rancher/fleet-examples
   paths:
   - single-cluster/manifests
 ```

tests/expected/multi-cluster/helm-external/bundle.yaml

@@ -165,7 +165,7 @@ spec:
       serviceType: NodePort
     name: .chart/9c24c039ba1d12c3cf62ee27ea13445e44c58e8d9e1df45d0a94a1bcc5a81566/guestbook/values.yaml
   - content: |
-      # Helm External Example
+      # Multi-Cluster Helm External Example
 
       This example will deploy the [Kubernetes sample guestbook](https://github.com/kubernetes/examples/tree/master/guestbook/) application as
       packaged as a Helm chart downloaded from a third party source.
@@ -184,10 +184,10 @@ spec:
         name: helm-external
         namespace: fleet-local
       spec:
-        repo: https://github.com/rancher/fleet-examples/
+        repo: https://github.com/rancher/fleet-examples
         paths:
-        - helm-external
+        - multi-cluster/helm-external
-        targetCustomizations:
+        targets:
         - name: dev
           clusterSelector:
             matchLabels:

tests/expected/multi-cluster/helm-kustomize/bundle.yaml

@@ -165,7 +165,7 @@ spec:
       serviceType: NodePort
     name: .chart/9c24c039ba1d12c3cf62ee27ea13445e44c58e8d9e1df45d0a94a1bcc5a81566/guestbook/values.yaml
   - content: |
-      # Helm Kustomize Example
+      # Multi-Cluster Helm Kustomize Example
 
       This example will deploy the [Kubernetes sample guestbook](https://github.com/kubernetes/examples/tree/master/guestbook/) application as
       packaged as a Helm chart downloaded from a third party source and will modify the helm chart using Kustomize.
@@ -184,10 +184,10 @@ spec:
         name: helm-kustomize
         namespace: fleet-local
       spec:
-        repo: https://github.com/rancher/fleet-examples/
+        repo: https://github.com/rancher/fleet-examples
         paths:
-        - helm-kustomize
+        - multi-cluster/helm-kustomize
-        targetCustomizations:
+        targets:
         - name: dev
           clusterSelector:
             matchLabels:

tests/expected/multi-cluster/helm/bundle.yaml

@@ -16,7 +16,7 @@ spec:
       appVersion: 0.0.0
     name: Chart.yaml
   - content: |
-      # Helm Example
+      # Multi-Cluster Helm Example
 
       This example will deploy the [Kubernetes sample guestbook](https://github.com/kubernetes/examples/tree/master/guestbook/) application as
       packaged as a Helm chart.
@@ -35,10 +35,10 @@ spec:
         name: helm
         namespace: fleet-local
       spec:
-        repo: https://github.com/rancher/fleet-examples/
+        repo: https://github.com/rancher/fleet-examples
         paths:
-        - helm
+        - multi-cluster/helm
-        targetCustomizations:
+        targets:
         - name: dev
           clusterSelector:
             matchLabels:

tests/expected/multi-cluster/kustomize/bundle.yaml

@@ -9,7 +9,7 @@ spec:
   namespace: fleet-mc-kustomize-example
   resources:
   - content: |
-      # Helm Example
+      # Multi-Cluster Kustomize Example
 
       This example will deploy the [Kubernetes sample guestbook](https://github.com/kubernetes/examples/tree/master/guestbook/) application
       using kustomize. The app will be deployed into the `fleet-mc-kustomize-example` namespace.
@@ -27,10 +27,10 @@ spec:
         name: kustomize
         namespace: fleet-local
       spec:
-        repo: https://github.com/rancher/fleet-examples/
+        repo: https://github.com/rancher/fleet-examples
-        bundleDirs:
+        paths:
-        - kustomize
+        - multi-cluster/kustomize
-        targetCustomization:
+        targets:
         - name: dev
           clusterSelector:
             matchLabels:
@@ -216,10 +216,6 @@ spec:
         kustomize:
           dir: overlays/prod
     name: fleet.yaml
-  - content: |
-      resources:
-      - overlays/dev
-    name: kustomization.yaml
   - content: |
       resources:
       - ../../base

tests/expected/multi-cluster/manifests/bundle.yaml

@@ -9,7 +9,7 @@ spec:
   namespace: fleet-mc-manifest-example
   resources:
   - content: |
-      # Manifests Example
+      # Multi-Cluster Manifests Example
 
       This example will deploy the [Kubernetes sample guestbook](https://github.com/kubernetes/examples/tree/master/guestbook/) application.
       The app will be deployed into the `fleet-mc-manifest-example` namespace.
@@ -27,10 +27,10 @@ spec:
         name: manifests
         namespace: fleet-local
       spec:
-        repo: https://github.com/rancher/fleet-examples/
+        repo: https://github.com/rancher/fleet-examples
-        bundleDirs:
+        paths:
-        - manifests
+        - multi-cluster/manifests
-        targetCustomizations:
+        targets:
         - name: dev
           clusterSelector:
             matchLabels:

tests/expected/single-cluster/helm-kustomize/bundle.yaml

@@ -9,7 +9,7 @@ spec:
   helm:
     chart: https://github.com/rancher/fleet-examples/releases/download/example/guestbook-0.0.0.tgz
   kustomize:
-    dir: ./overlays/dev
+    dir: overlays/dev
   namespace: fleet-helm-kustomize-example
   resources:
   - content: |
@@ -180,9 +180,9 @@ spec:
         name: helm-kustomize
         namespace: fleet-local
       spec:
-        repo: https://github.com/rancher/fleet-examples/
+        repo: https://github.com/rancher/fleet-examples
         paths:
-        - helm-kustomize
+        - single-cluster/helm-kustomize
       ```
     name: README.md
   - content: |
@@ -195,7 +195,7 @@ spec:
       helm:
         chart: https://github.com/rancher/fleet-examples/releases/download/example/guestbook-0.0.0.tgz
       kustomize:
-        dir: ./overlays/dev
+        dir: overlays/dev
     name: fleet.yaml
   - content: |
       patches:

tests/expected/single-cluster/helm/bundle.yaml

@@ -33,7 +33,7 @@ spec:
         name: helm
         namespace: fleet-local
       spec:
-        repo: https://github.com/rancher/fleet-examples/
+        repo: https://github.com/rancher/fleet-examples
         paths:
         - single-cluster/helm
       ```

tests/expected/single-cluster/kustomize/bundle.yaml

@@ -22,7 +22,7 @@ spec:
         name: kustomize
         namespace: fleet-local
       spec:
-        repo: https://github.com/rancher/fleet-examples/
+        repo: https://github.com/rancher/fleet-examples
         paths:
         - single-cluster/kustomize
       ```

tests/expected/single-cluster/manifests/bundle.yaml

@@ -21,7 +21,7 @@ spec:
         name: manifests
         namespace: fleet-local
       spec:
-        repo: https://github.com/rancher/fleet-examples/
+        repo: https://github.com/rancher/fleet-examples
         paths:
         - single-cluster/manifests
       ```