From d09bfa64d657071f81a292206c636cb68c6b92fd Mon Sep 17 00:00:00 2001 From: Filipe Forattini Date: Mon, 2 May 2022 15:37:55 -0300 Subject: [PATCH 1/3] ci: temp removed gpg --- .github/workflows/service-push.yml | 38 +++++++++++++++--------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/service-push.yml b/.github/workflows/service-push.yml index 4ce3c5be..c5b82bc5 100644 --- a/.github/workflows/service-push.yml +++ b/.github/workflows/service-push.yml @@ -398,24 +398,24 @@ jobs: # gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }} # passphrase: ${{ secrets.GPG_DEV_PASSPHRASE }} - - name: Decrypt Dev Secrets - env: - GPG_PASSPHRASE: ${{ secrets.GPG_DEV_PASSPHRASE }} - run: | - gpg --yes --batch --quiet --decrypt \ - --output ./manifests/k8s-secrets.env \ - --passphrase="$GPG_PASSPHRASE" \ - ./manifests/secrets/dev.gpg - cat ./manifests/k8s-secrets.env - - - name: Create K8s secrets - if: steps.deploy_setup.outputs.deploy_as_k8s == 'true' - uses: actions-hub/kubectl@master - env: - KUBE_CONFIG: ${{ secrets.KUBE_CONFIG }} - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - args: create secret generic svc --from-file=./manifests/k8s-secrets.env + # - name: Decrypt Dev Secrets + # env: + # GPG_PASSPHRASE: ${{ secrets.GPG_DEV_PASSPHRASE }} + # run: | + # gpg --yes --batch --quiet --decrypt \ + # --output ./manifests/k8s-secrets.env \ + # --passphrase="$GPG_PASSPHRASE" \ + # ./manifests/secrets/dev.gpg + # cat ./manifests/k8s-secrets.env + + # - name: Create K8s secrets + # if: steps.deploy_setup.outputs.deploy_as_k8s == 'true' + # uses: actions-hub/kubectl@master + # env: + # KUBE_CONFIG: ${{ secrets.KUBE_CONFIG }} + # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # with: + # args: create secret generic svc --from-file=./manifests/k8s-secrets.env - name: Generates Kubernetes YAML if: steps.deploy_setup.outputs.deploy_as_k8s == 'true' @@ -450,4 +450,4 @@ jobs: KUBE_CONFIG: ${{ secrets.KUBE_CONFIG }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - args: get pods -n ${{steps.deploy_setup.outputs.deploy_repository}} \ No newline at end of file + args: get pods -n ${{steps.deploy_setup.outputs.deploy_repository}} From d87bb7a0d9853097c5db3ecae8bad8f1b54aed2e Mon Sep 17 00:00:00 2001 From: Filipe Forattini Date: Mon, 2 May 2022 16:15:36 -0300 Subject: [PATCH 2/3] fix: repository name and match labels --- .github/workflows/service-push.yml | 2 -- deploy/as-k8s/service.schema.yml | 2 +- deploy/as-k8s/service.yml | 2 +- src/scrappers/git.class.js | 1 + 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/service-push.yml b/.github/workflows/service-push.yml index c5b82bc5..8f5d3db9 100644 --- a/.github/workflows/service-push.yml +++ b/.github/workflows/service-push.yml @@ -419,8 +419,6 @@ jobs: - name: Generates Kubernetes YAML if: steps.deploy_setup.outputs.deploy_as_k8s == 'true' - env: - PIPELINE_SETUP: ${{ steps.script_setup.outputs.result}} run: | ytt \ -f ./.ff/deploy/as-k8s/service.schema.yml \ diff --git a/deploy/as-k8s/service.schema.yml b/deploy/as-k8s/service.schema.yml index 85e3da9a..6471bd8d 100644 --- a/deploy/as-k8s/service.schema.yml +++ b/deploy/as-k8s/service.schema.yml @@ -34,7 +34,7 @@ ingress: enable: false name: svc type: alb - domain: ff.io + domain: acme.io alb: certificateArn: secret diff --git a/deploy/as-k8s/service.yml b/deploy/as-k8s/service.yml index 8af98e24..dbd7843b 100644 --- a/deploy/as-k8s/service.yml +++ b/deploy/as-k8s/service.yml @@ -83,7 +83,7 @@ spec: matchLabels: #@ data.values.deployment.matchLabels.labels #@ else: #@ deploymentMatchLabels = {} - #@ deploymentMatchLabels.update({ "pipe/selector": data.values.repository }) + #@ deploymentMatchLabels.update({ "pipe/selector": data.values.repository + "/" + data.values.deployment.name }) matchLabels: #@ deploymentMatchLabels #@ end template: diff --git a/src/scrappers/git.class.js b/src/scrappers/git.class.js index 51d21867..d4d6721d 100644 --- a/src/scrappers/git.class.js +++ b/src/scrappers/git.class.js @@ -20,6 +20,7 @@ module.exports = class Git extends Scrapper { repository }) .add('deploy', { + repository, organization, namespace: repository, tag: `c-${commit}`, From af7ef4472423ee299ea1b4948a05b0a3a5910624 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Mon, 2 May 2022 19:16:12 +0000 Subject: [PATCH 3/3] chore(release): 1.0.6 [skip ci] ## [1.0.6](https://github.com/filipeforattini/ff-iac-github-actions/compare/v1.0.5...v1.0.6) (2022-05-02) ### Bug Fixes * repository name and match labels ([d87bb7a](https://github.com/filipeforattini/ff-iac-github-actions/commit/d87bb7a0d9853097c5db3ecae8bad8f1b54aed2e)) --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a5c4f6ed..8983d92b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [1.0.6](https://github.com/filipeforattini/ff-iac-github-actions/compare/v1.0.5...v1.0.6) (2022-05-02) + + +### Bug Fixes + +* repository name and match labels ([d87bb7a](https://github.com/filipeforattini/ff-iac-github-actions/commit/d87bb7a0d9853097c5db3ecae8bad8f1b54aed2e)) + ## [1.0.5](https://github.com/filipeforattini/ff-iac-github-actions/compare/v1.0.4...v1.0.5) (2022-05-02)