Skip to content

Commit 4ce4d80

Browse files
author
Martin Jackson
committed
Put the playbook in a more normal location for us
1 parent 0983d0d commit 4ce4d80

4 files changed

Lines changed: 28 additions & 1 deletion

File tree

Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,9 @@ load-iib: ## CI target to install Index Image Bundles
119119
exit 1; \
120120
fi
121121

122+
.PHONY: token-kubeconfig
123+
token-kubeconfig: ## Create a local ~/.kube/config with password (not usually needed)
124+
common/scripts/write-token-kubeconfig.sh
122125

123126
##@ Validation Tasks
124127

scripts/write-token-kubeconfig.yml renamed to ansible/playbooks/write-token-kubeconfig/write-token-kubeconfig.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#!env ansible-playbook
21
---
32
- name: Test k8s authentication methods
43
hosts: localhost

scripts/pattern-util.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,12 @@ podman run -it --rm --pull=newer \
6767
-e EXTRA_HELM_OPTS \
6868
-e EXTRA_PLAYBOOK_OPTS \
6969
-e KUBECONFIG \
70+
-e K8S_AUTH_HOST \
71+
-e K8S_AUTH_VERIFY_SSL \
72+
-e K8S_AUTH_SSL_CA_CERT \
73+
-e K8S_AUTH_USERNAME \
74+
-e K8S_AUTH_PASSWORD \
75+
-e K8S_AUTH_TOKEN \
7076
-v "${PKI_HOST_MOUNT}":/etc/pki:ro \
7177
-v "${HOME}":"${HOME}" \
7278
-v "${HOME}":/pattern-home \

scripts/write-token-kubeconfig.sh

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
#!/usr/bin/env bash
2+
set -eu
3+
4+
get_abs_filename() {
5+
# $1 : relative filename
6+
echo "$(cd "$(dirname "$1")" && pwd)/$(basename "$1")"
7+
}
8+
9+
SCRIPT=$(get_abs_filename "$0")
10+
SCRIPTPATH=$(dirname "${SCRIPT}")
11+
COMMONPATH=$(dirname "${SCRIPTPATH}")
12+
PATTERNPATH=$(dirname "${COMMONPATH}")
13+
ANSIBLEPATH="$(dirname ${SCRIPTPATH})/ansible"
14+
PLAYBOOKPATH="${ANSIBLEPATH}/playbooks"
15+
export ANSIBLE_CONFIG="${ANSIBLEPATH}/ansible.cfg"
16+
17+
PATTERN_NAME=${1:-$(basename "`pwd`")}
18+
19+
ansible-playbook -e pattern_name="${PATTERN_NAME}" -e pattern_dir="${PATTERNPATH}" "${PLAYBOOKPATH}/write-token-kubeconfig/write-token-kubeconfig.yml"

0 commit comments

Comments
 (0)