Merge pull request #474 from nais/google-cloud-project-env-var

Add support for GOOGLE_CLOUD_PROJECT environment variable
nais · Nov 6, 2023 · 765656a · 765656a
2 parents c379453 + 1b96e2d
commit 765656a
Show file tree

Hide file tree

Showing 12 changed files with 30 additions and 0 deletions.
diff --git a/pkg/resourcecreator/google/gcp/gcp.go b/pkg/resourcecreator/google/gcp/gcp.go
@@ -41,6 +41,14 @@ func Create(source Source, ast *resource.Ast, cfg Config) error {
 
 	googleServiceAccount := google_iam.CreateServiceAccount(source, projectID)
 	googleServiceAccountBinding := google_iam.CreatePolicy(source, &googleServiceAccount, projectID)
+
+	// Standard environment variable name in Google SDKs
+	ast.Env = append(ast.Env, v1.EnvVar{
+		Name:  "GOOGLE_CLOUD_PROJECT",
+		Value: teamProjectID,
+	})
+
+	// Legacy environment variable for backwards compability
 	ast.Env = append(ast.Env, v1.EnvVar{
 		Name:  "GCP_TEAM_PROJECT_ID",
 		Value: teamProjectID,

diff --git a/pkg/resourcecreator/testdata/gcp_bigquery.yaml b/pkg/resourcecreator/testdata/gcp_bigquery.yaml
@@ -87,6 +87,8 @@ tests:
                 containers:
                   - image: navikt/myapplication:1.2.3
                     env:
+                      - name: GOOGLE_CLOUD_PROJECT
+                        value: team-project-id
                       - name: GCP_TEAM_PROJECT_ID
                         value: team-project-id
                 dnsPolicy: ClusterFirst

diff --git a/pkg/resourcecreator/testdata/gcp_bigquery_cascading_delete.yaml b/pkg/resourcecreator/testdata/gcp_bigquery_cascading_delete.yaml
@@ -90,6 +90,8 @@ tests:
                 containers:
                   - image: navikt/myapplication:1.2.3
                     env:
+                      - name: GOOGLE_CLOUD_PROJECT
+                        value: team-project-id
                       - name: GCP_TEAM_PROJECT_ID
                         value: team-project-id
                 dnsPolicy: ClusterFirst

diff --git a/pkg/resourcecreator/testdata/gcp_buckets.yaml b/pkg/resourcecreator/testdata/gcp_buckets.yaml
@@ -138,6 +138,8 @@ tests:
                 containers:
                   - image: navikt/myapplication:1.2.3
                     env:
+                      - name: GOOGLE_CLOUD_PROJECT
+                        value: team-project-id
                       - name: GCP_TEAM_PROJECT_ID
                         value: team-project-id
                 dnsPolicy: ClusterFirst

diff --git a/pkg/resourcecreator/testdata/gcp_buckets_publicaccessprevention.yaml b/pkg/resourcecreator/testdata/gcp_buckets_publicaccessprevention.yaml
@@ -128,6 +128,8 @@ tests:
                 containers:
                   - image: navikt/myapplication:1.2.3
                     env:
+                      - name: GOOGLE_CLOUD_PROJECT
+                        value: team-project-id
                       - name: GCP_TEAM_PROJECT_ID
                         value: team-project-id
                 dnsPolicy: ClusterFirst

diff --git a/pkg/resourcecreator/testdata/gcp_buckets_uniformlevelaccess.yaml b/pkg/resourcecreator/testdata/gcp_buckets_uniformlevelaccess.yaml
@@ -167,6 +167,8 @@ tests:
                 containers:
                   - image: navikt/myapplication:1.2.3
                     env:
+                      - name: GOOGLE_CLOUD_PROJECT
+                        value: team-project-id
                       - name: GCP_TEAM_PROJECT_ID
                         value: team-project-id
                 dnsPolicy: ClusterFirst

diff --git a/pkg/resourcecreator/testdata/gcp_buckets_with_lifecycle_and_retention.yaml b/pkg/resourcecreator/testdata/gcp_buckets_with_lifecycle_and_retention.yaml
@@ -151,6 +151,8 @@ tests:
                 containers:
                   - image: navikt/myapplication:1.2.3
                     env:
+                      - name: GOOGLE_CLOUD_PROJECT
+                        value: team-project-id
                       - name: GCP_TEAM_PROJECT_ID
                         value: team-project-id
                 dnsPolicy: ClusterFirst

diff --git a/pkg/resourcecreator/testdata/gcp_database.yaml b/pkg/resourcecreator/testdata/gcp_database.yaml
@@ -224,6 +224,8 @@ tests:
                       - secretRef:
                           name: google-sql-myapplication
                     env:
+                      - name: GOOGLE_CLOUD_PROJECT
+                        value: team-project-id
                       - name: GCP_TEAM_PROJECT_ID
                         value: team-project-id
                   - name: cloudsql-proxy

diff --git a/pkg/resourcecreator/testdata/gcp_database_with_insights.yaml b/pkg/resourcecreator/testdata/gcp_database_with_insights.yaml
@@ -223,6 +223,8 @@ tests:
                       - secretRef:
                           name: google-sql-myapplication
                     env:
+                      - name: GOOGLE_CLOUD_PROJECT
+                        value: team-project-id
                       - name: GCP_TEAM_PROJECT_ID
                         value: team-project-id
                   - name: cloudsql-proxy

diff --git a/pkg/resourcecreator/testdata/naisjob/cronjob_gcp_bigquery_cascading_delete.yaml b/pkg/resourcecreator/testdata/naisjob/cronjob_gcp_bigquery_cascading_delete.yaml
@@ -93,6 +93,8 @@ tests:
                     containers:
                       - image: navikt/mynaisjob:1.2.3
                         env:
+                          - name: GOOGLE_CLOUD_PROJECT
+                            value: team-project-id
                           - name: GCP_TEAM_PROJECT_ID
                             value: team-project-id
                     dnsPolicy: ClusterFirst

diff --git a/pkg/resourcecreator/testdata/naisjob/cronjob_gcp_buckets.yaml b/pkg/resourcecreator/testdata/naisjob/cronjob_gcp_buckets.yaml
@@ -143,6 +143,8 @@ tests:
                     containers:
                       - image: navikt/mynaisjob:1.2.3
                         env:
+                          - name: GOOGLE_CLOUD_PROJECT
+                            value: team-project-id
                           - name: GCP_TEAM_PROJECT_ID
                             value: team-project-id
                     dnsPolicy: ClusterFirst

diff --git a/pkg/resourcecreator/testdata/naisjob/cronjob_gcp_database.yaml b/pkg/resourcecreator/testdata/naisjob/cronjob_gcp_database.yaml
@@ -216,6 +216,8 @@ tests:
                           - secretRef:
                               name: google-sql-mynaisjob
                         env:
+                          - name: GOOGLE_CLOUD_PROJECT
+                            value: team-project-id
                           - name: GCP_TEAM_PROJECT_ID
                             value: team-project-id
                       - name: cloudsql-proxy