diff --git a/.github/actions/detect-docker-image-tags/action.yaml b/.github/actions/detect-docker-image-tags/action.yaml index 86de69cb95..18dc766362 100644 --- a/.github/actions/detect-docker-image-tags/action.yaml +++ b/.github/actions/detect-docker-image-tags/action.yaml @@ -16,7 +16,7 @@ name: "Detect Docker image tags" description: "A action to detect Docker image tags" inputs: - tag_name: + tags: description: "Tag name to check whether exists or not" required: true default: "" @@ -53,15 +53,16 @@ runs: ["vdaas/vald-ci-container"]="" ) - for image in ${IMAGES} - do + for image in ${IMAGES}; do echo "check for ${image}" - - if curl -s "https://registry.hub.docker.com/v2/repositories/${image}/tags/${TAG_NAME}" | jq '.name' | grep -v "null"; then - echo "${image}:${TAG_NAME} exists. adding a helm option '--set ${m[${image}]}=${TAG_NAME}'." - export HELM_EXTRA_OPTIONS="${HELM_EXTRA_OPTIONS} --set ${m[${image}]}=${TAG_NAME}" - export IMAGE_TAGS="${IMAGE_TAGS} ${m[${image}]}=\"${TAG_NAME}\"" - fi + for tag in ${TAGS}; do + if curl -s "https://registry.hub.docker.com/v2/repositories/${image}/tags/${tag}" | jq '.name' | grep -v "null"; then + echo "${image}:${tag} exists. adding a helm option '--set ${m[${image}]}=${tag}'." + export HELM_EXTRA_OPTIONS="${HELM_EXTRA_OPTIONS} --set ${m[${image}]}=${tag}" + export IMAGE_TAGS="${IMAGE_TAGS} ${m[${image}]}=\"${tag}\"" + break + fi + done done echo "HELM_EXTRA_OPTIONS=${HELM_EXTRA_OPTIONS}" @@ -70,4 +71,4 @@ runs: echo "IMAGE_TAGS=${IMAGE_TAGS}" >> $GITHUB_OUTPUT env: IMAGES: ${{ inputs.images }} - TAG_NAME: ${{ inputs.tag_name }} + TAGS: ${{ inputs.tags }} diff --git a/.github/actions/determine-docker-image-tag/action.yaml b/.github/actions/determine-docker-image-tag/action.yaml index 1f4b449861..1705c2972d 100644 --- a/.github/actions/determine-docker-image-tag/action.yaml +++ b/.github/actions/determine-docker-image-tag/action.yaml @@ -16,12 +16,12 @@ name: "Determine Docker image tag" description: "A action to determine Docker image tag" outputs: + TAGS: + description: "docker image tag list" + value: ${{ steps.determine_tag_name.outputs.TAGS }} PRIMARY_TAG: - description: "Primary tag" + description: "highest priority docker image tag in tag list" value: ${{ steps.determine_tag_name.outputs.PRIMARY_TAG }} - DEFAULT_TAG: - description: "default tag. Tag to be used if the primary tag does not exist" - value: ${{ steps.determine_tag_name.outputs.DEFAULT_TAG }} runs: using: "composite" steps: @@ -38,41 +38,63 @@ runs: id: determine_tag_name run: | if [[ "$GITHUB_REF" =~ ^refs/tags/.* ]]; then - tag_name=`echo $GITHUB_REF | sed -e 's:^refs/tags/::'` - echo "${tag_name}" > versions/VALD_VERSION + # The following is the priority of tags: + # tag -> release/vx.x tag (release branch build tag) -> commit hash tag -> vx.x -> latest tag + # When a tag is created, the image build for the tag may not be finished. + # In that case, the CI container will use the tag for the release branch. + # At the timing of the creation of the tag, the vx.x points to the previous version, so the priority is lowered. + # (At the timing of the start of the image build for tag, vx.x and tag are equal.) + tag=$(echo $GITHUB_REF | sed -e 's:^refs/tags/::') # e.g) v1.7.6 + tags="${tag}" - primary_tag="${tag_name}" - default_tag="nightly" - elif [[ "${{ github.event_name }}" = "pull_request" || "${{ github.event_name }}" = "pull_request_target" ]]; then - pr_num=`cat $GITHUB_EVENT_PATH | jq -r ".number"` - echo "PR-${pr_num}" > versions/VALD_VERSION + release_branch_tag="release/${major_minor_tag}" # e.g) release/v1.7 + tags="${tags} ${release_branch_tag}" + + major_minor_tag="$(echo "${tag}" | sed -E 's/^v?([0-9]+\.[0-9]+).*$/v\1/')" # e.g) v.1.7 + tags="${tags} ${major_minor_tag}" - primary_tag="pr-${pr_num}" - default_tag="nightly" + commit_hash_tag=${GITHUB_SHA::8} + tags="${tags} ${commit_hash_tag}" + tags="${tags} latest" - # For pull request to the release branch, use the release branch latest tag as the default tag (vx.x). + elif [[ "${{ github.event_name }}" = "pull_request" || "${{ github.event_name }}" = "pull_request_target" ]]; then + # The following is the priority of tags: + # pr-xxx tag (PR build tag) -> release/vx.x tag (release branch tag) or nightly tag + pr_num=$(cat $GITHUB_EVENT_PATH | jq -r ".number") + tags="pr-${pr_num}" + + # For pull request to the release branch, use the release branch latest tag as the default tag (release/vx.x). # This is only set if the event that triggers the workflow execution is pull_request or pull_request_target. if [[ "$GITHUB_BASE_REF" =~ ^release/v([0-9]+)\.([0-9]+)$ ]]; then - tag_name=`echo $GITHUB_BASE_REF | sed -e 's:^release/::'` - default_tag="${tag_name}" + tags="${tags} $(echo "$GITHUB_BASE_REF")" + else + # Currently, it is assumed to be nightly. + # However, further conditions will be added in the future if they cause inconvenience. + tags="${tags} nightly" fi elif [ "$GITHUB_REF" = "refs/heads/main" ]; then - echo "nightly" > versions/VALD_VERSION + # The following is the priority of tags: + # commit hash tag -> nightly tag + commit_hash_tag=${GITHUB_SHA::8} + tags="${commit_hash_tag}" + tags="${tags} nightly" - primary_tag="nightly" - default_tag="nightly" elif [[ "$GITHUB_REF" =~ ^refs/heads/release/v([0-9]+)\.([0-9]+)$ ]]; then - tag_name=`echo $GITHUB_REF | sed -e 's:^refs/heads/release/::'` - echo "${tag_name}" > versions/VALD_VERSION + # The following is the priority of tags: + # release/vx.x tag (release branch build tag) -> commit hash tag -> nightly tag + release_branch_tag=$(echo $GITHUB_REF | sed -e 's:^refs/heads/::') # e.g) release/v1.7 + tags="${release_branch_tag}" - primary_tag="${tag_name}" - default_tag="nightly" + commit_hash_tag=${GITHUB_SHA::8} + tags="${tags} ${commit_hash_tag}" + tags="${tags} nightly" else - primary_tag="unknown" - default_tag="unknown" + tags="unknown" fi + primary_tag=$(echo ${tags} | awk '{print $1}') + + echo "Determined tags: ${tags}" + echo "Primary tag: ${primary_tag}" - echo "PRIMARY_TAG is determined: ${primary_tag}" - echo "DEFAULT_TAG is determined: ${default_tag}" + echo "TAGS=${tags}" >> $GITHUB_OUTPUT echo "PRIMARY_TAG=${primary_tag}" >> $GITHUB_OUTPUT - echo "DEFAULT_TAG=${default_tag}" >> $GITHUB_OUTPUT diff --git a/.github/actions/docker-build/action.yaml b/.github/actions/docker-build/action.yaml index 34e1a416ba..ffd4d0757d 100644 --- a/.github/actions/docker-build/action.yaml +++ b/.github/actions/docker-build/action.yaml @@ -84,25 +84,32 @@ runs: echo "PLATFORMS=${platforms}" >> $GITHUB_OUTPUT env: TARGET_PLATFORMS: ${{ inputs.platforms }} + PRIMARY_TAG: ${{ steps.determine_tag_name.outputs.PRIMARY_TAG }} + - name: Update Vald version + shell: bash + run: echo "${PRIMARY_TAG}" >> versions/VALD_VERSION + env: + PRIMARY_TAG: ${{ steps.determine_tag_name.outputs.PRIMARY_TAG }} - name: Add extra tags shell: bash id: add_extra_tags run: | - extra_tags="-t ${ALTER_IMAGE_NAME}:${PRIMARY_TAG}" - if [[ "$GITHUB_REF" =~ ^refs/tags/.* ]]; then - latest_tags="-t ${IMAGE_NAME}:latest -t ${ALTER_IMAGE_NAME}:latest" - extra_tags="${extra_tags} ${latest_tags}" - fi - if [[ "$GITHUB_REF" =~ ^refs/heads/main$ ]] || [[ "$GITHUB_REF" =~ ^refs/heads/master$ ]] || [[ "$GITHUB_REF" =~ ^refs/heads/release.* ]] || [[ "${PRIMARY_TAG}" == "nightly" ]]; then - commit_hash=${GITHUB_SHA::8} - hash_tags="-t ${IMAGE_NAME}:${commit_hash} -t ${ALTER_IMAGE_NAME}:${commit_hash}" - extra_tags="${extra_tags} ${hash_tags}" + if [[ "${{ github.event_name }}" = "pull_request" || "${{ github.event_name }}" = "pull_request_target" ]]; then + extra_tags="-t ${IMAGE_NAME}:${PRIMARY_TAG} -t ${ALTER_IMAGE_NAME}:${PRIMARY_TAG}" + else + for tag in ${TAGS}; do + if [[ "${tag}" = "nightly" ]] && (! [[ "$GITHUB_REF" =~ ^refs/heads/main$ ]] || ! [[ "$GITHUB_REF" =~ ^refs/heads/master$ ]]); then + continue + fi + extra_tags="${extra_tags} -t ${IMAGE_NAME}:${tag} -t ${ALTER_IMAGE_NAME}:${tag}" + done fi echo "EXTRA_TAGS is determined: ${extra_tags}" echo "EXTRA_TAGS=${extra_tags}" >> $GITHUB_OUTPUT env: IMAGE_NAME: ${{ steps.image_name.outputs.IMAGE_NAME }} ALTER_IMAGE_NAME: ${{ steps.image_name.outputs.ALTER_IMAGE_NAME }} + TAGS: ${{ steps.determine_tag_name.outputs.TAGS }} PRIMARY_TAG: ${{ steps.determine_tag_name.outputs.PRIMARY_TAG }} - name: Build and Push shell: bash diff --git a/.github/actions/e2e-deploy-vald-helm-operator/action.yaml b/.github/actions/e2e-deploy-vald-helm-operator/action.yaml index 8743b5a3b6..edc38eccff 100644 --- a/.github/actions/e2e-deploy-vald-helm-operator/action.yaml +++ b/.github/actions/e2e-deploy-vald-helm-operator/action.yaml @@ -40,10 +40,6 @@ inputs: description: "If you want to use local charts, set this to true." required: false default: "true" - default_image_tag: - description: "Default image tag. e.g) nightly, vx.x, vx.x.x, pr-xxx" - required: true - default: "nightly" outputs: POD_NAME: description: "A pod name that waited for" @@ -67,23 +63,20 @@ runs: if: ${{ inputs.use_local_charts == 'false' }} run: | helm install vald-helm-operator \ - --set image.tag=${DEFAULT_IMAGE_TAG} \ ${HELM_EXTRA_OPTIONS} \ charts/vald-helm-operator/. sleep 6 env: - DEFAULT_IMAGE_TAG: ${{ inputs.default_image_tag }} HELM_EXTRA_OPTIONS: ${{ inputs.helm_extra_options }} - name: Deploy vald helm operator from local charts shell: bash id: deploy_vald_helm_operator_local if: ${{ inputs.use_local_charts == 'true' }} run: | - make k8s/vald-helm-operator/deploy VERSION=${DEFAULT_IMAGE_TAG} HELM_EXTRA_OPTIONS="${HELM_EXTRA_OPTIONS}" + make k8s/vald-helm-operator/deploy HELM_EXTRA_OPTIONS="${HELM_EXTRA_OPTIONS}" sleep 3 env: - DEFAULT_IMAGE_TAG: ${{ inputs.default_image_tag }} HELM_EXTRA_OPTIONS: ${{ inputs.helm_extra_options }} - name: Deploy vald shell: bash diff --git a/.github/actions/e2e-deploy-vald-readreplica/action.yaml b/.github/actions/e2e-deploy-vald-readreplica/action.yaml index e79c74598a..f306406082 100644 --- a/.github/actions/e2e-deploy-vald-readreplica/action.yaml +++ b/.github/actions/e2e-deploy-vald-readreplica/action.yaml @@ -40,10 +40,6 @@ inputs: description: "If you want to use local charts, set this to true." required: false default: "true" - default_image_tag: - description: "Default image tag. e.g) nightly, vx.x, vx.x.x" - required: true - default: "nightly" outputs: POD_NAME: description: "A pod name that waited for" @@ -68,7 +64,6 @@ runs: run: | helm install \ --values ${VALUES} \ - --set defaults.image.tag=${DEFAULT_IMAGE_TAG} \ ${HELM_EXTRA_OPTIONS} \ --generate-name charts/vald-readreplica @@ -81,7 +76,6 @@ runs: podname=`kubectl get pods --selector=${WAIT_FOR_SELECTOR} | tail -1 | awk '{print $1}'` echo "POD_NAME=${podname}" >> $GITHUB_OUTPUT env: - DEFAULT_IMAGE_TAG: ${{ inputs.default_image_tag }} VALUES: ${{ inputs.values }} HELM_EXTRA_OPTIONS: ${{ inputs.helm_extra_options }} WAIT_FOR_SELECTOR: ${{ inputs.wait_for_selector }} @@ -91,7 +85,7 @@ runs: id: deploy_vald_readreplica_local if: ${{ inputs.use_local_charts == 'true' }} run: | - make k8s/vald-readreplica/deploy VERSION=${DEFAULT_IMAGE_TAG} HELM_VALUES=${VALUES} HELM_EXTRA_OPTIONS="${HELM_EXTRA_OPTIONS}" + make k8s/vald-readreplica/deploy HELM_VALUES=${VALUES} HELM_EXTRA_OPTIONS="${HELM_EXTRA_OPTIONS}" sleep 3 @@ -102,7 +96,6 @@ runs: podname=`kubectl get pods --selector=${WAIT_FOR_SELECTOR} | tail -1 | awk '{print $1}'` echo "POD_NAME=${podname}" >> $GITHUB_OUTPUT env: - DEFAULT_IMAGE_TAG: ${{ inputs.default_image_tag }} VALUES: ${{ inputs.values }} HELM_EXTRA_OPTIONS: ${{ inputs.helm_extra_options }} WAIT_FOR_SELECTOR: ${{ inputs.wait_for_selector }} diff --git a/.github/actions/e2e-deploy-vald/action.yaml b/.github/actions/e2e-deploy-vald/action.yaml index 2b4dce3947..1368f7c1e2 100644 --- a/.github/actions/e2e-deploy-vald/action.yaml +++ b/.github/actions/e2e-deploy-vald/action.yaml @@ -43,10 +43,6 @@ inputs: description: "If you want to use local charts, set this to true." required: false default: "true" - default_image_tag: - description: "Default image tag. e.g) nightly, vx.x, vx.x.x" - required: true - default: "nightly" outputs: POD_NAME: description: "A pod name that waited for" @@ -78,7 +74,6 @@ runs: run: | helm install \ --values ${VALUES} \ - --set defaults.image.tag=${DEFAULT_IMAGE_TAG} \ ${HELM_EXTRA_OPTIONS} \ --generate-name charts/vald @@ -91,7 +86,6 @@ runs: podname=`kubectl get pods --selector=${WAIT_FOR_SELECTOR} | tail -1 | awk '{print $1}'` echo "POD_NAME=${podname}" >> $GITHUB_OUTPUT env: - DEFAULT_IMAGE_TAG: ${{ inputs.default_image_tag }} VALUES: ${{ inputs.values }} HELM_EXTRA_OPTIONS: ${{ inputs.helm_extra_options }} WAIT_FOR_SELECTOR: ${{ inputs.wait_for_selector }} @@ -101,7 +95,7 @@ runs: id: deploy_vald_local if: ${{ inputs.use_local_charts == 'true' }} run: | - make k8s/vald/deploy VERSION=${DEFAULT_IMAGE_TAG} HELM_VALUES=${VALUES} HELM_EXTRA_OPTIONS="${HELM_EXTRA_OPTIONS}" + make k8s/vald/deploy HELM_VALUES=${VALUES} HELM_EXTRA_OPTIONS="${HELM_EXTRA_OPTIONS}" sleep 3 @@ -112,7 +106,6 @@ runs: podname=`kubectl get pods --selector=${WAIT_FOR_SELECTOR} | tail -1 | awk '{print $1}'` echo "POD_NAME=${podname}" >> $GITHUB_OUTPUT env: - DEFAULT_IMAGE_TAG: ${{ inputs.default_image_tag }} VALUES: ${{ inputs.values }} HELM_EXTRA_OPTIONS: ${{ inputs.helm_extra_options }} WAIT_FOR_SELECTOR: ${{ inputs.wait_for_selector }} diff --git a/.github/actions/setup-e2e/action.yaml b/.github/actions/setup-e2e/action.yaml index c99eab09e3..295f7f815a 100644 --- a/.github/actions/setup-e2e/action.yaml +++ b/.github/actions/setup-e2e/action.yaml @@ -51,9 +51,6 @@ outputs: IMAGE_TAGS: description: "Specifies E2E target image tags" value: ${{ steps.specify_container_versions.outputs.IMAGE_TAGS }} - DEFAULT_IMAGE_TAG: - description: "Default E2E target image tag" - value: ${{ steps.determine_tag_name.outputs.DEFAULT_TAG }} runs: using: "composite" steps: @@ -81,7 +78,7 @@ runs: id: specify_container_versions uses: ./.github/actions/detect-docker-image-tags with: - tag_name: ${{ steps.determine_tag_name.outputs.PRIMARY_TAG }} + tags: ${{ steps.determine_tag_name.outputs.TAGS }} images: ${{ inputs.target_images }} - uses: ./.github/actions/setup-k3d if: ${{ inputs.require_k3d == 'true' }} diff --git a/.github/workflows/_detect-ci-container.yml b/.github/workflows/_detect-ci-container.yml index c9ed23314c..59befea939 100644 --- a/.github/workflows/_detect-ci-container.yml +++ b/.github/workflows/_detect-ci-container.yml @@ -17,48 +17,32 @@ name: "Detect CI container image tag" on: workflow_call: outputs: - TAG_NAME: + TAG: description: "The docker image tag name" - value: ${{ jobs.detect.outputs.TAG_NAME }} + value: ${{ jobs.detect.outputs.TAG }} env: TARGET_IMAGE: vdaas/vald-ci-container jobs: detect: runs-on: ubuntu-latest outputs: - TAG_NAME: ${{ steps.merge_detection_results.outputs.TAG_NAME }} + TAG: ${{ steps.get_tag_name.outputs.TAG }} steps: - uses: actions/checkout@v4 - name: Determine Docker image tag id: determine_tag_name uses: ./.github/actions/determine-docker-image-tag - - name: Detect Docker image tag for primary - id: detect_primary_tag_name + - name: Detect Docker image tag + id: detect_tag_name uses: ./.github/actions/detect-docker-image-tags with: images: ${{ env.TARGET_IMAGE }} - tag_name: ${{ steps.determine_tag_name.outputs.PRIMARY_TAG }} - - name: Detect Docker image tag for default - id: detect_default_tag_name - uses: ./.github/actions/detect-docker-image-tags - with: - images: ${{ env.TARGET_IMAGE }} - tag_name: ${{ steps.determine_tag_name.outputs.DEFAULT_TAG }} - - name: Merge Docker image tag detection results - id: merge_detection_results + tags: ${{ steps.determine_tag_name.outputs.TAGS }} + - name: Get Docker image tag from detection result + id: get_tag_name run: | - TAG_NAME="nightly" - - if [ -n "${DEFAULT_TAG_RESULT}" ]; then - TAG_NAME=${{ steps.determine_tag_name.outputs.DEFAULT_TAG }} - fi - - if [ -n "${PRIMARY_TAG_RESULT}" ]; then - TAG_NAME=${{ steps.determine_tag_name.outputs.PRIMARY_TAG }} - fi - - echo "TAG_NAME=${TAG_NAME}" - echo "TAG_NAME=${TAG_NAME}" >> $GITHUB_OUTPUT + TAG=$(echo "$TAGS" | awk '{print $1}' | awk -F '=' '{print $2}') + echo "TAG=${TAG}" + echo "TAG=${TAG}" >> $GITHUB_OUTPUT env: - PRIMARY_TAG_RESULT: ${{ steps.detect_primary_tag_name.outputs.IMAGE_TAGS }} - DEFAULT_TAG_RESULT: ${{ steps.detect_default_tag_name.outputs.IMAGE_TAGS }} + TAGS: ${{ steps.detect_tag_name.outputs.IMAGE_TAGS }} diff --git a/.github/workflows/_release-pr.yml b/.github/workflows/_release-pr.yml index 1b8e2b9fc8..3ed9269377 100644 --- a/.github/workflows/_release-pr.yml +++ b/.github/workflows/_release-pr.yml @@ -40,7 +40,7 @@ jobs: - detect-ci-container runs-on: ubuntu-latest container: - image: ghcr.io/vdaas/vald/vald-ci-container:${{ needs.detect-ci-container.outputs.TAG_NAME }} + image: ghcr.io/vdaas/vald/vald-ci-container:${{ needs.detect-ci-container.outputs.TAG }} env: RELEASE_BRANCH_NAME: ${{ inputs.release_branch_name }} PREPARE_RELEASE_BRANCH_NAME: prepare/${{ inputs.release_branch_name }} diff --git a/.github/workflows/build-binaries.yml b/.github/workflows/build-binaries.yml index 5aff86f5cb..fb794482be 100644 --- a/.github/workflows/build-binaries.yml +++ b/.github/workflows/build-binaries.yml @@ -30,7 +30,7 @@ jobs: runs-on: ubuntu-latest needs: [detect-ci-container] container: - image: ghcr.io/vdaas/vald/vald-ci-container:${{ needs.detect-ci-container.outputs.TAG_NAME }} + image: ghcr.io/vdaas/vald/vald-ci-container:${{ needs.detect-ci-container.outputs.TAG }} steps: - uses: actions/checkout@v4 with: diff --git a/.github/workflows/build-protobuf.yml b/.github/workflows/build-protobuf.yml index 94c5ff8d48..ce7bba459c 100644 --- a/.github/workflows/build-protobuf.yml +++ b/.github/workflows/build-protobuf.yml @@ -39,7 +39,7 @@ jobs: runs-on: ubuntu-latest needs: [detect-ci-container] container: - image: ghcr.io/vdaas/vald/vald-ci-container:${{ needs.detect-ci-container.outputs.TAG_NAME }} + image: ghcr.io/vdaas/vald/vald-ci-container:${{ needs.detect-ci-container.outputs.TAG }} steps: - uses: actions/checkout@v4 - name: Set Git config diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index bb921330b5..afbc82eb24 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -48,7 +48,7 @@ jobs: runs-on: ubuntu-latest needs: [detect-ci-container] container: - image: ghcr.io/vdaas/vald/vald-ci-container:${{ needs.detect-ci-container.outputs.TAG_NAME }} + image: ghcr.io/vdaas/vald/vald-ci-container:${{ needs.detect-ci-container.outputs.TAG }} steps: - name: Checkout repository uses: actions/checkout@v4 diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index e0707edad4..5304e6ccc6 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -41,7 +41,7 @@ jobs: runs-on: ubuntu-latest needs: [detect-ci-container] container: - image: ghcr.io/vdaas/vald/vald-ci-container:${{ needs.detect-ci-container.outputs.TAG_NAME }} + image: ghcr.io/vdaas/vald/vald-ci-container:${{ needs.detect-ci-container.outputs.TAG }} steps: - uses: actions/checkout@v4 with: diff --git a/.github/workflows/dockers-agent-faiss-image.yml b/.github/workflows/dockers-agent-faiss-image.yml index 297aca6ea9..9c6ef548a6 100644 --- a/.github/workflows/dockers-agent-faiss-image.yml +++ b/.github/workflows/dockers-agent-faiss-image.yml @@ -26,7 +26,7 @@ on: - "*.*.*-*" - "v*.*.*-*" paths: - - ".github/actions/docker-build/actions.yaml" + - ".github/actions/docker-build/action.yaml" - ".github/workflows/_docker-image.yaml" - ".github/workflows/dockers-agent-faiss-image.yml" - "go.mod" @@ -43,7 +43,7 @@ on: - "versions/FAISS_VERSION" pull_request: paths: - - ".github/actions/docker-build/actions.yaml" + - ".github/actions/docker-build/action.yaml" - ".github/workflows/_docker-image.yaml" - ".github/workflows/dockers-agent-faiss-image.yml" - "go.mod" @@ -60,7 +60,7 @@ on: - "versions/FAISS_VERSION" pull_request_target: paths: - - ".github/actions/docker-build/actions.yaml" + - ".github/actions/docker-build/action.yaml" - ".github/workflows/_docker-image.yaml" - ".github/workflows/dockers-agent-faiss-image.yml" - "go.mod" diff --git a/.github/workflows/dockers-agent-ngt-image.yml b/.github/workflows/dockers-agent-ngt-image.yml index f786cc5bce..59507e5fbf 100644 --- a/.github/workflows/dockers-agent-ngt-image.yml +++ b/.github/workflows/dockers-agent-ngt-image.yml @@ -26,7 +26,7 @@ on: - "*.*.*-*" - "v*.*.*-*" paths: - - ".github/actions/docker-build/actions.yaml" + - ".github/actions/docker-build/action.yaml" - ".github/workflows/_docker-image.yaml" - ".github/workflows/dockers-agent-ngt-image.yml" - "go.mod" @@ -43,7 +43,7 @@ on: - "versions/NGT_VERSION" pull_request: paths: - - ".github/actions/docker-build/actions.yaml" + - ".github/actions/docker-build/action.yaml" - ".github/workflows/_docker-image.yaml" - ".github/workflows/dockers-agent-ngt-image.yml" - "go.mod" @@ -60,7 +60,7 @@ on: - "versions/NGT_VERSION" pull_request_target: paths: - - ".github/actions/docker-build/actions.yaml" + - ".github/actions/docker-build/action.yaml" - ".github/workflows/_docker-image.yaml" - ".github/workflows/dockers-agent-ngt-image.yml" - "go.mod" diff --git a/.github/workflows/dockers-agent-sidecar-image.yml b/.github/workflows/dockers-agent-sidecar-image.yml index 8a46d773a2..36d9807105 100644 --- a/.github/workflows/dockers-agent-sidecar-image.yml +++ b/.github/workflows/dockers-agent-sidecar-image.yml @@ -26,7 +26,7 @@ on: - "*.*.*-*" - "v*.*.*-*" paths: - - ".github/actions/docker-build/actions.yaml" + - ".github/actions/docker-build/action.yaml" - ".github/workflows/_docker-image.yaml" - ".github/workflows/dockers-agent-sidecar-image.yml" - "go.mod" @@ -43,7 +43,7 @@ on: - "versions/GO_VERSION" pull_request: paths: - - ".github/actions/docker-build/actions.yaml" + - ".github/actions/docker-build/action.yaml" - ".github/workflows/_docker-image.yaml" - ".github/workflows/dockers-agent-sidecar-image.yml" - "go.mod" @@ -60,7 +60,7 @@ on: - "versions/GO_VERSION" pull_request_target: paths: - - ".github/actions/docker-build/actions.yaml" + - ".github/actions/docker-build/action.yaml" - ".github/workflows/_docker-image.yaml" - ".github/workflows/dockers-agent-sidecar-image.yml" - "go.mod" diff --git a/.github/workflows/dockers-benchmark-job-image.yml b/.github/workflows/dockers-benchmark-job-image.yml index 52abd5addc..4a2d0479f6 100644 --- a/.github/workflows/dockers-benchmark-job-image.yml +++ b/.github/workflows/dockers-benchmark-job-image.yml @@ -24,7 +24,7 @@ on: - "*.*.*-*" - "v*.*.*-*" paths: - - ".github/actions/docker-build/actions.yaml" + - ".github/actions/docker-build/action.yaml" - ".github/workflows/_docker-image.yaml" - ".github/workflows/dockers-benchmak-job-image.yml" - "go.mod" @@ -41,7 +41,7 @@ on: - "versions/GO_VERSION" pull_request: paths: - - ".github/actions/docker-build/actions.yaml" + - ".github/actions/docker-build/action.yaml" - ".github/workflows/_docker-image.yaml" - ".github/workflows/dockers-benchmak-job-image.yml" - "go.mod" @@ -58,7 +58,7 @@ on: - "versions/GO_VERSION" pull_request_target: paths: - - ".github/actions/docker-build/actions.yaml" + - ".github/actions/docker-build/action.yaml" - ".github/workflows/_docker-image.yaml" - ".github/workflows/dockers-benchmak-job-image.yml" - "go.mod" diff --git a/.github/workflows/dockers-benchmark-operator-image.yaml b/.github/workflows/dockers-benchmark-operator-image.yaml index 2116399296..2424657297 100644 --- a/.github/workflows/dockers-benchmark-operator-image.yaml +++ b/.github/workflows/dockers-benchmark-operator-image.yaml @@ -24,7 +24,7 @@ on: - "*.*.*-*" - "v*.*.*-*" paths: - - ".github/actions/docker-build/actions.yaml" + - ".github/actions/docker-build/action.yaml" - ".github/workflows/_docker-image.yaml" - ".github/workflows/dockers-benchmak-operator-image.yml" - "go.mod" @@ -41,7 +41,7 @@ on: - "versions/GO_VERSION" pull_request: paths: - - ".github/actions/docker-build/actions.yaml" + - ".github/actions/docker-build/action.yaml" - ".github/workflows/_docker-image.yaml" - ".github/workflows/dockers-benchmak-operator-image.yml" - "go.mod" @@ -58,7 +58,7 @@ on: - "versions/GO_VERSION" pull_request_target: paths: - - ".github/actions/docker-build/actions.yaml" + - ".github/actions/docker-build/action.yaml" - ".github/workflows/_docker-image.yaml" - ".github/workflows/dockers-benchmak-operator-image.yml" - "go.mod" diff --git a/.github/workflows/dockers-ci-container-image.yml b/.github/workflows/dockers-ci-container-image.yml index 179fe3e7a3..8a77e749f3 100644 --- a/.github/workflows/dockers-ci-container-image.yml +++ b/.github/workflows/dockers-ci-container-image.yml @@ -26,7 +26,7 @@ on: - "*.*.*-*" - "v*.*.*-*" paths: - - ".github/actions/docker-build/actions.yaml" + - ".github/actions/docker-build/action.yaml" - ".github/workflows/_docker-image.yaml" - ".github/workflows/dockers-ci-container-image.yml" - "dockers/ci/**" @@ -36,7 +36,7 @@ on: - "versions/NGT_VERSION" pull_request: paths: - - ".github/actions/docker-build/actions.yaml" + - ".github/actions/docker-build/action.yaml" - ".github/workflows/_docker-image.yaml" - ".github/workflows/dockers-ci-container-image.yml" - "dockers/ci/**" @@ -46,7 +46,7 @@ on: - "versions/NGT_VERSION" pull_request_target: paths: - - ".github/actions/docker-build/actions.yaml" + - ".github/actions/docker-build/action.yaml" - ".github/workflows/_docker-image.yaml" - ".github/workflows/dockers-ci-container-image.yml" - "dockers/ci/**" diff --git a/.github/workflows/dockers-dev-container-image.yml b/.github/workflows/dockers-dev-container-image.yml index 75746b67de..55d347d9a1 100644 --- a/.github/workflows/dockers-dev-container-image.yml +++ b/.github/workflows/dockers-dev-container-image.yml @@ -21,7 +21,7 @@ on: - "release/v*.*" - "!release/v*.*.*" paths: - - ".github/actions/docker-build/actions.yaml" + - ".github/actions/docker-build/action.yaml" - ".github/workflows/_docker-image.yaml" - ".github/workflows/dockers-dev-container-image.yml" - "dockers/dev/**" @@ -31,7 +31,7 @@ on: - "versions/NGT_VERSION" pull_request: paths: - - ".github/actions/docker-build/actions.yaml" + - ".github/actions/docker-build/action.yaml" - ".github/workflows/_docker-image.yaml" - ".github/workflows/dockers-dev-container-image.yml" - "dockers/dev/**" @@ -41,7 +41,7 @@ on: - "versions/NGT_VERSION" pull_request_target: paths: - - ".github/actions/docker-build/actions.yaml" + - ".github/actions/docker-build/action.yaml" - ".github/workflows/_docker-image.yaml" - ".github/workflows/dockers-dev-container-image.yml" - "dockers/dev/**" diff --git a/.github/workflows/dockers-discoverer-k8s-image.yml b/.github/workflows/dockers-discoverer-k8s-image.yml index 94ad3b97bd..91c42623ed 100644 --- a/.github/workflows/dockers-discoverer-k8s-image.yml +++ b/.github/workflows/dockers-discoverer-k8s-image.yml @@ -26,7 +26,7 @@ on: - "*.*.*-*" - "v*.*.*-*" paths: - - ".github/actions/docker-build/actions.yaml" + - ".github/actions/docker-build/action.yaml" - ".github/workflows/_docker-image.yaml" - ".github/workflows/dockers-discoverer-k8s-image.yml" - "go.mod" @@ -41,7 +41,7 @@ on: - "versions/GO_VERSION" pull_request: paths: - - ".github/actions/docker-build/actions.yaml" + - ".github/actions/docker-build/action.yaml" - ".github/workflows/_docker-image.yaml" - ".github/workflows/dockers-discoverer-k8s-image.yml" - "go.mod" @@ -56,7 +56,7 @@ on: - "versions/GO_VERSION" pull_request_target: paths: - - ".github/actions/docker-build/actions.yaml" + - ".github/actions/docker-build/action.yaml" - ".github/workflows/_docker-image.yaml" - ".github/workflows/dockers-discoverer-k8s-image.yml" - "go.mod" diff --git a/.github/workflows/dockers-gateway-filter-image.yml b/.github/workflows/dockers-gateway-filter-image.yml index c21e329ffd..d0562e0092 100644 --- a/.github/workflows/dockers-gateway-filter-image.yml +++ b/.github/workflows/dockers-gateway-filter-image.yml @@ -26,7 +26,7 @@ on: - "*.*.*-*" - "v*.*.*-*" paths: - - ".github/actions/docker-build/actions.yaml" + - ".github/actions/docker-build/action.yaml" - ".github/workflows/_docker-image.yaml" - ".github/workflows/dockers-gateway-filter-image.yml" - "go.mod" @@ -44,7 +44,7 @@ on: - "versions/GO_VERSION" pull_request: paths: - - ".github/actions/docker-build/actions.yaml" + - ".github/actions/docker-build/action.yaml" - ".github/workflows/_docker-image.yaml" - ".github/workflows/dockers-gateway-filter-image.yml" - "go.mod" @@ -62,7 +62,7 @@ on: - "versions/GO_VERSION" pull_request_target: paths: - - ".github/actions/docker-build/actions.yaml" + - ".github/actions/docker-build/action.yaml" - ".github/workflows/_docker-image.yaml" - ".github/workflows/dockers-gateway-filter-image.yml" - "go.mod" diff --git a/.github/workflows/dockers-gateway-lb-image.yml b/.github/workflows/dockers-gateway-lb-image.yml index 4806aa2615..f69bb599ee 100644 --- a/.github/workflows/dockers-gateway-lb-image.yml +++ b/.github/workflows/dockers-gateway-lb-image.yml @@ -26,7 +26,7 @@ on: - "*.*.*-*" - "v*.*.*-*" paths: - - ".github/actions/docker-build/actions.yaml" + - ".github/actions/docker-build/action.yaml" - ".github/workflows/_docker-image.yaml" - ".github/workflows/dockers-gateway-lb-image.yml" - "go.mod" @@ -44,7 +44,7 @@ on: - "versions/GO_VERSION" pull_request: paths: - - ".github/actions/docker-build/actions.yaml" + - ".github/actions/docker-build/action.yaml" - ".github/workflows/_docker-image.yaml" - ".github/workflows/dockers-gateway-lb-image.yml" - "go.mod" @@ -62,7 +62,7 @@ on: - "versions/GO_VERSION" pull_request_target: paths: - - ".github/actions/docker-build/actions.yaml" + - ".github/actions/docker-build/action.yaml" - ".github/workflows/_docker-image.yaml" - ".github/workflows/dockers-gateway-lb-image.yml" - "go.mod" diff --git a/.github/workflows/dockers-gateway-mirror-image.yaml b/.github/workflows/dockers-gateway-mirror-image.yaml index 196090d86e..301fc6adcb 100644 --- a/.github/workflows/dockers-gateway-mirror-image.yaml +++ b/.github/workflows/dockers-gateway-mirror-image.yaml @@ -24,7 +24,7 @@ on: - "*.*.*-*" - "v*.*.*-*" paths: - - ".github/actions/docker-build/actions.yaml" + - ".github/actions/docker-build/action.yaml" - ".github/workflows/dockers-gateway-mirror-image.yml" - "go.mod" - "go.sum" @@ -41,7 +41,7 @@ on: - "versions/GO_VERSION" pull_request: paths: - - ".github/actions/docker-build/actions.yaml" + - ".github/actions/docker-build/action.yaml" - ".github/workflows/dockers-gateway-mirror-image.yml" - "go.mod" - "go.sum" @@ -58,7 +58,7 @@ on: - "versions/GO_VERSION" pull_request_target: paths: - - ".github/actions/docker-build/actions.yaml" + - ".github/actions/docker-build/action.yaml" - ".github/workflows/dockers-gateway-mirror-image.yml" - "go.mod" - "go.sum" diff --git a/.github/workflows/dockers-helm-operator-image.yml b/.github/workflows/dockers-helm-operator-image.yml index 1050a6e56b..b27f3106ab 100644 --- a/.github/workflows/dockers-helm-operator-image.yml +++ b/.github/workflows/dockers-helm-operator-image.yml @@ -26,7 +26,7 @@ on: - "*.*.*-*" - "v*.*.*-*" paths: - - ".github/actions/docker-build/actions.yaml" + - ".github/actions/docker-build/action.yaml" - ".github/workflows/_docker-image.yaml" - ".github/workflows/dockers-helm-operator-image.yml" - "dockers/operator/helm/Dockerfile" @@ -39,7 +39,7 @@ on: - "versions/OPERATOR_SDK_VERSION" pull_request: paths: - - ".github/actions/docker-build/actions.yaml" + - ".github/actions/docker-build/action.yaml" - ".github/workflows/_docker-image.yaml" - ".github/workflows/dockers-helm-operator-image.yml" - "dockers/operator/helm/Dockerfile" @@ -52,7 +52,7 @@ on: - "versions/OPERATOR_SDK_VERSION" pull_request_target: paths: - - ".github/actions/docker-build/actions.yaml" + - ".github/actions/docker-build/action.yaml" - ".github/workflows/_docker-image.yaml" - ".github/workflows/dockers-helm-operator-image.yml" - "dockers/operator/helm/Dockerfile" diff --git a/.github/workflows/dockers-index-correction.yml b/.github/workflows/dockers-index-correction.yml index 66fd5008e3..9187b487a2 100644 --- a/.github/workflows/dockers-index-correction.yml +++ b/.github/workflows/dockers-index-correction.yml @@ -24,7 +24,7 @@ on: - "*.*.*-*" - "v*.*.*-*" paths: - - ".github/actions/docker-build/actions.yaml" + - ".github/actions/docker-build/action.yaml" - ".github/workflows/dockers-index-correction.yml" - "go.mod" - "go.sum" @@ -39,7 +39,7 @@ on: - "versions/GO_VERSION" pull_request: paths: - - ".github/actions/docker-build/actions.yaml" + - ".github/actions/docker-build/action.yaml" - ".github/workflows/_docker-image.yaml" - ".github/workflows/dockers-index-correction.yml" - "go.mod" @@ -55,7 +55,7 @@ on: - "versions/GO_VERSION" pull_request_target: paths: - - ".github/actions/docker-build/actions.yaml" + - ".github/actions/docker-build/action.yaml" - ".github/workflows/_docker-image.yaml" - ".github/workflows/dockers-index-correction.yml" - "go.mod" diff --git a/.github/workflows/dockers-index-creation.yml b/.github/workflows/dockers-index-creation.yml index 9902dfd54d..90a49ee2a1 100644 --- a/.github/workflows/dockers-index-creation.yml +++ b/.github/workflows/dockers-index-creation.yml @@ -24,7 +24,7 @@ on: - "*.*.*-*" - "v*.*.*-*" paths: - - ".github/actions/docker-build/actions.yaml" + - ".github/actions/docker-build/action.yaml" - ".github/workflows/dockers-index-creation.yml" - "go.mod" - "go.sum" @@ -39,7 +39,7 @@ on: - "versions/GO_VERSION" pull_request: paths: - - ".github/actions/docker-build/actions.yaml" + - ".github/actions/docker-build/action.yaml" - ".github/workflows/_docker-image.yaml" - ".github/workflows/dockers-index-creation.yml" - "go.mod" @@ -55,7 +55,7 @@ on: - "versions/GO_VERSION" pull_request_target: paths: - - ".github/actions/docker-build/actions.yaml" + - ".github/actions/docker-build/action.yaml" - ".github/workflows/_docker-image.yaml" - ".github/workflows/dockers-index-creation.yml" - "go.mod" diff --git a/.github/workflows/dockers-index-save.yml b/.github/workflows/dockers-index-save.yml index 696f13d533..7ee1509498 100644 --- a/.github/workflows/dockers-index-save.yml +++ b/.github/workflows/dockers-index-save.yml @@ -24,7 +24,7 @@ on: - "*.*.*-*" - "v*.*.*-*" paths: - - ".github/actions/docker-build/actions.yaml" + - ".github/actions/docker-build/action.yaml" - ".github/workflows/dockers-index-save.yml" - "go.mod" - "go.sum" @@ -39,7 +39,7 @@ on: - "versions/GO_VERSION" pull_request: paths: - - ".github/actions/docker-build/actions.yaml" + - ".github/actions/docker-build/action.yaml" - ".github/workflows/_docker-image.yaml" - ".github/workflows/dockers-index-save.yml" - "go.mod" @@ -55,7 +55,7 @@ on: - "versions/GO_VERSION" pull_request_target: paths: - - ".github/actions/docker-build/actions.yaml" + - ".github/actions/docker-build/action.yaml" - ".github/workflows/_docker-image.yaml" - ".github/workflows/dockers-index-save.yml" - "go.mod" diff --git a/.github/workflows/dockers-loadtest-image.yml b/.github/workflows/dockers-loadtest-image.yml index 6a39f6b2de..5abb15ad7b 100644 --- a/.github/workflows/dockers-loadtest-image.yml +++ b/.github/workflows/dockers-loadtest-image.yml @@ -26,7 +26,7 @@ on: - "*.*.*-*" - "v*.*.*-*" paths: - - ".github/actions/docker-build/actions.yaml" + - ".github/actions/docker-build/action.yaml" - ".github/workflows/_docker-image.yaml" - ".github/workflows/dockers-loadtest-image.yml" - "go.mod" @@ -42,7 +42,7 @@ on: - "versions/GO_VERSION" pull_request: paths: - - ".github/actions/docker-build/actions.yaml" + - ".github/actions/docker-build/action.yaml" - ".github/workflows/_docker-image.yaml" - ".github/workflows/dockers-loadtest-image.yml" - "go.mod" @@ -58,7 +58,7 @@ on: - "versions/GO_VERSION" pull_request_target: paths: - - ".github/actions/docker-build/actions.yaml" + - ".github/actions/docker-build/action.yaml" - ".github/workflows/_docker-image.yaml" - ".github/workflows/dockers-loadtest-image.yml" - "go.mod" diff --git a/.github/workflows/dockers-manager-index-image.yml b/.github/workflows/dockers-manager-index-image.yml index 2369f84282..334a60dfa6 100644 --- a/.github/workflows/dockers-manager-index-image.yml +++ b/.github/workflows/dockers-manager-index-image.yml @@ -26,7 +26,7 @@ on: - "*.*.*-*" - "v*.*.*-*" paths: - - ".github/actions/docker-build/actions.yaml" + - ".github/actions/docker-build/action.yaml" - ".github/workflows/_docker-image.yaml" - ".github/workflows/dockers-manager-index-image.yml" - "go.mod" @@ -42,7 +42,7 @@ on: - "versions/GO_VERSION" pull_request: paths: - - ".github/actions/docker-build/actions.yaml" + - ".github/actions/docker-build/action.yaml" - ".github/workflows/_docker-image.yaml" - ".github/workflows/dockers-manager-index-image.yml" - "go.mod" @@ -58,7 +58,7 @@ on: - "versions/GO_VERSION" pull_request_target: paths: - - ".github/actions/docker-build/actions.yaml" + - ".github/actions/docker-build/action.yaml" - ".github/workflows/_docker-image.yaml" - ".github/workflows/dockers-manager-index-image.yml" - "go.mod" diff --git a/.github/workflows/dockers-readreplica-rotate.yml b/.github/workflows/dockers-readreplica-rotate.yml index 32cf9df19e..0c2b3dca9b 100644 --- a/.github/workflows/dockers-readreplica-rotate.yml +++ b/.github/workflows/dockers-readreplica-rotate.yml @@ -24,7 +24,7 @@ on: - "*.*.*-*" - "v*.*.*-*" paths: - - ".github/actions/docker-build/actions.yaml" + - ".github/actions/docker-build/action.yaml" - ".github/workflows/dockers-readreplica-rotate.yml" - "go.mod" - "go.sum" @@ -39,7 +39,7 @@ on: - "versions/GO_VERSION" pull_request: paths: - - ".github/actions/docker-build/actions.yaml" + - ".github/actions/docker-build/action.yaml" - ".github/workflows/_docker-image.yaml" - ".github/workflows/dockers-readreplica-rotate.yml" - "go.mod" @@ -55,7 +55,7 @@ on: - "versions/GO_VERSION" pull_request_target: paths: - - ".github/actions/docker-build/actions.yaml" + - ".github/actions/docker-build/action.yaml" - ".github/workflows/_docker-image.yaml" - ".github/workflows/dockers-readreplica-rotate.yml" - "go.mod" diff --git a/.github/workflows/e2e-chaos.yaml b/.github/workflows/e2e-chaos.yaml index 6c85905376..d571227e1f 100644 --- a/.github/workflows/e2e-chaos.yaml +++ b/.github/workflows/e2e-chaos.yaml @@ -54,7 +54,6 @@ jobs: id: deploy_vald uses: ./.github/actions/e2e-deploy-vald with: - default_image_tag: ${{ steps.setup_e2e.outputs.DEFAULT_IMAGE_TAG }} helm_extra_options: ${{ steps.setup_e2e.outputs.HELM_EXTRA_OPTIONS }} values: ${{ env.VALUES }} wait_for_selector: app=vald-lb-gateway @@ -93,7 +92,6 @@ jobs: id: deploy_vald uses: ./.github/actions/e2e-deploy-vald with: - default_image_tag: ${{ steps.setup_e2e.outputs.DEFAULT_IMAGE_TAG }} helm_extra_options: ${{ steps.setup_e2e.outputs.HELM_EXTRA_OPTIONS }} values: ${{ env.VALUES }} wait_for_selector: app=vald-lb-gateway @@ -132,7 +130,6 @@ jobs: id: deploy_vald uses: ./.github/actions/e2e-deploy-vald with: - default_image_tag: ${{ steps.setup_e2e.outputs.DEFAULT_IMAGE_TAG }} helm_extra_options: ${{ steps.setup_e2e.outputs.HELM_EXTRA_OPTIONS }} values: ${{ env.VALUES }} wait_for_selector: app=vald-lb-gateway @@ -171,7 +168,6 @@ jobs: id: deploy_vald uses: ./.github/actions/e2e-deploy-vald with: - default_image_tag: ${{ steps.setup_e2e.outputs.DEFAULT_IMAGE_TAG }} helm_extra_options: ${{ steps.setup_e2e.outputs.HELM_EXTRA_OPTIONS }} values: ${{ env.VALUES }} wait_for_selector: app=vald-lb-gateway diff --git a/.github/workflows/e2e-code-bench-agent.yaml b/.github/workflows/e2e-code-bench-agent.yaml index 27e4837a2e..015873aaef 100644 --- a/.github/workflows/e2e-code-bench-agent.yaml +++ b/.github/workflows/e2e-code-bench-agent.yaml @@ -57,7 +57,7 @@ jobs: runs-on: ubuntu-latest needs: [detect-ci-container] container: - image: ghcr.io/vdaas/vald/vald-ci-container:${{ needs.detect-ci-container.outputs.TAG_NAME }} + image: ghcr.io/vdaas/vald/vald-ci-container:${{ needs.detect-ci-container.outputs.TAG }} steps: - uses: actions/checkout@v4 - name: Set Git config @@ -84,7 +84,7 @@ jobs: runs-on: ubuntu-latest needs: [detect-ci-container] container: - image: ghcr.io/vdaas/vald/vald-ci-container:${{ needs.detect-ci-container.outputs.TAG_NAME }} + image: ghcr.io/vdaas/vald/vald-ci-container:${{ needs.detect-ci-container.outputs.TAG }} steps: - uses: actions/checkout@v4 - name: Set Git config diff --git a/.github/workflows/e2e-max-dim.yml b/.github/workflows/e2e-max-dim.yml index 9e87ac084b..ef2b137547 100644 --- a/.github/workflows/e2e-max-dim.yml +++ b/.github/workflows/e2e-max-dim.yml @@ -61,8 +61,7 @@ jobs: DIM=$(($DIM-1)) fi - export HELM_EXTRA_OPTIOINS="--set agent.ngt.dimension=${DIM}" - make k8s/vald/deploy VERSION=${DEFAULT_IMAGE_TAG} HELM_VALUES=${VALUES} HELM_EXTRA_OPTIONS="${HELM_EXTRA_OPTIOINS}" + make k8s/vald/deploy HELM_VALUES=${VALUES} HELM_EXTRA_OPTIONS="--set agent.ngt.dimension=${DIM} ${HELM_EXTRA_OPTIONS}" sleep 3 @@ -95,12 +94,12 @@ jobs: rm ${FILEPATH} echo "removing cluster" - make k8s/vald/delete VERSION=${DEFAULT_IMAGE_TAG} HELM_VALUES=${VALUES} HELM_EXTRA_OPTIONS="${HELM_EXTRA_OPTIOINS}" + make k8s/vald/delete HELM_VALUES=${VALUES} HELM_EXTRA_OPTIONS="${HELM_EXTRA_OPTIONS}" done echo "MAX_BIT=${BIT}" >> $GITHUB_OUTPUT echo "MAX_BIT=${BIT}" env: - DEFAULT_IMAGE_TAG: ${{ steps.setup_e2e.outputs.DEFAULT_IMAGE_TAG }} + HELM_EXTRA_OPTIONS: ${{ steps.setup_e2e.outputs.HELM_EXTRA_OPTIONS }} WAIT_FOR_SELECTOR: app=vald-agent WAIT_FOR_TIMEOUT: 29m VALUES: .github/helm/values/values-max-dim.yaml diff --git a/.github/workflows/e2e-profiling.yml b/.github/workflows/e2e-profiling.yml index 851e918831..d54c79722d 100644 --- a/.github/workflows/e2e-profiling.yml +++ b/.github/workflows/e2e-profiling.yml @@ -50,7 +50,6 @@ jobs: id: deploy_vald uses: ./.github/actions/e2e-deploy-vald with: - default_image_tag: ${{ steps.setup_e2e.outputs.DEFAULT_IMAGE_TAG }} helm_extra_options: ${{ steps.setup_e2e.outputs.HELM_EXTRA_OPTIONS }} values: .github/helm/values/values-profile.yaml wait_for_selector: app=vald-lb-gateway diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index d4988ef553..780ddd8b66 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -50,7 +50,6 @@ jobs: id: deploy_vald uses: ./.github/actions/e2e-deploy-vald with: - default_image_tag: ${{ steps.setup_e2e.outputs.DEFAULT_IMAGE_TAG }} helm_extra_options: ${{ steps.setup_e2e.outputs.HELM_EXTRA_OPTIONS }} values: .github/helm/values/values-lb.yaml wait_for_selector: app=vald-lb-gateway @@ -96,7 +95,6 @@ jobs: require_k3d: false - name: Merge Docker image tag run: | - yq e ".spec.defaults.image.tag=\"${{ steps.setup_e2e.outputs.DEFAULT_IMAGE_TAG }}\"" -i ./.github/valdrelease/valdrelease.yaml IMAGE_TAGS=(${{ steps.setup_e2e.outputs.IMAGE_TAGS }}) for IMAGE_TAG in "${IMAGE_TAGS[@]}" @@ -112,7 +110,6 @@ jobs: id: deploy_vald uses: ./.github/actions/e2e-deploy-vald-helm-operator with: - default_image_tag: ${{ steps.vald_helm_operator.outputs.DEFAULT_IMAGE_TAG }} helm_extra_options: ${{ steps.vald_helm_operator.outputs.HELM_EXTRA_OPTIONS }} valdrelease: ./.github/valdrelease/valdrelease.yaml wait_for_selector: app=vald-lb-gateway @@ -193,7 +190,6 @@ jobs: id: deploy_vald uses: ./.github/actions/e2e-deploy-vald with: - default_image_tag: ${{ steps.setup_e2e.outputs.DEFAULT_IMAGE_TAG }} helm_extra_options: ${{ steps.setup_e2e.outputs.HELM_EXTRA_OPTIONS }} values: .github/helm/values/values-lb.yaml wait_for_selector: app=vald-lb-gateway @@ -232,7 +228,6 @@ jobs: id: deploy_vald uses: ./.github/actions/e2e-deploy-vald with: - default_image_tag: ${{ steps.setup_e2e.outputs.DEFAULT_IMAGE_TAG }} helm_extra_options: ${{ steps.setup_e2e.outputs.HELM_EXTRA_OPTIONS }} values: .github/helm/values/values-lb.yaml wait_for_selector: app=vald-lb-gateway @@ -308,7 +303,6 @@ jobs: id: deploy_vald_readreplica uses: ./.github/actions/e2e-deploy-vald-readreplica with: - default_image_tag: ${{ steps.setup_e2e.outputs.DEFAULT_IMAGE_TAG }} helm_extra_options: ${{ steps.setup_e2e.outputs.HELM_EXTRA_OPTIONS }} values: .github/helm/values/values-readreplica.yaml wait_for_selector: app=vald-lb-gateway diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml index c690ed6dc6..9b84555b31 100644 --- a/.github/workflows/format.yml +++ b/.github/workflows/format.yml @@ -32,7 +32,7 @@ jobs: runs-on: ubuntu-latest needs: [detect-ci-container] container: - image: ghcr.io/vdaas/vald/vald-ci-container:${{ needs.detect-ci-container.outputs.TAG_NAME }} + image: ghcr.io/vdaas/vald/vald-ci-container:${{ needs.detect-ci-container.outputs.TAG }} steps: - uses: actions/checkout@v4 with: @@ -90,7 +90,7 @@ jobs: runs-on: ubuntu-latest needs: [detect-ci-container] container: - image: ghcr.io/vdaas/vald/vald-ci-container:${{ needs.detect-ci-container.outputs.TAG_NAME }} + image: ghcr.io/vdaas/vald/vald-ci-container:${{ needs.detect-ci-container.outputs.TAG }} steps: - uses: actions/checkout@v4 with: diff --git a/.github/workflows/fossa.yml b/.github/workflows/fossa.yml index 792a9be2b3..7b8f86140c 100644 --- a/.github/workflows/fossa.yml +++ b/.github/workflows/fossa.yml @@ -35,7 +35,7 @@ jobs: runs-on: ubuntu-latest needs: [dump-contexts-to-log, detect-ci-container] container: - image: ghcr.io/vdaas/vald/vald-ci-container:${{ needs.detect-ci-container.outputs.TAG_NAME }} + image: ghcr.io/vdaas/vald/vald-ci-container:${{ needs.detect-ci-container.outputs.TAG }} steps: - uses: actions/checkout@v4 - name: Set Git config diff --git a/.github/workflows/helm-lint.yml b/.github/workflows/helm-lint.yml index f3748ab182..dce2c6b007 100644 --- a/.github/workflows/helm-lint.yml +++ b/.github/workflows/helm-lint.yml @@ -31,7 +31,7 @@ jobs: runs-on: ubuntu-latest needs: [detect-ci-container] container: - image: ghcr.io/vdaas/vald/vald-ci-container:${{ needs.detect-ci-container.outputs.TAG_NAME }} + image: ghcr.io/vdaas/vald/vald-ci-container:${{ needs.detect-ci-container.outputs.TAG }} steps: - name: Check out code. uses: actions/checkout@v4 @@ -51,7 +51,7 @@ jobs: runs-on: ubuntu-latest needs: [detect-ci-container] container: - image: ghcr.io/vdaas/vald/vald-ci-container:${{ needs.detect-ci-container.outputs.TAG_NAME }} + image: ghcr.io/vdaas/vald/vald-ci-container:${{ needs.detect-ci-container.outputs.TAG }} steps: - name: Check out code. uses: actions/checkout@v4 @@ -71,7 +71,7 @@ jobs: runs-on: ubuntu-latest needs: [detect-ci-container] container: - image: ghcr.io/vdaas/vald/vald-ci-container:${{ needs.detect-ci-container.outputs.TAG_NAME }} + image: ghcr.io/vdaas/vald/vald-ci-container:${{ needs.detect-ci-container.outputs.TAG }} options: "--add-host=host.docker.internal:host-gateway" steps: - name: Check out code. diff --git a/.github/workflows/helm.yml b/.github/workflows/helm.yml index b2f1b4bfc9..f72f943530 100644 --- a/.github/workflows/helm.yml +++ b/.github/workflows/helm.yml @@ -34,7 +34,7 @@ jobs: runs-on: ubuntu-latest needs: [detect-ci-container] container: - image: ghcr.io/vdaas/vald/vald-ci-container:${{ needs.detect-ci-container.outputs.TAG_NAME }} + image: ghcr.io/vdaas/vald/vald-ci-container:${{ needs.detect-ci-container.outputs.TAG }} steps: - uses: actions/checkout@v4 with: diff --git a/.github/workflows/reviewdog-k8s.yml b/.github/workflows/reviewdog-k8s.yml index bde5bc043d..f0e55b340d 100644 --- a/.github/workflows/reviewdog-k8s.yml +++ b/.github/workflows/reviewdog-k8s.yml @@ -33,7 +33,7 @@ jobs: runs-on: ubuntu-latest needs: [detect-ci-container] container: - image: ghcr.io/vdaas/vald/vald-ci-container:${{ needs.detect-ci-container.outputs.TAG_NAME }} + image: ghcr.io/vdaas/vald/vald-ci-container:${{ needs.detect-ci-container.outputs.TAG }} steps: - uses: actions/checkout@v4 - name: Set Git config @@ -53,7 +53,7 @@ jobs: runs-on: ubuntu-latest needs: [detect-ci-container] container: - image: ghcr.io/vdaas/vald/vald-ci-container:${{ needs.detect-ci-container.outputs.TAG_NAME }} + image: ghcr.io/vdaas/vald/vald-ci-container:${{ needs.detect-ci-container.outputs.TAG }} steps: - uses: actions/checkout@v4 - name: Set Git config @@ -72,7 +72,7 @@ jobs: runs-on: ubuntu-latest needs: [detect-ci-container] container: - image: ghcr.io/vdaas/vald/vald-ci-container:${{ needs.detect-ci-container.outputs.TAG_NAME }} + image: ghcr.io/vdaas/vald/vald-ci-container:${{ needs.detect-ci-container.outputs.TAG }} steps: - uses: actions/checkout@v4 - name: Set Git config diff --git a/.github/workflows/reviewdog.yml b/.github/workflows/reviewdog.yml index 6ad06cbf7c..967b34ed56 100644 --- a/.github/workflows/reviewdog.yml +++ b/.github/workflows/reviewdog.yml @@ -32,7 +32,7 @@ jobs: runs-on: ubuntu-latest needs: [detect-ci-container] container: - image: ghcr.io/vdaas/vald/vald-ci-container:${{ needs.detect-ci-container.outputs.TAG_NAME }} + image: ghcr.io/vdaas/vald/vald-ci-container:${{ needs.detect-ci-container.outputs.TAG }} steps: - uses: actions/checkout@v4 - name: Set Git config diff --git a/.github/workflows/test-hack.yml b/.github/workflows/test-hack.yml index 99ce9040f6..fbe9ff39e0 100644 --- a/.github/workflows/test-hack.yml +++ b/.github/workflows/test-hack.yml @@ -54,7 +54,7 @@ jobs: runs-on: ubuntu-latest needs: [detect-ci-container] container: - image: ghcr.io/vdaas/vald/vald-ci-container:${{ needs.detect-ci-container.outputs.TAG_NAME }} + image: ghcr.io/vdaas/vald/vald-ci-container:${{ needs.detect-ci-container.outputs.TAG }} defaults: run: working-directory: ${{ env.GOPATH }}/${{ env.PROJECT_ROOT_DIR }} diff --git a/.github/workflows/unit-test.yaml b/.github/workflows/unit-test.yaml index 96b4a8ffa1..34df7527ef 100644 --- a/.github/workflows/unit-test.yaml +++ b/.github/workflows/unit-test.yaml @@ -48,7 +48,7 @@ jobs: runs-on: ubuntu-latest needs: [detect-ci-container] container: - image: ghcr.io/vdaas/vald/vald-ci-container:${{ needs.detect-ci-container.outputs.TAG_NAME }} + image: ghcr.io/vdaas/vald/vald-ci-container:${{ needs.detect-ci-container.outputs.TAG }} steps: - uses: actions/checkout@v4 - name: Set Git config @@ -65,7 +65,7 @@ jobs: runs-on: ubuntu-latest needs: [detect-ci-container] container: - image: ghcr.io/vdaas/vald/vald-ci-container:${{ needs.detect-ci-container.outputs.TAG_NAME }} + image: ghcr.io/vdaas/vald/vald-ci-container:${{ needs.detect-ci-container.outputs.TAG }} steps: - uses: actions/checkout@v4 - name: Set Git config @@ -82,7 +82,7 @@ jobs: runs-on: ubuntu-latest needs: [detect-ci-container] container: - image: ghcr.io/vdaas/vald/vald-ci-container:${{ needs.detect-ci-container.outputs.TAG_NAME }} + image: ghcr.io/vdaas/vald/vald-ci-container:${{ needs.detect-ci-container.outputs.TAG }} steps: - uses: actions/checkout@v4 - name: Set Git config