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

chore: update json-mock image source in examples #31373

Merged
merged 1 commit into from Mar 21, 2024

Conversation

loomkoom
Copy link
Contributor

Replaced docker.io/cilium/json-mock with quay.io/cilium/json-mock
pinned with current latest (1.3.8)
The docker source is deprecated and doesn't provide arm64 builds

I had issues running examples/kubernetes-dns/dns-sw-app and examples/minikube/http-sw-app when following the docs in an ARM environment:
exec /bin/bash: exec format error

This was addressed in #24173, but it seems like that fix missed these 2 examples since they didn't have an explicit version tag provided?


Fixes: #24170

@loomkoom loomkoom requested review from a team as code owners March 13, 2024 14:23
@maintainer-s-little-helper maintainer-s-little-helper bot added the dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. label Mar 13, 2024
@github-actions github-actions bot added the kind/community-contribution This was a contribution made by a community member. label Mar 13, 2024
@lambdanis lambdanis added the release-note/misc This PR makes changes that have no direct user impact. label Mar 13, 2024
@maintainer-s-little-helper maintainer-s-little-helper bot removed the dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. label Mar 13, 2024
@joestringer joestringer added the needs-backport/1.15 This PR / issue needs backporting to the v1.15 branch label Mar 13, 2024
Copy link
Contributor

@lambdanis lambdanis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for the fix @loomkoom! Looks good.

There are two related changes that would be nice to have - feel free to add them to your PR, but otherwise these can also be done as a follow-up by someone else:

  • examples/minikube/http-sw-app.yaml references docker.io/cilium/starwars image, which like json-mock has been moved to quay.io. So the starwars image should be updated too.
  • It would be great to have the image tags updated on new releases. Cilium uses Renovate to auto-update dependencies, but examples directory is excluded by default. To get automatic updates in these examples, we should add these two files to includePaths list in Renovate config.

@lambdanis
Copy link
Contributor

/test

@lambdanis
Copy link
Contributor

@loomkoom I see one check is failing because of a long commit subject:

Error: ERROR:CUSTOM: Please avoid long commit subjects (max: 75, found: 256)

https://github.com/cilium/cilium/actions/runs/8266311327/job/22626632968?pr=31373

Could you amend the commit message?

Replaced docker.io by quay.io pinned with current latest
Docker source is deprecated.

Signed-off-by: loomkoom <loomkoom@hotmail.com>
@loomkoom
Copy link
Contributor Author

@lambdanis

  • I have added the change for the docker.io/cilium/starwars image and amended the commit message.
  • The update to the renovate file I will leave out as a lot of images use the json-mock image and I'm not sure which would be wanted for automatic updating and I feel it would be better to configure all examples instead of only this specific one?

@lambdanis
Copy link
Contributor

/test

@lambdanis lambdanis assigned lambdanis and unassigned lambdanis Mar 14, 2024
@maintainer-s-little-helper maintainer-s-little-helper bot added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Mar 21, 2024
@aditighag aditighag added this pull request to the merge queue Mar 21, 2024
Merged via the queue into cilium:main with commit f8fb8d1 Mar 21, 2024
62 checks passed
@sayboras sayboras mentioned this pull request Mar 24, 2024
6 tasks
@sayboras sayboras added backport-pending/1.15 The backport for Cilium 1.15.x for this PR is in progress. and removed needs-backport/1.15 This PR / issue needs backporting to the v1.15 branch labels Mar 24, 2024
@github-actions github-actions bot added backport-done/1.15 The backport for Cilium 1.15.x for this PR is done. and removed backport-pending/1.15 The backport for Cilium 1.15.x for this PR is in progress. labels Mar 25, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-done/1.15 The backport for Cilium 1.15.x for this PR is done. kind/community-contribution This was a contribution made by a community member. ready-to-merge This PR has passed all tests and received consensus from code owners to merge. release-note/misc This PR makes changes that have no direct user impact.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Support arm64 cilium/json-mock
6 participants