Skip to content

Commit 0834e9d

Browse files
authored
Update some dependencies (#447)
* update dependencies * prep 13.1 release * Fix helm version
1 parent b1bfc86 commit 0834e9d

File tree

9 files changed

+12
-12
lines changed

9 files changed

+12
-12
lines changed

bin/install-rok8s-requirements

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

35-
AWS_CLI_VERSION="${AWS_CLI_VERSION:-2.13.8}"
36-
KUBECTL_VERSION="${KUBECTL_VERSION:-v1.25.12}"
37-
HELM_VERSION="${HELM_VERSION:-v3.12.2}"
35+
AWS_CLI_VERSION="${AWS_CLI_VERSION:-2.13.24}"
36+
KUBECTL_VERSION="${KUBECTL_VERSION:-v1.25.14}"
37+
HELM_VERSION="${HELM_VERSION:-v3.13.0}"
3838
SOPS_VERSION="${SOPS_VERSION:-v3.7.3}"
3939

4040
# make sure sudo is installed

ci-images/alpine/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM python:3.11-alpine3.18 as builder
22

3-
ARG AWS_CLI_VERSION=2.11.15
3+
ARG AWS_CLI_VERSION=2.13.24
44
RUN apk add --no-cache git unzip groff build-base libffi-dev cmake
55
RUN git clone --single-branch --depth 1 -b ${AWS_CLI_VERSION} https://github.com/aws/aws-cli.git
66

@@ -19,7 +19,7 @@ RUN find /usr/local/lib/aws-cli/awscli/botocore/data -name examples-1.json -dele
1919
RUN (cd /usr/local/lib/aws-cli; for a in *.so*; do test -f /lib/$a && rm $a; done)
2020

2121

22-
FROM docker:24.0.5
22+
FROM docker:24.0.6
2323

2424
USER root
2525

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:v13.0-buster`. 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:v13.1-buster`. 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:v13.0-buster
1+
image: quay.io/reactiveops/ci-images:v13.1-buster
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:v13.0-buster`,
22+
We also use the rok8s-scripts CI image, `quay.io/reactiveops/ci-images:v13.1-buster`,
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:v13.0-buster`,
21+
We also use the rok8s-scripts CI image, `quay.io/reactiveops/ci-images:v13.1-buster`,
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: "v13.0-bullseye"
4+
default: "v13.1-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: "v13.0-bullseye"
4+
default: "v13.1-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:v13.0-alpine"
53+
default: "quay.io/reactiveops/ci-images:v13.1-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)