Bump gitops (#49)

* ⬆️ bump gitops

* 🚚 rename jira vars

* 🔥 remove docker enabled

* 🎨 change requirements

Author: flaxel

.github/workflows/template_gitops.yml

@@ -3,37 +3,33 @@ name: GitOps
 on:
   workflow_call:
     inputs:
-      dockerbuildargs:
+      docker-build-args:
         required: false
         type: string
-      dockerbuildtarget:
+      docker-build-target:
         required: false
         type: string
-      dockerenabled:
-        required: false
-        type: boolean
-        default: true
-      dockerimage:
+      docker-image:
         required: false
         type: string
         default: private/${{ github.event.repository.name }}
-      gitopsdev:
+      gitops-dev:
         required: false
         type: string
-      gitopsstage:
+      gitops-stage:
         required: false
         type: string
-      gitopsprod:
+      gitops-prod:
         required: false
         type: string
     secrets:
-      docker_username:
-        required: true
-      docker_password:
-        required: true
-      gitops_token:
-        required: true
-      npm_token:
+      docker-username:
+        required: false
+      docker-password:
+        required: false
+      gitops-token:
+        required: false
+      npm-token:
         required: false
 
 jobs:
@@ -48,25 +44,18 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
-      - uses: actions/checkout@v3
-        with:
-          repository: Staffbase/gitops-github-action
-          ref: v3
-          path: .github/gitops
-
       - name: GitOps (build, push and deploy a new Docker image)
-        uses: ./.github/gitops
+        uses: Staffbase/gitops-github-action@v4
         with:
-          dockerusername: ${{ secrets.docker_username }}
-          dockerpassword: ${{ secrets.docker_password }}
-          dockerenabled: ${{ inputs.dockerenabled }}
+          docker-username: ${{ secrets.docker-username }}
+          docker-password: ${{ secrets.docker-password }}
           # remove npm token if feature is available: https://github.com/github-community/community/discussions/17554
-          dockerbuildargs: |
-            ${{ inputs.dockerbuildargs }}
-            NPM_TOKEN=${{ secrets.npm_token }}
-          dockerbuildtarget: ${{ inputs.dockerbuildtarget }}
-          dockerimage: ${{ inputs.dockerimage }}
-          gitopstoken: ${{ secrets.gitops_token }}
-          gitopsdev: ${{ inputs.gitopsdev }}
-          gitopsstage: ${{ inputs.gitopsstage }}
-          gitopsprod: ${{ inputs.gitopsprod }}
+          docker-build-args: |
+            ${{ inputs.docker-build-args }}
+            NPM_TOKEN=${{ secrets.npm-token }}
+          docker-build-target: ${{ inputs.docker-build-target }}
+          docker-image: ${{ inputs.docker-image }}
+          gitops-token: ${{ secrets.gitops-token }}
+          gitops-dev: ${{ inputs.gitops-dev }}
+          gitops-stage: ${{ inputs.gitops-stage }}
+          gitops-prod: ${{ inputs.gitops-prod }}

.github/workflows/template_jira_tagging.yml

@@ -7,15 +7,15 @@ on:
         required: true
         type: string
         default: ${{ github.event.repository.name }}
-      tag_matcher:
+      tag-matcher:
         required: false
         type: string
     secrets:
-      jira_url:
+      jira-url:
         required: true
-      jira_token:
+      jira-token:
         required: true
-      jira_email:
+      jira-email:
         required: true
 
 jobs:
@@ -34,14 +34,14 @@ jobs:
         id: fetchTicketIds
         uses: Staffbase/[email protected]
         env:
-          TAG_MATCHER: ${{ inputs.tag_matcher }}
+          TAG_MATCHER: ${{ inputs.tag-matcher }}
 
       - name: Add release notes to JIRA tickets
         uses: Staffbase/[email protected]
         env:
-          JIRA_BASEURL: ${{ secrets.jira_url }}
-          JIRA_TOKEN: ${{ secrets.jira_token }}
-          JIRA_EMAIL: ${{ secrets.jira_email }}
+          JIRA_BASEURL: ${{ secrets.jira-url }}
+          JIRA_TOKEN: ${{ secrets.jira-token }}
+          JIRA_EMAIL: ${{ secrets.jira-email }}
         with:
           issueIds: ${{ steps.fetchTicketIds.outputs.tIDs }}
           componentName: ${{ inputs.name }}

README.md

@@ -76,33 +76,31 @@ jobs:
   gitops:
     uses: Staffbase/gha-workflows/.github/workflows/[email protected]
     with:
-      # optional: build and push the Docker image, default: true
-      dockerenabled: false
       # optional: list of build-time variables
-      dockerbuildargs: |
+      docker-build-args: |
         "any important args"
       # optional: set the target stage to build
-      dockerbuildtarget: "any target"
+      docker-build-target: "any target"
       # optional: name of the docker image, default: private/<repository_name>
-      dockerimage: <your-image>
+      docker-image: <your-image>
       # optional: files which should be updated for dev
-      gitopsdev: |-
+      gitops-dev: |-
         your files
       # optional: files which should be updated for stage
-      gitopsstage: |-
+      gitops-stage: |-
         your files
       # optional: files which should be updated for prod
-      gitopsprod: |-
+      gitops-prod: |-
         your files
     secrets:
       # token to access the repository
-      gitops_token: ${{ <your-gitops-token> }}
+      gitops-token: ${{ <your-gitops-token> }}
       # username for the docker registry
-      docker_username: ${{ <your-docker-username> }}
+      docker-username: ${{ <your-docker-username> }}
       # password for the docker registry
-      docker_password: ${{ <your-docker-password> }}
+      docker-password: ${{ <your-docker-password> }}
       # optional: token to pull private npm packages
-      npm_token: ${{ <your-npm-token> }}
+      npm-token: ${{ <your-npm-token> }}
 ```
 </details>
 
@@ -127,14 +125,14 @@ jobs:
       # name of the service to add as label, default: name of the repository
       name: 'component name'
       # optional: regex to match the tags
-      tag_matcher: your regex
+      tag-matcher: your regex
     secrets:
       # basic url for jira api
-      jira_url: ${{ <your-url> }}
+      jira-url: ${{ <your-url> }}
       # api token for jira usage
-      jira_token: ${{ <your-token> }}
+      jira-token: ${{ <your-token> }}
       # email of the api token owner
-      jira_email: ${{ <your-email> }}
+      jira-email: ${{ <your-email> }}
 ```
 </details>