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.

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

Jump to bottom

install/kubernetes: fix helm generation for operator image digest #17968

Merged
merged 1 commit into from
Nov 23, 2021
Merged

install/kubernetes: fix helm generation for operator image digest #17968

merged 1 commit into from
Nov 23, 2021

Conversation

aanm
Copy link
Member

@aanm aanm commented Nov 23, 2021 •
edited
Loading

This commit fixes the image digest as part of the operator deployment.

Fixes: 4638de2 ("cleanup the cilium helm chart:")
Signed-off-by: André Martins andre@cilium.io

The published v1.11.0-rc3 helm charts already contain this patch

This was caught by the smoke test we have for helm charts https://github.com/cilium/charts/actions/runs/1492998266

@aanm
install/kubernetes: fix helm generation for operator image digest
7cdab7f 
This commit fixes the image digest as part of the operator deployment.

Fixes: 4638de2 ("cleanup the cilium helm chart:")
Signed-off-by: André Martins <andre@cilium.io>
@aanm aanm added kind/regression This functionality worked fine before, but was broken in a newer release of Cilium. release-note/misc This PR makes changes that have no direct user impact. needs-backport/1.11 labels Nov 23, 2021
@aanm aanm requested a review from a team as a code owner November 23, 2021 02:54
@aanm aanm requested review from a team, kaworu and christarazi November 23, 2021 02:54
@maintainer-s-little-helper maintainer-s-little-helper bot added this to Needs backport from master in 1.11.0 Nov 23, 2021
@aanm aanm merged commit 1ccb845 into cilium:master Nov 23, 2021
@aanm aanm deleted the pr/fix-image-digest-operator-chart branch November 23, 2021 21:36
@qmonnet qmonnet mentioned this pull request Nov 26, 2021
Merged
12 tasks
@joestringer joestringer added backport-done/1.11 The backport for Cilium 1.11.x for this PR is done. and removed backport-pending/1.11 labels Dec 3, 2021
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Needs backport from master to Backport done to v1.11 in 1.11.0 Dec 3, 2021
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Needs backport from master to Backport done to v1.11 in 1.11.0 Dec 3, 2021
@joestringer
Copy link
Member

joestringer commented Dec 3, 2021 •
edited
Loading

This doesn't work correctly; with v1.11 branch checked out:

$ git log --oneline --grep "install/kubernetes: fix helm generation for operator image digest"
835a8f573ab9 install/kubernetes: fix helm generation for operator image digest
$ grep AWS_DIGEST install/kubernetes/Makefile.digests 
OPERATOR_AWS_DIGEST := "sha256:5ea0ccb6a866a5fb13f4bdfcf1ed8bce12a1355cb10a0914ea52af25f3a8f931"
$ grep GENERIC_DIGEST install/kubernetes/Makefile.digests 
OPERATOR_GENERIC_DIGEST := "sha256:bdaa42d80f8a11c5af398bc1f0c6e7656a05a6be0895a3c931a3bd3c41db7ebe"
$ helm template cilium ./install/kubernetes/cilium --version 1.11.0-rc3   --namespace kube-system   --set eni.enabled=true   --set ipam.mode=eni   --set egressMasqueradeInterfaces=eth0   --set tunnel=disabled | grep operator.*sha
        image: quay.io/cilium/operator-aws:v1.11.0-rc3@sha256:bdaa42d80f8a11c5af398bc1f0c6e7656a05a6be0895a3c931a3bd3c41db7ebe

(Reported by: @seanmwinn )

EDIT: Fix is here: #18116

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gandro gandro gandro approved these changes

@kaworu kaworu kaworu approved these changes

@joestringer joestringer joestringer approved these changes

@nebril nebril nebril approved these changes

@christarazi christarazi Awaiting requested review from christarazi

Assignees

@christarazi christarazi

Labels
backport-done/1.11 The backport for Cilium 1.11.x for this PR is done. kind/regression This functionality worked fine before, but was broken in a newer release of Cilium. release-note/misc This PR makes changes that have no direct user impact.
Projects
No open projects
1.11.0
Backport done to v1.11
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@aanm @joestringer @gandro @kaworu @nebril @christarazi @qmonnet