Merge pull request #126 from kahirokunn/use-native-multicluster-support-coredns

Use upstream CoreDNS v1.12.2 with multicluster support

Author: k8s-ci-robot

demo/demo.sh

@@ -44,8 +44,8 @@ trap cleanup EXIT
 tmux send -t "$c1_pane" "${k1} logs -f mcs-api-controller" Enter
 
 desc "Create our service in each cluster"
-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} apply -f ${demo_dir}/yaml/dep1.yaml -f ${demo_dir}/yaml/svc.yaml"
+run "${k2} apply -f ${demo_dir}/yaml/dep2.yaml -f ${demo_dir}/yaml/svc.yaml"
 run "${k1} get endpointslice -n demo"
 
 desc "Lets look at some requests to the service in cluster 1"
@@ -55,12 +55,12 @@ 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 | ${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"
+run "${k1} get endpointslice -n demo ${ep_1} -o yaml | ${demo_dir}/edit-meta --metadata '{name: imported-${ep_1}, namespace: demo, labels: {multicluster.kubernetes.io/service-name: serve}}' > ${demo_dir}/yaml/slice-1.tmp"
+run "${k2} get endpointslice -n demo ${ep_2} -o yaml | ${demo_dir}/edit-meta --metadata '{name: imported-${ep_2}, namespace: demo, labels: {multicluster.kubernetes.io/service-name: serve}}' > ${demo_dir}/yaml/slice-2.tmp"
+run "${k1} apply -f ${demo_dir}/yaml/serviceimport.yaml -f ${demo_dir}/yaml/slice-1.tmp -f ${demo_dir}/yaml/slice-2.tmp"
+run "${k2} apply -f ${demo_dir}/yaml/serviceimport.yaml -f ${demo_dir}/yaml/slice-1.tmp -f ${demo_dir}/yaml/slice-2.tmp"
+run "${k1} apply -f ${demo_dir}/yaml/serviceimport-with-vip.yaml -f ${demo_dir}/yaml/slice-1.tmp -f ${demo_dir}/yaml/slice-2.tmp"
+run "${k2} apply -f ${demo_dir}/yaml/serviceimport-with-vip.yaml -f ${demo_dir}/yaml/slice-1.tmp -f ${demo_dir}/yaml/slice-2.tmp"
 
 desc "See what we've created..."
 run "${k1} get -n demo serviceimports"
@@ -78,6 +78,7 @@ 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}"
+run "${k1} -n demo run -i --rm --restart=Never --image=jeremyot/request:0a40de8 request -- --duration=10s --address=serve.demo.svc.clusterset.local"
 desc "We have a multi-cluster service!"
 desc "See for yourself"
 desc "Cluster 1: kubectl --kubeconfig ${kubeconfig1} -n demo"

scripts/c1.yaml

@@ -9,5 +9,6 @@ nodes:
     - |
       kind: ClusterConfiguration
       dns:
-        imageRepository: multicluster
-        imageTag: latest
+        # TODO: Remove this after Kubernetes 1.35.
+        # Reference: https://github.com/kubernetes/kubernetes/pull/132288
+        imageTag: v1.12.2

scripts/c2.yaml

@@ -9,5 +9,6 @@ nodes:
     - |
       kind: ClusterConfiguration
       dns:
-        imageRepository: multicluster
-        imageTag: latest
+        # TODO: Remove this after Kubernetes 1.35.
+        # Reference: https://github.com/kubernetes/kubernetes/pull/132288
+        imageTag: v1.12.2

scripts/up.sh

@@ -39,38 +39,23 @@ if [ ! -z "${BUILD_CONTROLLER}" ] || [ -z "$(docker images mcs-api-controller -q
   popd
 fi
 
-coredns_version="1.11.4"
-coredns_image="multicluster/coredns:latest"
-coredns_path="/tmp/coredns-${coredns_version}"
-if [ ! -d "${coredns_path}" ]; then
-  pushd /tmp
-  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
-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
-
 kind create cluster --name "${c1}" --config "$PWD/${c1}.yaml"
 kind create cluster --name "${c2}" --config "$PWD/${c2}.yaml"
 
 kind get kubeconfig --name "${c1}" > "${kubeconfig1}"
 kind get kubeconfig --name "${c2}" > "${kubeconfig2}"
 
-kind load docker-image "${controller_image}" "${coredns_image}" --name "${c1}"
-kind load docker-image "${controller_image}" "${coredns_image}" --name "${c2}"
+kind load docker-image "${controller_image}" --name "${c1}"
+kind load docker-image "${controller_image}" --name "${c2}"
 
 echo "Configuring CoreDNS"
 function update_coredns() {
+  kubectl --kubeconfig ${1} apply -f ../config/crd
   kubectl --kubeconfig ${1} patch clusterrole system:coredns --type json --patch-file coredns-rbac.json
+  # Patching Corefile based on Cilium documentation: https://docs.cilium.io/en/latest/network/clustermesh/mcsapi/#prerequisites
   kubectl --kubeconfig ${1} get configmap -n kube-system coredns -o yaml | \
-    sed -E -e 's/^(\s*)kubernetes.*cluster\.local.*$/\1multicluster clusterset.local\n&/' | \
+    sed -e 's/cluster\.local/cluster.local clusterset.local/g' | \
+    sed -E 's/^(.*)kubernetes(.*)\{/\1kubernetes\2{\n\1   multicluster clusterset.local/' | \
     kubectl --kubeconfig ${1} replace -f-
   kubectl --kubeconfig ${1} rollout restart deploy -n kube-system coredns
 }
@@ -103,8 +88,8 @@ add_routes "${c1}" "${c2}-control-plane" "${kubeconfig2}"
 add_routes "${c2}" "${c1}-control-plane" "${kubeconfig1}"
 echo "Cluster networks connected"
 
-${k1} apply -f ../config/crd -f ../config/rbac
-${k2} apply -f ../config/crd -f ../config/rbac
+${k1} apply -f ../config/rbac
+${k2} apply -f ../config/rbac
 
 ${k1} create sa mcs-api-controller
 ${k1} create clusterrolebinding mcs-api-binding --clusterrole=mcs-derived-service-manager --serviceaccount=default:mcs-api-controller