From 9f8ca88a63c2bf5d443a0acfa45e33cd2fb4de62 Mon Sep 17 00:00:00 2001 From: Pravein-Govindan-Kannan Date: Fri, 14 Jun 2024 16:27:30 -0700 Subject: [PATCH] Fix wordings Signed-off-by: Pravein-Govindan-Kannan --- .../content/en/docs/main/concepts/services.md | 3 ++- website/go.mod | 6 +++--- website/go.sum | 16 ++++++---------- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/website/content/en/docs/main/concepts/services.md b/website/content/en/docs/main/concepts/services.md index 8d14a2a3d..1b078779c 100644 --- a/website/content/en/docs/main/concepts/services.md +++ b/website/content/en/docs/main/concepts/services.md @@ -208,7 +208,8 @@ spec: {{% /expand %}} -In certain cases, a service can be imported without explicitly creating a another corresponding service at the imported side, but merging it along with an existing service by setting the label import.clusterlink.net/merge to true. This would trigger the creation of endpointslice which services requests to the imported service. + +In certain cases, a service can be imported without creating another corresponding service at the imported side, but merging it along with a pre-existing service with the same `name`. This can be specified by adding the label `import.clusterlink.net/merge`, which is set to `true`. This would trigger the creation of an endpointslice which services requests to the imported service (by setting `kubernetes.io/service-name` to the imported service name). {{% expand summary="Example YAML for `kubectl apply -f `" %}} diff --git a/website/go.mod b/website/go.mod index 6ac339ac6..79aa4378b 100644 --- a/website/go.mod +++ b/website/go.mod @@ -3,9 +3,9 @@ module github.com/clusterlink-net/clusterlink/website go 1.20 require ( - github.com/FortAwesome/Font-Awesome v0.0.0-20240108205627-a1232e345536 // indirect - github.com/google/docsy v0.9.1 // indirect + github.com/FortAwesome/Font-Awesome v0.0.0-20240402185447-c0f460dca7f7 // indirect + github.com/google/docsy v0.10.0 // indirect github.com/google/docsy/dependencies v0.7.2 // indirect - github.com/martignoni/hugo-notice v0.0.0-20240317181534-be025da2580d // indirect + github.com/martignoni/hugo-notice v0.0.0-20240524142214-36e5ee342fef // indirect github.com/twbs/bootstrap v5.3.3+incompatible // indirect ) diff --git a/website/go.sum b/website/go.sum index 0edffd041..7f3ae2491 100644 --- a/website/go.sum +++ b/website/go.sum @@ -1,16 +1,12 @@ github.com/FortAwesome/Font-Awesome v0.0.0-20230327165841-0698449d50f2/go.mod h1:IUgezN/MFpCDIlFezw3L8j83oeiIuYoj28Miwr/KUYo= -github.com/FortAwesome/Font-Awesome v0.0.0-20240108205627-a1232e345536 h1:LFS9LpoSZYhxQ6clU0NIVbaGR08BlxAs4b+9W+7IGVQ= -github.com/FortAwesome/Font-Awesome v0.0.0-20240108205627-a1232e345536/go.mod h1:IUgezN/MFpCDIlFezw3L8j83oeiIuYoj28Miwr/KUYo= -github.com/google/docsy v0.7.2 h1:KzhFgTd3taF1jq9HDemH3omlUqn9qfdE68sxRyTySpM= -github.com/google/docsy v0.7.2/go.mod h1:ol3w2s1FBUzENdKSAEeNjtuaISUzHYHTw60xv5QH3Dg= -github.com/google/docsy v0.9.1 h1:+jqges1YCd+yHeuZ1BUvD8V8mEGVtPxULg5j/vaJ984= -github.com/google/docsy v0.9.1/go.mod h1:saOqKEUOn07Bc0orM/JdIF3VkOanHta9LU5Y53bwN2U= +github.com/FortAwesome/Font-Awesome v0.0.0-20240402185447-c0f460dca7f7 h1:2aWEKCRLqQ9nPyXaz4/IYtRrDr3PzEiX0DUSUr2/EDs= +github.com/FortAwesome/Font-Awesome v0.0.0-20240402185447-c0f460dca7f7/go.mod h1:IUgezN/MFpCDIlFezw3L8j83oeiIuYoj28Miwr/KUYo= +github.com/google/docsy v0.10.0 h1:6tMDacPwAyRWNCfvsn/9qGOZDQ8b0aRzjRZvnZPY5dg= +github.com/google/docsy v0.10.0/go.mod h1:c0nIAqmRTOuJ01F85U/wJPQtc3Zj9N58Kea9bOT2AJc= github.com/google/docsy/dependencies v0.7.2 h1:+t5ufoADQAj4XneFphz4A+UU0ICAxmNaRHVWtMYXPSI= github.com/google/docsy/dependencies v0.7.2/go.mod h1:gihhs5gmgeO+wuoay4FwOzob+jYJVyQbNaQOh788lD4= -github.com/martignoni/hugo-notice v0.0.0-20240113121429-9f516e6bedc3 h1:UTgKycyAU48Q++K/cWcyPKE8FcbsCZtaluFuM0lIqFM= -github.com/martignoni/hugo-notice v0.0.0-20240113121429-9f516e6bedc3/go.mod h1:MIQPOMgEcbyRC0gNLzQFSgrS+wIy3RuQ/HbaZYtTOKU= -github.com/martignoni/hugo-notice v0.0.0-20240317181534-be025da2580d h1:YmphoiBKQ7svpO338vXw8NH+Qg20Yu4JsmeHV9f2E5s= -github.com/martignoni/hugo-notice v0.0.0-20240317181534-be025da2580d/go.mod h1:MIQPOMgEcbyRC0gNLzQFSgrS+wIy3RuQ/HbaZYtTOKU= +github.com/martignoni/hugo-notice v0.0.0-20240524142214-36e5ee342fef h1:usUOTC/Tia7tnLy46EqakzYFDQVj1JjuDud00Cn/3y8= +github.com/martignoni/hugo-notice v0.0.0-20240524142214-36e5ee342fef/go.mod h1:MIQPOMgEcbyRC0gNLzQFSgrS+wIy3RuQ/HbaZYtTOKU= github.com/twbs/bootstrap v5.2.3+incompatible/go.mod h1:fZTSrkpSf0/HkL0IIJzvVspTt1r9zuf7XlZau8kpcY0= github.com/twbs/bootstrap v5.3.3+incompatible h1:goFoqinzdHfkeegpFP7pvhbd0g+A3O2hbU3XCjuNrEQ= github.com/twbs/bootstrap v5.3.3+incompatible/go.mod h1:fZTSrkpSf0/HkL0IIJzvVspTt1r9zuf7XlZau8kpcY0=