Merge pull request #28 from cloudposse-examples/DEV-1567-moved-org

chore: Action Versions and Default Branches
cloudposse-examples · Jan 31, 2024 · 58de547 · 58de547
2 parents 845b0d5 + 0dea48d
commit 58de547
Show file tree

Hide file tree

Showing 14 changed files with 40 additions and 36 deletions.
diff --git a/.github/workflows/eks-argocd-feature-branch.yml b/.github/workflows/eks-argocd-feature-branch.yml
@@ -30,7 +30,7 @@ name: |-
           labels: $\{\{ toJSON(github.event.pull_request.labels.*.name) \}\}
           ref: $\{\{ github.event.pull_request.head.ref  \}\}
         secrets:
-          github-private-actions-pat: "$\{\{ secrets.PUBLIC_REPO_ACCESS_TOKEN \}\}"
+          github-private-actions-pat: "$\{\{ secrets.ARGOCD_GITHUB_NONPROD \}\}"
           registry: "$\{\{ secrets.ECR_REGISTRY \}\}"
           secret-outputs-passphrase: "$\{\{ secrets.GHA_SECRET_OUTPUT_PASSPHRASE \}\}"
           ecr-region: "$\{\{ secrets.ECR_REGION \}\}"

diff --git a/.github/workflows/eks-argocd-hotfix-branch.yml b/.github/workflows/eks-argocd-hotfix-branch.yml
@@ -30,7 +30,7 @@ name: |-
           labels: $\{\{ toJSON(github.event.pull_request.labels.*.name) \}\}
           ref: $\{\{ github.event.pull_request.head.ref  \}\}
         secrets:
-          github-private-actions-pat: "$\{\{ secrets.PUBLIC_REPO_ACCESS_TOKEN \}\}"
+          github-private-actions-pat: "$\{\{ secrets.ARGOCD_GITHUB_NONPROD \}\}"
           registry: "$\{\{ secrets.ECR_REGISTRY \}\}"
           secret-outputs-passphrase: "$\{\{ secrets.GHA_SECRET_OUTPUT_PASSPHRASE \}\}"
           ecr-region: "$\{\{ secrets.ECR_REGION \}\}"

diff --git a/.github/workflows/eks-argocd-hotfix-release.yml b/.github/workflows/eks-argocd-hotfix-release.yml
@@ -24,7 +24,7 @@ name: |-
           organization: "$\{\{ github.event.repository.owner.login \}\}"
           repository: "$\{\{ github.event.repository.name \}\}"
         secrets:
-          github-private-actions-pat: "$\{\{ secrets.PUBLIC_REPO_ACCESS_TOKEN \}\}"
+          github-private-actions-pat: "$\{\{ secrets.ARGOCD_GITHUB_NONPROD \}\}"
           registry: "$\{\{ secrets.ECR_REGISTRY \}\}"
           secret-outputs-passphrase: "$\{\{ secrets.GHA_SECRET_OUTPUT_PASSPHRASE \}\}"
           ecr-region: "$\{\{ secrets.ECR_REGION \}\}"

diff --git a/.github/workflows/eks-argocd-main-branch.yml b/.github/workflows/eks-argocd-main-branch.yml
@@ -24,7 +24,7 @@ name: |-
           organization: "$\{\{ github.event.repository.owner.login \}\}"
           repository: "$\{\{ github.event.repository.name \}\}"
         secrets:
-          github-private-actions-pat: "$\{\{ secrets.PUBLIC_REPO_ACCESS_TOKEN \}\}"
+          github-private-actions-pat: "$\{\{ secrets.ARGOCD_GITHUB_NONPROD \}\}"
           registry: "$\{\{ secrets.ECR_REGISTRY \}\}"
           secret-outputs-passphrase: "$\{\{ secrets.GHA_SECRET_OUTPUT_PASSPHRASE \}\}"
           ecr-region: "$\{\{ secrets.ECR_REGION \}\}"

diff --git a/.github/workflows/eks-argocd-release.yml b/.github/workflows/eks-argocd-release.yml
@@ -25,7 +25,7 @@ name: |-
           repository: "$\{\{ github.event.repository.name \}\}"
           version: $\{\{ github.event.release.tag_name \}\}
         secrets:
-          github-private-actions-pat: "$\{\{ secrets.PUBLIC_REPO_ACCESS_TOKEN \}\}"
+          github-private-actions-pat: "$\{\{ secrets.ARGOCD_GITHUB_NONPROD \}\}"
           registry: "$\{\{ secrets.ECR_REGISTRY \}\}"
           secret-outputs-passphrase: "$\{\{ secrets.GHA_SECRET_OUTPUT_PASSPHRASE \}\}"
           ecr-region: "$\{\{ secrets.ECR_REGION \}\}"

diff --git a/.github/workflows/feature-branch.yml b/.github/workflows/feature-branch.yml
@@ -1,7 +1,9 @@
 name: Feature Branch
 on:
   pull_request:
-    branches: [ 'master' ]
+    branches: 
+      - master
+      - main
     types: [opened, synchronize, reopened, closed, labeled, unlabeled]
 
 permissions:
@@ -21,7 +23,7 @@ jobs:
       labels: ${{ toJSON(github.event.pull_request.labels.*.name) }}
       ref: ${{ github.event.pull_request.head.ref  }}
     secrets:
-      github-private-actions-pat: "${{ secrets.PUBLIC_REPO_ACCESS_TOKEN }}"
+      github-private-actions-pat: "${{ secrets.ARGOCD_GITHUB_NONPROD }}"
       registry: "${{ secrets.ECR_REGISTRY }}"
       secret-outputs-passphrase: "${{ secrets.GHA_SECRET_OUTPUT_PASSPHRASE }}"
       ecr-region: "${{ secrets.ECR_REGION }}"

diff --git a/.github/workflows/main-branch.yaml b/.github/workflows/main-branch.yaml
@@ -1,7 +1,9 @@
 name: Main Branch
 on:
   push:
-    branches: [ master ]
+    branches: 
+      - master
+      - main
 
 permissions:
   contents: write
@@ -16,7 +18,7 @@ jobs:
       path: deploy
       tests_enabled: false
     secrets:
-      github-private-actions-pat: "${{ secrets.PUBLIC_REPO_ACCESS_TOKEN }}"
+      github-private-actions-pat: "${{ secrets.ARGOCD_GITHUB_NONPROD }}"
       registry: "${{ secrets.ECR_REGISTRY }}"
       secret-outputs-passphrase: "${{ secrets.GHA_SECRET_OUTPUT_PASSPHRASE }}"
       ecr-region: "${{ secrets.ECR_REGION }}"

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -16,7 +16,7 @@ jobs:
       path: deploy
       version: ${{ github.event.release.tag_name }}
     secrets:
-      github-private-actions-pat: "${{ secrets.PUBLIC_REPO_ACCESS_TOKEN }}"
+      github-private-actions-pat: "${{ secrets.ARGOCD_GITHUB_PROD }}"
       registry: "${{ secrets.ECR_REGISTRY }}"
       secret-outputs-passphrase: "${{ secrets.GHA_SECRET_OUTPUT_PASSPHRASE }}"
       ecr-region: "${{ secrets.ECR_REGION }}"

diff --git a/.github/workflows/workflow-cd-argocd.yml b/.github/workflows/workflow-cd-argocd.yml
@@ -92,13 +92,13 @@ jobs:
           in: ${{ inputs.image }}
 
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Environment Info
-        uses: cloudposse/github-action-interface-environment@0.2.0
+        uses: cloudposse/github-action-interface-environment@0.3.0
         id: environment
         with:
-          implementation_repository: 'cloudposse/infra-live'
+          implementation_repository: 'cloudposse-examples/infra-config'
           implementation_path: '.github/environments/'
           implementation_file: 'eks-argocd.yml'
           implementation_ref: 'main'
@@ -108,14 +108,14 @@ jobs:
           repository: ${{ inputs.repository }}
 
       - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v2.2.0
+        uses: aws-actions/configure-aws-credentials@v4.0.1
         with:
           aws-region: ${{ steps.environment.outputs.region }}
           role-to-assume: ${{ steps.environment.outputs.role }}
           role-skip-session-tagging: true
 
       - name: Deploy
-        uses: cloudposse/[email protected].0
+        uses: cloudposse/[email protected].1
         id: deploy
         with:
           toolchain: ${{ inputs.toolchain }}

diff --git a/.github/workflows/workflow-cd-preview-argocd.yml b/.github/workflows/workflow-cd-preview-argocd.yml
@@ -120,7 +120,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Preview deployments controller
-        uses: cloudposse/github-action-preview-environment-controller@0.8.0
+        uses: cloudposse/github-action-preview-environment-controller@0.9.0
         id: controller
         with:
           labels: ${{ inputs.labels }}
@@ -162,13 +162,13 @@ jobs:
           desc: Environment purged
 
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Environment Info
         uses: cloudposse/[email protected]
         id: environment
         with:
-          implementation_repository: 'cloudposse/infra-live'
+          implementation_repository: 'cloudposse-examples/infra-config'
           implementation_path: '.github/environments/'
           implementation_file: 'eks-argocd.yml'
           implementation_ref: 'main'
@@ -178,14 +178,14 @@ jobs:
           repository: ${{ inputs.repository }}
 
       - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v2.2.0
+        uses: aws-actions/configure-aws-credentials@v4.0.1
         with:
           aws-region: ${{ steps.environment.outputs.region }}
           role-to-assume: ${{ steps.environment.outputs.role }}
           role-skip-session-tagging: true
 
       - name: Deploy
-        uses: cloudposse/[email protected].0
+        uses: cloudposse/[email protected].1
         id: deploy
         with:
           toolchain: ${{ inputs.toolchain }}
@@ -221,7 +221,7 @@ jobs:
       contents: read
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Seek deployment
         uses: cloudposse/[email protected]
@@ -233,11 +233,11 @@ jobs:
           status: success
 
       - name: Environment Info
-        uses: cloudposse/[email protected]
         if: ${{ steps.deployment.outputs.id != '' }}
+        uses: cloudposse/[email protected]
         id: environment
         with:
-          implementation_repository: 'cloudposse/infra-live'
+          implementation_repository: 'cloudposse-examples/infra-config'
           implementation_path: '.github/environments/'
           implementation_file: 'eks-argocd.yml'
           implementation_ref: 'main'
@@ -247,15 +247,15 @@ jobs:
           repository: ${{ inputs.repository }}
 
       - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v2.2.0
+        uses: aws-actions/configure-aws-credentials@v4.0.1
         if: ${{ steps.deployment.outputs.id != '' }}
         with:
           aws-region: ${{ steps.environment.outputs.region }}
           role-to-assume: ${{ steps.environment.outputs.role }}
           role-skip-session-tagging: true
 
       - name: Destroy
-        uses: cloudposse/[email protected].0
+        uses: cloudposse/[email protected].1
         if: ${{ steps.deployment.outputs.id != '' }}
         id: deploy
         with:
@@ -278,7 +278,7 @@ jobs:
           ref: ${{ github.sha }}
 
       - name: Inactivate deployment
-        uses: chrnorm/[email protected].0
+        uses: chrnorm/[email protected].1
         if: ${{ steps.deployment.outputs.id != '' }}
         with:
           state: inactive

diff --git a/.github/workflows/workflow-ci-dockerized-app-build.yml b/.github/workflows/workflow-ci-dockerized-app-build.yml
@@ -70,17 +70,17 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v2.2.0
+        uses: aws-actions/configure-aws-credentials@v4.0.1
         with:
           aws-region: ${{ secrets.ecr-region }}
           role-to-assume: ${{ secrets.ecr-iam-role }}
 
       - name: Build
         id: build
-        uses: cloudposse/github-action-docker-build-push@1.13.0
+        uses: cloudposse/github-action-docker-build-push@1.14.0
         with:
           organization: ${{ inputs.organization }}
           repository: ${{ inputs.repository }}
@@ -103,17 +103,17 @@ jobs:
     needs: [ build ]
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v2.2.0
+        uses: aws-actions/configure-aws-credentials@v4.0.1
         with:
           aws-region: ${{ secrets.ecr-region }}
           role-to-assume: ${{ secrets.ecr-iam-role }}
 
       - name: Tests
         id: test
-        uses: cloudposse/[email protected].2
+        uses: cloudposse/[email protected].3
         with:
           file: test/docker-compose.yml
           service: app

diff --git a/.github/workflows/workflow-ci-dockerized-app-promote.yml b/.github/workflows/workflow-ci-dockerized-app-promote.yml
@@ -83,7 +83,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v2.2.0
+        uses: aws-actions/configure-aws-credentials@v4.0.1
         with:
           aws-region: ${{ secrets.ecr-region }}
           role-to-assume: ${{ secrets.ecr-iam-role }}
@@ -99,7 +99,7 @@ jobs:
             false:
               image: ${{ inputs.repository }}/${{ inputs.app }}
 
-      - uses: cloudposse/[email protected].1
+      - uses: cloudposse/[email protected].2
         id: promote
         with:
           registry: ${{ secrets.registry }}

diff --git a/.github/workflows/workflow-controller-hotfix-release.yml b/.github/workflows/workflow-controller-hotfix-release.yml
@@ -33,7 +33,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           ref: ${{ inputs.ref }}
           fetch-depth: 0

diff --git a/Dockerfile b/Dockerfile
@@ -8,7 +8,7 @@ RUN cd /src && \
     go build -o example-app
 
 # Build the final image
-FROM alpine:3.18 as final
+FROM alpine:3.19 as final
 
 # Install the cloudposse alpine repository
 ADD https://apk.cloudposse.com/[email protected] /etc/apk/keys/