From 901b80b4ce9e67a0638672a4951606ad2c036064 Mon Sep 17 00:00:00 2001 From: Chris Porter Date: Thu, 8 Feb 2024 10:04:26 -0600 Subject: [PATCH] CI: Use consistent yaml file extension Signed-off-by: Chris Porter --- ...n-merge.yml => docker-publish-latest-on-merge.yaml} | 0 ...r-publish-on-tag.yml => docker-publish-on-tag.yaml} | 0 .github/workflows/{makefile.yml => makefile.yaml} | 0 ...rge.yml => pre-install-image-publish-on-merge.yaml} | 0 README.md | 4 ++-- ...{install_build_deps.yml => install_build_deps.yaml} | 2 +- ...{install_containerd.yml => install_containerd.yaml} | 0 .../{install_docker.yml => install_docker.yaml} | 0 .../{install_kubeadm.yml => install_kubeadm.yaml} | 4 ++-- .../{install_test_deps.yml => install_test_deps.yaml} | 0 tests/e2e/ansible/{main.yml => main.yaml} | 10 +++++----- ..._docker_registry.yml => start_docker_registry.yaml} | 0 .../{kube-flannel.yml.j2 => kube-flannel.yaml.j2} | 0 tests/e2e/cluster/up.sh | 2 +- tests/e2e/run-local.sh | 4 ++-- 15 files changed, 13 insertions(+), 13 deletions(-) rename .github/workflows/{docker-publish-latest-on-merge.yml => docker-publish-latest-on-merge.yaml} (100%) rename .github/workflows/{docker-publish-on-tag.yml => docker-publish-on-tag.yaml} (100%) rename .github/workflows/{makefile.yml => makefile.yaml} (100%) rename .github/workflows/{pre-install-image-publish-on-merge.yml => pre-install-image-publish-on-merge.yaml} (100%) rename tests/e2e/ansible/{install_build_deps.yml => install_build_deps.yaml} (97%) rename tests/e2e/ansible/{install_containerd.yml => install_containerd.yaml} (100%) rename tests/e2e/ansible/{install_docker.yml => install_docker.yaml} (100%) rename tests/e2e/ansible/{install_kubeadm.yml => install_kubeadm.yaml} (98%) rename tests/e2e/ansible/{install_test_deps.yml => install_test_deps.yaml} (100%) rename tests/e2e/ansible/{main.yml => main.yaml} (66%) rename tests/e2e/ansible/{start_docker_registry.yml => start_docker_registry.yaml} (100%) rename tests/e2e/ansible/templates/{kube-flannel.yml.j2 => kube-flannel.yaml.j2} (100%) diff --git a/.github/workflows/docker-publish-latest-on-merge.yml b/.github/workflows/docker-publish-latest-on-merge.yaml similarity index 100% rename from .github/workflows/docker-publish-latest-on-merge.yml rename to .github/workflows/docker-publish-latest-on-merge.yaml diff --git a/.github/workflows/docker-publish-on-tag.yml b/.github/workflows/docker-publish-on-tag.yaml similarity index 100% rename from .github/workflows/docker-publish-on-tag.yml rename to .github/workflows/docker-publish-on-tag.yaml diff --git a/.github/workflows/makefile.yml b/.github/workflows/makefile.yaml similarity index 100% rename from .github/workflows/makefile.yml rename to .github/workflows/makefile.yaml diff --git a/.github/workflows/pre-install-image-publish-on-merge.yml b/.github/workflows/pre-install-image-publish-on-merge.yaml similarity index 100% rename from .github/workflows/pre-install-image-publish-on-merge.yml rename to .github/workflows/pre-install-image-publish-on-merge.yaml diff --git a/README.md b/README.md index 724ebdc7..d31810be 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Confidential Containers Operator -[![Build](https://github.com/confidential-containers/operator/actions/workflows/makefile.yml/badge.svg)](https://github.com/confidential-containers/operator/actions/workflows/makefile.yml) -[![Container Image](https://github.com/confidential-containers/operator/actions/workflows/docker-publish.yml/badge.svg)](https://github.com/confidential-containers/operator/actions/workflows/docker-publish.yml) +[![Build](https://github.com/confidential-containers/operator/actions/workflows/makefile.yaml/badge.svg)](https://github.com/confidential-containers/operator/actions/workflows/makefile.yaml) +[![Container Image](https://github.com/confidential-containers/operator/actions/workflows/docker-publish.yaml/badge.svg)](https://github.com/confidential-containers/operator/actions/workflows/docker-publish.yaml) [![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2Fconfidential-containers%2Foperator.svg?type=shield)](https://app.fossa.com/projects/git%2Bgithub.com%2Fconfidential-containers%2Foperator?ref=badge_shield) This Confidential Containers Operator provides a means to deploy and manage Confidential Containers Runtime on Kubernetes clusters. diff --git a/tests/e2e/ansible/install_build_deps.yml b/tests/e2e/ansible/install_build_deps.yaml similarity index 97% rename from tests/e2e/ansible/install_build_deps.yml rename to tests/e2e/ansible/install_build_deps.yaml index e1621dbd..3d81225a 100644 --- a/tests/e2e/ansible/install_build_deps.yml +++ b/tests/e2e/ansible/install_build_deps.yaml @@ -25,7 +25,7 @@ src: /usr/local/go/bin/go dest: /usr/local/bin/go state: link - - import_tasks: "install_docker.yml" + - import_tasks: "install_docker.yaml" # Docker buildx relies on qemu-user-static to multi-arch builds, but # qemu-user-static is not packaged for CentOS. Let's get it installed via # https://github.com/multiarch/qemu-user-static diff --git a/tests/e2e/ansible/install_containerd.yml b/tests/e2e/ansible/install_containerd.yaml similarity index 100% rename from tests/e2e/ansible/install_containerd.yml rename to tests/e2e/ansible/install_containerd.yaml diff --git a/tests/e2e/ansible/install_docker.yml b/tests/e2e/ansible/install_docker.yaml similarity index 100% rename from tests/e2e/ansible/install_docker.yml rename to tests/e2e/ansible/install_docker.yaml diff --git a/tests/e2e/ansible/install_kubeadm.yml b/tests/e2e/ansible/install_kubeadm.yaml similarity index 98% rename from tests/e2e/ansible/install_kubeadm.yml rename to tests/e2e/ansible/install_kubeadm.yaml index f57c61aa..57aeb16b 100644 --- a/tests/e2e/ansible/install_kubeadm.yml +++ b/tests/e2e/ansible/install_kubeadm.yaml @@ -101,8 +101,8 @@ state: directory - name: Create flannel deployment file template: - src: kube-flannel.yml.j2 - dest: "{{ flannel_home }}/kube-flannel.yml" + src: kube-flannel.yaml.j2 + dest: "{{ flannel_home }}/kube-flannel.yaml" # # Undo the kubeadm installation. Assume that ../cluster/down.sh is executed # before. diff --git a/tests/e2e/ansible/install_test_deps.yml b/tests/e2e/ansible/install_test_deps.yaml similarity index 100% rename from tests/e2e/ansible/install_test_deps.yml rename to tests/e2e/ansible/install_test_deps.yaml diff --git a/tests/e2e/ansible/main.yml b/tests/e2e/ansible/main.yaml similarity index 66% rename from tests/e2e/ansible/main.yml rename to tests/e2e/ansible/main.yaml index 38eb4b8a..4b4aa128 100644 --- a/tests/e2e/ansible/main.yml +++ b/tests/e2e/ansible/main.yaml @@ -6,14 +6,14 @@ # --- - name: Install build dependencies - import_playbook: install_build_deps.yml + import_playbook: install_build_deps.yaml - name: Install and configure containerd - import_playbook: install_containerd.yml + import_playbook: install_containerd.yaml # TODO: import either containerd or crio # when: container_runtime is 'containerd' - name: Install and configure kubeadm - import_playbook: install_kubeadm.yml + import_playbook: install_kubeadm.yaml - name: Start a local docker registry - import_playbook: start_docker_registry.yml + import_playbook: start_docker_registry.yaml - name: Install test dependencies - import_playbook: install_test_deps.yml + import_playbook: install_test_deps.yaml diff --git a/tests/e2e/ansible/start_docker_registry.yml b/tests/e2e/ansible/start_docker_registry.yaml similarity index 100% rename from tests/e2e/ansible/start_docker_registry.yml rename to tests/e2e/ansible/start_docker_registry.yaml diff --git a/tests/e2e/ansible/templates/kube-flannel.yml.j2 b/tests/e2e/ansible/templates/kube-flannel.yaml.j2 similarity index 100% rename from tests/e2e/ansible/templates/kube-flannel.yml.j2 rename to tests/e2e/ansible/templates/kube-flannel.yaml.j2 diff --git a/tests/e2e/cluster/up.sh b/tests/e2e/cluster/up.sh index 35374dd2..e6cc4d74 100755 --- a/tests/e2e/cluster/up.sh +++ b/tests/e2e/cluster/up.sh @@ -36,7 +36,7 @@ init_kubeadm() { configure_flannel() { local flannel_ns="kube-flannel" - kubectl apply -f /opt/flannel/kube-flannel.yml + kubectl apply -f /opt/flannel/kube-flannel.yaml if ! wait_pods "$flannel_ns"; then echo "ERROR: pods didn't show up in $flannel_ns" diff --git a/tests/e2e/run-local.sh b/tests/e2e/run-local.sh index 38bde695..1b11d519 100755 --- a/tests/e2e/run-local.sh +++ b/tests/e2e/run-local.sh @@ -70,7 +70,7 @@ undo_changes() { if [ $step_bootstrap_env -eq 1 ]; then echo "::info:: Undo the bootstrap" - run 5m ansible-playbook -i localhost, -c local --tags undo ansible/main.yml || true + run 5m ansible-playbook -i localhost, -c local --tags undo ansible/main.yaml || true fi popd >/dev/null } @@ -102,7 +102,7 @@ main() { pushd "$script_dir" >/dev/null echo "::info:: Bootstrap the local machine" step_bootstrap_env=1 - run 10m ansible-playbook -i localhost, -c local --tags untagged ansible/main.yml + run 10m ansible-playbook -i localhost, -c local --tags untagged ansible/main.yaml echo "::info:: Bring up the test cluster" step_start_cluster=1