From 4ed8cc352ad661b1af6473850226d95c9313490d Mon Sep 17 00:00:00 2001 From: Craig Ingram Date: Thu, 3 Aug 2023 10:53:58 -0400 Subject: [PATCH 1/3] Bumped redis version --- .github/workflows/release.yml | 2 +- Dockerfile.node | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b939ce04..b4780ebd 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -8,7 +8,7 @@ on: env: GO_VERSION: ^1.20 HELM_VERSION: v3.11.2 - REDIS_VERSION: 6.2.7 + REDIS_VERSION: 6.2.13 CRD_PATH: charts/operator-for-redis/crds/db.ibm.com_redisclusters.yaml CRD_DIFF: crd.diff diff --git a/Dockerfile.node b/Dockerfile.node index c1d795e7..18fcec5d 100644 --- a/Dockerfile.node +++ b/Dockerfile.node @@ -1,4 +1,4 @@ -ARG REDIS_VERSION=6.2.7 +ARG REDIS_VERSION=6.2.13 ARG BUILDIMAGE=golang:1.20-bullseye ARG BASEIMAGE=redis:${REDIS_VERSION}-bullseye ARG DOCKER_PROXY_REGISTRY From 1e1c191414113711336e6d23b86780f05b639549 Mon Sep 17 00:00:00 2001 From: Craig Ingram Date: Thu, 3 Aug 2023 11:06:45 -0400 Subject: [PATCH 2/3] Updating from bullseye to bookworm --- Dockerfile.metrics | 4 ++-- Dockerfile.node | 4 ++-- Dockerfile.operator | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile.metrics b/Dockerfile.metrics index 2910f5a5..db26fca1 100644 --- a/Dockerfile.metrics +++ b/Dockerfile.metrics @@ -1,5 +1,5 @@ -ARG BUILDIMAGE=golang:1.20-bullseye -ARG BASEIMAGE=debian:bullseye-slim +ARG BUILDIMAGE=golang:1.20-bookworm +ARG BASEIMAGE=debian:bookworm-slim ARG DOCKER_PROXY_REGISTRY FROM ${DOCKER_PROXY_REGISTRY}${BUILDIMAGE} AS builder diff --git a/Dockerfile.node b/Dockerfile.node index 18fcec5d..2bb16811 100644 --- a/Dockerfile.node +++ b/Dockerfile.node @@ -1,6 +1,6 @@ ARG REDIS_VERSION=6.2.13 -ARG BUILDIMAGE=golang:1.20-bullseye -ARG BASEIMAGE=redis:${REDIS_VERSION}-bullseye +ARG BUILDIMAGE=golang:1.20-bookworm +ARG BASEIMAGE=redis:${REDIS_VERSION}-bookworm ARG DOCKER_PROXY_REGISTRY FROM ${DOCKER_PROXY_REGISTRY}${BUILDIMAGE} AS builder diff --git a/Dockerfile.operator b/Dockerfile.operator index d5fc3a95..9a306c64 100644 --- a/Dockerfile.operator +++ b/Dockerfile.operator @@ -1,5 +1,5 @@ -ARG BUILDIMAGE=golang:1.20-bullseye -ARG BASEIMAGE=debian:bullseye-slim +ARG BUILDIMAGE=golang:1.20-bookworm +ARG BASEIMAGE=debian:bookworm-slim ARG DOCKER_PROXY_REGISTRY FROM ${DOCKER_PROXY_REGISTRY}${BUILDIMAGE} AS builder From 484f06384c0dd4c640d6252cfdafa36d749e7959 Mon Sep 17 00:00:00 2001 From: Craig Ingram Date: Thu, 3 Aug 2023 11:27:26 -0400 Subject: [PATCH 3/3] Bumping kind node images and fixed readme doc link --- .github/workflows/pull_request.yml | 8 ++++---- README.md | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index e72e3896..c6504f09 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -138,13 +138,13 @@ jobs: kubernetes-version: [ "1.26" ] #, "1.25", "1.24", "1.23"] include: - kubernetes-version: "1.26" - kind-node: kindest/node:v1.26.3@sha256:61b92f38dff6ccc29969e7aa154d34e38b89443af1a2c14e6cfbd2df6419c66f + kind-node: kindest/node:v1.26.6@sha256:6e2d8b28a5b601defe327b98bd1c2d1930b49e5d8c512e1895099e4504007adb # - kubernetes-version: "1.25" - # kind-node: kindest/node:v1.25.8@sha256:00d3f5314cc35327706776e95b2f8e504198ce59ac545d0200a89e69fce10b7f + # kind-node: kindest/node:v1.25.11@sha256:227fa11ce74ea76a0474eeefb84cb75d8dad1b08638371ecf0e86259b35be0c8 # - kubernetes-version: "1.24" - # kind-node: kindest/node:v1.24.12@sha256:1e12918b8bc3d4253bc08f640a231bb0d3b2c5a9b28aa3f2ca1aee93e1e8db16 + # kind-node: kindest/node:v1.24.15@sha256:7db4f8bea3e14b82d12e044e25e34bd53754b7f2b0e9d56df21774e6f66a70ab # - kubernetes-version: "1.23" - # kind-node: kindest/node:v1.23.17@sha256:e5fd1d9cd7a9a50939f9c005684df5a6d145e8d695e78463637b79464292e66c + # kind-node: kindest/node:v1.23.17@sha256:59c989ff8a517a93127d4a536e7014d28e235fb3529d9fba91b3951d461edfdb steps: - name: Checkout uses: actions/checkout@v3 diff --git a/README.md b/README.md index 08a94491..629d0f47 100644 --- a/README.md +++ b/README.md @@ -6,4 +6,4 @@ The goal of this project is to simplify the deployment and management of a [Redi ## Documentation -This project's documentation is hosted at https://ibm.github.io/operator-for-redis-cluster. +This project's documentation is hosted at https://cin.github.io/operator-for-redis-cluster.