Skip to content

Commit 1b50cf7

Browse files
kcp-ci-botkcp-ci-bot
authored
Merge pull request #3694 from xmudrii/stage-sdk
Move SDK into a staging repository
2 parents fa4e118 + dd01efe commit 1b50cf7

File tree

790 files changed

+2509
-2337
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

790 files changed

+2509
-2337
lines changed

‎.prow.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ presubmits:
9898
- name: pull-kcp-test-integration
9999
decorate: true
100100
# only run integration tests if code changed.
101-
run_if_changed: "(cmd|config|pkg|sdk|test|go.mod|go.sum|Makefile|.prow.yaml)"
101+
run_if_changed: "(cmd|config|pkg|staging|test|go.mod|go.sum|Makefile|.prow.yaml)"
102102
clone_uri: "https://github.com/kcp-dev/kcp"
103103
labels:
104104
preset-goproxy: "true"
@@ -125,7 +125,7 @@ presubmits:
125125
- name: pull-kcp-test-e2e
126126
decorate: true
127127
# only run e2e tests if code changed.
128-
run_if_changed: "(cmd|config|pkg|sdk|test|go.mod|go.sum|Makefile|.prow.yaml)"
128+
run_if_changed: "(cmd|config|pkg|staging|test|go.mod|go.sum|Makefile|.prow.yaml)"
129129
clone_uri: "https://github.com/kcp-dev/kcp"
130130
labels:
131131
preset-goproxy: "true"
@@ -154,7 +154,7 @@ presubmits:
154154
- name: pull-kcp-test-e2e-multiple-runs
155155
decorate: true
156156
# only run e2e tests if code changed.
157-
run_if_changed: "(cmd|config|pkg|sdk|test|go.mod|go.sum|Makefile|.prow.yaml)"
157+
run_if_changed: "(cmd|config|pkg|staging|test|go.mod|go.sum|Makefile|.prow.yaml)"
158158
clone_uri: "https://github.com/kcp-dev/kcp"
159159
labels:
160160
preset-goproxy: "true"
@@ -187,7 +187,7 @@ presubmits:
187187
- name: pull-kcp-test-e2e-shared
188188
decorate: true
189189
# only run e2e tests if code changed.
190-
run_if_changed: "(cmd|config|pkg|sdk|test|go.mod|go.sum|Makefile|.prow.yaml)"
190+
run_if_changed: "(cmd|config|pkg|staging|test|go.mod|go.sum|Makefile|.prow.yaml)"
191191
clone_uri: "https://github.com/kcp-dev/kcp"
192192
labels:
193193
preset-goproxy: "true"
@@ -216,7 +216,7 @@ presubmits:
216216
- name: pull-kcp-test-e2e-sharded
217217
decorate: true
218218
# only run e2e tests if code changed.
219-
run_if_changed: "(cmd|config|pkg|sdk|test|go.mod|go.sum|Makefile|.prow.yaml)"
219+
run_if_changed: "(cmd|config|pkg|staging|test|go.mod|go.sum|Makefile|.prow.yaml)"
220220
clone_uri: "https://github.com/kcp-dev/kcp"
221221
labels:
222222
preset-goproxy: "true"

‎.typos.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ extend-ignore-identifiers-re = [
1818
extend-exclude = [
1919
"config/crds",
2020
"contrib/crds",
21-
"sdk/apis/third_party",
22-
"sdk/testing/third_party",
21+
"staging/src/github.com/kcp-dev/sdk/apis/third_party",
22+
"staging/src/github.com/kcp-dev/sdk/testing/third_party",
2323
]

‎Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ ENV GOPROXY=$goproxy
2828
# Copy the Go Modules manifests
2929
COPY go.mod go.mod
3030
COPY go.sum go.sum
31-
COPY sdk/go.mod sdk/go.mod
32-
COPY sdk/go.sum sdk/go.sum
3331
COPY cli/go.mod cli/go.mod
3432
COPY cli/go.sum cli/go.sum
3533
COPY staging/src/github.com/kcp-dev/apimachinery/go.mod staging/src/github.com/kcp-dev/apimachinery/go.mod
@@ -38,6 +36,8 @@ COPY staging/src/github.com/kcp-dev/client-go/go.mod staging/src/github.com/kcp-
3836
COPY staging/src/github.com/kcp-dev/client-go/go.sum staging/src/github.com/kcp-dev/client-go/go.sum
3937
COPY staging/src/github.com/kcp-dev/code-generator/go.mod staging/src/github.com/kcp-dev/code-generator/go.mod
4038
COPY staging/src/github.com/kcp-dev/code-generator/go.sum staging/src/github.com/kcp-dev/code-generator/go.sum
39+
COPY staging/src/github.com/kcp-dev/sdk/go.mod staging/src/github.com/kcp-dev/sdk/go.mod
40+
COPY staging/src/github.com/kcp-dev/sdk/go.sum staging/src/github.com/kcp-dev/sdk/go.sum
4141
USER 0
4242

4343
# Install kubectl.

‎Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ ldflags:
106106
require-%:
107107
@if ! command -v $* 1> /dev/null 2>&1; then echo "$* not found in ${PATH}"; exit 1; fi
108108

109-
build: WHAT ?= ./cmd/... ./cli/cmd/... ./sdk/cmd/...
109+
build: WHAT ?= ./cmd/... ./cli/cmd/... ./staging/src/github.com/kcp-dev/sdk/cmd/...
110110
build: require-jq require-go require-git verify-go-versions ## Build the project
111111
set -x; for W in $(WHAT); do \
112112
pushd . && cd $${W%..}; \
@@ -119,7 +119,7 @@ build: require-jq require-go require-git verify-go-versions ## Build the project
119119
build-all:
120120
GOOS=$(OS) GOARCH=$(ARCH) $(MAKE) build WHAT='./cmd/...'
121121

122-
install: WHAT ?= ./cmd/... ./cli/cmd/... ./sdk/cmd/...
122+
install: WHAT ?= ./cmd/... ./cli/cmd/... ./staging/src/github.com/kcp-dev/sdk/cmd/...
123123
install: require-jq require-go require-git verify-go-versions ## Install the project
124124
set -x; for W in $(WHAT); do \
125125
pushd . && cd $${W%..}; \
@@ -138,7 +138,7 @@ $(LOGCHECK):
138138
GOBIN=$(TOOLS_GOBIN_DIR) $(GO_INSTALL) sigs.k8s.io/logtools/logcheck $(LOGCHECK_BIN) $(LOGCHECK_VER)
139139

140140
$(KCP_APIGEN_GEN):
141-
pushd . && cd sdk && GOBIN=$(TOOLS_GOBIN_DIR) go install ./cmd/apigen && popd
141+
pushd . && cd staging/src/github.com/kcp-dev/sdk && GOBIN=$(TOOLS_GOBIN_DIR) go install ./cmd/apigen && popd
142142

143143
lint: $(GOLANGCI_LINT) $(LOGCHECK) ## Verify lint
144144
echo "Linting root module..."; \

‎cli/cmd/kubectl-kcp/cmd/kubectlKcp.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,12 @@ import (
2727
"k8s.io/component-base/version"
2828
"k8s.io/klog/v2"
2929

30+
"github.com/kcp-dev/sdk/cmd/help"
31+
3032
bindcmd "github.com/kcp-dev/kcp/cli/pkg/bind/cmd"
3133
claimscmd "github.com/kcp-dev/kcp/cli/pkg/claims/cmd"
3234
crdcmd "github.com/kcp-dev/kcp/cli/pkg/crd/cmd"
3335
workspacecmd "github.com/kcp-dev/kcp/cli/pkg/workspace/cmd"
34-
"github.com/kcp-dev/kcp/sdk/cmd/help"
3536
)
3637

3738
func KubectlKcpCommand() *cobra.Command {

‎cli/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ require (
77
github.com/charmbracelet/lipgloss v1.1.0
88
github.com/google/go-cmp v0.7.0
99
github.com/kcp-dev/client-go v0.0.0-20250728134101-0355faa9361b
10-
github.com/kcp-dev/kcp/sdk v0.0.0-00010101000000-000000000000
10+
github.com/kcp-dev/sdk v0.0.0-00010101000000-000000000000
1111
github.com/kcp-dev/logicalcluster/v3 v3.0.5
1212
github.com/spf13/cobra v1.9.1
1313
github.com/spf13/pflag v1.0.6
@@ -98,5 +98,5 @@ replace (
9898
github.com/charmbracelet/colorprofile => github.com/charmbracelet/colorprofile v0.2.2
9999
github.com/charmbracelet/x/ansi => github.com/charmbracelet/x/ansi v0.8.0
100100
github.com/kcp-dev/client-go => ../staging/src/github.com/kcp-dev/client-go
101-
github.com/kcp-dev/kcp/sdk => ../sdk
101+
github.com/kcp-dev/sdk => ../staging/src/github.com/kcp-dev/sdk
102102
)

‎cli/pkg/bind/plugin/bind.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,14 @@ import (
3333
"k8s.io/client-go/rest"
3434

3535
"github.com/kcp-dev/logicalcluster/v3"
36+
"github.com/kcp-dev/sdk/apis/apis"
37+
apisv1alpha1 "github.com/kcp-dev/sdk/apis/apis/v1alpha1"
38+
apisv1alpha2 "github.com/kcp-dev/sdk/apis/apis/v1alpha2"
39+
kcpclientset "github.com/kcp-dev/sdk/client/clientset/versioned/cluster"
3640

3741
"github.com/kcp-dev/kcp/cli/pkg/base"
3842
pluginhelpers "github.com/kcp-dev/kcp/cli/pkg/helpers"
3943
apishelpers "github.com/kcp-dev/kcp/cli/pkg/helpers/apis/apis"
40-
"github.com/kcp-dev/kcp/sdk/apis/apis"
41-
apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1"
42-
apisv1alpha2 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha2"
43-
kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster"
4444
)
4545

4646
// BindOptions contains the options for creating an APIBinding.

‎cli/pkg/claims/plugin/claims.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,12 @@ import (
2929
"k8s.io/client-go/rest"
3030
"k8s.io/client-go/tools/clientcmd"
3131

32+
"github.com/kcp-dev/sdk/apis/apis"
33+
kcpclientset "github.com/kcp-dev/sdk/client/clientset/versioned/cluster"
34+
3235
"github.com/kcp-dev/kcp/cli/pkg/base"
3336
pluginhelpers "github.com/kcp-dev/kcp/cli/pkg/helpers"
3437
apishelpers "github.com/kcp-dev/kcp/cli/pkg/helpers/apis/apis"
35-
"github.com/kcp-dev/kcp/sdk/apis/apis"
36-
kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster"
3738
)
3839

3940
// GetAPIBindingOptions contains the options for fetching claims

‎cli/pkg/crd/plugin/snapshot.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,9 @@ import (
3333
kubeyaml "k8s.io/apimachinery/pkg/util/yaml"
3434
"k8s.io/cli-runtime/pkg/genericclioptions"
3535

36+
apisv1alpha1 "github.com/kcp-dev/sdk/apis/apis/v1alpha1"
37+
3638
"github.com/kcp-dev/kcp/cli/pkg/base"
37-
apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1"
3839
)
3940

4041
// SnapshotOptions contains options for the snapshot command.

‎cli/pkg/helpers/apis/apis/apibinding.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ import (
2121
"fmt"
2222
"io"
2323

24-
apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1"
25-
apisv1alpha2 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha2"
26-
kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned"
24+
apisv1alpha1 "github.com/kcp-dev/sdk/apis/apis/v1alpha1"
25+
apisv1alpha2 "github.com/kcp-dev/sdk/apis/apis/v1alpha2"
26+
kcpclientset "github.com/kcp-dev/sdk/client/clientset/versioned"
2727
)
2828

2929
type APIBinding interface {

0 commit comments

Comments
 (0)