From 9fa1febfd9e6372fc1fd9ec3416082182c2f8c21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Fri, 23 Jul 2021 19:54:49 +0200 Subject: [PATCH 1/3] workflows: Also push the image to quay.io MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Now that the project owns https://quay.io/kata-containers, let's also push our images there and start making it our primary image repository. Fixes: #2306 Signed-off-by: Fabiano Fidêncio --- .github/workflows/kata-deploy-test.yaml | 4 +++- .github/workflows/main.yaml | 4 +++- .github/workflows/release.yaml | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/kata-deploy-test.yaml b/.github/workflows/kata-deploy-test.yaml index 228e2246ec..d5c5470001 100644 --- a/.github/workflows/kata-deploy-test.yaml +++ b/.github/workflows/kata-deploy-test.yaml @@ -46,9 +46,11 @@ jobs: VERSION="2.0.0" ARTIFACT_URL="https://github.com/kata-containers/kata-containers/releases/download/${VERSION}/kata-static-${VERSION}-x86_64.tar.xz" wget "${ARTIFACT_URL}" -O tools/packaging/kata-deploy/kata-static.tar.xz - docker build --build-arg KATA_ARTIFACTS=kata-static.tar.xz -t katadocker/kata-deploy-ci:${PR_SHA} ./tools/packaging/kata-deploy + docker build --build-arg KATA_ARTIFACTS=kata-static.tar.xz -t katadocker/kata-deploy-ci:${PR_SHA} -t quay.io/kata-containers/kata-deploy-ci:${PR_SHA} ./tools/packaging/kata-deploy docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }} docker push katadocker/kata-deploy-ci:$PR_SHA + docker login -u ${{ secrets.QUAY_DEPLOYER_USERNAME }} -p ${{ secrets.QUAY_DEPLOYER_PASSWORD }} + docker push quay.io/kata-containers/kata-deploy-ci:$PR_SHA echo "##[set-output name=pr-sha;]${PR_SHA}" - name: test-kata-deploy-ci-in-aks diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 47836f3b5f..1fd0a2e8e3 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -247,9 +247,11 @@ jobs: pkg_sha=$(git rev-parse HEAD) popd mv release-candidate/kata-static.tar.xz ./packaging/kata-deploy/kata-static.tar.xz - docker build --build-arg KATA_ARTIFACTS=kata-static.tar.xz -t katadocker/kata-deploy-ci:$pkg_sha ./packaging/kata-deploy + docker build --build-arg KATA_ARTIFACTS=kata-static.tar.xz -t katadocker/kata-deploy-ci:$pkg_sha -t quay.io/kata-containers/kata-deploy-ci:$pkg_sha ./packaging/kata-deploy docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }} docker push katadocker/kata-deploy-ci:$pkg_sha + docker login -u ${{ secrets.QUAY_DEPLOYER_USERNAME }} -p ${{ secrets.QUAY_DEPLOYER_PASSWORD }} + docker push quay.io/kata-containers/kata-deploy-ci:$pkg_sha echo "::set-output name=PKG_SHA::${pkg_sha}" - name: test-kata-deploy-ci-in-aks uses: ./packaging/kata-deploy/action diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 0892efe2c9..78e0723dd8 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -78,9 +78,11 @@ jobs: pkg_sha=$(git rev-parse HEAD) popd mv kata-static.tar.xz $GITHUB_WORKSPACE/tools/packaging/kata-deploy/kata-static.tar.xz - docker build --build-arg KATA_ARTIFACTS=kata-static.tar.xz -t katadocker/kata-deploy-ci:$pkg_sha $GITHUB_WORKSPACE/tools/packaging/kata-deploy + docker build --build-arg KATA_ARTIFACTS=kata-static.tar.xz -t katadocker/kata-deploy-ci:$pkg_sha -t quay.io/kata-containers/kata-deploy-ci:$pkg_sha $GITHUB_WORKSPACE/tools/packaging/kata-deploy docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }} docker push katadocker/kata-deploy-ci:$pkg_sha + docker login -u ${{ secrets.QUAY_DEPLOYER_USERNAME }} -p ${{ secrets.QUAY_DEPLOYER_PASSWORD }} + docker push quay.io/kata-containers/kata-deploy-ci:$pkg_sha mkdir -p packaging/kata-deploy ln -s $GITHUB_WORKSPACE/tools/packaging/kata-deploy/action packaging/kata-deploy/action echo "::set-output name=PKG_SHA::${pkg_sha}" From f47cad3d95d7352c9770fd0da8c99d281958d3ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Fri, 23 Jul 2021 20:00:08 +0200 Subject: [PATCH 2/3] tools: Update the image repository to quay.io MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This can help our users to **not** hit the pull limitation imposed by dockerhub. Fixes: #2306 Signed-off-by: Fabiano Fidêncio --- tools/packaging/kata-deploy/action/test-kata.sh | 4 ++-- .../packaging/kata-deploy/kata-cleanup/base/kata-cleanup.yaml | 2 +- tools/packaging/kata-deploy/kata-deploy/base/kata-deploy.yaml | 2 +- tools/packaging/release/update-repository-version.sh | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/packaging/kata-deploy/action/test-kata.sh b/tools/packaging/kata-deploy/action/test-kata.sh index f59925f6b1..a1d708159c 100755 --- a/tools/packaging/kata-deploy/action/test-kata.sh +++ b/tools/packaging/kata-deploy/action/test-kata.sh @@ -120,8 +120,8 @@ function test_kata() { kubectl get runtimeclasses # update deployment daemonset to utilize the container under test: - sed -i "s#katadocker/kata-deploy:${VERSION}#katadocker/kata-deploy-ci:${PKG_SHA}#g" $YAMLPATH/kata-deploy/base/kata-deploy.yaml - sed -i "s#katadocker/kata-deploy:${VERSION}#katadocker/kata-deploy-ci:${PKG_SHA}#g" $YAMLPATH/kata-cleanup/base/kata-cleanup.yaml + sed -i "s#quay.io/kata-containers/kata-deploy:${VERSION}#quay.io/kata-containers/kata-deploy-ci:${PKG_SHA}#g" $YAMLPATH/kata-deploy/base/kata-deploy.yaml + sed -i "s#quay.io/kata-containers/kata-deploy:${VERSION}#quay.io/kata-containers/kata-deploy-ci:${PKG_SHA}#g" $YAMLPATH/kata-cleanup/base/kata-cleanup.yaml cat $YAMLPATH/kata-deploy/base/kata-deploy.yaml diff --git a/tools/packaging/kata-deploy/kata-cleanup/base/kata-cleanup.yaml b/tools/packaging/kata-deploy/kata-cleanup/base/kata-cleanup.yaml index 930385f733..6c74f8cb27 100644 --- a/tools/packaging/kata-deploy/kata-cleanup/base/kata-cleanup.yaml +++ b/tools/packaging/kata-deploy/kata-cleanup/base/kata-cleanup.yaml @@ -18,7 +18,7 @@ spec: katacontainers.io/kata-runtime: cleanup containers: - name: kube-kata-cleanup - image: katadocker/kata-deploy:2.2.0-alpha1 + image: quay.io/kata-containers/kata-deploy:2.2.0-alpha1 imagePullPolicy: Always command: [ "bash", "-c", "/opt/kata-artifacts/scripts/kata-deploy.sh reset" ] env: diff --git a/tools/packaging/kata-deploy/kata-deploy/base/kata-deploy.yaml b/tools/packaging/kata-deploy/kata-deploy/base/kata-deploy.yaml index f45185261f..06d9593179 100644 --- a/tools/packaging/kata-deploy/kata-deploy/base/kata-deploy.yaml +++ b/tools/packaging/kata-deploy/kata-deploy/base/kata-deploy.yaml @@ -16,7 +16,7 @@ spec: serviceAccountName: kata-label-node containers: - name: kube-kata - image: katadocker/kata-deploy:2.2.0-alpha1 + image: quay.io/kata-containers/kata-deploy:2.2.0-alpha1 imagePullPolicy: Always lifecycle: preStop: diff --git a/tools/packaging/release/update-repository-version.sh b/tools/packaging/release/update-repository-version.sh index b8329aeb7e..d00c623a03 100755 --- a/tools/packaging/release/update-repository-version.sh +++ b/tools/packaging/release/update-repository-version.sh @@ -112,8 +112,8 @@ bump_repo() { if [ "${repo}" == "kata-containers" ]; then info "Updating kata-deploy / kata-cleanup image tags" - sed -i "s#katadocker/kata-deploy:${current_version}#katadocker/kata-deploy:${new_version}#g" tools/packaging/kata-deploy/kata-deploy/base/kata-deploy.yaml - sed -i "s#katadocker/kata-deploy:${current_version}#katadocker/kata-deploy:${new_version}#g" tools/packaging/kata-deploy/kata-cleanup/base/kata-cleanup.yaml + sed -i "s#quay.io/kata-containers/kata-deploy:${current_version}#quay.io/kata-containers/kata-deploy:${new_version}#g" tools/packaging/kata-deploy/kata-deploy/base/kata-deploy.yaml + sed -i "s#quay.io/kata-containers/kata-deploy:${current_version}#quay.io/kata-containers/kata-deploy:${new_version}#g" tools/packaging/kata-deploy/kata-cleanup/base/kata-cleanup.yaml git diff git add tools/packaging/kata-deploy/kata-deploy/base/kata-deploy.yaml From b9e03a1cf13c8373c9616b4fc75a5028420bd398 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Fri, 23 Jul 2021 20:00:29 +0200 Subject: [PATCH 3/3] docs: update the image repository to quay.io MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This can help our users to **not** hit the pull limitation imposed by dockerhub. Fixes: #2306 Signed-off-by: Fabiano Fidêncio --- docs/how-to/data/kata-monitor-daemonset.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/how-to/data/kata-monitor-daemonset.yml b/docs/how-to/data/kata-monitor-daemonset.yml index fca793730e..63443829c7 100644 --- a/docs/how-to/data/kata-monitor-daemonset.yml +++ b/docs/how-to/data/kata-monitor-daemonset.yml @@ -26,7 +26,7 @@ spec: hostNetwork: true containers: - name: kata-monitor - image: docker.io/katadocker/kata-monitor:2.0.0 + image: quay.io/kata-containers/kata-monitor:2.0.0 args: - -log-level=debug ports: