From 9d2a01ebbec8ffb628f30ae1a6454254b9a6fb56 Mon Sep 17 00:00:00 2001 From: Fabio Formosa Date: Sat, 27 Jul 2024 17:33:31 +0200 Subject: [PATCH] added the staging and prod env to the delivery pipeline --- cloudbuild.yaml | 2 -- .../deploy/pipeline.yaml | 6 +++++ .../deploy/prod.yaml | 10 +++++++ .../deploy/staging.yaml | 10 +++++++ skaffold.yaml | 26 ++++++++++++++++++- 5 files changed, 51 insertions(+), 3 deletions(-) create mode 100644 quartz-manager-parent/quartz-manager-web-showcase/deploy/prod.yaml create mode 100644 quartz-manager-parent/quartz-manager-web-showcase/deploy/staging.yaml diff --git a/cloudbuild.yaml b/cloudbuild.yaml index c9c76b6..54ec404 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -12,7 +12,6 @@ steps: # Build and push images sed -i s/_IMAGE_TAG_POLICY/$SHORT_SHA/g skaffold.yaml sed -i s/_HELM_APP_VERSION/$SHORT_SHA/g ./quartz-manager-parent/quartz-manager-web-showcase/helm/Chart.yaml - sed -i s/_HELM_NAMESPACE/quartzmanager-dev/g skaffold.yaml skaffold build --file-output=/workspace/artifacts.json \ --default-repo=${_REGION}-docker.pkg.dev/quartz-manager-test/quartz-manager/quartz-manager-standalone \ --push=true @@ -25,7 +24,6 @@ steps: - -c - | sed -i s/_HELM_APP_VERSION/$SHORT_SHA/g ./quartz-manager-parent/quartz-manager-web-showcase/helm/Chart.yaml - sed -i s/_HELM_NAMESPACE/quartzmanager-dev/g skaffold.yaml gcloud config set deploy/region ${_REGION} gcloud deploy apply --file ./quartz-manager-parent/quartz-manager-web-showcase/deploy/pipeline.yaml gcloud deploy apply --file ./quartz-manager-parent/quartz-manager-web-showcase/deploy/dev.yaml diff --git a/quartz-manager-parent/quartz-manager-web-showcase/deploy/pipeline.yaml b/quartz-manager-parent/quartz-manager-web-showcase/deploy/pipeline.yaml index 627993d..3d3c7fa 100644 --- a/quartz-manager-parent/quartz-manager-web-showcase/deploy/pipeline.yaml +++ b/quartz-manager-parent/quartz-manager-web-showcase/deploy/pipeline.yaml @@ -10,3 +10,9 @@ serialPipeline: - targetId: dev profiles: - dev + - targetId: staging + profiles: + - staging + - targetId: prod + profiles: + - prod diff --git a/quartz-manager-parent/quartz-manager-web-showcase/deploy/prod.yaml b/quartz-manager-parent/quartz-manager-web-showcase/deploy/prod.yaml new file mode 100644 index 0000000..ea621a6 --- /dev/null +++ b/quartz-manager-parent/quartz-manager-web-showcase/deploy/prod.yaml @@ -0,0 +1,10 @@ +apiVersion: deploy.cloud.google.com/v1 +kind: Target +metadata: + name: prod + annotations: {} + labels: {} +description: prod +requireApproval: true +gke: + cluster: projects/quartz-manager-test/locations/europe-west8-a/clusters/gke-cluster diff --git a/quartz-manager-parent/quartz-manager-web-showcase/deploy/staging.yaml b/quartz-manager-parent/quartz-manager-web-showcase/deploy/staging.yaml new file mode 100644 index 0000000..ecaf3a7 --- /dev/null +++ b/quartz-manager-parent/quartz-manager-web-showcase/deploy/staging.yaml @@ -0,0 +1,10 @@ +apiVersion: deploy.cloud.google.com/v1 +kind: Target +metadata: + name: staging + annotations: {} + labels: {} +description: staging +requireApproval: true +gke: + cluster: projects/quartz-manager-test/locations/europe-west8-a/clusters/gke-cluster diff --git a/skaffold.yaml b/skaffold.yaml index 8970eb8..035e751 100644 --- a/skaffold.yaml +++ b/skaffold.yaml @@ -14,9 +14,33 @@ profiles: releases: - name: quartzmanager-standalone createNamespace: true - namespace: _HELM_NAMESPACE + namespace: quartzmanager-dev chartPath: quartz-manager-parent/quartz-manager-web-showcase/helm # valuesFiles: # - helm/envs/dev/values.yaml setValueTemplates: image.tag: "_IMAGE_TAG_POLICY" + - name: staging + deploy: + helm: + releases: + - name: quartzmanager-standalone + createNamespace: true + namespace: quartzmanager-staging + chartPath: quartz-manager-parent/quartz-manager-web-showcase/helm + # valuesFiles: + # - helm/envs/dev/values.yaml + setValueTemplates: + image.tag: "_IMAGE_TAG_POLICY" + - name: prod + deploy: + helm: + releases: + - name: quartzmanager-standalone + createNamespace: true + namespace: quartzmanager-prod + chartPath: quartz-manager-parent/quartz-manager-web-showcase/helm + # valuesFiles: + # - helm/envs/dev/values.yaml + setValueTemplates: + image.tag: "_IMAGE_TAG_POLICY"