homogenizing kustomize usage in examples/renders folders

Signed-off-by: Sanskar Bhushan <[email protected]>
projectcontour · Aug 7, 2023 · 75407a7 · 75407a7
1 parent feda2e3
commit 75407a7
Show file tree

Hide file tree

Showing 22 changed files with 44 additions and 32 deletions.
diff --git a/examples/optional-features/kustomization.yaml b/examples/optional-features/kustomization.yaml
@@ -5,7 +5,7 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - ../render/contour-gateway.yaml
+  - ../render/contour/contour-gateway.yaml
 patches:
   - patch: |-
       - op: add

diff --git a/examples/render/contour-deployment.yaml → ...ontour-deployment/contour-deployment.yaml b/examples/render/contour-deployment.yaml → ...ontour-deployment/contour-deployment.yaml
diff --git a/examples/render/contour-deployment/kustomization.yaml b/examples/render/contour-deployment/kustomization.yaml
@@ -0,0 +1,4 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - contour-deployment.yaml
diff --git a/...s/render/contour-gateway-provisioner.yaml → ...visioner/contour-gateway-provisioner.yaml b/...s/render/contour-gateway-provisioner.yaml → ...visioner/contour-gateway-provisioner.yaml
diff --git a/examples/render/contour-gateway-provisioner/kustomization.yaml b/examples/render/contour-gateway-provisioner/kustomization.yaml
@@ -0,0 +1,4 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - contour-gateway-provisioner.yaml
diff --git a/examples/render/contour-gateway.yaml → ...nder/contour-gateway/contour-gateway.yaml b/examples/render/contour-gateway.yaml → ...nder/contour-gateway/contour-gateway.yaml
diff --git a/examples/render/contour-gateway/kustomization.yaml b/examples/render/contour-gateway/kustomization.yaml
@@ -0,0 +1,4 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - contour-gateway.yaml
diff --git a/examples/render/contour.yaml → examples/render/contour/contour.yaml b/examples/render/contour.yaml → examples/render/contour/contour.yaml
diff --git a/examples/render/kustomization.yaml → examples/render/contour/kustomization.yaml b/examples/render/kustomization.yaml → examples/render/contour/kustomization.yaml
diff --git a/hack/generate-deployment.sh b/hack/generate-deployment.sh
@@ -17,11 +17,11 @@ readonly MODE="$1"
 
 case $MODE in
   deployment)
-      TARGET="${REPO}/examples/render/contour-deployment.yaml"
+      TARGET="${REPO}/examples/render/contour/contour-deployment.yaml"
       SKIP_FILE="*/03-envoy.yaml"
       ;;
   daemonset)
-      TARGET="${REPO}/examples/render/contour.yaml"
+      TARGET="${REPO}/examples/render/contour/contour.yaml"
       SKIP_FILE="*/03-envoy-deployment.yaml"
       ;;
 esac

diff --git a/hack/generate-gateway-deployment.sh b/hack/generate-gateway-deployment.sh
@@ -7,7 +7,7 @@ set -o pipefail
 readonly HERE=$(cd "$(dirname "$0")" && pwd)
 readonly REPO=$(cd "${HERE}"/.. && pwd)
 readonly PROGNAME=$(basename "$0")
-readonly TARGET="${REPO}/examples/render/contour-gateway.yaml"
+readonly TARGET="${REPO}/examples/render/contour/contour-gateway.yaml"
 
 exec > >(git stripspace >"$TARGET")
 

diff --git a/hack/generate-provisioner-deployment.sh b/hack/generate-provisioner-deployment.sh
@@ -7,7 +7,7 @@ set -o pipefail
 readonly HERE=$(cd "$(dirname "$0")" && pwd)
 readonly REPO=$(cd "${HERE}"/.. && pwd)
 readonly PROGNAME=$(basename "$0")
-readonly TARGET="${REPO}/examples/render/contour-gateway-provisioner.yaml"
+readonly TARGET="${REPO}/examples/render/contour/contour-gateway-provisioner.yaml"
 
 exec > >(git stripspace >"$TARGET")
 

diff --git a/hack/release/make-release-tag.sh b/hack/release/make-release-tag.sh
@@ -85,10 +85,10 @@ if git status -s examples/contour 2>&1 | grep -E -q '^\s+[MADRCU]'; then
         examples/contour/02-job-certgen.yaml \
         examples/deployment/03-envoy-deployment.yaml \
         examples/gateway-provisioner/03-gateway-provisioner.yaml \
-        examples/render/contour.yaml \
-        examples/render/contour-gateway.yaml \
-        examples/render/contour-deployment.yaml \
-        examples/render/contour-gateway-provisioner.yaml
+        examples/render/contour/contour.yaml \
+        examples/render/contour/contour-gateway.yaml \
+        examples/render/contour/contour-deployment.yaml \
+        examples/render/contour/contour-gateway-provisioner.yaml
 fi
 
 git tag -F - "$NEWVERS" <<EOF

diff --git a/hack/release/release-notes-template.md b/hack/release/release-notes-template.md
@@ -51,12 +51,12 @@ The simplest way to install {{ .Version }} is to apply one of the example config
 
 With Gateway API:
 ```bash
-kubectl apply -f https://raw.githubusercontent.com/projectcontour/contour/{{ .Version }}/examples/render/contour-gateway.yaml
+kubectl apply -f https://raw.githubusercontent.com/projectcontour/contour/{{ .Version }}/examples/render/contour/contour-gateway.yaml
 ```
 
 Without Gateway API:
 ```bash
-kubectl apply -f https://raw.githubusercontent.com/projectcontour/contour/{{ .Version }}/examples/render/contour.yaml
+kubectl apply -f https://raw.githubusercontent.com/projectcontour/contour/{{ .Version }}/examples/render/contour/contour.yaml
 ```
 {{ else }}
 For a fresh install of Contour, consult the [getting started documentation](https://projectcontour.io/getting-started/).

diff --git a/netlify.toml b/netlify.toml
@@ -54,7 +54,7 @@ HUGO_ENABLEGITINFO = "true"
 # kubectl apply https://projectcontour.io/quickstart/contour.yaml
 [[redirects]]
   from = "/quickstart/contour.yaml"
-  to = "https://raw.githubusercontent.com/projectcontour/contour/release-1.25/examples/render/contour.yaml"
+  to = "https://raw.githubusercontent.com/projectcontour/contour/release-1.25/examples/render/contour/contour.yaml"
   status = 302
 
 # Redirect versioned quickstarts so that they can easily be referenced by
@@ -63,15 +63,15 @@ HUGO_ENABLEGITINFO = "true"
 # kubectl apply https://projectcontour.io/quickstart/v1.4.0/contour.yaml
 [[redirects]]
   from = "/quickstart/*/contour.yaml"
-  to = "https://raw.githubusercontent.com/projectcontour/contour/:splat/examples/render/contour.yaml"
+  to = "https://raw.githubusercontent.com/projectcontour/contour/:splat/examples/render/contour/contour.yaml"
   status = 302
 
 # Redirect /quickstart/contour-gateway.yaml to the example Contour-Gateway manifest that matches :latest.
 #
 # kubectl apply https://projectcontour.io/quickstart/contour-gateway.yaml
 [[redirects]]
 from = "/quickstart/contour-gateway.yaml"
-to = "https://raw.githubusercontent.com/projectcontour/contour/release-1.25/examples/render/contour-gateway.yaml"
+to = "https://raw.githubusercontent.com/projectcontour/contour/release-1.25/examples/render/contour/contour-gateway.yaml"
 status = 302
 
 # Redirect versioned quickstarts so that they can easily be referenced by
@@ -80,15 +80,15 @@ status = 302
 # kubectl apply https://projectcontour.io/quickstart/v1.4.0/contour-gateway.yaml
 [[redirects]]
   from = "/quickstart/*/contour-gateway.yaml"
-  to = "https://raw.githubusercontent.com/projectcontour/contour/:splat/examples/render/contour-gateway.yaml"
+  to = "https://raw.githubusercontent.com/projectcontour/contour/:splat/examples/render/contour/contour-gateway.yaml"
   status = 302
 
 # Redirect /quickstart/contour-gateway-provisioner.yaml to the Gateway provisioner manifest that matches :latest.
 #
 # kubectl apply https://projectcontour.io/quickstart/contour-gateway-provisioner.yaml
 [[redirects]]
   from = "/quickstart/contour-gateway-provisioner.yaml"
-  to = "https://raw.githubusercontent.com/projectcontour/contour/release-1.25/examples/render/contour-gateway-provisioner.yaml"
+  to = "https://raw.githubusercontent.com/projectcontour/contour/release-1.25/examples/render/contour/contour-gateway-provisioner.yaml"
   status = 302
 
 # Redirect versioned quickstarts so that they can easily be referenced by
@@ -97,7 +97,7 @@ status = 302
 # kubectl apply https://projectcontour.io/quickstart/v1.4.0/contour-gateway-provisioner.yaml
 [[redirects]]
   from = "/quickstart/*/contour-gateway-provisioner.yaml"
-  to = "https://raw.githubusercontent.com/projectcontour/contour/:splat/examples/render/contour-gateway-provisioner.yaml"
+  to = "https://raw.githubusercontent.com/projectcontour/contour/:splat/examples/render/contour/contour-gateway-provisioner.yaml"
   status = 302
 
 

diff --git a/site/content/docs/1.20/deploy-options.md b/site/content/docs/1.20/deploy-options.md
@@ -222,7 +222,7 @@ $ kubectl delete ns contour-operator
 ```
 
 [1]: #running-without-a-kubernetes-loadbalancer
-[2]: {{< param github_url>}}/tree/{{< param branch >}}/examples/render/contour.yaml
+[2]: {{< param github_url>}}/tree/{{< param branch >}}/examples/render/contour/contour.yaml
 [3]: #host-networking
 [4]: /guides/proxy-proto.md
 [5]: https://github.com/kubernetes-up-and-running/kuard
@@ -233,5 +233,5 @@ $ kubectl delete ns contour-operator
 [11]: redeploy-envoy.md
 [12]: https://github.com/projectcontour/contour-operator
 [13]: https://projectcontour.io/resources/deprecation-policy/
-[14]: {{< param github_url>}}/tree/{{< param branch >}}/examples/render/contour-deployment.yaml
+[14]: {{< param github_url>}}/tree/{{< param branch >}}/examples/render/contour/contour-deployment.yaml
 [15]: /resources/upgrading/
diff --git a/site/content/docs/1.21/deploy-options.md b/site/content/docs/1.21/deploy-options.md
@@ -222,7 +222,7 @@ $ kubectl delete ns contour-operator
 ```
 
 [1]: #running-without-a-kubernetes-loadbalancer
-[2]: {{< param github_url>}}/tree/{{< param branch >}}/examples/render/contour.yaml
+[2]: {{< param github_url>}}/tree/{{< param branch >}}/examples/render/contour/contour.yaml
 [3]: #host-networking
 [4]: /guides/proxy-proto.md
 [5]: https://github.com/kubernetes-up-and-running/kuard
@@ -233,5 +233,5 @@ $ kubectl delete ns contour-operator
 [11]: redeploy-envoy.md
 [12]: https://github.com/projectcontour/contour-operator
 [13]: https://projectcontour.io/resources/deprecation-policy/
-[14]: {{< param github_url>}}/tree/{{< param branch >}}/examples/render/contour-deployment.yaml
+[14]: {{< param github_url>}}/tree/{{< param branch >}}/examples/render/contour/contour-deployment.yaml
 [15]: /resources/upgrading/
diff --git a/site/content/docs/1.22/deploy-options.md b/site/content/docs/1.22/deploy-options.md
@@ -222,7 +222,7 @@ $ kubectl delete ns contour-operator
 ```
 
 [1]: #running-without-a-kubernetes-loadbalancer
-[2]: {{< param github_url>}}/tree/{{< param branch >}}/examples/render/contour.yaml
+[2]: {{< param github_url>}}/tree/{{< param branch >}}/examples/render/contour/contour.yaml
 [3]: #host-networking
 [4]: /guides/proxy-proto.md
 [5]: https://github.com/kubernetes-up-and-running/kuard
@@ -233,5 +233,5 @@ $ kubectl delete ns contour-operator
 [11]: redeploy-envoy.md
 [12]: https://github.com/projectcontour/contour-operator
 [13]: https://projectcontour.io/resources/deprecation-policy/
-[14]: {{< param github_url>}}/tree/{{< param branch >}}/examples/render/contour-deployment.yaml
+[14]: {{< param github_url>}}/tree/{{< param branch >}}/examples/render/contour/contour-deployment.yaml
 [15]: /resources/upgrading/
diff --git a/site/content/docs/1.23/deploy-options.md b/site/content/docs/1.23/deploy-options.md
@@ -348,7 +348,7 @@ $ kubectl delete ns contour-operator
 ```
 
 [1]: #running-without-a-kubernetes-loadbalancer
-[2]: {{< param github_url>}}/tree/{{< param branch >}}/examples/render/contour.yaml
+[2]: {{< param github_url>}}/tree/{{< param branch >}}/examples/render/contour/contour.yaml
 [3]: #host-networking
 [4]: guides/proxy-proto.md
 [5]: https://github.com/kubernetes-up-and-running/kuard
@@ -359,7 +359,7 @@ $ kubectl delete ns contour-operator
 [11]: redeploy-envoy.md
 [12]: https://github.com/projectcontour/contour-operator
 [13]: https://projectcontour.io/resources/deprecation-policy/
-[14]: {{< param github_url>}}/tree/{{< param branch >}}/examples/render/contour-deployment.yaml
+[14]: {{< param github_url>}}/tree/{{< param branch >}}/examples/render/contour/contour-deployment.yaml
 [15]: /resources/upgrading/
 [16]: https://projectcontour.io/getting-started/#option-3-contour-gateway-provisioner-alpha
 [17]: {{< param github_url>}}/tree/{{< param branch >}}/examples/contour

diff --git a/site/content/docs/1.24/deploy-options.md b/site/content/docs/1.24/deploy-options.md
@@ -361,7 +361,7 @@ $ kubectl delete ns contour-operator
 ```
 
 [1]: #running-without-a-kubernetes-loadbalancer
-[2]: {{< param github_url>}}/tree/{{< param branch >}}/examples/render/contour.yaml
+[2]: {{< param github_url>}}/tree/{{< param branch >}}/examples/render/contour/contour.yaml
 [3]: #host-networking
 [4]: guides/proxy-proto.md
 [5]: https://github.com/kubernetes-up-and-running/kuard
@@ -372,7 +372,7 @@ $ kubectl delete ns contour-operator
 [11]: redeploy-envoy.md
 [12]: https://github.com/projectcontour/contour-operator
 [13]: https://projectcontour.io/resources/deprecation-policy/
-[14]: {{< param github_url>}}/tree/{{< param branch >}}/examples/render/contour-deployment.yaml
+[14]: {{< param github_url>}}/tree/{{< param branch >}}/examples/render/contour/contour-deployment.yaml
 [15]: /resources/upgrading/
 [16]: https://projectcontour.io/getting-started/#option-3-contour-gateway-provisioner-alpha
 [17]: {{< param github_url>}}/tree/{{< param branch >}}/examples/contour

diff --git a/site/content/docs/1.25/deploy-options.md b/site/content/docs/1.25/deploy-options.md
@@ -371,7 +371,7 @@ $ kubectl delete ns contour-operator
 ```
 
 [1]: #running-without-a-kubernetes-loadbalancer
-[2]: {{< param github_url>}}/tree/{{< param branch >}}/examples/render/contour.yaml
+[2]: {{< param github_url>}}/tree/{{< param branch >}}/examples/render/contour/contour.yaml
 [3]: #host-networking
 [4]: guides/proxy-proto.md
 [5]: https://github.com/kubernetes-up-and-running/kuard
@@ -382,7 +382,7 @@ $ kubectl delete ns contour-operator
 [11]: redeploy-envoy.md
 [12]: https://github.com/projectcontour/contour-operator
 [13]: https://projectcontour.io/resources/deprecation-policy/
-[14]: {{< param github_url>}}/tree/{{< param branch >}}/examples/render/contour-deployment.yaml
+[14]: {{< param github_url>}}/tree/{{< param branch >}}/examples/render/contour/contour-deployment.yaml
 [15]: /resources/upgrading/
 [16]: https://projectcontour.io/getting-started/#option-3-contour-gateway-provisioner-alpha
 [17]: {{< param github_url>}}/tree/{{< param branch >}}/examples/contour

diff --git a/site/content/docs/main/deploy-options.md b/site/content/docs/main/deploy-options.md
@@ -364,7 +364,7 @@ $ kubectl delete ns projectcontour
 **Note**: Your namespace may differ from above.
 
 [1]: #running-without-a-kubernetes-loadbalancer
-[2]: {{< param github_url>}}/tree/{{< param branch >}}/examples/render/contour.yaml
+[2]: {{< param github_url>}}/tree/{{< param branch >}}/examples/render/contour/contour.yaml
 [3]: #host-networking
 [4]: guides/proxy-proto.md
 [5]: https://github.com/kubernetes-up-and-running/kuard
@@ -373,9 +373,9 @@ $ kubectl delete ns projectcontour
 [9]: config/fundamentals.md
 [10]: guides/deploy-aws-nlb.md
 [11]: redeploy-envoy.md
-[12]: {{< param github_url>}}/tree/{{< param branch >}}/examples/render/contour-gateway-provisioner.yaml
+[12]: {{< param github_url>}}/tree/{{< param branch >}}/examples/render/contour/contour-gateway-provisioner.yaml
 [13]: https://projectcontour.io/resources/deprecation-policy/
-[14]: {{< param github_url>}}/tree/{{< param branch >}}/examples/render/contour-deployment.yaml
+[14]: {{< param github_url>}}/tree/{{< param branch >}}/examples/render/contour/contour-deployment.yaml
 [15]: /resources/upgrading/
 [16]: https://projectcontour.io/getting-started/#option-3-contour-gateway-provisioner-alpha
 [17]: {{< param github_url>}}/tree/{{< param branch >}}/examples/contour