Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add kuberos to EKS, Bump kuberos chart version for kops and EKS #1254

Merged
merged 4 commits into from
Jun 22, 2021
Merged

Add kuberos to EKS, Bump kuberos chart version for kops and EKS #1254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d3420a5
Remove the unconditional exit and check for existing association
poornima-krishnasamy Jun 21, 2021
58ec377
Add kuberos module to eks. This is needed for users to authenticate t…
poornima-krishnasamy Jun 21, 2021
52648cd
Bump kuberos module release
poornima-krishnasamy Jun 21, 2021
3b1f1e6
Bump kuberos module release for kops
poornima-krishnasamy Jun 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions terraform/aws-accounts/cloud-platform-aws/vpc/eks/components/components.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,17 @@ module "modsec_ingress_controllers" {
dependence_certmanager = module.cert_manager.helm_cert_manager_status
}

module "kuberos" {
source = "github.com/ministryofjustice/cloud-platform-terraform-kuberos?ref=0.3.1"

cluster_domain_name = data.terraform_remote_state.cluster.outputs.cluster_domain_name
oidc_kubernetes_client_id = data.terraform_remote_state.cluster.outputs.oidc_kubernetes_client_id
oidc_kubernetes_client_secret = data.terraform_remote_state.cluster.outputs.oidc_kubernetes_client_secret
oidc_issuer_url = data.terraform_remote_state.cluster.outputs.oidc_issuer_url
cluster_address = data.terraform_remote_state.cluster.outputs.cluster_endpoint
create_aws_redirect = false
}

module "logging" {
source = "github.com/ministryofjustice/cloud-platform-terraform-logging?ref=1.1.0"

Expand Down
2 changes: 1 addition & 1 deletion terraform/aws-accounts/cloud-platform-aws/vpc/eks/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ module "auth0" {
resource "null_resource" "associate_identity_provider" {
depends_on = [module.eks.cluster_id]
provisioner "local-exec" {
command = "aws eks --region 'eu-west-2' associate-identity-provider-config --cluster-name '${terraform.workspace}' --oidc identityProviderConfigName='Auth0',issuerUrl='${var.auth0_issuerUrl}',clientId='${module.auth0.oidc_kubernetes_client_id}',usernameClaim=email,groupsClaim='${var.auth0_groupsClaim}',requiredClaims={}; exit 0"
command = "aws eks --region 'eu-west-2' associate-identity-provider-config --cluster-name '${terraform.workspace}' --oidc identityProviderConfigName='Auth0',issuerUrl='${var.auth0_issuerUrl}',clientId='${module.auth0.oidc_kubernetes_client_id}',usernameClaim=email,groupsClaim='${var.auth0_groupsClaim}',requiredClaims={} || aws eks --region 'eu-west-2' describe-identity-provider-config --cluster-name '${terraform.workspace}' --identity-provider-config type='oidc',name='Auth0' --output json --query 'identityProviderConfig.oidc.status'"
}

}
Expand Down
2 changes: 1 addition & 1 deletion terraform/aws-accounts/cloud-platform-aws/vpc/kops/components/components.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ module "kiam" {
}

module "kuberos" {
source = "github.com/ministryofjustice/cloud-platform-terraform-kuberos?ref=0.3.0"
source = "github.com/ministryofjustice/cloud-platform-terraform-kuberos?ref=0.3.1"

cluster_domain_name = data.terraform_remote_state.cluster.outputs.cluster_domain_name
oidc_kubernetes_client_id = data.terraform_remote_state.cluster.outputs.oidc_kubernetes_client_id
Expand Down