Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Syncing latest changes from upstream devel for ceph-csi #238

Merged
merged 5 commits into from
Dec 21, 2023
Merged

Syncing latest changes from upstream devel for ceph-csi #238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4c97bbb
rebase: bump github/codeql-action from 2 to 3
dependabot[bot] Dec 18, 2023
49cf9ec
build: use Go 1.21.5
nixpanic Dec 19, 2023
1f09ca2
build: create /etc/selinux/config in case it is missing
nixpanic Dec 19, 2023
8a2bf60
ci: update golangci to 1.54 which supports Go 1.21
nixpanic Dec 19, 2023
1ad7931
ci: Update the upgrade_version
karthik-us Dec 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/snyk-container-image.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 3 additions & 3 deletions build.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions deploy/cephcsi/image/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 2 additions & 0 deletions scripts/Dockerfile.devel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 2 additions & 0 deletions scripts/Dockerfile.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ) \
Expand Down