[pull] master from openfaas:master

.DEREK.yml

@@ -2,83 +2,14 @@ curators:
  - alexellis
  - LucasRoesler
  - viveksyngh
- - Waterdrips
+ - nitishkumar71
  - rgee0
+ - welteki
 
 features:
  - dco_check
  - comments
  - pr_description_required
  - release_notes
-# - hacktoberfest
-# - no_newbies # Newbies are welcome, however there is some automation that will affect you during October. You are welcome, please be patient with us.
 
 contributing_url: https://github.com/openfaas/faas/blob/master/CONTRIBUTING.md
-
-required_in_issues:
-  - "## Expected Behaviour"
-  - "## Current Behaviour"
-  - "## Possible Solution"
-  - "## Steps to Reproduce (for bugs)"
-  - "## Context"
-  - "## Your Environment"
-
-custom_messages:
-  - name: template
-    value: |
-           Thank you for your interest in the project.
-
-           By participating in the community, you are agreeing to follow the contribution guidelines.
-
-           This project uses templates for new Issues and Pull Requests. These templates contain information that the team needs you to provide, before they can help.
-
-           You are receiving this message because you chose to delete the template instead of filling it in as required by the project maintainers.
-
-           Please go ahead and edit this Issue or Pull Request and please provide all the fields that were requested. If it is simpler, you may open a new Issue or Pull Request or find the text within the `.github` folder in this repository.
-
-  - name: propose
-    value: |
-           This project follows a contributing guide which states that all
-           changes must be proposed with an Issue before being worked on.
-
-           Please raise an Issue and update your Pull Request to include
-           the ID or link as part of the description.
-
-           Thank you for your contribution.
-
-  - name: test
-    value: |
-           This project follows a contributing guide which requires that
-           all changes are tested before being merged. You should include
-           worked examples that a maintainer can run to prove that the
-           changes are good.
-
-           Screenshots and command line output are also accepted, but
-           must show the positive, and negative cases, not just that 
-           what was added worked as you expected.
-
-           Thank you for your contribution.
-
-  - name: enduser
-    value: |
-           Thank you for your interest in OpenFaaS. This project is maintained and made available for hobbyists and commercial users alike, so we need to balance our time across everyone's needs. Whilst we are excited in your interest in using OpenFaaS, we would also ask you to take a look at our contribution guide on [Setting expectations, support and SLAs](https://github.com/openfaas/faas/blob/master/CONTRIBUTING.md#setting-expectations-support-and-slas).
-
-           Commercial users can purchase [support](https://openfaas.com/support) in order to get dedicated help from OpenFaaS Ltd, or they can book ad-hoc consulting hours to get an engineer to dedicate time to helping them.
-
-           If that is not a good fit for you at this time, please check out the OpenFaaS [GitHub Sponsors](https://github.com/sponsors/openfaas) options which are priced for practitioners like yourself. Organisations can also sponsor through their GitHub billing relationship.
-
-           When you become a sponsor as an indvidual, it will show this on your issues and PRs, so that the community can see that you are supporting our work, and can prioritise your needs.
-
-           If you are receiving this message after having received hands-on support from the OpenFaaS community, please join [GitHub Sponsors](https://github.com/sponsors/openfaas) to say thank you for our time. 
-
-           Thank you for supporting OpenFaaS.
-
-  - name: service
-    value: |
-           We are glad that we could be of help with your usage of OpenFaaS.
-
-           Since OpenFaaS is maintained by a community of volunteers, we encourage all users to become individual [Sponsors on GitHub](https://github.com/sponsors/openfaas) for the OpenFaaS project.
-
-           As a benefit, you will show up as a Sponsor on future issues & PRs and also get access to a Sponsors Portal with curated updates across the 40-50 open source projects that we maintain for the community.
-
-           Thank you for supporting OpenFaaS.

.github/CODEOWNERS

@@ -1 +1,2 @@
 @alexellis
+@welteki

.github/ISSUE_TEMPLATE.md

@@ -1,12 +1,17 @@
 <!-- Due dilligence -->
-
 ## My actions before raising this issue
 - [ ] Followed the [troubleshooting guide](https://docs.openfaas.com/deployment/troubleshooting/)
 - [ ] Read/searched [the docs](https://docs.openfaas.com/)
 - [ ] Searched [past issues](/issues)
 
-<!--- Provide a general summary of the issue in the Title above -->
+<!-- How is this affecting you? What task are you trying to accomplish? -->
+## Why do you need this?
+
+## Who is this for?
+
+What company is this for? Are you listed in the [ADOPTERS.md](https://github.com/openfaas/faas/blob/master/ADOPTERS.md) file?
 
+<!--- Provide a general summary of the issue in the Title above -->
 ## Expected Behaviour
 <!--- If you're describing a bug, tell us what should happen -->
 <!--- If you're suggesting a change/improvement, tell us how it should work -->
@@ -16,8 +21,9 @@
 <!--- If describing a bug, tell us what happens instead of the expected behavior -->
 <!--- If suggesting a change/improvement, explain the difference from current behavior -->
 
+
 ## Are you a GitHub Sponsor (Yes/No?)
-<!--- Given this request for help, how are you supporting the project? -->
+<!-- Issues created by customers or monthly sponsors get priority -->
 
 Check at: https://github.com/sponsors/openfaas
 - [ ] Yes
@@ -31,6 +37,7 @@ Check at: https://github.com/sponsors/openfaas
 ## Which Solution Do You Recommend?
 <!--- Pick your preferred solution, if you were to implement and maintain this change -->
 
+
 ## Steps to Reproduce (for bugs)
 <!--- Provide a link to a live example, or an unambiguous set of steps to -->
 <!--- reproduce this bug. Include code to reproduce, if relevant -->
@@ -40,8 +47,7 @@ Check at: https://github.com/sponsors/openfaas
 4.
 
 ## Context
-<!--- How has this issue affected you? What are you trying to accomplish? -->
-<!--- Providing context helps us come up with a solution that is most useful in the real world -->
+<!-- Any additional context such as how this is affecting you or could affect other users --> 
 
 
 ## Your Environment
@@ -57,3 +63,4 @@ Check at: https://github.com/sponsors/openfaas
 * Code example or link to GitHub repo or gist to reproduce problem:
 
 * Other diagnostic information / logs from [troubleshooting guide](https://docs.openfaas.com/deployment/troubleshooting)
+

.github/workflows/build.yml

@@ -9,71 +9,37 @@ on:
       - '*'
 
 jobs:
-
-  build-gateway:
+  build:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        go-version: [1.15.x]
     steps:
       - uses: actions/checkout@master
         with:
           fetch-depth: 1
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-      - name: Get TAG
-        id: get_tag
-        run: echo ::set-output name=TAG::latest-dev
+        uses: docker/setup-buildx-action@v3
+
+      - name: Get git commit
+        id: get_git_commit
+        run: echo "GIT_COMMIT=$(git rev-parse HEAD)" >> $GITHUB_ENV
+      - name: Get version
+        id: get_version
+        run: echo "VERSION=$(git describe --tags --dirty)" >> $GITHUB_ENV
       - name: Get Repo Owner
         id: get_repo_owner
-        run: echo ::set-output name=repo_owner::$(echo ${{ github.repository_owner }} | tr '[:upper:]' '[:lower:]')
+        run: echo "REPO_OWNER=$(echo ${{ github.repository_owner }} | tr '[:upper:]' '[:lower:]')" > $GITHUB_ENV
+
       - name: Build ${{ matrix.svc }}
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v5
         with:
           context: ./gateway
           file: ./gateway/Dockerfile
           outputs: "type=image,push=false"
-          platforms: linux/amd64,linux/arm/v7,linux/arm64
+          platforms: linux/amd64,linux/arm64
           build-args: |
-            VERSION=${{ steps.get_tag.outputs.TAG }}
+            VERSION=${{ env.TAG }}
             GIT_COMMIT=${{ github.sha }}
           tags: |
-            ghcr.io/${{ steps.get_repo_owner.outputs.repo_owner }}/gateway:${{ steps.get_tag.outputs.TAG }}
-            ghcr.io/${{ steps.get_repo_owner.outputs.repo_owner }}/gateway:${{ github.sha }}
-            ghcr.io/${{ steps.get_repo_owner.outputs.repo_owner }}/gateway:latest
-
-  build-auth-plugins:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        go-version: [1.13.x]
-        svc: [
-          basic-auth
-        ]
-    steps:
-      - uses: actions/checkout@master
-        with:
-          fetch-depth: 1
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-      - name: Get TAG
-        id: get_tag
-        run: echo ::set-output name=TAG::latest-dev
-      - name: Get Repo Owner
-        id: get_repo_owner
-        run: echo ::set-output name=repo_owner::$(echo ${{ github.repository_owner }} | tr '[:upper:]' '[:lower:]')
-      - name: Build ${{ matrix.svc }}
-        uses: docker/build-push-action@v2
-        with:
-          context: ./auth/${{ matrix.svc }}
-          file: ./auth/${{ matrix.svc }}/Dockerfile
-          outputs: "type=image,push=false"
-          platforms: linux/amd64,linux/arm/v7,linux/arm64
-          tags: |
-            ghcr.io/${{ steps.get_repo_owner.outputs.repo_owner }}/${{ matrix.svc }}:${{ steps.get_tag.outputs.TAG }}
-            ghcr.io/${{ steps.get_repo_owner.outputs.repo_owner }}/${{ matrix.svc }}:${{ github.sha }}
-            ghcr.io/${{ steps.get_repo_owner.outputs.repo_owner }}/${{ matrix.svc }}:latest
+            ghcr.io/${{ env.REPO_OWNER }}/gateway:${{ github.sha }}
+            ghcr.io/${{ env.REPO_OWNER }}/gateway:latest

.github/workflows/publish.yml

@@ -6,82 +6,57 @@ on:
       - '*'
 
 jobs:
-
-  publish-gateway:
+  publish:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        go-version: [1.15.x]
+    permissions:
+      actions: read
+      checks: write
+      issues: read
+      packages: write
+      pull-requests: read
+      repository-projects: read
+      statuses: read
+
     steps:
       - uses: actions/checkout@master
         with:
           fetch-depth: 1
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v3
       - name: Login to Docker Registry
-        uses: docker/login-action@v1
+        uses: docker/login-action@v3
         with:
           username: ${{ github.repository_owner }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
+          password: ${{ secrets.GITHUB_TOKEN }}
           registry: ghcr.io
+
       - name: Get TAG
         id: get_tag
-        run: echo ::set-output name=TAG::${GITHUB_REF#refs/tags/}
+        run: echo TAG=${GITHUB_REF#refs/tags/} >> $GITHUB_ENV
+
+      - name: Get git commit
+        id: get_git_commit
+        run: echo "GIT_COMMIT=$(git rev-parse HEAD)" >> $GITHUB_ENV
+      - name: Get version
+        id: get_version
+        run: echo "VERSION=$(git describe --tags --dirty)" >> $GITHUB_ENV
       - name: Get Repo Owner
         id: get_repo_owner
-        run: echo ::set-output name=repo_owner::$(echo ${{ github.repository_owner }} | tr '[:upper:]' '[:lower:]')
+        run: echo "REPO_OWNER=$(echo ${{ github.repository_owner }} | tr '[:upper:]' '[:lower:]')" > $GITHUB_ENV
+
       - name: Publish ${{ matrix.svc }}
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v5
         with:
           context: ./gateway
           file: ./gateway/Dockerfile
           outputs: "type=registry,push=true"
-          platforms: linux/amd64,linux/arm/v7,linux/arm64
+          platforms: linux/amd64,linux/arm64
           build-args: |
-            VERSION=${{ steps.get_tag.outputs.TAG }}
+            VERSION=${{ env.TAG }}
             GIT_COMMIT=${{ github.sha }}
           tags: |
-            ghcr.io/${{ steps.get_repo_owner.outputs.repo_owner }}/gateway:${{ steps.get_tag.outputs.TAG }}
-            ghcr.io/${{ steps.get_repo_owner.outputs.repo_owner }}/gateway:${{ github.sha }}
-            ghcr.io/${{ steps.get_repo_owner.outputs.repo_owner }}/gateway:latest
-  publish-auth-plugins:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        go-version: [1.13.x]
-        svc: [
-          basic-auth
-        ]
-    steps:
-      - uses: actions/checkout@master
-        with:
-          fetch-depth: 1
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-      - name: Get TAG
-        id: get_tag
-        run: echo ::set-output name=TAG::${GITHUB_REF#refs/tags/}
-      - name: Login to Docker Registry
-        uses: docker/login-action@v1
-        with:
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-          registry: ghcr.io
-      - name: Get Repo Owner
-        id: get_repo_owner
-        run: echo ::set-output name=repo_owner::$(echo ${{ github.repository_owner }} | tr '[:upper:]' '[:lower:]')
-      - name: Publish ${{ matrix.svc }}
-        uses: docker/build-push-action@v2
-        with:
-          context: ./auth/${{ matrix.svc }}
-          file: ./auth/${{ matrix.svc }}/Dockerfile
-          outputs: "type=registry,push=true"
-          platforms: linux/amd64,linux/arm/v7,linux/arm64
-          tags: |
-            ghcr.io/${{ steps.get_repo_owner.outputs.repo_owner }}/${{ matrix.svc }}:${{ steps.get_tag.outputs.TAG }}
-            ghcr.io/${{ steps.get_repo_owner.outputs.repo_owner }}/${{ matrix.svc }}:${{ github.sha }}
-            ghcr.io/${{ steps.get_repo_owner.outputs.repo_owner }}/${{ matrix.svc }}:latest
+            ghcr.io/${{ env.REPO_OWNER }}/gateway:${{ github.sha }}
+            ghcr.io/${{ env.REPO_OWNER }}/gateway:${{ env.TAG }}
+            ghcr.io/${{ env.REPO_OWNER }}/gateway:latest