Merge pull request #549 from openinfradev/harbor

test
openinfradev · Nov 11, 2024 · eee19ec · eee19ec
2 parents 5a5e500 + 01fd85f
commit eee19ec
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/.github/workflows/build-and-push.yml b/.github/workflows/build-and-push.yml
@@ -10,6 +10,7 @@ on:
 env:
   SERVICE: tks-api
   TAG: ${{github.sha}}
+  REGISTRY: harbor.taco-cat.xyz
 
 jobs:
   build-deploy:
@@ -24,6 +25,7 @@ jobs:
       - name: Login to DockerHub
         uses: docker/login-action@v1
         with:
+          registry: ${{REGISTRY}}
           username: ${{secrets.HARBOR_USERNAME}}
           password: ${{secrets.HARBOR_SECRET}}
 
@@ -33,7 +35,7 @@ jobs:
         with:
           push: true
           tags: |
-            sktcloud/${{env.SERVICE}}:${{env.TAG}}
+            tks/${{env.SERVICE}}:${{env.TAG}}
 
       - name: Setup Kustomize
         uses: imranismail/setup-kustomize@v1
@@ -46,12 +48,12 @@ jobs:
           git clone "https://${{secrets.BOT_GITHUB_TOKEN}}@github.com/openinfradev/cicd-manifests.git"
 
           if [[ ${{github.ref}} == *"develop"* ]]; then
-            ( cd cicd-manifests/${SERVICE}/overlay/development && kustomize edit set image docker.io/sktcloud/${SERVICE}:${TAG} && git add kustomization.yaml )
+            ( cd cicd-manifests/${SERVICE}/overlay/development && kustomize edit set image ${REGISTRY}/tks/${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 )
+            ( cd cicd-manifests/${SERVICE}/overlay/ft && kustomize edit set image ${REGISTRY}/tks/${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 )
+            ( cd cicd-manifests/${SERVICE}/overlay/cicd && kustomize edit set image ${REGISTRY}/tks/${SERVICE}:${TAG} && git add kustomization.yaml )
+            ( cd cicd-manifests/${SERVICE}/overlay/prd && kustomize edit set image ${REGISTRY}/tks/${SERVICE}:${TAG} && git add kustomization.yaml )
           fi
 
           cd cicd-manifests

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -9,6 +9,7 @@ on:
 env:
   SERVICE: tks-api
   TAG: ${{github.sha}}
+  REGISTRY: harbor.taco-cat.xyz
 
 jobs:
   build-image:
@@ -25,6 +26,7 @@ jobs:
       - name: Login to DockerHub
         uses: docker/login-action@v1
         with:
+          registry: ${{REGISTRY}}
           username: ${{secrets.HARBOR_USERNAME}}
           password: ${{secrets.HARBOR_SECRET}}
 
@@ -34,4 +36,4 @@ jobs:
         with:
           push: false
           tags: |
-            sktcloud/${{env.SERVICE}}:${{env.TAG}}
+            tks/${{env.SERVICE}}:${{env.TAG}}
diff --git a/README.md b/README.md
@@ -67,3 +67,5 @@ roleRef:
   name: tks-api
   apiGroup: rbac.authorization.k8s.io
 ```
+
+