mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2025-01-29 16:19:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #238 from red-hat-storage/sync_us--devel

Browse Source 
Syncing latest changes from upstream devel for ceph-csi
This commit is contained in:
openshift-merge-bot[bot] 2023-12-21 08:54:45 +00:00 committed by GitHub
commit c9697c0bc3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/snyk-container-image.yaml vendored
View File

@ -38,6 +38,6 @@ jobs:
image: quay.io/cephcsi/cephcsi:${{ github.base_ref }} image: quay.io/cephcsi/cephcsi:${{ github.base_ref }}
args: --file=Dockerfilei args: --file=Dockerfilei
- name: Upload result to GitHub Code Scanning - name: Upload result to GitHub Code Scanning
uses: github/codeql-action/upload-sarif@v2 uses: github/codeql-action/upload-sarif@v3
with: with:
sarif_file: snyk.sarif sarif_file: snyk.sarif

6
build.env
View File

@ -12,21 +12,21 @@
CSI_IMAGE_VERSION=canary CSI_IMAGE_VERSION=canary
# cephcsi upgrade version # cephcsi upgrade version
CSI_UPGRADE_VERSION=v3.10.0 CSI_UPGRADE_VERSION=v3.10.1
# Ceph version to use # Ceph version to use
BASE_IMAGE=quay.io/ceph/ceph:v18 BASE_IMAGE=quay.io/ceph/ceph:v18
CEPH_VERSION=reef CEPH_VERSION=reef
# standard Golang options # standard Golang options
GOLANG_VERSION=1.20.4 GOLANG_VERSION=1.21.5
GO111MODULE=on GO111MODULE=on
# commitlint version # commitlint version
COMMITLINT_VERSION=latest COMMITLINT_VERSION=latest
# static checks and linters # static checks and linters
GOLANGCI_VERSION=v1.53.0 GOLANGCI_VERSION=v1.54.1
# external snapshotter version # external snapshotter version
# Refer: https://github.com/kubernetes-csi/external-snapshotter/releases # Refer: https://github.com/kubernetes-csi/external-snapshotter/releases

2
deploy/cephcsi/image/Dockerfile
View File

@ -10,6 +10,8 @@ FROM ${BASE_IMAGE} as updated_base
RUN dnf config-manager --disable \ RUN dnf config-manager --disable \
tcmu-runner,tcmu-runner-source,tcmu-runner-noarch,ceph-iscsi,ganesha || true tcmu-runner,tcmu-runner-source,tcmu-runner-noarch,ceph-iscsi,ganesha || true
RUN mkdir /etc/selinux || true && touch /etc/selinux/config
RUN dnf -y update --nobest \ RUN dnf -y update --nobest \
&& dnf -y install nfs-utils \ && dnf -y install nfs-utils \
&& dnf clean all \ && dnf clean all \

2
scripts/Dockerfile.devel
View File

@ -23,6 +23,8 @@ RUN source /build.env \
RUN dnf config-manager --disable \ RUN dnf config-manager --disable \
tcmu-runner,tcmu-runner-source,tcmu-runner-noarch,ceph-iscsi,ganesha || true tcmu-runner,tcmu-runner-source,tcmu-runner-noarch,ceph-iscsi,ganesha || true
RUN mkdir /etc/selinux || true && touch /etc/selinux/config
RUN dnf -y install \ RUN dnf -y install \
git \ git \
make \ make \

2
scripts/Dockerfile.test
View File

@ -23,6 +23,8 @@ ENV \
COPY build.env / COPY build.env /
RUN mkdir /etc/selinux || true && touch /etc/selinux/config
RUN source /build.env \ RUN source /build.env \
&& \ && \
( test -n "${GOARCH}" && exit 0; echo -e "\n\nMissing GOARCH argument for building image, install Golang or run: make containerized-test GOARCH=amd64\n\n"; exit 1 ) \ ( test -n "${GOARCH}" && exit 0; echo -e "\n\nMissing GOARCH argument for building image, install Golang or run: make containerized-test GOARCH=amd64\n\n"; exit 1 ) \