From 34f56935b9becf2c9664f05064b07a9fef157a3d Mon Sep 17 00:00:00 2001 From: Serge Bazanski Date: Mon, 8 Feb 2021 17:53:44 +0100 Subject: [PATCH] app/matrix/telegram: re-pin alpine to 3.13 Newer versions of alpine edge repos have a `yq` that behaves oddly: $ kubectl -n matrix-0x3c logs -f appservice-telegram-prod-85d66696c6-9drnl -c generate-config + apk add --no-cache yq fetch https://dl-cdn.alpinelinux.org/alpine/edge/main/x86_64/APKINDEX.tar.gz fetch https://dl-cdn.alpinelinux.org/alpine/edge/community/x86_64/APKINDEX.tar.gz (1/1) Installing yq (4.4.1-r0) Executing busybox-1.31.1-r21.trigger ERROR: busybox-1.31.1-r21.trigger: script exited with error 127 OK: 11 MiB in 15 packages + cp /config/config.yaml /data/config.yaml + yq r /registration/registration.yaml as_token Error: unknown command "r" for "yq" Run 'yq --help' for usage. + yq w -i /data/config.yaml appservice.as_token Error: unknown command "w" for "yq" Run 'yq --help' for usage. This downgrades back to a working yq. Change-Id: Ifc77bcc88156b02f3ec17e6f84c5615149108777 --- app/matrix/lib/appservice-telegram.libsonnet | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/matrix/lib/appservice-telegram.libsonnet b/app/matrix/lib/appservice-telegram.libsonnet index fd2a9a0e..6700fbc5 100644 --- a/app/matrix/lib/appservice-telegram.libsonnet +++ b/app/matrix/lib/appservice-telegram.libsonnet @@ -113,9 +113,7 @@ local kube = import "../../../kube/kube.libsonnet"; registration: { mountPath: "/registration", }, data: { mountPath: "/data" }, }, - // Ow, the edge! We need yq. - // See: https://github.com/mikefarah/yq/issues/190#issuecomment-667519015 - image: "alpine@sha256:156f59dc1cbe233827642e09ed06e259ef6fa1ca9b2e29d52ae14d5e7b79d7f0", + image: "alpine:3.13", command: [ "sh", "-c", ||| set -e -x