Skip to content
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.

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

Disable the images digest when pushing the development helm chart #27646

Merged
merged 1 commit into from Aug 25, 2023

Conversation

giorio94
Copy link
Member

@giorio94 giorio94 commented Aug 23, 2023

While the digests are unset and disabled in the main branch, they are set to the values corresponding to the latest patch release for stable branches. Hence, let's explicitly disable them when pushing the development helm chart.

Tested on top of the v1.14 branch (non-relevant images are omitted, the kvstoremesh image is configured in #27645, due to the different backport policy):

$ helm show values -n kube-system oci://quay.io/cilium-charts-dev/cilium \
        --version 1.15.0-dev-dev.748-pr-giorio94-main-gha-push-chart-digests-0a51d4c5b8| grep 'image:' -A7 -B1

# -- Agent container image.
image:
  override: ~
  repository: "quay.io/cilium/cilium-ci"
  tag: "0a51d4c5b82108ad6c3cb883c5b87b913a796fdb"
  pullPolicy: "Always"
  # cilium-digest
  digest: ""
  useDigest: false
--
    # -- Hubble-relay container image.
    image:
      override: ~
      repository: "quay.io/cilium/hubble-relay-ci"
      tag: "0a51d4c5b82108ad6c3cb883c5b87b913a796fdb"
      # hubble-relay-digest
      digest: ""
      useDigest: false
      pullPolicy: "Always"
--
  # -- Cilium pre-flight image.
  image:
    override: ~
    repository: "quay.io/cilium/cilium-ci"
    tag: "0a51d4c5b82108ad6c3cb883c5b87b913a796fdb"
    # cilium-digest
    digest: ""
    useDigest: false
    pullPolicy: "Always"
--
    # -- Clustermesh API server image.
    image:
      override: ~
      repository: "quay.io/cilium/clustermesh-apiserver-ci"
      tag: "0a51d4c5b82108ad6c3cb883c5b87b913a796fdb"
      # clustermesh-apiserver-digest
      digest: ""
      useDigest: false
      pullPolicy: "Always"


$ helm show values -n kube-system oci://quay.io/cilium-charts-dev/cilium \
        --version 1.15.0-dev-dev.748-pr-giorio94-main-gha-push-chart-digests-0a51d4c5b8| grep 'cilium-operator image' -A14

  # -- cilium-operator image.
  image:
    override: ~
    repository: "quay.io/cilium/operator"
    tag: "0a51d4c5b82108ad6c3cb883c5b87b913a796fdb"
    # operator-generic-digest
    genericDigest: ""
    # operator-azure-digest
    azureDigest: ""
    # operator-aws-digest
    awsDigest: ""
    # operator-alibabacloud-digest
    alibabacloudDigest: ""
    useDigest: false
    pullPolicy: "Always"

@giorio94 giorio94 added area/CI Continuous Integration testing issue or flake release-note/ci This PR makes changes to the CI. needs-backport/1.12 needs-backport/1.13 This PR / issue needs backporting to the v1.13 branch needs-backport/1.14 This PR / issue needs backporting to the v1.14 branch labels Aug 23, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot added backport/1.14 This PR represents a backport for Cilium 1.14.x of a PR that was merged to main. kind/backports This PR provides functionality previously merged into master. labels Aug 23, 2023
@giorio94 giorio94 force-pushed the pr/giorio94/main/gha-push-chart-digests branch 2 times, most recently from 953bfe3 to 7349c70 Compare August 23, 2023 09:51
@giorio94 giorio94 changed the base branch from v1.14 to main August 23, 2023 09:51
@giorio94 giorio94 removed kind/backports This PR provides functionality previously merged into master. backport/1.14 This PR represents a backport for Cilium 1.14.x of a PR that was merged to main. labels Aug 23, 2023
@giorio94 giorio94 marked this pull request as ready for review August 23, 2023 09:52
@giorio94 giorio94 requested review from a team as code owners August 23, 2023 09:52
@giorio94 giorio94 force-pushed the pr/giorio94/main/gha-push-chart-digests branch from 7349c70 to bd18f0f Compare August 23, 2023 12:35
@joestringer
Copy link
Member

This one also triggered #27675, I don't really understand why. Is it because the base commit is earlier in the tree and somehow the test is only running a diff vs. main?

While the digests are unset and disabled in the main branch, they are
set to the values corresponding to the latest patch release for stable
branches. Hence, let's explicitly disable them when pushing the
development helm chart.

Signed-off-by: Marco Iorio <marco.iorio@isovalent.com>
@giorio94 giorio94 force-pushed the pr/giorio94/main/gha-push-chart-digests branch from bd18f0f to 0a51d4c Compare August 24, 2023 06:33
@giorio94
Copy link
Member Author

This one also triggered #27675, I don't really understand why. Is it because the base commit is earlier in the tree and somehow the test is only running a diff vs. main?

Thanks for opening the issue! To be honest it is unclear to me why this didn't also happen on the original PR introducing the metric.

@giorio94 giorio94 force-pushed the pr/giorio94/main/gha-push-chart-digests branch from 0a51d4c to 2f59a89 Compare August 24, 2023 06:47
@giorio94
Copy link
Member Author

giorio94 commented Aug 24, 2023

Rebased onto main to fix a conflict, and re-tested

@giorio94
Copy link
Member Author

/test

@giorio94
Copy link
Member Author

Everything seems green. It's unclear to me why MLH didn't mark this as ready to merge. Doing that manually.

@giorio94 giorio94 added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Aug 25, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot added this to Needs backport from main in 1.13.7 Aug 25, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot added this to Needs backport from main in 1.12.14 Aug 25, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot added this to Needs backport from main in 1.14.2 Aug 25, 2023
@giorio94 giorio94 added ready-to-merge This PR has passed all tests and received consensus from code owners to merge. and removed ready-to-merge This PR has passed all tests and received consensus from code owners to merge. labels Aug 25, 2023
@aanm aanm merged commit 6fa9708 into main Aug 25, 2023
199 checks passed
@aanm aanm deleted the pr/giorio94/main/gha-push-chart-digests branch August 25, 2023 13:30
@pippolo84 pippolo84 mentioned this pull request Aug 28, 2023
9 tasks
@pippolo84 pippolo84 added backport-pending/1.14 The backport for Cilium 1.14.x for this PR is in progress. and removed needs-backport/1.14 This PR / issue needs backporting to the v1.14 branch labels Aug 28, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Needs backport from main to Backport pending to v1.14 in 1.14.2 Aug 28, 2023
@giorio94
Copy link
Member Author

I incorrectly though that this workflow had been backported to v1.12 and v1.13, but it appears not to exist in these branches. Hence, dropping the associated needs-backport labels.

@giorio94 giorio94 removed needs-backport/1.12 needs-backport/1.13 This PR / issue needs backporting to the v1.13 branch labels Aug 28, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot removed this from Needs backport from main in 1.12.14 Aug 28, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot removed this from Needs backport from main in 1.13.7 Aug 28, 2023
@michi-covalent michi-covalent added backport-done/1.14 The backport for Cilium 1.14.x for this PR is done. and removed backport-pending/1.14 The backport for Cilium 1.14.x for this PR is in progress. labels Sep 9, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Backport pending to v1.14 to Backport done to v1.14 in 1.14.2 Sep 9, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/CI Continuous Integration testing issue or flake backport-done/1.14 The backport for Cilium 1.14.x for this PR is done. ready-to-merge This PR has passed all tests and received consensus from code owners to merge. release-note/ci This PR makes changes to the CI.
Projects
No open projects
1.14.2
Backport done to v1.14
Development

Successfully merging this pull request may close these issues.

None yet

6 participants