Skip to content

Commit 4394fec

Browse files
authored
Merge pull request #9803 from circleci/DOCSS-1981-server-4.8-ref-fix
[DOCSS-1981] Updated Server 4.8 version info
2 parents 22849ed + eaf92b2 commit 4394fec

File tree

2 files changed

+49
-48
lines changed

2 files changed

+49
-48
lines changed

docs/server-admin-4.8/modules/ROOT/partials/installation/phase-2.adoc

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,12 @@ kubectl -n <namespace> create secret docker-registry regcred \
6565
[#create-helm-values]
6666
== 3. Create Helm values
6767

68-
Before installing CircleCI, it is recommended to create a new `values.yaml` file unique to your installation. xref:server-admin:installation:installation-reference.adoc#example-manifests[The Installation Reference section] contains some example `values.yaml` files that are a good place to start. The following describes the minimum required values to include in `values.yaml`. Additional customizations are available, see the provided `values.yaml` for all available options.
68+
Before installing CircleCI, it is recommended to create a new `values.yaml` file unique to your installation. xref:server-admin:installation:installation-reference.adoc#example-manifests[The Installation Reference Section] contains some example `values.yaml` files that are a good place to start. The following describes the minimum required values to include in `values.yaml`. Additional customizations are available, see the provided `values.yaml` for all available options.
6969

7070
For sensitive data there are two options:
7171

72-
* Add into the `values.yaml` file
73-
* Add them as Kubernetes Secrets directly
72+
* Add into the `values.yaml` file.
73+
* Add them as Kubernetes Secrets directly.
7474
7575
This flexibility allows you to manage Kubernetes Secrets using whichever process you prefer. Whichever option you choose, this sensitive information is stored as a Kubernetes Secret within CircleCI.
7676

@@ -79,7 +79,7 @@ NOTE: During the installation process, you may use the following command to gene
7979
[#api-token]
8080
=== a. API token
8181
82-
The application requires a Kubernetes Secret containing an API token. This API token is used to facilitate internal API communication to api-service. Use a random string and store it securely. CircleCI will not be able to recover this value if lost. There are two options depending on whether you want to create the Kubernetes Secret, or if you want CircleCI to create it for you.
82+
The application requires a Kubernetes Secret containing an API token. This API token is used to facilitate internal API communication to the API service. Use a random string and store it securely. CircleCI will not be able to recover this value if lost. You have two options depending on whether you want to create the Kubernetes Secret, or if you want CircleCI to create it for you.
8383
8484
[tabs]
8585
====
@@ -107,15 +107,15 @@ CircleCI creates Secret::
107107
--
108108
**Option 2:** CircleCI creates the Kubernetes Secret for you.
109109

110-
CircleCI will create the Kubernetes Secret "api-token" automatically.
110+
CircleCI will create the Kubernetes Secret `api-token` automatically.
111111

112112
--
113113
====
114114

115115
[#session-cookie]
116116
=== b. Session cookie
117117

118-
The application requires a session cookie key Kubernetes Secret, which CircleCI uses to sign session cookies. The Secret must be exactly 16 characters long. Use a random string and store it securely. CircleCI will not be able to recover this value if lost. There are two options depending on whether you want to create the Kubernetes Secret, or if you want CircleCI to create it for you.
118+
The application requires a session cookie key Kubernetes Secret, which CircleCI uses to sign session cookies. The Secret must be exactly 16 characters long. Use a random string and store it securely. CircleCI will not be able to recover this value if lost. You have two options depending on whether you want to create the Kubernetes Secret, or if you want CircleCI to create it for you.
119119

120120
[tabs]
121121
====
@@ -151,7 +151,7 @@ CircleCI will create the Kubernetes Secret "session-cookie" automatically.
151151
[#encryption]
152152
=== c. Encryption
153153

154-
The application requires a Kubernetes Secret containing signing and encryption keysets. These keysets are used to encrypt and sign artifacts generated by CircleCI. These keys were created during the prerequisites phase (xref:server-admin:installation:phase-1-gcp-prerequisites.adoc#encryption-signing-keys[GCP prerequisites], xref:server-admin:installation:phase-1-aws-prerequisites.adoc#encryption-signing-keys[AWS prerequisites]). CircleCI will not be able to recover the values if lost. Depending on how you prefer to manage Kubernetes Secrets, there are two options.
154+
The application requires a Kubernetes Secret containing signing and encryption keysets. These keysets are used to encrypt and sign artifacts generated by CircleCI. These keys were created during the prerequisites phase (xref:server-admin:installation:phase-1-gcp-prerequisites.adoc#encryption-signing-keys[GCP Prerequisites], xref:server-admin:installation:phase-1-aws-prerequisites.adoc#encryption-signing-keys[AWS Prerequisites]). CircleCI will not be able to recover the values if lost. Depending on how you prefer to manage Kubernetes Secrets, you have two options.
155155

156156
[tabs]
157157
====
@@ -188,7 +188,7 @@ keyset:
188188

189189
[#postgres-credentials]
190190
==== i. Credentials
191-
The application requires a Kubernetes Secret containing PostgreSQL credentials. This is true when using either the internal (default) or an externally hosted instance of PostgreSQL. CircleCI will not be able to recover the values if lost. Based on how you prefer to manage Kubernetes Secrets there are two options.
191+
The application requires a Kubernetes Secret containing PostgreSQL credentials. This requirement applies when using either the internal (default) or an externally hosted instance of PostgreSQL. CircleCI will not be able to recover the values if lost. Based on how you prefer to manage Kubernetes Secrets you have two options.
192192

193193
[tabs]
194194
====
@@ -264,7 +264,7 @@ postgresql:
264264

265265
=== e. MongoDB credentials
266266

267-
The application requires a Kubernetes Secret containing MongoDB credentials. This is true when using either the internal (default) or an externally hosted instance of MongoDB. CircleCI will not be able to recover the values if lost. Based on how you prefer to manage Kubernetes Secrets there are two options.
267+
The application requires a Kubernetes Secret containing MongoDB credentials. This requirement applies when using either the internal (default) or an externally hosted instance of MongoDB. CircleCI will not be able to recover the values if lost. Based on how you prefer to manage Kubernetes Secrets you have two options.
268268

269269
[tabs]
270270
====
@@ -479,7 +479,7 @@ Lets Encrypt::
479479
--
480480
*Let's Encrypt*
481481
482-
https://letsencrypt.org/[Let's Encrypt] will request and manage certificates for you. This is a good option when the load balancer is publicly accessible. The following snippet (using your own email) can be added to `values.yaml`:
482+
https://letsencrypt.org/[Let's Encrypt] will request and manage certificates for you. Let's Encrypt is a good option when the load balancer is publicly accessible. The following snippet (using your own email) can be added to `values.yaml`:
483483
484484
[source,yaml]
485485
----
@@ -649,11 +649,11 @@ github:
649649
=== l. Object storage
650650

651651
ifndef::env-gcp[]
652-
Regardless of your storage provider, the bucket name you xref:server-admin:installation:phase-1-aws-prerequisites.adoc#object-storage-and-permissions[created during the prerequisites phase] will need to be included.
652+
Regardless of your storage provider, the bucket name you xref:server-admin:installation:phase-1-aws-prerequisites.adoc#object-storage-and-permissions[Created During the Prerequisites Phase] will need to be included.
653653
endif::env-gcp[]
654654

655655
ifndef::env-aws[]
656-
Regardless of your storage provider, the bucket name you xref:server-admin:installation:phase-1-gcp-prerequisites.adoc#object-storage-and-permissions[created during the prerequisites phase] will need to be included.
656+
Regardless of your storage provider, the bucket name you xref:server-admin:installation:phase-1-gcp-prerequisites.adoc#object-storage-and-permissions[Created During the Prerequisites Phase] will need to be included.
657657
endif::env-aws[]
658658

659659
[source,yaml]
@@ -719,7 +719,7 @@ object_storage:
719719
----
720720
721721
**Disable Presigned Mode (Optional)**
722-
If you wish to store artifacts larger than 5GB, you will need to xref:installation:phase-1-aws-prerequisites.adoc#s3-storage[update your trust policy for your IRSA role]. Then disable presigned mode by adding the following to the `object_storage.s3` section:
722+
If you wish to store artifacts larger than 5GB, you will need to xref:installation:phase-1-aws-prerequisites.adoc#s3-storage[Update Your Trust Policy for Your IRSA Role]. Then disable presigned mode by adding the following to the `object_storage.s3` section:
723723
724724
[source,yaml]
725725
----
@@ -814,11 +814,11 @@ kubectl -n <namespace> create secret generic object-storage-secret \
814814
endif::env-aws[]
815815

816816
=== m. Installing behind a proxy
817-
Depending on your security requirements, you might want to install CircleCI server behind a proxy. Installing behind a proxy gives you the power to monitor and control access between your installation and the broader Internet. For further information including limitations of installation behind a proxy, see the xref:server-admin:installation:installing-server-behind-a-proxy.adoc#[Installing server behind a proxy] guide.
817+
Depending on your security requirements, you might want to install CircleCI server behind a proxy. Installing behind a proxy gives you the power to monitor and control access between your installation and the broader Internet. For further information including limitations of installation behind a proxy, see the xref:server-admin:installation:installing-server-behind-a-proxy.adoc#[Installing Server Behind a Proxy] guide.
818818

819819
The following fields need to be configured in your `values.yaml`:
820820

821-
* Toggle `proxy.enabled` to `"1"`
821+
* Toggle `proxy.enabled` to `"1"`.
822822
* Enter details for `proxy.http.host` and `proxy.https.host`, along with their associated ports. These values can be the same but they both need to be configured.
823823
* For authentication you will need to configure `proxy.http.auth.enabled` and `proxy.https.auth.enabled` as `"1"`. You will also need to configure the respective username and password for both HTTP and HTTPS.
824824
* configure the `no_proxy` hosts and subnets. This should include localhost, your GitHub Enterprise host (optional), the hostname of your CircleCI installation (see xref:server-admin:installation:installing-server-behind-a-proxy.adoc#known-limitations[Known Limitations] for an explanation), and the CIDR of Nomad.
@@ -920,13 +920,13 @@ WARNING: If your Tink keyset is somehow lost, you will need to generate a new ke
920920

921921
=== o. Setting up OIDC (optional)
922922

923-
CircleCI server optionally supports xref:guides:permissions-authentication:openid-connect-tokens.adoc#[OpenID Connect (OIDC) tokens] in jobs.
923+
CircleCI server optionally supports xref:guides:permissions-authentication:openid-connect-tokens.adoc#[Using OpenID Connect Tokens in Jobs] in jobs.
924924

925925
This feature is not enabled by default and requires a few additional steps to set up, as follows:
926926

927927
. Generate a https://mkjwk.org/[JSON Web Key (JWK)] using the default parameters and copy the `Public and Private Keypair Set` to a secure and convenient location (for example, `~/oidc-service-jwk.json`). This key pair will be used by `oidc-service` to sign the OIDC tokens used in jobs.
928928

929-
. The JWK will need to be base64 encoded without line wrapping before using it on server:
929+
. The JWK will need to be base64 encoded without line wrapping before using it on server.
930930
** On Linux:
931931
+
932932
[source,shell]
@@ -962,7 +962,7 @@ USERNAME=<provided-username>
962962
PASSWORD=<token>
963963
namespace=<your-namespace>
964964
helm registry login cciserver.azurecr.io/circleci-server -u $USERNAME -p $PASSWORD
965-
helm install circleci-server oci://cciserver.azurecr.io/circleci-server -n $namespace --version {serverversion47} -f <path-to-values.yaml>
965+
helm install circleci-server oci://cciserver.azurecr.io/circleci-server -n $namespace --version {serverversion48} -f <path-to-values.yaml>
966966
----
967967

968968
[#create-dns-entry]

0 commit comments

Comments
 (0)