Skip to content

Commit

Permalink
Rename data-pipeline configurations (us-central1 migration) (#431)
Browse files Browse the repository at this point in the history
* Change data-pipeline cluster name
* Use _CLUSTER_NAME in cloudbuild.yaml
* Remove obsolete create script
* Write to new etl bucket in us-central1
* Remove legacy cloudbuild config
  • Loading branch information
stephen-soltesz authored Aug 24, 2023
1 parent 48dcf95 commit 5aa2f51
Show file tree
Hide file tree
Showing 8 changed files with 3 additions and 125 deletions.
2 changes: 1 addition & 1 deletion apply-cluster.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ sed -i \
# Create the configmap
kubectl create configmap gardener-config --dry-run \
--from-file config/config.yml \
-o yaml > k8s/data-processing/deployments/config.yml
-o yaml > k8s/${CLUSTER}/deployments/config.yml

# Apply templates
find k8s/${CLUSTER}/ -type f -exec \
Expand Down
17 changes: 1 addition & 16 deletions cloudbuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -90,19 +90,4 @@ steps:
]
env:
- CLOUDSDK_COMPUTE_REGION=$_CLUSTER_REGION
- CLOUDSDK_CONTAINER_CLUSTER=$_CLUSTER

# LEGACY CLUSTER: Run apply-cluster.sh
# TODO: delete once legacy cluster services are retired.
#- name: gcr.io/cloud-builders/kubectl
# id: "Deploy legacy gardener configurations"
# entrypoint: /bin/bash
# args: [
# '-c', '/builder/kubectl.bash version && ./apply-cluster.sh'
# ]
# env:
# - CLOUDSDK_COMPUTE_ZONE=$_LEGACY_CLUSTER_ZONE
# - CLOUDSDK_CONTAINER_CLUSTER=$_LEGACY_CLUSTER
# # Defaults to zero. Only set in sandbox.
# - DATE_SKIP=$_DATE_SKIP
# - TASK_FILE_SKIP=$_TASK_FILE_SKIP
- CLOUDSDK_CONTAINER_CLUSTER=$_CLUSTER_NAME
107 changes: 0 additions & 107 deletions create-pipeline-cluster.sh

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ spec:
"-project={{GCLOUD_PROJECT}}",
"-shutdown_timeout=5m",
"-job_expiration_time=6h",
"-input_location=etl-{{GCLOUD_PROJECT}}", # must correspond to -output_location from etl parser.
"-input_location=etl-{{GCLOUD_PROJECT}}-us-central1", # must correspond to -output_location from etl parser.
]
ports:
- name: prometheus-port
Expand Down

0 comments on commit 5aa2f51

Please sign in to comment.