Skip to content

Commit ab67112

Browse files
authored
Some nits and pieces (#338)
* Remove Go version check Signed-off-by: Nelo-T. Wallus <red.brush9525@fastmail.com> Signed-off-by: Nelo-T. Wallus <n.wallus@sap.com> * Remove redundant dex config Signed-off-by: Nelo-T. Wallus <red.brush9525@fastmail.com> Signed-off-by: Nelo-T. Wallus <n.wallus@sap.com> * Update go.mod Signed-off-by: Nelo-T. Wallus <red.brush9525@fastmail.com> Signed-off-by: Nelo-T. Wallus <n.wallus@sap.com> * Fix host argument to log entry Signed-off-by: Nelo-T. Wallus <red.brush9525@fastmail.com> Signed-off-by: Nelo-T. Wallus <n.wallus@sap.com> * Use require instead of panicking Signed-off-by: Nelo-T. Wallus <red.brush9525@fastmail.com> Signed-off-by: Nelo-T. Wallus <n.wallus@sap.com> --------- Signed-off-by: Nelo-T. Wallus <red.brush9525@fastmail.com> Signed-off-by: Nelo-T. Wallus <n.wallus@sap.com>
1 parent ceb9e1c commit ab67112

5 files changed

Lines changed: 7 additions & 166 deletions

File tree

cli/pkg/kubectl/bind-apiservice/plugin/konnector.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ func (b *BindAPIServiceOptions) deployKonnector(ctx context.Context, config *res
119119
return true, nil
120120
}
121121

122-
logger.V(2).Info("Waiting for APIServiceBindings to be served", "error", err, "host", bindClient.RESTClient())
122+
logger.V(2).Info("Waiting for APIServiceBindings to be served", "error", err, "host", config.Host)
123123
if first {
124124
fmt.Fprint(b.Options.IOStreams.ErrOut, " Waiting for the konnector to be ready")
125125
first = false

contrib/kcp/dex-config-dev.yaml

Lines changed: 0 additions & 149 deletions
This file was deleted.

contrib/kcp/go.mod

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ module github.com/kube-bind/kube-bind/contrib/kcp
22

33
go 1.24.0
44

5-
replace github.com/kube-bind/kube-bind => ../../
6-
7-
replace github.com/kube-bind/kube-bind/sdk => ../../sdk
8-
9-
replace github.com/kube-bind/kube-bind/cli => ../../cli
5+
replace (
6+
github.com/kube-bind/kube-bind => ../../
7+
github.com/kube-bind/kube-bind/cli => ../../cli
8+
github.com/kube-bind/kube-bind/sdk => ../../sdk
9+
)
1010

1111
require (
1212
github.com/kcp-dev/client-go v0.0.0-20250728134101-0355faa9361b
@@ -145,7 +145,3 @@ replace (
145145
k8s.io/sample-cli-plugin => github.com/kcp-dev/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250816165010-ffe1d7c8649b
146146
k8s.io/sample-controller => github.com/kcp-dev/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250816165010-ffe1d7c8649b
147147
)
148-
149-
replace sigs.k8s.io/multicluster-runtime => github.com/mjudeikis/sigs-multicluster-runtime v0.0.0-20250818101434-d8ebc45e169b
150-
151-
replace github.com/kcp-dev/multicluster-provider => github.com/mjudeikis/kcp-multicluster-provider v0.0.0-20250818102159-3d31cbb06ebe

hack/verify-go-versions.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,3 @@ VERSION=$(grep "go 1." go.mod | sed 's/go //' | sed 's/.0$//')
2222
grep "FROM golang:" Dockerfile | { ! grep -v "${VERSION}"; } || { echo "Wrong go version in Dockerfile, expected ${VERSION}"; exit 1; }
2323
grep "go-version:" .github/workflows/*.yaml | { ! grep -v "go-version: v${VERSION}"; } || { echo "Wrong go version in .github/workflows/*.yaml, expected ${VERSION}"; exit 1; }
2424
grep "golang:" .ko.yaml | { ! grep -v "golang:${VERSION}"; } || { echo "Wrong go version in .ko.yaml, expected ${VERSION}"; exit 1; }
25-
# Note CONTRIBUTING.md isn't copied in the Dockerfile
26-
if [ -z "${IGNORE_GO_VERSION}" ]; then
27-
go version | { ! grep -v go${VERSION}; } || { echo "Unexpected go version installed, expected ${VERSION}. Use IGNORE_GO_VERSION=1 to skip this check."; exit 1; }
28-
fi

test/e2e/framework/backend.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,7 @@ import (
4242

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

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

0 commit comments

Comments
 (0)