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.

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

Ubi8image3.8.0 #1

Open
wants to merge 2 commits into
base: devel
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions build.env
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
# get proporly expanded.
#
# cephcsi image version
CSI_IMAGE_VERSION=canary
CSI_IMAGE_VERSION=v3.8.0

# Ceph version to use
BASE_IMAGE=quay.io/ceph/ceph:v17
BASE_IMAGE=gcr.io/spectro-common-dev/medha/ubi8/fips-ceph:v17.2.6
CEPH_VERSION=quincy

# standard Golang options
GOLANG_VERSION=1.19.5
GOLANG_VERSION=1.20.10
GO111MODULE=on

# commitlint version
Expand Down Expand Up @@ -45,7 +45,7 @@ CHANGE_MINIKUBE_NONE_USER=true
# Rook options
ROOK_VERSION=v1.10.9
# Provide ceph image path
ROOK_CEPH_CLUSTER_IMAGE=quay.io/ceph/ceph:v17
ROOK_CEPH_CLUSTER_IMAGE=gcr.io/spectro-common-dev/medha/ubi8/fips-ceph:v17.2.6

# CSI sidecar version
CSI_ATTACHER_VERSION=v4.0.0
Expand Down
2 changes: 1 addition & 1 deletion charts/ceph-csi-cephfs/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ nodeplugin:
plugin:
image:
repository: quay.io/cephcsi/cephcsi
tag: canary
tag: v3.8.0
pullPolicy: IfNotPresent
resources: {}

Expand Down
2 changes: 1 addition & 1 deletion charts/ceph-csi-rbd/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ nodeplugin:
plugin:
image:
repository: quay.io/cephcsi/cephcsi
tag: canary
tag: v3.8.0
pullPolicy: IfNotPresent
resources: {}

Expand Down
16 changes: 5 additions & 11 deletions deploy/cephcsi/image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ ARG BASE_IMAGE

FROM ${BASE_IMAGE} as updated_base

RUN dnf -y update \
&& dnf clean all \
RUN dnf clean all \
&& rm -rf /var/cache/yum

FROM updated_base as builder
Expand All @@ -17,25 +16,19 @@ ARG CSI_IMAGE_VERSION=canary
ARG GO_ARCH
ARG SRC_DIR
ARG GIT_COMMIT
ARG GOROOT=/usr/local/go
ARG GOROOT=/usr/lib/golang

COPY build.env /

RUN dnf install -y go-toolset
RUN source /build.env && \
( test -n "${GO_ARCH}" && exit 0; echo -e "\n\nMissing GO_ARCH argument for building image, install Golang or run: make image-cephcsi GOARCH=amd64\n\n"; exit 1 ) && \
mkdir -p ${GOROOT} && \
curl https://storage.googleapis.com/golang/go${GOLANG_VERSION}.linux-${GO_ARCH}.tar.gz | tar xzf - -C ${GOROOT} --strip-components=1
( test -n "${GO_ARCH}" && exit 0; echo -e "\n\nMissing GO_ARCH argument for building image, install Golang or run: make image-cephcsi GOARCH=amd64\n\n"; exit 1 )

# test if the downloaded version of Golang works (different arch?)
RUN ${GOROOT}/bin/go version && ${GOROOT}/bin/go env

# TODO: remove the following cmd, when issue
# https://github.com/ceph/ceph-container/issues/2034 is fixed.
RUN dnf config-manager --disable \
tcmu-runner,tcmu-runner-source,tcmu-runner-noarch || true

RUN dnf -y install --nodocs \
librados-devel librbd-devel \
/usr/bin/cc \
make \
git \
Expand All @@ -46,6 +39,7 @@ RUN dnf -y install --nodocs \
ENV GOROOT=${GOROOT} \
GOPATH=/go \
CGO_ENABLED=1 \
GOEXPERIMENT=boringcrypto \
GIT_COMMIT="${GIT_COMMIT}" \
ENV_CSI_IMAGE_VERSION="${CSI_IMAGE_VERSION}" \
ENV_CSI_IMAGE_NAME="${CSI_IMAGE_NAME}" \
Expand Down
4 changes: 2 additions & 2 deletions deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ spec:
mountPath: /csi
- name: csi-cephfsplugin
# for stable functionality replace canary with latest release version
image: quay.io/cephcsi/cephcsi:canary
image: quay.io/cephcsi/cephcsi:v3.8.0
args:
- "--nodeid=$(NODE_ID)"
- "--type=cephfs"
Expand Down Expand Up @@ -143,7 +143,7 @@ spec:
- name: ceph-csi-encryption-kms-config
mountPath: /etc/ceph-csi-encryption-kms-config/
- name: liveness-prometheus
image: quay.io/cephcsi/cephcsi:canary
image: quay.io/cephcsi/cephcsi:v3.8.0
args:
- "--type=liveness"
- "--endpoint=$(CSI_ENDPOINT)"
Expand Down
4 changes: 2 additions & 2 deletions deploy/cephfs/kubernetes/csi-cephfsplugin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ spec:
add: ["SYS_ADMIN"]
allowPrivilegeEscalation: true
# for stable functionality replace canary with latest release version
image: quay.io/cephcsi/cephcsi:canary
image: quay.io/cephcsi/cephcsi:v3.8.0
args:
- "--nodeid=$(NODE_ID)"
- "--type=cephfs"
Expand Down Expand Up @@ -116,7 +116,7 @@ spec:
securityContext:
privileged: true
allowPrivilegeEscalation: true
image: quay.io/cephcsi/cephcsi:canary
image: quay.io/cephcsi/cephcsi:v3.8.0
args:
- "--type=liveness"
- "--endpoint=$(CSI_ENDPOINT)"
Expand Down
4 changes: 2 additions & 2 deletions deploy/nfs/kubernetes/csi-nfsplugin-provisioner.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ spec:
mountPath: /csi
- name: csi-nfsplugin
# for stable functionality replace canary with latest release version
image: quay.io/cephcsi/cephcsi:canary
image: quay.io/cephcsi/cephcsi:v3.8.0
args:
- "--nodeid=$(NODE_ID)"
- "--type=nfs"
Expand Down Expand Up @@ -120,7 +120,7 @@ spec:
- name: keys-tmp-dir
mountPath: /tmp/csi/keys
- name: liveness-prometheus
image: quay.io/cephcsi/cephcsi:canary
image: quay.io/cephcsi/cephcsi:v3.8.0
args:
- "--type=liveness"
- "--endpoint=$(CSI_ENDPOINT)"
Expand Down
2 changes: 1 addition & 1 deletion deploy/nfs/kubernetes/csi-nfsplugin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ spec:
add: ["SYS_ADMIN"]
allowPrivilegeEscalation: true
# for stable functionality replace canary with latest release version
image: quay.io/cephcsi/cephcsi:canary
image: quay.io/cephcsi/cephcsi:v3.8.0
args:
- "--nodeid=$(NODE_ID)"
- "--type=nfs"
Expand Down
6 changes: 3 additions & 3 deletions deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ spec:
mountPath: /csi
- name: csi-rbdplugin
# for stable functionality replace canary with latest release version
image: quay.io/cephcsi/cephcsi:canary
image: quay.io/cephcsi/cephcsi:v3.8.0
args:
- "--nodeid=$(NODE_ID)"
- "--type=rbd"
Expand Down Expand Up @@ -174,7 +174,7 @@ spec:
readOnly: true
- name: csi-rbdplugin-controller
# for stable functionality replace canary with latest release version
image: quay.io/cephcsi/cephcsi:canary
image: quay.io/cephcsi/cephcsi:v3.8.0
args:
- "--type=controller"
- "--v=5"
Expand All @@ -195,7 +195,7 @@ spec:
- name: ceph-config
mountPath: /etc/ceph/
- name: liveness-prometheus
image: quay.io/cephcsi/cephcsi:canary
image: quay.io/cephcsi/cephcsi:v3.8.0
args:
- "--type=liveness"
- "--endpoint=$(CSI_ENDPOINT)"
Expand Down
4 changes: 2 additions & 2 deletions deploy/rbd/kubernetes/csi-rbdplugin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ spec:
add: ["SYS_ADMIN"]
allowPrivilegeEscalation: true
# for stable functionality replace canary with latest release version
image: quay.io/cephcsi/cephcsi:canary
image: quay.io/cephcsi/cephcsi:v3.8.0
args:
- "--nodeid=$(NODE_ID)"
- "--pluginpath=/var/lib/kubelet/plugins"
Expand Down Expand Up @@ -135,7 +135,7 @@ spec:
securityContext:
privileged: true
allowPrivilegeEscalation: true
image: quay.io/cephcsi/cephcsi:canary
image: quay.io/cephcsi/cephcsi:v3.8.0
args:
- "--type=liveness"
- "--endpoint=$(CSI_ENDPOINT)"
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/ceph/ceph-csi

go 1.19
go 1.20

require (
github.com/IBM/keyprotect-go-client v0.9.2
Expand Down