Skip to content

Commit

Permalink
Rename k8s.io/test-infra module to sigs.k8s.io/prow.
Browse files Browse the repository at this point in the history
  • Loading branch information
cjwagner committed Mar 22, 2024
1 parent d171581 commit 1a1a231
Show file tree
Hide file tree
Showing 20 changed files with 170 additions and 170 deletions.
230 changes: 115 additions & 115 deletions .ko.yaml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion go.mod
Expand Up @@ -62,7 +62,7 @@ require (
k8s.io/api v0.25.9
k8s.io/apimachinery v0.26.5
k8s.io/client-go v0.25.9
k8s.io/test-infra v0.0.0-20240130214201-267f128331b5
sigs.k8s.io/prow v0.0.0-20240130214201-267f128331b5
k8s.io/utils v0.0.0-20230209194617-a36077c30491
knative.dev/pkg v0.0.0-20230221145627-8efb3485adcf
sigs.k8s.io/controller-runtime v0.12.3
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Expand Up @@ -1161,8 +1161,8 @@ k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6/go.mod h1:UuqjUnNftUyPE5H64/qeyjQoUZhGpeFDVdxjTeEVN2o=
k8s.io/kube-openapi v0.0.0-20230308215209-15aac26d736a h1:gmovKNur38vgoWfGtP5QOGNOA7ki4n6qNYoFAgMlNvg=
k8s.io/kube-openapi v0.0.0-20230308215209-15aac26d736a/go.mod h1:y5VtZWM9sHHc2ZodIH/6SHzXj+TPU5USoA8lcIeKEKY=
k8s.io/test-infra v0.0.0-20240130214201-267f128331b5 h1:AfUZ+9L3ag9Z4eWoaQN1bWq7cseCzCk3jhBr+Tcmt2I=
k8s.io/test-infra v0.0.0-20240130214201-267f128331b5/go.mod h1:2eoHxXPfRvETWWaYJlV3fqdDJq6PGdr2Ia2nyhmLu4I=
sigs.k8s.io/prow v0.0.0-20240130214201-267f128331b5 h1:AfUZ+9L3ag9Z4eWoaQN1bWq7cseCzCk3jhBr+Tcmt2I=
sigs.k8s.io/prow v0.0.0-20240130214201-267f128331b5/go.mod h1:2eoHxXPfRvETWWaYJlV3fqdDJq6PGdr2Ia2nyhmLu4I=
k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPBjNSSOMowRZxxsY=
k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
knative.dev/pkg v0.0.0-20230221145627-8efb3485adcf h1:TwvZFDpkyqpK2OCAwvNGV2Zjk14FzIh8X8Ci/du3jYI=
Expand Down
6 changes: 3 additions & 3 deletions hack/gen-prow-documented/main.go
Expand Up @@ -24,9 +24,9 @@ import (
"path/filepath"

"github.com/sirupsen/logrus"
"k8s.io/test-infra/pkg/genyaml"
"k8s.io/test-infra/prow/config"
"k8s.io/test-infra/prow/plugins"
"sigs.k8s.io/prow/pkg/genyaml"
"sigs.k8s.io/prow/prow/config"
"sigs.k8s.io/prow/prow/plugins"
)

const (
Expand Down
36 changes: 18 additions & 18 deletions hack/make-rules/update/codegen.sh
Expand Up @@ -107,7 +107,7 @@ trap cleanup EXIT
ensure-in-gopath() {
FAKE_GOPATH=$(mktemp -d -t codegen.gopath.XXXX)

fake_repopath=$FAKE_GOPATH/src/k8s.io/test-infra
fake_repopath=$FAKE_GOPATH/src/sigs.k8s.io/prow
mkdir -p "$(dirname "$fake_repopath")"
if [[ -n "$do_clean" ]]; then
cp -LR "${REPO_ROOT}/" "$fake_repopath"
Expand All @@ -133,7 +133,7 @@ copyfiles() {
return 0
fi
(
cd "$GOPATH/src/k8s.io/test-infra/$path"
cd "$GOPATH/src/sigs.k8s.io/prow/$path"
find "." -name "$name" -exec cp {} "$REPO_ROOT/$path/{}" \;
)
}
Expand All @@ -159,14 +159,14 @@ gen-deepcopy() {
echo "Generating DeepCopy() methods..." >&2
"$deepcopygen" \
--go-header-file hack/boilerplate/boilerplate.generated.go.txt \
--input-dirs k8s.io/test-infra/prow/apis/prowjobs/v1 \
--input-dirs sigs.k8s.io/prow/prow/apis/prowjobs/v1 \
--output-file-base zz_generated.deepcopy \
--bounding-dirs k8s.io/test-infra/prow/apis
--bounding-dirs sigs.k8s.io/prow/prow/apis
copyfiles "prow/apis" "zz_generated.deepcopy.go"

"$deepcopygen" \
--go-header-file hack/boilerplate/boilerplate.generated.go.txt \
--input-dirs k8s.io/test-infra/prow/config \
--input-dirs sigs.k8s.io/prow/prow/config \
--output-file-base zz_generated.deepcopy
copyfiles "prow/config" "zz_generated.deepcopy.go"

Expand All @@ -179,8 +179,8 @@ gen-client() {
--go-header-file hack/boilerplate/boilerplate.generated.go.txt \
--clientset-name versioned \
--input-base "" \
--input k8s.io/test-infra/prow/apis/prowjobs/v1 \
--output-package k8s.io/test-infra/prow/client/clientset
--input sigs.k8s.io/prow/prow/apis/prowjobs/v1 \
--output-package sigs.k8s.io/prow/prow/client/clientset
copyfiles "./prow/client/clientset" "*.go"

clean prow/pipeline/clientset '*.go'
Expand All @@ -190,7 +190,7 @@ gen-client() {
--clientset-name versioned \
--input-base "" \
--input github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1 \
--output-package k8s.io/test-infra/prow/pipeline/clientset
--output-package sigs.k8s.io/prow/prow/pipeline/clientset
copyfiles "./prow/pipeline/clientset" "*.go"
}

Expand All @@ -199,16 +199,16 @@ gen-lister() {
echo "Generating lister..." >&2
"$listergen" \
--go-header-file hack/boilerplate/boilerplate.generated.go.txt \
--input-dirs k8s.io/test-infra/prow/apis/prowjobs/v1 \
--output-package k8s.io/test-infra/prow/client/listers
--input-dirs sigs.k8s.io/prow/prow/apis/prowjobs/v1 \
--output-package sigs.k8s.io/prow/prow/client/listers
copyfiles "./prow/client/listers" "*.go"

clean prow/pipeline/listers '*.go'
echo "Generating lister for pipeline..." >&2
"$listergen" \
--go-header-file hack/boilerplate/boilerplate.generated.go.txt \
--input-dirs github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1 \
--output-package k8s.io/test-infra/prow/pipeline/listers
--output-package sigs.k8s.io/prow/prow/pipeline/listers
copyfiles "./prow/pipeline/listers" "*.go"
}

Expand All @@ -217,20 +217,20 @@ gen-informer() {
echo "Generating informer..." >&2
"$informergen" \
--go-header-file hack/boilerplate/boilerplate.generated.go.txt \
--input-dirs k8s.io/test-infra/prow/apis/prowjobs/v1 \
--versioned-clientset-package k8s.io/test-infra/prow/client/clientset/versioned \
--listers-package k8s.io/test-infra/prow/client/listers \
--output-package k8s.io/test-infra/prow/client/informers
--input-dirs sigs.k8s.io/prow/prow/apis/prowjobs/v1 \
--versioned-clientset-package sigs.k8s.io/prow/prow/client/clientset/versioned \
--listers-package sigs.k8s.io/prow/prow/client/listers \
--output-package sigs.k8s.io/prow/prow/client/informers
copyfiles "./prow/client/informers" "*.go"

clean prow/pipeline/informers '*.go'
echo "Generating informer for pipeline..." >&2
"$informergen" \
--go-header-file hack/boilerplate/boilerplate.generated.go.txt \
--input-dirs github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1 \
--versioned-clientset-package k8s.io/test-infra/prow/pipeline/clientset/versioned \
--listers-package k8s.io/test-infra/prow/pipeline/listers \
--output-package k8s.io/test-infra/prow/pipeline/informers
--versioned-clientset-package sigs.k8s.io/prow/prow/pipeline/clientset/versioned \
--listers-package sigs.k8s.io/prow/prow/pipeline/listers \
--output-package sigs.k8s.io/prow/prow/pipeline/informers
copyfiles "./prow/pipeline/informers" "*.go"
}

Expand Down
4 changes: 2 additions & 2 deletions hack/scripts/sync-prow.sh
Expand Up @@ -61,7 +61,7 @@ git fetch old_prow
git merge old_prow/master --no-edit --allow-unrelated-histories --strategy-option theirs

# Rename go module paths
find . -type f -exec sed -i 's,k8s.io/test-infra,sigs.k8s.io/prow,g' {} \;
git commit -a -m "Rename k8s.io/test-infra module to sigs.k8s.io/prow."
find . -type f -exec sed -i 's,sigs.k8s.io/prow,sigs.k8s.io/prow,g' {} \;
git commit -a -m "Rename sigs.k8s.io/prow module to sigs.k8s.io/prow."

echo "Sync completed successfully! 'cd ${new_prow} && git push origin' when you're ready."
2 changes: 1 addition & 1 deletion site/content/en/docs/build-test-update.md
Expand Up @@ -167,7 +167,7 @@ go run ./config:mkpj --job=JOB_NAME

For your own prow instance:
```shell
go run k8s.io/test-infra/prow/cmd/mkpj --job=JOB_NAME --config-path=path/to/config.yaml
go run sigs.k8s.io/prow/prow/cmd/mkpj --job=JOB_NAME --config-path=path/to/config.yaml
```

Alternatively, if you have jobs defined in a separate `job-config`, you can
Expand Down
Expand Up @@ -43,7 +43,7 @@ We need to fulfil those requirements to use this tool:
to be used by this tool to push changes and create PRs against the remote repo.

* a yaml config file that specifies the follwing information passed in with the flag -config=FILEPATH:
* For info about what should go in the config look at [the documentation for the Options here](https://pkg.go.dev/k8s.io/test-infra/prow/cmd/generic-autobumper/bumper#Options) and look at the example below.
* For info about what should go in the config look at [the documentation for the Options here](https://pkg.go.dev/sigs.k8s.io/prow/prow/cmd/generic-autobumper/bumper#Options) and look at the example below.

e.g.,

Expand Down
4 changes: 2 additions & 2 deletions site/content/en/docs/components/cli-tools/phaino.md
Expand Up @@ -41,7 +41,7 @@ volumes that the Prow Job may require.
* `--timeout=10m` controls how long to allow jobs to run before interrupting them
* `--code-mount-path=/go` changes the path where code is mounted in the container
* `--skip-volume-mounts=volume1,volume2` includes the unwanted volume mounts that are defined in the job spec
* `--extra-volume-mounts=/go/src/k8s.io/test-infra=/Users/xyz/k8s-test-infra` includes the extra volume mounts needed for the container. Key is the mount path and value is the local path
* `--extra-volume-mounts=/go/src/sigs.k8s.io/prow=/Users/xyz/k8s-test-infra` includes the extra volume mounts needed for the container. Key is the mount path and value is the local path
* `--skip-envs=env1,env2` includes the unwanted env vars that are defined in the job spec
* `--extra-envs=env1=val1,env2=val2` includes the extra env vars needed for the container
* `--use-local-gcloud-credentials` controls whether to use the same gcloud credentials as local or not
Expand All @@ -56,7 +56,7 @@ it's desired to save the prompts, use the following tricks instead:

```
--code-mount-path==/whatever/go/src # Controls where source code is mounted in container
--extra-volume-mounts=/whatever/go/src/k8s.io/test-infra=/Users/xyz/k8s-test-infra
--extra-volume-mounts=/whatever/go/src/sigs.k8s.io/prow=/Users/xyz/k8s-test-infra
```

- If job requires mounting kubeconfig, assume the mount is named `kubeconfig`,use:
Expand Down
2 changes: 1 addition & 1 deletion site/content/en/docs/components/core/tide/config.md
Expand Up @@ -22,7 +22,7 @@ The following configuration fields are available:
* `merge_method`: A key/value pair of an `org/repo` as the key and merge method to override
the default method of merge as value. Valid options are `squash`, `rebase`, and `merge`.
Defaults to `merge`.
* `merge_commit_template`: A mapping from `org/repo` or `org` to a set of Go templates to use when creating the title and body of merge commits. Go templates are evaluated with a `PullRequest` (see [`PullRequest`](https://godoc.org/k8s.io/test-infra/prow/tide#PullRequest) type). This field and map keys are optional.
* `merge_commit_template`: A mapping from `org/repo` or `org` to a set of Go templates to use when creating the title and body of merge commits. Go templates are evaluated with a `PullRequest` (see [`PullRequest`](https://godoc.org/sigs.k8s.io/prow/prow/tide#PullRequest) type). This field and map keys are optional.
* `target_urls`: A mapping from "*", <org>, or <org/repo> to the URL for the tide status contexts. The most specific key that matches will be used.
* `pr_status_base_urls`: A mapping from "*", <org>, or <org/repo> to the base URL for the PR status page. If specified, this URL is used to construct
a link that will be used for the tide status context. It is mutually exclusive with the `target_urls` field.
Expand Down
Expand Up @@ -15,7 +15,7 @@ It ignores jobs that have no GCS buckets.
## Install

```shell
go get k8s.io/test-infra/prow/cmd/tot/fallbackcheck
go get sigs.k8s.io/prow/prow/cmd/tot/fallbackcheck
```

## Run
Expand Down
2 changes: 1 addition & 1 deletion site/content/en/docs/components/plugins/_index.md
Expand Up @@ -8,7 +8,7 @@ description: >
Plugins are sub-components of [`hook`](/docs/components/core/hook/) that consume [GitHub webhooks](https://developer.github.com/webhooks/) related to their function and can be individually enabled per repo or org.

All plugin specific configuration is stored in [`plugins.yaml`](https://github.com/kubernetes/test-infra/tree/master/config/prow/plugins.yaml).
The `Configuration` golang struct holds all the config fields organized into substructures by plugin. See its [GoDoc](https://godoc.org/k8s.io/test-infra/prow/plugins#Configuration) for up-to-date descriptions of every config option.
The `Configuration` golang struct holds all the config fields organized into substructures by plugin. See its [GoDoc](https://godoc.org/sigs.k8s.io/prow/prow/plugins#Configuration) for up-to-date descriptions of every config option.

## Help Information

Expand Down
Expand Up @@ -205,9 +205,9 @@ The PR is now unblocked from merging. If [Tide](/docs/components/core/tide/) is

## Configuration options

See the [Approve](https://godoc.org/k8s.io/test-infra/prow/plugins#Approve) go struct for documentation of the options for this plugin.
See the [Approve](https://godoc.org/sigs.k8s.io/prow/prow/plugins#Approve) go struct for documentation of the options for this plugin.

See also the [Lgtm](https://godoc.org/k8s.io/test-infra/prow/plugins#Lgtm) go struct for documentation of the [LGTM](#lgtm-label) plugin's options.
See also the [Lgtm](https://godoc.org/sigs.k8s.io/prow/prow/plugins#Lgtm) go struct for documentation of the [LGTM](#lgtm-label) plugin's options.

## Final Notes

Expand All @@ -228,12 +228,12 @@ If an approval is cancelled, the bot will delete the status added to the PR and
### Code Implementation Links

Blunderbuss:
[prow/plugins/blunderbuss/blunderbuss.go](https://git.k8s.io/test-infra/prow/plugins/blunderbuss/blunderbuss.go)
[prow/plugins/blunderbuss/blunderbuss.go](https://git.sigs.k8s.io/prow/prow/plugins/blunderbuss/blunderbuss.go)

LGTM:
[prow/plugins/lgtm/lgtm.go](https://git.k8s.io/test-infra/prow/plugins/lgtm/lgtm.go)
[prow/plugins/lgtm/lgtm.go](https://git.sigs.k8s.io/prow/prow/plugins/lgtm/lgtm.go)

Approve:
[prow/plugins/approve/approve.go](https://git.k8s.io/test-infra/prow/plugins/approve/approve.go)
[prow/plugins/approve/approve.go](https://git.sigs.k8s.io/prow/prow/plugins/approve/approve.go)

[prow/plugins/approve/approvers/owners.go](https://git.k8s.io/test-infra/prow/plugins/approve/approvers/owners.go)
[prow/plugins/approve/approvers/owners.go](https://git.sigs.k8s.io/prow/prow/plugins/approve/approvers/owners.go)
2 changes: 1 addition & 1 deletion site/content/en/docs/components/pod-utilities/_index.md
Expand Up @@ -100,7 +100,7 @@ Additional fields may be required for some use cases:
and specify the secret name in the `ssh_key_secrets` field of the job decoration config.
- Set the `clone_uri` field of the job spec to `git@github.com:{{.Org}}/{{.Repo}}.git`.
- Repos requiring a non-standard clone path can use the `path_alias` field
to clone the repo to different go import path than the default of `/home/prow/go/src/github.com/{{.Org}}/{{.Repo}}/` (e.g. `path_alias: k8s.io/test-infra` -> `/home/prow/go/src/k8s.io/test-infra`).
to clone the repo to different go import path than the default of `/home/prow/go/src/github.com/{{.Org}}/{{.Repo}}/` (e.g. `path_alias: sigs.k8s.io/prow` -> `/home/prow/go/src/sigs.k8s.io/prow`).
- Jobs that require additional repos to be checked out can arrange for that with
the `exta_refs` field. If the cloned path of this repo must be used as a default working dir the `workdir: true` must be specified.
- Jobs that do not want submodules to be cloned should set `skip_submodules` to `true`
Expand Down
2 changes: 1 addition & 1 deletion site/content/en/docs/config.md
Expand Up @@ -5,7 +5,7 @@ description: >
---

Core Prow component configuration is managed by the `config` package and stored in the [`Config` struct](https://godoc.org/k8s.io/test-infra/prow/config#Config). If a configuration guide is available for a component it can be found in the ["Components"](/docs/components/) directory. See [`jobs.md`](/docs/jobs/) for a guide to configuring ProwJobs.
Core Prow component configuration is managed by the `config` package and stored in the [`Config` struct](https://godoc.org/sigs.k8s.io/prow/prow/config#Config). If a configuration guide is available for a component it can be found in the ["Components"](/docs/components/) directory. See [`jobs.md`](/docs/jobs/) for a guide to configuring ProwJobs.
Configuration for plugins is handled and stored separately. See the [`plugins`](/docs/components/plugins/) package for details.

You can find a sample config with all possible options and a documentation of them [here.](https://github.com/kubernetes/test-infra/tree/master/prow/config/prow-config-documented.yaml)
2 changes: 1 addition & 1 deletion site/content/en/docs/getting-started-develop.md
Expand Up @@ -20,7 +20,7 @@ There are a number of ways that you can write code for Prow or integrate existin
#### Plugins

[Prow plugins](/docs/components/plugins/) are sub-components of the [`hook`](/docs/components/core/hook/) binary that register event handlers for various types of GitHub events.
Plugin event handlers are provided a [`PluginClient`](https://godoc.org/k8s.io/test-infra/prow/plugins#PluginClient) that provides access to a suite of clients and agents for configuration, ProwJobs, GitHub, git, OWNERS file, Slack, and more.
Plugin event handlers are provided a [`PluginClient`](https://godoc.org/sigs.k8s.io/prow/prow/plugins#PluginClient) that provides access to a suite of clients and agents for configuration, ProwJobs, GitHub, git, OWNERS file, Slack, and more.

##### How to add new plugins

Expand Down
6 changes: 3 additions & 3 deletions site/content/en/docs/jobs.md
Expand Up @@ -36,7 +36,7 @@ that you can define pods in yaml. Please see kubernetes documentation
for help here, for example the [Pod overview] and [PodSpec api
reference].

Periodic config looks like so (see [GoDocs](https://pkg.go.dev/k8s.io/test-infra/prow/config#Periodic) for complete config):
Periodic config looks like so (see [GoDocs](https://pkg.go.dev/sigs.k8s.io/prow/prow/config#Periodic) for complete config):

```yaml
periodics:
Expand All @@ -52,7 +52,7 @@ periodics:
spec: {} # Valid Kubernetes PodSpec.
```

Postsubmit config looks like so (see [GoDocs](https://pkg.go.dev/k8s.io/test-infra/prow/config#Postsubmit) for complete config):
Postsubmit config looks like so (see [GoDocs](https://pkg.go.dev/sigs.k8s.io/prow/prow/config#Postsubmit) for complete config):

```yaml
postsubmits:
Expand All @@ -74,7 +74,7 @@ every branch on the given repo.
Postsubmit jobs apply `run_if_changed` and `skip_if_only_changed` filters based on which
files were modified by the commits included in the specific push event from github.

Presubmit config looks like so (see [GoDocs](https://pkg.go.dev/k8s.io/test-infra/prow/config#Presubmit) for complete config):
Presubmit config looks like so (see [GoDocs](https://pkg.go.dev/sigs.k8s.io/prow/prow/config#Presubmit) for complete config):

```yaml
presubmits:
Expand Down
2 changes: 1 addition & 1 deletion site/content/en/docs/overview/_index.md
Expand Up @@ -9,7 +9,7 @@ description: >

Prow is a Kubernetes based CI/CD system. Jobs can be triggered by various types of events and report their status to many different services. In addition to job execution, Prow provides GitHub automation in the form of policy enforcement, chat-ops via `/foo` style commands, and automatic PR merging.

See the [GoDoc](https://pkg.go.dev/k8s.io/test-infra/prow) for library docs.
See the [GoDoc](https://pkg.go.dev/sigs.k8s.io/prow/prow) for library docs.
Please note that these libraries are intended for use by prow only, and we do
not make any attempt to preserve backwards compatibility.

Expand Down
10 changes: 5 additions & 5 deletions site/content/en/docs/spyglass/write-a-lens.md
Expand Up @@ -14,10 +14,10 @@ Today, a lens backend must be linked in to the `deck` binary. As such, lenses mu
name of the lens. The content of this folder will be served by `deck`, enabling you to reference
static content such as images, stylesheets, or scripts.

Inside your template you must implement the [`lenses.Lens` interface](https://godoc.org/k8s.io/test-infra/prow/spyglass/lenses#Lens).
Inside your template you must implement the [`lenses.Lens` interface](https://godoc.org/sigs.k8s.io/prow/prow/spyglass/lenses#Lens).

An instance of the struct implementing the `lenses.Lens` interface must then be registered with
spyglass, by calling [`lenses.RegisterLens`](https://godoc.org/k8s.io/test-infra/prow/spyglass/lenses#RegisterLens).
spyglass, by calling [`lenses.RegisterLens`](https://godoc.org/sigs.k8s.io/prow/prow/spyglass/lenses#RegisterLens).

A minimal example of a lens called `samplelens`, located at `lenses/samplelens`, might look like this:

Expand All @@ -26,8 +26,8 @@ package samplelens
import (
"encoding/json"

"k8s.io/test-infra/prow/config"
"k8s.io/test-infra/prow/spyglass/lenses"
"sigs.k8s.io/prow/prow/config"
"sigs.k8s.io/prow/prow/spyglass/lenses"
)

type Lens struct{}
Expand Down Expand Up @@ -69,7 +69,7 @@ this by `import`ing it from [`prow/cmd/deck/main.go`](https://github.com/kuberne
```go
import (
// ...
_ "k8s.io/test-infra/prow/spyglass/lenses/samplelens"
_ "sigs.k8s.io/prow/prow/spyglass/lenses/samplelens"
)
```

Expand Down

0 comments on commit 1a1a231

Please sign in to comment.