Skip to content

Commit

Permalink
Optimize CI (#303)
Browse files Browse the repository at this point in the history
* upgrade machineType

* pinned workload-identity module to fix for sa bug

* Modified all occurances of WI module

* remove automount_service_account_token from kuberay-operator
  • Loading branch information
hsachdevah authored Mar 7, 2024
1 parent 9f53668 commit 6b844bc
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 3 deletions.
1 change: 1 addition & 0 deletions applications/rag/frontend/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ module "iap_auth" {

module "frontend-workload-identity" {
source = "terraform-google-modules/kubernetes-engine/google//modules/workload-identity"
version = "30.0.0" # Pinning to a previous version as current version (30.1.0) showed inconsitent behaviour with workload identity service accounts
use_existing_gcp_sa = !var.create_service_account
name = var.google_service_account
namespace = var.namespace
Expand Down
2 changes: 1 addition & 1 deletion cloudbuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -363,4 +363,4 @@ substitutions:
_USER_NAME: github
options:
substitutionOption: 'ALLOW_LOOSE'

machineType: 'E2_HIGHCPU_8'
1 change: 1 addition & 0 deletions modules/jupyter/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ module "iap_auth" {

module "jupyterhub-workload-identity" {
source = "terraform-google-modules/kubernetes-engine/google//modules/workload-identity"
version = "30.0.0" # Pinning to a previous version as current version (30.1.0) showed inconsitent behaviour with workload identity service accounts
name = var.workload_identity_service_account
namespace = var.namespace
project_id = var.project_id
Expand Down
3 changes: 1 addition & 2 deletions modules/kuberay-operator/kuberay.tf
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,13 @@ resource "helm_release" "kuberay-operator" {

module "kuberay-workload-identity" {
source = "terraform-google-modules/kubernetes-engine/google//modules/workload-identity"
version = "30.0.0" # Pinning to a previous version as current version (30.1.0) showed inconsitent behaviour with workload identity service accounts
use_existing_gcp_sa = !var.create_service_account
name = var.google_service_account
namespace = var.namespace
project_id = var.project_id
roles = ["roles/cloudsql.client", "roles/monitoring.viewer"]

automount_service_account_token = true

This comment has been minimized.

Copy link
@artemvmin

artemvmin Mar 9, 2024

Collaborator

Hello! This broke credentials for our RAG application. Keep in mind these modules are shared by multiple applications at this point, so code is here for a reason.

If you have questions about why something is implemented the way it is, please reach out to the original author.


depends_on = [helm_release.kuberay-operator]
}

Expand Down

0 comments on commit 6b844bc

Please sign in to comment.