Skip to content

Commit 24bfe3f

Browse files
authored
make kind-dev-cluster path-independent, and remove reserved var warnings (skupperproject#2347)
Fixes skupperproject#2345
1 parent e2976bf commit 24bfe3f

4 files changed

Lines changed: 13 additions & 7 deletions

File tree

scripts/kind-dev-cluster

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,9 @@ FORCE_RECREATE="false"
3939
METALLB="false"
4040
SUBNET="1"
4141

42+
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
43+
REPO_ROOT="$(cd "${SCRIPT_DIR}/.." && pwd)"
44+
4245
verbose_log() {
4346
if [ "${VERBOSE}" == "true" ]; then
4447
echo "(skdev) $1"
@@ -175,7 +178,7 @@ EOF
175178
}
176179

177180
skupper::cluster::controller() {
178-
SKUPPER_TESTING=true scripts/skupper-deployment-generator.sh cluster ${IMAGE_TAG} ${ROUTER_IMAGE_TAG} false
181+
SKUPPER_TESTING=true "${REPO_ROOT}/scripts/skupper-deployment-generator.sh" cluster ${IMAGE_TAG} ${ROUTER_IMAGE_TAG} false
179182
}
180183

181184
main () {

scripts/skupper-deployment-generator.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ readonly SKUPPER_TESTING=${SKUPPER_TESTING:-false}
2929

3030
DEBUG=${DEBUG:=false}
3131

32+
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
33+
REPO_ROOT="$(cd "${SCRIPT_DIR}/.." && pwd)"
34+
3235
skupper::deployment::namespace() {
3336
cat << EOF
3437
apiVersion: v1
@@ -276,7 +279,7 @@ EOF
276279
}
277280

278281
main () {
279-
ktempdir=$(mktemp -d --tmpdir=./)
282+
ktempdir=$(mktemp -d --tmpdir="${REPO_ROOT}")
280283
if [ "${DEBUG}" != "true" ]; then
281284
trap 'rm -rf $ktempdir' EXIT
282285
fi

tests/e2e/collections/ansible_collections/e2e/tests/roles/generate_namespaces/tasks/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
labels:
1212
e2e.id: "{{ generate_namespaces_namespace_label }}"
1313
kubeconfig: "{{ kubeconfig }}"
14-
register: namespace
14+
register: namespace_result
1515

1616
- name: Display namespace name
1717
ansible.builtin.debug:
18-
msg: "Namespace Name: {{ namespace.result.metadata.labels['kubernetes.io/metadata.name'] }}"
18+
msg: "Namespace Name: {{ namespace_result.result.metadata.labels['kubernetes.io/metadata.name'] }}"

tests/e2e/collections/ansible_collections/e2e/tests/roles/run_curl/tasks/main.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
---
22
- name: Setting namespace name with prefix
33
ansible.builtin.set_fact:
4-
namespace: "{{ namespace_prefix }}-{{ namespace_name }}"
4+
curl_namespace: "{{ namespace_prefix }}-{{ namespace_name }}"
55

66
- name: Deploy curl pod
77
kubernetes.core.k8s:
88
api_version: v1
99
kind: Pod
1010
name: curl
11-
namespace: "{{ namespace }}"
11+
namespace: "{{ curl_namespace }}"
1212
kubeconfig: "{{ kubeconfig }}"
1313
state: present
1414
definition:
@@ -29,7 +29,7 @@
2929

3030
- name: Run curl command
3131
kubernetes.core.k8s_exec:
32-
namespace: "{{ namespace }}"
32+
namespace: "{{ curl_namespace }}"
3333
kubeconfig: "{{ kubeconfig }}"
3434
pod: curl
3535
command: >-

0 commit comments

Comments
 (0)