Skip to content

Commit

Permalink
Merge pull request #8 from missingcharacter/develop
Browse files Browse the repository at this point in the history
[~] Bumped:
  • Loading branch information
missingcharacter authored Dec 7, 2023
2 parents 3c525f1 + fe14b05 commit c21a117
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 8 deletions.
15 changes: 8 additions & 7 deletions setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,13 @@ function check_dependencies() {
check_dependencies

export \
KUBERNETES_VERSION='1.25.4' \
ETCD_VERSION='3.5.5' \
CONTAINERD_VERSION='1.6.10' \
CNI_PLUGINS_VERSION='1.1.1' \
COREDNS_CHART_VERSION='1.19.7' \
CILIUM_CHART_VERSION='1.12.4' \
KUBERNETES_VERSION='1.28.4' \
ETCD_VERSION='3.5.10' \
CONTAINERD_VERSION='1.7.10' \
CNI_PLUGINS_VERSION='1.4.0' \
COREDNS_CHART_VERSION='1.28.2' \
CILIUM_CHART_VERSION='1.14.4' \
UBUNTU_VERSION='22.04' \
SERVICE_CLUSTER_IP_RANGE='172.17.0.0/24' \
SERVICE_NODE_PORT_RANGE='30000-32767' \
CLUSTER_CIDR='172.16.0.0/16' \
Expand All @@ -55,7 +56,7 @@ KUBE_API_CLUSTER_IP="$(ipcalc "${SERVICE_CLUSTER_IP_RANGE}" | grep 'HostMin' | a
msg_info 'Creating multipass instances'

for i in 'controller-k8s' 'worker-1-k8s' 'worker-2-k8s' ; do
multipass launch --name "${i}" --cpus 2 --mem 2048M --disk 11G 22.04
multipass launch --name "${i}" --cpus 2 --memory 2048M --disk 11G "${UBUNTU_VERSION}"
done

msg_info 'Creating and distributing certificates'
Expand Down
2 changes: 1 addition & 1 deletion tests/tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ if ! grep -q 'aescbc' <<<"${ETCD_OUTPUT=}"; then
msg_fatal "Kubernetes secret is not encrypted"
fi

msg_info "Deplotying nginx"
msg_info "Deploying nginx"
kubectl create deployment nginx --image=nginx
until grep -q 'true' <(grep 'nginx' <(kubectl get pods -o json -A | jq -r '.items[] | .status.containerStatuses[]? | [.name, .ready|tostring] |join(":")')); do
echo "Pod nginx is not ready yet, will wait 2 seconds"
Expand Down

0 comments on commit c21a117

Please sign in to comment.