From 75407a78d5dc5be5d72afb6b827f4a27cb3caea4 Mon Sep 17 00:00:00 2001 From: Sanskar Bhushan Date: Tue, 8 Aug 2023 01:07:57 +0530 Subject: [PATCH] homogenizing kustomize usage in examples/renders folders Signed-off-by: Sanskar Bhushan --- examples/optional-features/kustomization.yaml | 2 +- .../{ => contour-deployment}/contour-deployment.yaml | 0 .../render/contour-deployment/kustomization.yaml | 4 ++++ .../contour-gateway-provisioner.yaml | 0 .../contour-gateway-provisioner/kustomization.yaml | 4 ++++ .../{ => contour-gateway}/contour-gateway.yaml | 0 examples/render/contour-gateway/kustomization.yaml | 4 ++++ examples/render/{ => contour}/contour.yaml | 0 examples/render/{ => contour}/kustomization.yaml | 0 hack/generate-deployment.sh | 4 ++-- hack/generate-gateway-deployment.sh | 2 +- hack/generate-provisioner-deployment.sh | 2 +- hack/release/make-release-tag.sh | 8 ++++---- hack/release/release-notes-template.md | 4 ++-- netlify.toml | 12 ++++++------ site/content/docs/1.20/deploy-options.md | 4 ++-- site/content/docs/1.21/deploy-options.md | 4 ++-- site/content/docs/1.22/deploy-options.md | 4 ++-- site/content/docs/1.23/deploy-options.md | 4 ++-- site/content/docs/1.24/deploy-options.md | 4 ++-- site/content/docs/1.25/deploy-options.md | 4 ++-- site/content/docs/main/deploy-options.md | 6 +++--- 22 files changed, 44 insertions(+), 32 deletions(-) rename examples/render/{ => contour-deployment}/contour-deployment.yaml (100%) create mode 100644 examples/render/contour-deployment/kustomization.yaml rename examples/render/{ => contour-gateway-provisioner}/contour-gateway-provisioner.yaml (100%) create mode 100644 examples/render/contour-gateway-provisioner/kustomization.yaml rename examples/render/{ => contour-gateway}/contour-gateway.yaml (100%) create mode 100644 examples/render/contour-gateway/kustomization.yaml rename examples/render/{ => contour}/contour.yaml (100%) rename examples/render/{ => contour}/kustomization.yaml (100%) diff --git a/examples/optional-features/kustomization.yaml b/examples/optional-features/kustomization.yaml index 52c3603e0f9..dd9e89769ae 100644 --- 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 b/examples/render/contour-deployment/contour-deployment.yaml similarity index 100% rename from examples/render/contour-deployment.yaml rename to examples/render/contour-deployment/contour-deployment.yaml diff --git a/examples/render/contour-deployment/kustomization.yaml b/examples/render/contour-deployment/kustomization.yaml new file mode 100644 index 00000000000..60e94b16ab5 --- /dev/null +++ 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/examples/render/contour-gateway-provisioner.yaml b/examples/render/contour-gateway-provisioner/contour-gateway-provisioner.yaml similarity index 100% rename from examples/render/contour-gateway-provisioner.yaml rename to examples/render/contour-gateway-provisioner/contour-gateway-provisioner.yaml diff --git a/examples/render/contour-gateway-provisioner/kustomization.yaml b/examples/render/contour-gateway-provisioner/kustomization.yaml new file mode 100644 index 00000000000..7b7bd340690 --- /dev/null +++ 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 b/examples/render/contour-gateway/contour-gateway.yaml similarity index 100% rename from examples/render/contour-gateway.yaml rename to examples/render/contour-gateway/contour-gateway.yaml diff --git a/examples/render/contour-gateway/kustomization.yaml b/examples/render/contour-gateway/kustomization.yaml new file mode 100644 index 00000000000..e06ad753fed --- /dev/null +++ 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 b/examples/render/contour/contour.yaml similarity index 100% rename from examples/render/contour.yaml rename to examples/render/contour/contour.yaml diff --git a/examples/render/kustomization.yaml b/examples/render/contour/kustomization.yaml similarity index 100% rename from examples/render/kustomization.yaml rename to examples/render/contour/kustomization.yaml diff --git a/hack/generate-deployment.sh b/hack/generate-deployment.sh index 697c3403dd4..6284051c671 100755 --- 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 index a8d0ae82248..11ea3a21b1f 100755 --- 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 index bc66f3433b5..e6aad6d6ea0 100755 --- 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 index 6d71dfcd554..034dad0d3d4 100755 --- 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" <}}/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 index be73ea1f679..8347db26bf1 100644 --- 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 index 645add6f3a4..cec0b791b89 100644 --- 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 index 11bfd53bff5..372ae4488f2 100644 --- 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 index 212518bfd74..a3465059110 100644 --- 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 index 711e9ffa296..63c031e6f80 100644 --- 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 index 0ae74a53bd9..7103a5c9e39 100644 --- 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