Skip to content

Commit 63112d5

Browse files
committed
add cluster resource labels to makefile for docker run exposition
1 parent 91a7a1f commit 63112d5

File tree

8 files changed

+13
-0
lines changed

8 files changed

+13
-0
lines changed

Makefile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ docker_run:
112112
-e REGION \
113113
-e ZONES \
114114
-e SERVICE_ACCOUNT_JSON \
115+
-e CLUSTER_RESOURCE_LABELS \
115116
-e CLOUDSDK_AUTH_CREDENTIAL_FILE_OVERRIDE=${CREDENTIALS_PATH} \
116117
-e GOOGLE_APPLICATION_CREDENTIALS=${CREDENTIALS_PATH} \
117118
-v $(CURDIR):/cft/workdir \
@@ -126,6 +127,7 @@ docker_create: docker_build_kitchen_terraform
126127
-e REGION \
127128
-e ZONES \
128129
-e SERVICE_ACCOUNT_JSON \
130+
-e CLUSTER_RESOURCE_LABELS \
129131
-e CLOUDSDK_AUTH_CREDENTIAL_FILE_OVERRIDE=${CREDENTIALS_PATH} \
130132
-e GOOGLE_APPLICATION_CREDENTIALS=${CREDENTIALS_PATH} \
131133
-v $(CURDIR):/cft/workdir \
@@ -140,6 +142,7 @@ docker_converge:
140142
-e REGION \
141143
-e ZONES \
142144
-e SERVICE_ACCOUNT_JSON \
145+
-e CLUSTER_RESOURCE_LABELS \
143146
-e CLOUDSDK_AUTH_CREDENTIAL_FILE_OVERRIDE=${CREDENTIALS_PATH} \
144147
-e GOOGLE_APPLICATION_CREDENTIALS=${CREDENTIALS_PATH} \
145148
-v $(CURDIR):/cft/workdir \
@@ -154,6 +157,7 @@ docker_verify:
154157
-e REGION \
155158
-e ZONES \
156159
-e SERVICE_ACCOUNT_JSON \
160+
-e CLUSTER_RESOURCE_LABELS \
157161
-e CLOUDSDK_AUTH_CREDENTIAL_FILE_OVERRIDE=${CREDENTIALS_PATH} \
158162
-e GOOGLE_APPLICATION_CREDENTIALS=${CREDENTIALS_PATH} \
159163
-v $(CURDIR):/cft/workdir \
@@ -168,6 +172,7 @@ docker_destroy:
168172
-e REGION \
169173
-e ZONES \
170174
-e SERVICE_ACCOUNT_JSON \
175+
-e CLUSTER_RESOURCE_LABELS \
171176
-e CLOUDSDK_AUTH_CREDENTIAL_FILE_OVERRIDE=${CREDENTIALS_PATH} \
172177
-e GOOGLE_APPLICATION_CREDENTIALS=${CREDENTIALS_PATH} \
173178
-v $(CURDIR):/cft/workdir \
@@ -182,6 +187,7 @@ test_integration_docker:
182187
-e REGION \
183188
-e ZONES \
184189
-e SERVICE_ACCOUNT_JSON \
190+
-e CLUSTER_RESOURCE_LABELS \
185191
-v $(CURDIR):/cft/workdir \
186192
${DOCKER_IMAGE_KITCHEN_TERRAFORM}:${DOCKER_TAG_KITCHEN_TERRAFORM} \
187193
/bin/bash -c "test/ci_integration.sh"

test/ci/deploy-service.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,4 @@ params:
1616
COMPUTE_ENGINE_SERVICE_ACCOUNT: ""
1717
REGION: "us-east4"
1818
ZONES: '["us-east4-a", "us-east4-b", "us-east4-c"]'
19+
CLUSTER_RESOURCE_LABELS: 'cluster_resource_labels={ created-by = "terraform" }'

test/ci/node-pool.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,4 @@ params:
1616
COMPUTE_ENGINE_SERVICE_ACCOUNT: ""
1717
REGION: "us-east4"
1818
ZONES: '["us-east4-a", "us-east4-b", "us-east4-c"]'
19+
CLUSTER_RESOURCE_LABELS: 'cluster_resource_labels={ created-by = "terraform" }'

test/ci/shared-vpc.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,4 @@ params:
1616
COMPUTE_ENGINE_SERVICE_ACCOUNT: ""
1717
REGION: "us-east4"
1818
ZONES: '["us-east4-a", "us-east4-b", "us-east4-c"]'
19+
CLUSTER_RESOURCE_LABELS: 'cluster_resource_labels={ created-by = "terraform" }'

test/ci/simple-regional-private.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,4 @@ params:
1616
COMPUTE_ENGINE_SERVICE_ACCOUNT: ""
1717
REGION: "us-east4"
1818
ZONES: '["us-east4-a", "us-east4-b", "us-east4-c"]'
19+
CLUSTER_RESOURCE_LABELS: 'cluster_resource_labels={ created-by = "terraform" }'

test/ci/simple-zonal-private.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,4 @@ params:
1616
COMPUTE_ENGINE_SERVICE_ACCOUNT: ""
1717
REGION: "us-east4"
1818
ZONES: '["us-east4-a", "us-east4-b", "us-east4-c"]'
19+
CLUSTER_RESOURCE_LABELS: 'cluster_resource_labels={ created-by = "terraform" }'

test/ci/simple-zonal.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,4 @@ params:
1616
COMPUTE_ENGINE_SERVICE_ACCOUNT: ""
1717
REGION: "us-east4"
1818
ZONES: '["us-east4-a", "us-east4-b", "us-east4-c"]'
19+
CLUSTER_RESOURCE_LABELS: 'cluster_resource_labels={ created-by = "terraform" }'

test/ci/stub-domains.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,4 @@ params:
1616
COMPUTE_ENGINE_SERVICE_ACCOUNT: ""
1717
REGION: "us-east4"
1818
ZONES: '["us-east4-a", "us-east4-b", "us-east4-c"]'
19+
CLUSTER_RESOURCE_LABELS: 'cluster_resource_labels={ created-by = "terraform" }'

0 commit comments

Comments
 (0)