Skip to content

Some nits and pieces #338

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mjudeikis merged 5 commits into from
Oct 3, 2025
Merged

Some nits and pieces #338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1845238
Remove Go version check
ntnn Sep 17, 2025
c63ce85
Remove redundant dex config
ntnn Oct 1, 2025
841d857
Update go.mod
ntnn Oct 1, 2025
1d430bf
Fix host argument to log entry
ntnn Oct 2, 2025
7136870
Use require instead of panicking
ntnn Oct 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cli/pkg/kubectl/bind-apiservice/plugin/konnector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ func (b *BindAPIServiceOptions) deployKonnector(ctx context.Context, config *res
return true, nil
}

logger.V(2).Info("Waiting for APIServiceBindings to be served", "error", err, "host", bindClient.RESTClient())
logger.V(2).Info("Waiting for APIServiceBindings to be served", "error", err, "host", config.Host)
if first {
fmt.Fprint(b.Options.IOStreams.ErrOut, " Waiting for the konnector to be ready")
first = false
Expand Down
149 changes: 0 additions & 149 deletions contrib/kcp/dex-config-dev.yaml
View file
Open in desktop

This file was deleted.

14 changes: 5 additions & 9 deletions contrib/kcp/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ module github.com/kube-bind/kube-bind/kcp

go 1.24.0

replace github.com/kube-bind/kube-bind => ../../

replace github.com/kube-bind/kube-bind/sdk => ../../sdk

replace github.com/kube-bind/kube-bind/cli => ../../cli
replace (
github.com/kube-bind/kube-bind => ../../
github.com/kube-bind/kube-bind/cli => ../../cli
github.com/kube-bind/kube-bind/sdk => ../../sdk
)

require (
github.com/kcp-dev/client-go v0.0.0-20250728134101-0355faa9361b
Expand Down Expand Up @@ -145,7 +145,3 @@ replace (
k8s.io/sample-cli-plugin => github.com/kcp-dev/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250816165010-ffe1d7c8649b
k8s.io/sample-controller => github.com/kcp-dev/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250816165010-ffe1d7c8649b
)

replace sigs.k8s.io/multicluster-runtime => github.com/mjudeikis/sigs-multicluster-runtime v0.0.0-20250818101434-d8ebc45e169b

replace github.com/kcp-dev/multicluster-provider => github.com/mjudeikis/kcp-multicluster-provider v0.0.0-20250818102159-3d31cbb06ebe
4 changes: 0 additions & 4 deletions hack/verify-go-versions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,3 @@ VERSION=$(grep "go 1." go.mod | sed 's/go //' | sed 's/.0$//')
grep "FROM golang:" Dockerfile | { ! grep -v "${VERSION}"; } || { echo "Wrong go version in Dockerfile, expected ${VERSION}"; exit 1; }
grep "go-version:" .github/workflows/*.yaml | { ! grep -v "go-version: v${VERSION}"; } || { echo "Wrong go version in .github/workflows/*.yaml, expected ${VERSION}"; exit 1; }
grep "golang:" .ko.yaml | { ! grep -v "golang:${VERSION}"; } || { echo "Wrong go version in .ko.yaml, expected ${VERSION}"; exit 1; }
# Note CONTRIBUTING.md isn't copied in the Dockerfile
if [ -z "${IGNORE_GO_VERSION}" ]; then

@cnvergence cnvergence Oct 2, 2025

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🙂

go version | { ! grep -v go${VERSION}; } || { echo "Unexpected go version installed, expected ${VERSION}. Use IGNORE_GO_VERSION=1 to skip this check."; exit 1; }
fi
4 changes: 1 addition & 3 deletions test/e2e/framework/backend.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,7 @@ import (

func StartBackend(t *testing.T, clientConfig *rest.Config, args ...string) (net.Addr, *backend.Server) {
signingKey := securecookie.GenerateRandomKey(32)
if len(signingKey) == 0 {
panic("error creating signing key")
}
require.NotEmpty(t, signingKey, "error creating signing key")

return StartBackendWithoutDefaultArgs(t, clientConfig, append([]string{
"--oidc-issuer-client-secret=ZXhhbXBsZS1hcHAtc2VjcmV0",
Expand Down