Skip to content

Commit

Permalink
adds prow job to install nephio components on kubeadm cluster
Browse files Browse the repository at this point in the history
Co-authored-by: Daniel Kostecki <[email protected]>
  • Loading branch information
vjayaramrh and dkosteck committed Aug 20, 2024
1 parent 8e07fa9 commit 76dbd84
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 55 deletions.
6 changes: 3 additions & 3 deletions .prow.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ presubmits:
path: id_rsa
- key: id_rsa.pub
path: id_rsa.pub
- name: e2e-kubeadm-fedora-40
- name: e2e-kubeadm-fedora-38
annotations:
labels:
run_if_changed: '^e2e/'
Expand All @@ -348,8 +348,8 @@ presubmits:
args:
- "-c"
- |
set -eE; cd "$(git rev-parse --show-toplevel)/e2e/terraform"; trap 'terraform destroy -target module.gcp-fedora-34 -auto-approve' EXIT;
terraform init && timeout 120m terraform apply -target module.gcp-fedora-40 -var="fail_fast=true" -var="mgmt_cluster_type=kubeadm" -auto-approve
set -eE; cd "$(git rev-parse --show-toplevel)/e2e/terraform"; trap 'terraform destroy -target module.gcp-fedora-38 -auto-approve' EXIT;
terraform init && timeout 120m terraform apply -target module.gcp-fedora-38 -var="fail_fast=true" -var="mgmt_cluster_type=kubeadm" -auto-approve
volumeMounts:
- name: satoken
mountPath: "/etc/satoken"
Expand Down
1 change: 0 additions & 1 deletion e2e/provision/init.sh
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@ if [ ${MGMT_CLUSTER_TYPE} == "kubeadm" ]; then
fi
export ANSIBLE_CMD_EXTRA_VAR_LIST='{ "nephio_catalog_repo_uri": "'${NEPHIO_CATALOG_REPO_URI}'", "k8s": { "context" : "'${K8S_CONTEXT}'", "version" : "'$K8S_VERSION'" } }'


if [ ${K8S_CONTEXT} == "kind-kind" ]; then
export ANSIBLE_TAG=all
else
Expand Down
11 changes: 0 additions & 11 deletions e2e/provision/playbooks/roles/kubeadm/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -207,14 +207,3 @@
ansible.builtin.shell: kubectl taint node $(hostname) node-role.kubernetes.io/control-plane-
register: my_output
changed_when: my_output.rc != 0
<<<<<<< HEAD

- name: Wait for deployments to complete
ansible.builtin.include_tasks: wait-deployments.yml
loop: "{{ kube-system + kube-flannel + local-path-storage }}"
loop_control:
loop_var: namespace
vars:
context: "{{ k8s.context }}"
=======
>>>>>>> 4a828c2 (add support for installing nonKIND cluster via kubeadm (previously PR #46) (#296))
38 changes: 0 additions & 38 deletions e2e/provision/playbooks/roles/kubeadm/tasks/wait-deployments.yml

This file was deleted.

4 changes: 2 additions & 2 deletions e2e/terraform/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ module "gcp-fedora-34" {
nephio_mgmt_cluster_type = var.mgmt_cluster_type
}

module "gcp-fedora-40" {
module "gcp-fedora-38" {
source = ".//modules/gcp"
vmimage = "fedora-cloud/fedora-cloud-40"
vmimage = "fedora-cloud/fedora-cloud-38"
ansible_user = "fedora"
nephio_e2e_type = var.e2e_type
nephio_e2e_fail_fast = var.fail_fast
Expand Down

0 comments on commit 76dbd84

Please sign in to comment.