Update scripts with new sdk path

On-behalf-of: @SAP [email protected]
Signed-off-by: Marko Mudrinić <[email protected]>

Author: xmudrii

.prow.yaml

@@ -98,7 +98,7 @@ presubmits:
   - name: pull-kcp-test-integration
     decorate: true
     # only run integration tests if code changed.
-    run_if_changed: "(cmd|config|pkg|sdk|test|go.mod|go.sum|Makefile|.prow.yaml)"
+    run_if_changed: "(cmd|config|pkg|staging|test|go.mod|go.sum|Makefile|.prow.yaml)"
     clone_uri: "https://github.com/kcp-dev/kcp"
     labels:
       preset-goproxy: "true"
@@ -125,7 +125,7 @@ presubmits:
   - name: pull-kcp-test-e2e
     decorate: true
     # only run e2e tests if code changed.
-    run_if_changed: "(cmd|config|pkg|sdk|test|go.mod|go.sum|Makefile|.prow.yaml)"
+    run_if_changed: "(cmd|config|pkg|staging|test|go.mod|go.sum|Makefile|.prow.yaml)"
     clone_uri: "https://github.com/kcp-dev/kcp"
     labels:
       preset-goproxy: "true"
@@ -154,7 +154,7 @@ presubmits:
   - name: pull-kcp-test-e2e-multiple-runs
     decorate: true
     # only run e2e tests if code changed.
-    run_if_changed: "(cmd|config|pkg|sdk|test|go.mod|go.sum|Makefile|.prow.yaml)"
+    run_if_changed: "(cmd|config|pkg|staging|test|go.mod|go.sum|Makefile|.prow.yaml)"
     clone_uri: "https://github.com/kcp-dev/kcp"
     labels:
       preset-goproxy: "true"
@@ -187,7 +187,7 @@ presubmits:
   - name: pull-kcp-test-e2e-shared
     decorate: true
     # only run e2e tests if code changed.
-    run_if_changed: "(cmd|config|pkg|sdk|test|go.mod|go.sum|Makefile|.prow.yaml)"
+    run_if_changed: "(cmd|config|pkg|staging|test|go.mod|go.sum|Makefile|.prow.yaml)"
     clone_uri: "https://github.com/kcp-dev/kcp"
     labels:
       preset-goproxy: "true"
@@ -216,7 +216,7 @@ presubmits:
   - name: pull-kcp-test-e2e-sharded
     decorate: true
     # only run e2e tests if code changed.
-    run_if_changed: "(cmd|config|pkg|sdk|test|go.mod|go.sum|Makefile|.prow.yaml)"
+    run_if_changed: "(cmd|config|pkg|staging|test|go.mod|go.sum|Makefile|.prow.yaml)"
     clone_uri: "https://github.com/kcp-dev/kcp"
     labels:
       preset-goproxy: "true"

.typos.toml

@@ -18,6 +18,6 @@ extend-ignore-identifiers-re = [
 extend-exclude = [
    "config/crds",
    "contrib/crds",
-   "sdk/apis/third_party",
-   "sdk/testing/third_party",
+   "staging/src/github.com/kcp-dev/sdk/apis/third_party",
+   "staging/src/github.com/kcp-dev/sdk/testing/third_party",
 ]

Dockerfile

@@ -28,8 +28,6 @@ ENV GOPROXY=$goproxy
 # Copy the Go Modules manifests
 COPY go.mod go.mod
 COPY go.sum go.sum
-COPY sdk/go.mod sdk/go.mod
-COPY sdk/go.sum sdk/go.sum
 COPY cli/go.mod cli/go.mod
 COPY cli/go.sum cli/go.sum
 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-
 COPY staging/src/github.com/kcp-dev/client-go/go.sum staging/src/github.com/kcp-dev/client-go/go.sum
 COPY staging/src/github.com/kcp-dev/code-generator/go.mod staging/src/github.com/kcp-dev/code-generator/go.mod
 COPY staging/src/github.com/kcp-dev/code-generator/go.sum staging/src/github.com/kcp-dev/code-generator/go.sum
+COPY staging/src/github.com/kcp-dev/sdk/go.mod staging/src/github.com/kcp-dev/sdk/go.mod
+COPY staging/src/github.com/kcp-dev/sdk/go.sum staging/src/github.com/kcp-dev/sdk/go.sum
 USER 0
 
 # Install kubectl.

Makefile

@@ -106,7 +106,7 @@ ldflags:
 require-%:
 	@if ! command -v $* 1> /dev/null 2>&1; then echo "$* not found in ${PATH}"; exit 1; fi
 
-build: WHAT ?= ./cmd/... ./cli/cmd/... ./sdk/cmd/...
+build: WHAT ?= ./cmd/... ./cli/cmd/... ./staging/src/github.com/kcp-dev/sdk/cmd/...
 build: require-jq require-go require-git verify-go-versions ## Build the project
 	set -x; for W in $(WHAT); do \
 		pushd . && cd $${W%..}; \
@@ -119,7 +119,7 @@ build: require-jq require-go require-git verify-go-versions ## Build the project
 build-all:
 	GOOS=$(OS) GOARCH=$(ARCH) $(MAKE) build WHAT='./cmd/...'
 
-install: WHAT ?= ./cmd/... ./cli/cmd/... ./sdk/cmd/...
+install: WHAT ?= ./cmd/... ./cli/cmd/... ./staging/src/github.com/kcp-dev/sdk/cmd/...
 install: require-jq require-go require-git verify-go-versions ## Install the project
 	set -x; for W in $(WHAT); do \
 		pushd . && cd $${W%..}; \
@@ -138,7 +138,7 @@ $(LOGCHECK):
 	GOBIN=$(TOOLS_GOBIN_DIR) $(GO_INSTALL) sigs.k8s.io/logtools/logcheck $(LOGCHECK_BIN) $(LOGCHECK_VER)
 
 $(KCP_APIGEN_GEN):
-	pushd . && cd sdk && GOBIN=$(TOOLS_GOBIN_DIR) go install ./cmd/apigen && popd
+	pushd . && cd staging/src/github.com/kcp-dev/sdk && GOBIN=$(TOOLS_GOBIN_DIR) go install ./cmd/apigen && popd
 
 lint: $(GOLANGCI_LINT) $(LOGCHECK) ## Verify lint
 	echo "Linting root module..."; \

hack/update-codegen-clients.sh

@@ -25,6 +25,7 @@ SCRIPT_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
 pushd "${SCRIPT_ROOT}"
 BOILERPLATE_HEADER="$( pwd )/hack/boilerplate/boilerplate.generatego.txt"
 popd
+SDK_PKG=${SDK_PKG:-$(cd "${SCRIPT_ROOT}"; go list -f '{{.Dir}}' -m github.com/kcp-dev/sdk)}
 CODEGEN_PKG=${CODEGEN_PKG:-$(cd "${SCRIPT_ROOT}"; go list -f '{{.Dir}}' -m k8s.io/code-generator)}
 CLUSTER_CODEGEN_PKG=${CLUSTER_CODEGEN_PKG:-$(cd "${SCRIPT_ROOT}"; go list -f '{{.Dir}}' -m github.com/kcp-dev/code-generator/v3)}
 OPENAPI_PKG=${OPENAPI_PKG:-$(cd "${SCRIPT_ROOT}"; go list -f '{{.Dir}}' -m k8s.io/kube-openapi)}
@@ -39,54 +40,54 @@ chmod +x "${CODEGEN_PKG}"/generate-internal-groups.sh
 source "${CODEGEN_PKG}/kube_codegen.sh"
 source "${CLUSTER_CODEGEN_PKG}/cluster_codegen.sh"
 
-rm -rf ${SCRIPT_ROOT}/sdk/client/{clientset,applyconfiguration,listers,informers}
-mkdir -p ${SCRIPT_ROOT}/sdk/client/{clientset,applyconfiguration,listers,informers}
+rm -rf ${SDK_PKG}/client/{clientset,applyconfiguration,listers,informers}
+mkdir -p ${SDK_PKG}/client/{clientset,applyconfiguration,listers,informers}
 
 "$GOPATH"/bin/applyconfiguration-gen \
   --go-header-file "${BOILERPLATE_HEADER}" \
-  --output-pkg github.com/kcp-dev/kcp/sdk/client/applyconfiguration \
-  --output-dir "${SCRIPT_ROOT}/sdk/client/applyconfiguration" \
-  github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1 \
-  github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1 \
-  github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1 \
-  github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha2 \
-  github.com/kcp-dev/kcp/sdk/apis/cache/v1alpha1 \
-  github.com/kcp-dev/kcp/sdk/apis/topology/v1alpha1 \
-  github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1 \
+  --output-pkg github.com/kcp-dev/sdk/client/applyconfiguration \
+  --output-dir "${SDK_PKG}/client/applyconfiguration" \
+  github.com/kcp-dev/sdk/apis/core/v1alpha1 \
+  github.com/kcp-dev/sdk/apis/tenancy/v1alpha1 \
+  github.com/kcp-dev/sdk/apis/apis/v1alpha1 \
+  github.com/kcp-dev/sdk/apis/apis/v1alpha2 \
+  github.com/kcp-dev/sdk/apis/cache/v1alpha1 \
+  github.com/kcp-dev/sdk/apis/topology/v1alpha1 \
+  github.com/kcp-dev/sdk/apis/third_party/conditions/apis/conditions/v1alpha1 \
   k8s.io/apimachinery/pkg/apis/meta/v1 \
   k8s.io/apimachinery/pkg/runtime \
   k8s.io/apimachinery/pkg/version
 
 "$GOPATH"/bin/client-gen \
   --go-header-file "${BOILERPLATE_HEADER}" \
-  --output-pkg github.com/kcp-dev/kcp/sdk/client/clientset \
-  --output-dir "${SCRIPT_ROOT}/sdk/client/clientset" \
-  --input github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1 \
-  --input github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1 \
-  --input github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1 \
-  --input github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha2 \
-  --input github.com/kcp-dev/kcp/sdk/apis/topology/v1alpha1 \
-  --input github.com/kcp-dev/kcp/sdk/apis/cache/v1alpha1 \
+  --output-pkg github.com/kcp-dev/sdk/client/clientset \
+  --output-dir "${SDK_PKG}/client/clientset" \
+  --input github.com/kcp-dev/sdk/apis/core/v1alpha1 \
+  --input github.com/kcp-dev/sdk/apis/tenancy/v1alpha1 \
+  --input github.com/kcp-dev/sdk/apis/apis/v1alpha1 \
+  --input github.com/kcp-dev/sdk/apis/apis/v1alpha2 \
+  --input github.com/kcp-dev/sdk/apis/topology/v1alpha1 \
+  --input github.com/kcp-dev/sdk/apis/cache/v1alpha1 \
   --input-base="" \
-  --apply-configuration-package=github.com/kcp-dev/kcp/sdk/client/applyconfiguration \
+  --apply-configuration-package=github.com/kcp-dev/sdk/client/applyconfiguration \
   --clientset-name "versioned"
 
 kube::codegen::gen_helpers \
   --boilerplate "${BOILERPLATE_HEADER}" \
-  ./sdk/apis
+  ./staging/src/github.com/kcp-dev/sdk/apis
 
-cd sdk
+cd ./staging/src/github.com/kcp-dev/sdk
 cluster::codegen::gen_client \
   --boilerplate "${BOILERPLATE_HEADER}" \
   --versioned-clientset-dir client/clientset/versioned/cluster \
-  --versioned-clientset-pkg github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster \
+  --versioned-clientset-pkg github.com/kcp-dev/sdk/client/clientset/versioned/cluster \
   --listers-dir client/listers \
-  --listers-pkg github.com/kcp-dev/kcp/sdk/client/listers \
+  --listers-pkg github.com/kcp-dev/sdk/client/listers \
   --informers-dir client/informers/externalversions \
-  --informers-pkg github.com/kcp-dev/kcp/sdk/client/informers/externalversions \
+  --informers-pkg github.com/kcp-dev/sdk/client/informers/externalversions \
   --with-watch \
-  --single-cluster-versioned-clientset-pkg github.com/kcp-dev/kcp/sdk/client/clientset/versioned \
-  --single-cluster-applyconfigurations-pkg github.com/kcp-dev/kcp/sdk/client/applyconfiguration \
+  --single-cluster-versioned-clientset-pkg github.com/kcp-dev/sdk/client/clientset/versioned \
+  --single-cluster-applyconfigurations-pkg github.com/kcp-dev/sdk/client/applyconfiguration \
   apis
 cd -
 
@@ -108,7 +109,7 @@ cd -
 
 kube::codegen::gen_helpers \
   --boilerplate "${BOILERPLATE_HEADER}" \
-  ./sdk/third_party/conditions/apis
+  ./staging/src/github.com/kcp-dev/sdk/third_party/conditions/apis
 
 kube::codegen::gen_helpers \
   --boilerplate "${BOILERPLATE_HEADER}" \
@@ -136,13 +137,13 @@ go install "${OPENAPI_PKG}"/cmd/openapi-gen
   --output-pkg github.com/kcp-dev/kcp/pkg/openapi \
   --output-file zz_generated.openapi.go \
   --output-dir "${SCRIPT_ROOT}/pkg/openapi" \
-  github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1 \
-  github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1 \
-  github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1 \
-  github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha2 \
-  github.com/kcp-dev/kcp/sdk/apis/topology/v1alpha1 \
-  github.com/kcp-dev/kcp/sdk/apis/cache/v1alpha1 \
-  github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1 \
+  github.com/kcp-dev/sdk/apis/core/v1alpha1 \
+  github.com/kcp-dev/sdk/apis/tenancy/v1alpha1 \
+  github.com/kcp-dev/sdk/apis/apis/v1alpha1 \
+  github.com/kcp-dev/sdk/apis/apis/v1alpha2 \
+  github.com/kcp-dev/sdk/apis/topology/v1alpha1 \
+  github.com/kcp-dev/sdk/apis/cache/v1alpha1 \
+  github.com/kcp-dev/sdk/apis/third_party/conditions/apis/conditions/v1alpha1 \
   k8s.io/apimachinery/pkg/apis/meta/v1 \
   k8s.io/apimachinery/pkg/runtime \
   k8s.io/apimachinery/pkg/version

hack/update-codegen-crds.sh

@@ -28,8 +28,8 @@ REPO_ROOT=$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)
 
 # Update generated CRD YAML
 (
-    cd "${REPO_ROOT}/sdk/apis"
-    "../../${CONTROLLER_GEN}" \
+    cd "${REPO_ROOT}/staging/src/github.com/kcp-dev/sdk/apis"
+    "../../../../../../${CONTROLLER_GEN}" \
         crd \
         rbac:roleName=manager-role \
         webhook \

hack/verify-contextual-logging.sh

@@ -31,8 +31,8 @@ ${LOGCHECK} ${LOGCHECK_ARGS} ./... > "${work_file}" 2>&1
 set -o errexit
 
 # sdk is a separate module, so check that in addition to our root packages
-echo "Checking "${REPO_ROOT}"/sdk"
-cd "${REPO_ROOT}"/sdk
+echo "Checking "${REPO_ROOT}"/staging/src/github.com/kcp-dev/sdk"
+cd "${REPO_ROOT}"/staging/src/github.com/kcp-dev/sdk
 set +o errexit
 ${LOGCHECK} ${LOGCHECK_ARGS} ./... >> "${work_file}" 2>&1
 set -o errexit