From c5a78958787967307091d18e9a4c0b47ab4ca7e8 Mon Sep 17 00:00:00 2001 From: Mat Kowalski Date: Wed, 26 May 2021 13:23:57 +0200 Subject: [PATCH] [WIP] Bug 1964591: Remove AI Agent image in case of service failure This is a placeholder for some meaningful description. Chocobomb. Closes: OCPBUGSM-29583 --- internal/ignition/ignition.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/internal/ignition/ignition.go b/internal/ignition/ignition.go index de6d5f430f1..93a70e34c59 100644 --- a/internal/ignition/ignition.go +++ b/internal/ignition/ignition.go @@ -139,7 +139,12 @@ const discoveryIgnitionConfigFormat = `{ "units": [{ "name": "agent.service", "enabled": true, - "contents": "[Service]\nType=simple\nRestart=always\nRestartSec=3\nStartLimitInterval=0\nEnvironment=HTTP_PROXY={{.HTTPProxy}}\nEnvironment=http_proxy={{.HTTPProxy}}\nEnvironment=HTTPS_PROXY={{.HTTPSProxy}}\nEnvironment=https_proxy={{.HTTPSProxy}}\nEnvironment=NO_PROXY={{.NoProxy}}\nEnvironment=no_proxy={{.NoProxy}}{{if .PullSecretToken}}\nEnvironment=PULL_SECRET_TOKEN={{.PullSecretToken}}{{end}}\nTimeoutStartSec={{.AgentTimeoutStartSec}}\nExecStartPre=podman run --privileged --rm -v /usr/local/bin:/hostbin {{.AgentDockerImg}} cp /usr/bin/agent /hostbin\nExecStart=/usr/local/bin/agent --url {{.ServiceBaseURL}} --cluster-id {{.clusterId}} --agent-version {{.AgentDockerImg}} --insecure={{.SkipCertVerification}} {{if .HostCACertPath}}--cacert {{.HostCACertPath}}{{end}}\n\n[Unit]\nWants=network-online.target\nAfter=network-online.target\n\n[Install]\nWantedBy=multi-user.target" + "contents": "[Service]\nType=simple\nRestart=always\nRestartSec=3\nStartLimitInterval=0\nEnvironment=HTTP_PROXY={{.HTTPProxy}}\nEnvironment=http_proxy={{.HTTPProxy}}\nEnvironment=HTTPS_PROXY={{.HTTPSProxy}}\nEnvironment=https_proxy={{.HTTPSProxy}}\nEnvironment=NO_PROXY={{.NoProxy}}\nEnvironment=no_proxy={{.NoProxy}}{{if .PullSecretToken}}\nEnvironment=PULL_SECRET_TOKEN={{.PullSecretToken}}{{end}}\nTimeoutStartSec={{.AgentTimeoutStartSec}}\nExecStartPre=podman run --privileged --rm -v /usr/local/bin:/hostbin {{.AgentDockerImg}} cp /usr/bin/agent /hostbin\nExecStart=/usr/local/bin/agent --url {{.ServiceBaseURL}} --cluster-id {{.clusterId}} --agent-version {{.AgentDockerImg}} --insecure={{.SkipCertVerification}} {{if .HostCACertPath}}--cacert {{.HostCACertPath}}{{end}}\n\n[Unit]\nWants=network-online.target\nAfter=network-online.target\nOnFailure=agent-image-cleanup.service\n[Install]\nWantedBy=multi-user.target" + }, + { + "name": "agent-image-cleanup.service", + "enabled": false, + "contents": "[Unit]\nDescription=Delete {{.AgentDockerImg}} podman image\n\n[Service]\nExecStart=podman rmi --force {{.AgentDockerImg}}", }, { "name": "selinux.service",