Thanks to visit codestin.com
Credit goes to github.com

Skip to content

cloudbuild steps to use cache during build #452

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

Merged
anovis merged 7 commits into from
Nov 6, 2023
Merged

cloudbuild steps to use cache during build #452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
dd678a7
cloudbuild steps to use cache during build
mauriciowittenberg Nov 1, 2023
6e4bb75
test backends.cloudrun.CloudRun functions
mauriciowittenberg Nov 2, 2023
c7dc8b5
deployer cache tests
mauriciowittenberg Nov 2, 2023
2aa0a7b
Merge branch 'main' into cloudbuild-cache
anovis Nov 3, 2023
3fb58f5
fix for kaniko cache when there are no additional tags
mauriciowittenberg Nov 4, 2023
4c20938
black fix
mauriciowittenberg Nov 4, 2023
9690a2e
Merge branch 'main' into cloudbuild-cache
anovis Nov 5, 2023
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
25 changes: 25 additions & 0 deletions goblet.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,13 @@
"artifact_tag": {
"type": "string"
},
"cloudbuild_cache": {
"enum": [
"KANIKO",
"DOCKER_LATEST"
],
"type": "string"
},
"environmentVariables": {
"patternProperties": {
"^.+$": {
Expand All @@ -94,6 +101,15 @@
"dockerfile": {
"type": "string"
},
"eventarc": {
"properties": {
"serviceAccount": {
"description": "eventarc@{PROJECT}.iam.gserviceaccount.com",
"type": "string"
}
},
"type": "object"
},
"function_name": {
"type": "string"
},
Expand All @@ -106,6 +122,15 @@
"redis": {
"$ref": "https://raw.githubusercontent.com/goblet/goblet/main/utils/schema/references/redis.v1.json#/schemas/Instance"
},
"scheduler": {
"properties": {
"serviceAccount": {
"description": "scheduler@{PROJECT}.iam.gserviceaccount.com",
"type": "string"
}
},
"type": "object"
},
"securityDefinitions": {
"properties": {
"firebase": {
Expand Down
72 changes: 57 additions & 15 deletions goblet/backends/cloudrun.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,23 +180,11 @@ def create_build(self, client, source=None, name="goblet"):
if build_tags:
images += list(map(lambda tag: f"{registry}:{tag}", build_tags.split(",")))

steps = self._get_cloudbuild_steps(images)

req_body = {
"source": {"storageSource": source["storageSource"]},
"steps": [
{
"name": "gcr.io/cloud-builders/docker",
"args": [
"build",
"--network=cloudbuild",
]
+ list(map(lambda image: ["-t", image], images))
+ [
"--cache-from",
registry,
".",
],
}
],
"steps": steps,
"images": images,
**build_configs,
}
Expand Down Expand Up @@ -249,6 +237,60 @@ def _checksum(self):
except KeyError:
return 0

def _get_cloudbuild_steps(self, images):
cloudbuild_cache = self.config.deploy.get("cloudbuild_cache", "DOCKER_LATEST")
if cloudbuild_cache == "DOCKER_LATEST":
steps = [
{
"name": "gcr.io/cloud-builders/docker",
"entrypoint": "bash",
"args": ["-c", f"docker pull {images[0]} || exit 0"],
},
{
"name": "gcr.io/cloud-builders/docker",
"args": [
"build",
"--network=cloudbuild",
]
+ list(map(lambda image: ["-t", image], images))
+ [
"--cache-from",
images[0],
".",
],
},
]
elif cloudbuild_cache == "KANIKO":
steps = [
{
"name": "gcr.io/kaniko-project/executor:latest",
"args": [
f"--destination={images[0]}",
"--cache=true",
f"--cache-ttl={24*365*3}h",
],
},
{
"name": "gcr.io/cloud-builders/docker",
"entrypoint": "bash",
"args": [
"-c",
f"docker pull {images[0]}"
+ " && ".join(
[""]
+ [
f"docker tag {images[0]} {build_tag_image}"
for build_tag_image in images[1:]
]
),
],
},
]
else:
raise Exception(f"Invalid cloudbuild_cache option {cloudbuild_cache}")

return steps

def update_config(self, infra_configs=[], write_config=False, stage=None):
config_updates = {}
for infra_config in infra_configs:
Expand Down
4 changes: 2 additions & 2 deletions ...jects-goblet-locations-us-central1-operations-8182fff8-6fc8-4964-8866-12c196371e80_1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
"generation": "1",
"createTime": "2023-10-11T21:29:36.879768Z",
"updateTime": "2023-10-11T21:29:36.879768Z",
"creator": "mauricio.martinez@premise.com",
"lastModifier": "mauricio.martinez@premise.com",
"creator": "creator@goblet.com",
"lastModifier": "modifier@goblet.com",
"ingress": "INGRESS_TRAFFIC_ALL",
"launchStage": "GA",
"template": {
Expand Down
8 changes: 4 additions & 4 deletions .../tests/data/http/build-tags/post-v2-projects-goblet-locations-us-central1-services_1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
"generation": "1",
"createTime": "2023-10-11T21:29:36.879768Z",
"updateTime": "2023-10-11T21:29:36.879768Z",
"creator": "mauricio.martinez@premise.com",
"lastModifier": "mauricio.martinez@premise.com",
"creator": "creator@goblet.com",
"lastModifier": "modifier@goblet.com",
"launchStage": "GA",
"template": {
"scaling": {
Expand Down Expand Up @@ -70,8 +70,8 @@
"generation": "1",
"createTime": "2023-10-11T21:29:36.879768Z",
"updateTime": "2023-10-11T21:29:36.879768Z",
"creator": "mauricio.martinez@premise.com",
"lastModifier": "mauricio.martinez@premise.com",
"creator": "creator@goblet.com",
"lastModifier": "modifier@goblet.com",
"launchStage": "GA",
"template": {
"scaling": {
Expand Down
Loading