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

Syncing latest changes from upstream devel for ceph-csi
nixpanic · Dec 21, 2023 · c9697c0 · c9697c0
2 parents cee8525 + 1ad7931
commit c9697c0
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git a/.github/workflows/snyk-container-image.yaml b/.github/workflows/snyk-container-image.yaml
@@ -38,6 +38,6 @@ jobs:
           image: quay.io/cephcsi/cephcsi:${{ github.base_ref }}
           args: --file=Dockerfilei
       - name: Upload result to GitHub Code Scanning
-        uses: github/codeql-action/upload-sarif@v2
+        uses: github/codeql-action/upload-sarif@v3
         with:
           sarif_file: snyk.sarif
diff --git a/build.env b/build.env
@@ -12,21 +12,21 @@
 CSI_IMAGE_VERSION=canary
 
 # cephcsi upgrade version
-CSI_UPGRADE_VERSION=v3.10.0
+CSI_UPGRADE_VERSION=v3.10.1
 
 # Ceph version to use
 BASE_IMAGE=quay.io/ceph/ceph:v18
 CEPH_VERSION=reef
 
 # standard Golang options
-GOLANG_VERSION=1.20.4
+GOLANG_VERSION=1.21.5
 GO111MODULE=on
 
 # commitlint version
 COMMITLINT_VERSION=latest
 
 # static checks and linters
-GOLANGCI_VERSION=v1.53.0
+GOLANGCI_VERSION=v1.54.1
 
 # external snapshotter version
 # Refer: https://github.com/kubernetes-csi/external-snapshotter/releases

diff --git a/deploy/cephcsi/image/Dockerfile b/deploy/cephcsi/image/Dockerfile
@@ -10,6 +10,8 @@ FROM ${BASE_IMAGE} as updated_base
 RUN dnf config-manager --disable \
     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 \
        && dnf -y install nfs-utils \
        && dnf clean all \

diff --git a/scripts/Dockerfile.devel b/scripts/Dockerfile.devel
@@ -23,6 +23,8 @@ RUN source /build.env \
 RUN dnf config-manager --disable \
     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 \
 	git \
 	make \

diff --git a/scripts/Dockerfile.test b/scripts/Dockerfile.test
@@ -23,6 +23,8 @@ ENV \
 
 COPY build.env /
 
+RUN mkdir /etc/selinux || true && touch /etc/selinux/config
+
 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 ) \