Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport PR #2620 to release/v1.7 for [Bugfix] agent service test #2622

Closed
wants to merge 1 commit into from
Closed

Backport PR #2620 to release/v1.7 for [Bugfix] agent service test #2622

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions .gitfiles
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1422,6 +1422,15 @@ k8s/gateway/gateway/lb/hpa.yaml
k8s/gateway/gateway/lb/pdb.yaml
k8s/gateway/gateway/lb/priorityclass.yaml
k8s/gateway/gateway/lb/svc.yaml
k8s/gateway/gateway/mirror/clusterrole.yaml
k8s/gateway/gateway/mirror/clusterrolebinding.yaml
k8s/gateway/gateway/mirror/configmap.yaml
k8s/gateway/gateway/mirror/deployment.yaml
k8s/gateway/gateway/mirror/hpa.yaml
k8s/gateway/gateway/mirror/pdb.yaml
k8s/gateway/gateway/mirror/priorityclass.yaml
k8s/gateway/gateway/mirror/serviceaccount.yaml
k8s/gateway/gateway/mirror/svc.yaml
k8s/index/job/correction/configmap.yaml
k8s/index/job/correction/cronjob.yaml
k8s/index/job/creation/configmap.yaml
Expand Down
8 changes: 8 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,18 @@ assignees: ""
<!--- Please change the versions below along with your environment -->

- Vald Version: v1.7.13
<<<<<<< HEAD
- Go Version: v1.22.6
- Rust Version: v1.80.0
- Docker Version: v27.1.1
- Kubernetes Version: v1.30.3
- Helm Version: v3.15.3
=======
- Go Version: v1.23.1
- Rust Version: v1.81.0
- Docker Version: v27.2.1
- Kubernetes Version: v1.31.0
- Helm Version: v3.16.0
>>>>>>> 5ba13751f ([Bugfix] agent service test (#2620))
- NGT Version: v2.2.4
- Faiss Version: v1.8.0
8 changes: 8 additions & 0 deletions .github/ISSUE_TEMPLATE/security_issue_report.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,18 @@ assignees: ""
<!--- Please change the versions below along with your environment -->

- Vald Version: v1.7.13
<<<<<<< HEAD
- Go Version: v1.22.6
- Rust Version: v1.80.0
- Docker Version: v27.1.1
- Kubernetes Version: v1.30.3
- Helm Version: v3.15.3
=======
- Go Version: v1.23.1
- Rust Version: v1.81.0
- Docker Version: v27.2.1
- Kubernetes Version: v1.31.0
- Helm Version: v3.16.0
>>>>>>> 5ba13751f ([Bugfix] agent service test (#2620))
- NGT Version: v2.2.4
- Faiss Version: v1.8.0
8 changes: 8 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,19 @@

<!--- Please change the versions below along with your environment -->
- Vald Version: v1.7.13
<<<<<<< HEAD
- Go Version: v1.22.6
- Rust Version: v1.80.0
- Docker Version: v27.1.1
- Kubernetes Version: v1.30.3
- Helm Version: v3.15.3
=======
- Go Version: v1.23.1
- Rust Version: v1.81.0
- Docker Version: v27.2.1
- Kubernetes Version: v1.31.0
- Helm Version: v3.16.0
>>>>>>> 5ba13751f ([Bugfix] agent service test (#2620))
- NGT Version: v2.2.4
- Faiss Version: v1.8.0

Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/dockers-agent-faiss-image.yaml
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,14 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#

# DO_NOT_EDIT this workflow file is generated by https://github.com/vdaas/vald/blob/main/hack/actions/gen/main.go
<<<<<<< HEAD
name: 'Build docker image: agent-faiss'
=======

name: "Build docker image: agent-faiss"
>>>>>>> 5ba13751f ([Bugfix] agent service test (#2620))
on:
push:
branches:
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/dockers-agent-image.yaml
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,14 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#

# DO_NOT_EDIT this workflow file is generated by https://github.com/vdaas/vald/blob/main/hack/actions/gen/main.go
<<<<<<< HEAD
name: 'Build docker image: agent'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fix the YAML parsing error.

The actionlint static analysis tool has flagged a YAML parsing error at line 19 due to the unresolved merge conflict markers.

This error will be automatically fixed once the merge conflict is resolved by removing the conflict markers as suggested in the previous comment.

Tools
actionlint

19-19: could not parse as YAML: yaml: line 19: mapping values are not allowed in this context

(syntax-check)

=======

name: "Build docker image: agent"
>>>>>>> 5ba13751f ([Bugfix] agent service test (#2620))
Comment on lines +18 to +23
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Resolve the merge conflict.

The file has unresolved merge conflict markers. The desired version of the name field needs to be kept and the conflict markers (<<<<<<<, =======, >>>>>>>) should be removed.

To resolve the conflict, apply this diff:

-<<<<<<< HEAD
-name: 'Build docker image: agent'
-=======
-
 name: "Build docker image: agent"
->>>>>>> 5ba13751f ([Bugfix] agent service test (#2620))
Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
<<<<<<< HEAD
name: 'Build docker image: agent'
=======
name: "Build docker image: agent"
>>>>>>> 5ba13751f ([Bugfix] agent service test (#2620))
name: "Build docker image: agent"
Tools
actionlint

19-19: could not parse as YAML: yaml: line 19: mapping values are not allowed in this context

(syntax-check)

on:
push:
branches:
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/dockers-agent-ngt-image.yaml
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,14 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#

# DO_NOT_EDIT this workflow file is generated by https://github.com/vdaas/vald/blob/main/hack/actions/gen/main.go
<<<<<<< HEAD
name: 'Build docker image: agent-ngt'
=======
Comment on lines +18 to +20
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fix the YAML parsing error.

The static analysis tool actionlint has flagged a valid YAML parsing error at line 19:

could not parse as YAML: yaml: line 19: mapping values are not allowed in this context

This error is caused by the Git conflict markers (<<<<<<<, =======, >>>>>>>) that are present in the file.

To fix this error, please resolve the Git conflict by removing the conflict markers and keeping only the desired version of the code. For example:

-<<<<<<< HEAD
-name: 'Build docker image: agent-ngt'
-=======
-
 name: "Build docker image: agent-ngt"
->>>>>>> 5ba13751f ([Bugfix] agent service test (#2620))

Do you want me to open a GitHub issue to track this task?

Committable suggestion was skipped due to low confidence.

Tools
actionlint

19-19: could not parse as YAML: yaml: line 19: mapping values are not allowed in this context

(syntax-check)


name: "Build docker image: agent-ngt"
>>>>>>> 5ba13751f ([Bugfix] agent service test (#2620))
on:
push:
branches:
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/dockers-agent-sidecar-image.yaml
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,14 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#

# DO_NOT_EDIT this workflow file is generated by https://github.com/vdaas/vald/blob/main/hack/actions/gen/main.go
<<<<<<< HEAD
name: 'Build docker image: agent-sidecar'
=======

name: "Build docker image: agent-sidecar"
>>>>>>> 5ba13751f ([Bugfix] agent service test (#2620))
Comment on lines +18 to +23
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Resolve the merge conflict.

There is an unresolved merge conflict in the workflow file, as indicated by the presence of Git conflict markers <<<<<<< HEAD, =======, and >>>>>>> 5ba13751f ([Bugfix] agent service test (#2620)).

Please resolve the merge conflict by deciding which version of the name field to keep - either the single-quoted or double-quoted version. Remove the conflict markers and ensure the file is valid YAML.

Tools
actionlint

19-19: could not parse as YAML: yaml: line 19: mapping values are not allowed in this context

(syntax-check)

on:
push:
branches:
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/dockers-benchmark-job-image.yaml
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,14 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#

# DO_NOT_EDIT this workflow file is generated by https://github.com/vdaas/vald/blob/main/hack/actions/gen/main.go
<<<<<<< HEAD
name: 'Build docker image: benchmark-job'
=======

name: "Build docker image: benchmark-job"
>>>>>>> 5ba13751f ([Bugfix] agent service test (#2620))
Comment on lines +18 to +23
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fix the YAML parsing error.

There is a YAML parsing error due to the Git conflict markers <<<<<<<, =======, and >>>>>>> present in the workflow file. These markers are causing the YAML syntax to be invalid.

To resolve this, remove the Git conflict markers and keep only the desired version of the workflow name:

-<<<<<<< HEAD
-name: 'Build docker image: benchmark-job'
-=======
-
-name: "Build docker image: benchmark-job"
->>>>>>> 5ba13751f ([Bugfix] agent service test (#2620))
+name: "Build docker image: benchmark-job"
Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
<<<<<<< HEAD
name: 'Build docker image: benchmark-job'
=======
name: "Build docker image: benchmark-job"
>>>>>>> 5ba13751f ([Bugfix] agent service test (#2620))
name: "Build docker image: benchmark-job"
Tools
actionlint

19-19: could not parse as YAML: yaml: line 19: mapping values are not allowed in this context

(syntax-check)

on:
push:
branches:
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/dockers-benchmark-operator-image.yaml
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,14 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#

# DO_NOT_EDIT this workflow file is generated by https://github.com/vdaas/vald/blob/main/hack/actions/gen/main.go
<<<<<<< HEAD
name: 'Build docker image: benchmark-operator'
=======

name: "Build docker image: benchmark-operator"
>>>>>>> 5ba13751f ([Bugfix] agent service test (#2620))
Comment on lines +18 to +23
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Resolve the merge conflict.

There are conflict markers (<<<<<<<, =======, >>>>>>>) in the file, indicating an unresolved merge conflict. This is causing a YAML parsing error as flagged by the static analysis tool.

Please resolve the merge conflict by removing the conflict markers and keeping the desired version of the workflow name.

Tools
actionlint

19-19: could not parse as YAML: yaml: line 19: mapping values are not allowed in this context

(syntax-check)

on:
push:
branches:
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/dockers-binfmt-image.yaml
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,14 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#

# DO_NOT_EDIT this workflow file is generated by https://github.com/vdaas/vald/blob/main/hack/actions/gen/main.go
<<<<<<< HEAD
name: 'Build docker image: binfmt'
=======

name: "Build docker image: binfmt"
>>>>>>> 5ba13751f ([Bugfix] agent service test (#2620))
on:
schedule:
- cron: 0 * * * *
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/dockers-buildbase-image.yaml
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,14 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#

# DO_NOT_EDIT this workflow file is generated by https://github.com/vdaas/vald/blob/main/hack/actions/gen/main.go
<<<<<<< HEAD
name: 'Build docker image: buildbase'
=======

name: "Build docker image: buildbase"
>>>>>>> 5ba13751f ([Bugfix] agent service test (#2620))
on:
schedule:
- cron: 0 * * * *
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/dockers-buildkit-image.yaml
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,14 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#

# DO_NOT_EDIT this workflow file is generated by https://github.com/vdaas/vald/blob/main/hack/actions/gen/main.go
<<<<<<< HEAD
name: 'Build docker image: buildkit'
=======

name: "Build docker image: buildkit"
>>>>>>> 5ba13751f ([Bugfix] agent service test (#2620))
Comment on lines +18 to +23
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Resolve the merge conflict.

There are Git conflict markers present in the workflow file, causing a YAML parsing error. Please resolve the merge conflict by either accepting the current change, the incoming change, or manually merging the changes.

Tools
actionlint

19-19: could not parse as YAML: yaml: line 19: mapping values are not allowed in this context

(syntax-check)

on:
schedule:
- cron: 0 * * * *
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/dockers-buildkit-syft-scanner-image.yaml
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,14 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#

# DO_NOT_EDIT this workflow file is generated by https://github.com/vdaas/vald/blob/main/hack/actions/gen/main.go
<<<<<<< HEAD
name: 'Build docker image: buildkit-syft-scanner'
=======

name: "Build docker image: buildkit-syft-scanner"
>>>>>>> 5ba13751f ([Bugfix] agent service test (#2620))
Comment on lines +18 to +23
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Resolve the merge conflict.

There are merge conflict markers (<<<<<<<, =======, >>>>>>>) in the file, indicating that the file has not been properly merged. Please resolve the conflict by removing the markers and keeping the desired version of the code.

Tools
actionlint

19-19: could not parse as YAML: yaml: line 19: mapping values are not allowed in this context

(syntax-check)

on:
schedule:
- cron: 0 * * * *
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/dockers-ci-container-image.yaml
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,14 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#

# DO_NOT_EDIT this workflow file is generated by https://github.com/vdaas/vald/blob/main/hack/actions/gen/main.go
<<<<<<< HEAD
name: 'Build docker image: ci-container'
=======

name: "Build docker image: ci-container"
>>>>>>> 5ba13751f ([Bugfix] agent service test (#2620))
on:
push:
branches:
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/dockers-dev-container-image.yaml
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,14 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#

# DO_NOT_EDIT this workflow file is generated by https://github.com/vdaas/vald/blob/main/hack/actions/gen/main.go
<<<<<<< HEAD
name: 'Build docker image: dev-container'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Resolve the merge conflict.

There is an unresolved merge conflict in this file at line 19. The actionlint tool has also flagged a YAML parsing error due to the conflict markers.

Please resolve the conflict by deciding which version of the workflow name to keep - either single quotes or double quotes. Remove the conflict markers <<<<<<<, =======, >>>>>>> and the commit hash after resolving.

Tools
actionlint

19-19: could not parse as YAML: yaml: line 19: mapping values are not allowed in this context

(syntax-check)

=======

name: "Build docker image: dev-container"
>>>>>>> 5ba13751f ([Bugfix] agent service test (#2620))
on:
push:
branches:
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/dockers-discoverer-k8s-image.yaml
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,14 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#

# DO_NOT_EDIT this workflow file is generated by https://github.com/vdaas/vald/blob/main/hack/actions/gen/main.go
<<<<<<< HEAD
name: 'Build docker image: discoverer-k8s'
=======

name: "Build docker image: discoverer-k8s"
>>>>>>> 5ba13751f ([Bugfix] agent service test (#2620))
Comment on lines +18 to +23
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Resolve Git conflict markers.

The file contains Git conflict markers that are causing YAML parsing errors. This needs to be resolved before merging the changes.

To resolve the conflict markers, remove the following lines:

-<<<<<<< HEAD
-name: 'Build docker image: discoverer-k8s'
-=======
-
-name: "Build docker image: discoverer-k8s"
->>>>>>> 5ba13751f ([Bugfix] agent service test (#2620))

And keep only the desired version of the workflow name:

name: "Build docker image: discoverer-k8s"
Tools
actionlint

19-19: could not parse as YAML: yaml: line 19: mapping values are not allowed in this context

(syntax-check)

on:
push:
branches:
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/dockers-gateway-filter-image.yaml
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,14 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#

# DO_NOT_EDIT this workflow file is generated by https://github.com/vdaas/vald/blob/main/hack/actions/gen/main.go
<<<<<<< HEAD
name: 'Build docker image: gateway-filter'
=======

name: "Build docker image: gateway-filter"
>>>>>>> 5ba13751f ([Bugfix] agent service test (#2620))
on:
push:
branches:
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/dockers-gateway-lb-image.yaml
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,14 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#

# DO_NOT_EDIT this workflow file is generated by https://github.com/vdaas/vald/blob/main/hack/actions/gen/main.go
<<<<<<< HEAD
name: 'Build docker image: gateway-lb'
=======

name: "Build docker image: gateway-lb"
>>>>>>> 5ba13751f ([Bugfix] agent service test (#2620))
Comment on lines +16 to +23
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fix the YAML parsing error caused by the new line.

The new line added at line 16 is causing a YAML parsing error because it breaks the structure of the YAML document. The error message from actionlint confirms this:

could not parse as YAML: yaml: line 19: mapping values are not allowed in this context

To fix the YAML parsing error, remove the new line at line 16:

-
 # DO_NOT_EDIT this workflow file is generated by https://github.com/vdaas/vald/blob/main/hack/actions/gen/main.go
-<<<<<<< HEAD
-name: 'Build docker image: gateway-lb'
-=======
-
 name: "Build docker image: gateway-lb"
->>>>>>> 5ba13751f ([Bugfix] agent service test (#2620))
Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
# DO_NOT_EDIT this workflow file is generated by https://github.com/vdaas/vald/blob/main/hack/actions/gen/main.go
<<<<<<< HEAD
name: 'Build docker image: gateway-lb'
=======
name: "Build docker image: gateway-lb"
>>>>>>> 5ba13751f ([Bugfix] agent service test (#2620))
# DO_NOT_EDIT this workflow file is generated by https://github.com/vdaas/vald/blob/main/hack/actions/gen/main.go
name: "Build docker image: gateway-lb"
Tools
actionlint

19-19: could not parse as YAML: yaml: line 19: mapping values are not allowed in this context

(syntax-check)

on:
push:
branches:
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/dockers-gateway-mirror-image.yaml
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,14 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#

# DO_NOT_EDIT this workflow file is generated by https://github.com/vdaas/vald/blob/main/hack/actions/gen/main.go
<<<<<<< HEAD
name: 'Build docker image: gateway-mirror'
=======

name: "Build docker image: gateway-mirror"
>>>>>>> 5ba13751f ([Bugfix] agent service test (#2620))
on:
push:
branches:
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/dockers-helm-operator-image.yaml
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,14 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#

# DO_NOT_EDIT this workflow file is generated by https://github.com/vdaas/vald/blob/main/hack/actions/gen/main.go
<<<<<<< HEAD
name: 'Build docker image: helm-operator'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fix the YAML parsing error.

The static analysis tool actionlint has flagged a YAML parsing error at line 19. This error is caused by the presence of merge conflict markers in the file.

Resolve the merge conflict by removing the conflict markers, which will also fix the YAML parsing error.

Tools
actionlint

19-19: could not parse as YAML: yaml: line 19: mapping values are not allowed in this context

(syntax-check)

=======

name: "Build docker image: helm-operator"
>>>>>>> 5ba13751f ([Bugfix] agent service test (#2620))
Comment on lines +18 to +23
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Resolve the merge conflict.

There are merge conflict markers present in the file, which need to be resolved before merging the changes. The conflict is related to the formatting of the name field.

To resolve the conflict, remove the conflict markers and keep either the single quotes or double quotes version of the name field, based on the project's coding style guidelines.

Tools
actionlint

19-19: could not parse as YAML: yaml: line 19: mapping values are not allowed in this context

(syntax-check)

on:
push:
branches:
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/dockers-index-correction-image.yaml
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,14 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#

# DO_NOT_EDIT this workflow file is generated by https://github.com/vdaas/vald/blob/main/hack/actions/gen/main.go
<<<<<<< HEAD
name: 'Build docker image: index-correction'
=======

name: "Build docker image: index-correction"
>>>>>>> 5ba13751f ([Bugfix] agent service test (#2620))
Comment on lines +18 to +23
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Resolve merge conflict.

There are unresolved merge conflict markers in the file. The conflict seems to be around the name field.

Based on the context, the preferred change appears to be:

name: "Build docker image: index-correction"

Please resolve the conflict by removing the conflict markers and keeping the above line.

Tools
actionlint

19-19: could not parse as YAML: yaml: line 19: mapping values are not allowed in this context

(syntax-check)

on:
push:
branches:
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/dockers-index-creation-image.yaml
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,14 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#

# DO_NOT_EDIT this workflow file is generated by https://github.com/vdaas/vald/blob/main/hack/actions/gen/main.go
<<<<<<< HEAD
name: 'Build docker image: index-creation'
=======

name: "Build docker image: index-creation"
>>>>>>> 5ba13751f ([Bugfix] agent service test (#2620))
Comment on lines +18 to +23
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Resolve the merge conflict and fix the YAML parsing error.

There are merge conflict markers present in the file, which is causing a YAML parsing error at line 19 as indicated by the static analysis tool. Please resolve the merge conflict and ensure the file is properly formatted.

Tools
actionlint

19-19: could not parse as YAML: yaml: line 19: mapping values are not allowed in this context

(syntax-check)

on:
push:
branches:
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/dockers-index-operator-image.yaml
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,14 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#

# DO_NOT_EDIT this workflow file is generated by https://github.com/vdaas/vald/blob/main/hack/actions/gen/main.go
<<<<<<< HEAD
name: 'Build docker image: index-operator'
=======

name: "Build docker image: index-operator"
>>>>>>> 5ba13751f ([Bugfix] agent service test (#2620))
Comment on lines +18 to +23
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fix the merge conflict resolution.

The merge conflict resolution on lines 18-23 is incorrect and introduces a YAML syntax error. The conflict markers <<<<<<< HEAD, =======, and >>>>>>> 5ba13751f ([Bugfix] agent service test (#2620)) should be removed, and only the desired version of the name field should be kept.

Apply this diff to fix the merge conflict resolution:

-<<<<<<< HEAD
-name: 'Build docker image: index-operator'
-=======
-
 name: "Build docker image: index-operator"
->>>>>>> 5ba13751f ([Bugfix] agent service test (#2620))
Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
<<<<<<< HEAD
name: 'Build docker image: index-operator'
=======
name: "Build docker image: index-operator"
>>>>>>> 5ba13751f ([Bugfix] agent service test (#2620))
name: "Build docker image: index-operator"
Tools
actionlint

19-19: could not parse as YAML: yaml: line 19: mapping values are not allowed in this context

(syntax-check)

on:
push:
branches:
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/dockers-index-save-image.yaml
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,14 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#

# DO_NOT_EDIT this workflow file is generated by https://github.com/vdaas/vald/blob/main/hack/actions/gen/main.go
<<<<<<< HEAD
name: 'Build docker image: index-save'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fix the YAML syntax error.

The static analysis tool actionlint has flagged a YAML syntax error on line 19. It seems there is an incorrect merge conflict marker <<<<<<< HEAD present.

Please remove the lines with the merge conflict markers to fix the YAML syntax:

-<<<<<<< HEAD
-name: 'Build docker image: index-save'
-=======
-
 name: "Build docker image: index-save"
->>>>>>> 5ba13751f ([Bugfix] agent service test (#2620))

Committable suggestion was skipped due to low confidence.

Tools
actionlint

19-19: could not parse as YAML: yaml: line 19: mapping values are not allowed in this context

(syntax-check)

=======

name: "Build docker image: index-save"
>>>>>>> 5ba13751f ([Bugfix] agent service test (#2620))
on:
push:
branches:
Expand Down
Loading
Loading