Skip to content
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
10 changes: 5 additions & 5 deletions bin/install-rok8s-requirements
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ else
PKG_INSTALL="${PKG_MANAGER} install -y"
fi

AWS_CLI_VERSION="${AWS_CLI_VERSION:-2.17.5}"
KUBECTL_VERSION="${KUBECTL_VERSION:-v1.30.2}"
HELM_VERSION="${HELM_VERSION:-v3.15.2}"
SOPS_VERSION="${SOPS_VERSION:-v3.9.0}"
AWS_CLI_VERSION="${AWS_CLI_VERSION:-2.28.1}"
KUBECTL_VERSION="${KUBECTL_VERSION:-v1.34.2}"
HELM_VERSION="${HELM_VERSION:-v3.19.2}"
SOPS_VERSION="${SOPS_VERSION:-v3.11.0}"

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

Expand Down
12 changes: 12 additions & 0 deletions ci-images/cimg-24.04/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
FROM cimg/base:current-24.04

USER root

RUN apt-get update && \
apt-get upgrade -y && \
apt-get install -y -qq jq wget python3-pip python3-dev && \
apt-get clean && \
rm -rf /var/lib/apt/lists/*

COPY bin /usr/local/bin
RUN install-rok8s-requirements
2 changes: 1 addition & 1 deletion docs/ci-images.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ meta:

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.

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).
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).

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

Expand Down
2 changes: 1 addition & 1 deletion examples/ci/bitbucket-pipelines.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
image: quay.io/reactiveops/ci-images:v14.1-bullseye
image: quay.io/reactiveops/ci-images:v15.0-bullseye

aliases:
- &initialize-env |
Expand Down
2 changes: 1 addition & 1 deletion examples/minimal-sops-secrets/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ we run some of the scripts provided by rok8s-scripts. In particular, we use:
* `k8s-deploy-and-verify` to deploy our image to Kubernetes and make sure the deployment succeeded
* This also calls the `k8s-deploy-secrets` script to decrypt and deploy secrets

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

## Try it out
Expand Down
2 changes: 1 addition & 1 deletion examples/minimal/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ we run some of the scripts provided by rok8s-scripts. In particular, we use:
* `prepare-kubectl` to configure the `kubectl` command to be able to deploy resources to our Kubernetes cluster
* `k8s-deploy-and-verify` to deploy our image to Kubernetes and make sure the deployment succeeded

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

## Try it out
Expand Down
2 changes: 1 addition & 1 deletion orb/executors/ci-images.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
parameters:
version:
type: string
default: "v14.1-bullseye"
default: "v15.0-bullseye"
docker:
- image: quay.io/reactiveops/ci-images:<<parameters.version>>
2 changes: 1 addition & 1 deletion orb/executors/default.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
parameters:
version:
type: string
default: "v14.1-bullseye"
default: "v15.0-bullseye"
docker:
- image: quay.io/reactiveops/ci-images:<<parameters.version>>
2 changes: 1 addition & 1 deletion orb/jobs/kubernetes_e2e_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ parameters:
command_runner_image:
description: "The image to execute commands from against the kind cluster. Also where the script gets executed."
type: string
default: "quay.io/reactiveops/ci-images:v14.1-alpine"
default: "quay.io/reactiveops/ci-images:v15.0-alpine"
pre_script:
description: "Script to run on the local machine before running script on command runner."
type: string
Expand Down