From 5c6a933ae2fb47636b2058734705ffe8e741788b Mon Sep 17 00:00:00 2001 From: ron1 Date: Wed, 9 Dec 2020 01:16:18 -0500 Subject: [PATCH] Correct multi-cluster README.md GitRepo manifests to use 'fleet-default' namespace --- multi-cluster/helm-external/README.md | 2 +- multi-cluster/helm-kustomize/README.md | 2 +- multi-cluster/helm/README.md | 2 +- multi-cluster/kustomize/README.md | 2 +- multi-cluster/manifests/README.md | 2 +- tests/expected/multi-cluster/helm-external/bundle.yaml | 4 ++-- tests/expected/multi-cluster/helm-kustomize/bundle.yaml | 4 ++-- tests/expected/multi-cluster/helm/bundle.yaml | 4 ++-- tests/expected/multi-cluster/kustomize/bundle.yaml | 4 ++-- tests/expected/multi-cluster/manifests/bundle.yaml | 4 ++-- tests/test.sh | 2 +- 11 files changed, 16 insertions(+), 16 deletions(-) diff --git a/multi-cluster/helm-external/README.md b/multi-cluster/helm-external/README.md index 8f6dadcc..a9022d81 100644 --- a/multi-cluster/helm-external/README.md +++ b/multi-cluster/helm-external/README.md @@ -15,7 +15,7 @@ kind: GitRepo apiVersion: fleet.cattle.io/v1alpha1 metadata: name: helm-external - namespace: fleet-local + namespace: fleet-default spec: repo: https://github.com/rancher/fleet-examples paths: diff --git a/multi-cluster/helm-kustomize/README.md b/multi-cluster/helm-kustomize/README.md index 0dcf1c99..0fd27dd8 100644 --- a/multi-cluster/helm-kustomize/README.md +++ b/multi-cluster/helm-kustomize/README.md @@ -15,7 +15,7 @@ kind: GitRepo apiVersion: fleet.cattle.io/v1alpha1 metadata: name: helm-kustomize - namespace: fleet-local + namespace: fleet-default spec: repo: https://github.com/rancher/fleet-examples paths: diff --git a/multi-cluster/helm/README.md b/multi-cluster/helm/README.md index 4f4fa480..61912199 100644 --- a/multi-cluster/helm/README.md +++ b/multi-cluster/helm/README.md @@ -15,7 +15,7 @@ kind: GitRepo apiVersion: fleet.cattle.io/v1alpha1 metadata: name: helm - namespace: fleet-local + namespace: fleet-default spec: repo: https://github.com/rancher/fleet-examples paths: diff --git a/multi-cluster/kustomize/README.md b/multi-cluster/kustomize/README.md index dadc8e15..40bcc960 100644 --- a/multi-cluster/kustomize/README.md +++ b/multi-cluster/kustomize/README.md @@ -14,7 +14,7 @@ kind: GitRepo apiVersion: fleet.cattle.io/v1alpha1 metadata: name: kustomize - namespace: fleet-local + namespace: fleet-default spec: repo: https://github.com/rancher/fleet-examples paths: diff --git a/multi-cluster/manifests/README.md b/multi-cluster/manifests/README.md index f42d671f..ed193981 100644 --- a/multi-cluster/manifests/README.md +++ b/multi-cluster/manifests/README.md @@ -14,7 +14,7 @@ kind: GitRepo apiVersion: fleet.cattle.io/v1alpha1 metadata: name: manifests - namespace: fleet-local + namespace: fleet-default spec: repo: https://github.com/rancher/fleet-examples paths: diff --git a/tests/expected/multi-cluster/helm-external/bundle.yaml b/tests/expected/multi-cluster/helm-external/bundle.yaml index 85ef6eca..6926d880 100644 --- a/tests/expected/multi-cluster/helm-external/bundle.yaml +++ b/tests/expected/multi-cluster/helm-external/bundle.yaml @@ -4,7 +4,7 @@ metadata: labels: fleet.cattle.io/commit: fake name: test - namespace: fleet-local + namespace: fleet-default spec: helm: chart: https://github.com/rancher/fleet-examples/releases/download/example/guestbook-0.0.0.tgz @@ -182,7 +182,7 @@ spec: apiVersion: fleet.cattle.io/v1alpha1 metadata: name: helm-external - namespace: fleet-local + namespace: fleet-default spec: repo: https://github.com/rancher/fleet-examples paths: diff --git a/tests/expected/multi-cluster/helm-kustomize/bundle.yaml b/tests/expected/multi-cluster/helm-kustomize/bundle.yaml index 913dae35..bcb6c6b6 100644 --- a/tests/expected/multi-cluster/helm-kustomize/bundle.yaml +++ b/tests/expected/multi-cluster/helm-kustomize/bundle.yaml @@ -4,7 +4,7 @@ metadata: labels: fleet.cattle.io/commit: fake name: test - namespace: fleet-local + namespace: fleet-default spec: helm: chart: https://github.com/rancher/fleet-examples/releases/download/example/guestbook-0.0.0.tgz @@ -182,7 +182,7 @@ spec: apiVersion: fleet.cattle.io/v1alpha1 metadata: name: helm-kustomize - namespace: fleet-local + namespace: fleet-default spec: repo: https://github.com/rancher/fleet-examples paths: diff --git a/tests/expected/multi-cluster/helm/bundle.yaml b/tests/expected/multi-cluster/helm/bundle.yaml index 4d0283df..be839a59 100644 --- a/tests/expected/multi-cluster/helm/bundle.yaml +++ b/tests/expected/multi-cluster/helm/bundle.yaml @@ -4,7 +4,7 @@ metadata: labels: fleet.cattle.io/commit: fake name: test - namespace: fleet-local + namespace: fleet-default spec: namespace: fleet-mc-helm-example resources: @@ -33,7 +33,7 @@ spec: apiVersion: fleet.cattle.io/v1alpha1 metadata: name: helm - namespace: fleet-local + namespace: fleet-default spec: repo: https://github.com/rancher/fleet-examples paths: diff --git a/tests/expected/multi-cluster/kustomize/bundle.yaml b/tests/expected/multi-cluster/kustomize/bundle.yaml index 24e2e883..6f23d362 100644 --- a/tests/expected/multi-cluster/kustomize/bundle.yaml +++ b/tests/expected/multi-cluster/kustomize/bundle.yaml @@ -4,7 +4,7 @@ metadata: labels: fleet.cattle.io/commit: fake name: test - namespace: fleet-local + namespace: fleet-default spec: namespace: fleet-mc-kustomize-example resources: @@ -25,7 +25,7 @@ spec: apiVersion: fleet.cattle.io/v1alpha1 metadata: name: kustomize - namespace: fleet-local + namespace: fleet-default spec: repo: https://github.com/rancher/fleet-examples paths: diff --git a/tests/expected/multi-cluster/manifests/bundle.yaml b/tests/expected/multi-cluster/manifests/bundle.yaml index bc042ae4..4b1aedcd 100644 --- a/tests/expected/multi-cluster/manifests/bundle.yaml +++ b/tests/expected/multi-cluster/manifests/bundle.yaml @@ -4,7 +4,7 @@ metadata: labels: fleet.cattle.io/commit: fake name: test - namespace: fleet-local + namespace: fleet-default spec: namespace: fleet-mc-manifest-example resources: @@ -25,7 +25,7 @@ spec: apiVersion: fleet.cattle.io/v1alpha1 metadata: name: manifests - namespace: fleet-local + namespace: fleet-default spec: repo: https://github.com/rancher/fleet-examples paths: diff --git a/tests/test.sh b/tests/test.sh index be0ae5b1..a2d66add 100755 --- a/tests/test.sh +++ b/tests/test.sh @@ -28,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 apply -o - test > ../../tests/output/garbage/${i}/bundle.yaml + fleet apply -n fleet-default -o - test > ../../tests/output/garbage/${i}/bundle.yaml done popd done