Skip to content

Commit

Permalink
Merging pull request 344
Browse files Browse the repository at this point in the history
Signed-off-by: Lukáš Doktor <[email protected]>

* github.com:confidential-containers/operator:
  CI: Use consistent yaml file extension
  • Loading branch information
ldoktor committed Feb 13, 2024
2 parents 22b4d52 + 901b80b commit 14a040c
Show file tree
Hide file tree
Showing 15 changed files with 13 additions and 13 deletions.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
File renamed without changes.
10 changes: 5 additions & 5 deletions tests/e2e/ansible/main.yml → tests/e2e/ansible/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
File renamed without changes.
2 changes: 1 addition & 1 deletion tests/e2e/cluster/up.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions tests/e2e/run-local.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 14a040c

Please sign in to comment.