From cf61f5e15b7901c9dd6c9cc50b144eabb1954b3b Mon Sep 17 00:00:00 2001 From: Nathan Shaw Date: Wed, 31 Aug 2022 21:06:43 -0400 Subject: [PATCH] ENDOC-557 Apply EntandoCode component to local, Amazon, and Google install guides. --- .../docs/next/docs/getting-started/README.md | 16 +++++-------- .../tutorials/getting-started/eks-install.md | 23 +++++++++--------- .../tutorials/getting-started/gke-install.md | 24 +++++++++---------- 3 files changed, 29 insertions(+), 34 deletions(-) diff --git a/vuepress/docs/next/docs/getting-started/README.md b/vuepress/docs/next/docs/getting-started/README.md index b8154e8efb..a7ad520ec7 100644 --- a/vuepress/docs/next/docs/getting-started/README.md +++ b/vuepress/docs/next/docs/getting-started/README.md @@ -7,7 +7,7 @@ sidebarDepth: 2 ::: warning -If you have a MacBook with an M1 chip, please see our alternative [install guides](../../tutorials/#operations). Entando 7 is not currently compatible with an ARM64-based architecture. +If you have a MacBook with an M1 or M2 chip, please see our alternative [install guides](../../tutorials/#operations). Entando 7 is not currently compatible with an ARM64-based architecture. ::: You can set up Entando in two simple steps or install it manually to meet your specific needs. @@ -164,15 +164,13 @@ From your Ubuntu shell 1. Install the cluster-scoped custom resource definitions (CRDs) -``` shell -sudo kubectl apply -f https://raw.githubusercontent.com/entando/entando-releases/v7.1.0/dist/ge-1-1-6/namespace-scoped-deployment/cluster-resources.yaml -``` +kubectl apply -f https://raw.githubusercontent.com/entando/entando-releases/{{ $site.themeConfig.entando.fixpack.v71 }}/dist/ge-1-1-6/namespace-scoped-deployment/cluster-resources.yaml + 2. Install the namespace-scoped custom resources -``` shell -sudo kubectl apply -n entando -f https://raw.githubusercontent.com/entando/entando-releases/v7.1.0/dist/ge-1-1-6/namespace-scoped-deployment/namespace-resources.yaml -``` +kubectl apply -n entando -f https://raw.githubusercontent.com/entando/entando-releases/{{ $site.themeConfig.entando.fixpack.v71 }}/dist/ge-1-1-6/namespace-scoped-deployment/namespace-resources.yaml + #### Configure Access to Your Cluster ::: tip What about Networking? @@ -195,9 +193,7 @@ Now that you've determined YOUR-HOST-NAME, use it to configure the Entando Appli 1. Download the template `entando-app.yaml`. -``` -curl -sLO "https://raw.githubusercontent.com/entando/entando-releases/v7.1.0/dist/ge-1-1-6/samples/entando-app.yaml" -``` +curl -sLO "https://raw.githubusercontent.com/entando/entando-releases/{{ $site.themeConfig.entando.fixpack.v71 }}/dist/ge-1-1-6/samples/entando-app.yaml" 2. Modify `entando-app.yaml` to set the `ingressHostName` to YOUR-HOST-NAME. Examples: - `ingressHostName`: quickstart.mshome.net diff --git a/vuepress/docs/next/tutorials/getting-started/eks-install.md b/vuepress/docs/next/tutorials/getting-started/eks-install.md index c6df95f74f..b01258c548 100644 --- a/vuepress/docs/next/tutorials/getting-started/eks-install.md +++ b/vuepress/docs/next/tutorials/getting-started/eks-install.md @@ -137,18 +137,18 @@ See the [NGINX AWS Guide](https://kubernetes.github.io/ingress-nginx/deploy/#aws ### Install the Entando Custom Resources 1. Apply the cluster-scoped custom resource definitions (CRDs). This is required only once per cluster. -```sh -kubectl apply -f https://raw.githubusercontent.com/entando/entando-releases/v7.1.0/dist/ge-1-1-6/namespace-scoped-deployment/cluster-resources.yaml -``` + +kubectl apply -f https://raw.githubusercontent.com/entando/entando-releases/{{ $site.themeConfig.entando.fixpack.v71 }}/dist/ge-1-1-6/namespace-scoped-deployment/cluster-resources.yaml + 2. Create the namespace for the Entando Application ```sh kubectl create namespace entando ``` 3. Download the `entando-operator-config` template so you can configure the [Entando Operator](../devops/entando-operator.md). -```sh -curl -sLO "https://raw.githubusercontent.com/entando/entando-releases/v7.1.0/dist/ge-1-1-6/samples/entando-operator-config.yaml" -``` + +curl -sLO "https://raw.githubusercontent.com/entando/entando-releases/{{ $site.themeConfig.entando.fixpack.v71 }}/dist/ge-1-1-6/samples/entando-operator-config.yaml" + 4. Edit the `entando-operator-config.yaml` to set `data/entando.requires.filesystem.group.override: "true"` ```yaml data: @@ -162,9 +162,9 @@ kubectl apply -f entando-operator-config.yaml -n entando ``` 6. Apply the namespace-scoped custom resources -```sh -kubectl apply -n entando -f https://raw.githubusercontent.com/entando/entando-releases/v7.1.0/dist/ge-1-1-6/namespace-scoped-deployment/namespace-resources.yaml -``` + +kubectl apply -n entando -f https://raw.githubusercontent.com/entando/entando-releases/{{ $site.themeConfig.entando.fixpack.v71 }}/dist/ge-1-1-6/namespace-scoped-deployment/namespace-resources.yaml + 7. You can use `kubectl get pods -n entando --watch` to see the initial pods start up. Use `Ctrl+C` to exit. ``` $ kubectl get pods -n entando @@ -175,9 +175,8 @@ entando-operator-5b5465788b-ghb25 1/1 Running 0 5m53s ### Configure the Entando Application 1. Download the `entando-app.yaml` template -```sh -curl -sLO "https://raw.githubusercontent.com/entando/entando-releases/v7.1.0/dist/ge-1-1-6/samples/entando-app.yaml" -``` + +curl -sLO "https://raw.githubusercontent.com/entando/entando-releases/{{ $site.themeConfig.entando.fixpack.v71 }}/dist/ge-1-1-6/samples/entando-app.yaml" 2. Edit `entando-app.yaml` and replace YOUR-HOST-NAME with the NGINX address from above. See the [Custom Resources overview](../../docs/consume/entandoapp-cr.md) for details on other `EntandoApp` options. ```yaml diff --git a/vuepress/docs/next/tutorials/getting-started/gke-install.md b/vuepress/docs/next/tutorials/getting-started/gke-install.md index edded29e94..f46d31097a 100644 --- a/vuepress/docs/next/tutorials/getting-started/gke-install.md +++ b/vuepress/docs/next/tutorials/getting-started/gke-install.md @@ -69,17 +69,18 @@ NGINX is working correctly if a `404 Not Found` NGINX error page is generated wh ### Install the Entando Custom Resources 1. Download and apply the custom resource definitions (CRDs) to the cluster. This must be done once per cluster. -```sh -kubectl apply -f https://raw.githubusercontent.com/entando/entando-releases/v7.1.0/dist/ge-1-1-6/namespace-scoped-deployment/cluster-resources.yaml -``` + +kubectl apply -f https://raw.githubusercontent.com/entando/entando-releases/{{ $site.themeConfig.entando.fixpack.v71 }}/dist/ge-1-1-6/namespace-scoped-deployment/cluster-resources.yaml + + 2. Create a namespace for the Entando Application. If you choose a name other than "entando," update the following commands wherever a namespace is provided. ```sh kubectl create namespace entando ``` 3. Download the `entando-operator-config` template to configure the [Entando Operator](../devops/entando-operator.md) -```sh -curl -sLO "https://raw.githubusercontent.com/entando/entando-releases/v7.1.0/dist/ge-1-1-6/samples/entando-operator-config.yaml" -``` + +curl -sLO "https://raw.githubusercontent.com/entando/entando-releases/{{ $site.themeConfig.entando.fixpack.v71 }}/dist/ge-1-1-6/samples/entando-operator-config.yaml" + 4. Edit the `entando-operator-config.yaml` to add two properties ```yaml data: @@ -91,9 +92,9 @@ data: kubectl apply -f entando-operator-config.yaml -n entando ```` 6. Install the namespace-scoped resources -```sh -kubectl apply -n entando -f https://raw.githubusercontent.com/entando/entando-releases/v7.1.0/dist/ge-1-1-6/namespace-scoped-deployment/namespace-resources.yaml -``` + +kubectl apply -n entando -f https://raw.githubusercontent.com/entando/entando-releases/{{ $site.themeConfig.entando.fixpack.v71 }}/dist/ge-1-1-6/namespace-scoped-deployment/namespace-resources.yaml + 7. Use `kubectl get pods -n entando --watch` to observe the base pods initialize. Exit this command via `Ctrl+C`. ```sh $ kubectl get pods -n entando @@ -104,9 +105,8 @@ entando-operator-5b5465788b-ghb25 1/1 Running 0 95s ### Configure the Entando Application 1. Download the `entando-app.yaml` template -```sh -curl -sLO "https://raw.githubusercontent.com/entando/entando-releases/v7.1.0/dist/ge-1-1-6/samples/entando-app.yaml" -``` + +curl -sLO "https://raw.githubusercontent.com/entando/entando-releases/{{ $site.themeConfig.entando.fixpack.v71 }}/dist/ge-1-1-6/samples/entando-app.yaml" 2. Edit `entando-app.yaml`. Replace `YOUR-HOST-NAME` with `EXTERNAL-IP` + `.nip.io`. See [the EntandoApp custom resource overview](../../docs/consume/entandoapp-cr.md) for additional options. ```yaml