From 6db73b2c9af5fe00de7b62f5c00df582e8611f1d Mon Sep 17 00:00:00 2001 From: Francis Laniel Date: Wed, 6 Dec 2023 17:17:57 +0100 Subject: [PATCH] Addon inspektor-gadget: Update inspektor-gadget image from v0.22.0 to v0.23.1 This commit bumps Inspektor Gadget addon from v0.22.0 to v0.23.1. To avoid deployment failures, we also need to update the YAML. Indeed, Inspektor Gadget container entrypoint and cleanup programs were translated from bash to golang [1, 2]. Upstream YAML file used to deploy was updated to reflect this change [3]. Sadly, it was not the case for the YAML used to deploy the minikube addon which leaded to troubles [4, 5, 6]. Signed-off-by: Francis Laniel [1]: https://github.com/inspektor-gadget/inspektor-gadget/pull/2207/commits/b268d38758cfc175a9fc7bddea82c937e9668542 [2]: https://github.com/inspektor-gadget/inspektor-gadget/pull/2207/commits/3dba83f2ebe8cb8d08dbe1b81ab0cb24531fe5b0 [3]: https://github.com/inspektor-gadget/inspektor-gadget/pull/2207/commits/992399f2ddd3392615860b75d6251ac3e1706231#diff-0927404b80a3c13f63de64a0c7af1833ba3dfd4b4e1dd07b09cb8216c7f033fcR46 [4]: https://storage.googleapis.com/minikube-builds/logs/17731/32161/Docker_Linux_crio_arm64.html#fail_TestAddons/parallel/InspektorGadget [5]: https://storage.googleapis.com/minikube-builds/logs/17731/32161/Docker_Linux_crio.html#fail_TestAddons/parallel/InspektorGadget [6]: https://storage.googleapis.com/minikube-builds/logs/17731/32161/KVM_Linux_crio.html#fail_TestAddons/parallel/InspektorGadget --- deploy/addons/inspektor-gadget/ig-daemonset.yaml.tmpl | 4 ++-- pkg/minikube/assets/addons.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/deploy/addons/inspektor-gadget/ig-daemonset.yaml.tmpl b/deploy/addons/inspektor-gadget/ig-daemonset.yaml.tmpl index e358f9fe0c68..77141e7fced7 100644 --- a/deploy/addons/inspektor-gadget/ig-daemonset.yaml.tmpl +++ b/deploy/addons/inspektor-gadget/ig-daemonset.yaml.tmpl @@ -32,12 +32,12 @@ spec: terminationMessagePolicy: FallbackToLogsOnError image: {{.CustomRegistries.InspektorGadget | default .ImageRepository | default .Registries.InspektorGadget }}{{.Images.InspektorGadget}} imagePullPolicy: "Always" - command: [ "/entrypoint.sh" ] + command: [ "/entrypoint" ] lifecycle: preStop: exec: command: - - "/cleanup.sh" + - "/cleanup" readinessProbe: periodSeconds: 5 timeoutSeconds: 2 diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index e3328d3d30e4..02700b6f8d34 100644 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -315,7 +315,7 @@ var Addons = map[string]*Addon{ MustBinAsset(addons.InspektorGadgetAssets, "inspektor-gadget/ig-daemonset.yaml.tmpl", vmpath.GuestAddonsDir, "ig-daemonset.yaml", "0640"), }, false, "inspektor-gadget", "3rd party (inspektor-gadget.io)", "https://github.com/orgs/inspektor-gadget/people", "https://minikube.sigs.k8s.io/docs/handbook/addons/inspektor-gadget/", map[string]string{ - "InspektorGadget": "inspektor-gadget/inspektor-gadget:v0.22.0@sha256:9272c2be979a9857971fc8b6f7226e609cadec8352f97e9769081930121ef27f", + "InspektorGadget": "inspektor-gadget/inspektor-gadget:v0.23.1@sha256:c77d8eb2b3dc6e9d60767f824b296e42d6d4fdc2f17f507492a2c981933db931", }, map[string]string{ "InspektorGadget": "ghcr.io", }),