github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-10-31 09:26:52 +00:00
Code Issues Projects Releases Wiki Activity

ci: k8s: Export KUBERNETES env var

Browse Source 
So we have a better control on which flavour of kubernetes kata-deploy
is expected to be targetting.

Signed-off-by: Fabiano Fidêncio <fabiano.fidencio@intel.com>
This commit is contained in:
Fabiano Fidêncio
2023-09-08 10:02:08 +02:00
parent 8c9380a798
commit fa62a4c01b
5 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/run-k8s-tests-on-aks.yaml vendored
View File

@@ -40,6 +40,7 @@ jobs:
GH_PR_NUMBER: ${{ inputs.pr-number }} GH_PR_NUMBER: ${{ inputs.pr-number }}
KATA_HOST_OS: ${{ matrix.host_os }} KATA_HOST_OS: ${{ matrix.host_os }}
KATA_HYPERVISOR: ${{ matrix.vmm }} KATA_HYPERVISOR: ${{ matrix.vmm }}
KUBERNETES: "vanilla"
USING_NFD: "false" USING_NFD: "false"
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3

1
.github/workflows/run-k8s-tests-on-sev.yaml vendored
View File

@@ -33,6 +33,7 @@ jobs:
PR_NUMBER: ${{ inputs.pr-number }} PR_NUMBER: ${{ inputs.pr-number }}
KATA_HYPERVISOR: ${{ matrix.vmm }} KATA_HYPERVISOR: ${{ matrix.vmm }}
KUBECONFIG: /home/kata/.kube/config KUBECONFIG: /home/kata/.kube/config
KUBERNETES: "vanilla"
USING_NFD: "false" USING_NFD: "false"
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3

1
.github/workflows/run-k8s-tests-on-snp.yaml vendored
View File

@@ -33,6 +33,7 @@ jobs:
PR_NUMBER: ${{ inputs.pr-number }} PR_NUMBER: ${{ inputs.pr-number }}
KATA_HYPERVISOR: ${{ matrix.vmm }} KATA_HYPERVISOR: ${{ matrix.vmm }}
KUBECONFIG: /home/kata/.kube/config KUBECONFIG: /home/kata/.kube/config
KUBERNETES: "vanilla"
USING_NFD: "false" USING_NFD: "false"
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3

1
.github/workflows/run-k8s-tests-on-tdx.yaml vendored
View File

@@ -32,6 +32,7 @@ jobs:
DOCKER_TAG: ${{ inputs.tag }} DOCKER_TAG: ${{ inputs.tag }}
PR_NUMBER: ${{ inputs.pr-number }} PR_NUMBER: ${{ inputs.pr-number }}
KATA_HYPERVISOR: ${{ matrix.vmm }} KATA_HYPERVISOR: ${{ matrix.vmm }}
KUBERNETES: "k3s"
USING_NFD: "true" USING_NFD: "true"
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3

4
tests/integration/kubernetes/gha-run.sh
View File

@@ -118,7 +118,7 @@ function deploy_kata() {
echo "::endgroup::" echo "::endgroup::"
kubectl apply -f "${tools_dir}/packaging/kata-deploy/kata-rbac/base/kata-rbac.yaml" kubectl apply -f "${tools_dir}/packaging/kata-deploy/kata-rbac/base/kata-rbac.yaml"
if [ "${platform}" = "tdx" ]; then if [ "${KUBERNETES}" = "k3s" ]; then
kubectl apply -k "${tools_dir}/packaging/kata-deploy/kata-deploy/overlays/k3s" kubectl apply -k "${tools_dir}/packaging/kata-deploy/kata-deploy/overlays/k3s"
else else
kubectl apply -f "${tools_dir}/packaging/kata-deploy/kata-deploy/base/kata-deploy.yaml" kubectl apply -f "${tools_dir}/packaging/kata-deploy/kata-deploy/base/kata-deploy.yaml"
@@ -213,7 +213,7 @@ function cleanup() {
kubectl config set-context --current --namespace=default kubectl config set-context --current --namespace=default
kubectl delete namespace kata-containers-k8s-tests kubectl delete namespace kata-containers-k8s-tests
if [ "${platform}" = "tdx" ]; then if [ "${KUBERNETES}" = "k3s" ]; then
deploy_spec="-k "${tools_dir}/packaging/kata-deploy/kata-deploy/overlays/k3s"" deploy_spec="-k "${tools_dir}/packaging/kata-deploy/kata-deploy/overlays/k3s""
cleanup_spec="-k "${tools_dir}/packaging/kata-deploy/kata-cleanup/overlays/k3s"" cleanup_spec="-k "${tools_dir}/packaging/kata-deploy/kata-cleanup/overlays/k3s""
else else