Skip to content

[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
merged 10 commits into from
Jun 13, 2022

Conversation

joestringer
Copy link
Member

@joestringer joestringer commented Jun 13, 2022

Once this PR is merged, you can update the PR labels via:

$ for pr in 20066; do contrib/backporting/set-labels.py $pr done 1.11; done

[ 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>
@joestringer joestringer requested review from a team as code owners June 13, 2022 22:47
@joestringer joestringer added backport/1.11 kind/backports This PR provides functionality previously merged into master. labels Jun 13, 2022
@joestringer joestringer merged commit 15aed2d into cilium:v1.11 Jun 13, 2022
@joestringer joestringer deleted the pr/v1.11-backport-2022-06-13 branch June 13, 2022 22:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/backports This PR provides functionality previously merged into master.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants