Skip to content

Commit

Permalink
Debian 11 will be EOL soon. Move to Debian 12 (#883)
Browse files Browse the repository at this point in the history
* Debian 11 will be EOL soon. Move to Debian 12

* Require go 1.22, 1.21 is eol

* Use latest golang in circleci

* Use latest setup-go github action with latest go version

* Makefile buildgo must match circleci config

* try newer ubuntu

* silence docker warning about AS case
  • Loading branch information
ptnapoleon authored Jul 23, 2024
1 parent ff15282 commit 4fde3fd
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 13 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ executors:
docker:
# This is circle ci images, provides default tool installed (like docker) to ease step definition and avoid apt-get/update things
# https://circleci.com/docs/circleci-images/#next-gen-language-images
- image: cimg/go:1.22.1
- image: cimg/go:1.22.5
resource_class: 2xlarge
python:
<<: *working_directory
Expand All @@ -93,7 +93,7 @@ executors:
ubuntu:
<<: *working_directory
machine:
image: ubuntu-2204:2024.01.2
image: ubuntu-2404:2024.05.1
resource_class: xlarge # if you change the resource_class here, please adapt Makefile/minikube start cpu/memory accordingly
jobs:
# prepares the CI environment by checking out the code,
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ jobs:
- name: Unshallow
run: git fetch --prune --unshallow
- name: Set up Go
uses: actions/setup-go@v1
uses: actions/setup-go@v5
with:
go-version: 1.22.x
go-version: '>=1.22.5'
- name: Install Helm
uses: azure/setup-helm@v1
with:
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ GOARCH = $(shell go env GOARCH)

# change also circleci go build version "cimb/go:" if you change the version below
# https://github.com/DataDog/chaos-controller/blob/main/.circleci/config.yml#L85
BUILDGOVERSION = 1.22.1
BUILDGOVERSION = 1.22.5

# GOBIN can be provided (gitlab), defined (custom user setup), or empty/guessed (default go setup)
GOBIN ?= $(shell go env GOBIN)
Expand Down
2 changes: 1 addition & 1 deletion bin/handler/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM scratch as handler
FROM scratch AS handler

ARG TARGETARCH
COPY handler_${TARGETARCH} /usr/local/bin/handler
Expand Down
6 changes: 3 additions & 3 deletions bin/injector/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:23.10 as binaries
FROM ubuntu:23.10 AS binaries

RUN apt-get update && \
# iproute2 => tc
Expand All @@ -20,7 +20,7 @@ RUN apt-get update && \
mv bpftool /usr/bin/bpftool-amd64


FROM gcr.io/distroless/python3-debian11:latest
FROM gcr.io/distroless/python3-debian12:latest

ARG TARGETARCH

Expand Down Expand Up @@ -51,7 +51,7 @@ ENTRYPOINT ["/usr/local/bin/chaos-injector"]

LABEL baseimage.os="debian"
LABEL baseimage.isgbi="custom"
LABEL baseimage.name="gcr.io/distroless/python3-debian11:latest"
LABEL baseimage.name="gcr.io/distroless/python3-debian12:latest"

ARG BUILDSTAMP
LABEL baseimage.buildstamp="${BUILDSTAMP}"
6 changes: 3 additions & 3 deletions bin/manager/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ARG BUILDGOVERSION
FROM golang:${BUILDGOVERSION} as go
FROM gcr.io/distroless/base-debian11:nonroot
FROM golang:${BUILDGOVERSION} AS go
FROM gcr.io/distroless/base-debian12:nonroot

ARG TARGETARCH
COPY manager_${TARGETARCH} /usr/local/bin/manager
Expand All @@ -13,7 +13,7 @@ ENTRYPOINT ["/usr/local/bin/manager"]

LABEL baseimage.os="debian"
LABEL baseimage.isgbi="custom"
LABEL baseimage.name="gcr.io/distroless/base-debian11:nonroot"
LABEL baseimage.name="gcr.io/distroless/base-debian12:nonroot"

ARG BUILDSTAMP
LABEL baseimage.buildstamp="${BUILDSTAMP}"
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/DataDog/chaos-controller

go 1.21
go 1.22

require (
github.com/AlecAivazis/survey/v2 v2.3.6
Expand Down

0 comments on commit 4fde3fd

Please sign in to comment.