Skip to content

Commit 1748602

Browse files
loktev-dnevermarine
authored andcommitted
fix(ci): fix mirrord health probes and certificate paths (#1547)
Fixed mirrord local development setup for both virtualization-controller and virtualization-api: 1. Health probes removal: Modified mirrord.sh to remove livenessProbe and readinessProbe from the mirrored container (alpine sleep container) to prevent probe failures. 2. Certificate path fix: Set TMPDIR=/tmp in both mirrord tasks to ensure os.TempDir() returns /tmp for macOS, matching the certificate mount path in pods (/tmp/k8s-webhook-server/serving-certs). 3. Typo fix: Corrected certificate path typos in apiserver task: virtualziation → virtualization. Signed-off-by: Daniil Loktev <[email protected]> (cherry picked from commit 5e96206) Signed-off-by: Maksim Fedotov <[email protected]>
1 parent 5bb340c commit 1748602

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

images/virtualization-artifact/Taskfile.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ tasks:
7272
deps:
7373
- _ensure:mirrord
7474
cmd: |
75-
./hack/mirrord.sh run --app=$PWD/cmd/virtualization-controller/main.go \
75+
TMPDIR=/tmp ./hack/mirrord.sh run --app=$PWD/cmd/virtualization-controller/main.go \
7676
--deployment=virtualization-controller \
7777
--namespace={{ .BaseNamespace }} \
7878
--container-name=virtualization-controller
@@ -92,15 +92,15 @@ tasks:
9292
flags+=( "--kubevirt-cabundle=/etc/virt-api/certificates/ca.crt" )
9393
flags+=( "--kubevirt-endpoint=virt-api.{{ .BaseNamespace }}.svc" )
9494
flags+=( "--secure-port=8443" )
95-
flags+=( "--tls-private-key-file=/etc/virtualziation-api/certificates/tls.key" )
96-
flags+=( "--tls-cert-file=/etc/virtualziation-api/certificates/tls.crt" )
95+
flags+=( "--tls-private-key-file=/etc/virtualization-api/certificates/tls.key" )
96+
flags+=( "--tls-cert-file=/etc/virtualization-api/certificates/tls.crt" )
9797
flags+=( "--v=7" )
98-
flags+=( "--proxy-client-cert-file=/etc/virtualziation-api-proxy/certificates/tls.crt" )
99-
flags+=( "--proxy-client-key-file=/etc/virtualziation-api-proxy/certificates/tls.key" )
98+
flags+=( "--proxy-client-cert-file=/etc/virtualization-api-proxy/certificates/tls.crt" )
99+
flags+=( "--proxy-client-key-file=/etc/virtualization-api-proxy/certificates/tls.key" )
100100
flags+=( "--service-account-name=virtualization-api" )
101101
flags+=( "--service-account-namespace={{ .BaseNamespace }}" )
102102
103-
./hack/mirrord.sh run --app="$PWD/cmd/virtualization-api/main.go" \
103+
TMPDIR=/tmp ./hack/mirrord.sh run --app="$PWD/cmd/virtualization-api/main.go" \
104104
--deployment="virtualization-api" \
105105
--namespace="{{ .BaseNamespace }}" \
106106
--flags="\"${flags[@]}\""

images/virtualization-artifact/hack/mirrord.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ chmod +x "${BIN_DIR}/${BINARY}"
103103
if ! kubectl -n "${NAMESPACE}" get "deployment/${NEW_NAME}" &>/dev/null; then
104104
kubectl -n "${NAMESPACE}" get "deployment/${DEPLOYMENT}" -ojson | \
105105
jq --arg CONTAINER_NAME "$CONTAINER_NAME" --arg NEW_NAME "$NEW_NAME" '.metadata.name = $NEW_NAME |
106-
(.spec.template.spec.containers[] | select(.name == $CONTAINER_NAME) ) |= (.command= [ "/bin/sh", "-c", "--" ] | .args = [ "while true; do sleep 60; done;" ] | .image = "alpine:3.20.1") |
106+
(.spec.template.spec.containers[] | select(.name == $CONTAINER_NAME) ) |= (.command= [ "/bin/sh", "-c", "--" ] | .args = [ "while true; do sleep 60; done;" ] | .image = "alpine:3.20.1" | del(.livenessProbe) | del(.readinessProbe)) |
107107
.spec.replicas = 1 |
108108
.spec.template.metadata.labels.mirror = "true" |
109109
.spec.template.metadata.labels.ownerName = $NEW_NAME' | \

0 commit comments

Comments
 (0)