Skip to content

Build and push the hourly billing agent ubbagent #6

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
merged 3 commits into from
Feb 11, 2021
Merged

Build and push the hourly billing agent ubbagent #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cc031c9
Build and push the ubbagent image
maelvls Feb 10, 2021
e9b1286
Use _APP_VERSION instead of _CERT_MANAGER_VERSION
maelvls Feb 11, 2021
7dbda9f
Move preflight to chart/jetstacksecure-mp/charts
maelvls Feb 11, 2021
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
0 chart/preflight/.helmignore → ...acksecure-mp/charts/preflight/.helmignore
View file
Open in desktop
File renamed without changes.
0 chart/preflight/Chart.yaml → ...tacksecure-mp/charts/preflight/Chart.yaml
View file
Open in desktop
File renamed without changes.
0 chart/preflight/README.md → ...stacksecure-mp/charts/preflight/README.md
View file
Open in desktop
File renamed without changes.
0 chart/preflight/templates/NOTES.txt → ...e-mp/charts/preflight/templates/NOTES.txt
View file
Open in desktop
File renamed without changes.
0 chart/preflight/templates/_helpers.tpl → ...p/charts/preflight/templates/_helpers.tpl
View file
Open in desktop
File renamed without changes.
0 chart/preflight/templates/deployment.yaml → ...harts/preflight/templates/deployment.yaml
View file
Open in desktop
File renamed without changes.
0 chart/preflight/templates/rbac.yaml → ...e-mp/charts/preflight/templates/rbac.yaml
View file
Open in desktop
File renamed without changes.
0 ...t/preflight/templates/serviceaccount.yaml → ...s/preflight/templates/serviceaccount.yaml
View file
Open in desktop
File renamed without changes.
0 chart/preflight/values.yaml → ...acksecure-mp/charts/preflight/values.yaml
View file
Open in desktop
File renamed without changes.
27 changes: 27 additions & 0 deletions cloudbuild.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,31 @@ steps:
waitFor:
- tag-webhook


- id: clone-ubbagent
name: gcr.io/cloud-builders/gcloud
entrypoint: bash
args:
- -exc
- git clone https://github.com/GoogleCloudPlatform/ubbagent --branch 0.0.1
waitFor: ["-"]

- id: build-ubbagent
name: gcr.io/cloud-builders/docker
args:
- build
- --tag
- gcr.io/$PROJECT_ID/${_SOLUTION_NAME}/ubbagent:${_APP_VERSION}
- "./ubbagent"
waitFor: ["clone-ubbagent"]

- id: push-ubbagent
name: gcr.io/cloud-builders/docker
args:
- push
- gcr.io/$PROJECT_ID/${_SOLUTION_NAME}/ubbagent:${_APP_VERSION}
waitFor: ["build-ubbagent"]
Copy link
Member

@wallrj wallrj Feb 11, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wondered if these commands could all be executed in a single step, assuming that the gcr.io/cloud-builders/gcloud has the docker cli tools.
It might simplify the (already rather long) cloud-build.yaml.

But happy for this to be merged now, if you prefer it this way.

Copy link
Member

@wallrj wallrj Feb 11, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And another question is whether we can pull / tag and push an existing image, rather than building from scratch?
Or even whether we need to pull and push this image, if by chance it is already hosted on the marketplace gcr registry.
These are just idle thoughts. Ignore them if you want to just get this merged.

Copy link
Member Author

@maelvls maelvls Feb 11, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sure, i would be happy to justn one single step instead of scattering in 3 different steps

Copy link
Member Author

@maelvls maelvls Feb 11, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And another question is whether we can pull / tag and push an existing image, rather than building from scratch?

I was unable to find a blessed image on gcr.io unfortunately, I searched everywhere but could not find anything :(

Copy link
Member Author

@maelvls maelvls Feb 11, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like the gcloud doesnt have docker 😞

Step #12 - "build-ubbagent": + git clone https://github.com/GoogleCloudPlatform/ubbagent --branch 0.0.1
Step #12 - "build-ubbagent": + docker build --tag gcr.io/jetstack-mael-valais/cert-manager/ubbagent:1.1.0 ./ubbagent
Step #12 - "build-ubbagent": bash: line 1: docker: command not found


- id: build-deployer
name: gcr.io/cloud-builders/docker
args:
Expand Down Expand Up @@ -192,6 +217,7 @@ steps:
- push-cainjector
- push-webhook
- push-cas-issuer
- push-ubbagent

- id: publish
name: gcr.io/cloud-marketplace-tools/k8s/dev
Expand All @@ -213,3 +239,4 @@ images:
- gcr.io/$PROJECT_ID/${_SOLUTION_NAME}/cert-manager-webhook:${_APP_VERSION}
- gcr.io/$PROJECT_ID/${_SOLUTION_NAME}/cert-manager-google-cas-issuer:${_APP_VERSION}
- gcr.io/$PROJECT_ID/${_SOLUTION_NAME}/deployer:${_APP_VERSION}
- gcr.io/$PROJECT_ID/${_SOLUTION_NAME}/ubbagent:${_APP_VERSION}