diff --git a/demo/Dockerfile b/demo/Dockerfile index c59271d55..472614d3c 100644 --- a/demo/Dockerfile +++ b/demo/Dockerfile @@ -23,7 +23,7 @@ RUN CGO_ENABLED=0 make -C /src VERSION="${VERSION:-dev}" karma FROM alpine:3.13 COPY --from=ghcr.io/prymitive/kthxbye:v0.11 /kthxbye /kthxbye -COPY --from=prom/alertmanager:v0.22.0-rc.1 /bin/alertmanager /alertmanager +COPY --from=prom/alertmanager:v0.22.0 /bin/alertmanager /alertmanager RUN apk add supervisor python3 && rm -rf /tmp/* /var/cache/apk/* COPY demo/supervisord.conf /etc/supervisord.conf COPY demo/alertmanager.yaml /etc/alertmanager.yaml diff --git a/internal/mapper/v017/Makefile b/internal/mapper/v017/Makefile index e78d4656b..b58ffe158 100644 --- a/internal/mapper/v017/Makefile +++ b/internal/mapper/v017/Makefile @@ -1,4 +1,4 @@ -ALERTMANAGER_VERSION := v0.21.0 +ALERTMANAGER_VERSION := v0.22.0 API_VERSION := v2 PACKAGE := v017 TARGET_DIR := /go/src/github.com/prymitive/karma/internal/mapper/$(PACKAGE) diff --git a/internal/mock/0.22.0-rc.1/.ok b/internal/mock/0.22.0/.ok similarity index 100% rename from internal/mock/0.22.0-rc.1/.ok rename to internal/mock/0.22.0/.ok diff --git a/internal/mock/0.22.0-rc.1/api/v2/alerts/groups b/internal/mock/0.22.0/api/v2/alerts/groups similarity index 100% rename from internal/mock/0.22.0-rc.1/api/v2/alerts/groups rename to internal/mock/0.22.0/api/v2/alerts/groups diff --git a/internal/mock/0.22.0-rc.1/api/v2/silences b/internal/mock/0.22.0/api/v2/silences similarity index 100% rename from internal/mock/0.22.0-rc.1/api/v2/silences rename to internal/mock/0.22.0/api/v2/silences diff --git a/internal/mock/0.22.0-rc.1/api/v2/status b/internal/mock/0.22.0/api/v2/status similarity index 100% rename from internal/mock/0.22.0-rc.1/api/v2/status rename to internal/mock/0.22.0/api/v2/status diff --git a/internal/mock/0.22.0-rc.1/metrics b/internal/mock/0.22.0/metrics similarity index 100% rename from internal/mock/0.22.0-rc.1/metrics rename to internal/mock/0.22.0/metrics diff --git a/internal/mock/Makefile b/internal/mock/Makefile index ce7695453..9d9a15464 100644 --- a/internal/mock/Makefile +++ b/internal/mock/Makefile @@ -5,7 +5,7 @@ DOCKER_ARGS := --name $(DOCKER_NAME) --rm -d -p 9093:9093 \ -v $(CURDIR)/alertmanager.yml:/etc/alertmanager/alertmanager.yml # list of Alertmanager versions to generate mock files for -VERSIONS := 0.19.0 0.20.0 0.21.0 0.22.0-rc.1 +VERSIONS := 0.19.0 0.20.0 0.21.0 0.22.0 %/.ok: livemock.py $(eval VERSION := $(word 1, $(subst /, ,$@)))