Skip to content

Commit

Permalink
Add kubeconfig import into bootstrap ansible role
Browse files Browse the repository at this point in the history
  • Loading branch information
electrocucaracha committed Jun 21, 2023
1 parent 3ef8aed commit a4c26ca
Show file tree
Hide file tree
Showing 11 changed files with 48 additions and 28 deletions.
6 changes: 0 additions & 6 deletions e2e/provision/install_sandbox.sh
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,6 @@ else
else
ansible-playbook -vvv -i ./nephio.yaml playbooks/cluster.yml
fi

# Put this in the ubuntu dir and make it accessible to world
mkdir "$HOME/.kube" && chmod 755 "$HOME/.kube"
sudo cp /root/.kube/config "$HOME/.kube"
sudo chown $USER:$USER "$HOME/.kube/config"
chmod 644 "$HOME/.kube/config"
fi

echo "Done installing Nephio Sandbox Environment"
8 changes: 5 additions & 3 deletions e2e/provision/playbooks/roles/bootstrap/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,10 @@ flowchart TD
Q --> R(Get k8s clusters)
R --> S{not 'kind' in bootstrap_kind_get_cluster.stdout?}
S -- true --> T(Create management cluster)
T --> U(Create .kube directory)
S -- false --> U
T --> U(Create gitea namespace)
U --> V(Create gitea postgresql user password)
V --> W(Deploy base packages)
U --> V(Copy root kubeconfig file)
V --> W(Create gitea namespace)
W --> Y(Create gitea postgresql user password)
Y --> Z(Deploy base packages)
```
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,3 @@ provisioner:
host_min_cpu_ram: 1
verifier:
name: testinfra
options:
sudo: true
21 changes: 17 additions & 4 deletions e2e/provision/playbooks/roles/bootstrap/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

- name: Create management cluster
become: true
ansible.builtin.command: kind create cluster --config=-
ansible.builtin.command: kind create cluster --kubeconfig /tmp/kubeconfig --config=-
args:
stdin: |
kind: Cluster
Expand All @@ -47,8 +47,23 @@
when: not 'kind' in bootstrap_kind_get_cluster.stdout
changed_when: true

- name: Create gitea namespace
- name: Create .kube directory
ansible.builtin.file:
path: "{{ ansible_user_dir }}/.kube"
state: directory
mode: '0755'

- name: Copy root kubeconfig file
become: true
ansible.builtin.copy:
remote_src: true
src: /tmp/kubeconfig
dest: "{{ ansible_user_dir }}/.kube/config"
owner: "{{ ansible_user_uid }}"
group: "{{ ansible_user_gid }}"
mode: '0644'

- name: Create gitea namespace
kubernetes.core.k8s:
state: present
definition:
Expand All @@ -58,7 +73,6 @@
name: gitea

- name: Create gitea postgresql user password
become: true
kubernetes.core.k8s:
state: present
definition:
Expand All @@ -76,7 +90,6 @@
password: "{{ gitea_db_password }}"

- name: Create gitea user password
become: true
kubernetes.core.k8s:
state: present
definition:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,3 @@ provisioner:
ANSIBLE_LIBRARY: ${MOLECULE_PROJECT_DIRECTORY}/../../../playbooks/library
verifier:
name: testinfra
options:
sudo: true
1 change: 0 additions & 1 deletion e2e/provision/playbooks/roles/install/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
context: kind-kind

- name: Create gitea user password in nephio-system namespace
become: true
kubernetes.core.k8s:
context: kind-kind
state: present
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,3 @@ provisioner:
- default
verifier:
name: testinfra
options:
sudo: true
16 changes: 15 additions & 1 deletion e2e/provision/playbooks/roles/kpt/molecule/default/prepare.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,5 +46,19 @@
failed_when: (kind_get_cluster.rc not in [0, 1])
- name: Create k8s cluster
become: true
ansible.builtin.command: kind create cluster --image kindest/node:v1.27.1
ansible.builtin.command: kind create cluster --image kindest/node:v1.27.1 --kubeconfig=/tmp/kubeconfig
when: not 'kind' in kind_get_cluster.stdout
- name: Create .kube directory
ansible.builtin.file:
path: "{{ ansible_user_dir }}/.kube"
state: directory
mode: '0755'
- name: Copy root kubeconfig file
become: true
ansible.builtin.copy:
remote_src: true
src: /tmp/kubeconfig
dest: "{{ ansible_user_dir }}/.kube/config"
owner: "{{ ansible_user_uid }}"
group: "{{ ansible_user_gid }}"
mode: '0644'
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,16 @@

def test_deployments(host):
got = host.check_output(
"sudo kubectl get deploy --no-headers -o custom-columns=':metadata.name'"
"kubectl get deploy --no-headers -o custom-columns=':metadata.name'"
)
assert "my-nginx" == got
cmd = host.run("sudo kubectl rollout status deployment/my-nginx")
cmd = host.run("kubectl rollout status deployment/my-nginx")
assert cmd.succeeded
assert cmd.rc == 0


def test_services(host):
got = host.check_output(
"sudo kubectl get service --no-headers -o custom-columns=':metadata.name'"
"kubectl get service --no-headers -o custom-columns=':metadata.name'"
)
assert "my-nginx-svc" in got
10 changes: 8 additions & 2 deletions e2e/provision/playbooks/roles/kpt/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,14 @@
pkg_path: "{{ workdir }}"
command: fn-render

- name: Recursively restore ownership of a directory package
ansible.builtin.file:
path: "{{ workdir }}"
state: directory
owner: "{{ ansible_user_uid }}"
group: "{{ ansible_user_gid }}"
recurse: true

- name: Get package differences between local and upstream
kpt:
pkg_path: "{{ workdir }}"
Expand All @@ -60,7 +68,6 @@
register: kpt_resourcegroup

- name: Init package
become: true
kpt:
pkg_path: "{{ workdir }}"
version: "{{ version }}"
Expand All @@ -74,7 +81,6 @@
var: kpt_live_init

- name: Apply package
become: true
kpt:
pkg_path: "{{ workdir }}"
version: "{{ version }}"
Expand Down
2 changes: 0 additions & 2 deletions e2e/provision/playbooks/roles/kpt/tasks/wait_deployments.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
##############################################################################

- name: Get deployment resources
become: true
kubernetes.core.k8s_info:
context: "{{ context }}"
api_version: v1
Expand All @@ -22,7 +21,6 @@
var: deployment_list.resources

- name: Wait for deployments
become: true
kubernetes.core.k8s:
context: "{{ context }}"
definition:
Expand Down

0 comments on commit a4c26ca

Please sign in to comment.