Update demo scripts and CoreDNS setup for improved consistency and multi-arch support

- Update demo script to use Python 3.
- Use absolute paths in demo scripts to ensure consistency.
- Remove manual platform detection from demo script:
  - Switch to using a Docker container for consistent CoreDNS build across platforms.
  - Replace manual architecture detection and platform-specific binary handling with a container-based approach.
  - Use `realpath` for resolving script paths and simplify variable definitions.
- Update CoreDNS setup:
  - Replace tar download with git clone to address the 'make' dependency.
  - Adjust platform handling to support multi-arch CoreDNS binaries.

Signed-off-by: kahirokunn <[email protected]>
Co-authored-by: Arthur Outhenin-Chalandre <[email protected]>
Co-authored-by: Stephen Kitt <[email protected]>

Author: 3 people

demo/demo.sh

@@ -14,14 +14,18 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-cd $(dirname ${BASH_SOURCE})
-. ./udemo.sh
-. ../scripts/util.sh
+# Resolve the absolute path to this script directory.
+cd $(dirname "${BASH_SOURCE[0]}")
+demo_dir=$(realpath "$(pwd)")
+scripts_dir=$(realpath "$(pwd)/../scripts")
+
+. "${demo_dir}/udemo.sh"
+. "${scripts_dir}/util.sh"
 
 DEMO_AUTO_RUN=true
 
-kubeconfig1=${KUBECONFIG1:-../scripts/c1.kubeconfig}
-kubeconfig2=${KUBECONFIG2:-../scripts/c2.kubeconfig}
+kubeconfig1="${KUBECONFIG1:-${scripts_dir}/c1.kubeconfig}"
+kubeconfig2="${KUBECONFIG2:-${scripts_dir}/c2.kubeconfig}"
 
 k1="kubectl --kubeconfig ${kubeconfig1}"
 k2="kubectl --kubeconfig ${kubeconfig2}"
@@ -30,33 +34,33 @@ desc "Setup our demo namespace"
 run "${k1} create ns demo"
 run "${k2} create ns demo"
 
-c1_pane=`tmux split-window -h -d -P`
+c1_pane=$(tmux split-window -h -d -P)
 
 function cleanup() {
-    tmux kill-pane -t $c1_pane
+    tmux kill-pane -t "$c1_pane"
 }
 trap cleanup EXIT
 
-tmux send -t $c1_pane "${k1} logs -f mcs-api-controller" Enter
+tmux send -t "$c1_pane" "${k1} logs -f mcs-api-controller" Enter
 
 desc "Create our service in each cluster"
-run "${k1} apply -f yaml/dep1.yaml -f yaml/svc.yaml"
-run "${k2} apply -f yaml/dep2.yaml -f yaml/svc.yaml"
+run "${k1} apply -f ${script_dir}/yaml/dep1.yaml -f ${script_dir}/yaml/svc.yaml"
+run "${k2} apply -f ${script_dir}/yaml/dep2.yaml -f ${script_dir}/yaml/svc.yaml"
 run "${k1} get endpointslice -n demo"
 
-
 desc "Lets look at some requests to the service in cluster 1"
 run "${k1} -n demo run -i --rm --restart=Never --image=jeremyot/request:0a40de8 request -- --duration=5s --address=serve.demo.svc.cluster.local"
 
 desc "Ok, looks normal. Let's import the service from our other cluster"
 ep_1=$(${k1} get endpointslice -n demo -l 'kubernetes.io/service-name=serve' --template="{{(index .items 0).metadata.name}}")
 ep_2=$(${k2} get endpointslice -n demo -l 'kubernetes.io/service-name=serve' --template="{{(index .items 0).metadata.name}}")
-run "${k1} get endpointslice -n demo ${ep_1} -o yaml | ./edit-meta --metadata '{name: imported-${ep_1}, namespace: demo, labels: {multicluster.kubernetes.io/service-name: serve}}' > yaml/slice-1.tmp"
-run "${k2} get endpointslice -n demo ${ep_2} -o yaml | ./edit-meta --metadata '{name: imported-${ep_2}, namespace: demo, labels: {multicluster.kubernetes.io/service-name: serve}}' > yaml/slice-2.tmp"
-run "${k1} apply -f yaml/serviceimport.yaml -f yaml/slice-1.tmp -f yaml/slice-2.tmp"
-run "${k2} apply -f yaml/serviceimport.yaml -f yaml/slice-1.tmp -f yaml/slice-2.tmp"
-run "${k1} apply -f yaml/serviceimport-with-vip.yaml -f yaml/slice-1.tmp -f yaml/slice-2.tmp"
-run "${k2} apply -f yaml/serviceimport-with-vip.yaml -f yaml/slice-1.tmp -f yaml/slice-2.tmp"
+
+run "${k1} get endpointslice -n demo ${ep_1} -o yaml | ${script_dir}/edit-meta --metadata '{name: imported-${ep_1}, namespace: demo, labels: {multicluster.kubernetes.io/service-name: serve}}' > ${script_dir}/yaml/slice-1.tmp"
+run "${k2} get endpointslice -n demo ${ep_2} -o yaml | ${script_dir}/edit-meta --metadata '{name: imported-${ep_2}, namespace: demo, labels: {multicluster.kubernetes.io/service-name: serve}}' > ${script_dir}/yaml/slice-2.tmp"
+run "${k1} apply -f ${script_dir}/yaml/serviceimport.yaml -f ${script_dir}/yaml/slice-1.tmp -f ${script_dir}/yaml/slice-2.tmp"
+run "${k2} apply -f ${script_dir}/yaml/serviceimport.yaml -f ${script_dir}/yaml/slice-1.tmp -f ${script_dir}/yaml/slice-2.tmp"
+run "${k1} apply -f ${script_dir}/yaml/serviceimport-with-vip.yaml -f ${script_dir}/yaml/slice-1.tmp -f ${script_dir}/yaml/slice-2.tmp"
+run "${k2} apply -f ${script_dir}/yaml/serviceimport-with-vip.yaml -f ${script_dir}/yaml/slice-1.tmp -f ${script_dir}/yaml/slice-2.tmp"
 
 desc "See what we've created..."
 run "${k1} get -n demo serviceimports"
@@ -70,7 +74,7 @@ function import_ip() {
 waitfor import_ip
 
 vip=$(${k1} get serviceimport -n demo -o go-template --template='{{index (index .items 0).spec.ips 0}}')
-desc "Now grap the multi-cluster VIP from the serviceimport..."
+desc "Now grab the multi-cluster VIP from the serviceimport..."
 run "${k1} get serviceimport -n demo -o go-template --template='{{index (index .items 0).spec.ips 0}}{{\"\n\"}}'"
 desc "...and connect to it"
 run "${k1} -n demo run -i --rm --restart=Never --image=jeremyot/request:0a40de8 request -- --duration=10s --address=${vip}"

demo/edit-meta

@@ -1,15 +1,17 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import sys
 import argparse
 import yaml
 
 if __name__ == '__main__':
-  parser = argparse.ArgumentParser()
-  parser.add_argument('-m',  '--metadata', dest='metadata', help="Overwrite the resource's metadata with this value, may be any valid YAML")
-  args = parser.parse_args()
-  data = yaml.load(sys.stdin, Loader=yaml.Loader)
-  if args.metadata:
-    value = yaml.load(args.metadata, Loader=yaml.Loader)
-    data['metadata'] = value
-  print yaml.dump(data, indent=2, default_flow_style=False, Dumper=yaml.Dumper)
+    parser = argparse.ArgumentParser()
+    parser.add_argument('-m', '--metadata', dest='metadata', help="Overwrite the resource's metadata with this value, may be any valid YAML")
+    args = parser.parse_args()
+
+    data = yaml.load(sys.stdin, Loader=yaml.Loader)
+    if args.metadata:
+        value = yaml.load(args.metadata, Loader=yaml.Loader)
+        data['metadata'] = value
+
+    print(yaml.dump(data, indent=2, default_flow_style=False, Dumper=yaml.Dumper))

demo/udemo.sh

@@ -17,7 +17,7 @@ readonly  reset=$(tput sgr0)
 readonly  green=$(tput bold; tput setaf 2)
 readonly yellow=$(tput bold; tput setaf 3)
 readonly   blue=$(tput bold; tput setaf 6)
-readonly timeout=$(if [ "$(uname)" == "Darwin" ]; then echo "1"; else echo "0.1"; fi) 
+readonly timeout=$(if [ "$(uname)" == "Darwin" ]; then echo "1"; else echo "0.1"; fi)
 
 function desc() {
     maybe_first_prompt
@@ -52,7 +52,11 @@ function run() {
       sleep 0.5
     fi
     OFILE="$(mktemp -t $(basename $0).XXXXXX)"
-    script -eq -c "$1" -f "$OFILE"
+    if [[ "$OSTYPE" == "darwin"* ]]; then
+        script -q -a "$OFILE" bash -c "$1"
+    else
+        script -eq -c "$1" -f "$OFILE"
+    fi
     r=$?
     read -d '' -t "${timeout}" -n 10000 # clear stdin
     prompt
@@ -71,4 +75,4 @@ function relative() {
 
 SSH_NODE=$(kubectl get nodes | tail -1 | cut -f1 -d' ')
 
-trap "echo" EXIT
+trap "echo" EXIT

scripts/up.sh

@@ -44,15 +44,16 @@ coredns_image="multicluster/coredns:latest"
 coredns_path="/tmp/coredns-${coredns_version}"
 if [ ! -d "${coredns_path}" ]; then
   pushd /tmp
-  curl -fLO "https://github.com/coredns/coredns/archive/refs/tags/v${coredns_version}.tar.gz"
-  tar xf v${coredns_version}.tar.gz
+  git clone --depth 1 https://github.com/coredns/coredns.git --branch v${coredns_version} --single-branch "${coredns_path}"
   popd
 fi
 pushd "${coredns_path}"
 if ! grep -q -F 'multicluster:github.com/coredns/multicluster' "plugin.cfg"; then
   sed -i -e 's/^kubernetes:kubernetes$/&\nmulticluster:github.com\/coredns\/multicluster/' "plugin.cfg"
 fi
-make
+docker run --rm \
+    -v $PWD:/go/src/github.com/coredns/coredns -w /go/src/github.com/coredns/coredns \
+        golang:1.23 make gen coredns GOFLAGS=-buildvcs=false
 docker build -t "${coredns_image}" .
 popd