istio
/
istio.io
mirror of https://github.com/istio/istio.io.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Automator: update common-files@master in istio/istio.io@master (#8143)

This commit is contained in:
Istio Automation 2020-09-15 08:23:06 -07:00 committed by GitHub
parent b786060981
commit 5241ceeea7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/.commonfiles.sha
View File

@ -1 +1 @@
33b4259e89725d5bdbb66337780a20dc015acd8b
e1383ba7ad09e3c21c987c3c47fbf9f85b9ee88a

18
common/scripts/kind_provisioner.sh
View File

@ -98,6 +98,8 @@ function cleanup_kind_cluster() {
fi
}
# check_default_cluster_yaml checks the presence of default cluster YAML
# It returns 1 if it is not present
function check_default_cluster_yaml() {
if [[ -z "${DEFAULT_CLUSTER_YAML}" ]]; then
echo 'DEFAULT_CLUSTER_YAML file must be specified. Exiting...'
@ -106,11 +108,9 @@ function check_default_cluster_yaml() {
}
# setup_kind_cluster creates new KinD cluster with given name, image and configuration
# Even in case of single cluster, don't call this directly. Call through setup_kind_clusters
# with cluster topology configuration file.
# 1. CLUSTER_CONFIG: KinD cluster configuration YAML file (mandatory)
# 2. NAME: Name of the Kind cluster (optional)
# 3. IMAGE: Node image used by KinD (optional)
# 1. NAME: Name of the Kind cluster (optional)
# 2. IMAGE: Node image used by KinD (optional)
# 3. CONFIG: KinD cluster configuration YAML file. If not specified then DEFAULT_CLUSTER_YAML is used
# This function returns 0 when everything goes well, or 1 otherwise
# If Kind cluster was already created then it would be cleaned up in case of errors
function setup_kind_cluster() {
@ -132,9 +132,9 @@ function setup_kind_cluster() {
# If config not explicitly set, then use defaults
if [[ -z "${CONFIG}" ]]; then
# Kubernetes 1.15+
CONFIG=${DEFAULT_CLUSTER_YAML}
# Configure the cluster IP Family only for default configs
# Kubernetes 1.15+
CONFIG=${DEFAULT_CLUSTER_YAML}
# Configure the cluster IP Family only for default configs
if [ "${IP_FAMILY}" = "ipv6" ]; then
grep 'ipFamily: ipv6' "${CONFIG}" || \
cat <<EOF >> "${CONFIG}"
@ -200,7 +200,7 @@ function setup_kind_clusters() {
CLUSTER_YAML="${ARTIFACTS}/config-${CLUSTER_NAME}.yaml"
if [ ! -f "${CLUSTER_YAML}" ]; then
cp "${DEFAULT_CLUSTER_YAML}" "${CLUSTER_YAML}"
cat <<EOF >> "${CLUSTER_YAML}"
cat <<EOF >> "${CLUSTER_YAML}"
networking:
podSubnet: ${CLUSTER_POD_SUBNET}
serviceSubnet: ${CLUSTER_SVC_SUBNET}

2
common/scripts/setup_env.sh
View File

@ -59,7 +59,7 @@ fi
# Build image to use
if [[ "${IMAGE_VERSION:-}" == "" ]]; then
export IMAGE_VERSION=master-2020-09-04T21-07-25
export IMAGE_VERSION=master-2020-09-15T14-05-50
fi
if [[ "${IMAGE_NAME:-}" == "" ]]; then
export IMAGE_NAME=build-tools