Skip to content

Commit dbb0845

Browse files
authored
feat: add a cimg/base (ubuntu) image. Prep v15 release (#461)
* feat: add an image for trixie and update some bin versions BREAKING CHANGE: v15 will default to Trixie * feat: use cimg/base instead * feat: move to cimg 24.04 * fix: update kubectl download path * feat: prep v15 release
1 parent 25b9669 commit dbb0845

File tree

9 files changed

+24
-12
lines changed

9 files changed

+24
-12
lines changed

bin/install-rok8s-requirements

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ else
3232
PKG_INSTALL="${PKG_MANAGER} install -y"
3333
fi
3434

35-
AWS_CLI_VERSION="${AWS_CLI_VERSION:-2.17.5}"
36-
KUBECTL_VERSION="${KUBECTL_VERSION:-v1.30.2}"
37-
HELM_VERSION="${HELM_VERSION:-v3.15.2}"
38-
SOPS_VERSION="${SOPS_VERSION:-v3.9.0}"
35+
AWS_CLI_VERSION="${AWS_CLI_VERSION:-2.28.1}"
36+
KUBECTL_VERSION="${KUBECTL_VERSION:-v1.34.2}"
37+
HELM_VERSION="${HELM_VERSION:-v3.19.2}"
38+
SOPS_VERSION="${SOPS_VERSION:-v3.11.0}"
3939

4040
# make sure sudo is installed
4141
if ! hash sudo 2>/dev/null; then
@@ -101,7 +101,7 @@ hash aws
101101
# make sure kubectl is installed
102102
if ! hash kubectl 2>/dev/null; then
103103
echo Installing kubectl...
104-
wget -q "https://storage.googleapis.com/kubernetes-release/release/${KUBECTL_VERSION}/bin/linux/amd64/kubectl" -O "${ROK8S_INSTALL_PATH}/kubectl"
104+
wget -q "https://dl.k8s.io/release/${KUBECTL_VERSION}/bin/linux/amd64/kubectl" -O "${ROK8S_INSTALL_PATH}/kubectl"
105105
chmod +x "${ROK8S_INSTALL_PATH}/kubectl"
106106
fi
107107

ci-images/cimg-24.04/Dockerfile

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
FROM cimg/base:current-24.04
2+
3+
USER root
4+
5+
RUN apt-get update && \
6+
apt-get upgrade -y && \
7+
apt-get install -y -qq jq wget python3-pip python3-dev && \
8+
apt-get clean && \
9+
rm -rf /var/lib/apt/lists/*
10+
11+
COPY bin /usr/local/bin
12+
RUN install-rok8s-requirements

docs/ci-images.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ meta:
77

88
Each new release of rok8s-scripts generates CI images for common workflows. These images include a set of common CI/CD dependencies, including Docker, Kubernetes, Helm, AWS, and Google Cloud client libraries. Starting with these images as a base for deployment workflows ensures that you don't need to spend any build time installing extra dependencies.
99

10-
We currently include CI Images based on Alpine and Debian Buster as our recommended starting points. The latest Debian Buster release can be pulled from `quay.io/reactiveops/ci-images:v14.1-bullseye`. A full list of image tags is available on our [Quay repository](https://quay.io/repository/reactiveops/ci-images).
10+
We currently include CI Images based on Alpine and Debian Buster as our recommended starting points. The latest Debian Buster release can be pulled from `quay.io/reactiveops/ci-images:v15.0-bullseye`. A full list of image tags is available on our [Quay repository](https://quay.io/repository/reactiveops/ci-images).
1111

1212
**Deprecation Notice** As of v10 and onward, alpine and stretch will be the only available images.
1313

examples/ci/bitbucket-pipelines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
image: quay.io/reactiveops/ci-images:v14.1-bullseye
1+
image: quay.io/reactiveops/ci-images:v15.0-bullseye
22

33
aliases:
44
- &initialize-env |

examples/minimal-sops-secrets/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ we run some of the scripts provided by rok8s-scripts. In particular, we use:
1919
* `k8s-deploy-and-verify` to deploy our image to Kubernetes and make sure the deployment succeeded
2020
* This also calls the `k8s-deploy-secrets` script to decrypt and deploy secrets
2121

22-
We also use the rok8s-scripts CI image, `quay.io/reactiveops/ci-images:v14.1-bullseye`,
22+
We also use the rok8s-scripts CI image, `quay.io/reactiveops/ci-images:v15.0-bullseye`,
2323
to ensure rok8s-scripts and its dependencies are available during the build and deploy jobs.
2424

2525
## Try it out

examples/minimal/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ we run some of the scripts provided by rok8s-scripts. In particular, we use:
1818
* `prepare-kubectl` to configure the `kubectl` command to be able to deploy resources to our Kubernetes cluster
1919
* `k8s-deploy-and-verify` to deploy our image to Kubernetes and make sure the deployment succeeded
2020

21-
We also use the rok8s-scripts CI image, `quay.io/reactiveops/ci-images:v14.1-bullseye`,
21+
We also use the rok8s-scripts CI image, `quay.io/reactiveops/ci-images:v15.0-bullseye`,
2222
to ensure rok8s-scripts and its dependencies are available during the build and deploy jobs.
2323

2424
## Try it out

orb/executors/ci-images.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
parameters:
22
version:
33
type: string
4-
default: "v14.1-bullseye"
4+
default: "v15.0-bullseye"
55
docker:
66
- image: quay.io/reactiveops/ci-images:<<parameters.version>>

orb/executors/default.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
parameters:
22
version:
33
type: string
4-
default: "v14.1-bullseye"
4+
default: "v15.0-bullseye"
55
docker:
66
- image: quay.io/reactiveops/ci-images:<<parameters.version>>

orb/jobs/kubernetes_e2e_tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ parameters:
5050
command_runner_image:
5151
description: "The image to execute commands from against the kind cluster. Also where the script gets executed."
5252
type: string
53-
default: "quay.io/reactiveops/ci-images:v14.1-alpine"
53+
default: "quay.io/reactiveops/ci-images:v15.0-alpine"
5454
pre_script:
5555
description: "Script to run on the local machine before running script on command runner."
5656
type: string

0 commit comments

Comments
 (0)