diff --git a/distribution.create_cluster.sh b/distribution.create_cluster.sh index 7b58e61c52ea3b48dbd820eee1c5b5bbf99c939a..8a2749726081a5abd7987576651715eacd1a7383 100644 --- a/distribution.create_cluster.sh +++ b/distribution.create_cluster.sh @@ -1,7 +1,6 @@ #!/bin/bash script_dir=$(dirname "${BASH_SOURCE[0]}") -echo "SCRIPT_DIR: ${script_dir}" source "${script_dir}/helpers/helm_helpers.sh" k3d cluster create distribution \ @@ -30,7 +29,7 @@ install_helm_chart calico \ tigera-operator \ "${CALICO_VERSION:-v3.29.2}" \ tigera-operator \ - 300 \ + 5m \ "${calico_dir}/values.yaml" \ "--set installation.calicoNetwork.ipPools[0].cidr=${CLUSTER_CIDR}" # helm repo add ${calico_repo_name} https://docs.tigera.io/calico/charts diff --git a/helpers/helm_helpers.sh b/helpers/helm_helpers.sh index 7deba58e496934b62af712e20e98fa596c86dd33..45cd830e45686139e9df90af48ab85f5c1bc29a1 100644 --- a/helpers/helm_helpers.sh +++ b/helpers/helm_helpers.sh @@ -56,6 +56,6 @@ install_gitlab_agent() { git clone "${git_repo_url}" "${git_repo_dir}" add_helm_repo ${repo_name} https://charts.gitlab.io - install_helm_chart distribution-agent ${repo_name} ${chart_name} ${chart_version} gitlab-agents 300 "${values_files}" "${upgrade_args}" + install_helm_chart distribution-agent ${repo_name} ${chart_name} ${chart_version} gitlab-agents 5m "${values_files}" "${upgrade_args}" remove_helm_repo ${repo_name} }