diff --git a/.github/workflows/kindIntegTest.yml b/.github/workflows/kindIntegTest.yml index 4baae2c4..d013b276 100644 --- a/.github/workflows/kindIntegTest.yml +++ b/.github/workflows/kindIntegTest.yml @@ -88,7 +88,7 @@ jobs: strategy: matrix: version: - - "4.0.14" + - "4.0.15" integration_test: - cdc_successful # OSS only - config_fql @@ -117,12 +117,12 @@ jobs: strategy: matrix: version: - - "6.8.51" + - "6.8.52" integration_test: - cdc_successful include: - - version: 6.8.51 - serverImage: datastax/dse-mgmtapi-6_8:6.8.51-ubi8 # DSE 6.8.51 + - version: 6.8.52 + serverImage: datastax/dse-mgmtapi-6_8:6.8.52-ubi8 # DSE 6.8.51 serverType: dse integration_test: "cdc_successful" fail-fast: true @@ -155,7 +155,7 @@ jobs: strategy: matrix: version: - - "5.0.1" + - "5.0.2" integration_test: # Single worker tests: - additional_serviceoptions @@ -233,19 +233,19 @@ jobs: version: - "4.0.14" - "4.1.7" - - "5.0.1" - - "6.8.51" - - "6.9.2" + - "5.0.2" + - "6.8.52" + - "6.9.5" - "1.0.0" integration_test: - test_all_the_things - smoke_test_read_only_fs include: - version: 6.8.51 - serverImage: datastax/dse-mgmtapi-6_8:6.8.51-ubi8 # DSE 6.8.51 + serverImage: datastax/dse-mgmtapi-6_8:6.8.52-ubi8 # DSE 6.8.52 serverType: dse - version: 6.9.2 - serverImage: datastax/dse-mgmtapi-6_8:6.9.2-ubi # DSE 6.9.2 + serverImage: datastax/dse-mgmtapi-6_8:6.9.5-ubi # DSE 6.9.5 serverType: dse - version: 1.0.0 serverImage: datastax/hcd:1.0.0-ubi # HCD 1.0.0 @@ -283,7 +283,7 @@ jobs: strategy: matrix: version: - - "5.0.1" + - "5.0.2" integration_test: - pvc_expansion fail-fast: true @@ -306,7 +306,7 @@ jobs: with: repository: topolvm/topolvm path: topolvm - ref: topolvm-chart-v15.2.0 + ref: topolvm-chart-v15.5.0 - name: Create LVM from TopoLVM's example setup run: | cd topolvm/example diff --git a/.github/workflows/operatorBuildAndDeploy.yml b/.github/workflows/operatorBuildAndDeploy.yml index 7d554c13..e729fafd 100644 --- a/.github/workflows/operatorBuildAndDeploy.yml +++ b/.github/workflows/operatorBuildAndDeploy.yml @@ -3,7 +3,6 @@ on: push: branches: - master - - 1.10.x pull_request: branches: [ master ] jobs: diff --git a/Dockerfile b/Dockerfile index 730d7fe8..cbc794ea 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,7 +21,7 @@ COPY internal/ internal/ RUN CGO_ENABLED=0 GOOS=${TARGETOS:-linux} GOARCH=${TARGETARCH} go build -a -o manager cmd/main.go # Build the UBI image -FROM redhat/ubi8-micro:latest +FROM redhat/ubi9-micro:latest ARG VERSION diff --git a/logger.Dockerfile b/logger.Dockerfile index fd7c5f2a..6cef79b6 100644 --- a/logger.Dockerfile +++ b/logger.Dockerfile @@ -1,16 +1,16 @@ -FROM redhat/ubi8:latest AS builder +FROM redhat/ubi9:latest AS builder ARG VERSION ARG TARGETPLATFORM # Install Vector -ENV VECTOR_VERSION=0.39.0 +ENV VECTOR_VERSION=0.43.1 RUN case ${TARGETPLATFORM} in \ "linux/amd64") VECTOR_ARCH=x86_64 ;; \ "linux/arm64") VECTOR_ARCH=aarch64 ;; \ esac \ && rpm -i https://packages.timber.io/vector/${VECTOR_VERSION}/vector-${VECTOR_VERSION}-1.${VECTOR_ARCH}.rpm -FROM redhat/ubi8-micro:latest +FROM redhat/ubi9-micro:latest ARG VERSION ARG TARGETPLATFORM