From a9dd8f2dc775c6b636114d92a26d72043977f0ef Mon Sep 17 00:00:00 2001 From: david <9059044+Tansito@users.noreply.github.com> Date: Tue, 29 Aug 2023 11:55:51 +0200 Subject: [PATCH] Unify yaml extension --- .dockerignore | 4 ++-- .github/actions/docker-vscan/{action.yml => action.yaml} | 2 +- .github/actions/helm-lint/{action.yml => action.yaml} | 6 +++--- .../icr-build-and-push-images/{action.yml => action.yaml} | 0 .github/{release-drafter.yml => release-drafter.yaml} | 0 .../{client-pypi-release.yml => client-pypi-release.yaml} | 0 .github/workflows/{docker-build.yml => docker-build.yaml} | 4 ++-- .github/workflows/docker-verify.yaml | 2 +- .github/workflows/{docs-verify.yml => docs-verify.yaml} | 0 .github/workflows/{helm-verify.yml => helm-verify.yaml} | 6 +++--- ...age-build-and-push.yml => icr-image-build-and-push.yaml} | 0 .github/workflows/{publish-docs.yml => publish-docs.yaml} | 0 .../workflows/{release-drafter.yml => release-drafter.yaml} | 0 .../{release-pull-request.yml => release-pull-request.yaml} | 0 CONTRIBUTING.md | 6 +++--- client/tests/core/test_program.py | 2 +- client/tests/core/test_state.py | 2 +- docker-compose-dev.yml => docker-compose-dev.yaml | 2 +- docker-compose.yml => docker-compose.yaml | 2 +- docs/deployment/cloud.rst | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) rename .github/actions/docker-vscan/{action.yml => action.yaml} (93%) rename .github/actions/helm-lint/{action.yml => action.yaml} (87%) rename .github/actions/icr-build-and-push-images/{action.yml => action.yaml} (100%) rename .github/{release-drafter.yml => release-drafter.yaml} (100%) rename .github/workflows/{client-pypi-release.yml => client-pypi-release.yaml} (100%) rename .github/workflows/{docker-build.yml => docker-build.yaml} (83%) rename .github/workflows/{docs-verify.yml => docs-verify.yaml} (100%) rename .github/workflows/{helm-verify.yml => helm-verify.yaml} (70%) rename .github/workflows/{icr-image-build-and-push.yml => icr-image-build-and-push.yaml} (100%) rename .github/workflows/{publish-docs.yml => publish-docs.yaml} (100%) rename .github/workflows/{release-drafter.yml => release-drafter.yaml} (100%) rename .github/workflows/{release-pull-request.yml => release-pull-request.yaml} (100%) rename docker-compose-dev.yml => docker-compose-dev.yaml (98%) rename docker-compose.yml => docker-compose.yaml (98%) diff --git a/.dockerignore b/.dockerignore index eddf74be6..da1346038 100644 --- a/.dockerignore +++ b/.dockerignore @@ -13,8 +13,8 @@ INSTALL.md README.md /vendor Dockerfile -docker-compose.yml -docker-compose-dev.yml +docker-compose.yaml +docker-compose-dev.yaml ### IDEs diff --git a/.github/actions/docker-vscan/action.yml b/.github/actions/docker-vscan/action.yaml similarity index 93% rename from .github/actions/docker-vscan/action.yml rename to .github/actions/docker-vscan/action.yaml index 1e4f01692..e9e0f1165 100644 --- a/.github/actions/docker-vscan/action.yml +++ b/.github/actions/docker-vscan/action.yaml @@ -7,7 +7,7 @@ inputs: default: aquasec/trivy:0.42.1 required: false GITHUB_TOKEN: - description: GitHub token passed as input to be used in action.yml # https://github.com/orgs/community/discussions/27054#discussioncomment-3254450 + description: GitHub token passed as input to be used in action.yaml # https://github.com/orgs/community/discussions/27054#discussioncomment-3254450 required: true dockerfile: description: Dockerfile to build the image diff --git a/.github/actions/helm-lint/action.yml b/.github/actions/helm-lint/action.yaml similarity index 87% rename from .github/actions/helm-lint/action.yml rename to .github/actions/helm-lint/action.yaml index 29f797e8d..a8f34f422 100644 --- a/.github/actions/helm-lint/action.yml +++ b/.github/actions/helm-lint/action.yaml @@ -23,7 +23,7 @@ runs: shell: bash id: list-changed run: | - changed=$(ct list-changed --config ct.yml) + changed=$(ct list-changed --config ct.yaml) if [[ -n "$changed" ]]; then echo "changed=true" >> "$GITHUB_OUTPUT" fi @@ -31,7 +31,7 @@ runs: - name: Run chart-testing (lint) shell: bash if: steps.list-changed.outputs.changed == 'true' - run: ct lint --config ct.yml --check-version-increment=false + run: ct lint --config ct.yaml --check-version-increment=false # - name: Create kind cluster # if: steps.list-changed.outputs.changed == 'true' @@ -40,4 +40,4 @@ runs: # - name: Run chart-testing (install) # shell: bash # if: steps.list-changed.outputs.changed == 'true' - # run: ct install --config ct.yml + # run: ct install --config ct.yaml diff --git a/.github/actions/icr-build-and-push-images/action.yml b/.github/actions/icr-build-and-push-images/action.yaml similarity index 100% rename from .github/actions/icr-build-and-push-images/action.yml rename to .github/actions/icr-build-and-push-images/action.yaml diff --git a/.github/release-drafter.yml b/.github/release-drafter.yaml similarity index 100% rename from .github/release-drafter.yml rename to .github/release-drafter.yaml diff --git a/.github/workflows/client-pypi-release.yml b/.github/workflows/client-pypi-release.yaml similarity index 100% rename from .github/workflows/client-pypi-release.yml rename to .github/workflows/client-pypi-release.yaml diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yaml similarity index 83% rename from .github/workflows/docker-build.yml rename to .github/workflows/docker-build.yaml index 9b4015a51..afada8090 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yaml @@ -11,9 +11,9 @@ jobs: steps: - uses: actions/checkout@v3 - name: Build the containers - run: docker compose -f docker-compose-dev.yml --profile jupyter build + run: docker compose -f docker-compose-dev.yaml --profile jupyter build - name: Run the jupyter profile - run: docker compose -f docker-compose-dev.yml --profile jupyter up -d + run: docker compose -f docker-compose-dev.yaml --profile jupyter up -d - name: Give containers time to initialize shell: bash run: sleep 90 diff --git a/.github/workflows/docker-verify.yaml b/.github/workflows/docker-verify.yaml index dc9132a3f..8f9b17b44 100644 --- a/.github/workflows/docker-verify.yaml +++ b/.github/workflows/docker-verify.yaml @@ -7,7 +7,7 @@ on: - "Dockerfile-ray-node" - "gateway/Dockerfile" - "repository/Dockerfile" - - ".github/actions/docker-vscan/action.yml" + - ".github/actions/docker-vscan/action.yaml" - ".github/scripts/dockerfile-security.rego" - ".github/workflows/docker-verify.yaml" diff --git a/.github/workflows/docs-verify.yml b/.github/workflows/docs-verify.yaml similarity index 100% rename from .github/workflows/docs-verify.yml rename to .github/workflows/docs-verify.yaml diff --git a/.github/workflows/helm-verify.yml b/.github/workflows/helm-verify.yaml similarity index 70% rename from .github/workflows/helm-verify.yml rename to .github/workflows/helm-verify.yaml index 17feebeac..1e8549c36 100644 --- a/.github/workflows/helm-verify.yml +++ b/.github/workflows/helm-verify.yaml @@ -3,10 +3,10 @@ name: Helm verify process on: push: paths: - - "ct.yml" + - "ct.yaml" - "charts/*" - - ".github/actions/helm-lint/action.yml" - - ".github/workflows/helm-verify.yml" + - ".github/actions/helm-lint/action.yaml" + - ".github/workflows/helm-verify.yaml" jobs: lint: diff --git a/.github/workflows/icr-image-build-and-push.yml b/.github/workflows/icr-image-build-and-push.yaml similarity index 100% rename from .github/workflows/icr-image-build-and-push.yml rename to .github/workflows/icr-image-build-and-push.yaml diff --git a/.github/workflows/publish-docs.yml b/.github/workflows/publish-docs.yaml similarity index 100% rename from .github/workflows/publish-docs.yml rename to .github/workflows/publish-docs.yaml diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yaml similarity index 100% rename from .github/workflows/release-drafter.yml rename to .github/workflows/release-drafter.yaml diff --git a/.github/workflows/release-pull-request.yml b/.github/workflows/release-pull-request.yaml similarity index 100% rename from .github/workflows/release-pull-request.yml rename to .github/workflows/release-pull-request.yaml diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index cfccfbcf3..b43225aaf 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -138,15 +138,15 @@ To set up a local development environment for the quantum-serverless components To build the images, run the following command from the root directory: -```docker compose -f docker-compose-dev.yml build``` +```docker compose -f docker-compose-dev.yaml build``` And to deploy your code, run the following command: -```docker compose -f docker-compose-dev.yml up``` +```docker compose -f docker-compose-dev.yaml up``` If you wish to rebuild only a specific component (for example, the `gateway`), you can do so as follows: -```docker compose -f docker-compose-dev.yml build gateway``` +```docker compose -f docker-compose-dev.yaml build gateway``` For Apple Silicon system (arm64 / aarch64), set `TARGETARCH=arm64` before running the `docker compose` command. diff --git a/client/tests/core/test_program.py b/client/tests/core/test_program.py index c65f8e2e5..73b7d35ad 100644 --- a/client/tests/core/test_program.py +++ b/client/tests/core/test_program.py @@ -19,7 +19,7 @@ def test_program(): """Integration test for program.""" with DockerCompose( - resources_path, compose_file_name="test-compose.yml", pull=True + resources_path, compose_file_name="test-compose.yaml", pull=True ) as compose: host = compose.get_service_host("testrayhead", 8265) port = compose.get_service_port("testrayhead", 8265) diff --git a/client/tests/core/test_state.py b/client/tests/core/test_state.py index 31308052e..87297e618 100644 --- a/client/tests/core/test_state.py +++ b/client/tests/core/test_state.py @@ -32,7 +32,7 @@ def test_state(): """Integration test for jobs.""" with DockerCompose( - resources_path, compose_file_name="test-compose.yml", pull=True + resources_path, compose_file_name="test-compose.yaml", pull=True ) as compose: host = compose.get_service_host("testrayhead", 8265) port = compose.get_service_port("testrayhead", 8265) diff --git a/docker-compose-dev.yml b/docker-compose-dev.yaml similarity index 98% rename from docker-compose-dev.yml rename to docker-compose-dev.yaml index d9a75f698..6f07ba563 100644 --- a/docker-compose-dev.yml +++ b/docker-compose-dev.yaml @@ -171,7 +171,7 @@ services: profiles: [ "full" ] volumes: - /var/log:/var/log - command: -config.file=/etc/promtail/config.yml + command: -config.file=/etc/promtail/config.yaml networks: - safe-tier grafana: diff --git a/docker-compose.yml b/docker-compose.yaml similarity index 98% rename from docker-compose.yml rename to docker-compose.yaml index 9e1b058e9..c1777f237 100644 --- a/docker-compose.yml +++ b/docker-compose.yaml @@ -161,7 +161,7 @@ services: profiles: [ "full" ] volumes: - /var/log:/var/log - command: -config.file=/etc/promtail/config.yml + command: -config.file=/etc/promtail/config.yaml networks: - safe-tier grafana: diff --git a/docs/deployment/cloud.rst b/docs/deployment/cloud.rst index 80c038b1d..06fc58e40 100644 --- a/docs/deployment/cloud.rst +++ b/docs/deployment/cloud.rst @@ -71,7 +71,7 @@ In case you want to use the ``main`` branch you can use the configuration for de .. code-block:: :caption: run the command from the root of the project - $ docker compose -f docker-compose-dev.yml --profile jupyter up + $ docker compose -f docker-compose-dev.yaml --profile jupyter up .. _helm-deployment: