8000 v1.15 Backports 2024-09-30 by jibi · Pull Request #35118 · cilium/cilium · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

v1.15 Backports 2024-09-30 #35118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 1, 2024
Merged

v1.15 Backports 2024-09-30 #35118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fd3509a
.github: fix runtime image digests
aanm Sep 30, 2024
69117a2
workflows: documentation: switch back to ubuntu 22.04
jibi Sep 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 30 additions & 10 deletions .github/workflows/build-images-base.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@ jobs:
cp ./images/runtime/update-cilium-runtime-image.sh ../cilium-base-branch/images/runtime/
mkdir -p ../cilium-base-branch/images/builder/
cp ./images/builder/update-cilium-builder-image.sh ../cilium-base-branch/images/builder/
mkdir -p ../cilium-base-branch/images/scripts/
cp ./images/scripts/get-image-digest.sh ../cilium-base-branch/images/scripts/

- name: Set Environment Variables
uses: ./.github/actions/set-env-variables
Expand Down Expand Up @@ -172,10 +174,20 @@ jobs:
retention-days: 1

- name: Update Runtime Image
if: ${{ steps.cilium-runtime-tag-in-repositories.outputs.exists == 'false' }}
id: update-runtime-image
run: |
../cilium-base-branch/images/runtime/update-cilium-runtime-image.sh "quay.io/${{ env.QUAY_ORGANIZATION_DEV }}/cilium-runtime:${{ steps.runtime-tag.outputs.tag }}@${{ steps.docker_build_release_runtime.outputs.digest }}"
git commit -sam "images: update cilium-{runtime,builder}"
if [[ "${{ steps.cilium-runtime-tag-in-repositories.outputs.exists == 'false' }}" == "true" ]]; then
../cilium-base-branch/images/runtime/update-cilium-runtime-image.sh "quay.io/${{ env.QUAY_ORGANIZATION_DEV }}/cilium-runtime:${{ steps.runtime-tag.outputs.tag }}@${{ steps.docker_build_release_runtime.outputs.digest }}"
else
digest=$(../cilium-base-branch/images/scripts/get-image-digest.sh "quay.io/${{ env.QUAY_ORGANIZATION_DEV }}/cilium-runtime:${{ steps.runtime-tag.outputs.tag }}")
../cilium-base-branch/images/runtime/update-cilium-runtime-image.sh "quay.io/${{ env.QUAY_ORGANIZATION_DEV }}/cilium-runtime:${{ steps.runtime-tag.outputs.tag }}@${digest}"
fi
if ! git diff --quiet; then
git commit -sam "images: update cilium-{runtime,builder}"
echo committed="true" >> $GITHUB_OUTPUT
else
echo committed="false" >> $GITHUB_OUTPUT
fi

- name: Generating image tag for Cilium-Builder
id: builder-tag
Expand Down Expand Up @@ -257,25 +269,33 @@ jobs:
path: image-digest
retention-days: 1

- name: Update Runtime Images
if: ${{ steps.cilium-runtime-tag-in-repositories.outputs.exists == 'false' }}
- name: Update Runtime Image
run: |
../cilium-base-branch/images/runtime/update-cilium-runtime-image.sh "quay.io/${{ env.QUAY_ORGANIZATION_DEV }}/cilium-runtime:${{ steps.runtime-tag.outputs.tag }}@${{ steps.docker_build_release_runtime.outputs.digest }}"
if [[ "${{ steps.cilium-runtime-tag-in-repositories.outputs.exists == 'false' }}" == "true" ]]; then
../cilium-base-branch/images/runtime/update-cilium-runtime-image.sh "quay.io/${{ env.QUAY_ORGANIZATION_DEV }}/cilium-runtime:${{ steps.runtime-tag.outputs.tag }}@${{ steps.docker_build_release_runtime.outputs.digest }}"
else
digest=$(../cilium-base-branch/images/scripts/get-image-digest.sh "quay.io/${{ env.QUAY_ORGANIZATION_DEV }}/cilium-runtime:${{ steps.runtime-tag.outputs.tag }}")
../cilium-base-branch/images/runtime/update-cilium-runtime-image.sh "quay.io/${{ env.QUAY_ORGANIZATION_DEV }}/cilium-runtime:${{ steps.runtime-tag.outputs.tag }}@${digest}"
fi

- name: Update Builder Images
if: ${{ steps.cilium-builder-tag-in-repositories.outputs.exists == 'false' }}
run: |
../cilium-base-branch/images/builder/update-cilium-builder-image.sh "quay.io/${{ env.QUAY_ORGANIZATION_DEV }}/cilium-builder:${{ steps.builder-tag.outputs.tag }}@${{ steps.docker_build_release_builder.outputs.digest }}"
if [[ "${{ steps.cilium-builder-tag-in-repositories.outputs.exists == 'false' }}" == "true" ]]; then
../cilium-base-branch/images/builder/update-cilium-builder-image.sh "quay.io/${{ env.QUAY_ORGANIZATION_DEV }}/cilium-builder:${{ steps.builder-tag.outputs.tag }}@${{ steps.docker_build_release_builder.outputs.digest }}"
else
digest=$(../cilium-base-branch/images/scripts/get-image-digest.sh "quay.io/${{ env.QUAY_ORGANIZATION_DEV }}/cilium-builder:${{ steps.builder-tag.outputs.tag }}")
../cilium-base-branch/images/builder/update-cilium-builder-image.sh "quay.io/${{ env.QUAY_ORGANIZATION_DEV }}/cilium-builder:${{ steps.builder-tag.outputs.tag }}@${digest}"
fi

- name: Commit changes by amending previous commit
# Run this step in case we have committed the cilium-runtime changes before
if: ${{ steps.cilium-runtime-tag-in-repositories.outputs.exists == 'false' }}
if: ${{ steps.cilium-runtime-tag-in-repositories.outputs.exists == 'false' && steps.update-runtime-image.outputs.committed == 'false' }}
run: |
git commit --amend -sam "images: update cilium-{runtime,builder}"

- name: Commit changes
# Run this step in case we have NOT committed the cilium-runtime changes before
if: ${{ steps.cilium-runtime-tag-in-repositories.outputs.exists != 'false' && steps.cilium-builder-tag-in-repositories.outputs.exists == 'false' }}
if: ${{ (steps.cilium-runtime-tag-in-repositories.outputs.exists != 'false' || steps.update-runtime-image.outputs.committed != 'false') && steps.cilium-builder-tag-in-repositories.outputs.exists == 'false' }}
run: |
git commit -sam "images: update cilium-{runtime,builder}"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/documentation.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ concurrency:
jobs:
check_changes:
name: Deduce required tests from code changes
runs-on: ubuntu-24.04
runs-on: ubuntu-22.04
outputs:
docs-tree: ${{ steps.docs-tree.outputs.src }}
steps:
Expand Down
Loading
0