release -> main merge (20220808)

.github/workflows/build-and-push.yml

@@ -4,6 +4,9 @@ on:
     branches:
       - main
       - develop
+      - release
+  workflow_dispatch:
+
 env:
   SERVICE: tks-api
   TAG: ${{github.sha}}
@@ -44,9 +47,11 @@ jobs:
 
           if [[ ${{github.ref}} == *"develop"* ]]; then
             ( cd cicd-manifests/${SERVICE}/overlay/development && kustomize edit set image docker.io/sktcloud/${SERVICE}:${TAG} && git add kustomization.yaml )
+          elif [[ ${{github.ref}} == *"release"* ]]; then
             ( cd cicd-manifests/${SERVICE}/overlay/ft && kustomize edit set image docker.io/sktcloud/${SERVICE}:${TAG} && git add kustomization.yaml )
           elif [[ ${{github.ref}} == *"main"* ]]; then
             ( cd cicd-manifests/${SERVICE}/overlay/cicd && kustomize edit set image docker.io/sktcloud/${SERVICE}:${TAG} && git add kustomization.yaml )
+            ( cd cicd-manifests/${SERVICE}/overlay/prd && kustomize edit set image docker.io/sktcloud/${SERVICE}:${TAG} && git add kustomization.yaml )
           fi
 
           cd cicd-manifests

.github/workflows/build.yml

@@ -1,9 +1,10 @@
-name: Build image
+name: Build Image
 on:
   pull_request_target:
     branches:
       - main
       - develop
+      - release
 
 env:
   SERVICE: tks-api

.github/workflows/lint.yml

@@ -1,17 +1,17 @@
-name: golangci-lint
+name: Lint
 on:
   push:
     tags:
       - v*
     branches:
       - main
       - develop
-      - "release**"
+      - release
   pull_request:
     branches:
       - main
       - develop
-      - "release**"
+      - release
 jobs:
   golangci:
     name: lint

.gitignore

@@ -8,8 +8,9 @@
 *.njsproj
 *.sln
 *.sw?
+*.sh
 
 web
 main
 output
-vendor
+vendor