Update tests

single-cluster/helm/fleet.yaml

@@ -1,6 +1,6 @@
 # This file and all contents in it are OPTIONAL.
 
-# The namespace this chart will be installed to,
+# The namespace this chart will be installed and restricted to,
 # if not specified the chart will be installed to "default"
 namespace: fleet-helm-example
 

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

@@ -1,6 +1,8 @@
 apiVersion: fleet.cattle.io/v1alpha1
 kind: Bundle
 metadata:
+  labels:
+    fleet.cattle.io/commit: fake
   name: test
   namespace: fleet-local
 spec:

tests/expected/multi-cluster/helm-external/dev-output.yaml

@@ -8,6 +8,7 @@ metadata:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
     tier: frontend
   name: frontend
+  namespace: fleet-mc-helm-external-example
 spec:
   ports:
   - port: 80
@@ -28,6 +29,7 @@ metadata:
     role: master
     tier: backend
   name: redis-master
+  namespace: fleet-mc-helm-external-example
 spec:
   ports:
   - port: 6379
@@ -49,6 +51,7 @@ metadata:
     role: slave
     tier: backend
   name: redis-slave
+  namespace: fleet-mc-helm-external-example
 spec:
   ports:
   - port: 6379
@@ -66,6 +69,7 @@ metadata:
   labels:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
   name: frontend
+  namespace: fleet-mc-helm-external-example
 spec:
   replicas: 1
   selector:
@@ -97,6 +101,7 @@ metadata:
   labels:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
   name: redis-master
+  namespace: fleet-mc-helm-external-example
 spec:
   replicas: 1
   selector:

tests/expected/multi-cluster/helm-external/prod-output.yaml

@@ -8,6 +8,7 @@ metadata:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
     tier: frontend
   name: frontend
+  namespace: fleet-mc-helm-external-example
 spec:
   ports:
   - port: 80
@@ -28,6 +29,7 @@ metadata:
     role: master
     tier: backend
   name: redis-master
+  namespace: fleet-mc-helm-external-example
 spec:
   ports:
   - port: 6379
@@ -49,6 +51,7 @@ metadata:
     role: slave
     tier: backend
   name: redis-slave
+  namespace: fleet-mc-helm-external-example
 spec:
   ports:
   - port: 6379
@@ -66,6 +69,7 @@ metadata:
   labels:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
   name: frontend
+  namespace: fleet-mc-helm-external-example
 spec:
   replicas: 3
   selector:
@@ -97,6 +101,7 @@ metadata:
   labels:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
   name: redis-master
+  namespace: fleet-mc-helm-external-example
 spec:
   replicas: 1
   selector:
@@ -130,6 +135,7 @@ metadata:
   labels:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
   name: redis-slave
+  namespace: fleet-mc-helm-external-example
 spec:
   replicas: 2
   selector:

tests/expected/multi-cluster/helm-external/test-output.yaml

@@ -8,6 +8,7 @@ metadata:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
     tier: frontend
   name: frontend
+  namespace: fleet-mc-helm-external-example
 spec:
   ports:
   - port: 80
@@ -28,6 +29,7 @@ metadata:
     role: master
     tier: backend
   name: redis-master
+  namespace: fleet-mc-helm-external-example
 spec:
   ports:
   - port: 6379
@@ -49,6 +51,7 @@ metadata:
     role: slave
     tier: backend
   name: redis-slave
+  namespace: fleet-mc-helm-external-example
 spec:
   ports:
   - port: 6379
@@ -66,6 +69,7 @@ metadata:
   labels:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
   name: frontend
+  namespace: fleet-mc-helm-external-example
 spec:
   replicas: 3
   selector:
@@ -97,6 +101,7 @@ metadata:
   labels:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
   name: redis-master
+  namespace: fleet-mc-helm-external-example
 spec:
   replicas: 1
   selector:
@@ -130,6 +135,7 @@ metadata:
   labels:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
   name: redis-slave
+  namespace: fleet-mc-helm-external-example
 spec:
   replicas: 2
   selector:

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

@@ -1,6 +1,8 @@
 apiVersion: fleet.cattle.io/v1alpha1
 kind: Bundle
 metadata:
+  labels:
+    fleet.cattle.io/commit: fake
   name: test
   namespace: fleet-local
 spec:

tests/expected/multi-cluster/helm-kustomize/dev-output.yaml

@@ -8,6 +8,7 @@ metadata:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
     tier: frontend
   name: frontend
+  namespace: fleet-mc-helm-kustomize-example
 spec:
   ports:
   - port: 80
@@ -28,6 +29,7 @@ metadata:
     role: master
     tier: backend
   name: redis-master
+  namespace: fleet-mc-helm-kustomize-example
 spec:
   ports:
   - port: 6379
@@ -49,6 +51,7 @@ metadata:
     role: slave
     tier: backend
   name: redis-slave
+  namespace: fleet-mc-helm-kustomize-example
 spec:
   ports:
   - port: 6379
@@ -66,6 +69,7 @@ metadata:
   labels:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
   name: frontend
+  namespace: fleet-mc-helm-kustomize-example
 spec:
   replicas: 1
   selector:
@@ -97,6 +101,7 @@ metadata:
   labels:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
   name: redis-master
+  namespace: fleet-mc-helm-kustomize-example
 spec:
   replicas: 1
   selector:
@@ -130,6 +135,7 @@ metadata:
   labels:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
   name: redis-slave
+  namespace: fleet-mc-helm-kustomize-example
 spec:
   replicas: 0
   selector:

tests/expected/multi-cluster/helm-kustomize/prod-output.yaml

@@ -8,6 +8,7 @@ metadata:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
     tier: frontend
   name: frontend
+  namespace: fleet-mc-helm-kustomize-example
 spec:
   ports:
   - port: 80
@@ -28,6 +29,7 @@ metadata:
     role: master
     tier: backend
   name: redis-master
+  namespace: fleet-mc-helm-kustomize-example
 spec:
   ports:
   - port: 6379
@@ -49,6 +51,7 @@ metadata:
     role: slave
     tier: backend
   name: redis-slave
+  namespace: fleet-mc-helm-kustomize-example
 spec:
   ports:
   - port: 6379
@@ -66,6 +69,7 @@ metadata:
   labels:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
   name: frontend
+  namespace: fleet-mc-helm-kustomize-example
 spec:
   replicas: 3
   selector:
@@ -97,6 +101,7 @@ metadata:
   labels:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
   name: redis-master
+  namespace: fleet-mc-helm-kustomize-example
 spec:
   replicas: 1
   selector:
@@ -130,6 +135,7 @@ metadata:
   labels:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
   name: redis-slave
+  namespace: fleet-mc-helm-kustomize-example
 spec:
   replicas: 2
   selector:

tests/expected/multi-cluster/helm-kustomize/test-output.yaml

@@ -8,6 +8,7 @@ metadata:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
     tier: frontend
   name: frontend
+  namespace: fleet-mc-helm-kustomize-example
 spec:
   ports:
   - port: 80
@@ -28,6 +29,7 @@ metadata:
     role: master
     tier: backend
   name: redis-master
+  namespace: fleet-mc-helm-kustomize-example
 spec:
   ports:
   - port: 6379
@@ -49,6 +51,7 @@ metadata:
     role: slave
     tier: backend
   name: redis-slave
+  namespace: fleet-mc-helm-kustomize-example
 spec:
   ports:
   - port: 6379
@@ -66,6 +69,7 @@ metadata:
   labels:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
   name: frontend
+  namespace: fleet-mc-helm-kustomize-example
 spec:
   replicas: 3
   selector:
@@ -97,6 +101,7 @@ metadata:
   labels:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
   name: redis-master
+  namespace: fleet-mc-helm-kustomize-example
 spec:
   replicas: 1
   selector:
@@ -130,6 +135,7 @@ metadata:
   labels:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
   name: redis-slave
+  namespace: fleet-mc-helm-kustomize-example
 spec:
   replicas: 2
   selector:

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

@@ -1,6 +1,8 @@
 apiVersion: fleet.cattle.io/v1alpha1
 kind: Bundle
 metadata:
+  labels:
+    fleet.cattle.io/commit: fake
   name: test
   namespace: fleet-local
 spec:

tests/expected/multi-cluster/helm/dev-output.yaml

@@ -8,6 +8,7 @@ metadata:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
     tier: frontend
   name: frontend
+  namespace: fleet-mc-helm-example
 spec:
   ports:
   - port: 80
@@ -28,6 +29,7 @@ metadata:
     role: master
     tier: backend
   name: redis-master
+  namespace: fleet-mc-helm-example
 spec:
   ports:
   - port: 6379
@@ -49,6 +51,7 @@ metadata:
     role: slave
     tier: backend
   name: redis-slave
+  namespace: fleet-mc-helm-example
 spec:
   ports:
   - port: 6379
@@ -66,6 +69,7 @@ metadata:
   labels:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
   name: frontend
+  namespace: fleet-mc-helm-example
 spec:
   replicas: 1
   selector:
@@ -97,6 +101,7 @@ metadata:
   labels:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
   name: redis-master
+  namespace: fleet-mc-helm-example
 spec:
   replicas: 1
   selector:

tests/expected/multi-cluster/helm/prod-output.yaml

@@ -8,6 +8,7 @@ metadata:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
     tier: frontend
   name: frontend
+  namespace: fleet-mc-helm-example
 spec:
   ports:
   - port: 80
@@ -28,6 +29,7 @@ metadata:
     role: master
     tier: backend
   name: redis-master
+  namespace: fleet-mc-helm-example
 spec:
   ports:
   - port: 6379
@@ -49,6 +51,7 @@ metadata:
     role: slave
     tier: backend
   name: redis-slave
+  namespace: fleet-mc-helm-example
 spec:
   ports:
   - port: 6379
@@ -66,6 +69,7 @@ metadata:
   labels:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
   name: frontend
+  namespace: fleet-mc-helm-example
 spec:
   replicas: 3
   selector:
@@ -97,6 +101,7 @@ metadata:
   labels:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
   name: redis-master
+  namespace: fleet-mc-helm-example
 spec:
   replicas: 1
   selector:
@@ -130,6 +135,7 @@ metadata:
   labels:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
   name: redis-slave
+  namespace: fleet-mc-helm-example
 spec:
   replicas: 2
   selector:

tests/expected/multi-cluster/helm/test-output.yaml

@@ -8,6 +8,7 @@ metadata:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
     tier: frontend
   name: frontend
+  namespace: fleet-mc-helm-example
 spec:
   ports:
   - port: 80
@@ -28,6 +29,7 @@ metadata:
     role: master
     tier: backend
   name: redis-master
+  namespace: fleet-mc-helm-example
 spec:
   ports:
   - port: 6379
@@ -49,6 +51,7 @@ metadata:
     role: slave
     tier: backend
   name: redis-slave
+  namespace: fleet-mc-helm-example
 spec:
   ports:
   - port: 6379
@@ -66,6 +69,7 @@ metadata:
   labels:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
   name: frontend
+  namespace: fleet-mc-helm-example
 spec:
   replicas: 3
   selector:
@@ -97,6 +101,7 @@ metadata:
   labels:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
   name: redis-master
+  namespace: fleet-mc-helm-example
 spec:
   replicas: 1
   selector:
@@ -130,6 +135,7 @@ metadata:
   labels:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
   name: redis-slave
+  namespace: fleet-mc-helm-example
 spec:
   replicas: 2
   selector:

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

@@ -1,6 +1,8 @@
 apiVersion: fleet.cattle.io/v1alpha1
 kind: Bundle
 metadata:
+  labels:
+    fleet.cattle.io/commit: fake
   name: test
   namespace: fleet-local
 spec:

tests/expected/multi-cluster/kustomize/dev-output.yaml

@@ -6,6 +6,7 @@ metadata:
   labels:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
   name: frontend
+  namespace: fleet-mc-kustomize-example
 spec:
   replicas: 1
   selector:
@@ -39,6 +40,7 @@ metadata:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
     tier: frontend
   name: frontend
+  namespace: fleet-mc-kustomize-example
 spec:
   ports:
   - port: 80
@@ -56,6 +58,7 @@ metadata:
   labels:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
   name: redis-master
+  namespace: fleet-mc-kustomize-example
 spec:
   replicas: 1
   selector:
@@ -92,6 +95,7 @@ metadata:
     role: master
     tier: backend
   name: redis-master
+  namespace: fleet-mc-kustomize-example
 spec:
   ports:
   - port: 6379
@@ -110,6 +114,7 @@ metadata:
   labels:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
   name: redis-slave
+  namespace: fleet-mc-kustomize-example
 spec:
   replicas: 0
   selector:
@@ -146,6 +151,7 @@ metadata:
     role: slave
     tier: backend
   name: redis-slave
+  namespace: fleet-mc-kustomize-example
 spec:
   ports:
   - port: 6379

tests/expected/multi-cluster/kustomize/prod-output.yaml

@@ -6,6 +6,7 @@ metadata:
   labels:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
   name: frontend
+  namespace: fleet-mc-kustomize-example
 spec:
   replicas: 3
   selector:
@@ -39,6 +40,7 @@ metadata:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
     tier: frontend
   name: frontend
+  namespace: fleet-mc-kustomize-example
 spec:
   ports:
   - port: 80
@@ -56,6 +58,7 @@ metadata:
   labels:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
   name: redis-master
+  namespace: fleet-mc-kustomize-example
 spec:
   replicas: 1
   selector:
@@ -92,6 +95,7 @@ metadata:
     role: master
     tier: backend
   name: redis-master
+  namespace: fleet-mc-kustomize-example
 spec:
   ports:
   - port: 6379
@@ -110,6 +114,7 @@ metadata:
   labels:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
   name: redis-slave
+  namespace: fleet-mc-kustomize-example
 spec:
   replicas: 2
   selector:
@@ -146,6 +151,7 @@ metadata:
     role: slave
     tier: backend
   name: redis-slave
+  namespace: fleet-mc-kustomize-example
 spec:
   ports:
   - port: 6379

tests/expected/multi-cluster/kustomize/test-output.yaml

@@ -6,6 +6,7 @@ metadata:
   labels:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
   name: frontend
+  namespace: fleet-mc-kustomize-example
 spec:
   replicas: 3
   selector:
@@ -39,6 +40,7 @@ metadata:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
     tier: frontend
   name: frontend
+  namespace: fleet-mc-kustomize-example
 spec:
   ports:
   - port: 80
@@ -56,6 +58,7 @@ metadata:
   labels:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
   name: redis-master
+  namespace: fleet-mc-kustomize-example
 spec:
   replicas: 1
   selector:
@@ -92,6 +95,7 @@ metadata:
     role: master
     tier: backend
   name: redis-master
+  namespace: fleet-mc-kustomize-example
 spec:
   ports:
   - port: 6379
@@ -110,6 +114,7 @@ metadata:
   labels:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
   name: redis-slave
+  namespace: fleet-mc-kustomize-example
 spec:
   replicas: 2
   selector:
@@ -146,6 +151,7 @@ metadata:
     role: slave
     tier: backend
   name: redis-slave
+  namespace: fleet-mc-kustomize-example
 spec:
   ports:
   - port: 6379

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

@@ -1,6 +1,8 @@
 apiVersion: fleet.cattle.io/v1alpha1
 kind: Bundle
 metadata:
+  labels:
+    fleet.cattle.io/commit: fake
   name: test
   namespace: fleet-local
 spec:

tests/expected/multi-cluster/manifests/dev-output.yaml

@@ -1,63 +1,3 @@
-apiVersion: v1
-kind: Service
-metadata:
-  annotations:
-    objectset.rio.cattle.io/id: -test
-  labels:
-    app: guestbook
-    objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
-    tier: frontend
-  name: frontend
-spec:
-  ports:
-  - port: 80
-  selector:
-    app: guestbook
-    tier: frontend
-  type: NodePort
-
----
-apiVersion: v1
-kind: Service
-metadata:
-  annotations:
-    objectset.rio.cattle.io/id: -test
-  labels:
-    app: redis
-    objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
-    role: master
-    tier: backend
-  name: redis-master
-spec:
-  ports:
-  - port: 6379
-    targetPort: 6379
-  selector:
-    app: redis
-    role: master
-    tier: backend
-
----
-apiVersion: v1
-kind: Service
-metadata:
-  annotations:
-    objectset.rio.cattle.io/id: -test
-  labels:
-    app: redis
-    objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
-    role: slave
-    tier: backend
-  name: redis-slave
-spec:
-  ports:
-  - port: 6379
-  selector:
-    app: redis
-    role: master
-    tier: backend
-
----
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -66,6 +6,7 @@ metadata:
   labels:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
   name: frontend
+  namespace: fleet-mc-manifest-example
 spec:
   replicas: 1
   selector:
@@ -88,6 +29,26 @@ spec:
             cpu: 100m
             memory: 100Mi
 
+---
+apiVersion: v1
+kind: Service
+metadata:
+  annotations:
+    objectset.rio.cattle.io/id: -test
+  labels:
+    app: guestbook
+    objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
+    tier: frontend
+  name: frontend
+  namespace: fleet-mc-manifest-example
+spec:
+  ports:
+  - port: 80
+  selector:
+    app: guestbook
+    tier: frontend
+  type: NodePort
+
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -97,6 +58,7 @@ metadata:
   labels:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
   name: redis-master
+  namespace: fleet-mc-manifest-example
 spec:
   replicas: 1
   selector:
@@ -120,3 +82,46 @@ spec:
           requests:
             cpu: 100m
             memory: 100Mi
+
+---
+apiVersion: v1
+kind: Service
+metadata:
+  annotations:
+    objectset.rio.cattle.io/id: -test
+  labels:
+    app: redis
+    objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
+    role: master
+    tier: backend
+  name: redis-master
+  namespace: fleet-mc-manifest-example
+spec:
+  ports:
+  - port: 6379
+    targetPort: 6379
+  selector:
+    app: redis
+    role: master
+    tier: backend
+
+---
+apiVersion: v1
+kind: Service
+metadata:
+  annotations:
+    objectset.rio.cattle.io/id: -test
+  labels:
+    app: redis
+    objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
+    role: slave
+    tier: backend
+  name: redis-slave
+  namespace: fleet-mc-manifest-example
+spec:
+  ports:
+  - port: 6379
+  selector:
+    app: redis
+    role: master
+    tier: backend

tests/expected/multi-cluster/manifests/prod-output.yaml

@@ -1,63 +1,3 @@
-apiVersion: v1
-kind: Service
-metadata:
-  annotations:
-    objectset.rio.cattle.io/id: -test
-  labels:
-    app: guestbook
-    objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
-    tier: frontend
-  name: frontend
-spec:
-  ports:
-  - port: 80
-  selector:
-    app: guestbook
-    tier: frontend
-  type: LoadBalancer
-
----
-apiVersion: v1
-kind: Service
-metadata:
-  annotations:
-    objectset.rio.cattle.io/id: -test
-  labels:
-    app: redis
-    objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
-    role: master
-    tier: backend
-  name: redis-master
-spec:
-  ports:
-  - port: 6379
-    targetPort: 6379
-  selector:
-    app: redis
-    role: master
-    tier: backend
-
----
-apiVersion: v1
-kind: Service
-metadata:
-  annotations:
-    objectset.rio.cattle.io/id: -test
-  labels:
-    app: redis
-    objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
-    role: slave
-    tier: backend
-  name: redis-slave
-spec:
-  ports:
-  - port: 6379
-  selector:
-    app: redis
-    role: slave
-    tier: backend
-
----
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -66,6 +6,7 @@ metadata:
   labels:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
   name: frontend
+  namespace: fleet-mc-manifest-example
 spec:
   replicas: 3
   selector:
@@ -88,6 +29,26 @@ spec:
             cpu: 100m
             memory: 100Mi
 
+---
+apiVersion: v1
+kind: Service
+metadata:
+  annotations:
+    objectset.rio.cattle.io/id: -test
+  labels:
+    app: guestbook
+    objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
+    tier: frontend
+  name: frontend
+  namespace: fleet-mc-manifest-example
+spec:
+  ports:
+  - port: 80
+  selector:
+    app: guestbook
+    tier: frontend
+  type: LoadBalancer
+
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -97,6 +58,7 @@ metadata:
   labels:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
   name: redis-master
+  namespace: fleet-mc-manifest-example
 spec:
   replicas: 1
   selector:
@@ -121,6 +83,28 @@ spec:
             cpu: 100m
             memory: 100Mi
 
+---
+apiVersion: v1
+kind: Service
+metadata:
+  annotations:
+    objectset.rio.cattle.io/id: -test
+  labels:
+    app: redis
+    objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
+    role: master
+    tier: backend
+  name: redis-master
+  namespace: fleet-mc-manifest-example
+spec:
+  ports:
+  - port: 6379
+    targetPort: 6379
+  selector:
+    app: redis
+    role: master
+    tier: backend
+
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -130,6 +114,7 @@ metadata:
   labels:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
   name: redis-slave
+  namespace: fleet-mc-manifest-example
 spec:
   replicas: 2
   selector:
@@ -153,3 +138,24 @@ spec:
           requests:
             cpu: 100m
             memory: 100Mi
+
+---
+apiVersion: v1
+kind: Service
+metadata:
+  annotations:
+    objectset.rio.cattle.io/id: -test
+  labels:
+    app: redis
+    objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
+    role: slave
+    tier: backend
+  name: redis-slave
+  namespace: fleet-mc-manifest-example
+spec:
+  ports:
+  - port: 6379
+  selector:
+    app: redis
+    role: slave
+    tier: backend

tests/expected/multi-cluster/manifests/test-output.yaml

@@ -1,63 +1,3 @@
-apiVersion: v1
-kind: Service
-metadata:
-  annotations:
-    objectset.rio.cattle.io/id: -test
-  labels:
-    app: guestbook
-    objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
-    tier: frontend
-  name: frontend
-spec:
-  ports:
-  - port: 80
-  selector:
-    app: guestbook
-    tier: frontend
-  type: NodePort
-
----
-apiVersion: v1
-kind: Service
-metadata:
-  annotations:
-    objectset.rio.cattle.io/id: -test
-  labels:
-    app: redis
-    objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
-    role: master
-    tier: backend
-  name: redis-master
-spec:
-  ports:
-  - port: 6379
-    targetPort: 6379
-  selector:
-    app: redis
-    role: master
-    tier: backend
-
----
-apiVersion: v1
-kind: Service
-metadata:
-  annotations:
-    objectset.rio.cattle.io/id: -test
-  labels:
-    app: redis
-    objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
-    role: slave
-    tier: backend
-  name: redis-slave
-spec:
-  ports:
-  - port: 6379
-  selector:
-    app: redis
-    role: slave
-    tier: backend
-
----
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -66,6 +6,7 @@ metadata:
   labels:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
   name: frontend
+  namespace: fleet-mc-manifest-example
 spec:
   replicas: 3
   selector:
@@ -88,6 +29,26 @@ spec:
             cpu: 100m
             memory: 100Mi
 
+---
+apiVersion: v1
+kind: Service
+metadata:
+  annotations:
+    objectset.rio.cattle.io/id: -test
+  labels:
+    app: guestbook
+    objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
+    tier: frontend
+  name: frontend
+  namespace: fleet-mc-manifest-example
+spec:
+  ports:
+  - port: 80
+  selector:
+    app: guestbook
+    tier: frontend
+  type: NodePort
+
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -97,6 +58,7 @@ metadata:
   labels:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
   name: redis-master
+  namespace: fleet-mc-manifest-example
 spec:
   replicas: 1
   selector:
@@ -121,6 +83,28 @@ spec:
             cpu: 100m
             memory: 100Mi
 
+---
+apiVersion: v1
+kind: Service
+metadata:
+  annotations:
+    objectset.rio.cattle.io/id: -test
+  labels:
+    app: redis
+    objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
+    role: master
+    tier: backend
+  name: redis-master
+  namespace: fleet-mc-manifest-example
+spec:
+  ports:
+  - port: 6379
+    targetPort: 6379
+  selector:
+    app: redis
+    role: master
+    tier: backend
+
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -130,6 +114,7 @@ metadata:
   labels:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
   name: redis-slave
+  namespace: fleet-mc-manifest-example
 spec:
   replicas: 2
   selector:
@@ -153,3 +138,24 @@ spec:
           requests:
             cpu: 100m
             memory: 100Mi
+
+---
+apiVersion: v1
+kind: Service
+metadata:
+  annotations:
+    objectset.rio.cattle.io/id: -test
+  labels:
+    app: redis
+    objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
+    role: slave
+    tier: backend
+  name: redis-slave
+  namespace: fleet-mc-manifest-example
+spec:
+  ports:
+  - port: 6379
+  selector:
+    app: redis
+    role: slave
+    tier: backend

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

@@ -1,6 +1,8 @@
 apiVersion: fleet.cattle.io/v1alpha1
 kind: Bundle
 metadata:
+  labels:
+    fleet.cattle.io/commit: fake
   name: test
   namespace: fleet-local
 spec:

tests/expected/single-cluster/helm-kustomize/dev-output.yaml

@@ -8,6 +8,7 @@ metadata:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
     tier: frontend
   name: frontend
+  namespace: fleet-helm-kustomize-example
 spec:
   ports:
   - port: 80
@@ -28,6 +29,7 @@ metadata:
     role: master
     tier: backend
   name: redis-master
+  namespace: fleet-helm-kustomize-example
 spec:
   ports:
   - port: 6379
@@ -49,6 +51,7 @@ metadata:
     role: slave
     tier: backend
   name: redis-slave
+  namespace: fleet-helm-kustomize-example
 spec:
   ports:
   - port: 6379
@@ -66,6 +69,7 @@ metadata:
   labels:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
   name: frontend
+  namespace: fleet-helm-kustomize-example
 spec:
   replicas: 1
   selector:
@@ -97,6 +101,7 @@ metadata:
   labels:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
   name: redis-master
+  namespace: fleet-helm-kustomize-example
 spec:
   replicas: 1
   selector:
@@ -130,6 +135,7 @@ metadata:
   labels:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
   name: redis-slave
+  namespace: fleet-helm-kustomize-example
 spec:
   replicas: 0
   selector:

tests/expected/single-cluster/helm-kustomize/prod-output.yaml

@@ -8,6 +8,7 @@ metadata:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
     tier: frontend
   name: frontend
+  namespace: fleet-helm-kustomize-example
 spec:
   ports:
   - port: 80
@@ -28,6 +29,7 @@ metadata:
     role: master
     tier: backend
   name: redis-master
+  namespace: fleet-helm-kustomize-example
 spec:
   ports:
   - port: 6379
@@ -49,6 +51,7 @@ metadata:
     role: slave
     tier: backend
   name: redis-slave
+  namespace: fleet-helm-kustomize-example
 spec:
   ports:
   - port: 6379
@@ -66,6 +69,7 @@ metadata:
   labels:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
   name: frontend
+  namespace: fleet-helm-kustomize-example
 spec:
   replicas: 1
   selector:
@@ -97,6 +101,7 @@ metadata:
   labels:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
   name: redis-master
+  namespace: fleet-helm-kustomize-example
 spec:
   replicas: 1
   selector:
@@ -130,6 +135,7 @@ metadata:
   labels:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
   name: redis-slave
+  namespace: fleet-helm-kustomize-example
 spec:
   replicas: 0
   selector:

tests/expected/single-cluster/helm-kustomize/test-output.yaml

@@ -8,6 +8,7 @@ metadata:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
     tier: frontend
   name: frontend
+  namespace: fleet-helm-kustomize-example
 spec:
   ports:
   - port: 80
@@ -28,6 +29,7 @@ metadata:
     role: master
     tier: backend
   name: redis-master
+  namespace: fleet-helm-kustomize-example
 spec:
   ports:
   - port: 6379
@@ -49,6 +51,7 @@ metadata:
     role: slave
     tier: backend
   name: redis-slave
+  namespace: fleet-helm-kustomize-example
 spec:
   ports:
   - port: 6379
@@ -66,6 +69,7 @@ metadata:
   labels:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
   name: frontend
+  namespace: fleet-helm-kustomize-example
 spec:
   replicas: 1
   selector:
@@ -97,6 +101,7 @@ metadata:
   labels:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
   name: redis-master
+  namespace: fleet-helm-kustomize-example
 spec:
   replicas: 1
   selector:
@@ -130,6 +135,7 @@ metadata:
   labels:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
   name: redis-slave
+  namespace: fleet-helm-kustomize-example
 spec:
   replicas: 0
   selector:

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

@@ -1,6 +1,8 @@
 apiVersion: fleet.cattle.io/v1alpha1
 kind: Bundle
 metadata:
+  labels:
+    fleet.cattle.io/commit: fake
   name: test
   namespace: fleet-local
 spec:
@@ -39,7 +41,7 @@ spec:
   - content: |
       # This file and all contents in it are OPTIONAL.
 
-      # The namespace this chart will be installed to,
+      # The namespace this chart will be installed and restricted to,
       # if not specified the chart will be installed to "default"
       namespace: fleet-helm-example
 

tests/expected/single-cluster/helm/dev-output.yaml

@@ -8,6 +8,7 @@ metadata:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
     tier: frontend
   name: frontend
+  namespace: fleet-helm-example
 spec:
   ports:
   - port: 80
@@ -28,6 +29,7 @@ metadata:
     role: master
     tier: backend
   name: redis-master
+  namespace: fleet-helm-example
 spec:
   ports:
   - port: 6379
@@ -49,6 +51,7 @@ metadata:
     role: slave
     tier: backend
   name: redis-slave
+  namespace: fleet-helm-example
 spec:
   ports:
   - port: 6379
@@ -66,6 +69,7 @@ metadata:
   labels:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
   name: frontend
+  namespace: fleet-helm-example
 spec:
   replicas: 2
   selector:
@@ -97,6 +101,7 @@ metadata:
   labels:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
   name: redis-master
+  namespace: fleet-helm-example
 spec:
   replicas: 1
   selector:
@@ -130,6 +135,7 @@ metadata:
   labels:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
   name: redis-slave
+  namespace: fleet-helm-example
 spec:
   replicas: 2
   selector:

tests/expected/single-cluster/helm/prod-output.yaml

@@ -8,6 +8,7 @@ metadata:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
     tier: frontend
   name: frontend
+  namespace: fleet-helm-example
 spec:
   ports:
   - port: 80
@@ -28,6 +29,7 @@ metadata:
     role: master
     tier: backend
   name: redis-master
+  namespace: fleet-helm-example
 spec:
   ports:
   - port: 6379
@@ -49,6 +51,7 @@ metadata:
     role: slave
     tier: backend
   name: redis-slave
+  namespace: fleet-helm-example
 spec:
   ports:
   - port: 6379
@@ -66,6 +69,7 @@ metadata:
   labels:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
   name: frontend
+  namespace: fleet-helm-example
 spec:
   replicas: 2
   selector:
@@ -97,6 +101,7 @@ metadata:
   labels:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
   name: redis-master
+  namespace: fleet-helm-example
 spec:
   replicas: 1
   selector:
@@ -130,6 +135,7 @@ metadata:
   labels:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
   name: redis-slave
+  namespace: fleet-helm-example
 spec:
   replicas: 2
   selector:

tests/expected/single-cluster/helm/test-output.yaml

@@ -8,6 +8,7 @@ metadata:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
     tier: frontend
   name: frontend
+  namespace: fleet-helm-example
 spec:
   ports:
   - port: 80
@@ -28,6 +29,7 @@ metadata:
     role: master
     tier: backend
   name: redis-master
+  namespace: fleet-helm-example
 spec:
   ports:
   - port: 6379
@@ -49,6 +51,7 @@ metadata:
     role: slave
     tier: backend
   name: redis-slave
+  namespace: fleet-helm-example
 spec:
   ports:
   - port: 6379
@@ -66,6 +69,7 @@ metadata:
   labels:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
   name: frontend
+  namespace: fleet-helm-example
 spec:
   replicas: 2
   selector:
@@ -97,6 +101,7 @@ metadata:
   labels:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
   name: redis-master
+  namespace: fleet-helm-example
 spec:
   replicas: 1
   selector:
@@ -130,6 +135,7 @@ metadata:
   labels:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
   name: redis-slave
+  namespace: fleet-helm-example
 spec:
   replicas: 2
   selector:

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

@@ -1,6 +1,8 @@
 apiVersion: fleet.cattle.io/v1alpha1
 kind: Bundle
 metadata:
+  labels:
+    fleet.cattle.io/commit: fake
   name: test
   namespace: fleet-local
 spec:

tests/expected/single-cluster/kustomize/dev-output.yaml

@@ -6,6 +6,7 @@ metadata:
   labels:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
   name: frontend
+  namespace: fleet-kustomize-example
 spec:
   replicas: 1
   selector:
@@ -39,6 +40,7 @@ metadata:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
     tier: frontend
   name: frontend
+  namespace: fleet-kustomize-example
 spec:
   ports:
   - port: 80
@@ -56,6 +58,7 @@ metadata:
   labels:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
   name: redis-master
+  namespace: fleet-kustomize-example
 spec:
   replicas: 1
   selector:
@@ -92,6 +95,7 @@ metadata:
     role: master
     tier: backend
   name: redis-master
+  namespace: fleet-kustomize-example
 spec:
   ports:
   - port: 6379
@@ -110,6 +114,7 @@ metadata:
   labels:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
   name: redis-slave
+  namespace: fleet-kustomize-example
 spec:
   replicas: 0
   selector:
@@ -146,6 +151,7 @@ metadata:
     role: slave
     tier: backend
   name: redis-slave
+  namespace: fleet-kustomize-example
 spec:
   ports:
   - port: 6379

tests/expected/single-cluster/kustomize/prod-output.yaml

@@ -6,6 +6,7 @@ metadata:
   labels:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
   name: frontend
+  namespace: fleet-kustomize-example
 spec:
   replicas: 1
   selector:
@@ -39,6 +40,7 @@ metadata:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
     tier: frontend
   name: frontend
+  namespace: fleet-kustomize-example
 spec:
   ports:
   - port: 80
@@ -56,6 +58,7 @@ metadata:
   labels:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
   name: redis-master
+  namespace: fleet-kustomize-example
 spec:
   replicas: 1
   selector:
@@ -92,6 +95,7 @@ metadata:
     role: master
     tier: backend
   name: redis-master
+  namespace: fleet-kustomize-example
 spec:
   ports:
   - port: 6379
@@ -110,6 +114,7 @@ metadata:
   labels:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
   name: redis-slave
+  namespace: fleet-kustomize-example
 spec:
   replicas: 0
   selector:
@@ -146,6 +151,7 @@ metadata:
     role: slave
     tier: backend
   name: redis-slave
+  namespace: fleet-kustomize-example
 spec:
   ports:
   - port: 6379

tests/expected/single-cluster/kustomize/test-output.yaml

@@ -6,6 +6,7 @@ metadata:
   labels:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
   name: frontend
+  namespace: fleet-kustomize-example
 spec:
   replicas: 1
   selector:
@@ -39,6 +40,7 @@ metadata:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
     tier: frontend
   name: frontend
+  namespace: fleet-kustomize-example
 spec:
   ports:
   - port: 80
@@ -56,6 +58,7 @@ metadata:
   labels:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
   name: redis-master
+  namespace: fleet-kustomize-example
 spec:
   replicas: 1
   selector:
@@ -92,6 +95,7 @@ metadata:
     role: master
     tier: backend
   name: redis-master
+  namespace: fleet-kustomize-example
 spec:
   ports:
   - port: 6379
@@ -110,6 +114,7 @@ metadata:
   labels:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
   name: redis-slave
+  namespace: fleet-kustomize-example
 spec:
   replicas: 0
   selector:
@@ -146,6 +151,7 @@ metadata:
     role: slave
     tier: backend
   name: redis-slave
+  namespace: fleet-kustomize-example
 spec:
   ports:
   - port: 6379

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

@@ -1,6 +1,8 @@
 apiVersion: fleet.cattle.io/v1alpha1
 kind: Bundle
 metadata:
+  labels:
+    fleet.cattle.io/commit: fake
   name: test
   namespace: fleet-local
 spec:

tests/expected/single-cluster/manifests/dev-output.yaml

@@ -1,63 +1,3 @@
-apiVersion: v1
-kind: Service
-metadata:
-  annotations:
-    objectset.rio.cattle.io/id: -test
-  labels:
-    app: guestbook
-    objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
-    tier: frontend
-  name: frontend
-spec:
-  ports:
-  - port: 80
-  selector:
-    app: guestbook
-    tier: frontend
-  type: NodePort
-
----
-apiVersion: v1
-kind: Service
-metadata:
-  annotations:
-    objectset.rio.cattle.io/id: -test
-  labels:
-    app: redis
-    objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
-    role: master
-    tier: backend
-  name: redis-master
-spec:
-  ports:
-  - port: 6379
-    targetPort: 6379
-  selector:
-    app: redis
-    role: master
-    tier: backend
-
----
-apiVersion: v1
-kind: Service
-metadata:
-  annotations:
-    objectset.rio.cattle.io/id: -test
-  labels:
-    app: redis
-    objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
-    role: slave
-    tier: backend
-  name: redis-slave
-spec:
-  ports:
-  - port: 6379
-  selector:
-    app: redis
-    role: slave
-    tier: backend
-
----
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -66,6 +6,7 @@ metadata:
   labels:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
   name: frontend
+  namespace: fleet-manifest-example
 spec:
   replicas: 1
   selector:
@@ -97,6 +38,7 @@ metadata:
   labels:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
   name: redis-master
+  namespace: fleet-manifest-example
 spec:
   replicas: 1
   selector:
@@ -130,6 +72,7 @@ metadata:
   labels:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
   name: redis-slave
+  namespace: fleet-manifest-example
 spec:
   replicas: 2
   selector:
@@ -153,3 +96,66 @@ spec:
           requests:
             cpu: 100m
             memory: 100Mi
+
+---
+apiVersion: v1
+kind: Service
+metadata:
+  annotations:
+    objectset.rio.cattle.io/id: -test
+  labels:
+    app: guestbook
+    objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
+    tier: frontend
+  name: frontend
+  namespace: fleet-manifest-example
+spec:
+  ports:
+  - port: 80
+  selector:
+    app: guestbook
+    tier: frontend
+  type: NodePort
+
+---
+apiVersion: v1
+kind: Service
+metadata:
+  annotations:
+    objectset.rio.cattle.io/id: -test
+  labels:
+    app: redis
+    objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
+    role: master
+    tier: backend
+  name: redis-master
+  namespace: fleet-manifest-example
+spec:
+  ports:
+  - port: 6379
+    targetPort: 6379
+  selector:
+    app: redis
+    role: master
+    tier: backend
+
+---
+apiVersion: v1
+kind: Service
+metadata:
+  annotations:
+    objectset.rio.cattle.io/id: -test
+  labels:
+    app: redis
+    objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
+    role: slave
+    tier: backend
+  name: redis-slave
+  namespace: fleet-manifest-example
+spec:
+  ports:
+  - port: 6379
+  selector:
+    app: redis
+    role: slave
+    tier: backend

tests/expected/single-cluster/manifests/prod-output.yaml

@@ -1,63 +1,3 @@
-apiVersion: v1
-kind: Service
-metadata:
-  annotations:
-    objectset.rio.cattle.io/id: -test
-  labels:
-    app: guestbook
-    objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
-    tier: frontend
-  name: frontend
-spec:
-  ports:
-  - port: 80
-  selector:
-    app: guestbook
-    tier: frontend
-  type: NodePort
-
----
-apiVersion: v1
-kind: Service
-metadata:
-  annotations:
-    objectset.rio.cattle.io/id: -test
-  labels:
-    app: redis
-    objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
-    role: master
-    tier: backend
-  name: redis-master
-spec:
-  ports:
-  - port: 6379
-    targetPort: 6379
-  selector:
-    app: redis
-    role: master
-    tier: backend
-
----
-apiVersion: v1
-kind: Service
-metadata:
-  annotations:
-    objectset.rio.cattle.io/id: -test
-  labels:
-    app: redis
-    objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
-    role: slave
-    tier: backend
-  name: redis-slave
-spec:
-  ports:
-  - port: 6379
-  selector:
-    app: redis
-    role: slave
-    tier: backend
-
----
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -66,6 +6,7 @@ metadata:
   labels:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
   name: frontend
+  namespace: fleet-manifest-example
 spec:
   replicas: 1
   selector:
@@ -97,6 +38,7 @@ metadata:
   labels:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
   name: redis-master
+  namespace: fleet-manifest-example
 spec:
   replicas: 1
   selector:
@@ -130,6 +72,7 @@ metadata:
   labels:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
   name: redis-slave
+  namespace: fleet-manifest-example
 spec:
   replicas: 2
   selector:
@@ -153,3 +96,66 @@ spec:
           requests:
             cpu: 100m
             memory: 100Mi
+
+---
+apiVersion: v1
+kind: Service
+metadata:
+  annotations:
+    objectset.rio.cattle.io/id: -test
+  labels:
+    app: guestbook
+    objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
+    tier: frontend
+  name: frontend
+  namespace: fleet-manifest-example
+spec:
+  ports:
+  - port: 80
+  selector:
+    app: guestbook
+    tier: frontend
+  type: NodePort
+
+---
+apiVersion: v1
+kind: Service
+metadata:
+  annotations:
+    objectset.rio.cattle.io/id: -test
+  labels:
+    app: redis
+    objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
+    role: master
+    tier: backend
+  name: redis-master
+  namespace: fleet-manifest-example
+spec:
+  ports:
+  - port: 6379
+    targetPort: 6379
+  selector:
+    app: redis
+    role: master
+    tier: backend
+
+---
+apiVersion: v1
+kind: Service
+metadata:
+  annotations:
+    objectset.rio.cattle.io/id: -test
+  labels:
+    app: redis
+    objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
+    role: slave
+    tier: backend
+  name: redis-slave
+  namespace: fleet-manifest-example
+spec:
+  ports:
+  - port: 6379
+  selector:
+    app: redis
+    role: slave
+    tier: backend

tests/expected/single-cluster/manifests/test-output.yaml

@@ -1,63 +1,3 @@
-apiVersion: v1
-kind: Service
-metadata:
-  annotations:
-    objectset.rio.cattle.io/id: -test
-  labels:
-    app: guestbook
-    objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
-    tier: frontend
-  name: frontend
-spec:
-  ports:
-  - port: 80
-  selector:
-    app: guestbook
-    tier: frontend
-  type: NodePort
-
----
-apiVersion: v1
-kind: Service
-metadata:
-  annotations:
-    objectset.rio.cattle.io/id: -test
-  labels:
-    app: redis
-    objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
-    role: master
-    tier: backend
-  name: redis-master
-spec:
-  ports:
-  - port: 6379
-    targetPort: 6379
-  selector:
-    app: redis
-    role: master
-    tier: backend
-
----
-apiVersion: v1
-kind: Service
-metadata:
-  annotations:
-    objectset.rio.cattle.io/id: -test
-  labels:
-    app: redis
-    objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
-    role: slave
-    tier: backend
-  name: redis-slave
-spec:
-  ports:
-  - port: 6379
-  selector:
-    app: redis
-    role: slave
-    tier: backend
-
----
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -66,6 +6,7 @@ metadata:
   labels:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
   name: frontend
+  namespace: fleet-manifest-example
 spec:
   replicas: 1
   selector:
@@ -97,6 +38,7 @@ metadata:
   labels:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
   name: redis-master
+  namespace: fleet-manifest-example
 spec:
   replicas: 1
   selector:
@@ -130,6 +72,7 @@ metadata:
   labels:
     objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
   name: redis-slave
+  namespace: fleet-manifest-example
 spec:
   replicas: 2
   selector:
@@ -153,3 +96,66 @@ spec:
           requests:
             cpu: 100m
             memory: 100Mi
+
+---
+apiVersion: v1
+kind: Service
+metadata:
+  annotations:
+    objectset.rio.cattle.io/id: -test
+  labels:
+    app: guestbook
+    objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
+    tier: frontend
+  name: frontend
+  namespace: fleet-manifest-example
+spec:
+  ports:
+  - port: 80
+  selector:
+    app: guestbook
+    tier: frontend
+  type: NodePort
+
+---
+apiVersion: v1
+kind: Service
+metadata:
+  annotations:
+    objectset.rio.cattle.io/id: -test
+  labels:
+    app: redis
+    objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
+    role: master
+    tier: backend
+  name: redis-master
+  namespace: fleet-manifest-example
+spec:
+  ports:
+  - port: 6379
+    targetPort: 6379
+  selector:
+    app: redis
+    role: master
+    tier: backend
+
+---
+apiVersion: v1
+kind: Service
+metadata:
+  annotations:
+    objectset.rio.cattle.io/id: -test
+  labels:
+    app: redis
+    objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d
+    role: slave
+    tier: backend
+  name: redis-slave
+  namespace: fleet-manifest-example
+spec:
+  ports:
+  - port: 6379
+  selector:
+    app: redis
+    role: slave
+    tier: backend

tests/test.sh

@@ -1,6 +1,8 @@
 #!/bin/bash
 set -e
 
+export COMMIT=fake
+
 cd $(dirname $0)
 
 rm -rf output
@@ -12,8 +14,8 @@ for i in ../single-cluster/*; do
     pushd $i
     for j in dev test prod; do
         mkdir -p ../../tests/output/garbage/${i}
-        fleet test  > ../../tests/output/garbage/${i}/${j}-output.yaml
+        fleet test > ../../tests/output/garbage/${i}/${j}-output.yaml
-        fleet test --print-bundle  > ../../tests/output/garbage/${i}/bundle.yaml
+        fleet apply -o - test > ../../tests/output/garbage/${i}/bundle.yaml
     done
     popd
 done
@@ -26,7 +28,7 @@ for i in ../multi-cluster/*; do
     for j in dev test prod; do
         mkdir -p ../../tests/output/garbage/${i}
         fleet test -l env=${j} > ../../tests/output/garbage/${i}/${j}-output.yaml
-        fleet test --print-bundle  > ../../tests/output/garbage/${i}/bundle.yaml
+        fleet apply -o - test > ../../tests/output/garbage/${i}/bundle.yaml
     done
     popd
 done