diff --git a/v3/admin/platforms/eks/index.html b/v3/admin/platforms/eks/index.html index 4559d2e1fe6..4f41ee4a151 100644 --- a/v3/admin/platforms/eks/index.html +++ b/v3/admin/platforms/eks/index.html @@ -1490,16 +1490,10 @@

Amazon


EKS + Terraform + Vault/ASM + Github

@@ -1536,13 +1530,14 @@

EKS + Terraform + Vault/ASM + GithubYou should use a dedicated git user account for the Bot user. Jenkins X will use this user to interact with git. After you are logged in with the Bot user account you may use the following link Create Git Token for the Bot user

  • -

    Override the variable defaults in the Infrastructure repository. (E.g, edit variables.tf, set TFVAR environment variables, or pass the values on the terraform command line.)

    +

    Override the input defaults in the Infrastructure repository. (E.g, edit variables.tf, set TFVAR environment variables, or pass the values on the terraform command line.)

    +

    If you want to use AWS secrets manager instead of vault you should also set the following inputs use_asm to true.

  • commit and push any changes to your Infrastructure git repository:

    @@ -1563,7 +1558,7 @@

    EKS + Terraform + Vault/ASM + Github
    • Tail the Jenkins X installation logs
    -
      $(terraform output follow_install_logs)
    +
      jx admin log
     
    • Once finished you can now move into the Jenkins X Developer namespace
    @@ -1653,7 +1648,7 @@
    diff --git a/v3/admin/platforms/index.xml b/v3/admin/platforms/index.xml index 8184adf8b16..9a2956e7309 100644 --- a/v3/admin/platforms/index.xml +++ b/v3/admin/platforms/index.xml @@ -32,16 +32,10 @@ <ul> <li>Ensure you are logged into GitHub else you will get a 404 error when clicking the links below</li> <li>The quickstart guides are for users who want to get up and running quickly with Jenkins X. -Refer to the <a href="https://github.com/jenkins-x/terraform-aws-eks-jx/blob/master/README.md">eks-jx terraform module readme</a> for all the variables that can be customized. -<ul> -<li>Refer to this <a href="https://jenkins-x.io/v3/admin/setup/secrets/vault/#external-vault">page</a> for setting up Jenkins X v3 with external/existing vault.</li> -<li>For installing Jenkins X in an existing EKS cluster, refer to this <a href="https://github.com/jenkins-x/terraform-aws-eks-jx#existing-eks-cluster">section</a>.</li> -<li>To use AWS secrets manager instead of vault, refer to this <a href="https://github.com/jenkins-x/terraform-aws-eks-jx#secrets-management">section</a></li> -</ul> -</li> +Refer to the <a href="https://github.com/jenkins-x/terraform-aws-eks-jx/blob/master/README.md">eks-jx terraform module readme</a> for all the inputs that can be customized.</li> <li>Always use the latest module version for the eks-jx module. The list of versions can be found <a href="https://github.com/jenkins-x/terraform-aws-eks-jx/releases">here.</a></li> -<li>Do not specify the last digit of the kubernetes version, so if you want to provision an EKS cluster with kubernetes <code>1.21.5</code>, just specify <code>1.21</code>. See <a href="https://github.com/jx3-gitops-repositories/jx3-terraform-eks/issues/26#issuecomment-936055015">this issue</a> for more details.</li> +<li>Do not specify the last digit of the kubernetes version, so if you want to provision an EKS cluster with kubernetes <code>1.30.1</code>, just specify <code>1.30</code>.</li> </ul> <hr> <h3 id="eks--terraform--vaultasm--github">EKS + Terraform + Vault/ASM + Github</h3> @@ -78,13 +72,14 @@ The list of versions can be found <a href="https://github.com/jenkins-x/t <p>You should use a dedicated git user account for the Bot user. Jenkins X will use this user to interact with git. After you are logged in with the Bot user account you may use the following link <a href="https://github.com/settings/tokens/new?scopes=repo,read:user,read:org,user:email,admin:repo_hook,write:packages,read:packages,write:discussion,workflow" target="github-token" class="btn bg-primary text-light">Create Git Token for the Bot user </a></p> </li> <li> -<p>Override the variable defaults in the Infrastructure repository. (E.g, edit variables.tf, set TF<em>VAR</em> environment variables, or pass the values on the terraform command line.)</p> +<p>Override the input defaults in the Infrastructure repository. (E.g, edit variables.tf, set TF<em>VAR</em> environment variables, or pass the values on the terraform command line.)</p> <ul> -<li>cluster_version: Kubernetes version for the EKS cluster. (should be 1.20 at the moment)</li> -<li>region: AWS region code for the AWS region to create the cluster in.</li> -<li>jx_git_url: URL of the Cluster repository.</li> -<li>jx_bot_username: The username of the git bot user</li> +<li><code>cluster_version</code>: Kubernetes version for the EKS cluster. (should be 1.20 at the moment)</li> +<li><code>region</code>: AWS region code for the AWS region to create the cluster in.</li> +<li><code>jx_git_url</code>: URL of the Cluster repository.</li> +<li><code>jx_bot_username</code>: The username of the git bot user</li> </ul> +<p>If you want to use AWS secrets manager instead of vault you should also set the following inputs <code>use_asm</code> to true.</p> </li> <li> <p>commit and push any changes to your Infrastructure git repository:</p> @@ -105,7 +100,7 @@ The list of versions can be found <a href="https://github.com/jenkins-x/t </span></span></code></pre></div><ul> <li>Tail the Jenkins X installation logs</li> </ul> -<div class="highlight"><pre tabindex="0" style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-bash" data-lang="bash"><span style="display:flex;"><span> <span style="color:#66d9ef">$(</span>terraform output follow_install_logs<span style="color:#66d9ef">)</span> +<div class="highlight"><pre tabindex="0" style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-bash" data-lang="bash"><span style="display:flex;"><span> jx admin log </span></span></code></pre></div><ul> <li>Once finished you can now move into the Jenkins X Developer namespace</li> </ul>