Skip to content

Commit

Permalink
Merge pull request #518 from entando/ENDOC-505
Browse files Browse the repository at this point in the history
ENDOC-505 Fix getting started cluster-resources link
  • Loading branch information
nshaw authored Jun 1, 2022
2 parents d28774c + 58e575f commit 0105e71
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion vuepress/docs/next/docs/consume/custom-resources.md
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ gets deployed. If you already have a Keycloak instance that you want to use, you

### Overview
* Entando Cluster Citizen: [Keycloak](../getting-started/concepts-overview.md#entando-cluster-citizens)
* Custom Resource Definition: [EntandoKeycloakServer](https://github.com/entando-k8s/entando-k8s-custom-model/blob/v7.0.0/src/main/resources/crd/entandokeycloakservers.entando.org.crd.yaml)
* Custom Resource Definition: [EntandoKeycloakServer](https://github.com/entando-k8s/entando-k8s-custom-model/blob/v7.0.1/src/main/resources/crd/entandokeycloakservers.entando.org.crd.yaml)
* Kubernetes Controller Details:
* Docker image: [entando/entando-k8s-keycloak-controller](https://hub.docker.com/r/entando/entando-k8s-keycloak-controller)
* Github Repo: [entando-k8s/entando-k8s-keycloak-controller](https://github.com/entando-k8s/entando-k8s-keycloak-controller)
Expand Down
6 changes: 3 additions & 3 deletions vuepress/docs/next/docs/getting-started/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -167,13 +167,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.0.0/dist/ge-1-1-6/namespace-scoped-deployment/cluster-resources.yaml
sudo kubectl apply -f https://raw.githubusercontent.com/entando/entando-releases/v7.0.1/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.0.0/dist/ge-1-1-6/namespace-scoped-deployment/namespace-resources.yaml
sudo kubectl apply -n entando -f https://raw.githubusercontent.com/entando/entando-releases/v7.0.1/dist/ge-1-1-6/namespace-scoped-deployment/namespace-resources.yaml
```
#### Configure Access to Your Cluster

Expand All @@ -198,7 +198,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.0.0/dist/ge-1-1-6/samples/entando-app.yaml"
curl -sLO "https://raw.githubusercontent.com/entando/entando-releases/v7.0.1/dist/ge-1-1-6/samples/entando-app.yaml"
```

2. Modify `entando-app.yaml` to set the `ingressHostName` to YOUR-HOST-NAME. Examples:
Expand Down
2 changes: 1 addition & 1 deletion vuepress/docs/next/tutorials/devops/entando-operator.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ kubectl get configmap -n entando
## Add a new ConfigMap
If the ConfigMap doesn't already exist, you can use a template as a starting point.
```sh
curl -sfL "https://raw.githubusercontent.com/entando/entando-releases/v7.0.0/dist/ge-1-1-6/samples/entando-operator-config.yaml"
curl -sfL "https://raw.githubusercontent.com/entando/entando-releases/v7.0.1/dist/ge-1-1-6/samples/entando-operator-config.yaml"
```

Edit `entando-operator-config.yaml` to adjust existing settings or add new ones. You can then apply it to Kubernetes.
Expand Down
4 changes: 2 additions & 2 deletions vuepress/docs/next/tutorials/solution/entando-hub.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ ent ecr deploy --repo="https://github.com/entando-samples/entando-hub-content-bu
## Configuration

::: tip
(New with Entando 7.0.0) Any Hub instance can be accessed from the Entando App Builder of another Entando Application. Configure the App Builder to access the desired Hub instance via the endpoint `BASEURL/entando-hub-api/appbuilder/api`, where the BASEURL is the URL for the Entando Application.
(New with Entando 7.0) Any Hub instance can be accessed from the Entando App Builder of another Entando Application. Configure the App Builder to access the desired Hub instance via the endpoint `BASEURL/entando-hub-api/appbuilder/api`, where the BASEURL is the URL for the Entando Application.
:::

## Using the Hub
Expand Down Expand Up @@ -139,7 +139,7 @@ The Hub includes the following key components:
### Microservices
A single Spring Boot microservice provides two REST endpoints:
- The first is a backend-for-a-frontend (BFF) service for the Hub UI and contains the various entity APIs.
- The second provides methods that support the Entando App Builder integration (7.0.0+).
- The second provides methods that support the Entando App Builder integration (7.0+).

### Content
The Hub content bundle (`entando-hub`) includes a custom template and a page preconfigured with the main Hub micro frontends.
Expand Down
2 changes: 1 addition & 1 deletion vuepress/docs/v7.0/docs/consume/custom-resources.md
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ gets deployed. If you already have a Keycloak instance that you want to use, you

### Overview
* Entando Cluster Citizen: [Keycloak](../getting-started/concepts-overview.md#entando-cluster-citizens)
* Custom Resource Definition: [EntandoKeycloakServer](https://github.com/entando-k8s/entando-k8s-custom-model/blob/v7.0.0/src/main/resources/crd/entandokeycloakservers.entando.org.crd.yaml)
* Custom Resource Definition: [EntandoKeycloakServer](https://github.com/entando-k8s/entando-k8s-custom-model/blob/v7.0.1/src/main/resources/crd/entandokeycloakservers.entando.org.crd.yaml)
* Kubernetes Controller Details:
* Docker image: [entando/entando-k8s-keycloak-controller](https://hub.docker.com/r/entando/entando-k8s-keycloak-controller)
* Github Repo: [entando-k8s/entando-k8s-keycloak-controller](https://github.com/entando-k8s/entando-k8s-keycloak-controller)
Expand Down
6 changes: 3 additions & 3 deletions vuepress/docs/v7.0/docs/getting-started/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -167,13 +167,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.0.0/dist/ge-1-1-6/namespace-scoped-deployment/cluster-resources.yaml
sudo kubectl apply -f https://raw.githubusercontent.com/entando/entando-releases/v7.0.1/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.0.0/dist/ge-1-1-6/namespace-scoped-deployment/namespace-resources.yaml
sudo kubectl apply -n entando -f https://raw.githubusercontent.com/entando/entando-releases/v7.0.1/dist/ge-1-1-6/namespace-scoped-deployment/namespace-resources.yaml
```
#### Configure Access to Your Cluster

Expand All @@ -198,7 +198,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.0.0/dist/ge-1-1-6/samples/entando-app.yaml"
curl -sLO "https://raw.githubusercontent.com/entando/entando-releases/v7.0.1/dist/ge-1-1-6/samples/entando-app.yaml"
```

2. Modify `entando-app.yaml` to set the `ingressHostName` to YOUR-HOST-NAME. Examples:
Expand Down
2 changes: 1 addition & 1 deletion vuepress/docs/v7.0/tutorials/devops/entando-operator.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ kubectl get configmap -n entando
## Add a new ConfigMap
If the ConfigMap doesn't already exist, you can use a template as a starting point.
```sh
curl -sfL "https://raw.githubusercontent.com/entando/entando-releases/v7.0.0/dist/ge-1-1-6/samples/entando-operator-config.yaml"
curl -sfL "https://raw.githubusercontent.com/entando/entando-releases/v7.0.1/dist/ge-1-1-6/samples/entando-operator-config.yaml"
```

Edit `entando-operator-config.yaml` to adjust existing settings or add new ones. You can then apply it to Kubernetes.
Expand Down
4 changes: 2 additions & 2 deletions vuepress/docs/v7.0/tutorials/solution/entando-hub.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ ent ecr deploy --repo="https://github.com/entando-samples/entando-hub-content-bu
## Configuration

::: tip
(New with Entando 7.0.0) Any Hub instance can be accessed from the Entando App Builder of another Entando Application. Configure the App Builder to access the desired Hub instance via the endpoint `BASEURL/entando-hub-api/appbuilder/api`, where the BASEURL is the URL for the Entando Application.
(New with Entando 7.0) Any Hub instance can be accessed from the Entando App Builder of another Entando Application. Configure the App Builder to access the desired Hub instance via the endpoint `BASEURL/entando-hub-api/appbuilder/api`, where the BASEURL is the URL for the Entando Application.
:::

## Using the Hub
Expand Down Expand Up @@ -139,7 +139,7 @@ The Hub includes the following key components:
### Microservices
A single Spring Boot microservice provides two REST endpoints:
- The first is a backend-for-a-frontend (BFF) service for the Hub UI and contains the various entity APIs.
- The second provides methods that support the Entando App Builder integration (7.0.0+).
- The second provides methods that support the Entando App Builder integration (7.0+).

### Content
The Hub content bundle (`entando-hub`) includes a custom template and a page preconfigured with the main Hub micro frontends.
Expand Down

0 comments on commit 0105e71

Please sign in to comment.