aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.copr/prepare.sh2
-rw-r--r--Dockerfile4
-rw-r--r--Dockerfile.CentOS4
-rw-r--r--Dockerfile.Fedora4
-rw-r--r--README.md4
-rw-r--r--contrib/spec/podman.spec.in6
-rw-r--r--docs/tutorials/podman_tutorial.md4
-rw-r--r--pkg/hooks/0.1.0/hook.go2
-rw-r--r--transfer.md2
9 files changed, 16 insertions, 16 deletions
diff --git a/.copr/prepare.sh b/.copr/prepare.sh
index c00a317d2..8ec38f2df 100644
--- a/.copr/prepare.sh
+++ b/.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"
diff --git a/Dockerfile b/Dockerfile
index 878d2c0b9..70595a509 100644
--- a/Dockerfile
+++ b/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 \
diff --git a/Dockerfile.CentOS b/Dockerfile.CentOS
index 80ade88bb..cfb2a2d5d 100644
--- a/Dockerfile.CentOS
+++ b/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 \
diff --git a/Dockerfile.Fedora b/Dockerfile.Fedora
index 4830e2078..623edf96d 100644
--- a/Dockerfile.Fedora
+++ b/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 \
diff --git a/README.md b/README.md
index ef3627b20..0f31c24a9 100644
--- a/README.md
+++ b/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
diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in
index dbcbfea8f..6f67b84dc 100644
--- a/contrib/spec/podman.spec.in
+++ b/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
diff --git a/docs/tutorials/podman_tutorial.md b/docs/tutorials/podman_tutorial.md
index b54e7cfd2..9a6cf3e9d 100644
--- a/docs/tutorials/podman_tutorial.md
+++ b/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
diff --git a/pkg/hooks/0.1.0/hook.go b/pkg/hooks/0.1.0/hook.go
index 4ebc5ff9d..49d833aa8 100644
--- a/pkg/hooks/0.1.0/hook.go
+++ b/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"`
diff --git a/transfer.md b/transfer.md
index 7c8b64b02..00e732265 100644
--- a/transfer.md
+++ b/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.|
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-12 07:09:24 +0000