-
Notifications
You must be signed in to change notification settings - Fork 43
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
especially remove cloud vault resources for vault that are not used anymore in jx3 vault configuration also fixing link to documentation BREAKING CHANGE: Don't upgrade to this version if you still use this module with Jenkins X 2. It would break things badly.
- Loading branch information
Showing
67 changed files
with
122 additions
and
1,342 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,29 @@ | ||
| provider "aws" { | ||
| region = var.region | ||
| profile = var.profile | ||
| } | ||
|
|
||
|
|
||
| module "eks-jx" { | ||
| source = "jenkins-x/eks-jx/aws" | ||
| vault_user = var.vault_user | ||
| source = "../../" | ||
| install_kuberhealthy = true | ||
| create_nginx = true | ||
| cluster_version = "1.21" | ||
| nginx_chart_version = "3.12.0" | ||
| enable_worker_groups_launch_template = true | ||
| volume_type = "gp3" | ||
| volume_size = "100" | ||
| encrypt_volume_self = true | ||
| boot_secrets = [ | ||
| { | ||
| name = "jxBootJobEnvVarSecrets.EXTERNAL_VAULT" | ||
| value = "true" | ||
| type = "string" | ||
| }, | ||
| { | ||
| name = "jxBootJobEnvVarSecrets.VAULT_ADDR" | ||
| value = "http://external-vault:8200" | ||
| type = "string" | ||
| } | ||
| ] | ||
| } |
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,72 @@ | ||
| output "jx_requirements" { | ||
| value = module.jx-eks.jx_requirements | ||
| description = "The templated jx-requirements.yml" | ||
| // VPC | ||
| output "vpc_id" { | ||
| value = module.eks-jx.vpc_id | ||
| } | ||
|
|
||
| // Storage (backup, logs, reports, repo) | ||
| output "backup_bucket_url" { | ||
| value = module.eks-jx.backup_bucket_url | ||
| description = "The bucket where backups from velero will be stored" | ||
| } | ||
|
|
||
| output "lts_logs_bucket" { | ||
| value = module.eks-jx.lts_logs_bucket | ||
| description = "The bucket where logs from builds will be stored" | ||
| } | ||
|
|
||
| output "lts_reports_bucket" { | ||
| value = module.eks-jx.lts_reports_bucket | ||
| description = "The bucket where test reports will be stored" | ||
| } | ||
|
|
||
| output "lts_repository_bucket" { | ||
| value = module.eks-jx.lts_reports_bucket | ||
| description = "The bucket that will serve as artifacts repository" | ||
| } | ||
|
|
||
| // IAM Roles | ||
| output "cert_manager_iam_role" { | ||
| value = module.eks-jx.cert_manager_iam_role | ||
| description = "The IAM Role that the Cert Manager pod will assume to authenticate" | ||
| } | ||
|
|
||
| output "tekton_bot_iam_role" { | ||
| value = module.eks-jx.tekton_bot_iam_role | ||
| description = "The IAM Role that the build pods will assume to authenticate" | ||
| } | ||
|
|
||
| output "external_dns_iam_role" { | ||
| value = module.eks-jx.external_dns_iam_role | ||
| description = "The IAM Role that the External DNS pod will assume to authenticate" | ||
| } | ||
|
|
||
| output "cm_cainjector_iam_role" { | ||
| value = module.eks-jx.cm_cainjector_iam_role | ||
| description = "The IAM Role that the CM CA Injector pod will assume to authenticate" | ||
| } | ||
|
|
||
| output "controllerbuild_iam_role" { | ||
| value = module.eks-jx.controllerbuild_iam_role | ||
| description = "The IAM Role that the ControllerBuild pod will assume to authenticate" | ||
| } | ||
|
|
||
| output "cluster_autoscaler_iam_role" { | ||
| value = module.eks-jx.cluster_autoscaler_iam_role | ||
| description = "The IAM Role that the Jenkins X UI pod will assume to authenticate" | ||
| } | ||
|
|
||
| output "pipeline_viz_iam_role" { | ||
| value = module.eks-jx.pipeline_viz_iam_role | ||
| description = "The IAM Role that the pipeline visualizer pod will assume to authenticate" | ||
| } | ||
|
|
||
| // Cluster specific output | ||
| output "cluster_name" { | ||
| value = module.eks-jx.cluster_name | ||
| description = "The name of the created cluster" | ||
| } | ||
|
|
||
| output "cluster_oidc_issuer_url" { | ||
| value = module.eks-jx.cluster_oidc_issuer_url | ||
| description = "The Cluster OIDC Issuer URL" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,9 @@ | ||
| variable "vault_user" { | ||
| variable "region" { | ||
| type = string | ||
| default = "" | ||
| default = "us-east-1" | ||
| } | ||
|
|
||
| variable "profile" { | ||
| type = string | ||
| default = "default" | ||
| } |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.