Git-Mirrors/constellation
1
0
Fork 0
mirror of https://github.com/edgelesssys/constellation.git synced 2025-06-20 12:14:23 -04:00
Code Issues Projects Releases Packages Wiki Activity

Cilium: avoid requirements for jq on Constellation OS

Browse source
This commit is contained in:
Malte Poll 2022-10-11 11:34:19 +02:00 • committed by Malte Poll
parent 981796574c
commit 9b57f2a91c
1 changed files with 20 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

23
bootstrapper/internal/kubernetes/k8sapi/k8sutil.go
View file

@ -288,13 +288,30 @@ func (k *KubernetesUtil) FixCilium(log *logger.Logger) {
} }
} }
// get cilium pod name // get cilium container id
out, err := exec.CommandContext(context.Background(), "/bin/bash", "-c", "/run/state/bin/crictl ps -o json | jq -r '.containers[] | select(.metadata.name == \"cilium-agent\") | .podSandboxId'").CombinedOutput() out, err := exec.CommandContext(context.Background(), "/run/state/bin/crictl", "ps", "--name", "cilium-agent", "-q").CombinedOutput()
if err != nil { if err != nil {
log.With(zap.Error(err)).Errorf("Getting pod id failed: %s", out) log.With(zap.Error(err)).Errorf("Getting cilium container id failed: %s", out)
return return
} }
outLines := strings.Split(string(out), "\n") outLines := strings.Split(string(out), "\n")
if len(outLines) < 2 {
log.Errorf("Getting cilium container id returned invalid output: %s", out)
return
}
containerID := outLines[len(outLines)-2]
// get cilium pod id
out, err = exec.CommandContext(context.Background(), "/run/state/bin/crictl", "inspect", "-o", "go-template", "--template", "{{ .info.sandboxID }}", containerID).CombinedOutput()
if err != nil {
log.With(zap.Error(err)).Errorf("Getting cilium pod id failed: %s", out)
return
}
outLines = strings.Split(string(out), "\n")
if len(outLines) < 2 {
log.Errorf("Getting cilium pod id returned invalid output: %s", out)
return
}
podID := outLines[len(outLines)-2] podID := outLines[len(outLines)-2]
// stop and delete pod // stop and delete pod