[bot] Merge automation (#260)

* Update from solo-io/procgen@577d6e3 --------- Co-authored-by: soloio-bot <>
solo-io · Oct 9, 2024 · 4f0f087 · 4f0f087
1 parent 6a83dc0
commit 4f0f087
Show file tree

Hide file tree

Showing 83 changed files with 10,146 additions and 309 deletions.
diff --git a/gloo-gateway/1-17/oss-istio-ambient/README.md b/gloo-gateway/1-17/oss-istio-ambient/README.md
diff --git a/gloo-gateway/1-17/oss-istio-ambient/scripts/deploy-aws-with-calico.sh b/gloo-gateway/1-17/oss-istio-ambient/scripts/deploy-aws-with-calico.sh
@@ -22,6 +22,24 @@ else
   myip=$(ipconfig getifaddr en0)
 fi
 
+# Function to determine the next available cluster number
+get_next_cluster_number() {
+    if ! kind get clusters 2>&1 | grep "^kind" > /dev/null; then
+        echo 1
+    else
+        highest_num=$(kind get clusters | grep "^kind" | tail -1 | cut -c 5-)
+        echo $((highest_num + 1))
+    fi
+}
+
+if [ -f /.dockerenv ]; then
+myip=$HOST_IP
+container=$(docker inspect $(docker ps -q) | jq -r ".[] | select(.Config.Hostname == \"$HOSTNAME\") | .Name" | cut -d/ -f2)
+docker network connect "kind" $container || true
+number=$(get_next_cluster_number)
+twodigits=$(printf "%02d\n" $number)
+fi
+
 reg_name='kind-registry'
 reg_port='5000'
 docker start "${reg_name}" 2>/dev/null || \
@@ -64,9 +82,9 @@ docker start "${cache_name}" 2>/dev/null || \
 docker run -d --restart=always ${DEPLOY_EXTRA_PARAMS} -v ${HOME}/.${cache_name}-config.yml:/etc/docker/registry/config.yml --name "${cache_name}" registry:2
 done
 
-mkdir -p oidc
+mkdir -p /tmp/oidc
 
-cat <<'EOF' >./oidc/sa-signer-pkcs8.pub
+cat <<'EOF' >/tmp/oidc/sa-signer-pkcs8.pub
 -----BEGIN PUBLIC KEY-----
 MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA53YiBcrn7+ZK0Vb4odeA
 1riYdvEb8To4H6/HtF+OKzuCIXFQ+bRy7yMrDGITYpfYPrTZOgfdeTLZqOiAj+cL
@@ -78,7 +96,7 @@ ywIDAQAB
 -----END PUBLIC KEY-----
 EOF
 
-cat <<'EOF' >./oidc/sa-signer.key
+cat <<'EOF' >/tmp/oidc/sa-signer.key
 -----BEGIN RSA PRIVATE KEY-----
 MIIEpAIBAAKCAQEA53YiBcrn7+ZK0Vb4odeA1riYdvEb8To4H6/HtF+OKzuCIXFQ
 +bRy7yMrDGITYpfYPrTZOgfdeTLZqOiAj+cL395nvxdly83SUrdh7ItfOPRluuui
@@ -119,7 +137,7 @@ nodes:
     hostPort: 70${twodigits}
   extraMounts:
   - containerPath: /etc/kubernetes/oidc
-    hostPath: /${PWD}/oidc
+    hostPath: /tmp/oidc
   labels:
     ingress-ready: true
     topology.kubernetes.io/region: ${region}

diff --git a/gloo-gateway/1-17/oss-istio-ambient/scripts/deploy-aws-with-cilium.sh b/gloo-gateway/1-17/oss-istio-ambient/scripts/deploy-aws-with-cilium.sh
@@ -22,6 +22,24 @@ else
   myip=$(ipconfig getifaddr en0)
 fi
 
+# Function to determine the next available cluster number
+get_next_cluster_number() {
+    if ! kind get clusters 2>&1 | grep "^kind" > /dev/null; then
+        echo 1
+    else
+        highest_num=$(kind get clusters | grep "^kind" | tail -1 | cut -c 5-)
+        echo $((highest_num + 1))
+    fi
+}
+
+if [ -f /.dockerenv ]; then
+myip=$HOST_IP
+container=$(docker inspect $(docker ps -q) | jq -r ".[] | select(.Config.Hostname == \"$HOSTNAME\") | .Name" | cut -d/ -f2)
+docker network connect "kind" $container || true
+number=$(get_next_cluster_number)
+twodigits=$(printf "%02d\n" $number)
+fi
+
 reg_name='kind-registry'
 reg_port='5000'
 docker start "${reg_name}" 2>/dev/null || \
@@ -64,8 +82,9 @@ docker start "${cache_name}" 2>/dev/null || \
 docker run -d --restart=always ${DEPLOY_EXTRA_PARAMS} -v ${HOME}/.${cache_name}-config.yml:/etc/docker/registry/config.yml --name "${cache_name}" registry:2
 done
 
-mkdir -p oidc
-cat <<'EOF' >./oidc/sa-signer-pkcs8.pub
+mkdir -p /tmp/oidc
+
+cat <<'EOF' >/tmp/oidc/sa-signer-pkcs8.pub
 -----BEGIN PUBLIC KEY-----
 MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA53YiBcrn7+ZK0Vb4odeA
 1riYdvEb8To4H6/HtF+OKzuCIXFQ+bRy7yMrDGITYpfYPrTZOgfdeTLZqOiAj+cL
@@ -76,7 +95,8 @@ zIM9OviX8iEF8xHWUtz4BAMDG8N6+zpLo0pAzaei5hKuLZ9dZOzHBC8VOW82cQMm
 ywIDAQAB
 -----END PUBLIC KEY-----
 EOF
-cat <<'EOF' >./oidc/sa-signer.key
+
+cat <<'EOF' >/tmp/oidc/sa-signer.key
 -----BEGIN RSA PRIVATE KEY-----
 MIIEpAIBAAKCAQEA53YiBcrn7+ZK0Vb4odeA1riYdvEb8To4H6/HtF+OKzuCIXFQ
 +bRy7yMrDGITYpfYPrTZOgfdeTLZqOiAj+cL395nvxdly83SUrdh7ItfOPRluuui
@@ -105,6 +125,7 @@ Yu+tZtHXtKYf3B99GwPrFzw/7yfDwae5YeWmi2/pFTH96wv3brJBqkAWY8G5Rsmd
 qF50p34vIFqUBniNRwSArx8t2dq/CuAMgLAtSjh70Q6ZAnCF85PD8Q==
 -----END RSA PRIVATE KEY-----
 EOF
+
 cat << EOF > kind${number}.yaml
 kind: Cluster
 apiVersion: kind.x-k8s.io/v1alpha4
@@ -116,7 +137,7 @@ nodes:
     hostPort: 70${twodigits}
   extraMounts:
   - containerPath: /etc/kubernetes/oidc
-    hostPath: /${PWD}/oidc
+    hostPath: /tmp/oidc
   labels:
     ingress-ready: true
     topology.kubernetes.io/region: ${region}

diff --git a/gloo-gateway/1-17/oss-istio-ambient/scripts/deploy-aws.sh b/gloo-gateway/1-17/oss-istio-ambient/scripts/deploy-aws.sh
@@ -24,6 +24,24 @@ else
   myip=$(ipconfig getifaddr en0)
 fi
 
+# Function to determine the next available cluster number
+get_next_cluster_number() {
+    if ! kind get clusters 2>&1 | grep "^kind" > /dev/null; then
+        echo 1
+    else
+        highest_num=$(kind get clusters | grep "^kind" | tail -1 | cut -c 5-)
+        echo $((highest_num + 1))
+    fi
+}
+
+if [ -f /.dockerenv ]; then
+myip=$HOST_IP
+container=$(docker inspect $(docker ps -q) | jq -r ".[] | select(.Config.Hostname == \"$HOSTNAME\") | .Name" | cut -d/ -f2)
+docker network connect "kind" $container || true
+number=$(get_next_cluster_number)
+twodigits=$(printf "%02d\n" $number)
+fi
+
 reg_name='kind-registry'
 reg_port='5000'
 docker start "${reg_name}" 2>/dev/null || \
@@ -66,9 +84,9 @@ docker start "${cache_name}" 2>/dev/null || \
 docker run -d --restart=always ${DEPLOY_EXTRA_PARAMS} -v ${HOME}/.${cache_name}-config.yml:/etc/docker/registry/config.yml --name "${cache_name}" registry:2
 done
 
-mkdir -p oidc
+mkdir -p /tmp/oidc
 
-cat <<'EOF' >./oidc/sa-signer-pkcs8.pub
+cat <<'EOF' >/tmp/oidc/sa-signer-pkcs8.pub
 -----BEGIN PUBLIC KEY-----
 MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA53YiBcrn7+ZK0Vb4odeA
 1riYdvEb8To4H6/HtF+OKzuCIXFQ+bRy7yMrDGITYpfYPrTZOgfdeTLZqOiAj+cL
@@ -80,7 +98,7 @@ ywIDAQAB
 -----END PUBLIC KEY-----
 EOF
 
-cat <<'EOF' >./oidc/sa-signer.key
+cat <<'EOF' >/tmp/oidc/sa-signer.key
 -----BEGIN RSA PRIVATE KEY-----
 MIIEpAIBAAKCAQEA53YiBcrn7+ZK0Vb4odeA1riYdvEb8To4H6/HtF+OKzuCIXFQ
 +bRy7yMrDGITYpfYPrTZOgfdeTLZqOiAj+cL395nvxdly83SUrdh7ItfOPRluuui
@@ -121,7 +139,7 @@ nodes:
     hostPort: 70${twodigits}
   extraMounts:
   - containerPath: /etc/kubernetes/oidc
-    hostPath: /${PWD}/oidc
+    hostPath: /tmp/oidc
   labels:
     ingress-ready: true
     topology.kubernetes.io/region: ${region}

diff --git a/gloo-gateway/1-17/oss-istio-ambient/scripts/deploy-ipv6.sh b/gloo-gateway/1-17/oss-istio-ambient/scripts/deploy-ipv6.sh
@@ -23,6 +23,24 @@ else
   myip=$(ipconfig getifaddr en0)
 fi
 
+# Function to determine the next available cluster number
+get_next_cluster_number() {
+    if ! kind get clusters 2>&1 | grep "^kind" > /dev/null; then
+        echo 1
+    else
+        highest_num=$(kind get clusters | grep "^kind" | tail -1 | cut -c 5-)
+        echo $((highest_num + 1))
+    fi
+}
+
+if [ -f /.dockerenv ]; then
+myip=$HOST_IP
+container=$(docker inspect $(docker ps -q) | jq -r ".[] | select(.Config.Hostname == \"$HOSTNAME\") | .Name" | cut -d/ -f2)
+docker network connect "kind" $container || true
+number=$(get_next_cluster_number)
+twodigits=$(printf "%02d\n" $number)
+fi
+
 reg_name='kind-registry'
 reg_port='5000'
 docker start "${reg_name}" 2>/dev/null || \

diff --git a/gloo-gateway/1-17/oss-istio-ambient/scripts/deploy-multi-with-calico.sh b/gloo-gateway/1-17/oss-istio-ambient/scripts/deploy-multi-with-calico.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+set -o errexit
 
 number=$1
 name=$2
@@ -21,6 +22,24 @@ else
   myip=$(ipconfig getifaddr en0)
 fi
 
+# Function to determine the next available cluster number
+get_next_cluster_number() {
+    if ! kind get clusters 2>&1 | grep "^kind" > /dev/null; then
+        echo 1
+    else
+        highest_num=$(kind get clusters | grep "^kind" | tail -1 | cut -c 5-)
+        echo $((highest_num + 1))
+    fi
+}
+
+if [ -f /.dockerenv ]; then
+myip=$HOST_IP
+container=$(docker inspect $(docker ps -q) | jq -r ".[] | select(.Config.Hostname == \"$HOSTNAME\") | .Name" | cut -d/ -f2)
+docker network connect "kind" $container || true
+number=$(get_next_cluster_number)
+twodigits=$(printf "%02d\n" $number)
+fi
+
 reg_name='kind-registry'
 reg_port='5000'
 docker start "${reg_name}" 2>/dev/null || \
@@ -30,6 +49,7 @@ cache_port='5000'
 cat > registries <<EOF
 docker https://registry-1.docker.io
 us-docker https://us-docker.pkg.dev
+us-central1-docker https://us-central1-docker.pkg.dev
 quay https://quay.io
 gcr https://gcr.io
 EOF
@@ -99,6 +119,8 @@ containerdConfigPatches:
     endpoint = ["http://docker:${cache_port}"]
   [plugins."io.containerd.grpc.v1.cri".registry.mirrors."us-docker.pkg.dev"]
     endpoint = ["http://us-docker:${cache_port}"]
+  [plugins."io.containerd.grpc.v1.cri".registry.mirrors."us-central1-docker.pkg.dev"]
+    endpoint = ["http://us-central1-docker:${cache_port}"]
   [plugins."io.containerd.grpc.v1.cri".registry.mirrors."quay.io"]
     endpoint = ["http://quay:${cache_port}"]
   [plugins."io.containerd.grpc.v1.cri".registry.mirrors."gcr.io"]
@@ -119,6 +141,8 @@ docker network connect "kind" us-central1-docker || true
 docker network connect "kind" quay || true
 docker network connect "kind" gcr || true
 
+curl -sL https://raw.githubusercontent.com/projectcalico/calico/v3.28.1/manifests/calico.yaml | sed 's/250m/50m/g' | kubectl --context kind-kind${number} apply -f -
+
 # Preload images
 cat << EOF >> images.txt
 quay.io/metallb/controller:v0.13.12

diff --git a/gloo-gateway/1-17/oss-istio-ambient/scripts/deploy-multi-with-cilium.sh b/gloo-gateway/1-17/oss-istio-ambient/scripts/deploy-multi-with-cilium.sh
@@ -22,6 +22,24 @@ else
   myip=$(ipconfig getifaddr en0)
 fi
 
+# Function to determine the next available cluster number
+get_next_cluster_number() {
+    if ! kind get clusters 2>&1 | grep "^kind" > /dev/null; then
+        echo 1
+    else
+        highest_num=$(kind get clusters | grep "^kind" | tail -1 | cut -c 5-)
+        echo $((highest_num + 1))
+    fi
+}
+
+if [ -f /.dockerenv ]; then
+myip=$HOST_IP
+container=$(docker inspect $(docker ps -q) | jq -r ".[] | select(.Config.Hostname == \"$HOSTNAME\") | .Name" | cut -d/ -f2)
+docker network connect "kind" $container || true
+number=$(get_next_cluster_number)
+twodigits=$(printf "%02d\n" $number)
+fi
+
 reg_name='kind-registry'
 reg_port='5000'
 docker start "${reg_name}" 2>/dev/null || \

diff --git a/gloo-gateway/1-17/oss-istio-ambient/scripts/deploy-multi-without-cni.sh b/gloo-gateway/1-17/oss-istio-ambient/scripts/deploy-multi-without-cni.sh
@@ -22,6 +22,24 @@ else
   myip=$(ipconfig getifaddr en0)
 fi
 
+# Function to determine the next available cluster number
+get_next_cluster_number() {
+    if ! kind get clusters 2>&1 | grep "^kind" > /dev/null; then
+        echo 1
+    else
+        highest_num=$(kind get clusters | grep "^kind" | tail -1 | cut -c 5-)
+        echo $((highest_num + 1))
+    fi
+}
+
+if [ -f /.dockerenv ]; then
+myip=$HOST_IP
+container=$(docker inspect $(docker ps -q) | jq -r ".[] | select(.Config.Hostname == \"$HOSTNAME\") | .Name" | cut -d/ -f2)
+docker network connect "kind" $container || true
+number=$(get_next_cluster_number)
+twodigits=$(printf "%02d\n" $number)
+fi
+
 reg_name='kind-registry'
 reg_port='5000'
 docker start "${reg_name}" 2>/dev/null || \

diff --git a/gloo-gateway/1-17/oss-istio-ambient/scripts/deploy-multi.sh b/gloo-gateway/1-17/oss-istio-ambient/scripts/deploy-multi.sh
@@ -22,6 +22,24 @@ else
   myip=$(ipconfig getifaddr en0)
 fi
 
+# Function to determine the next available cluster number
+get_next_cluster_number() {
+    if ! kind get clusters 2>&1 | grep "^kind" > /dev/null; then
+        echo 1
+    else
+        highest_num=$(kind get clusters | grep "^kind" | tail -1 | cut -c 5-)
+        echo $((highest_num + 1))
+    fi
+}
+
+if [ -f /.dockerenv ]; then
+myip=$HOST_IP
+container=$(docker inspect $(docker ps -q) | jq -r ".[] | select(.Config.Hostname == \"$HOSTNAME\") | .Name" | cut -d/ -f2)
+docker network connect "kind" $container || true
+number=$(get_next_cluster_number)
+twodigits=$(printf "%02d\n" $number)
+fi
+
 reg_name='kind-registry'
 reg_port='5000'
 docker start "${reg_name}" 2>/dev/null || \

diff --git a/gloo-gateway/1-17/oss-istio-ambient/scripts/deploy-with-calico.sh b/gloo-gateway/1-17/oss-istio-ambient/scripts/deploy-with-calico.sh
@@ -21,6 +21,24 @@ else
   myip=$(ipconfig getifaddr en0)
 fi
 
+# Function to determine the next available cluster number
+get_next_cluster_number() {
+    if ! kind get clusters 2>&1 | grep "^kind" > /dev/null; then
+        echo 1
+    else
+        highest_num=$(kind get clusters | grep "^kind" | tail -1 | cut -c 5-)
+        echo $((highest_num + 1))
+    fi
+}
+
+if [ -f /.dockerenv ]; then
+myip=$HOST_IP
+container=$(docker inspect $(docker ps -q) | jq -r ".[] | select(.Config.Hostname == \"$HOSTNAME\") | .Name" | cut -d/ -f2)
+docker network connect "kind" $container || true
+number=$(get_next_cluster_number)
+twodigits=$(printf "%02d\n" $number)
+fi
+
 reg_name='kind-registry'
 reg_port='5000'
 docker start "${reg_name}" 2>/dev/null || \

diff --git a/gloo-gateway/1-17/oss-istio-ambient/scripts/deploy-with-cilium.sh b/gloo-gateway/1-17/oss-istio-ambient/scripts/deploy-with-cilium.sh
@@ -22,6 +22,24 @@ else
   myip=$(ipconfig getifaddr en0)
 fi
 
+# Function to determine the next available cluster number
+get_next_cluster_number() {
+    if ! kind get clusters 2>&1 | grep "^kind" > /dev/null; then
+        echo 1
+    else
+        highest_num=$(kind get clusters | grep "^kind" | tail -1 | cut -c 5-)
+        echo $((highest_num + 1))
+    fi
+}
+
+if [ -f /.dockerenv ]; then
+myip=$HOST_IP
+container=$(docker inspect $(docker ps -q) | jq -r ".[] | select(.Config.Hostname == \"$HOSTNAME\") | .Name" | cut -d/ -f2)
+docker network connect "kind" $container || true
+number=$(get_next_cluster_number)
+twodigits=$(printf "%02d\n" $number)
+fi
+
 reg_name='kind-registry'
 reg_port='5000'
 docker start "${reg_name}" 2>/dev/null || \