-
Notifications
You must be signed in to change notification settings - Fork 3.4k
[v1.11] Templatize helm template image references #20189
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
Merged
joestringer
merged 10 commits into
cilium:v1.11
from
joestringer:pr/v1.11-backport-2022-06-13
Jun 13, 2022
Merged
[v1.11] Templatize helm template image references #20189
joestringer
merged 10 commits into
cilium:v1.11
from
joestringer:pr/v1.11-backport-2022-06-13
Jun 13, 2022
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[ upstream commit 6bfaf9e ] [ Backporter's notes: Minor conflict in copyright line ] The autogenerated file referred to a workflow that doesn't exist, update how that path is generated to reflect the current location. Signed-off-by: Joe Stringer <joe@cilium.io>
[ upstream commit cd53331 ] [ Backporter's notes: * Prepend all lines with 'export' to resolve conflict. This causes a divergence from original commit, but in the way that's intended for this branch. ] Export each of the digest variables so that they can be passed to subcommands from future Makefile infrastructure. Signed-off-by: Joe Stringer <joe@cilium.io>
[ upstream commit a4c7a80 ] [ Backporter's notes: * Remove $(SED) variable since v1.11 didn't have a variable for it ] Split the target used for updating Chart.yaml, since the substitutions there are a bit simpler and unrelated to the rest of the changes we need to do for the values.yaml in an upcoming commit. This introduces a new install/kubernetes/Makefile.values file with an exported variable for the cilium branch, used for generating a logo URL for external websites like https://artifacthub.io . While we're at it, drop the non-cross-platform `-Z` for separating paths by NULL character to parse the inputs to iterate them and run commands against them. Signed-off-by: Joe Stringer <joe@cilium.io> squash! install/kubernetes: Split Chart.yaml update target
[ upstream commit 11333b2 ] [ Backporter's notes: Fix up the versions to match v1.11 tree. ] Move all of the declarations of the image repositories and tags into install/kubernetes/Makefile.values, then templatize the values file so that we can pick up these env variables using envsubst. Then we can get rid of the big ugly 'sed' hack in the Makefile which is hard to maintain. Signed-off-by: Joe Stringer <joe@cilium.io>
[ upstream commit 219c843 ] [ Backporter's notes: Re-created this commit from scratch by running make -C install/kubernetes ] Signed-off-by: Joe Stringer <joe@cilium.io>
[ upstream commit 247de47 ] Signed-off-by: Joe Stringer <joe@cilium.io>
[ upstream commit 4d873ca ] Signed-off-by: Joe Stringer <joe@cilium.io>
[ upstream commit e66b7dd ] Split up the variables used here for better readability, and add the V=0 quiet line to indicate progress in the way the other targets do. Signed-off-by: Joe Stringer <joe@cilium.io>
[ upstream commit 47c45b4 ] The 'docs' target under install/kubernetes is already run by the 'helm-charts' step via the 'all' make target. Given some of the recent re-organizing, we should probably just add linting to the overall steps in the makefile and run all of the targets. This should avoid running these targets twice: * 2x Run cilium/values.yaml generation (via lint, all targets) * 2x Run docs (via docs, all targets) Suggested-by: Alexandre Perrin <alex@isovalent.com> Signed-off-by: Joe Stringer <joe@cilium.io>
[ upstream commit 3ec10e7 ] Previously this script wouldn't work when invoked on the master branch via `make -C install/kubernetes check-docker-images`, because the script expected some images to be present on dockerhub when we don't keep them up to date there (startup-script, cilium-etcd-operator), and also because the tree specifies the image tag as "latest" which are only published on the quay.io/cilium/*-ci repositories. Teach the script to pick up the correct set of image dependencies to handle these cases. Signed-off-by: Joe Stringer <joe@cilium.io>
michi-covalent
approved these changes
Jun 13, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Once this PR is merged, you can update the PR labels via: