diff --git a/README.md b/README.md index e862bb0..20cc327 100644 --- a/README.md +++ b/README.md @@ -12,10 +12,10 @@ understand the basics of structuring git repos for Fleet. | Example | Description | |-------------|-------------| -| [manifests](single-cluster/manifests/) | An example using raw Kubernetes YAML and customizing it per target cluster | -| [helm](single-cluster/helm/) | An example using Helm and customizing it per target cluster | +| [manifests](single-cluster/manifests/) | An example using raw Kubernetes YAML | +| [helm](single-cluster/helm/) | An example using Helm | | [helm-multi-chart](single-cluster/helm-multi-chart/) | An example deploying multiple charts from a single repo | -| [kustomize](single-cluster/kustomize/) | An example using Kustomize and customizing it per target cluster | +| [kustomize](single-cluster/kustomize/) | An example using Kustomize | | [helm-kustomize](single-cluster/helm-kustomize/) | An example using Kustomize to modify a third party Helm chart | ## Multi-Cluster Examples diff --git a/multi-cluster/helm/templates/redis-master-deployment.yaml b/multi-cluster/helm/templates/redis-master-deployment.yaml index fd9b2f5..d815405 100644 --- a/multi-cluster/helm/templates/redis-master-deployment.yaml +++ b/multi-cluster/helm/templates/redis-master-deployment.yaml @@ -18,7 +18,7 @@ spec: spec: containers: - name: master - image: k8s.gcr.io/redis:e2e + image: registry.k8s.io/redis:e2e resources: requests: cpu: 100m diff --git a/multi-cluster/kustomize/base/redis-master-deployment.yaml b/multi-cluster/kustomize/base/redis-master-deployment.yaml index fd9b2f5..d815405 100644 --- a/multi-cluster/kustomize/base/redis-master-deployment.yaml +++ b/multi-cluster/kustomize/base/redis-master-deployment.yaml @@ -18,7 +18,7 @@ spec: spec: containers: - name: master - image: k8s.gcr.io/redis:e2e + image: registry.k8s.io/redis:e2e resources: requests: cpu: 100m diff --git a/multi-cluster/manifests/redis-master-deployment.yaml b/multi-cluster/manifests/redis-master-deployment.yaml index fd9b2f5..d815405 100644 --- a/multi-cluster/manifests/redis-master-deployment.yaml +++ b/multi-cluster/manifests/redis-master-deployment.yaml @@ -18,7 +18,7 @@ spec: spec: containers: - name: master - image: k8s.gcr.io/redis:e2e + image: registry.k8s.io/redis:e2e resources: requests: cpu: 100m diff --git a/simple/redis-master-deployment.yaml b/simple/redis-master-deployment.yaml index fd9b2f5..d815405 100644 --- a/simple/redis-master-deployment.yaml +++ b/simple/redis-master-deployment.yaml @@ -18,7 +18,7 @@ spec: spec: containers: - name: master - image: k8s.gcr.io/redis:e2e + image: registry.k8s.io/redis:e2e resources: requests: cpu: 100m diff --git a/single-cluster/helm-multi-chart/guestbook/templates/redis-master-deployment.yaml b/single-cluster/helm-multi-chart/guestbook/templates/redis-master-deployment.yaml index fd9b2f5..d815405 100644 --- a/single-cluster/helm-multi-chart/guestbook/templates/redis-master-deployment.yaml +++ b/single-cluster/helm-multi-chart/guestbook/templates/redis-master-deployment.yaml @@ -18,7 +18,7 @@ spec: spec: containers: - name: master - image: k8s.gcr.io/redis:e2e + image: registry.k8s.io/redis:e2e resources: requests: cpu: 100m diff --git a/single-cluster/helm/templates/redis-master-deployment.yaml b/single-cluster/helm/templates/redis-master-deployment.yaml index fd9b2f5..d815405 100644 --- a/single-cluster/helm/templates/redis-master-deployment.yaml +++ b/single-cluster/helm/templates/redis-master-deployment.yaml @@ -18,7 +18,7 @@ spec: spec: containers: - name: master - image: k8s.gcr.io/redis:e2e + image: registry.k8s.io/redis:e2e resources: requests: cpu: 100m diff --git a/single-cluster/kustomize/base/redis-master-deployment.yaml b/single-cluster/kustomize/base/redis-master-deployment.yaml index fd9b2f5..d815405 100644 --- a/single-cluster/kustomize/base/redis-master-deployment.yaml +++ b/single-cluster/kustomize/base/redis-master-deployment.yaml @@ -18,7 +18,7 @@ spec: spec: containers: - name: master - image: k8s.gcr.io/redis:e2e + image: registry.k8s.io/redis:e2e resources: requests: cpu: 100m diff --git a/single-cluster/manifests/deployments/redis-master-deployment.yaml b/single-cluster/manifests/deployments/redis-master-deployment.yaml index fd9b2f5..d815405 100644 --- a/single-cluster/manifests/deployments/redis-master-deployment.yaml +++ b/single-cluster/manifests/deployments/redis-master-deployment.yaml @@ -18,7 +18,7 @@ spec: spec: containers: - name: master - image: k8s.gcr.io/redis:e2e + image: registry.k8s.io/redis:e2e resources: requests: cpu: 100m diff --git a/tests/expected/multi-cluster/helm/bundle.yaml b/tests/expected/multi-cluster/helm/bundle.yaml index 1a28aa1..edef9f5 100644 --- a/tests/expected/multi-cluster/helm/bundle.yaml +++ b/tests/expected/multi-cluster/helm/bundle.yaml @@ -147,7 +147,7 @@ spec: spec: containers: - name: master - image: k8s.gcr.io/redis:e2e + image: registry.k8s.io/redis:e2e resources: requests: cpu: 100m diff --git a/tests/expected/multi-cluster/helm/dev-output.yaml b/tests/expected/multi-cluster/helm/dev-output.yaml index 6aa8bf8..869f614 100644 --- a/tests/expected/multi-cluster/helm/dev-output.yaml +++ b/tests/expected/multi-cluster/helm/dev-output.yaml @@ -117,7 +117,7 @@ spec: tier: backend spec: containers: - - image: k8s.gcr.io/redis:e2e + - image: registry.k8s.io/redis:e2e name: master ports: - containerPort: 6379 diff --git a/tests/expected/multi-cluster/helm/prod-output.yaml b/tests/expected/multi-cluster/helm/prod-output.yaml index 38396c4..044c633 100644 --- a/tests/expected/multi-cluster/helm/prod-output.yaml +++ b/tests/expected/multi-cluster/helm/prod-output.yaml @@ -117,7 +117,7 @@ spec: tier: backend spec: containers: - - image: k8s.gcr.io/redis:e2e + - image: registry.k8s.io/redis:e2e name: master ports: - containerPort: 6379 diff --git a/tests/expected/multi-cluster/helm/test-output.yaml b/tests/expected/multi-cluster/helm/test-output.yaml index a5ce671..38c9b53 100644 --- a/tests/expected/multi-cluster/helm/test-output.yaml +++ b/tests/expected/multi-cluster/helm/test-output.yaml @@ -117,7 +117,7 @@ spec: tier: backend spec: containers: - - image: k8s.gcr.io/redis:e2e + - image: registry.k8s.io/redis:e2e name: master ports: - containerPort: 6379 diff --git a/tests/expected/multi-cluster/kustomize/bundle.yaml b/tests/expected/multi-cluster/kustomize/bundle.yaml index 15c7cbf..a1825c2 100644 --- a/tests/expected/multi-cluster/kustomize/bundle.yaml +++ b/tests/expected/multi-cluster/kustomize/bundle.yaml @@ -120,7 +120,7 @@ spec: spec: containers: - name: master - image: k8s.gcr.io/redis:e2e + image: registry.k8s.io/redis:e2e resources: requests: cpu: 100m diff --git a/tests/expected/multi-cluster/kustomize/dev-output.yaml b/tests/expected/multi-cluster/kustomize/dev-output.yaml index 7d710b3..af54295 100644 --- a/tests/expected/multi-cluster/kustomize/dev-output.yaml +++ b/tests/expected/multi-cluster/kustomize/dev-output.yaml @@ -74,7 +74,7 @@ spec: tier: backend spec: containers: - - image: k8s.gcr.io/redis:e2e + - image: registry.k8s.io/redis:e2e name: master ports: - containerPort: 6379 diff --git a/tests/expected/multi-cluster/kustomize/prod-output.yaml b/tests/expected/multi-cluster/kustomize/prod-output.yaml index c900da9..5adf524 100644 --- a/tests/expected/multi-cluster/kustomize/prod-output.yaml +++ b/tests/expected/multi-cluster/kustomize/prod-output.yaml @@ -74,7 +74,7 @@ spec: tier: backend spec: containers: - - image: k8s.gcr.io/redis:e2e + - image: registry.k8s.io/redis:e2e name: master ports: - containerPort: 6379 diff --git a/tests/expected/multi-cluster/kustomize/test-output.yaml b/tests/expected/multi-cluster/kustomize/test-output.yaml index 803fdb8..cdf50ed 100644 --- a/tests/expected/multi-cluster/kustomize/test-output.yaml +++ b/tests/expected/multi-cluster/kustomize/test-output.yaml @@ -74,7 +74,7 @@ spec: tier: backend spec: containers: - - image: k8s.gcr.io/redis:e2e + - image: registry.k8s.io/redis:e2e name: master ports: - containerPort: 6379 diff --git a/tests/expected/multi-cluster/manifests/bundle.yaml b/tests/expected/multi-cluster/manifests/bundle.yaml index 54e9650..3033698 100644 --- a/tests/expected/multi-cluster/manifests/bundle.yaml +++ b/tests/expected/multi-cluster/manifests/bundle.yaml @@ -156,7 +156,7 @@ spec: spec: containers: - name: master - image: k8s.gcr.io/redis:e2e + image: registry.k8s.io/redis:e2e resources: requests: cpu: 100m diff --git a/tests/expected/multi-cluster/manifests/dev-output.yaml b/tests/expected/multi-cluster/manifests/dev-output.yaml index f4519c1..e2186a8 100644 --- a/tests/expected/multi-cluster/manifests/dev-output.yaml +++ b/tests/expected/multi-cluster/manifests/dev-output.yaml @@ -74,7 +74,7 @@ spec: tier: backend spec: containers: - - image: k8s.gcr.io/redis:e2e + - image: registry.k8s.io/redis:e2e name: master ports: - containerPort: 6379 diff --git a/tests/expected/multi-cluster/manifests/prod-output.yaml b/tests/expected/multi-cluster/manifests/prod-output.yaml index df4489d..b780049 100644 --- a/tests/expected/multi-cluster/manifests/prod-output.yaml +++ b/tests/expected/multi-cluster/manifests/prod-output.yaml @@ -74,7 +74,7 @@ spec: tier: backend spec: containers: - - image: k8s.gcr.io/redis:e2e + - image: registry.k8s.io/redis:e2e name: master ports: - containerPort: 6379 diff --git a/tests/expected/multi-cluster/manifests/test-output.yaml b/tests/expected/multi-cluster/manifests/test-output.yaml index 87228ac..b7f19c7 100644 --- a/tests/expected/multi-cluster/manifests/test-output.yaml +++ b/tests/expected/multi-cluster/manifests/test-output.yaml @@ -74,7 +74,7 @@ spec: tier: backend spec: containers: - - image: k8s.gcr.io/redis:e2e + - image: registry.k8s.io/redis:e2e name: master ports: - containerPort: 6379 diff --git a/tests/expected/single-cluster/helm-multi-chart/bundle.yaml b/tests/expected/single-cluster/helm-multi-chart/bundle.yaml index 6e97a49..3839d87 100644 --- a/tests/expected/single-cluster/helm-multi-chart/bundle.yaml +++ b/tests/expected/single-cluster/helm-multi-chart/bundle.yaml @@ -120,7 +120,7 @@ spec: spec: containers: - name: master - image: k8s.gcr.io/redis:e2e + image: registry.k8s.io/redis:e2e resources: requests: cpu: 100m @@ -353,7 +353,7 @@ spec: spec: containers: - name: master - image: k8s.gcr.io/redis:e2e + image: registry.k8s.io/redis:e2e resources: requests: cpu: 100m diff --git a/tests/expected/single-cluster/helm/bundle.yaml b/tests/expected/single-cluster/helm/bundle.yaml index 017bdd7..7933521 100644 --- a/tests/expected/single-cluster/helm/bundle.yaml +++ b/tests/expected/single-cluster/helm/bundle.yaml @@ -136,7 +136,7 @@ spec: spec: containers: - name: master - image: k8s.gcr.io/redis:e2e + image: registry.k8s.io/redis:e2e resources: requests: cpu: 100m diff --git a/tests/expected/single-cluster/helm/dev-output.yaml b/tests/expected/single-cluster/helm/dev-output.yaml index 51bfd4d..3e906d3 100644 --- a/tests/expected/single-cluster/helm/dev-output.yaml +++ b/tests/expected/single-cluster/helm/dev-output.yaml @@ -117,7 +117,7 @@ spec: tier: backend spec: containers: - - image: k8s.gcr.io/redis:e2e + - image: registry.k8s.io/redis:e2e name: master ports: - containerPort: 6379 diff --git a/tests/expected/single-cluster/helm/prod-output.yaml b/tests/expected/single-cluster/helm/prod-output.yaml index 51bfd4d..3e906d3 100644 --- a/tests/expected/single-cluster/helm/prod-output.yaml +++ b/tests/expected/single-cluster/helm/prod-output.yaml @@ -117,7 +117,7 @@ spec: tier: backend spec: containers: - - image: k8s.gcr.io/redis:e2e + - image: registry.k8s.io/redis:e2e name: master ports: - containerPort: 6379 diff --git a/tests/expected/single-cluster/helm/test-output.yaml b/tests/expected/single-cluster/helm/test-output.yaml index 51bfd4d..3e906d3 100644 --- a/tests/expected/single-cluster/helm/test-output.yaml +++ b/tests/expected/single-cluster/helm/test-output.yaml @@ -117,7 +117,7 @@ spec: tier: backend spec: containers: - - image: k8s.gcr.io/redis:e2e + - image: registry.k8s.io/redis:e2e name: master ports: - containerPort: 6379 diff --git a/tests/expected/single-cluster/kustomize/bundle.yaml b/tests/expected/single-cluster/kustomize/bundle.yaml index 616a928..e1d9042 100644 --- a/tests/expected/single-cluster/kustomize/bundle.yaml +++ b/tests/expected/single-cluster/kustomize/bundle.yaml @@ -100,7 +100,7 @@ spec: spec: containers: - name: master - image: k8s.gcr.io/redis:e2e + image: registry.k8s.io/redis:e2e resources: requests: cpu: 100m diff --git a/tests/expected/single-cluster/kustomize/dev-output.yaml b/tests/expected/single-cluster/kustomize/dev-output.yaml index 52bd819..f3e93a5 100644 --- a/tests/expected/single-cluster/kustomize/dev-output.yaml +++ b/tests/expected/single-cluster/kustomize/dev-output.yaml @@ -74,7 +74,7 @@ spec: tier: backend spec: containers: - - image: k8s.gcr.io/redis:e2e + - image: registry.k8s.io/redis:e2e name: master ports: - containerPort: 6379 diff --git a/tests/expected/single-cluster/kustomize/prod-output.yaml b/tests/expected/single-cluster/kustomize/prod-output.yaml index 52bd819..f3e93a5 100644 --- a/tests/expected/single-cluster/kustomize/prod-output.yaml +++ b/tests/expected/single-cluster/kustomize/prod-output.yaml @@ -74,7 +74,7 @@ spec: tier: backend spec: containers: - - image: k8s.gcr.io/redis:e2e + - image: registry.k8s.io/redis:e2e name: master ports: - containerPort: 6379 diff --git a/tests/expected/single-cluster/kustomize/test-output.yaml b/tests/expected/single-cluster/kustomize/test-output.yaml index 52bd819..f3e93a5 100644 --- a/tests/expected/single-cluster/kustomize/test-output.yaml +++ b/tests/expected/single-cluster/kustomize/test-output.yaml @@ -74,7 +74,7 @@ spec: tier: backend spec: containers: - - image: k8s.gcr.io/redis:e2e + - image: registry.k8s.io/redis:e2e name: master ports: - containerPort: 6379 diff --git a/tests/expected/single-cluster/manifests/bundle.yaml b/tests/expected/single-cluster/manifests/bundle.yaml index 98d54a4..e732d72 100644 --- a/tests/expected/single-cluster/manifests/bundle.yaml +++ b/tests/expected/single-cluster/manifests/bundle.yaml @@ -74,7 +74,7 @@ spec: spec: containers: - name: master - image: k8s.gcr.io/redis:e2e + image: registry.k8s.io/redis:e2e resources: requests: cpu: 100m diff --git a/tests/expected/single-cluster/manifests/dev-output.yaml b/tests/expected/single-cluster/manifests/dev-output.yaml index 76313af..739f125 100644 --- a/tests/expected/single-cluster/manifests/dev-output.yaml +++ b/tests/expected/single-cluster/manifests/dev-output.yaml @@ -54,7 +54,7 @@ spec: tier: backend spec: containers: - - image: k8s.gcr.io/redis:e2e + - image: registry.k8s.io/redis:e2e name: master ports: - containerPort: 6379 diff --git a/tests/expected/single-cluster/manifests/prod-output.yaml b/tests/expected/single-cluster/manifests/prod-output.yaml index 76313af..739f125 100644 --- a/tests/expected/single-cluster/manifests/prod-output.yaml +++ b/tests/expected/single-cluster/manifests/prod-output.yaml @@ -54,7 +54,7 @@ spec: tier: backend spec: containers: - - image: k8s.gcr.io/redis:e2e + - image: registry.k8s.io/redis:e2e name: master ports: - containerPort: 6379 diff --git a/tests/expected/single-cluster/manifests/test-output.yaml b/tests/expected/single-cluster/manifests/test-output.yaml index 76313af..739f125 100644 --- a/tests/expected/single-cluster/manifests/test-output.yaml +++ b/tests/expected/single-cluster/manifests/test-output.yaml @@ -54,7 +54,7 @@ spec: tier: backend spec: containers: - - image: k8s.gcr.io/redis:e2e + - image: registry.k8s.io/redis:e2e name: master ports: - containerPort: 6379