Skip to content

Commit 2693d1d

Browse files
committed
fixes for installation guide from Jennings
1 parent 0bb7980 commit 2693d1d

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

jekyll/_cci2/server-3-install-build-services.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Once completed you will be able to update your CircleCI server configuration so
4343

4444
==== Cluster Creation with Terraform
4545

46-
CircleCI curates Terraform modules to help install Nomad clients in your cloud provider of choice. You can browse the modules in our link:https://circleci.com/docs/2.0/server-3-overview[public repository] including example Terraform config files (man.tf) for both AWS and GKEs for `main.tf`. Some information about your cluster and server installation is required to complete your `main.tf`. How to get this information is described in the following sections.
46+
CircleCI curates Terraform modules to help install Nomad clients in your cloud provider of choice. You can browse the modules in our link:https://github.com/CircleCI-Public/server-terraform[public repository] including example Terraform config files (man.tf) for both AWS and GKEs for `main.tf`. Some information about your cluster and server installation is required to complete your `main.tf`. How to get this information is described in the following sections.
4747

4848
===== AWS
4949
You will need some information about your cluster and server installation to complete the required fields for the terraform configuration file (`main.tf`). A full example as well as a full list of variables can be found link:https://github.com/CircleCI-Public/server-terraform/tree/main/nomad-aws[here].

jekyll/_cci2/server-3-install.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ NOTE: Once you have created your namespace we recommend setting your `kubectl` c
5151
If you wish to install CircleCI server behind a proxy, the following command structure should be used (for more information see the KOTS docs https://kots.io/kotsadm/installing/online-install/#proxies[here]):
5252

5353
```bash
54-
kubectl kots install circleci-server --http-proxy <http-proxy-uri> --https-proxy <https-proxy> --no-proxy <no proxy list>
54+
kubectl kots install circleci-server --http-proxy <YOUR_HTTP_PROXY_URI> --https-proxy <https-proxy> --no-proxy <YOUR_NO_PROXY_LIST>
5555
```
5656

5757
The load balancer endpoints must be added to the no-proxy list for the following services: `output processor` and `vm-service`. This is because the no-proxy list is shared between the application and build-agent. The application and build-agent are assumed to be behind the same firewall and therefore cannot have a proxy between them.
@@ -162,12 +162,12 @@ Once you have completed the fields detailed above it is time to deploy. The depl
162162
NOTE: In this first stage we skipped a lot of fields in the config. Not to worry. We will revisit those in the next stages of installation.
163163

164164
==== Create DNS Entry
165-
Create a DNS entry for your Traefik load balancer, i.e. circleci.your.domain.com and app.circleci.your.domain.com. The DNS entry should align with the DNS names used when creating your TLS certificate and Github OAuth app during the prerequisites steps. All traffic will be routed through this DNS record.
165+
Create a DNS entry for your Traefik load balancer, for example, `circleci.your.domain.com` and `app.circleci.your.domain.com`. The DNS entry should align with the DNS names used when creating your TLS certificate and GitHub OAuth app during the prerequisites steps. All traffic will be routed through this DNS record.
166166

167167
You will need the IP address of the Traefik load balancer. You can find it with the following terminal command:
168168

169169
----
170-
kubectl get service circleci-server-traefik --namespace=nfish-circleci-server
170+
kubectl get service circleci-server-traefik --namespace=<YOUR_CIRCLECI_INSTALLATION_NAMESPACE>
171171
----
172172

173173
For more information on adding a new DNS record, see the following documentation:
@@ -181,7 +181,7 @@ For more information on adding a new DNS record, see the following documentation
181181
You should now be able to navigate to your CircleCI server installation and log in to the application successfully. Now let’s move on to build services. It may take a while for all your services to be up. You can periodically check by running the following command (you are looking for the “frontend” pod to be status of running and ready should show 1/1):
182182

183183
----
184-
kubectl get pods -n <<circleci installation namespace>>
184+
kubectl get pods -n <YOUR_CIRCLECI_INSTALLATION_NAMESPACE>
185185
----
186186

187187
## What to read next

0 commit comments

Comments
 (0)