Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update argocd to 2.8.6 #1146

Merged
merged 4 commits into from
Nov 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion admission/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
CONTROLLER_TOOLS_VERSION = 0.12.0
KUSTOMIZE_VERSION = 4.5.7
CONTOUR_VERSION = 1.26.0
ARGOCD_VERSION = 2.6.8
ARGOCD_VERSION = 2.8.6
GRAFANA_OPERATOR_V4_VERSION = 4.10.1
GRAFANA_OPERATOR_VERSION = 5.4.1
ENVTEST_K8S_VERSION = 1.27.1
Expand Down
4 changes: 2 additions & 2 deletions argocd/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ RUN chmod +x /usr/local/bin/tini-static
# We cannot use Ubuntu 22.04 (jammy) image because the combination of
# jammy and Node.js v12 is not provided by the NodeSource Node.js Binary
# Distributions.
FROM quay.io/cybozu/golang:1.20-focal AS argocd-build
ENV ARGOCD_VERSION=2.8.3
FROM quay.io/cybozu/golang:1.21-focal AS argocd-build
ENV ARGOCD_VERSION=2.8.6
ENV PACKAGE=github.com/argoproj/argo-cd

SHELL ["/bin/bash", "-o", "pipefail", "-c"]
Expand Down
2 changes: 1 addition & 1 deletion argocd/TAG
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.8.3.1
2.8.6.1
4 changes: 2 additions & 2 deletions dex/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# dex container image

# Stage1: build from source
FROM quay.io/cybozu/golang:1.20-focal AS build
FROM quay.io/cybozu/golang:1.21-jammy AS build

ARG DEX_VERSION=2.37.0

Expand All @@ -13,7 +13,7 @@ RUN curl -sSLf https://github.com/dexidp/dex/archive/v${DEX_VERSION}.tar.gz | \
RUN make bin/dex VERSION=v${DEX_VERSION}

# Stage2: setup runtime container
FROM quay.io/cybozu/ubuntu:20.04
FROM quay.io/cybozu/ubuntu:22.04

COPY --from=build /work/dex/bin/dex /usr/local/bin/dex
COPY --from=build /work/dex/LICENSE /usr/local/share/doc/dex/LICENSE
Expand Down
2 changes: 1 addition & 1 deletion dex/TAG
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.37.0.1
2.37.0.2
2 changes: 1 addition & 1 deletion haproxy/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ ENV DEBIAN_FRONTEND noninteractive

RUN mkdir -p /var/lib/haproxy && \
mkdir -p /usr/local/haproxy && \
mkdir -p /usr/local/bin
mkdir -p /usr/local/bin

COPY --from=build /usr/local/sbin/haproxy /usr/local/bin/haproxy
COPY --from=build /tmp/haproxy/examples/errorfiles /usr/etc/haproxy/errors
Expand Down
2 changes: 1 addition & 1 deletion haproxy/TAG
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.6.14.1
2.6.14.2
2 changes: 1 addition & 1 deletion redis/TAG
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7.0.11.1
7.0.11.2