Change references to cri-o to point at new repository

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>

Closes: #1425
Approved by: mheon

.copr/prepare.sh

@@ -21,4 +21,4 @@ sed "s,#COMMIT#,${COMMIT},;
 mkdir build/
 git archive --prefix "libpod-${COMMIT_SHORT}/" --format "tar.gz" HEAD -o "build/libpod-${COMMIT_SHORT}.tar.gz"
 git clone https://github.com/kubernetes-incubator/cri-o
-cd cri-o && git checkout 4e7f71b714932dafc6a70e9b6dc09112da478be1 && git archive --prefix "crio/" --format "tar.gz" HEAD -o "../build/crio.tar.gz"
+cd cri-o && git checkout 4cd5a7c60349be0678d9f1b0657683324c1a2726 && git archive --prefix "crio/" --format "tar.gz" HEAD -o "../build/crio.tar.gz"

Dockerfile

@@ -65,8 +65,8 @@ RUN set -x \
 ENV CRIO_COMMIT 662dbb31b5d4f5ed54511a47cde7190c61c28677
 RUN set -x \
 	&& export GOPATH="$(mktemp -d)" \
-	&& git clone https://github.com/kubernetes-incubator/cri-o.git "$GOPATH/src/github.com/kubernetes-incubator/cri-o.git" \
-	&& cd "$GOPATH/src/github.com/kubernetes-incubator/cri-o.git" \
+	&& git clone https://github.com/kubernetes-sigs/cri-o.git "$GOPATH/src/github.com/kubernetes-sigs/cri-o.git" \
+	&& cd "$GOPATH/src/github.com/kubernetes-sigs/cri-o.git" \
 	&& git fetch origin --tags \
 	&& git checkout -q "$CRIO_COMMIT" \
 	&& make \

Dockerfile.CentOS

@@ -71,8 +71,8 @@ RUN set -x \
 ENV CRIO_COMMIT 662dbb31b5d4f5ed54511a47cde7190c61c28677
 RUN set -x \
 	&& export GOPATH="$(mktemp -d)" \
-	&& git clone https://github.com/kubernetes-incubator/cri-o.git "$GOPATH/src/github.com/kubernetes-incubator/cri-o.git" \
-	&& cd "$GOPATH/src/github.com/kubernetes-incubator/cri-o.git" \
+	&& git clone https://github.com/kubernetes-sigs/cri-o.git "$GOPATH/src/github.com/kubernetes-sigs/cri-o.git" \
+	&& cd "$GOPATH/src/github.com/kubernetes-sigs/cri-o.git" \
 	&& git fetch origin --tags \
 	&& git checkout -q "$CRIO_COMMIT" \
 	&& make \

Dockerfile.Fedora

@@ -74,8 +74,8 @@ RUN set -x \
 ENV CRIO_COMMIT 662dbb31b5d4f5ed54511a47cde7190c61c28677
 RUN set -x \
 	&& export GOPATH="$(mktemp -d)" \
-	&& git clone https://github.com/kubernetes-incubator/cri-o.git "$GOPATH/src/github.com/kubernetes-incubator/cri-o.git" \
-	&& cd "$GOPATH/src/github.com/kubernetes-incubator/cri-o.git" \
+	&& git clone https://github.com/kubernetes-sigs/cri-o.git "$GOPATH/src/github.com/kubernetes-sigs/cri-o.git" \
+	&& cd "$GOPATH/src/github.com/kubernetes-sigs/cri-o.git" \
 	&& git fetch origin --tags \
 	&& git checkout -q "$CRIO_COMMIT" \
 	&& make \

README.md

@@ -20,7 +20,7 @@ At a high level, the scope of libpod and podman is the following:
 ## What is not in scope for this project?
 
 * Signing and pushing images to various image storages. See [Skopeo](https://github.com/containers/skopeo/).
-* Container Runtimes daemons for working with Kubernetes CRIs. See [CRI-O](https://github.com/kubernetes-incubator/cri-o). We are working to integrate libpod into CRI-O to share containers and backend code with Podman.
+* Container Runtimes daemons for working with Kubernetes CRIs. See [CRI-O](https://github.com/kubernetes-sigs/cri-o). We are working to integrate libpod into CRI-O to share containers and backend code with Podman.
 
 ## OCI Projects Plans
 
@@ -30,7 +30,7 @@ The plan is to use OCI projects and best of breed libraries for different aspect
 - Storage: Container and image storage is managed by [containers/storage](https://github.com/containers/storage)
 - Networking: Networking support through use of [CNI](https://github.com/containernetworking/cni)
 - Builds: Builds are supported via [Buildah](https://github.com/projectatomic/buildah).
-- Conmon: [Conmon](https://github.com/kubernetes-incubator/cri-o) is a tool for monitoring OCI runtimes. It is part of the CRI-O package
+- Conmon: [Conmon](https://github.com/kubernetes-sigs/cri-o) is a tool for monitoring OCI runtimes. It is part of the CRI-O package
 
 ## Podman Information for Developers
 

contrib/spec/podman.spec.in

@@ -33,9 +33,9 @@
 %global shortcommit0 %(c=%{commit0}; echo ${c:0:8})
 
 # People want conmon packaged with the copr rpm
-%global import_path_conmon      github.com/kubernetes-incubator/cri-o
+%global import_path_conmon      github.com/kubernetes-sigs/cri-o
 %global git_conmon      https://%{import_path_conmon}
-%global commit_conmon   4e7f71b714932dafc6a70e9b6dc09112da478be1
+%global commit_conmon   4cd5a7c60349be0678d9f1b0657683324c1a2726
 %global shortcommit_conmon %(c=%{commit_conmon}; echo ${c:0:7})
 
 Name: podman
@@ -404,7 +404,7 @@ pushd crio
 
 mkdir _output
 pushd _output
-mkdir -p src/%{provider}.%{provider_tld}/{kubernetes-incubator,opencontainers}
+mkdir -p src/%{provider}.%{provider_tld}/{kubernetes-sigs,opencontainers}
 ln -s $(dirs +1 -l) src/%{import_path_conmon}
 popd
 

docs/tutorials/podman_tutorial.md

@@ -61,8 +61,8 @@ and make libpod.
 ```console
 $ export GOPATH=~/go
 $ mkdir -p $GOPATH
-$ git clone https://github.com/kubernetes-incubator/cri-o $GOPATH/src/github.com/kubernetes-incubator/cri-o
-$ cd $GOPATH/src/github.com/kubernetes-incubator/cri-o
+$ git clone https://github.com/kubernetes-sigs/cri-o $GOPATH/src/github.com/kubernetes-sigs/cri-o
+$ cd $GOPATH/src/github.com/kubernetes-sigs/cri-o
 $ mkdir bin
 $ make bin/conmon
 $ sudo install -D -m 755 bin/conmon /usr/libexec/podman/conmon

pkg/hooks/0.1.0/hook.go

@@ -19,7 +19,7 @@ type Hook struct {
 	Hook      *string  `json:"hook"`
 	Arguments []string `json:"arguments,omitempty"`
 
-	// https://github.com/kubernetes-incubator/cri-o/pull/1235
+	// https://github.com/kubernetes-sigs/cri-o/pull/1235
 	Stages []string `json:"stages"`
 	Stage  []string `json:"stage"`
 

transfer.md

@@ -88,7 +88,7 @@ Those Docker commands currently do not have equivalents in `podman`:
 | `docker secret`   ||
 | `docker service`  ||
 | `docker stack`    ||
-| `docker swarm`    | podman does not support swarm.  We support Kubernetes for orchestration using [CRI-O](https://github.com/kubernetes-incubator/cri-o).|
+| `docker swarm`    | podman does not support swarm.  We support Kubernetes for orchestration using [CRI-O](https://github.com/kubernetes-sigs/cri-o).|
 | `docker system`   ||
 | `docker volume`   | podman does not support volumes.  Volumes should be built on the host operating system and then volume mounted into the containers.|