From f11a0d90b59aed24da9ef1fbc9801ea5f0591a22 Mon Sep 17 00:00:00 2001 From: Christoph Mewes Date: Tue, 19 Aug 2025 19:50:49 +0200 Subject: [PATCH 1/6] bump Dex dependency On-behalf-of: @SAP christoph.mewes@sap.com --- Makefile | 4 ++-- go.mod | 4 ++-- go.sum | 12 ++++++------ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 6024b7792..aca208cbf 100644 --- a/Makefile +++ b/Makefile @@ -85,7 +85,7 @@ KCP_VER := v0.28.0 KCP_BIN := kcp KCP := $(TOOLS_GOBIN_DIR)/$(KCP_BIN)-$(KCP_VER) -DEX_VER := v2.41.1 +DEX_VER := v2.43.1 DEX_BIN := dex DEX := $(TOOLS_GOBIN_DIR)/$(DEX_BIN)-$(DEX_VER) @@ -163,7 +163,7 @@ vendor: ## Vendor the dependencies go mod vendor .PHONY: vendor -tools: $(GOLANGCI_LINT) $(CONTROLLER_GEN) $(YAML_PATCH) $(GOTESTSUM) $(CODE_GENERATOR) +tools: $(GOLANGCI_LINT) $(CONTROLLER_GEN) $(YAML_PATCH) $(GOTESTSUM) $(CODE_GENERATOR) .PHONY: tools $(CONTROLLER_GEN): diff --git a/go.mod b/go.mod index 47b855ef6..571092d52 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,7 @@ replace ( require ( github.com/coreos/go-oidc v2.3.0+incompatible - github.com/dexidp/dex/api/v2 v2.1.0 + github.com/dexidp/dex/api/v2 v2.3.0 github.com/evanphx/json-patch/v5 v5.9.11 github.com/google/go-cmp v0.7.0 github.com/gorilla/mux v1.8.0 @@ -31,7 +31,7 @@ require ( github.com/stretchr/testify v1.10.0 github.com/vmihailenco/msgpack/v4 v4.3.12 golang.org/x/oauth2 v0.29.0 - google.golang.org/grpc v1.69.2 + google.golang.org/grpc v1.70.0 gopkg.in/headzoo/surf.v1 v1.0.1 k8s.io/api v0.33.3 k8s.io/apiextensions-apiserver v0.33.0 diff --git a/go.sum b/go.sum index 58355e885..d46140a51 100644 --- a/go.sum +++ b/go.sum @@ -33,8 +33,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/dexidp/dex/api/v2 v2.1.0 h1:V7XTnG2HM2bqWZMABDQpf4EA6F+0jWPsv9pGaUIDo+k= -github.com/dexidp/dex/api/v2 v2.1.0/go.mod h1:s91/6CI290JhYN1F8aiRifLF71qRGLVZvzq68uC6Ln4= +github.com/dexidp/dex/api/v2 v2.3.0 h1:gv79YqTBTGU6z/QE3RNFzlS6KrPRUudVUN8o858gpCc= +github.com/dexidp/dex/api/v2 v2.3.0/go.mod h1:y9As69T4WZOERCS/CfB9D8Dbb12tafU9ywv2ZZLf4EI= github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= github.com/emicklei/go-restful/v3 v3.12.1 h1:PJMDIM/ak7btuL8Ex0iYET9hxM3CI2sjZtzpL63nKAU= @@ -275,8 +275,8 @@ go.opentelemetry.io/otel/metric v1.33.0 h1:r+JOocAyeRVXD8lZpjdQjzMadVZp2M4WmQ+5W go.opentelemetry.io/otel/metric v1.33.0/go.mod h1:L9+Fyctbp6HFTddIxClbQkjtubW6O9QS3Ann/M82u6M= go.opentelemetry.io/otel/sdk v1.33.0 h1:iax7M131HuAm9QkZotNHEfstof92xM+N8sr3uHXc2IM= go.opentelemetry.io/otel/sdk v1.33.0/go.mod h1:A1Q5oi7/9XaMlIWzPSxLRWOI8nG3FnzHJNbiENQuihM= -go.opentelemetry.io/otel/sdk/metric v1.31.0 h1:i9hxxLJF/9kkvfHppyLL55aW7iIJz4JjxTeYusH7zMc= -go.opentelemetry.io/otel/sdk/metric v1.31.0/go.mod h1:CRInTMVvNhUKgSAMbKyTMxqOBC0zgyxzW55lZzX43Y8= +go.opentelemetry.io/otel/sdk/metric v1.32.0 h1:rZvFnvmvawYb0alrYkjraqJq0Z4ZUJAiyYCU9snn1CU= +go.opentelemetry.io/otel/sdk/metric v1.32.0/go.mod h1:PWeZlq0zt9YkYAp3gjKZ0eicRYvOh1Gd+X99x6GHpCQ= go.opentelemetry.io/otel/trace v1.33.0 h1:cCJuF7LRjUFso9LPnEAHJDB2pqzp+hbO8eu1qqW2d/s= go.opentelemetry.io/otel/trace v1.33.0/go.mod h1:uIcdVUZMpTAmz0tI1z04GoVSezK37CbGV4fr1f2nBck= go.opentelemetry.io/proto/otlp v1.5.0 h1:xJvq7gMzB31/d406fB8U5CBdyQGw4P399D1aQWU/3i4= @@ -357,8 +357,8 @@ google.golang.org/genproto/googleapis/api v0.0.0-20250106144421-5f5ef82da422 h1: google.golang.org/genproto/googleapis/api v0.0.0-20250106144421-5f5ef82da422/go.mod h1:b6h1vNKhxaSoEI+5jc3PJUCustfli/mRab7295pY7rw= google.golang.org/genproto/googleapis/rpc v0.0.0-20250106144421-5f5ef82da422 h1:3UsHvIr4Wc2aW4brOaSCmcxh9ksica6fHEr8P1XhkYw= google.golang.org/genproto/googleapis/rpc v0.0.0-20250106144421-5f5ef82da422/go.mod h1:3ENsm/5D1mzDyhpzeRi1NR784I0BcofWBoSc5QqqMK4= -google.golang.org/grpc v1.69.2 h1:U3S9QEtbXC0bYNvRtcoklF3xGtLViumSYxWykJS+7AU= -google.golang.org/grpc v1.69.2/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4= +google.golang.org/grpc v1.70.0 h1:pWFv03aZoHzlRKHWicjsZytKAiYCtNS0dHbXnIdq7jQ= +google.golang.org/grpc v1.70.0/go.mod h1:ofIJqVKDXx/JiXrwr2IG4/zwdH9txy3IlF40RmcJSQw= google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM= google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= From 8f317e363e681c443b85049e857e30639bf1a35e Mon Sep 17 00:00:00 2001 From: Christoph Mewes Date: Tue, 19 Aug 2025 19:55:16 +0200 Subject: [PATCH 2/6] improve dex-related docs On-behalf-of: @SAP christoph.mewes@sap.com --- docs/content/setup/local-setup-with-kind.md | 13 ++-- docs/content/setup/quickstart.md | 67 ++++++++++++--------- hack/dex-config-dev.yaml | 4 +- hack/kind-example-setup/backend-cluster.sh | 2 +- kcp/dex-config-dev.yaml | 4 +- 5 files changed, 48 insertions(+), 42 deletions(-) diff --git a/docs/content/setup/local-setup-with-kind.md b/docs/content/setup/local-setup-with-kind.md index cf2cfc30d..00e204921 100644 --- a/docs/content/setup/local-setup-with-kind.md +++ b/docs/content/setup/local-setup-with-kind.md @@ -2,13 +2,10 @@ This guide will walk you through setting up kube-bind between two Kubernetes clusters, where -**Backend cluster**: - +* **Backend cluster**: * Deploys dex, cert-manager and kube-bind/example-backend * Provides kube-bind compatible backend for MangoDB resources - -**App cluster**: - +* **App cluster**: * Provides an application consuming MangoDBs ## Pre-requisites @@ -62,7 +59,7 @@ nodes: - containerPort: 30080 hostPort: 8080 protocol: TCP - # DEX endpoint + # dex endpoint - containerPort: 30556 hostPort: 5556 protocol: TCP @@ -73,7 +70,7 @@ EOF_BackendClusterDefinition ### Step two: deploy an identity provider -kube-bind relies on OAuth2 for securely authenticating consumer and producer clusters. There are many ways to handle that in Kubernetes, for example with [DEX IDP](https://github.com/dexidp/dex). It depends on cert-manager, which we'll deploy first: +kube-bind relies on OAuth2 for securely authenticating consumer and producer clusters. There are many ways to handle that in Kubernetes, for example with [dex IDP](https://github.com/dexidp/dex). It depends on cert-manager, which we'll deploy first: ```sh helm repo add jetstack https://charts.jetstack.io @@ -85,7 +82,7 @@ helm install \ cert-manager jetstack/cert-manager ``` -And now let's deploy DEX: +And now let's deploy dex: ```sh helm repo add dex https://charts.dexidp.io diff --git a/docs/content/setup/quickstart.md b/docs/content/setup/quickstart.md index a55b4c418..5550c6802 100644 --- a/docs/content/setup/quickstart.md +++ b/docs/content/setup/quickstart.md @@ -27,17 +27,19 @@ To run the current backend, there must be an OIDC issuer installed in place to d the oauth2 workflow. We use dex to manage OIDC, following the steps below you can run a local OIDC issuer using dex: + * First, clone the dex repo: `git clone https://github.com/dexidp/dex.git` * `cd dex` and then build the dex binary `make build` * The binary will be created in `bin/dex` * Adjust the config file(`examples/config-dev.yaml`) for dex by specifying the server callback method: -```yaml -staticClients: -- id: kube-bind - redirectURIs: - - 'http://127.0.0.1:8080/callback' - name: 'Kube Bind' -``` + ```yaml + staticClients: + - id: kube-bind + redirectURIs: + - 'http://127.0.0.1:8080/callback' + name: 'Kube Bind' + secret: ZXhhbXBsZS1hcHAtc2VjcmV0 + ``` * Run dex: `./bin/dex serve examples/config-dev.yaml` Next you should be able to run the backend. For it you need a kubernetes cluster (e.g. kind) @@ -54,33 +56,38 @@ export KUBECONFIG=.kcp/provider.kubeconfig kubectl ws create provider --enter ``` -* apply the CRDs: `kubectl apply -f deploy/crd` +* apply the CRDs: + + ```shell + kubectl apply -f deploy/crd + ``` * In order to populate binding list on website, we need a CRD with label `kube-bind.io/exported: true`. Apply example APIResourceSchema for the CRD: `kubectl apply -f deploy/examples/crd-mangodb.yaml` -```shell -kubectl apply -f deploy/crd -kubectl apply -f deploy/examples/crd-mangodb.yaml -kubectl apply -f deploy/examples/crd-foo.yaml -``` + ```shell + kubectl apply -f deploy/examples/crd-mangodb.yaml + kubectl apply -f deploy/examples/crd-foo.yaml + ``` * start the backend binary with the right flags: -```shell -make build -bin/backend \ - --oidc-issuer-client-secret=ZXhhbXBsZS1hcHAtc2VjcmV0 \ - --oidc-issuer-client-id=kube-bind \ - --oidc-issuer-url=http://127.0.0.1:5556/dex \ - --oidc-callback-url=http://127.0.0.1:8080/callback \ - --pretty-name="BigCorp.com" \ - --namespace-prefix="kube-bind-" \ - --cookie-signing-key=bGMHz7SR9XcI9JdDB68VmjQErrjbrAR9JdVqjAOKHzE= \ - --cookie-encryption-key=wadqi4u+w0bqnSrVFtM38Pz2ykYVIeeadhzT34XlC1Y= \ - --consumer-scope=cluster -``` + ```shell + make build + + bin/backend \ + --oidc-issuer-client-secret=ZXhhbXBsZS1hcHAtc2VjcmV0 \ + --oidc-issuer-client-id=kube-bind \ + --oidc-issuer-url=http://127.0.0.1:5556/dex \ + --oidc-callback-url=http://127.0.0.1:8080/callback \ + --pretty-name="BigCorp.com" \ + --namespace-prefix="kube-bind-" \ + --cookie-signing-key=bGMHz7SR9XcI9JdDB68VmjQErrjbrAR9JdVqjAOKHzE= \ + --cookie-encryption-key=wadqi4u+w0bqnSrVFtM38Pz2ykYVIeeadhzT34XlC1Y= \ + --consumer-scope=cluster + ``` where `ZXhhbXBsZS1hcHAtc2VjcmV0` matches the value of the dex config file. The `--cookie-signing-key` and `--cookie-encryption-key` settings can be generated using: + ```shell $ openssl rand -base64 32 WQh88mNOY0Z3tLy1/WOud7qIEEBxz+POc4j8BsYenYo= @@ -90,6 +97,7 @@ The `--cookie-signing-key` option is required and supports 32 and 64 byte length The `--cookie-encryption-key` option is optional and supports byte lengths of 16, 24, 32 for AES-128, AES-192, or AES-256. ### Consumer + Now create consumer cluster: ```shell @@ -101,17 +109,18 @@ Now create the APIServiceExportRequest: ```shell ./bin/kubectl-bind http://127.0.0.1:8080/exports --dry-run -o yaml > apiserviceexport.yaml + # This will wait for konnector to be ready. Once this gets running - start the konnector bellow -# IMPORTANT: Check namespace to be used! +# IMPORTANT: Check namespace to be used! ./bin/kubectl-bind apiservice --remote-kubeconfig .kcp/provider.kubeconfig -f apiserviceexport.yaml --skip-konnector --remote-namespace + # run konnector in different terminal export KUBECONFIG=.kcp/admin.kubeconfig go run ./cmd/konnector/ --lease-namespace default ``` - Create mangoDB object: ```bash kubectl create -f deploy/examples/mangodb.yaml -``` \ No newline at end of file +``` diff --git a/hack/dex-config-dev.yaml b/hack/dex-config-dev.yaml index 9e2bdbe91..94c44579c 100644 --- a/hack/dex-config-dev.yaml +++ b/hack/dex-config-dev.yaml @@ -93,8 +93,8 @@ grpc: oauth2: # use ["code", "token", "id_token"] to enable implicit flow for web-only clients # responseTypes: [ "code" ] # also allowed are "token" and "id_token" - # By default, Dex will ask for approval to share data with application - # (approval for sharing data from connected IdP to Dex is separate process on IdP) + # By default, dex will ask for approval to share data with application + # (approval for sharing data from connected IdP to dex is separate process on IdP) skipApprovalScreen: true # If only one authentication method is enabled, the default behavior is to # go directly to it. For connected IdPs, this redirects the browser away diff --git a/hack/kind-example-setup/backend-cluster.sh b/hack/kind-example-setup/backend-cluster.sh index 69128e3fe..2bb03ab37 100755 --- a/hack/kind-example-setup/backend-cluster.sh +++ b/hack/kind-example-setup/backend-cluster.sh @@ -38,7 +38,7 @@ nodes: - containerPort: 30080 hostPort: 8080 protocol: TCP - # DEX endpoint + # dex endpoint - containerPort: 30556 hostPort: 5556 protocol: TCP diff --git a/kcp/dex-config-dev.yaml b/kcp/dex-config-dev.yaml index 9e2bdbe91..94c44579c 100644 --- a/kcp/dex-config-dev.yaml +++ b/kcp/dex-config-dev.yaml @@ -93,8 +93,8 @@ grpc: oauth2: # use ["code", "token", "id_token"] to enable implicit flow for web-only clients # responseTypes: [ "code" ] # also allowed are "token" and "id_token" - # By default, Dex will ask for approval to share data with application - # (approval for sharing data from connected IdP to Dex is separate process on IdP) + # By default, dex will ask for approval to share data with application + # (approval for sharing data from connected IdP to dex is separate process on IdP) skipApprovalScreen: true # If only one authentication method is enabled, the default behavior is to # go directly to it. For connected IdPs, this redirects the browser away From 9eaa45c097b24c09d70017c7761e2c8bf0ee9db8 Mon Sep 17 00:00:00 2001 From: Christoph Mewes Date: Tue, 19 Aug 2025 19:55:43 +0200 Subject: [PATCH 3/6] go mod tidy all modules On-behalf-of: @SAP christoph.mewes@sap.com --- cli/go.mod | 2 +- cli/go.sum | 12 ++++++------ docs/generators/cli-doc/go.mod | 2 +- docs/generators/cli-doc/go.sum | 8 ++++---- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/cli/go.mod b/cli/go.mod index d4591e527..c051c70c6 100644 --- a/cli/go.mod +++ b/cli/go.mod @@ -114,7 +114,7 @@ require ( golang.org/x/time v0.11.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20250106144421-5f5ef82da422 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20250106144421-5f5ef82da422 // indirect - google.golang.org/grpc v1.69.2 // indirect + google.golang.org/grpc v1.70.0 // indirect google.golang.org/protobuf v1.36.5 // indirect gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect diff --git a/cli/go.sum b/cli/go.sum index a56520ac3..b7734c760 100644 --- a/cli/go.sum +++ b/cli/go.sum @@ -226,8 +226,8 @@ go.opentelemetry.io/otel/metric v1.33.0 h1:r+JOocAyeRVXD8lZpjdQjzMadVZp2M4WmQ+5W go.opentelemetry.io/otel/metric v1.33.0/go.mod h1:L9+Fyctbp6HFTddIxClbQkjtubW6O9QS3Ann/M82u6M= go.opentelemetry.io/otel/sdk v1.33.0 h1:iax7M131HuAm9QkZotNHEfstof92xM+N8sr3uHXc2IM= go.opentelemetry.io/otel/sdk v1.33.0/go.mod h1:A1Q5oi7/9XaMlIWzPSxLRWOI8nG3FnzHJNbiENQuihM= -go.opentelemetry.io/otel/sdk/metric v1.31.0 h1:i9hxxLJF/9kkvfHppyLL55aW7iIJz4JjxTeYusH7zMc= -go.opentelemetry.io/otel/sdk/metric v1.31.0/go.mod h1:CRInTMVvNhUKgSAMbKyTMxqOBC0zgyxzW55lZzX43Y8= +go.opentelemetry.io/otel/sdk/metric v1.32.0 h1:rZvFnvmvawYb0alrYkjraqJq0Z4ZUJAiyYCU9snn1CU= +go.opentelemetry.io/otel/sdk/metric v1.32.0/go.mod h1:PWeZlq0zt9YkYAp3gjKZ0eicRYvOh1Gd+X99x6GHpCQ= go.opentelemetry.io/otel/trace v1.33.0 h1:cCJuF7LRjUFso9LPnEAHJDB2pqzp+hbO8eu1qqW2d/s= go.opentelemetry.io/otel/trace v1.33.0/go.mod h1:uIcdVUZMpTAmz0tI1z04GoVSezK37CbGV4fr1f2nBck= go.opentelemetry.io/proto/otlp v1.5.0 h1:xJvq7gMzB31/d406fB8U5CBdyQGw4P399D1aQWU/3i4= @@ -286,14 +286,14 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 h1:KAeGQVN3M9nD0/bQXnr/ClcEMJ968gUXJQ9pwfSynuQ= -google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80/go.mod h1:cc8bqMqtv9gMOr0zHg2Vzff5ULhhL2IXP4sbcn32Dro= +google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 h1:9+tzLLstTlPTRyJTh+ah5wIMsBW5c4tQwGTN3thOW9Y= +google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9/go.mod h1:mqHbVIp48Muh7Ywss/AD6I5kNVKZMmAa/QEW58Gxp2s= google.golang.org/genproto/googleapis/api v0.0.0-20250106144421-5f5ef82da422 h1:GVIKPyP/kLIyVOgOnTwFOrvQaQUzOzGMCxgFUOEmm24= google.golang.org/genproto/googleapis/api v0.0.0-20250106144421-5f5ef82da422/go.mod h1:b6h1vNKhxaSoEI+5jc3PJUCustfli/mRab7295pY7rw= google.golang.org/genproto/googleapis/rpc v0.0.0-20250106144421-5f5ef82da422 h1:3UsHvIr4Wc2aW4brOaSCmcxh9ksica6fHEr8P1XhkYw= google.golang.org/genproto/googleapis/rpc v0.0.0-20250106144421-5f5ef82da422/go.mod h1:3ENsm/5D1mzDyhpzeRi1NR784I0BcofWBoSc5QqqMK4= -google.golang.org/grpc v1.69.2 h1:U3S9QEtbXC0bYNvRtcoklF3xGtLViumSYxWykJS+7AU= -google.golang.org/grpc v1.69.2/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4= +google.golang.org/grpc v1.70.0 h1:pWFv03aZoHzlRKHWicjsZytKAiYCtNS0dHbXnIdq7jQ= +google.golang.org/grpc v1.70.0/go.mod h1:ofIJqVKDXx/JiXrwr2IG4/zwdH9txy3IlF40RmcJSQw= google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM= google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/docs/generators/cli-doc/go.mod b/docs/generators/cli-doc/go.mod index 2781d7a75..6f59b79f9 100644 --- a/docs/generators/cli-doc/go.mod +++ b/docs/generators/cli-doc/go.mod @@ -106,7 +106,7 @@ require ( golang.org/x/time v0.11.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20250106144421-5f5ef82da422 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20250106144421-5f5ef82da422 // indirect - google.golang.org/grpc v1.69.2 // indirect + google.golang.org/grpc v1.70.0 // indirect google.golang.org/protobuf v1.36.5 // indirect gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect diff --git a/docs/generators/cli-doc/go.sum b/docs/generators/cli-doc/go.sum index ed2f801f4..95e48537c 100644 --- a/docs/generators/cli-doc/go.sum +++ b/docs/generators/cli-doc/go.sum @@ -230,8 +230,8 @@ go.opentelemetry.io/otel/metric v1.33.0 h1:r+JOocAyeRVXD8lZpjdQjzMadVZp2M4WmQ+5W go.opentelemetry.io/otel/metric v1.33.0/go.mod h1:L9+Fyctbp6HFTddIxClbQkjtubW6O9QS3Ann/M82u6M= go.opentelemetry.io/otel/sdk v1.33.0 h1:iax7M131HuAm9QkZotNHEfstof92xM+N8sr3uHXc2IM= go.opentelemetry.io/otel/sdk v1.33.0/go.mod h1:A1Q5oi7/9XaMlIWzPSxLRWOI8nG3FnzHJNbiENQuihM= -go.opentelemetry.io/otel/sdk/metric v1.31.0 h1:i9hxxLJF/9kkvfHppyLL55aW7iIJz4JjxTeYusH7zMc= -go.opentelemetry.io/otel/sdk/metric v1.31.0/go.mod h1:CRInTMVvNhUKgSAMbKyTMxqOBC0zgyxzW55lZzX43Y8= +go.opentelemetry.io/otel/sdk/metric v1.32.0 h1:rZvFnvmvawYb0alrYkjraqJq0Z4ZUJAiyYCU9snn1CU= +go.opentelemetry.io/otel/sdk/metric v1.32.0/go.mod h1:PWeZlq0zt9YkYAp3gjKZ0eicRYvOh1Gd+X99x6GHpCQ= go.opentelemetry.io/otel/trace v1.33.0 h1:cCJuF7LRjUFso9LPnEAHJDB2pqzp+hbO8eu1qqW2d/s= go.opentelemetry.io/otel/trace v1.33.0/go.mod h1:uIcdVUZMpTAmz0tI1z04GoVSezK37CbGV4fr1f2nBck= go.opentelemetry.io/proto/otlp v1.5.0 h1:xJvq7gMzB31/d406fB8U5CBdyQGw4P399D1aQWU/3i4= @@ -296,8 +296,8 @@ google.golang.org/genproto/googleapis/api v0.0.0-20250106144421-5f5ef82da422 h1: google.golang.org/genproto/googleapis/api v0.0.0-20250106144421-5f5ef82da422/go.mod h1:b6h1vNKhxaSoEI+5jc3PJUCustfli/mRab7295pY7rw= google.golang.org/genproto/googleapis/rpc v0.0.0-20250106144421-5f5ef82da422 h1:3UsHvIr4Wc2aW4brOaSCmcxh9ksica6fHEr8P1XhkYw= google.golang.org/genproto/googleapis/rpc v0.0.0-20250106144421-5f5ef82da422/go.mod h1:3ENsm/5D1mzDyhpzeRi1NR784I0BcofWBoSc5QqqMK4= -google.golang.org/grpc v1.69.2 h1:U3S9QEtbXC0bYNvRtcoklF3xGtLViumSYxWykJS+7AU= -google.golang.org/grpc v1.69.2/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4= +google.golang.org/grpc v1.70.0 h1:pWFv03aZoHzlRKHWicjsZytKAiYCtNS0dHbXnIdq7jQ= +google.golang.org/grpc v1.70.0/go.mod h1:ofIJqVKDXx/JiXrwr2IG4/zwdH9txy3IlF40RmcJSQw= google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM= google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= From 0579383ff4cac0ce4bc4a74667d47b43d46598fc Mon Sep 17 00:00:00 2001 From: Christoph Mewes Date: Tue, 19 Aug 2025 19:57:13 +0200 Subject: [PATCH 4/6] remove unused dependency On-behalf-of: @SAP christoph.mewes@sap.com --- go.mod | 2 -- 1 file changed, 2 deletions(-) diff --git a/go.mod b/go.mod index 571092d52..03a6f4820 100644 --- a/go.mod +++ b/go.mod @@ -49,8 +49,6 @@ require ( sigs.k8s.io/yaml v1.4.0 ) -replace cloud.google.com/go => cloud.google.com/go v0.100.2 - require ( cel.dev/expr v0.19.1 // indirect github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect From b17ea2d575d3c99bbee9310492d7f94be21f119e Mon Sep 17 00:00:00 2001 From: Christoph Mewes Date: Tue, 19 Aug 2025 19:58:18 +0200 Subject: [PATCH 5/6] make replace directives more visible On-behalf-of: @SAP christoph.mewes@sap.com --- go.mod | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/go.mod b/go.mod index 03a6f4820..135eefa2c 100644 --- a/go.mod +++ b/go.mod @@ -10,6 +10,24 @@ replace ( github.com/kube-bind/kube-bind/sdk/client => ./sdk/client ) +// Matches multicluster-runtime v0.21.0-alpha.8 +replace ( + github.com/google/cel-go => github.com/google/cel-go v0.22.0 + github.com/kcp-dev/apimachinery/v2 => github.com/kcp-dev/apimachinery/v2 v2.0.1-0.20250728122101-adbf20db3e51 + github.com/kcp-dev/multicluster-provider => github.com/mjudeikis/kcp-multicluster-provider v0.0.0-20250818102159-3d31cbb06ebe + k8s.io/api => k8s.io/api v0.33.0 + k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.33.0 + k8s.io/apimachinery => k8s.io/apimachinery v0.33.0 + k8s.io/apiserver => k8s.io/apiserver v0.33.0 + k8s.io/cli-runtime => k8s.io/cli-runtime v0.33.0 + k8s.io/client-go => k8s.io/client-go v0.33.0 + k8s.io/code-generator => k8s.io/code-generator v0.33.0 + k8s.io/component-base => k8s.io/component-base v0.33.0 + sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.21.0 + //sigs.k8s.io/multicluster-runtime => sigs.k8s.io/multicluster-runtime v0.20.4-alpha.7 + sigs.k8s.io/multicluster-runtime => github.com/mjudeikis/sigs-multicluster-runtime v0.0.0-20250818101434-d8ebc45e169b +) + require ( github.com/coreos/go-oidc v2.3.0+incompatible github.com/dexidp/dex/api/v2 v2.3.0 @@ -165,21 +183,3 @@ require ( sigs.k8s.io/randfill v1.0.0 // indirect sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect ) - -// Matches multicluster-runtime v0.21.0-alpha.8 -replace ( - github.com/google/cel-go => github.com/google/cel-go v0.22.0 - github.com/kcp-dev/apimachinery/v2 => github.com/kcp-dev/apimachinery/v2 v2.0.1-0.20250728122101-adbf20db3e51 - github.com/kcp-dev/multicluster-provider => github.com/mjudeikis/kcp-multicluster-provider v0.0.0-20250818102159-3d31cbb06ebe - k8s.io/api => k8s.io/api v0.33.0 - k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.33.0 - k8s.io/apimachinery => k8s.io/apimachinery v0.33.0 - k8s.io/apiserver => k8s.io/apiserver v0.33.0 - k8s.io/cli-runtime => k8s.io/cli-runtime v0.33.0 - k8s.io/client-go => k8s.io/client-go v0.33.0 - k8s.io/code-generator => k8s.io/code-generator v0.33.0 - k8s.io/component-base => k8s.io/component-base v0.33.0 - sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.21.0 - //sigs.k8s.io/multicluster-runtime => sigs.k8s.io/multicluster-runtime v0.20.4-alpha.7 - sigs.k8s.io/multicluster-runtime => github.com/mjudeikis/sigs-multicluster-runtime v0.0.0-20250818101434-d8ebc45e169b -) From eb550fa435d7d1afc20cde0d01a3c69eeee2d512 Mon Sep 17 00:00:00 2001 From: Christoph Mewes Date: Tue, 19 Aug 2025 19:59:49 +0200 Subject: [PATCH 6/6] improve link On-behalf-of: @SAP christoph.mewes@sap.com --- docs/content/setup/local-setup-with-kind.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/content/setup/local-setup-with-kind.md b/docs/content/setup/local-setup-with-kind.md index 00e204921..65dd2ae47 100644 --- a/docs/content/setup/local-setup-with-kind.md +++ b/docs/content/setup/local-setup-with-kind.md @@ -27,7 +27,7 @@ To install `kubectl-bind` plugin, please download the archive for your platform > sudo sysctl fs.inotify.max_user_instances=512 > ``` > -> See https://kind.sigs.k8s.io/docs/user/known-issues/#pod-errors-due-to-too-many-open-files for more details. +> See the [kind documentation](https://kind.sigs.k8s.io/docs/user/known-issues/#pod-errors-due-to-too-many-open-files) for more details. ## Provider cluster